Do not use $key as varname outside functions because that's used for the

global secret key.

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

diff --git a/src/options_identities.php b/src/options_identities.php
index 5072dee6fa62d8f4e67a666042d920758d8a4068..f836e442b83fe7ad5cc6a99958d313b922bbe206 100644 (file)
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -44,8 +44,8 @@ if (!empty($smaction) && is_array($smaction)) {
         // we only need to extract the action and the identity we are
         // altering
 
-        foreach($row as $key=>$data) {
-            $identid = $key;
+        foreach($row as $iKey=>$data) {
+            $identid = $iKey;
         }
 
         $doaction = $action;
@@ -69,15 +69,15 @@ $td_str = '';
 $td_str .= '<form name="f" action="options_identities.php" method="post"><br />' . "\n";
 $td_str .= '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . "\n";
 $cnt = count($identities);
-foreach( $identities as $key=>$ident ) {
+foreach( $identities as $iKey=>$ident ) {
 
-    if ($key == 0) {
+    if ($iKey == 0) {
         $hdr_str = _("Default Identity");
     } else {
-        $hdr_str = sprintf( _("Alternate Identity %d"), $key);
+        $hdr_str = sprintf( _("Alternate Identity %d"), $iKey);
     }
 
-    $td_str .= ShowIdentityInfo( $hdr_str, $ident, $key );
+    $td_str .= ShowIdentityInfo( $hdr_str, $ident, $iKey );
 
 }
 
@@ -88,7 +88,7 @@ $td_str .= '</form>';
 echo '<br /> ' . "\n" .
     html_tag('table', "\n" .
         html_tag('tr', "\n" .
-            html_tag('td' , "\n" . 
+            html_tag('td' , "\n" .
             '<b>' . _("Options") . ' - ' . _("Advanced Identities") . '</b><br />' .
             html_tag('table', "\n" .
                 html_tag('tr', "\n" .
@@ -103,24 +103,24 @@ echo '<br /> ' . "\n" .
             '', '', 'width="100%" border="0" cellpadding="1" cellspacing="1"' )) ,
         'center', $color[0]),
     'center', '', 'width="95%" border="0" cellpadding="2" cellspacing="0"' ) . '</body></html>';
-                    
+
 /**
  * Returns html formated identity form fields
- * 
+ *
  * Contains options_identities_buttons and option_identities_table hooks.
- * Before 1.4.5/1.5.1 hooks were placed in ShowTableInfo() function. 
- * In 1.1.3-1.4.1 they were called in do_hook function with two or 
+ * Before 1.4.5/1.5.1 hooks were placed in ShowTableInfo() function.
+ * In 1.1.3-1.4.1 they were called in do_hook function with two or
  * three arguments. Since 1.4.1 hooks are called in concat_hook_function.
  * Arguments are moved to array.
  *
  * options_identities_buttons hook uses array with two keys. First array key is
- * boolean variable used to indicate empty identity field. Second array key 
+ * boolean variable used to indicate empty identity field. Second array key
  * is integer variable used to indicate identity number
  *
  * options_identities_table hook uses array with three keys. First array key is
- * a string containing background color style CSS (1.4.1-1.4.4/1.5.0 uses only 
- * html color code). Second array key is boolean variable used to indicate empty 
- * identity field. Third array key is integer variable used to indicate identity 
+ * a string containing background color style CSS (1.4.1-1.4.4/1.5.0 uses only
+ * html color code). Second array key is boolean variable used to indicate empty
+ * identity field. Third array key is integer variable used to indicate identity
  * number
  * @param string $title Name displayed in header row
  * @param array $identity Identity information
@@ -195,7 +195,7 @@ function sti_input( $title, $name, $data, $bgcolor ) {
     $str .= '  <td style="white-space: nowrap;text-align:right;">' . $title . ' </td>' . "\n";
     $str .= '  <td> <input type="text" name="' . $name . '" size="50" value="'. htmlspecialchars($data) . '"> </td>' . "\n";
     $str .= '</tr>';
-    
+
     return $str;
 
 }
@@ -217,7 +217,7 @@ function sti_textarea( $title, $name, $data, $bgcolor ) {
     $str .= '  <td style="white-space: nowrap;text-align:right;">' . $title . ' </td>' . "\n";
     $str .= '  <td> <textarea name="' . $name . '" cols="50" rows="5">'. htmlspecialchars($data) . '</textarea> </td>' . "\n";
     $str .= '</tr>';
-    
+
     return $str;
 
 }