Changeset 2025

Timestamp:

May 25, 2007, 5:59:39 PM (17 years ago)

Author:

rub

Message:

Resolved issue 0000693: guest & default users can to be deleted

Merge BSF 2023:2024 into branch-1_7

Location:

branches/branch-1_7

Files:

• admin/user_list.php (modified) (2 diffs)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)

branches/branch-1_7/admin/user_list.php

@@ -253 +253 @@
 if (isset($_POST['delete']) and count($collection) > 0)
 {
+  if (in_array($conf['guest_id'], $collection))
+  {
+    array_push($page['errors'], l10n('Guest cannot be deleted'));
+  }
+  if (($conf['guest_id'] != $conf['default_user_id']) and 
+      in_array($conf['default_user_id'], $collection))
+  {
+    array_push($page['errors'], l10n('Default user cannot be deleted'));
+  }
   if (in_array($conf['webmaster_id'], $collection))
   {
     array_push($page['errors'], l10n('Webmaster cannot be deleted'));
   }
-  elseif (in_array($user['id'], $collection))
+  if (in_array($user['id'], $collection))
   {
     array_push($page['errors'], l10n('You cannot delete your account'));
   }
-  else
+
+  if (count($page['errors']) == 0)
   {
     if (isset($_POST['confirm_deletion']) and 1 == $_POST['confirm_deletion'])
@@ -392 +402 @@
       }
 
-      // Webmaster status must not be changed
-      if ($conf['webmaster_id'] == $user_id and isset($data['status']))
+      // special users checks
+      if
+        (
+          ($conf['webmaster_id'] == $user_id) or
+          ($conf['guest_id'] == $user_id) or
+          ($conf['default_user_id'] == $user_id)
+        )
       {
-        $data['status'] = 'webmaster';
-      }
-
-      // Webmaster and guest adviser must not be changed
-      if ((($conf['webmaster_id'] == $user_id) or ($conf['guest_id'] == $user_id)) and isset($data['adviser']))
-      {
-        $data['adviser'] = 'false';
+        // status must not be changed
+        if (isset($data['status']))
+        {
+          if ($conf['webmaster_id'] == $user_id)
+          {
+            $data['status'] = 'webmaster';
+          }
+          else
+          {
+            $data['status'] = 'guest';
+          }
+        }
+
+        // could not be adivser
+        if (isset($data['adviser']))
+        {
+          $data['adviser'] = 'false';
+        }
       }
 

branches/branch-1_7/language/en_UK.iso-8859-1/admin.lang.php

@@ -609 +609 @@
 $lang['is_the_default'] = 'default values';
 $lang['High filesize'] = 'High filesize';
+// --------- Starting below: New or revised $lang ---- from Butterfly (1.7.1)
+$lang['Guest cannot be deleted'] = 'Guest cannot be deleted';
+$lang['Default user cannot be deleted'] = 'Default user cannot be deleted';
 ?>

branches/branch-1_7/language/fr_FR.iso-8859-1/admin.lang.php

@@ -610 +610 @@
 $lang['is_the_default'] = 'valeurs par défaut';
 $lang['High filesize'] = 'Taille du fichier HR';
+// --------- Starting below: New or revised $lang ---- from Butterfly (1.7.1)
+$lang['Guest cannot be deleted'] = 'L\'invité ne peut pas être supprimé';
+$lang['Default user cannot be deleted'] = 'L\'utilisateur par défaut ne peut pas être supprimé';
 ?>