From 60416d6f33e94d44bab4e47e616b363b36dbd777 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 21 Jan 2014 14:56:42 -0800
Subject: fix the admin interface to pending registrations

---
 include/account.php      | 4 ++--
 mod/admin.php            | 2 +-
 view/tpl/admin_users.tpl | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/account.php b/include/account.php
index b3dbb7023..7d1aa598d 100644
--- a/include/account.php
+++ b/include/account.php
@@ -383,11 +383,11 @@ function user_deny($hash) {
 	if(! count($register))
 		return false;
 
-	$user = q("SELECT account_id FROM account WHERE account_id = %d LIMIT 1",
+	$account = q("SELECT account_id FROM account WHERE account_id = %d LIMIT 1",
 		intval($register[0]['uid'])
 	);
 	
-	if(! $user)
+	if(! $account)
 		return false;
 
 	$r = q("DELETE FROM account WHERE account_id = %d LIMIT 1",
diff --git a/mod/admin.php b/mod/admin.php
index 984e12777..749b94de2 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -688,7 +688,7 @@ function admin_page_users(&$a){
 		'$submit' => t('Submit'),
 		'$select_all' => t('select all'),
 		'$h_pending' => t('User registrations waiting for confirm'),
-		'$th_pending' => array( t('Request date'), t('Name'), t('Email') ),
+		'$th_pending' => array( t('Request date'), t('Email') ),
 		'$no_pending' =>  t('No registrations.'),
 		'$approve' => t('Approve'),
 		'$deny' => t('Deny'),
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index 3549dc5c2..65fffd17c 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -29,9 +29,8 @@
 				<tbody>
 			{{foreach $pending as $u}}
 				<tr>
-					<td class="created">{{$u.created}}</td>
-					<td class="name">{{$u.name}}</td>
-					<td class="email">{{$u.email}}</td>
+					<td class="created">{{$u.account_created}}</td>
+					<td class="email">{{$u.account_email}}</td>
 					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
 					<td class="tools">
 						<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><i class='icon-thumbs-up-alt admin-icons'></i></a>
-- 
cgit v1.2.3