more removing of each()

diff --git a/lib/xmlrpc.inc b/lib/xmlrpc.inc
index 7aee62c..829a92d 100644 (file)
--- a/lib/xmlrpc.inc
+++ b/lib/xmlrpc.inc
@@ -2402,7 +2402,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                                }\r
                                // be tolerant to line endings, and extra empty lines\r
                                $ar = preg_split("/\r?\n/", trim(substr($data, 0, $pos)));\r
-                               while(list(,$line) = @each($ar))\r
+               foreach($ar as $line)\r
                                {\r
                                        // take care of multi-line headers and cookies\r
                                        $arr = explode(':',$line,2);\r
@@ -2976,7 +2976,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                                echo "$key => $val<br />";\r
                                if($key == 'array')\r
                                {\r
-                                       while(list($key2, $val2) = each($val))\r
+                    foreach($val as $key2 => $val2)\r
                                        {\r
                                                echo "-- $key2 => $val2<br />";\r
                                        }\r
@@ -3188,8 +3188,8 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                function getval()\r
                {\r
                        // UNSTABLE\r
-                       reset($this->me);\r
-                       list($a,$b)=each($this->me);\r
+                       $b = reset($this->me);\r
+                       $a = key($this->me);\r
                        // contributed by I Sofer, 2001-03-24\r
                        // add support for nested arrays to scalarval\r
                        // i've created a new method here, so as to\r
@@ -3197,8 +3197,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
 \r
                        if(is_array($b))\r
                        {\r
-                               @reset($b);\r
-                               while(list($id,$cont) = @each($b))\r
+                               foreach($b as $id => $cont)\r
                                {\r
                                        $b[$id] = $cont->scalarval();\r
                                }\r
@@ -3208,13 +3207,11 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                        if(is_object($b))\r
                        {\r
                                $t = get_object_vars($b);\r
-                               @reset($t);\r
-                               while(list($id,$cont) = @each($t))\r
+                               foreach($t as $id => $cont)\r
                                {\r
                                        $t[$id] = $cont->scalarval();\r
                                }\r
-                               @reset($t);\r
-                               while(list($id,$cont) = @each($t))\r
+                foreach($t as $id => $cont)\r
                                {\r
                                        @$b->$id = $cont;\r
                                }\r
@@ -3243,7 +3240,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                function scalartyp()\r
                {\r
                        reset($this->me);\r
-                       list($a,)=each($this->me);\r
+            $a = key($this->me);\r
                        if($a==$GLOBALS['xmlrpcI4'])\r
                        {\r
                                $a=$GLOBALS['xmlrpcInt'];\r
@@ -3376,8 +3373,8 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                        case 'scalar':\r
                                if (in_array('extension_api', $options))\r
                                {\r
-                                       reset($xmlrpc_val->me);\r
-                                       list($typ,$val) = each($xmlrpc_val->me);\r
+                    $val = reset($xmlrpc_val->me);\r
+                    $typ = key($xmlrpc_val->me);\r
                                        switch ($typ)\r
                                        {\r
                                                case 'dateTime.iso8601':\r
@@ -3550,8 +3547,7 @@ xmlrpc_encode_entitites($this->errstr, $GLOBALS['xmlrpc_internalencoding'], $cha
                                else\r
                                {\r
                                        $arr = array();\r
-                                       reset($php_val);\r
-                                       while(list($k,$v) = each($php_val))\r
+                    foreach($php_val as $k => $v)\r
                                        {\r
                                                $arr[$k] = php_xmlrpc_encode($v, $options);\r
                                        }\r