Inspection of "oops" - gggeek/phpxmlrpc - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 80cfcb...3f3f21 )

by Gaetano

created 2022-11-27 15:42 UTC

Status

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

@@ -24,12 +24,12 @@  discard block
 block discarded – undo
 
         // read chunk-size, chunk-extension (if any) and crlf
         // get the position of the linebreak
-        $chunkEnd = strpos($buffer, "\r\n") + 2;
+        $chunkEnd = strpos($buffer, "\r\n")+2;
         $temp = substr($buffer, 0, $chunkEnd);
         $chunkSize = hexdec(trim($temp));
         $chunkStart = $chunkEnd;
-        while ($chunkSize > 0) {
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
+        while ($chunkSize>0) {
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
 
             // just in case we got a broken connection
             if ($chunkEnd == false) {
@@ -41,19 +41,19 @@  discard block
 block discarded – undo
             }
 
             // read chunk-data and crlf
-            $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             // append chunk-data to entity-body
             $new .= $chunk;
             // length := length + chunk-size
             $length += strlen($chunk);
             // read chunk-size and crlf
-            $chunkStart = $chunkEnd + 2;
+            $chunkStart = $chunkEnd+2;
 
-            $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
+            $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
             if ($chunkEnd == false) {
                 break; //just in case we got a broken connection
             }
-            $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
+            $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
             $chunkSize = hexdec(trim($temp));
             $chunkStart = $chunkEnd;
         }
@@ -84,11 +84,11 @@  discard block
 block discarded – undo
             // (even though it is not valid http)
             $pos = strpos($data, "\r\n\r\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 4;
+                $bd = $pos+4;
             } else {
                 $pos = strpos($data, "\n\n");
                 if ($pos || is_int($pos)) {
-                    $bd = $pos + 2;
+                    $bd = $pos+2;
                 } else {
                     // No separation between response headers and body: fault?
                     $bd = 0;
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
                 // maybe we could take them into account, too?
                 $data = substr($data, $bd);
             } else {
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
-                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
+                throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
             }
         }
 
@@ -131,20 +131,20 @@  discard block
 block discarded – undo
         }
 
         if ($httpResponse['status_code'] !== '200') {
-            $errstr = substr($data, 0, strpos($data, "\n") - 1);
-            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
-            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
+            $errstr = substr($data, 0, strpos($data, "\n")-1);
+            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
+            throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
         }
 
         // be tolerant to usage of \n instead of \r\n to separate headers and data
         // (even though it is not valid http)
         $pos = strpos($data, "\r\n\r\n");
         if ($pos || is_int($pos)) {
-            $bd = $pos + 4;
+            $bd = $pos+4;
         } else {
             $pos = strpos($data, "\n\n");
             if ($pos || is_int($pos)) {
-                $bd = $pos + 2;
+                $bd = $pos+2;
             } else {
                 // No separation between response headers and body: fault?
                 // we could take some action here instead of going on...
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
         foreach ($ar as $line) {
             // take care of multi-line headers and cookies
             $arr = explode(':', $line, 2);
-            if (count($arr) > 1) {
+            if (count($arr)>1) {
                 $headerName = strtolower(trim($arr[0]));
                 /// @todo some other headers (the ones that allow a CSV list of values)
                 ///       do allow many values to be passed using multiple header lines.
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
                         // glue together all received cookies, using a comma to separate them
                         // (same as php does with getallheaders())
                         if (isset($httpResponse['headers'][$headerName])) {
-                            $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
+                            $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
                         } else {
                             $httpResponse['headers'][$headerName] = trim($cookie);
                         }
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
                 }
             } elseif (isset($headerName)) {
                 /// @todo version1 cookies might span multiple lines, thus breaking the parsing above
-                $httpResponse['headers'][$headerName] .= ' ' . trim($line);
+                $httpResponse['headers'][$headerName] .= ' '.trim($line);
             }
         }
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
             // Decode chunked encoding sent by http 1.1 servers
             if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
                 if (!$data = static::decodeChunked($data)) {
-                    Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
+                    Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
                     throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
                 }
             }
@@ -245,19 +245,19 @@  discard block
 block discarded – undo
                         if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
                             $data = $degzdata;
                             if ($debug) {
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
                             $data = $degzdata;
                             if ($debug) {
-                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
+                                Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
                             }
                         } else {
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
                             throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
                         }
                     } else {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
                         throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
                     }
                 }

Please login to merge, or discard this patch.

src/Helper/XMLParser.php 1 patch

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -154,10 +154,10 @@  discard block
 block discarded – undo
         $this->accept = $accept;
 
         // @see ticket #70 - we have to parse big xml docks in chunks to avoid errors
-        for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
+        for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
             $chunk = substr($data, $offset, $this->maxChunkLength);
             // error handling: xml not well formed
-            if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
+            if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
                 $errCode = xml_get_error_code($parser);
                 $errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
                     xml_get_current_line_number($parser), xml_get_current_column_number($parser));
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
     public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
     {
         // if invalid xmlrpc already detected, skip all processing
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
 
             // check for correct element nesting
             if (count($this->_xh['stack']) == 0) {
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
                     $this->_xh['rt'] = strtolower($name);
                 } else {
                     $this->_xh['isf'] = 2;
-                    $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
+                    $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
 
                     return;
                 }
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
                     break;
                 case 'MEMBER':
                     // set member name to null, in case we do not find in the xml later on
-                    $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = '';
+                    $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = '';
                     //$this->_xh['ac']='';
                 // Drop trough intentionally
                 case 'PARAM':
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
      */
     public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
     {
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             // push this element name from stack
             // NB: if XML validates, correct opening/closing is guaranteed and
             // we do not have to check for $name == $currElem.
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
                         $this->_xh['vt'] = Value::$xmlrpcString;
                     }
 
-                    if ($rebuildXmlrpcvals > 0) {
+                    if ($rebuildXmlrpcvals>0) {
                         // build the xmlrpc val out of the data received, and substitute it
                         $temp = new Value($this->_xh['value'], $this->_xh['vt']);
                         // in case we got info about underlying php class, save it
@@ -381,15 +381,15 @@  discard block
 block discarded – undo
                             $temp->_php_class = $this->_xh['php_class'];
                         }
                         $this->_xh['value'] = $temp;
-                    } elseif ($rebuildXmlrpcvals < 0) {
+                    } elseif ($rebuildXmlrpcvals<0) {
                         if ($this->_xh['vt'] == Value::$xmlrpcDateTime) {
-                            $this->_xh['value'] = (object)array(
+                            $this->_xh['value'] = (object) array(
                                 'xmlrpc_type' => 'datetime',
                                 'scalar' => $this->_xh['value'],
                                 'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value'])
                             );
                         } elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) {
-                            $this->_xh['value'] = (object)array(
+                            $this->_xh['value'] = (object) array(
                                 'xmlrpc_type' => 'base64',
                                 'scalar' => $this->_xh['value']
                             );
@@ -405,8 +405,8 @@  discard block
 block discarded – undo
                     // check if we are inside an array or struct:
                     // if value just built is inside an array, let's move it into array on the stack
                     $vscount = count($this->_xh['valuestack']);
-                    if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
-                        $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
+                    if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
+                        $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
                     }
                     break;
                 case 'BOOLEAN':
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
                         $this->_xh['value'] = $this->_xh['ac'];
                     } elseif ($name == 'DATETIME.ISO8601') {
                         if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) {
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']);
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']);
                         }
                         $this->_xh['vt'] = Value::$xmlrpcDateTime;
                         $this->_xh['value'] = $this->_xh['ac'];
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
                         } else {
                             // log if receiving something strange, even though we set the value to false anyway
                             if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) {
-                                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']);
+                                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']);
                             }
                             $this->_xh['value'] = false;
                         }
@@ -454,37 +454,37 @@  discard block
 block discarded – undo
                         // NOTE: regexp could be much stricter than this...
                         if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) {
                             /// @todo: find a better way of throwing an error than this!
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']);
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']);
                             $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                         } else {
                             // it's ok, add it on
-                            $this->_xh['value'] = (double)$this->_xh['ac'];
+                            $this->_xh['value'] = (double) $this->_xh['ac'];
                         }
                     } else {
                         // we have an I4/I8/INT
                         // we must check that only 0123456789-<space> are characters here
                         if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) {
                             /// @todo find a better way of throwing an error than this!
-                            Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']);
+                            Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']);
                             $this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
                         } else {
                             // it's ok, add it on
-                            $this->_xh['value'] = (int)$this->_xh['ac'];
+                            $this->_xh['value'] = (int) $this->_xh['ac'];
                         }
                     }
                     $this->_xh['lv'] = 3; // indicate we've found a value
                     break;
                 case 'NAME':
-                    $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
+                    $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
                     break;
                 case 'MEMBER':
                     // add to array in the stack the last element built,
                     // unless no VALUE was found
                     if ($this->_xh['vt']) {
                         $vscount = count($this->_xh['valuestack']);
-                        $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
+                        $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
                     } else {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml');
                     }
                     break;
                 case 'DATA':
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
                         $this->_xh['params'][] = $this->_xh['value'];
                         $this->_xh['pt'][] = $this->_xh['vt'];
                     } else {
-                        Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml');
+                        Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml');
                     }
                     break;
                 case 'METHODNAME':
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
     public function xmlrpc_cd($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             // "lookforvalue==3" means that we've found an entire value
             // and should discard any further character data
             if ($this->_xh['lv'] != 3) {
@@ -585,7 +585,7 @@  discard block
 block discarded – undo
     public function xmlrpc_dh($parser, $data)
     {
         // skip processing if xml fault already detected
-        if ($this->_xh['isf'] < 2) {
+        if ($this->_xh['isf']<2) {
             if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') {
                 $this->_xh['ac'] .= $data;
             }
@@ -659,8 +659,8 @@  discard block
 block discarded – undo
         // Details:
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
             $xmlChunk, $matches)) {
             return strtoupper(substr($matches[2], 1, -1));
         }
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
             // NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
             // IANA also likes better US-ASCII, so go with it
             if ($enc == 'ASCII') {
-                $enc = 'US-' . $enc;
+                $enc = 'US-'.$enc;
             }
 
             return $enc;
@@ -713,8 +713,8 @@  discard block
 block discarded – undo
         // Details:
         // SPACE:         (#x20 | #x9 | #xD | #xA)+ === [ \x9\xD\xA]+
         // EQ:            SPACE?=SPACE? === [ \x9\xD\xA]*=[ \x9\xD\xA]*
-        if (preg_match('/^<\?xml\s+version\s*=\s*' . "((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))" .
-            '\s+encoding\s*=\s*' . "((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
+        if (preg_match('/^<\?xml\s+version\s*=\s*'."((?:\"[a-zA-Z0-9_.:-]+\")|(?:'[a-zA-Z0-9_.:-]+'))".
+            '\s+encoding\s*=\s*'."((?:\"[A-Za-z][A-Za-z0-9._-]*\")|(?:'[A-Za-z][A-Za-z0-9._-]*'))/",
             $xmlChunk, $matches)) {
             return true;
         }

Please login to merge, or discard this patch.

src/Helper/Charset.php 1 patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -68,14 +68,14 @@  discard block
 block discarded – undo
                 if (count($this->xml_iso88591_Entities['in'])) {
                     return;
                 }
-                for ($i = 0; $i < 32; $i++) {
+                for ($i = 0; $i<32; $i++) {
                     $this->xml_iso88591_Entities["in"][] = chr($i);
                     $this->xml_iso88591_Entities["out"][] = "&#{$i};";
                 }
 
                 /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
 
-                for ($i = 160; $i < 256; $i++) {
+                for ($i = 160; $i<256; $i++) {
                     $this->xml_iso88591_Entities["in"][] = chr($i);
                     $this->xml_iso88591_Entities["out"][] = "&#{$i};";
                 }
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
                 break;*/
 
             default:
-                throw new \Exception('Unsupported table: ' . $tableName);
+                throw new \Exception('Unsupported table: '.$tableName);
         }
     }
 
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
             $destEncoding = 'US-ASCII';
         }
 
-        $conversion = strtoupper($srcEncoding . '_' . $destEncoding);
+        $conversion = strtoupper($srcEncoding.'_'.$destEncoding);
 
         // list ordered with (expected) most common scenarios first
         switch ($conversion) {
@@ -164,20 +164,20 @@  discard block
 block discarded – undo
                 // NB: this will choke on invalid UTF-8, going most likely beyond EOF
                 $escapedData = '';
                 // be kind to users creating string xmlrpc values out of different php types
-                $data = (string)$data;
+                $data = (string) $data;
                 $ns = strlen($data);
-                for ($nn = 0; $nn < $ns; $nn++) {
+                for ($nn = 0; $nn<$ns; $nn++) {
                     $ch = $data[$nn];
                     $ii = ord($ch);
                     // 7 bits in 1 byte: 0bbbbbbb (127)
-                    if ($ii < 32) {
+                    if ($ii<32) {
                         if ($conversion == 'UTF-8_US-ASCII') {
                             $escapedData .= sprintf('&#%d;', $ii);
                         } else {
                             $escapedData .= $ch;
                         }
                     }
-                    else if ($ii < 128) {
+                    else if ($ii<128) {
                         /// @todo shall we replace this with a (supposedly) faster str_replace?
                         /// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
                         switch ($ii) {
@@ -202,25 +202,25 @@  discard block
 block discarded – undo
                     } // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047)
                     elseif ($ii >> 5 == 6) {
                         $b1 = ($ii & 31);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $ii = ($b1 * 64) + $b2;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $ii = ($b1 * 64)+$b2;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 1;
                     } // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 4 == 14) {
                         $b1 = ($ii & 15);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $b3 = (ord($data[$nn + 2]) & 63);
-                        $ii = ((($b1 * 64) + $b2) * 64) + $b3;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $b3 = (ord($data[$nn+2]) & 63);
+                        $ii = ((($b1 * 64)+$b2) * 64)+$b3;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 2;
                     } // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
                     elseif ($ii >> 3 == 30) {
                         $b1 = ($ii & 7);
-                        $b2 = (ord($data[$nn + 1]) & 63);
-                        $b3 = (ord($data[$nn + 2]) & 63);
-                        $b4 = (ord($data[$nn + 3]) & 63);
-                        $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
+                        $b2 = (ord($data[$nn+1]) & 63);
+                        $b3 = (ord($data[$nn+2]) & 63);
+                        $b4 = (ord($data[$nn+3]) & 63);
+                        $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4;
                         $escapedData .= sprintf('&#%d;', $ii);
                         $nn += 3;
                     }
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
 
             default:
                 $escapedData = '';
-                Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
+                Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported...");
         }
 
         return $escapedData;
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
             case 'iso88591':
                 return $this->xml_iso88591_Entities;
             default:
-                throw new \Exception('Unsupported charset: ' . $charset);
+                throw new \Exception('Unsupported charset: '.$charset);
         }
     }
 }

Please login to merge, or discard this patch.

debugger/action.php 1 patch

Spacing +113 added lines, -113 removed lines patch added patch discarded remove patch

@@ -92,13 +92,13 @@  discard block
 block discarded – undo
 <body>
 <?php
 
-include __DIR__ . '/common.php';
+include __DIR__.'/common.php';
 
 if ($action) {
 
     // make sure the script waits long enough for the call to complete...
     if ($timeout) {
-        set_time_limit($timeout + 10);
+        set_time_limit($timeout+10);
     }
 
     if ($wstype == 1) {
@@ -123,13 +123,13 @@  discard block
 block discarded – undo
         $server = "$host$path";
     }
     if ($protocol == 2 || $protocol == 3) {
-        $server = 'https://' . $server;
+        $server = 'https://'.$server;
     } else {
-        $server = 'http://' . $server;
+        $server = 'http://'.$server;
     }
     if ($proxy != '') {
         $pproxy = explode(':', $proxy);
-        if (count($pproxy) > 1) {
+        if (count($pproxy)>1) {
             $pport = $pproxy[1];
         } else {
             $pport = 8080;
@@ -204,9 +204,9 @@  discard block
 block discarded – undo
         case 'wrap':
             $msg[0] = new $requestClass('system.methodHelp', array(), $id);
             $msg[0]->addparam(new PhpXmlRpc\Value($method));
-            $msg[1] = new $requestClass('system.methodSignature', array(), (int)$id + 1);
+            $msg[1] = new $requestClass('system.methodSignature', array(), (int) $id+1);
             $msg[1]->addparam(new PhpXmlRpc\Value($method));
-            $actionname = 'Description of method "' . $method . '"';
+            $actionname = 'Description of method "'.$method.'"';
             break;
         case 'list':
             $msg[0] = new $requestClass('system.listMethods', array(), $id);
@@ -219,9 +219,9 @@  discard block
 block discarded – undo
             $msg[0] = new $requestClass($method, array(), $id);
             // hack! build xml payload by hand
             if ($wstype == 1) {
-                $msg[0]->payload = "{\n" .
-                    '"method": "' . $method . "\",\n\"params\": [" .
-                    $payload .
+                $msg[0]->payload = "{\n".
+                    '"method": "'.$method."\",\n\"params\": [".
+                    $payload.
                     "\n],\n\"id\": ";
                 // fix: if user gave an empty string, use NULL, or we'll break json syntax
                 if ($id == "") {
@@ -234,20 +234,20 @@  discard block
 block discarded – undo
                     }
                 }
             } else {
-                $msg[0]->payload = $msg[0]->xml_header($inputcharset) .
-                    '<methodName>' . $method . "</methodName>\n<params>" .
-                    $payload .
-                    "</params>\n" . $msg[0]->xml_footer();
+                $msg[0]->payload = $msg[0]->xml_header($inputcharset).
+                    '<methodName>'.$method."</methodName>\n<params>".
+                    $payload.
+                    "</params>\n".$msg[0]->xml_footer();
             }
-            $actionname = 'Execution of method ' . $method;
+            $actionname = 'Execution of method '.$method;
             break;
         default: // give a warning
-            $actionname = '[ERROR: unknown action] "' . $action . '"';
+            $actionname = '[ERROR: unknown action] "'.$action.'"';
     }
 
     // Before calling execute, echo out brief description of action taken + date and time ???
     // this gives good user feedback for long-running methods...
-    echo '<h2>' . htmlspecialchars($actionname, ENT_COMPAT, $inputcharset) . ' on server ' . htmlspecialchars($server, ENT_COMPAT, $inputcharset) . " ...</h2>\n";
+    echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset)." ...</h2>\n";
     flush();
 
     $response = null;
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
             break;
         }
     }
-    $time = microtime(true) - $time;
+    $time = microtime(true)-$time;
     if ($debug) {
         echo "</div>\n";
     }
@@ -275,8 +275,8 @@  discard block
 block discarded – undo
             // call failed! echo out error msg!
             //echo '<h2>'.htmlspecialchars($actionname, ENT_COMPAT, $inputcharset).' on server '.htmlspecialchars($server, ENT_COMPAT, $inputcharset).'</h2>';
             echo "<h3>$protoName call FAILED!</h3>\n";
-            echo "<p>Fault code: [" . htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
-                "] Reason: '" . htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "'</p>\n";
+            echo "<p>Fault code: [".htmlspecialchars($response->faultCode(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
+                "] Reason: '".htmlspecialchars($response->faultString(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."'</p>\n";
             echo(date("d/M/Y:H:i:s\n"));
         } else {
             // call succeeded: parse results
@@ -292,36 +292,36 @@  discard block
 block discarded – undo
                         $max = $v->count();
                         echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
                         echo "<thead>\n<tr><th>Method ($max)</th><th>Description</th></tr>\n</thead>\n<tbody>\n";
-                        foreach($v as $i => $rec) {
+                        foreach ($v as $i => $rec) {
                             if ($i % 2) {
                                 $class = ' class="oddrow"';
                             } else {
                                 $class = ' class="evenrow"';
                             }
-                            echo("<tr><td$class>" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">" .
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "\" />" .
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
-                                "<input type=\"hidden\" name=\"action\" value=\"describe\" />" .
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
+                            echo("<tr><td$class>".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."</td><td$class><form action=\"controller.php\" method=\"get\" target=\"frmcontroller\">".
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($rec->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."\" />".
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
+                                "<input type=\"hidden\" name=\"action\" value=\"describe\" />".
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
                                 "<input type=\"submit\" value=\"Describe\" /></form></td>");
                             //echo("</tr>\n");
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
                     $r2 = $resp[1]->value();
 
                     echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
-                    echo "<thead>\n<tr><th>Method</th><th>" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
+                    echo "<thead>\n<tr><th>Method</th><th>".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."</th><th>&nbsp;</th><th>&nbsp;</th></tr>\n</thead>\n<tbody>\n";
                     $desc = htmlspecialchars($r1->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
                     if ($desc == "") {
                         $desc = "-";
@@ -358,41 +358,41 @@  discard block
 block discarded – undo
                     if ($r2->kindOf() != "array") {
                         echo "<tr><td class=\"oddrow\">Signature</td><td class=\"oddrow\">Unknown</td><td class=\"oddrow\">&nbsp;</td></tr>\n";
                     } else {
-                        foreach($r2 as $i => $x) {
+                        foreach ($r2 as $i => $x) {
                             $payload = "";
                             $alt_payload = "";
-                            if ($i + 1 % 2) {
+                            if ($i+1 % 2) {
                                 $class = ' class="oddrow"';
                             } else {
                                 $class = ' class="evenrow"';
                             }
-                            echo "<tr><td$class>Signature&nbsp;" . ($i + 1) . "</td><td$class>";
+                            echo "<tr><td$class>Signature&nbsp;".($i+1)."</td><td$class>";
                             if ($x->kindOf() == "array") {
                                 $ret = $x[0];
-                                echo "<code>OUT:&nbsp;" . htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) . "<br />IN: (";
-                                if ($x->count() > 1) {
-                                    foreach($x as $k => $y) {
+                                echo "<code>OUT:&nbsp;".htmlspecialchars($ret->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding)."<br />IN: (";
+                                if ($x->count()>1) {
+                                    foreach ($x as $k => $y) {
                                         if ($k == 0) continue;
                                         echo htmlspecialchars($y->scalarval(), ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding);
                                         if ($wstype != 1) {
                                             $type = $y->scalarval();
                                             $payload .= '<param><value>';
-                                            switch($type) {
+                                            switch ($type) {
                                                 case 'undefined':
                                                     break;
                                                 case 'null';
                                                     $type = 'nil';
                                                     // fall thru intentionally
                                                 default:
-                                                    $payload .= '<' .
-                                                        htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
-                                                        '></' . htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding) .
+                                                    $payload .= '<'.
+                                                        htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
+                                                        '></'.htmlspecialchars($type, ENT_COMPAT, \PhpXmlRpc\PhpXmlRpc::$xmlrpc_internalencoding).
                                                         '>';
                                             }
                                             $payload .= "</value></param>\n";
                                         }
                                         $alt_payload .= $y->scalarval();
-                                        if ($k < $x->count() - 1) {
+                                        if ($k<$x->count()-1) {
                                             $alt_payload .= ';';
                                             echo ", ";
                                         }
@@ -405,63 +405,63 @@  discard block
 block discarded – undo
                             echo '</td>';
                             // button to test this method
                             //$payload="<methodCall>\n<methodName>$method</methodName>\n<params>\n$payload</params>\n</methodCall>";
-                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" .
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
+                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
                                 "<input type=\"hidden\" name=\"action\" value=\"execute\" />";
                             if ($wstype != 1) {
                                 echo "<input type=\"submit\" value=\"Load method synopsis\" />";
                             }
                             echo "</form></td>\n";
 
-                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">" .
-                                "<input type=\"hidden\" name=\"host\" value=\"" . htmlspecialchars($host, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"port\" value=\"" . htmlspecialchars($port, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"path\" value=\"" . htmlspecialchars($path, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"id\" value=\"" . htmlspecialchars($id, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />" .
-                                "<input type=\"hidden\" name=\"username\" value=\"" . htmlspecialchars($username, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"password\" value=\"" . htmlspecialchars($password, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />" .
-                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />" .
-                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />" .
-                                "<input type=\"hidden\" name=\"cainfo\" value=\"" . htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxy\" value=\"" . htmlspecialchars($proxy, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxyuser\" value=\"" . htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"proxypwd\" value=\"" . htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />" .
-                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />" .
-                                "<input type=\"hidden\" name=\"clientcookies\" value=\"" . htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />" .
-                                "<input type=\"hidden\" name=\"timeout\" value=\"" . htmlspecialchars($timeout, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"method\" value=\"" . htmlspecialchars($method, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"methodsig\" value=\"" . $i . "\" />" .
-                                "<input type=\"hidden\" name=\"methodpayload\" value=\"" . htmlspecialchars($payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"" . htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset) . "\" />" .
-                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />" .
-                                "<input type=\"hidden\" name=\"run\" value=\"now\" />" .
-                                "<input type=\"hidden\" name=\"action\" value=\"wrap\" />" .
+                            echo "<td$class><form action=\"controller.php\" target=\"frmcontroller\" method=\"get\">".
+                                "<input type=\"hidden\" name=\"host\" value=\"".htmlspecialchars($host, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"port\" value=\"".htmlspecialchars($port, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"path\" value=\"".htmlspecialchars($path, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"id\" value=\"".htmlspecialchars($id, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"debug\" value=\"$debug\" />".
+                                "<input type=\"hidden\" name=\"username\" value=\"".htmlspecialchars($username, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"password\" value=\"".htmlspecialchars($password, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"authtype\" value=\"$authtype\" />".
+                                "<input type=\"hidden\" name=\"verifyhost\" value=\"$verifyhost\" />".
+                                "<input type=\"hidden\" name=\"verifypeer\" value=\"$verifypeer\" />".
+                                "<input type=\"hidden\" name=\"cainfo\" value=\"".htmlspecialchars($cainfo, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxy\" value=\"".htmlspecialchars($proxy, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxyuser\" value=\"".htmlspecialchars($proxyuser, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"proxypwd\" value=\"".htmlspecialchars($proxypwd, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"responsecompression\" value=\"$responsecompression\" />".
+                                "<input type=\"hidden\" name=\"requestcompression\" value=\"$requestcompression\" />".
+                                "<input type=\"hidden\" name=\"clientcookies\" value=\"".htmlspecialchars($clientcookies, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"protocol\" value=\"$protocol\" />".
+                                "<input type=\"hidden\" name=\"timeout\" value=\"".htmlspecialchars($timeout, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"method\" value=\"".htmlspecialchars($method, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"methodsig\" value=\"".$i."\" />".
+                                "<input type=\"hidden\" name=\"methodpayload\" value=\"".htmlspecialchars($payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"altmethodpayload\" value=\"".htmlspecialchars($alt_payload, ENT_COMPAT, $inputcharset)."\" />".
+                                "<input type=\"hidden\" name=\"wstype\" value=\"$wstype\" />".
+                                "<input type=\"hidden\" name=\"run\" value=\"now\" />".
+                                "<input type=\"hidden\" name=\"action\" value=\"wrap\" />".
                                 "<input type=\"submit\" value=\"Generate method call stub code\" />";
                             echo "</form></td></tr>\n";
                         }
@@ -473,14 +473,14 @@  discard block
 block discarded – undo
                 case 'wrap':
                     $r1 = $resp[0]->value();
                     $r2 = $resp[1]->value();
-                    if ($r2->kindOf() != "array" || $r2->count() <= $methodsig) {
+                    if ($r2->kindOf() != "array" || $r2->count()<=$methodsig) {
                         echo "Error: signature unknown\n";
                     } else {
                         $mdesc = $r1->scalarval();
                         $encoder = new PhpXmlRpc\Encoder();
                         $msig = $encoder->decode($r2);
                         $msig = $msig[$methodsig];
-                        $proto = ($protocol == 1) ? 'http11' : ( $protocol == 2 ? 'https' : ( $protocol == 3 ? 'h2' : ( $protocol == 4 ? 'h2c' : '' ) ) );
+                        $proto = ($protocol == 1) ? 'http11' : ($protocol == 2 ? 'https' : ($protocol == 3 ? 'h2' : ($protocol == 4 ? 'h2c' : '')));
                         if ($proxy == '' && $username == '' && !$requestcompression && !$responsecompression &&
                             $clientcookies == ''
                         ) {
@@ -494,11 +494,11 @@  discard block
 block discarded – undo
                             $prefix = 'xmlrpc';
                         }
                         $wrapper = new PhpXmlRpc\Wrapper();
-                        $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix . '_' . $method), $msig, $mdesc);
+                        $code = $wrapper->buildWrapMethodSource($client, $method, array('timeout' => $timeout, 'protocol' => $proto, 'simple_client_copy' => $opts, 'prefix' => $prefix), str_replace('.', '_', $prefix.'_'.$method), $msig, $mdesc);
                         //if ($code)
                         //{
                         echo "<div id=\"phpcode\">\n";
-                        highlight_string("<?php\n" . $code['docstring'] . $code['source'] . '?>');
+                        highlight_string("<?php\n".$code['docstring'].$code['source'].'?>');
                         echo "\n</div>";
                         //}
                         //else
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
                     break;
 
                 case 'execute':
-                    echo '<div id="response"><h2>Response:</h2>' . htmlspecialchars($response->serialize()) . '</div>';
+                    echo '<div id="response"><h2>Response:</h2>'.htmlspecialchars($response->serialize()).'</div>';
                     break;
 
                 default: // give a warning

Please login to merge, or discard this patch.

		@@ -24,12 +24,12 @@ discard block
		block discarded – undo
24	24
25	25	// read chunk-size, chunk-extension (if any) and crlf
26	26	// get the position of the linebreak
27		- $chunkEnd = strpos($buffer, "\r\n") + 2;
	27	+ $chunkEnd = strpos($buffer, "\r\n")+2;
28	28	$temp = substr($buffer, 0, $chunkEnd);
29	29	$chunkSize = hexdec(trim($temp));
30	30	$chunkStart = $chunkEnd;
31		- while ($chunkSize > 0) {
32		- $chunkEnd = strpos($buffer, "\r\n", $chunkStart + $chunkSize);
	31	+ while ($chunkSize>0) {
	32	+ $chunkEnd = strpos($buffer, "\r\n", $chunkStart+$chunkSize);
33	33
34	34	// just in case we got a broken connection
35	35	if ($chunkEnd == false) {
		@@ -41,19 +41,19 @@ discard block
		block discarded – undo
41	41	}
42	42
43	43	// read chunk-data and crlf
44		- $chunk = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
	44	+ $chunk = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
45	45	// append chunk-data to entity-body
46	46	$new .= $chunk;
47	47	// length := length + chunk-size
48	48	$length += strlen($chunk);
49	49	// read chunk-size and crlf
50		- $chunkStart = $chunkEnd + 2;
	50	+ $chunkStart = $chunkEnd+2;
51	51
52		- $chunkEnd = strpos($buffer, "\r\n", $chunkStart) + 2;
	52	+ $chunkEnd = strpos($buffer, "\r\n", $chunkStart)+2;
53	53	if ($chunkEnd == false) {
54	54	break; //just in case we got a broken connection
55	55	}
56		- $temp = substr($buffer, $chunkStart, $chunkEnd - $chunkStart);
	56	+ $temp = substr($buffer, $chunkStart, $chunkEnd-$chunkStart);
57	57	$chunkSize = hexdec(trim($temp));
58	58	$chunkStart = $chunkEnd;
59	59	}
		@@ -84,11 +84,11 @@ discard block
		block discarded – undo
84	84	// (even though it is not valid http)
85	85	$pos = strpos($data, "\r\n\r\n");
86	86	if ($pos \|\| is_int($pos)) {
87		- $bd = $pos + 4;
	87	+ $bd = $pos+4;
88	88	} else {
89	89	$pos = strpos($data, "\n\n");
90	90	if ($pos \|\| is_int($pos)) {
91		- $bd = $pos + 2;
	91	+ $bd = $pos+2;
92	92	} else {
93	93	// No separation between response headers and body: fault?
94	94	$bd = 0;
		@@ -99,8 +99,8 @@ discard block
		block discarded – undo
99	99	// maybe we could take them into account, too?
100	100	$data = substr($data, $bd);
101	101	} else {
102		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTPS via proxy error, tunnel connection possibly failed');
103		- throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
	102	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTPS via proxy error, tunnel connection possibly failed');
	103	+ throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' (HTTPS via proxy error, tunnel connection possibly failed)', PhpXmlRpc::$xmlrpcerr['http_error']);
104	104	}
105	105	}
106	106
		@@ -131,20 +131,20 @@ discard block
		block discarded – undo
131	131	}
132	132
133	133	if ($httpResponse['status_code'] !== '200') {
134		- $errstr = substr($data, 0, strpos($data, "\n") - 1);
135		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': HTTP error, got response: ' . $errstr);
136		- throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'] . ' (' . $errstr . ')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
	134	+ $errstr = substr($data, 0, strpos($data, "\n")-1);
	135	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': HTTP error, got response: '.$errstr);
	136	+ throw new HttpException(PhpXmlRpc::$xmlrpcstr['http_error'].' ('.$errstr.')', PhpXmlRpc::$xmlrpcerr['http_error'], null, $httpResponse['status_code']);
137	137	}
138	138
139	139	// be tolerant to usage of \n instead of \r\n to separate headers and data
140	140	// (even though it is not valid http)
141	141	$pos = strpos($data, "\r\n\r\n");
142	142	if ($pos \|\| is_int($pos)) {
143		- $bd = $pos + 4;
	143	+ $bd = $pos+4;
144	144	} else {
145	145	$pos = strpos($data, "\n\n");
146	146	if ($pos \|\| is_int($pos)) {
147		- $bd = $pos + 2;
	147	+ $bd = $pos+2;
148	148	} else {
149	149	// No separation between response headers and body: fault?
150	150	// we could take some action here instead of going on...
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158	foreach ($ar as $line) {
159	159	// take care of multi-line headers and cookies
160	160	$arr = explode(':', $line, 2);
161		- if (count($arr) > 1) {
	161	+ if (count($arr)>1) {
162	162	$headerName = strtolower(trim($arr[0]));
163	163	/// @todo some other headers (the ones that allow a CSV list of values)
164	164	/// do allow many values to be passed using multiple header lines.
		@@ -177,7 +177,7 @@ discard block
		block discarded – undo
177	177	// glue together all received cookies, using a comma to separate them
178	178	// (same as php does with getallheaders())
179	179	if (isset($httpResponse['headers'][$headerName])) {
180		- $httpResponse['headers'][$headerName] .= ', ' . trim($cookie);
	180	+ $httpResponse['headers'][$headerName] .= ', '.trim($cookie);
181	181	} else {
182	182	$httpResponse['headers'][$headerName] = trim($cookie);
183	183	}
		@@ -206,7 +206,7 @@ discard block
		block discarded – undo
206	206	}
207	207	} elseif (isset($headerName)) {
208	208	/// @todo version1 cookies might span multiple lines, thus breaking the parsing above
209		- $httpResponse['headers'][$headerName] .= ' ' . trim($line);
	209	+ $httpResponse['headers'][$headerName] .= ' '.trim($line);
210	210	}
211	211	}
212	212
		@@ -230,7 +230,7 @@ discard block
		block discarded – undo
230	230	// Decode chunked encoding sent by http 1.1 servers
231	231	if (isset($httpResponse['headers']['transfer-encoding']) && $httpResponse['headers']['transfer-encoding'] == 'chunked') {
232	232	if (!$data = static::decodeChunked($data)) {
233		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to rebuild the chunked data received from server');
	233	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to rebuild the chunked data received from server');
234	234	throw new HttpException(PhpXmlRpc::$xmlrpcstr['dechunk_fail'], PhpXmlRpc::$xmlrpcerr['dechunk_fail'], null, $httpResponse['status_code']);
235	235	}
236	236	}
		@@ -245,19 +245,19 @@ discard block
		block discarded – undo
245	245	if ($httpResponse['headers']['content-encoding'] == 'deflate' && $degzdata = @gzuncompress($data)) {
246	246	$data = $degzdata;
247	247	if ($debug) {
248		- Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
	248	+ Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
249	249	}
250	250	} elseif ($httpResponse['headers']['content-encoding'] == 'gzip' && $degzdata = @gzinflate(substr($data, 10))) {
251	251	$data = $degzdata;
252	252	if ($debug) {
253		- Logger::instance()->debugMessage("---INFLATED RESPONSE---[" . strlen($data) . " chars]---\n$data\n---END---");
	253	+ Logger::instance()->debugMessage("---INFLATED RESPONSE---[".strlen($data)." chars]---\n$data\n---END---");
254	254	}
255	255	} else {
256		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': errors occurred when trying to decode the deflated data received from server');
	256	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': errors occurred when trying to decode the deflated data received from server');
257	257	throw new HttpException(PhpXmlRpc::$xmlrpcstr['decompress_fail'], PhpXmlRpc::$xmlrpcerr['decompress_fail'], null, $httpResponse['status_code']);
258	258	}
259	259	} else {
260		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
	260	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': the server sent deflated data. Your php install must have the Zlib extension compiled in to support this.');
261	261	throw new HttpException(PhpXmlRpc::$xmlrpcstr['cannot_decompress'], PhpXmlRpc::$xmlrpcerr['cannot_decompress'], null, $httpResponse['status_code']);
262	262	}
263	263	}

		@@ -154,10 +154,10 @@ discard block
		block discarded – undo
154	154	$this->accept = $accept;
155	155
156	156	// @see ticket #70 - we have to parse big xml docks in chunks to avoid errors
157		- for ($offset = 0; $offset < $len; $offset += $this->maxChunkLength) {
	157	+ for ($offset = 0; $offset<$len; $offset += $this->maxChunkLength) {
158	158	$chunk = substr($data, $offset, $this->maxChunkLength);
159	159	// error handling: xml not well formed
160		- if (!xml_parse($parser, $chunk, $offset + $this->maxChunkLength >= $len)) {
	160	+ if (!xml_parse($parser, $chunk, $offset+$this->maxChunkLength>=$len)) {
161	161	$errCode = xml_get_error_code($parser);
162	162	$errStr = sprintf('XML error %s: %s at line %d, column %d', $errCode, xml_error_string($errCode),
163	163	xml_get_current_line_number($parser), xml_get_current_column_number($parser));
		@@ -182,7 +182,7 @@ discard block
		block discarded – undo
182	182	public function xmlrpc_se($parser, $name, $attrs, $acceptSingleVals = false)
183	183	{
184	184	// if invalid xmlrpc already detected, skip all processing
185		- if ($this->_xh['isf'] < 2) {
	185	+ if ($this->_xh['isf']<2) {
186	186
187	187	// check for correct element nesting
188	188	if (count($this->_xh['stack']) == 0) {
		@@ -202,7 +202,7 @@ discard block
		block discarded – undo
202	202	$this->_xh['rt'] = strtolower($name);
203	203	} else {
204	204	$this->_xh['isf'] = 2;
205		- $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: ' . $name;
	205	+ $this->_xh['isf_reason'] = 'missing top level xmlrpc element. Found: '.$name;
206	206
207	207	return;
208	208	}
		@@ -296,7 +296,7 @@ discard block
		block discarded – undo
296	296	break;
297	297	case 'MEMBER':
298	298	// set member name to null, in case we do not find in the xml later on
299		- $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = '';
	299	+ $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = '';
300	300	//$this->_xh['ac']='';
301	301	// Drop trough intentionally
302	302	case 'PARAM':
		@@ -357,7 +357,7 @@ discard block
		block discarded – undo
357	357	*/
358	358	public function xmlrpc_ee($parser, $name, $rebuildXmlrpcvals = 1)
359	359	{
360		- if ($this->_xh['isf'] < 2) {
	360	+ if ($this->_xh['isf']<2) {
361	361	// push this element name from stack
362	362	// NB: if XML validates, correct opening/closing is guaranteed and
363	363	// we do not have to check for $name == $currElem.
		@@ -372,7 +372,7 @@ discard block
		block discarded – undo
372	372	$this->_xh['vt'] = Value::$xmlrpcString;
373	373	}
374	374
375		- if ($rebuildXmlrpcvals > 0) {
	375	+ if ($rebuildXmlrpcvals>0) {
376	376	// build the xmlrpc val out of the data received, and substitute it
377	377	$temp = new Value($this->_xh['value'], $this->_xh['vt']);
378	378	// in case we got info about underlying php class, save it
		@@ -381,15 +381,15 @@ discard block
		block discarded – undo
381	381	$temp->_php_class = $this->_xh['php_class'];
382	382	}
383	383	$this->_xh['value'] = $temp;
384		- } elseif ($rebuildXmlrpcvals < 0) {
	384	+ } elseif ($rebuildXmlrpcvals<0) {
385	385	if ($this->_xh['vt'] == Value::$xmlrpcDateTime) {
386		- $this->_xh['value'] = (object)array(
	386	+ $this->_xh['value'] = (object) array(
387	387	'xmlrpc_type' => 'datetime',
388	388	'scalar' => $this->_xh['value'],
389	389	'timestamp' => \PhpXmlRpc\Helper\Date::iso8601Decode($this->_xh['value'])
390	390	);
391	391	} elseif ($this->_xh['vt'] == Value::$xmlrpcBase64) {
392		- $this->_xh['value'] = (object)array(
	392	+ $this->_xh['value'] = (object) array(
393	393	'xmlrpc_type' => 'base64',
394	394	'scalar' => $this->_xh['value']
395	395	);
		@@ -405,8 +405,8 @@ discard block
		block discarded – undo
405	405	// check if we are inside an array or struct:
406	406	// if value just built is inside an array, let's move it into array on the stack
407	407	$vscount = count($this->_xh['valuestack']);
408		- if ($vscount && $this->_xh['valuestack'][$vscount - 1]['type'] == 'ARRAY') {
409		- $this->_xh['valuestack'][$vscount - 1]['values'][] = $this->_xh['value'];
	408	+ if ($vscount && $this->_xh['valuestack'][$vscount-1]['type'] == 'ARRAY') {
	409	+ $this->_xh['valuestack'][$vscount-1]['values'][] = $this->_xh['value'];
410	410	}
411	411	break;
412	412	case 'BOOLEAN':
		@@ -425,7 +425,7 @@ discard block
		block discarded – undo
425	425	$this->_xh['value'] = $this->_xh['ac'];
426	426	} elseif ($name == 'DATETIME.ISO8601') {
427	427	if (!preg_match('/^[0-9]{8}T[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $this->_xh['ac'])) {
428		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in DATETIME: ' . $this->_xh['ac']);
	428	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in DATETIME: '.$this->_xh['ac']);
429	429	}
430	430	$this->_xh['vt'] = Value::$xmlrpcDateTime;
431	431	$this->_xh['value'] = $this->_xh['ac'];
		@@ -444,7 +444,7 @@ discard block
		block discarded – undo
444	444	} else {
445	445	// log if receiving something strange, even though we set the value to false anyway
446	446	if ($this->_xh['ac'] != '0' && strcasecmp($this->_xh['ac'], 'false') != 0) {
447		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': invalid value received in BOOLEAN: ' . $this->_xh['ac']);
	447	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': invalid value received in BOOLEAN: '.$this->_xh['ac']);
448	448	}
449	449	$this->_xh['value'] = false;
450	450	}
		@@ -454,37 +454,37 @@ discard block
		block discarded – undo
454	454	// NOTE: regexp could be much stricter than this...
455	455	if (!preg_match('/^[+-eE0123456789 \t.]+$/', $this->_xh['ac'])) {
456	456	/// @todo: find a better way of throwing an error than this!
457		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in DOUBLE: ' . $this->_xh['ac']);
	457	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in DOUBLE: '.$this->_xh['ac']);
458	458	$this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
459	459	} else {
460	460	// it's ok, add it on
461		- $this->_xh['value'] = (double)$this->_xh['ac'];
	461	+ $this->_xh['value'] = (double) $this->_xh['ac'];
462	462	}
463	463	} else {
464	464	// we have an I4/I8/INT
465	465	// we must check that only 0123456789-<space> are characters here
466	466	if (!preg_match('/^[+-]?[0123456789 \t]+$/', $this->_xh['ac'])) {
467	467	/// @todo find a better way of throwing an error than this!
468		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': non numeric value received in INT: ' . $this->_xh['ac']);
	468	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': non numeric value received in INT: '.$this->_xh['ac']);
469	469	$this->_xh['value'] = 'ERROR_NON_NUMERIC_FOUND';
470	470	} else {
471	471	// it's ok, add it on
472		- $this->_xh['value'] = (int)$this->_xh['ac'];
	472	+ $this->_xh['value'] = (int) $this->_xh['ac'];
473	473	}
474	474	}
475	475	$this->_xh['lv'] = 3; // indicate we've found a value
476	476	break;
477	477	case 'NAME':
478		- $this->_xh['valuestack'][count($this->_xh['valuestack']) - 1]['name'] = $this->_xh['ac'];
	478	+ $this->_xh['valuestack'][count($this->_xh['valuestack'])-1]['name'] = $this->_xh['ac'];
479	479	break;
480	480	case 'MEMBER':
481	481	// add to array in the stack the last element built,
482	482	// unless no VALUE was found
483	483	if ($this->_xh['vt']) {
484	484	$vscount = count($this->_xh['valuestack']);
485		- $this->_xh['valuestack'][$vscount - 1]['values'][$this->_xh['valuestack'][$vscount - 1]['name']] = $this->_xh['value'];
	485	+ $this->_xh['valuestack'][$vscount-1]['values'][$this->_xh['valuestack'][$vscount-1]['name']] = $this->_xh['value'];
486	486	} else {
487		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside STRUCT in received xml');
	487	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside STRUCT in received xml');
488	488	}
489	489	break;
490	490	case 'DATA':
		@@ -507,7 +507,7 @@ discard block
		block discarded – undo
507	507	$this->_xh['params'][] = $this->_xh['value'];
508	508	$this->_xh['pt'][] = $this->_xh['vt'];
509	509	} else {
510		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ': missing VALUE inside PARAM in received xml');
	510	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.': missing VALUE inside PARAM in received xml');
511	511	}
512	512	break;
513	513	case 'METHODNAME':
		@@ -566,7 +566,7 @@ discard block
		block discarded – undo
566	566	public function xmlrpc_cd($parser, $data)
567	567	{
568	568	// skip processing if xml fault already detected
569		- if ($this->_xh['isf'] < 2) {
	569	+ if ($this->_xh['isf']<2) {
570	570	// "lookforvalue==3" means that we've found an entire value
571	571	// and should discard any further character data
572	572	if ($this->_xh['lv'] != 3) {
		@@ -585,7 +585,7 @@ discard block
		block discarded – undo
585	585	public function xmlrpc_dh($parser, $data)
586	586	{
587	587	// skip processing if xml fault already detected
588		- if ($this->_xh['isf'] < 2) {
	588	+ if ($this->_xh['isf']<2) {
589	589	if (substr($data, 0, 1) == '&' && substr($data, -1, 1) == ';') {
590	590	$this->_xh['ac'] .= $data;
591	591	}
		@@ -659,8 +659,8 @@ discard block
		block discarded – undo
659	659	// Details:
660	660	// SPACE: (#x20 \| #x9 \| #xD \| #xA)+ === [ \x9\xD\xA]+
661	661	// EQ: SPACE?=SPACE? === [ \x9\xD\xA]=[ \x9\xD\xA]
662		- if (preg_match('/^<\?xml\s+version\s=\s' . "((?:\"[a-zA-Z0-9_.:-]+\")\|(?:'[a-zA-Z0-9_.:-]+'))" .
663		- '\s+encoding\s=\s' . "((?:\"[A-Za-z][A-Za-z0-9._-]\")\|(?:'[A-Za-z][A-Za-z0-9._-]'))/",
	662	+ if (preg_match('/^<\?xml\s+version\s=\s'."((?:\"[a-zA-Z0-9_.:-]+\")\|(?:'[a-zA-Z0-9_.:-]+'))".
	663	+ '\s+encoding\s=\s'."((?:\"[A-Za-z][A-Za-z0-9._-]\")\|(?:'[A-Za-z][A-Za-z0-9._-]'))/",
664	664	$xmlChunk, $matches)) {
665	665	return strtoupper(substr($matches[2], 1, -1));
666	666	}
		@@ -678,7 +678,7 @@ discard block
		block discarded – undo
678	678	// NB: mb_detect likes to call it ascii, xml parser likes to call it US_ASCII...
679	679	// IANA also likes better US-ASCII, so go with it
680	680	if ($enc == 'ASCII') {
681		- $enc = 'US-' . $enc;
	681	+ $enc = 'US-'.$enc;
682	682	}
683	683
684	684	return $enc;
		@@ -713,8 +713,8 @@ discard block
		block discarded – undo
713	713	// Details:
714	714	// SPACE: (#x20 \| #x9 \| #xD \| #xA)+ === [ \x9\xD\xA]+
715	715	// EQ: SPACE?=SPACE? === [ \x9\xD\xA]=[ \x9\xD\xA]
716		- if (preg_match('/^<\?xml\s+version\s=\s' . "((?:\"[a-zA-Z0-9_.:-]+\")\|(?:'[a-zA-Z0-9_.:-]+'))" .
717		- '\s+encoding\s=\s' . "((?:\"[A-Za-z][A-Za-z0-9._-]\")\|(?:'[A-Za-z][A-Za-z0-9._-]'))/",
	716	+ if (preg_match('/^<\?xml\s+version\s=\s'."((?:\"[a-zA-Z0-9_.:-]+\")\|(?:'[a-zA-Z0-9_.:-]+'))".
	717	+ '\s+encoding\s=\s'."((?:\"[A-Za-z][A-Za-z0-9._-]\")\|(?:'[A-Za-z][A-Za-z0-9._-]'))/",
718	718	$xmlChunk, $matches)) {
719	719	return true;
720	720	}

		@@ -68,14 +68,14 @@ discard block
		block discarded – undo
68	68	if (count($this->xml_iso88591_Entities['in'])) {
69	69	return;
70	70	}
71		- for ($i = 0; $i < 32; $i++) {
	71	+ for ($i = 0; $i<32; $i++) {
72	72	$this->xml_iso88591_Entities["in"][] = chr($i);
73	73	$this->xml_iso88591_Entities["out"][] = "&#{$i};";
74	74	}
75	75
76	76	/// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
77	77
78		- for ($i = 160; $i < 256; $i++) {
	78	+ for ($i = 160; $i<256; $i++) {
79	79	$this->xml_iso88591_Entities["in"][] = chr($i);
80	80	$this->xml_iso88591_Entities["out"][] = "&#{$i};";
81	81	}
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	break;*/
104	104
105	105	default:
106		- throw new \Exception('Unsupported table: ' . $tableName);
	106	+ throw new \Exception('Unsupported table: '.$tableName);
107	107	}
108	108	}
109	109
		@@ -146,7 +146,7 @@ discard block
		block discarded – undo
146	146	$destEncoding = 'US-ASCII';
147	147	}
148	148
149		- $conversion = strtoupper($srcEncoding . '_' . $destEncoding);
	149	+ $conversion = strtoupper($srcEncoding.'_'.$destEncoding);
150	150
151	151	// list ordered with (expected) most common scenarios first
152	152	switch ($conversion) {
		@@ -164,20 +164,20 @@ discard block
		block discarded – undo
164	164	// NB: this will choke on invalid UTF-8, going most likely beyond EOF
165	165	$escapedData = '';
166	166	// be kind to users creating string xmlrpc values out of different php types
167		- $data = (string)$data;
	167	+ $data = (string) $data;
168	168	$ns = strlen($data);
169		- for ($nn = 0; $nn < $ns; $nn++) {
	169	+ for ($nn = 0; $nn<$ns; $nn++) {
170	170	$ch = $data[$nn];
171	171	$ii = ord($ch);
172	172	// 7 bits in 1 byte: 0bbbbbbb (127)
173		- if ($ii < 32) {
	173	+ if ($ii<32) {
174	174	if ($conversion == 'UTF-8_US-ASCII') {
175	175	$escapedData .= sprintf('&#%d;', $ii);
176	176	} else {
177	177	$escapedData .= $ch;
178	178	}
179	179	}
180		- else if ($ii < 128) {
	180	+ else if ($ii<128) {
181	181	/// @todo shall we replace this with a (supposedly) faster str_replace?
182	182	/// @todo to be 'print safe', should we encode as well character 127 (DEL) ?
183	183	switch ($ii) {
		@@ -202,25 +202,25 @@ discard block
		block discarded – undo
202	202	} // 11 bits in 2 bytes: 110bbbbb 10bbbbbb (2047)
203	203	elseif ($ii >> 5 == 6) {
204	204	$b1 = ($ii & 31);
205		- $b2 = (ord($data[$nn + 1]) & 63);
206		- $ii = ($b1 * 64) + $b2;
	205	+ $b2 = (ord($data[$nn+1]) & 63);
	206	+ $ii = ($b1 * 64)+$b2;
207	207	$escapedData .= sprintf('&#%d;', $ii);
208	208	$nn += 1;
209	209	} // 16 bits in 3 bytes: 1110bbbb 10bbbbbb 10bbbbbb
210	210	elseif ($ii >> 4 == 14) {
211	211	$b1 = ($ii & 15);
212		- $b2 = (ord($data[$nn + 1]) & 63);
213		- $b3 = (ord($data[$nn + 2]) & 63);
214		- $ii = ((($b1 * 64) + $b2) * 64) + $b3;
	212	+ $b2 = (ord($data[$nn+1]) & 63);
	213	+ $b3 = (ord($data[$nn+2]) & 63);
	214	+ $ii = ((($b1 * 64)+$b2) * 64)+$b3;
215	215	$escapedData .= sprintf('&#%d;', $ii);
216	216	$nn += 2;
217	217	} // 21 bits in 4 bytes: 11110bbb 10bbbbbb 10bbbbbb 10bbbbbb
218	218	elseif ($ii >> 3 == 30) {
219	219	$b1 = ($ii & 7);
220		- $b2 = (ord($data[$nn + 1]) & 63);
221		- $b3 = (ord($data[$nn + 2]) & 63);
222		- $b4 = (ord($data[$nn + 3]) & 63);
223		- $ii = ((((($b1 * 64) + $b2) * 64) + $b3) * 64) + $b4;
	220	+ $b2 = (ord($data[$nn+1]) & 63);
	221	+ $b3 = (ord($data[$nn+2]) & 63);
	222	+ $b4 = (ord($data[$nn+3]) & 63);
	223	+ $ii = ((((($b1 * 64)+$b2) * 64)+$b3) * 64)+$b4;
224	224	$escapedData .= sprintf('&#%d;', $ii);
225	225	$nn += 3;
226	226	}
		@@ -268,7 +268,7 @@ discard block
		block discarded – undo
268	268
269	269	default:
270	270	$escapedData = '';
271		- Logger::instance()->errorLog('XML-RPC: ' . __METHOD__ . ": Converting from $srcEncoding to $destEncoding: not supported...");
	271	+ Logger::instance()->errorLog('XML-RPC: '.__METHOD__.": Converting from $srcEncoding to $destEncoding: not supported...");
272	272	}
273	273
274	274	return $escapedData;
		@@ -322,7 +322,7 @@ discard block
		block discarded – undo
322	322	case 'iso88591':
323	323	return $this->xml_iso88591_Entities;
324	324	default:
325		- throw new \Exception('Unsupported charset: ' . $charset);
	325	+ throw new \Exception('Unsupported charset: '.$charset);
326	326	}
327	327	}
328	328	}

gggeek / phpxmlrpc

Push — master ( 80cfcb...3f3f21 )

Status

Category

Spacing +24 added lines, -24 removed lines patch added patch discarded remove patch

Spacing +29 added lines, -29 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

Spacing +113 added lines, -113 removed lines patch added patch discarded remove patch