Changeset 313:92f24bfd1563 for admin

Timestamp:

05/24/11 13:56:04 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

default

Message:

superadmin now cannot delete themselves, nor remove their superadmin right.

Location:

admin

Files:

• user.php (modified) (2 diffs)
• users.php (modified) (2 diffs)

admin/user.php

@@ -96 +96 @@
           $cur->user_post_status = $user_post_status = $_POST['user_post_status'];
           
+          if ($cur->user_id == $core->auth->userID() && $core->auth->isSuperAdmin()) {
+               // force super_user to true if current user
+               $cur->user_super = $user_super = true;
+          }
           if ($core->auth->allowPassChange()) {
                $cur->user_change_pwd = !empty($_POST['user_change_pwd']) ? 1 : 0;
@@ -255 +259 @@
 }
 
+$super_disabled = $user_super && $user_id == $core->auth->userID();
+
 echo
-'<p><label for="user_super" class="classic">'.form::checkbox('user_super','1',$user_super,'',16).' '.
+'<p><label for="user_super" class="classic">'.form::checkbox('user_super','1',$user_super,'',16,$super_disabled).' '.
 __('Super administrator').'</label></p>'.
 '</div>'.

admin/users.php

@@ -24 +24 @@
                # --BEHAVIOR-- adminBeforeUserDelete
                $core->callBehavior('adminBeforeUserDelete',$u);
-               
-               $core->delUser($u);
+               if ($u != $core->auth->userID()) {
+                    $core->delUser($u);
+               }
           }
           catch (Exception $e)
@@ -32 +33 @@
           }
      }
-     
      if (!$core->error->flag()) {
           http::redirect('users.php?del=1');