MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

admin: Don't allow to block or delete site admin in users admin page. fix bug 471

Browse source
This commit is contained in:
Fabrixxm 2012-09-17 08:48:43 -04:00
parent 59d98647fb
commit 6aa45fb9cc
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mod/admin.php
View file

@ -664,6 +664,7 @@ function admin_page_users(&$a){
); );
function _setup_users($e){ function _setup_users($e){
$a = get_app();
$accounts = Array( $accounts = Array(
t('Normal Account'), t('Normal Account'),
t('Soapbox Account'), t('Soapbox Account'),
@ -674,6 +675,7 @@ function admin_page_users(&$a){
$e['register_date'] = relative_date($e['register_date']); $e['register_date'] = relative_date($e['register_date']);
$e['login_date'] = relative_date($e['login_date']); $e['login_date'] = relative_date($e['login_date']);
$e['lastitem_date'] = relative_date($e['lastitem_date']); $e['lastitem_date'] = relative_date($e['lastitem_date']);
$e['is_admin'] = ($e['email'] === $a->config['admin_email']);
return $e; return $e;
} }
$users = array_map("_setup_users", $users); $users = array_map("_setup_users", $users);
@ -694,6 +696,7 @@ function admin_page_users(&$a){
'$delete' => t('Delete'), '$delete' => t('Delete'),
'$block' => t('Block'), '$block' => t('Block'),
'$unblock' => t('Unblock'), '$unblock' => t('Unblock'),
'$siteadmin' => t('Site admin'),
'$h_users' => t('Users'), '$h_users' => t('Users'),
'$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account') ), '$th_users' => array( t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account') ),

17
view/admin_users.tpl
View file

@ -70,11 +70,20 @@
<td class='register_date'>$u.register_date</td> <td class='register_date'>$u.register_date</td>
<td class='login_date'>$u.login_date</td> <td class='login_date'>$u.login_date</td>
<td class='lastitem_date'>$u.lastitem_date</td> <td class='lastitem_date'>$u.lastitem_date</td>
<td class='login_date'>$u.page-flags</td> <td class='login_date'>$u.page-flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td> <td class="checkbox">
{{ if $u.is_admin }}
&nbsp;
{{ else }}
<input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
{{ endif }}
<td class="tools"> <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> {{ if $u.is_admin }}
<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> &nbsp;
{{ 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> </td>
</tr> </tr>
{{ endfor }} {{ endfor }}