Renamed $key variable in loops (fixes bug #111155)

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

diff --git a/functions/addressbook.php b/functions/addressbook.php
index 45f586b38b7e0d9da0a5709349c1e5feebe8b429..21b6f1c679e726bbe1471642ab0927d94c835478 100644 (file)
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -36,7 +36,7 @@
       // Load configured LDAP servers
       if(is_array($ldap_server)) {
         reset($ldap_server);
-        while(list($key,$param) = each($ldap_server)) {
+        while(list($undef,$param) = each($ldap_server)) {
            if(is_array($param)) {
               $r = $abook->add_backend("ldap_server", $param);
               if(!$r && $showerr) {

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index d89d118b5f4043f2c6d6b76dd571b0472a526a7f..df487f719613bbcf80b4387dcadbd52e6c019d40 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -100,7 +100,7 @@ function bcc_address($addr) {
 
       print "</TR>\n";
       
-      while(list($key, $row) = each($res)) {
+      while(list($undef, $row) = each($res)) {
         printf("<tr%s nowrap><td valign=top nowrap align=center width=\"5%%\">".
                "<small><a href=\"javascript:to_address('%s');\">To</A> | ".
                "<a href=\"javascript:cc_address('%s');\">Cc</A> | ".
@@ -190,7 +190,7 @@ function bcc_address($addr) {
         printf("<OPTION VALUE=-1 SELECTED>%s\n", 
                _("All address books"));
         $ret = $abook->get_backend_list();
-        while(list($k,$v) = each($ret)) 
+        while(list($undef,$v) = each($ret)) 
            printf("<OPTION VALUE=%d>%s\n", $v->bnum, $v->sname);
         printf("</SELECT>\n");
       } else {

diff --git a/src/addrbook_search_html.php b/src/addrbook_search_html.php
index 6f8259ffd89dc3c5e5b85ff4e74e448026bcabea..cbbfa933c00f47b0b904e64b544f8ccbe32b4c91 100644 (file)
--- a/src/addrbook_search_html.php
+++ b/src/addrbook_search_html.php
@@ -75,7 +75,7 @@
 
       print "</TR>\n";
       
-      while(list($key, $row) = each($res)) {
+      while(list($undef, $row) = each($res)) {
          printf("<tr%s nowrap><td nowrap align=center width=\"5%%\">".
                 "<input type=checkbox name=\"send_to_search[]\" value=\"%s\">&nbsp;To".
                 "<input type=checkbox name=\"send_to_cc_search[]\" value=\"%s\">&nbsp;Cc&nbsp;".
@@ -138,7 +138,7 @@
             ($backend == -1) ? "SELECTED" : "",
             _("All address books"));
       $ret = $abook->get_backend_list();
-      while(list($k,$v) = each($ret)) 
+      while(list($undef,$v) = each($ret)) 
         printf("<OPTION VALUE=%d %s>%s\n", 
                $v->bnum, 
                ($backend == $v->bnum) ? "SELECTED" : "",

diff --git a/src/addressbook.php b/src/addressbook.php
index d8c7d4537788852051b90f45d3646155b5666801..d269fe5a95f156df3aa17e692bfb85a8b056aa37 100644 (file)
--- a/src/addressbook.php
+++ b/src/addressbook.php
@@ -283,7 +283,7 @@
       $headerprinted = false;
 
       // List addresses
-      while(list($key,$row) = each($alist)) {
+      while(list($undef,$row) = each($alist)) {
 
         // New table header for each backend
         if($prevbackend != $row["backend"]) {

diff --git a/src/compose.php b/src/compose.php
index 660752290e6574a04506e2d94738768e210c7e7b..a1e43f78b0b3eccf959d9ee767b98369b8ee3c71 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -371,8 +371,8 @@
       is_logged_in();
       displayPageHeader($color, $mailbox);
 
-      while (list($key, $localname) = each($delete)) {
-         array_splice ($attachments, $key, 1);
+      while (list($lkey, $localname) = each($delete)) {
+         array_splice ($attachments, $lkey, 1);
          unlink ($attachment_dir.$localname);
          unlink ($attachment_dir.$localname.".info");
       }