aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortuscanhobbit <tuscanhobbit@users.noreply.github.com>2013-11-23 19:46:07 +0100
committertuscanhobbit <tuscanhobbit@users.noreply.github.com>2013-11-23 19:46:07 +0100
commit2e4177796364ca4edb3a29e7646545649d57c56a (patch)
treee0d639f14a3245963c60da8a043797f1a31b8661
parentd27ed7f6e5b595aaf20154a30995601fd6b11644 (diff)
downloadvolse-hubzilla-2e4177796364ca4edb3a29e7646545649d57c56a.tar.gz
volse-hubzilla-2e4177796364ca4edb3a29e7646545649d57c56a.tar.bz2
volse-hubzilla-2e4177796364ca4edb3a29e7646545649d57c56a.zip
a reference to account_id was missing in user admin table
-rw-r--r--mod/admin.php5
-rwxr-xr-xview/tpl/admin_users.tpl14
2 files changed, 11 insertions, 8 deletions
diff --git a/mod/admin.php b/mod/admin.php
index 1615412b5..5a3ec48f7 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -649,7 +649,8 @@ function admin_page_users(&$a){
if($_REQUEST['order'] === 'expires')
$order = " order by account_expires desc ";
- $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, `account_service_class` FROM `account` where true $serviceclass $order limit %d , %d ",
+ $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, `account_service_class`, ( account_flags & %d ) > 0 as `blocked` FROM `account` where true $serviceclass $order limit %d , %d ",
+ intval(ACCOUNT_BLOCKED),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
@@ -686,7 +687,7 @@ function admin_page_users(&$a){
'$delete' => t('Delete'),
'$block' => t('Block'),
'$unblock' => t('Unblock'),
-
+
'$h_users' => t('Users'),
'$th_users' => array( t('Email'), t('Register date'), t('Last login'), t('Expires'), t('Service Class')),
diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl
index cedd55216..609289013 100755
--- a/view/tpl/admin_users.tpl
+++ b/view/tpl/admin_users.tpl
@@ -55,7 +55,6 @@
<table id='users'>
<thead>
<tr>
- <th></th>
{{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}}
<th></th>
<th></th>
@@ -64,16 +63,19 @@
<tbody>
{{foreach $users as $u}}
<tr>
- <td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
- <td class='email'>{{$u.account_email}}</td>
+ <td class='email'>{{if $u.blocked}}
+ <i>{{$u.account_email}}</i>
+ {{else}}
+ <strong>{{$u.account_email}}</strong>
+ {{/if}}</td>
<td class='register_date'>{{$u.account_created}}</td>
<td class='login_date'>{{$u.account_lastlog}}</td>
<td class='account_expires'>{{$u.account_expires}}</td>
<td class='service_class'>{{$u.account_service_class}}</td>
- <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.uid}}" name="user[]" value="{{$u.uid}}"/></td>
+ <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"/></td>
<td class="tools">
- <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if $u.blocked==0}}dim{{/if}}'></i></a>
- <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a>
+ <a href="{{$baseurl}}/admin/users/block/{{$u.account_id}}?t={{$form_security_token}}" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($u.blocked)}}dim{{/if}}'></i></a>
+ <a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class='icon-remove admin-icons'></i></a>
</td>
</tr>
{{/foreach}}