Changeset 1490

Timestamp:

Jul 21, 2006, 5:30:13 PM (18 years ago)

Author:

nikrou

Message:

bug 482 fixed: deletion of our account must be impossible
svn merge from trunk into branch 1.6

Location:

branches/branch-1_6

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_6/admin/user_list.php

@@ -251 +251 @@
 // |                             delete users                              |
 // +-----------------------------------------------------------------------+
-
 if (isset($_POST['delete']) and count($collection) > 0)
 {
@@ -257 +256 @@
   {
     array_push($page['errors'], l10n('Webmaster cannot be deleted'));
+  }
+  elseif (in_array($user['id'], $collection))
+  {
+    array_push($page['errors'], l10n('You cannot delete your account'));
   }
   else

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

@@ -178 +178 @@
 $lang['You are running on development sources, no check possible.'] = 'You are running on development sources, no check possible.';
 $lang['You are running the latest version of PhpWebGallery.'] = 'You are running the latest version of PhpWebGallery.';
+$lang['You cannot delete your account'] = "You cannot delete your account";
 $lang['You cannot move a category in its own sub category'] = 'You cannot move a category in its own sub category';
 $lang['You need to confirm deletion'] = 'You need to confirm deletion';

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

@@ -178 +178 @@
 $lang['You are running on development sources, no check possible.'] = 'Vous travaillez avec les sources de développement, impossible de vérifier la dernière version.';
 $lang['You are running the latest version of PhpWebGallery.'] = 'Vous utilisez la dernière version de PhpWebGallery.';
+$lang['You cannot delete your account'] = "Vous ne pouvez pas supprimer votre compte";
 $lang['You cannot move a category in its own sub category'] = 'Vous ne pouvez pas déplacer une catégorie dans sa propre sous-catégorie';
 $lang['You need to confirm deletion'] = 'Vous devez confirmer la suppression';