From 6aa45fb9cc2569f99b550003ee3f98916754dd0a Mon Sep 17 00:00:00 2001 From: Fabrixxm <fabrix.xm@gmail.com> Date: Mon, 17 Sep 2012 08:48:43 -0400 Subject: [PATCH] admin: Don't allow to block or delete site admin in users admin page. fix bug 471 --- mod/admin.php | 3 +++ view/admin_users.tpl | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 5edb927559..ee04830548 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -664,6 +664,7 @@ function admin_page_users(&$a){ ); function _setup_users($e){ + $a = get_app(); $accounts = Array( t('Normal Account'), t('Soapbox Account'), @@ -674,6 +675,7 @@ function admin_page_users(&$a){ $e['register_date'] = relative_date($e['register_date']); $e['login_date'] = relative_date($e['login_date']); $e['lastitem_date'] = relative_date($e['lastitem_date']); + $e['is_admin'] = ($e['email'] === $a->config['admin_email']); return $e; } $users = array_map("_setup_users", $users); @@ -694,6 +696,7 @@ function admin_page_users(&$a){ '$delete' => t('Delete'), '$block' => t('Block'), '$unblock' => t('Unblock'), + '$siteadmin' => t('Site admin'), '$h_users' => t('Users'), '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account') ), diff --git a/view/admin_users.tpl b/view/admin_users.tpl index f67e4a0f74..c9ab0e3f73 100644 --- a/view/admin_users.tpl +++ b/view/admin_users.tpl @@ -70,11 +70,20 @@ <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="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td> + <td class='login_date'>$u.page-flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td> + <td class="checkbox"> + {{ if $u.is_admin }} + + {{ else }} + <input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td> + {{ endif }} <td class="tools"> - <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a> - <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a> + {{ if $u.is_admin }} + + {{ else }} + <a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a> + <a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a> + {{ endif }} </td> </tr> {{ endfor }} -- 2.39.5