Changeset 2622

Timestamp:

06/07/2005 07:39:39 AM (21 years ago)

Author:

matt

Message:

Updating IXR to latest, fixes #1400

File:

• trunk/wp-includes/class-IXR.php (modified) (15 diffs)

trunk/wp-includes/class-IXR.php

@@ -1 +1 @@
 <?php
-
 /* 
-   IXR - The Inutio XML-RPC Library - (c) Incutio Ltd 2002
-   Version 1.62WP - Simon Willison, 11th July 2003 (htmlentities -> htmlspecialchars)
-           ^^^^^^ (We've made some changes)
+   IXR - The Inutio XML-RPC Library - (c) Incutio Ltd 2002-2005
+   Version 1.7 (beta) - Simon Willison, 23rd May 2005
    Site:   http://scripts.incutio.com/xmlrpc/
    Manual: http://scripts.incutio.com/xmlrpc/manual.php
    Made available under the BSD License: http://www.opensource.org/licenses/bsd-license.php
 */
-
 
 class IXR_Value {
@@ -91 +88 @@
                 $return = '<struct>'."\n";
                 foreach ($this->data as $name => $value) {
+                    $name = htmlspecialchars($name);
                     $return .= "  <member><name>$name</name><value>";
                     $return .= $value->getXml()."</value></member>\n";
@@ -166 +164 @@
     }
     function tag_open($parser, $tag, $attr) {
+        $this->_currentTagContents = '';
         $this->currentTag = $tag;
         switch($tag) {
@@ -192 +191 @@
             case 'int':
             case 'i4':
-                $value = (int)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
+                $value = (int) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'double':
-                $value = (double)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
+                $value = (double) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'string':
-                $value = (string)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
+                $value = $this->_currentTagContents;
                 $valueFlag = true;
                 break;
@@ -209 +205 @@
                 $value = new IXR_Date(trim($this->_currentTagContents));
                 // $value = $iso->getTimestamp();
-                $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
@@ -216 +211 @@
                 if (trim($this->_currentTagContents) != '') {
                     $value = (string)$this->_currentTagContents;
-                    $this->_currentTagContents = '';
                     $valueFlag = true;
                 }
                 break;
             case 'boolean':
-                $value = (boolean)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
+                $value = (boolean) trim($this->_currentTagContents);
                 $valueFlag = true;
                 break;
             case 'base64':
-                $value = base64_decode( trim($this->_currentTagContents) );
-                $this->_currentTagContents = '';
+                $value = base64_decode( trim( $this->_currentTagContents ) );
                 $valueFlag = true;
                 break;
@@ -242 +234 @@
             case 'name':
                 $this->_currentStructName[] = trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
                 break;
             case 'methodName':
                 $this->methodName = trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
                 break;
         }
         if ($valueFlag) {
-            /*
-            if (!is_array($value) && !is_object($value)) {
-                $value = trim($value);
-            }
-            */
             if (count($this->_arraystructs) > 0) {
                 // Add value to struct or array
@@ -269 +254 @@
             }
         }
+        $this->_currentTagContents = '';
     }       
 }
@@ -470 +456 @@
     var $useragent;
     var $response;
-    var $timeout;
-    var $vendor = '';
     var $message = false;
     var $debug = false;
+    var $timeout;
     // Storage place for an error message
     var $error = false;
-    function IXR_Client($server, $path = false, $port = 80, $timeout = 30, $vendor = '') {
+    function IXR_Client($server, $path = false, $port = 80, $timeout = false) {
         if (!$path) {
             // Assume we have been given a URL instead
@@ -491 +476 @@
             $this->path = $path;
             $this->port = $port;
-            $this->timeout = $timeout;
-        }
-        $this->useragent = 'The Incutio XML-RPC PHP Library';
+        }
+        $this->useragent = 'Incutio XML-RPC';
+        $this->timeout = $timeout;
     }
     function query() {
@@ -512 +497 @@
             echo '<pre>'.htmlspecialchars($request)."\n</pre>\n\n";
         }
-        $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
+        if ($this->timeout) {
+            $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
+        } else {
+            $fp = @fsockopen($this->server, $this->port, $errno, $errstr);
+        }
         if (!$fp) {
-            $this->error = new IXR_Error(-32300, 'transport error - could not open socket');
+            $this->error = new IXR_Error(-32300, "transport error - could not open socket: $errno $errstr");
             return false;
         }
@@ -611 +600 @@
     var $minute;
     var $second;
-    var $timezone;
     function IXR_Date($time) {
         // $time can be a PHP timestamp or an ISO one
@@ -622 +610 @@
     function parseTimestamp($timestamp) {
         $this->year = date('Y', $timestamp);
-        $this->month = date('Y', $timestamp);
-        $this->day = date('Y', $timestamp);
+        $this->month = date('m', $timestamp);
+        $this->day = date('d', $timestamp);
         $this->hour = date('H', $timestamp);
         $this->minute = date('i', $timestamp);
@@ -638 +626 @@
     }
     function getIso() {
-        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
+        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second;
     }
     function getXml() {
@@ -714 +702 @@
         // Check the number of arguments
         if (count($args) != count($signature)) {
-            // print 'Num of args: '.count($args).' Num in signature: '.count($signature);
             return new IXR_Error(-32602, 'server error. wrong number of method parameters');
         }