* Check for $delete_# properly

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1357 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/options_identities.php b/src/options_identities.php
index ececa25be02e7884a75239f8a2b12b2c00db7830..5b900cfc708c0bda48b4f06a9da5619bb404f0b2 100644 (file)
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -21,10 +21,7 @@
    if (CheckAndDoDefault() || CheckAndDoPromote()) {
       SaveUpdateFunction();
    }
-   if (isset($update) || isset($delete_0) || isset($delete_1) || 
-       isset($delete_2) || isset($delete_3) || isset($delete_4) || 
-          isset($delete_5) || isset($delete_6) || isset($delete_7) || 
-          isset($delete_8))
+   if (isset($update) || CheckForDelete())
       SaveUpdateFunction();
 
    LoadInfo($full_name, $email_address, $reply_to, '');
@@ -179,6 +176,28 @@ function CheckAndDoDefault()
    return false;
 }
 
+function CheckForDelete()
+{
+   global $username, $data_dir, $full_name, $email_address, $reply_to;
+    
+   $i = 1;
+   $name = 'form_for_' . $i;
+   global $$name;
+   while (isset($$name))
+   {
+      $name = 'delete_' . $i;
+      global $$name;
+      if (isset($$name)) {
+          return true;
+      }
+      
+      $i ++;
+      $name = 'form_for_' . $i;
+      global $$name;
+   }
+   return false;
+}
+
 function CheckAndDoPromote()
 {
    global $username, $data_dir, $full_name, $email_address, $reply_to;