diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-03-15 15:25:39 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-03-15 15:25:39 +0000 |
| commit | b48c481b9cb1b1c06634139dc0e6c4c91b83d873 (patch) | |
| tree | d1ace904df3f775859dfb6aa7aa047776d828d83 | |
| parent | d07971b909363dd82faee3e4b5a218cb21d376dc (diff) | |
| download | volse-hubzilla-b48c481b9cb1b1c06634139dc0e6c4c91b83d873.tar.gz volse-hubzilla-b48c481b9cb1b1c06634139dc0e6c4c91b83d873.tar.bz2 volse-hubzilla-b48c481b9cb1b1c06634139dc0e6c4c91b83d873.zip | |
Tidy up
| -rw-r--r-- | mod/admin.php | 9 | ||||
| -rw-r--r-- | view/tpl/admin_users.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/smarty3/admin_users.tpl | 10 |
3 files changed, 8 insertions, 14 deletions
diff --git a/mod/admin.php b/mod/admin.php index e88936cf4..be8575e4e 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -564,10 +564,9 @@ function admin_page_users(&$a){ $a->set_pager_itemspage(100); } -// FIXME this is borked since there is no more user table - -// $users = q("SELECT `account_email` FROM `account` -// ", + +// WEe'll still need to link email addresses to admin/users/channels or some such, but this bit doesn't exist yet. +// That's where we need to be doing last post/channel flags/etc, not here. $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_service_class` FROM `account`", intval($a->pager['start']), intval($a->pager['itemspage']) @@ -607,7 +606,7 @@ function admin_page_users(&$a){ '$unblock' => t('Unblock'), '$h_users' => t('Users'), - '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account'), t('Service Class')), + '$th_users' => array( t('Email'), t('Register date'), t('Last login'), t('Service Class')), '$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), '$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index b8822175c..6de504e2a 100644 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -65,12 +65,9 @@ {{ for $users as $u }} <tr> <td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td> - <td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td> <td class='email'>$u.account_email</td> <td class='register_date'>$u.account_created</td> <td class='login_date'>$u.account_lastlog</td> - <td class='lastitem_date'>$u.lastitem_date</td> - <td class='login_date'>$u.page_flags</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="tools"> diff --git a/view/tpl/smarty3/admin_users.tpl b/view/tpl/smarty3/admin_users.tpl index 5448a08c4..136ce3c3e 100644 --- a/view/tpl/smarty3/admin_users.tpl +++ b/view/tpl/smarty3/admin_users.tpl @@ -70,12 +70,10 @@ {{foreach $users as $u}} <tr> <td><img src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td> - <td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td> - <td class='email'>{{$u.email}}</td> - <td class='register_date'>{{$u.register_date}}</td> - <td class='login_date'>{{$u.login_date}}</td> - <td class='lastitem_date'>{{$u.lastitem_date}}</td> - <td class='login_date'>{{$u.page_flags}}</td> + <td class='email'>{{$u.account_email}}</td> + <td class='register_date'>{{$u.account_created}}</td> + <td class='login_date'>{{$u.account_lastlog}}</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="tools"> <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a> |