Prechádzať zdrojové kódy

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

pallo 25 rokov pred
rodič
commit
dc3ab7a91f

+ 1 - 1
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) {

+ 2 - 2
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 {

+ 2 - 2
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" : "",

+ 1 - 1
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"]) {

+ 2 - 2
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");
       }