mambax7 / planet

class/magpie.inc.php

Indentation +536 added lines, -536 removed lines

@@ -33,457 +33,457 @@ 
  */
 class MagpieRSS
 {
-    public $parser;
-
-    public $current_item = array();  // item currently being parsed
-    public $items        = array();  // collection of parsed items
-    public $channel      = array();  // hash of channel fields
-    public $textinput    = array();
-    public $image        = array();
-    public $feed_type;
-    public $feed_version;
-    public $encoding     = '';       // output encoding of parsed rss
-
-    public $_source_encoding = '';     // only set if we have to parse xml prolog
-
-    public $ERROR   = '';
-    public $WARNING = '';
-
-    // define some constants
-
-    public $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
-    public $_KNOWN_ENCODINGS    = array('UTF-8', 'US-ASCII', 'ISO-8859-1');
-
-    // parser variables, useless if you're not a parser, treat as private
-    public $stack             = array(); // parser stack
-    public $inchannel         = false;
-    public $initem            = false;
-    public $incontent         = false; // if in Atom <content mode="xml"> field
-    public $intextinput       = false;
-    public $inimage           = false;
-    public $current_field     = '';
-    public $current_namespace = false;
-
-    /**
-     *  Set up XML parser, parse source, and return populated RSS object..
-     *
-     * @param string $source          string containing the RSS to be parsed
-     *
-     *  NOTE:  Probably a good idea to leave the encoding options alone unless
-     *         you know what you're doing as PHP's character set support is
-     *         a little weird.
-     *
-     *  NOTE:  A lot of this is unnecessary but harmless with PHP5
-     *
-     *
-     * @param string $output_encoding output the parsed RSS in this character
-     *                                set defaults to ISO-8859-1 as this is PHP's
-     *                                default.
-     *
-     *                                  NOTE: might be changed to UTF-8 in future
-     *                                  versions.
-     *
-     * @param string $input_encoding  the character set of the incoming RSS source.
-     *                                Leave blank and Magpie will try to figure it
-     *                                out.
-     *
-     *
-     * @param bool   $detect_encoding if false Magpie won't attempt to detect
-     *                                source encoding. (caveat emptor)
-     *
-     */
-    public function __construct(
-        $source,
-        $output_encoding = 'ISO-8859-1',
-        $input_encoding = null,
-        $detect_encoding = true
-    ) {
-        # if PHP xml isn't compiled in, die
-        #
-        if (!function_exists('xml_parser_create')) {
-            $this->error("Failed to load PHP's XML Extension. " . 'http://www.php.net/manual/en/ref.xml.php',
-                         E_USER_ERROR);
-        }
-
-        list($parser, $source) = $this->create_parser($source, $output_encoding, $input_encoding, $detect_encoding);
-
-        if (!is_resource($parser)) {
-            $this->error("Failed to create an instance of PHP's XML parser. "
-                         . 'http://www.php.net/manual/en/ref.xml.php', E_USER_ERROR);
-        }
-
-        $this->parser = $parser;
-
-        # pass in parser, and a reference to this object
-        # setup handlers
-        #
-        xml_set_object($this->parser, $this);
-        xml_set_element_handler($this->parser, 'feed_start_element', 'feed_end_element');
-
-        xml_set_character_data_handler($this->parser, 'feed_cdata');
-
-        $status = @xml_parse($this->parser, $source);
-
-        if (!$status) {
-            $errorcode = xml_get_error_code($this->parser);
-            if ($errorcode != XML_ERROR_NONE) {
-                $xml_error  = xml_error_string($errorcode);
-                $error_line = xml_get_current_line_number($this->parser);
-                $error_col  = xml_get_current_column_number($this->parser);
-                $errormsg   = "$xml_error at line $error_line, column $error_col";
-
-                $this->error($errormsg);
-            }
-        }
-
-        xml_parser_free($this->parser);
-
-        $this->normalize();
-    }
-
-    /**
-     * @param $p
-     * @param $element
-     * @param $attrs
-     */
-    public function feed_start_element($p, $element, &$attrs) {
-        $el    = $element = strtolower($element);
-        $attrs = array_change_key_case($attrs, CASE_LOWER);
-
-        // check for a namespace, and split if found
-        $ns = false;
-        if (strpos($element, ':')) {
-            list($ns, $el) = explode(':', $element, 2);
-        }
-        if ($ns && $ns !== 'rdf') {
-            $this->current_namespace = $ns;
-        }
-
-        # if feed type isn't set, then this is first element of feed
-        # identify feed from root element
-        #
-        if (!isset($this->feed_type)) {
-            if ($el === 'rdf') {
-                $this->feed_type    = RSS;
-                $this->feed_version = '1.0';
-            } elseif ($el === 'rss') {
-                $this->feed_type    = RSS;
-                $this->feed_version = $attrs['version'];
-            } elseif ($el === 'feed') {
-                $this->feed_type    = ATOM;
-                $this->feed_version = $attrs['version'];
-                $this->inchannel    = true;
-            }
-
-            return;
-        }
-
-        if ($el === 'channel') {
-            $this->inchannel = true;
-        } elseif ($el === 'item' || $el === 'entry') {
-            $this->initem = true;
-            if (isset($attrs['rdf:about'])) {
-                $this->current_item['about'] = $attrs['rdf:about'];
-            }
-        }
-
-        // if we're in the default namespace of an RSS feed,
-        //  record textinput or image fields
-        elseif ($this->feed_type == RSS && $this->current_namespace === '' && $el === 'textinput') {
-            $this->intextinput = true;
-        } elseif ($this->feed_type == RSS && $this->current_namespace === '' && $el === 'image') {
-            $this->inimage = true;
-        } # handle atom content constructs
-        elseif ($this->feed_type == ATOM && in_array($el, $this->_CONTENT_CONSTRUCTS)) {
-            // avoid clashing w/ RSS mod_content
-            if ($el === 'content') {
-                $el = 'atom_content';
-            }
-
-            $this->incontent = $el;
-        } // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM && $this->incontent) {
-            // if tags are inlined, then flatten
-            $attrs_str = implode(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
-
-            $this->append_content("<$element $attrs_str>");
-
-            array_unshift($this->stack, $el);
-        }
-
-        // Atom support many links per containging element.
-        // Magpie treats link elements of type rel='alternate'
-        // as being equivalent to RSS's simple link element.
-        //
-        elseif ($this->feed_type == ATOM && $el === 'link') {
-            if (isset($attrs['rel']) && $attrs['rel'] === 'alternate') {
-                $link_el = 'link';
-            } else {
-                $link_el = 'link_' . $attrs['rel'];
-            }
-
-            $this->append($link_el, $attrs['href']);
-        } // set stack[0] to current element
-        else {
-            array_unshift($this->stack, $el);
-        }
-    }
-
-    /**
-     * @param $p
-     * @param $text
-     */
-    public function feed_cdata($p, $text) {
-        if ($this->feed_type == ATOM && $this->incontent) {
-            $this->append_content($text);
-        } else {
-            $current_el = implode('_', array_reverse($this->stack));
-            $this->append($current_el, $text);
-        }
-    }
-
-    /**
-     * @param $p
-     * @param $el
-     */
-    public function feed_end_element($p, $el) {
-        $el = strtolower($el);
-
-        if ($el === 'item' || $el === 'entry') {
-            $this->items[]      = $this->current_item;
-            $this->current_item = array();
-            $this->initem       = false;
-        } elseif ($this->feed_type == RSS && $this->current_namespace === '' && $el === 'textinput') {
-            $this->intextinput = false;
-        } elseif ($this->feed_type == RSS && $this->current_namespace === '' && $el === 'image') {
-            $this->inimage = false;
-        } elseif ($this->feed_type == ATOM && in_array($el, $this->_CONTENT_CONSTRUCTS)) {
-            $this->incontent = false;
-        } elseif ($el === 'channel' || $el === 'feed') {
-            $this->inchannel = false;
-        } elseif ($this->feed_type == ATOM && $this->incontent) {
-            // balance tags properly
-            // note:  i don't think this is actually neccessary
-            if ($this->stack[0] == $el) {
-                $this->append_content("</$el>");
-            } else {
-                $this->append_content("<$el />");
-            }
-
-            array_shift($this->stack);
-        } else {
-            array_shift($this->stack);
-        }
-
-        $this->current_namespace = false;
-    }
-
-    /**
-     * @param        $str1
-     * @param string $str2
-     */
-    public function concat(&$str1, $str2 = '') {
-        if (!isset($str1)) {
-            $str1 = '';
-        }
-        $str1 .= $str2;
-    }
-
-    /**
-     * @param $text
-     */
-    public function append_content($text) {
-        if ($this->initem) {
-            $this->concat($this->current_item[$this->incontent], $text);
-        } elseif ($this->inchannel) {
-            $this->concat($this->channel[$this->incontent], $text);
-        }
-    }
-
-    // smart append - field and namespace aware
-    /**
-     * @param $el
-     * @param $text
-     */
-    public function append($el, $text) {
-        if (!$el) {
-            return;
-        }
-        if ($this->current_namespace) {
-            if ($this->initem) {
-                $this->concat($this->current_item[$this->current_namespace][$el], $text);
-            } elseif ($this->inchannel) {
-                $this->concat($this->channel[$this->current_namespace][$el], $text);
-            } elseif ($this->intextinput) {
-                $this->concat($this->textinput[$this->current_namespace][$el], $text);
-            } elseif ($this->inimage) {
-                $this->concat($this->image[$this->current_namespace][$el], $text);
-            }
-        } else {
-            if ($this->initem) {
-                $this->concat($this->current_item[$el], $text);
-            } elseif ($this->intextinput) {
-                $this->concat($this->textinput[$el], $text);
-            } elseif ($this->inimage) {
-                $this->concat($this->image[$el], $text);
-            } elseif ($this->inchannel) {
-                $this->concat($this->channel[$el], $text);
-            }
-        }
-    }
-
-    public function normalize() {
-        // if atom populate rss fields
-        if ($this->is_atom()) {
-            $this->channel['description'] = $this->channel['tagline'];
-            for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-                $item = $this->items[$i];
-                if (isset($item['summary'])) {
-                    $item['description'] = $item['summary'];
-                }
-                if (isset($item['atom_content'])) {
-                    $item['content']['encoded'] = $item['atom_content'];
-                }
-
-                $atom_date = isset($item['issued']) ? $item['issued'] : @$item['modified'];
-                if ($atom_date) {
-                    $epoch = @parse_w3cdtf($atom_date);
-                    if ($epoch && $epoch > 0) {
-                        $item['date_timestamp'] = $epoch;
-                    }
-                }
-
-                $this->items[$i] = $item;
-            }
-        } elseif ($this->is_rss()) {
-            $this->channel['tagline'] = $this->channel['description'];
-            for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-                $item = $this->items[$i];
-                if (isset($item['description'])) {
-                    $item['summary'] = $item['description'];
-                }
-                if (isset($item['content']['encoded'])) {
-                    $item['atom_content'] = $item['content']['encoded'];
-                }
-
-                if ($this->is_rss() === '1.0' && isset($item['dc']['date'])) {
-                    $epoch = @parse_w3cdtf($item['dc']['date']);
-                    if ($epoch && $epoch > 0) {
-                        $item['date_timestamp'] = $epoch;
-                    }
-                } elseif (isset($item['pubdate'])) {
-                    $epoch = @strtotime($item['pubdate']);
-                    if ($epoch > 0) {
-                        $item['date_timestamp'] = $epoch;
-                    }
-                }
-
-                $this->items[$i] = $item;
-            }
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function is_rss() {
-        if ($this->feed_type == RSS) {
-            return $this->feed_version;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function is_atom() {
-        if ($this->feed_type == ATOM) {
-            return $this->feed_version;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * return XML parser, and possibly re-encoded source
-     * @param $source
-     * @param $out_enc
-     * @param $in_enc
-     * @param $detect
-     * @return array
-     */
-    public function create_parser($source, $out_enc, $in_enc, $detect) {
-        if (substr(phpversion(), 0, 1) == 5) {
-            $parser = $this->php5_create_parser($in_enc, $detect);
-        } else {
-            list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect);
-        }
-        if ($out_enc) {
-            $this->encoding = $out_enc;
-            xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $out_enc);
-        }
-
-        return array($parser, $source);
-    }
-
-    /**
-     * Instantiate an XML parser under PHP5
-     *
-     * PHP5 will do a fine job of detecting input encoding
-     * if passed an empty string as the encoding.
-     *
-     * All hail libxml2!
-     * @param $in_enc
-     * @param $detect
-     * @return resource
-     */
-    public function php5_create_parser($in_enc, $detect) {
-        // by default php5 does a fine job of detecting input encodings
-        if (!$detect && $in_enc) {
-            return xml_parser_create($in_enc);
-        } else {
-            return xml_parser_create('');
-        }
-    }
-
-    /**
-     * Instaniate an XML parser under PHP4
-     *
-     * Unfortunately PHP4's support for character encodings
-     * and especially XML and character encodings sucks.  As
-     * long as the documents you parse only contain characters
-     * from the ISO-8859-1 character set (a superset of ASCII,
-     * and a subset of UTF-8) you're fine.  However once you
-     * step out of that comfy little world things get mad, bad,
-     * and dangerous to know.
-     *
-     * The following code is based on SJM's work with FoF
-     * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
-     * @param $source
-     * @param $in_enc
-     * @param $detect
-     * @return array
-     */
-    public function php4_create_parser($source, $in_enc, $detect) {
-        if (!$detect) {
-            return array(xml_parser_create($in_enc), $source);
-        }
-
-        if (!$in_enc) {
-            if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
-                $in_enc                = strtoupper($m[1]);
-                $this->source_encoding = $in_enc;
-            } else {
-                $in_enc = 'UTF-8';
-            }
-        }
-
-        if ($this->known_encoding($in_enc)) {
-            return array(xml_parser_create($in_enc), $source);
-        }
-
-        /*
+	public $parser;
+
+	public $current_item = array();  // item currently being parsed
+	public $items        = array();  // collection of parsed items
+	public $channel      = array();  // hash of channel fields
+	public $textinput    = array();
+	public $image        = array();
+	public $feed_type;
+	public $feed_version;
+	public $encoding     = '';       // output encoding of parsed rss
+
+	public $_source_encoding = '';     // only set if we have to parse xml prolog
+
+	public $ERROR   = '';
+	public $WARNING = '';
+
+	// define some constants
+
+	public $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
+	public $_KNOWN_ENCODINGS    = array('UTF-8', 'US-ASCII', 'ISO-8859-1');
+
+	// parser variables, useless if you're not a parser, treat as private
+	public $stack             = array(); // parser stack
+	public $inchannel         = false;
+	public $initem            = false;
+	public $incontent         = false; // if in Atom <content mode="xml"> field
+	public $intextinput       = false;
+	public $inimage           = false;
+	public $current_field     = '';
+	public $current_namespace = false;
+
+	/**
+	 *  Set up XML parser, parse source, and return populated RSS object..
+	 *
+	 * @param string $source          string containing the RSS to be parsed
+	 *
+	 *  NOTE:  Probably a good idea to leave the encoding options alone unless
+	 *         you know what you're doing as PHP's character set support is
+	 *         a little weird.
+	 *
+	 *  NOTE:  A lot of this is unnecessary but harmless with PHP5
+	 *
+	 *
+	 * @param string $output_encoding output the parsed RSS in this character
+	 *                                set defaults to ISO-8859-1 as this is PHP's
+	 *                                default.
+	 *
+	 *                                  NOTE: might be changed to UTF-8 in future
+	 *                                  versions.
+	 *
+	 * @param string $input_encoding  the character set of the incoming RSS source.
+	 *                                Leave blank and Magpie will try to figure it
+	 *                                out.
+	 *
+	 *
+	 * @param bool   $detect_encoding if false Magpie won't attempt to detect
+	 *                                source encoding. (caveat emptor)
+	 *
+	 */
+	public function __construct(
+		$source,
+		$output_encoding = 'ISO-8859-1',
+		$input_encoding = null,
+		$detect_encoding = true
+	) {
+		# if PHP xml isn't compiled in, die
+		#
+		if (!function_exists('xml_parser_create')) {
+			$this->error("Failed to load PHP's XML Extension. " . 'http://www.php.net/manual/en/ref.xml.php',
+						 E_USER_ERROR);
+		}
+
+		list($parser, $source) = $this->create_parser($source, $output_encoding, $input_encoding, $detect_encoding);
+
+		if (!is_resource($parser)) {
+			$this->error("Failed to create an instance of PHP's XML parser. "
+						 . 'http://www.php.net/manual/en/ref.xml.php', E_USER_ERROR);
+		}
+
+		$this->parser = $parser;
+
+		# pass in parser, and a reference to this object
+		# setup handlers
+		#
+		xml_set_object($this->parser, $this);
+		xml_set_element_handler($this->parser, 'feed_start_element', 'feed_end_element');
+
+		xml_set_character_data_handler($this->parser, 'feed_cdata');
+
+		$status = @xml_parse($this->parser, $source);
+
+		if (!$status) {
+			$errorcode = xml_get_error_code($this->parser);
+			if ($errorcode != XML_ERROR_NONE) {
+				$xml_error  = xml_error_string($errorcode);
+				$error_line = xml_get_current_line_number($this->parser);
+				$error_col  = xml_get_current_column_number($this->parser);
+				$errormsg   = "$xml_error at line $error_line, column $error_col";
+
+				$this->error($errormsg);
+			}
+		}
+
+		xml_parser_free($this->parser);
+
+		$this->normalize();
+	}
+
+	/**
+	 * @param $p
+	 * @param $element
+	 * @param $attrs
+	 */
+	public function feed_start_element($p, $element, &$attrs) {
+		$el    = $element = strtolower($element);
+		$attrs = array_change_key_case($attrs, CASE_LOWER);
+
+		// check for a namespace, and split if found
+		$ns = false;
+		if (strpos($element, ':')) {
+			list($ns, $el) = explode(':', $element, 2);
+		}
+		if ($ns && $ns !== 'rdf') {
+			$this->current_namespace = $ns;
+		}
+
+		# if feed type isn't set, then this is first element of feed
+		# identify feed from root element
+		#
+		if (!isset($this->feed_type)) {
+			if ($el === 'rdf') {
+				$this->feed_type    = RSS;
+				$this->feed_version = '1.0';
+			} elseif ($el === 'rss') {
+				$this->feed_type    = RSS;
+				$this->feed_version = $attrs['version'];
+			} elseif ($el === 'feed') {
+				$this->feed_type    = ATOM;
+				$this->feed_version = $attrs['version'];
+				$this->inchannel    = true;
+			}
+
+			return;
+		}
+
+		if ($el === 'channel') {
+			$this->inchannel = true;
+		} elseif ($el === 'item' || $el === 'entry') {
+			$this->initem = true;
+			if (isset($attrs['rdf:about'])) {
+				$this->current_item['about'] = $attrs['rdf:about'];
+			}
+		}
+
+		// if we're in the default namespace of an RSS feed,
+		//  record textinput or image fields
+		elseif ($this->feed_type == RSS && $this->current_namespace === '' && $el === 'textinput') {
+			$this->intextinput = true;
+		} elseif ($this->feed_type == RSS && $this->current_namespace === '' && $el === 'image') {
+			$this->inimage = true;
+		} # handle atom content constructs
+		elseif ($this->feed_type == ATOM && in_array($el, $this->_CONTENT_CONSTRUCTS)) {
+			// avoid clashing w/ RSS mod_content
+			if ($el === 'content') {
+				$el = 'atom_content';
+			}
+
+			$this->incontent = $el;
+		} // if inside an Atom content construct (e.g. content or summary) field treat tags as text
+		elseif ($this->feed_type == ATOM && $this->incontent) {
+			// if tags are inlined, then flatten
+			$attrs_str = implode(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
+
+			$this->append_content("<$element $attrs_str>");
+
+			array_unshift($this->stack, $el);
+		}
+
+		// Atom support many links per containging element.
+		// Magpie treats link elements of type rel='alternate'
+		// as being equivalent to RSS's simple link element.
+		//
+		elseif ($this->feed_type == ATOM && $el === 'link') {
+			if (isset($attrs['rel']) && $attrs['rel'] === 'alternate') {
+				$link_el = 'link';
+			} else {
+				$link_el = 'link_' . $attrs['rel'];
+			}
+
+			$this->append($link_el, $attrs['href']);
+		} // set stack[0] to current element
+		else {
+			array_unshift($this->stack, $el);
+		}
+	}
+
+	/**
+	 * @param $p
+	 * @param $text
+	 */
+	public function feed_cdata($p, $text) {
+		if ($this->feed_type == ATOM && $this->incontent) {
+			$this->append_content($text);
+		} else {
+			$current_el = implode('_', array_reverse($this->stack));
+			$this->append($current_el, $text);
+		}
+	}
+
+	/**
+	 * @param $p
+	 * @param $el
+	 */
+	public function feed_end_element($p, $el) {
+		$el = strtolower($el);
+
+		if ($el === 'item' || $el === 'entry') {
+			$this->items[]      = $this->current_item;
+			$this->current_item = array();
+			$this->initem       = false;
+		} elseif ($this->feed_type == RSS && $this->current_namespace === '' && $el === 'textinput') {
+			$this->intextinput = false;
+		} elseif ($this->feed_type == RSS && $this->current_namespace === '' && $el === 'image') {
+			$this->inimage = false;
+		} elseif ($this->feed_type == ATOM && in_array($el, $this->_CONTENT_CONSTRUCTS)) {
+			$this->incontent = false;
+		} elseif ($el === 'channel' || $el === 'feed') {
+			$this->inchannel = false;
+		} elseif ($this->feed_type == ATOM && $this->incontent) {
+			// balance tags properly
+			// note:  i don't think this is actually neccessary
+			if ($this->stack[0] == $el) {
+				$this->append_content("</$el>");
+			} else {
+				$this->append_content("<$el />");
+			}
+
+			array_shift($this->stack);
+		} else {
+			array_shift($this->stack);
+		}
+
+		$this->current_namespace = false;
+	}
+
+	/**
+	 * @param        $str1
+	 * @param string $str2
+	 */
+	public function concat(&$str1, $str2 = '') {
+		if (!isset($str1)) {
+			$str1 = '';
+		}
+		$str1 .= $str2;
+	}
+
+	/**
+	 * @param $text
+	 */
+	public function append_content($text) {
+		if ($this->initem) {
+			$this->concat($this->current_item[$this->incontent], $text);
+		} elseif ($this->inchannel) {
+			$this->concat($this->channel[$this->incontent], $text);
+		}
+	}
+
+	// smart append - field and namespace aware
+	/**
+	 * @param $el
+	 * @param $text
+	 */
+	public function append($el, $text) {
+		if (!$el) {
+			return;
+		}
+		if ($this->current_namespace) {
+			if ($this->initem) {
+				$this->concat($this->current_item[$this->current_namespace][$el], $text);
+			} elseif ($this->inchannel) {
+				$this->concat($this->channel[$this->current_namespace][$el], $text);
+			} elseif ($this->intextinput) {
+				$this->concat($this->textinput[$this->current_namespace][$el], $text);
+			} elseif ($this->inimage) {
+				$this->concat($this->image[$this->current_namespace][$el], $text);
+			}
+		} else {
+			if ($this->initem) {
+				$this->concat($this->current_item[$el], $text);
+			} elseif ($this->intextinput) {
+				$this->concat($this->textinput[$el], $text);
+			} elseif ($this->inimage) {
+				$this->concat($this->image[$el], $text);
+			} elseif ($this->inchannel) {
+				$this->concat($this->channel[$el], $text);
+			}
+		}
+	}
+
+	public function normalize() {
+		// if atom populate rss fields
+		if ($this->is_atom()) {
+			$this->channel['description'] = $this->channel['tagline'];
+			for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+				$item = $this->items[$i];
+				if (isset($item['summary'])) {
+					$item['description'] = $item['summary'];
+				}
+				if (isset($item['atom_content'])) {
+					$item['content']['encoded'] = $item['atom_content'];
+				}
+
+				$atom_date = isset($item['issued']) ? $item['issued'] : @$item['modified'];
+				if ($atom_date) {
+					$epoch = @parse_w3cdtf($atom_date);
+					if ($epoch && $epoch > 0) {
+						$item['date_timestamp'] = $epoch;
+					}
+				}
+
+				$this->items[$i] = $item;
+			}
+		} elseif ($this->is_rss()) {
+			$this->channel['tagline'] = $this->channel['description'];
+			for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+				$item = $this->items[$i];
+				if (isset($item['description'])) {
+					$item['summary'] = $item['description'];
+				}
+				if (isset($item['content']['encoded'])) {
+					$item['atom_content'] = $item['content']['encoded'];
+				}
+
+				if ($this->is_rss() === '1.0' && isset($item['dc']['date'])) {
+					$epoch = @parse_w3cdtf($item['dc']['date']);
+					if ($epoch && $epoch > 0) {
+						$item['date_timestamp'] = $epoch;
+					}
+				} elseif (isset($item['pubdate'])) {
+					$epoch = @strtotime($item['pubdate']);
+					if ($epoch > 0) {
+						$item['date_timestamp'] = $epoch;
+					}
+				}
+
+				$this->items[$i] = $item;
+			}
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function is_rss() {
+		if ($this->feed_type == RSS) {
+			return $this->feed_version;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function is_atom() {
+		if ($this->feed_type == ATOM) {
+			return $this->feed_version;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * return XML parser, and possibly re-encoded source
+	 * @param $source
+	 * @param $out_enc
+	 * @param $in_enc
+	 * @param $detect
+	 * @return array
+	 */
+	public function create_parser($source, $out_enc, $in_enc, $detect) {
+		if (substr(phpversion(), 0, 1) == 5) {
+			$parser = $this->php5_create_parser($in_enc, $detect);
+		} else {
+			list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect);
+		}
+		if ($out_enc) {
+			$this->encoding = $out_enc;
+			xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $out_enc);
+		}
+
+		return array($parser, $source);
+	}
+
+	/**
+	 * Instantiate an XML parser under PHP5
+	 *
+	 * PHP5 will do a fine job of detecting input encoding
+	 * if passed an empty string as the encoding.
+	 *
+	 * All hail libxml2!
+	 * @param $in_enc
+	 * @param $detect
+	 * @return resource
+	 */
+	public function php5_create_parser($in_enc, $detect) {
+		// by default php5 does a fine job of detecting input encodings
+		if (!$detect && $in_enc) {
+			return xml_parser_create($in_enc);
+		} else {
+			return xml_parser_create('');
+		}
+	}
+
+	/**
+	 * Instaniate an XML parser under PHP4
+	 *
+	 * Unfortunately PHP4's support for character encodings
+	 * and especially XML and character encodings sucks.  As
+	 * long as the documents you parse only contain characters
+	 * from the ISO-8859-1 character set (a superset of ASCII,
+	 * and a subset of UTF-8) you're fine.  However once you
+	 * step out of that comfy little world things get mad, bad,
+	 * and dangerous to know.
+	 *
+	 * The following code is based on SJM's work with FoF
+	 * @see http://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
+	 * @param $source
+	 * @param $in_enc
+	 * @param $detect
+	 * @return array
+	 */
+	public function php4_create_parser($source, $in_enc, $detect) {
+		if (!$detect) {
+			return array(xml_parser_create($in_enc), $source);
+		}
+
+		if (!$in_enc) {
+			if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
+				$in_enc                = strtoupper($m[1]);
+				$this->source_encoding = $in_enc;
+			} else {
+				$in_enc = 'UTF-8';
+			}
+		}
+
+		if ($this->known_encoding($in_enc)) {
+			return array(xml_parser_create($in_enc), $source);
+		}
+
+		/*
         // the dectected encoding is not one of the simple encodings PHP knows
 
         // attempt to use the iconv extension to
@@ -512,44 +512,44 @@ 
                      E_USER_NOTICE);
         */
 
-        return array(xml_parser_create(), $source);
-    }
-
-    /**
-     * @param $enc
-     * @return bool|string
-     */
-    public function known_encoding($enc) {
-        $enc = strtoupper($enc);
-        if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
-            return $enc;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * @param     $errormsg
-     * @param int $lvl
-     */
-    public function error($errormsg, $lvl = E_USER_WARNING) {
-        // append PHP's error message if track_errors enabled
-        if (!empty($php_errormsg)) {
-            $errormsg .= " ($php_errormsg)";
-        }
-        if (MAGPIE_DEBUG) {
-            trigger_error($errormsg, $lvl);
-        } else {
-            error_log($errormsg, 0);
-        }
-
-        $notices = E_USER_NOTICE | E_NOTICE;
-        if ($lvl & $notices) {
-            $this->WARNING = $errormsg;
-        } else {
-            $this->ERROR = $errormsg;
-        }
-    }
+		return array(xml_parser_create(), $source);
+	}
+
+	/**
+	 * @param $enc
+	 * @return bool|string
+	 */
+	public function known_encoding($enc) {
+		$enc = strtoupper($enc);
+		if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
+			return $enc;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * @param     $errormsg
+	 * @param int $lvl
+	 */
+	public function error($errormsg, $lvl = E_USER_WARNING) {
+		// append PHP's error message if track_errors enabled
+		if (!empty($php_errormsg)) {
+			$errormsg .= " ($php_errormsg)";
+		}
+		if (MAGPIE_DEBUG) {
+			trigger_error($errormsg, $lvl);
+		} else {
+			error_log($errormsg, 0);
+		}
+
+		$notices = E_USER_NOTICE | E_NOTICE;
+		if ($lvl & $notices) {
+			$this->WARNING = $errormsg;
+		} else {
+			$this->ERROR = $errormsg;
+		}
+	}
 } // end class RSS
 
 /**
@@ -558,7 +558,7 @@ 
  * @return string
  */
 function map_attrs($k, $v) {
-    return "$k=\"$v\"";
+	return "$k=\"$v\"";
 }
 
 /**
@@ -566,50 +566,50 @@ 
  * @return int
  */
 function parse_w3cdtf($date_str) {
-    # regex to match wc3dtf
-    $pat = "/(\d{4})-(\d{2})-(\d{2})[T]?(\d{2})?[:]?(\d{2})?(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
-
-    if (preg_match($pat, $date_str, $match)) {
-        list($year, $month, $day, $hours, $minutes, $seconds) = array(
-            $match[1],
-            $match[2],
-            $match[3],
-            $match[4],
-            $match[5],
-            $match[6]
-        );
-
-        # calc epoch for current date assuming GMT
-        $epoch = gmmktime((int)$hours, (int)$minutes, (int)$seconds, (int)$month, (int)$day, (int)$year);
-
-        $offset = 0;
-        if ($match[10] === 'Z') {
-            # zulu time, aka GMT
-        } else {
-            list($tz_mod, $tz_hour, $tz_min) = array($match[8], $match[9], $match[10]);
-
-            # zero out the variables
-            if (!$tz_hour) {
-                $tz_hour = 0;
-            }
-            if (!$tz_min) {
-                $tz_min = 0;
-            }
-
-            $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
-
-            # is timezone ahead of GMT?  then subtract offset
-            #
-            if ($tz_mod == '+') {
-                $offset_secs = $offset_secs * -1;
-            }
-
-            $offset = $offset_secs;
-        }
-        $epoch = $epoch + $offset;
-
-        return $epoch;
-    } else {
-        return -1;
-    }
+	# regex to match wc3dtf
+	$pat = "/(\d{4})-(\d{2})-(\d{2})[T]?(\d{2})?[:]?(\d{2})?(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
+
+	if (preg_match($pat, $date_str, $match)) {
+		list($year, $month, $day, $hours, $minutes, $seconds) = array(
+			$match[1],
+			$match[2],
+			$match[3],
+			$match[4],
+			$match[5],
+			$match[6]
+		);
+
+		# calc epoch for current date assuming GMT
+		$epoch = gmmktime((int)$hours, (int)$minutes, (int)$seconds, (int)$month, (int)$day, (int)$year);
+
+		$offset = 0;
+		if ($match[10] === 'Z') {
+			# zulu time, aka GMT
+		} else {
+			list($tz_mod, $tz_hour, $tz_min) = array($match[8], $match[9], $match[10]);
+
+			# zero out the variables
+			if (!$tz_hour) {
+				$tz_hour = 0;
+			}
+			if (!$tz_min) {
+				$tz_min = 0;
+			}
+
+			$offset_secs = (($tz_hour * 60) + $tz_min) * 60;
+
+			# is timezone ahead of GMT?  then subtract offset
+			#
+			if ($tz_mod == '+') {
+				$offset_secs = $offset_secs * -1;
+			}
+
+			$offset = $offset_secs;
+		}
+		$epoch = $epoch + $offset;
+
+		return $epoch;
+	} else {
+		return -1;
+	}
 }

class/blog.php

Indentation +88 added lines, -88 removed lines

@@ -44,29 +44,29 @@ 
  **/
 if (!class_exists('Bblog')):
 
-    /**
-     * Class Bblog
-     */
-    class Bblog extends XoopsObject
-    {
-        /**
-         * Constructor
-         */
-        public function __construct() {
-            //            parent:__construct();
-            $this->table = planet_DB_prefix('blog');
-            $this->initVar('blog_id', XOBJ_DTYPE_INT, null, false);
-            $this->initVar('blog_title', XOBJ_DTYPE_TXTBOX, null, true);
-            $this->initVar('blog_desc', XOBJ_DTYPE_TXTBOX, null);
-            /* rss URI */
-            $this->initVar('blog_feed', XOBJ_DTYPE_TXTBOX, null, true);
-            $this->initVar('blog_language', XOBJ_DTYPE_TXTBOX, null);
-            $this->initVar('blog_charset', XOBJ_DTYPE_TXTBOX, null);
-            /* blog website */
-            $this->initVar('blog_link', XOBJ_DTYPE_TXTBOX, null);
-            $this->initVar('blog_image', XOBJ_DTYPE_TXTBOX, null);
-
-            /* regexp for blog article trackback
+	/**
+	 * Class Bblog
+	 */
+	class Bblog extends XoopsObject
+	{
+		/**
+		 * Constructor
+		 */
+		public function __construct() {
+			//            parent:__construct();
+			$this->table = planet_DB_prefix('blog');
+			$this->initVar('blog_id', XOBJ_DTYPE_INT, null, false);
+			$this->initVar('blog_title', XOBJ_DTYPE_TXTBOX, null, true);
+			$this->initVar('blog_desc', XOBJ_DTYPE_TXTBOX, null);
+			/* rss URI */
+			$this->initVar('blog_feed', XOBJ_DTYPE_TXTBOX, null, true);
+			$this->initVar('blog_language', XOBJ_DTYPE_TXTBOX, null);
+			$this->initVar('blog_charset', XOBJ_DTYPE_TXTBOX, null);
+			/* blog website */
+			$this->initVar('blog_link', XOBJ_DTYPE_TXTBOX, null);
+			$this->initVar('blog_image', XOBJ_DTYPE_TXTBOX, null);
+
+			/* regexp for blog article trackback
              * From article url to article trackback URI
              *
              * For example: http://www.example.com/blog/111.html => http://www.example.com/blog/trackback/111.html
@@ -77,71 +77,71 @@ 
              * The input shall be: pattern[SPACE]replacement
              *                     (.*wordpress/)(index.php)?(\?p.*) $1wp-trackback/$3
              */
-            $this->initVar('blog_trackback', XOBJ_DTYPE_TXTBOX, '');
-
-            /* blog submitter: is_numeric - uid; is_string - IP */
-            $this->initVar('blog_submitter', XOBJ_DTYPE_TXTBOX, '');
-
-            /* blog status: 0 - pending; 1 - active; 2 - featured */
-            $this->initVar('blog_status', XOBJ_DTYPE_INT, 1);
-
-            /* key for blog content */
-            $this->initVar('blog_key', XOBJ_DTYPE_TXTBOX, '');
-
-            $this->initVar('blog_time', XOBJ_DTYPE_INT, 0);
-            $this->initVar('blog_rating', XOBJ_DTYPE_INT, 0);
-            $this->initVar('blog_rates', XOBJ_DTYPE_INT, 0);
-            /* bookmark times */
-            $this->initVar('blog_marks', XOBJ_DTYPE_INT, 0);
-        }
-
-        /**
-         * get formatted publish time of the article
-         *
-         * {@link Config}
-         *
-         * @param  string $format format of time
-         * @return string
-         */
-        public function getTime($format = '') {
-            $time = planet_formatTimestamp($this->getVar('blog_time'), $format);
-
-            return $time;
-        }
-
-        /**
-         * get verified image url of the category
-         *
-         * @return string
-         */
-        public function getImage() {
-            $image = $this->getVar('blog_image');
-
-            return $image;
-        }
-
-        /**
-         * get rating average of the article
-         *
-         * @param  int $decimals decimal length
-         * @return numeric
-         */
-        public function getRatingAverage($decimals = 1) {
-            $ave = 3;
-            if ($this->getVar('blog_rates')) {
-                $ave = number_format($this->getVar('blog_rating') / $this->getVar('blog_rates'), $decimals);
-            }
-
-            return $ave;
-        }
-
-        /**
-         * @return numeric
-         */
-        public function getStar() {
-            return $this->getRatingAverage(0);
-        }
-    }
+			$this->initVar('blog_trackback', XOBJ_DTYPE_TXTBOX, '');
+
+			/* blog submitter: is_numeric - uid; is_string - IP */
+			$this->initVar('blog_submitter', XOBJ_DTYPE_TXTBOX, '');
+
+			/* blog status: 0 - pending; 1 - active; 2 - featured */
+			$this->initVar('blog_status', XOBJ_DTYPE_INT, 1);
+
+			/* key for blog content */
+			$this->initVar('blog_key', XOBJ_DTYPE_TXTBOX, '');
+
+			$this->initVar('blog_time', XOBJ_DTYPE_INT, 0);
+			$this->initVar('blog_rating', XOBJ_DTYPE_INT, 0);
+			$this->initVar('blog_rates', XOBJ_DTYPE_INT, 0);
+			/* bookmark times */
+			$this->initVar('blog_marks', XOBJ_DTYPE_INT, 0);
+		}
+
+		/**
+		 * get formatted publish time of the article
+		 *
+		 * {@link Config}
+		 *
+		 * @param  string $format format of time
+		 * @return string
+		 */
+		public function getTime($format = '') {
+			$time = planet_formatTimestamp($this->getVar('blog_time'), $format);
+
+			return $time;
+		}
+
+		/**
+		 * get verified image url of the category
+		 *
+		 * @return string
+		 */
+		public function getImage() {
+			$image = $this->getVar('blog_image');
+
+			return $image;
+		}
+
+		/**
+		 * get rating average of the article
+		 *
+		 * @param  int $decimals decimal length
+		 * @return numeric
+		 */
+		public function getRatingAverage($decimals = 1) {
+			$ave = 3;
+			if ($this->getVar('blog_rates')) {
+				$ave = number_format($this->getVar('blog_rating') / $this->getVar('blog_rates'), $decimals);
+			}
+
+			return $ave;
+		}
+
+		/**
+		 * @return numeric
+		 */
+		public function getStar() {
+			return $this->getRatingAverage(0);
+		}
+	}
 endif;
 /**
  * Topic object handler class.

class/rate.php

Indentation +20 added lines, -20 removed lines

@@ -30,26 +30,26 @@
 mod_loadFunctions('', $GLOBALS['moddirname']);
 
 if (!class_exists('Brate')):
-    /**
-     * Class Brate
-     */
-    class Brate extends XoopsObject
-    {
-        /**
-         * Brate constructor.
-         * @param null $id
-         */
-        public function __construct($id = null) {
-            //            $this->ArtObject();
-            $this->table = planet_DB_prefix('rate');
-            $this->initVar('rate_id', XOBJ_DTYPE_INT, null, false);
-            $this->initVar('art_id', XOBJ_DTYPE_INT, 0, true);
-            $this->initVar('rate_uid', XOBJ_DTYPE_INT, 0);
-            $this->initVar('rate_ip', XOBJ_DTYPE_INT, 0);
-            $this->initVar('rate_rating', XOBJ_DTYPE_INT, 0, true);
-            $this->initVar('rate_time', XOBJ_DTYPE_INT, 0, true);
-        }
-    }
+	/**
+	 * Class Brate
+	 */
+	class Brate extends XoopsObject
+	{
+		/**
+		 * Brate constructor.
+		 * @param null $id
+		 */
+		public function __construct($id = null) {
+			//            $this->ArtObject();
+			$this->table = planet_DB_prefix('rate');
+			$this->initVar('rate_id', XOBJ_DTYPE_INT, null, false);
+			$this->initVar('art_id', XOBJ_DTYPE_INT, 0, true);
+			$this->initVar('rate_uid', XOBJ_DTYPE_INT, 0);
+			$this->initVar('rate_ip', XOBJ_DTYPE_INT, 0);
+			$this->initVar('rate_rating', XOBJ_DTYPE_INT, 0, true);
+			$this->initVar('rate_time', XOBJ_DTYPE_INT, 0, true);
+		}
+	}
 endif;
 
 planet_parse_class('

class/xml.php

Indentation +87 added lines, -87 removed lines

@@ -81,93 +81,93 @@
  * @link
  */
 if (!class_exists('Xmlfeed')) {
-    /**
-     * Class Bxmlfeed
-     */
-    class Bxmlfeed extends UniversalFeedCreator
-    {
-        public $version;
-        public $filename = '';
-
-        /**
-         * Bxmlfeed constructor.
-         * @param $version
-         */
-        public function __construct($version) {
-            $this->filename = XOOPS_CACHE_PATH . '/feed.xml';
-            $this->version  = $version;
-        }
-
-        /**
-         * @param      $var
-         * @param      $val
-         * @param bool $encoding
-         */
-        public function setVar($var, $val, $encoding = false) {
-            if (!empty($encoding)) {
-                $val = $this->convert_encoding($val);
-            }
-            $this->$var = $val;
-        }
-
-        /**
-         * @param $val
-         * @return array|mixed|string
-         */
-        public function convert_encoding($val) {
-            if (is_array($val)) {
-                foreach (array_keys($val) as $key) {
-                    $val[$key] = $this->convert_encoding($val[$key]);
-                }
-            } else {
-                $val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
-            }
-
-            return $val;
-        }
-
-        /**
-         * @param $var
-         * @return mixed
-         */
-        public function getVar($var) {
-            return $this->$var;
-        }
-
-        /**
-         * @param $img
-         */
-        public function setImage(&$img) {
-            $image = new FeedImage();
-            foreach ($img as $key => $val) {
-                $image->$key = $this->convert_encoding($val);
-            }
-            $this->setVar('image', $image);
-        }
-
-        /**
-         * @param $itm
-         */
-        public function _addItem(&$itm) {
-            $item = new FeedItem();
-            foreach ($itm as $key => $val) {
-                $item->$key = $this->convert_encoding($val);
-            }
-            $this->addItem($item);
-        }
-
-        /**
-         * @param $items
-         */
-        public function addItems(&$items) {
-            if (!is_array($items) || count($items) == 0) {
-                return;
-            }
-            foreach ($items as $item) {
-                $this->_addItem($item);
-            }
-        }
-    }
+	/**
+	 * Class Bxmlfeed
+	 */
+	class Bxmlfeed extends UniversalFeedCreator
+	{
+		public $version;
+		public $filename = '';
+
+		/**
+		 * Bxmlfeed constructor.
+		 * @param $version
+		 */
+		public function __construct($version) {
+			$this->filename = XOOPS_CACHE_PATH . '/feed.xml';
+			$this->version  = $version;
+		}
+
+		/**
+		 * @param      $var
+		 * @param      $val
+		 * @param bool $encoding
+		 */
+		public function setVar($var, $val, $encoding = false) {
+			if (!empty($encoding)) {
+				$val = $this->convert_encoding($val);
+			}
+			$this->$var = $val;
+		}
+
+		/**
+		 * @param $val
+		 * @return array|mixed|string
+		 */
+		public function convert_encoding($val) {
+			if (is_array($val)) {
+				foreach (array_keys($val) as $key) {
+					$val[$key] = $this->convert_encoding($val[$key]);
+				}
+			} else {
+				$val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
+			}
+
+			return $val;
+		}
+
+		/**
+		 * @param $var
+		 * @return mixed
+		 */
+		public function getVar($var) {
+			return $this->$var;
+		}
+
+		/**
+		 * @param $img
+		 */
+		public function setImage(&$img) {
+			$image = new FeedImage();
+			foreach ($img as $key => $val) {
+				$image->$key = $this->convert_encoding($val);
+			}
+			$this->setVar('image', $image);
+		}
+
+		/**
+		 * @param $itm
+		 */
+		public function _addItem(&$itm) {
+			$item = new FeedItem();
+			foreach ($itm as $key => $val) {
+				$item->$key = $this->convert_encoding($val);
+			}
+			$this->addItem($item);
+		}
+
+		/**
+		 * @param $items
+		 */
+		public function addItems(&$items) {
+			if (!is_array($items) || count($items) == 0) {
+				return;
+			}
+			foreach ($items as $item) {
+				$this->_addItem($item);
+			}
+		}
+	}
 }
 
 planet_parse_class('

class/category.php

Indentation +16 added lines, -16 removed lines

@@ -44,22 +44,22 @@
  **/
 if (!class_exists('Bcategory')):
 
-    /**
-     * Class Bcategory
-     */
-    class Bcategory extends XoopsObject
-    {
-        /**
-         * Constructor
-         */
-        public function __construct() {
-            //            $this->ArtObject();
-            $this->table = planet_DB_prefix('category');
-            $this->initVar('cat_id', XOBJ_DTYPE_INT, null, false);
-            $this->initVar('cat_title', XOBJ_DTYPE_TXTBOX, '', true);
-            $this->initVar('cat_order', XOBJ_DTYPE_INT, 1, false);
-        }
-    }
+	/**
+	 * Class Bcategory
+	 */
+	class Bcategory extends XoopsObject
+	{
+		/**
+		 * Constructor
+		 */
+		public function __construct() {
+			//            $this->ArtObject();
+			$this->table = planet_DB_prefix('category');
+			$this->initVar('cat_id', XOBJ_DTYPE_INT, null, false);
+			$this->initVar('cat_title', XOBJ_DTYPE_TXTBOX, '', true);
+			$this->initVar('cat_order', XOBJ_DTYPE_INT, 1, false);
+		}
+	}
 
 endif;
 /**

class/class-IXR.php

Indentation +954 added lines, -954 removed lines

@@ -14,132 +14,132 @@ 
  */
 class IXR_Value
 {
-    public $data;
-    public $type;
-
-    /**
-     * IXR_Value constructor.
-     * @param      $data
-     * @param bool $type
-     */
-    public function __construct($data, $type = false) {
-        $this->data = $data;
-        if (!$type) {
-            $type = $this->calculateType();
-        }
-        $this->type = $type;
-        if ($type === 'struct') {
-            /* Turn all the values in the array in to new IXR_Value objects */
-            foreach ($this->data as $key => $value) {
-                $this->data[$key] = new IXR_Value($value);
-            }
-        }
-        if ($type === 'array') {
-            for ($i = 0, $j = count($this->data); $i < $j; ++$i) {
-                $this->data[$i] = new IXR_Value($this->data[$i]);
-            }
-        }
-    }
-
-    /**
-     * @return string
-     */
-    public function calculateType() {
-        if ($this->data === true || $this->data === false) {
-            return 'boolean';
-        }
-        if (is_int($this->data)) {
-            return 'int';
-        }
-        if (is_float($this->data)) {
-            return 'double';
-        }
-        // Deal with IXR object types base64 and date
-        if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
-            return 'date';
-        }
-        if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
-            return 'base64';
-        }
-        // If it is a normal PHP object convert it in to a struct
-        if (is_object($this->data)) {
-            $this->data = get_object_vars($this->data);
-
-            return 'struct';
-        }
-        if (!is_array($this->data)) {
-            return 'string';
-        }
-        /* We have an array - is it an array or a struct ? */
-        if ($this->isStruct($this->data)) {
-            return 'struct';
-        } else {
-            return 'array';
-        }
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function getXml() {
-        /* Return XML for this value */
-        switch ($this->type) {
-            case 'boolean':
-                return '<boolean>' . ($this->data ? '1' : '0') . '</boolean>';
-                break;
-            case 'int':
-                return '<int>' . $this->data . '</int>';
-                break;
-            case 'double':
-                return '<double>' . $this->data . '</double>';
-                break;
-            case 'string':
-                return '<string>' . htmlspecialchars($this->data) . '</string>';
-                break;
-            case 'array':
-                $return = '<array><data>' . "\n";
-                foreach ($this->data as $item) {
-                    $return .= '  <value>' . $item->getXml() . "</value>\n";
-                }
-                $return .= '</data></array>';
-
-                return $return;
-                break;
-            case 'struct':
-                $return = '<struct>' . "\n";
-                foreach ($this->data as $name => $value) {
-                    $return .= "  <member><name>$name</name><value>";
-                    $return .= $value->getXml() . "</value></member>\n";
-                }
-                $return .= '</struct>';
-
-                return $return;
-                break;
-            case 'date':
-            case 'base64':
-                return $this->data->getXml();
-                break;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $array
-     * @return bool
-     */
-    public function isStruct($array) {
-        /* Nasty function to check if an array is a struct or not */
-        $expected = 0;
-        foreach ($array as $key => $value) {
-            if ((string)$key != (string)$expected) {
-                return true;
-            }
-            ++$expected;
-        }
-
-        return false;
-    }
+	public $data;
+	public $type;
+
+	/**
+	 * IXR_Value constructor.
+	 * @param      $data
+	 * @param bool $type
+	 */
+	public function __construct($data, $type = false) {
+		$this->data = $data;
+		if (!$type) {
+			$type = $this->calculateType();
+		}
+		$this->type = $type;
+		if ($type === 'struct') {
+			/* Turn all the values in the array in to new IXR_Value objects */
+			foreach ($this->data as $key => $value) {
+				$this->data[$key] = new IXR_Value($value);
+			}
+		}
+		if ($type === 'array') {
+			for ($i = 0, $j = count($this->data); $i < $j; ++$i) {
+				$this->data[$i] = new IXR_Value($this->data[$i]);
+			}
+		}
+	}
+
+	/**
+	 * @return string
+	 */
+	public function calculateType() {
+		if ($this->data === true || $this->data === false) {
+			return 'boolean';
+		}
+		if (is_int($this->data)) {
+			return 'int';
+		}
+		if (is_float($this->data)) {
+			return 'double';
+		}
+		// Deal with IXR object types base64 and date
+		if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
+			return 'date';
+		}
+		if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
+			return 'base64';
+		}
+		// If it is a normal PHP object convert it in to a struct
+		if (is_object($this->data)) {
+			$this->data = get_object_vars($this->data);
+
+			return 'struct';
+		}
+		if (!is_array($this->data)) {
+			return 'string';
+		}
+		/* We have an array - is it an array or a struct ? */
+		if ($this->isStruct($this->data)) {
+			return 'struct';
+		} else {
+			return 'array';
+		}
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function getXml() {
+		/* Return XML for this value */
+		switch ($this->type) {
+			case 'boolean':
+				return '<boolean>' . ($this->data ? '1' : '0') . '</boolean>';
+				break;
+			case 'int':
+				return '<int>' . $this->data . '</int>';
+				break;
+			case 'double':
+				return '<double>' . $this->data . '</double>';
+				break;
+			case 'string':
+				return '<string>' . htmlspecialchars($this->data) . '</string>';
+				break;
+			case 'array':
+				$return = '<array><data>' . "\n";
+				foreach ($this->data as $item) {
+					$return .= '  <value>' . $item->getXml() . "</value>\n";
+				}
+				$return .= '</data></array>';
+
+				return $return;
+				break;
+			case 'struct':
+				$return = '<struct>' . "\n";
+				foreach ($this->data as $name => $value) {
+					$return .= "  <member><name>$name</name><value>";
+					$return .= $value->getXml() . "</value></member>\n";
+				}
+				$return .= '</struct>';
+
+				return $return;
+				break;
+			case 'date':
+			case 'base64':
+				return $this->data->getXml();
+				break;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param $array
+	 * @return bool
+	 */
+	public function isStruct($array) {
+		/* Nasty function to check if an array is a struct or not */
+		$expected = 0;
+		foreach ($array as $key => $value) {
+			if ((string)$key != (string)$expected) {
+				return true;
+			}
+			++$expected;
+		}
+
+		return false;
+	}
 }
 
 /**
@@ -147,185 +147,185 @@ 
  */
 class IXR_Message
 {
-    public $message;
-    public $messageType;  // methodCall / methodResponse / fault
-    public $faultCode;
-    public $faultString;
-    public $methodName;
-    public $params;
-    // Current variable stacks
-    public $_arraystructs      = array();   // The stack used to keep track of the current array/struct
-    public $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
-    public $_currentStructName = array();  // A stack as well
-    public $_param;
-    public $_value;
-    public $_currentTag;
-    public $_currentTagContents;
-    // The XML parser
-    public $_parser;
-
-    /**
-     * IXR_Message constructor.
-     * @param $message
-     */
-    public function __construct($message) {
-        $this->message = $message;
-    }
-
-    /**
-     * @return bool
-     */
-    public function parse() {
-        // first remove the XML declaration
-        $this->message = preg_replace('/<\?xml(.*)?\?' . '>/', '', $this->message);
-        if (trim($this->message) == '') {
-            return false;
-        }
-        $this->_parser = xml_parser_create();
-        // Set XML parser to take the case of tags in to account
-        xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
-        // Set XML parser callback functions
-        xml_set_object($this->_parser, $this);
-        xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
-        xml_set_character_data_handler($this->_parser, 'cdata');
-        if (!xml_parse($this->_parser, $this->message)) {
-            /* die(sprintf('XML error: %s at line %d',
+	public $message;
+	public $messageType;  // methodCall / methodResponse / fault
+	public $faultCode;
+	public $faultString;
+	public $methodName;
+	public $params;
+	// Current variable stacks
+	public $_arraystructs      = array();   // The stack used to keep track of the current array/struct
+	public $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
+	public $_currentStructName = array();  // A stack as well
+	public $_param;
+	public $_value;
+	public $_currentTag;
+	public $_currentTagContents;
+	// The XML parser
+	public $_parser;
+
+	/**
+	 * IXR_Message constructor.
+	 * @param $message
+	 */
+	public function __construct($message) {
+		$this->message = $message;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function parse() {
+		// first remove the XML declaration
+		$this->message = preg_replace('/<\?xml(.*)?\?' . '>/', '', $this->message);
+		if (trim($this->message) == '') {
+			return false;
+		}
+		$this->_parser = xml_parser_create();
+		// Set XML parser to take the case of tags in to account
+		xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
+		// Set XML parser callback functions
+		xml_set_object($this->_parser, $this);
+		xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
+		xml_set_character_data_handler($this->_parser, 'cdata');
+		if (!xml_parse($this->_parser, $this->message)) {
+			/* die(sprintf('XML error: %s at line %d',
                 xml_error_string(xml_get_error_code($this->_parser)),
                 xml_get_current_line_number($this->_parser))); */
 
-            return false;
-        }
-        xml_parser_free($this->_parser);
-        // Grab the error messages, if any
-        if ($this->messageType === 'fault') {
-            $this->faultCode   = $this->params[0]['faultCode'];
-            $this->faultString = $this->params[0]['faultString'];
-        }
-
-        return true;
-    }
-
-    /**
-     * @param $parser
-     * @param $tag
-     * @param $attr
-     */
-    public function tag_open($parser, $tag, $attr) {
-        $this->currentTag = $tag;
-        switch ($tag) {
-            case 'methodCall':
-            case 'methodResponse':
-            case 'fault':
-                $this->messageType = $tag;
-                break;
-            /* Deal with stacks of arrays and structs */
-            case 'data':    // data is to all intents and puposes more interesting than array
-                $this->_arraystructstypes[] = 'array';
-                $this->_arraystructs[]      = array();
-                break;
-            case 'struct':
-                $this->_arraystructstypes[] = 'struct';
-                $this->_arraystructs[]      = array();
-                break;
-        }
-    }
-
-    /**
-     * @param $parser
-     * @param $cdata
-     */
-    public function cdata($parser, $cdata) {
-        $this->_currentTagContents .= $cdata;
-    }
-
-    /**
-     * @param $parser
-     * @param $tag
-     */
-    public function tag_close($parser, $tag) {
-        $valueFlag = false;
-        switch ($tag) {
-            case 'int':
-            case 'i4':
-                $value                     = (int)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'double':
-                $value                     = (double)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'string':
-                $value                     = (string)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'dateTime.iso8601':
-                $value = new IXR_Date(trim($this->_currentTagContents));
-                // $value = $iso->getTimestamp();
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'value':
-                // "If no type is indicated, the type is string."
-                if (trim($this->_currentTagContents) != '') {
-                    $value                     = (string)$this->_currentTagContents;
-                    $this->_currentTagContents = '';
-                    $valueFlag                 = true;
-                }
-                break;
-            case 'boolean':
-                $value                     = (boolean)trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            case 'base64':
-                $value                     = base64_decode(trim($this->_currentTagContents));
-                $this->_currentTagContents = '';
-                $valueFlag                 = true;
-                break;
-            /* Deal with stacks of arrays and structs */
-            case 'data':
-            case 'struct':
-                $value = array_pop($this->_arraystructs);
-                array_pop($this->_arraystructstypes);
-                $valueFlag = true;
-                break;
-            case 'member':
-                array_pop($this->_currentStructName);
-                break;
-            case 'name':
-                $this->_currentStructName[] = trim($this->_currentTagContents);
-                $this->_currentTagContents  = '';
-                break;
-            case 'methodName':
-                $this->methodName          = trim($this->_currentTagContents);
-                $this->_currentTagContents = '';
-                break;
-        }
-        if ($valueFlag) {
-            /*
+			return false;
+		}
+		xml_parser_free($this->_parser);
+		// Grab the error messages, if any
+		if ($this->messageType === 'fault') {
+			$this->faultCode   = $this->params[0]['faultCode'];
+			$this->faultString = $this->params[0]['faultString'];
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param $parser
+	 * @param $tag
+	 * @param $attr
+	 */
+	public function tag_open($parser, $tag, $attr) {
+		$this->currentTag = $tag;
+		switch ($tag) {
+			case 'methodCall':
+			case 'methodResponse':
+			case 'fault':
+				$this->messageType = $tag;
+				break;
+			/* Deal with stacks of arrays and structs */
+			case 'data':    // data is to all intents and puposes more interesting than array
+				$this->_arraystructstypes[] = 'array';
+				$this->_arraystructs[]      = array();
+				break;
+			case 'struct':
+				$this->_arraystructstypes[] = 'struct';
+				$this->_arraystructs[]      = array();
+				break;
+		}
+	}
+
+	/**
+	 * @param $parser
+	 * @param $cdata
+	 */
+	public function cdata($parser, $cdata) {
+		$this->_currentTagContents .= $cdata;
+	}
+
+	/**
+	 * @param $parser
+	 * @param $tag
+	 */
+	public function tag_close($parser, $tag) {
+		$valueFlag = false;
+		switch ($tag) {
+			case 'int':
+			case 'i4':
+				$value                     = (int)trim($this->_currentTagContents);
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'double':
+				$value                     = (double)trim($this->_currentTagContents);
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'string':
+				$value                     = (string)trim($this->_currentTagContents);
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'dateTime.iso8601':
+				$value = new IXR_Date(trim($this->_currentTagContents));
+				// $value = $iso->getTimestamp();
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'value':
+				// "If no type is indicated, the type is string."
+				if (trim($this->_currentTagContents) != '') {
+					$value                     = (string)$this->_currentTagContents;
+					$this->_currentTagContents = '';
+					$valueFlag                 = true;
+				}
+				break;
+			case 'boolean':
+				$value                     = (boolean)trim($this->_currentTagContents);
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			case 'base64':
+				$value                     = base64_decode(trim($this->_currentTagContents));
+				$this->_currentTagContents = '';
+				$valueFlag                 = true;
+				break;
+			/* Deal with stacks of arrays and structs */
+			case 'data':
+			case 'struct':
+				$value = array_pop($this->_arraystructs);
+				array_pop($this->_arraystructstypes);
+				$valueFlag = true;
+				break;
+			case 'member':
+				array_pop($this->_currentStructName);
+				break;
+			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
-                if ($this->_arraystructstypes[count($this->_arraystructstypes) - 1] === 'struct') {
-                    // Add to struct
-                    $this->_arraystructs[count($this->_arraystructs)
-                                         - 1][$this->_currentStructName[count($this->_currentStructName) - 1]] = $value;
-                } else {
-                    // Add to array
-                    $this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
-                }
-            } else {
-                // Just add as a paramater
-                $this->params[] = $value;
-            }
-        }
-    }
+			if (count($this->_arraystructs) > 0) {
+				// Add value to struct or array
+				if ($this->_arraystructstypes[count($this->_arraystructstypes) - 1] === 'struct') {
+					// Add to struct
+					$this->_arraystructs[count($this->_arraystructs)
+										 - 1][$this->_currentStructName[count($this->_currentStructName) - 1]] = $value;
+				} else {
+					// Add to array
+					$this->_arraystructs[count($this->_arraystructs) - 1][] = $value;
+				}
+			} else {
+				// Just add as a paramater
+				$this->params[] = $value;
+			}
+		}
+	}
 }
 
 /**
@@ -333,53 +333,53 @@ 
  */
 class IXR_Server
 {
-    public $data;
-    public $callbacks = array();
-    public $message;
-    public $capabilities;
-
-    /**
-     * IXR_Server constructor.
-     * @param bool $callbacks
-     * @param bool $data
-     */
-    public function __construct($callbacks = false, $data = false) {
-        $this->setCapabilities();
-        if ($callbacks) {
-            $this->callbacks = $callbacks;
-        }
-        $this->setCallbacks();
-        $this->serve($data);
-    }
-
-    /**
-     * @param bool $data
-     */
-    public function serve($data = false) {
-        if (!$data) {
-            $http_raw_post_data = file_get_contents('php://input');
-            if (!$http_raw_post_data) {
-                die('XML-RPC server accepts POST requests only.');
-            }
-            $data = $http_raw_post_data;
-        }
-        $this->message = new IXR_Message($data);
-        if (!$this->message->parse()) {
-            $this->error(-32700, 'parse error. not well formed');
-        }
-        if ($this->message->messageType !== 'methodCall') {
-            $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
-        }
-        $result = $this->call($this->message->methodName, $this->message->params);
-        // Is the result an error?
-        if (is_a($result, 'IXR_Error')) {
-            $this->error($result);
-        }
-        // Encode the result
-        $r         = new IXR_Value($result);
-        $resultxml = $r->getXml();
-        // Create the XML
-        $xml = <<<EOD
+	public $data;
+	public $callbacks = array();
+	public $message;
+	public $capabilities;
+
+	/**
+	 * IXR_Server constructor.
+	 * @param bool $callbacks
+	 * @param bool $data
+	 */
+	public function __construct($callbacks = false, $data = false) {
+		$this->setCapabilities();
+		if ($callbacks) {
+			$this->callbacks = $callbacks;
+		}
+		$this->setCallbacks();
+		$this->serve($data);
+	}
+
+	/**
+	 * @param bool $data
+	 */
+	public function serve($data = false) {
+		if (!$data) {
+			$http_raw_post_data = file_get_contents('php://input');
+			if (!$http_raw_post_data) {
+				die('XML-RPC server accepts POST requests only.');
+			}
+			$data = $http_raw_post_data;
+		}
+		$this->message = new IXR_Message($data);
+		if (!$this->message->parse()) {
+			$this->error(-32700, 'parse error. not well formed');
+		}
+		if ($this->message->messageType !== 'methodCall') {
+			$this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
+		}
+		$result = $this->call($this->message->methodName, $this->message->params);
+		// Is the result an error?
+		if (is_a($result, 'IXR_Error')) {
+			$this->error($result);
+		}
+		// Encode the result
+		$r         = new IXR_Value($result);
+		$resultxml = $r->getXml();
+		// Create the XML
+		$xml = <<<EOD
 <methodResponse>
   <params>
     <param>
@@ -391,154 +391,154 @@ 
 </methodResponse>
 
 EOD;
-        // Send it
-        $this->output($xml);
-    }
-
-    /**
-     * @param $methodname
-     * @param $args
-     * @return IXR_Error|mixed
-     */
-    public function call($methodname, $args) {
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method ' . $methodname . ' does not exist.');
-        }
-        $method = $this->callbacks[$methodname];
-        // Perform the callback and send the response
-        if (count($args) == 1) {
-            // If only one paramater just send that instead of the whole array
-            $args = $args[0];
-        }
-        // Are we dealing with a function or a method?
-        if (substr($method, 0, 5) === 'this:') {
-            // It's a class method - check it exists
-            $method = substr($method, 5);
-            if (!method_exists($this, $method)) {
-                return new IXR_Error(-32601, 'server error. requested class method "' . $method . '" does not exist.');
-            }
-            // Call the method
-            $result = $this->$method($args);
-        } else {
-            // It's a function - does it exist?
-            if (is_array($method)) {
-                if (!method_exists($method[0], $method[1])) {
-                    return new IXR_Error(-32601,
-                                         'server error. requested object method "' . $method[1] . '" does not exist.');
-                }
-            } elseif (!function_exists($method)) {
-                return new IXR_Error(-32601, 'server error. requested function "' . $method . '" does not exist.');
-            }
-            // Call the function
-            $result = call_user_func($method, $args);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param      $error
-     * @param bool $message
-     */
-    public function error($error, $message = false) {
-        // Accepts either an error object or an error code and message
-        if ($message && !is_object($error)) {
-            $error = new IXR_Error($error, $message);
-        }
-        $this->output($error->getXml());
-    }
-
-    /**
-     * @param $xml
-     */
-    public function output($xml) {
-        $xml    = '<?xml version="1.0"?>' . "\n" . $xml;
-        $length = strlen($xml);
-        header('Connection: close');
-        header('Content-Length: ' . $length);
-        header('Content-Type: text/xml');
-        header('Date: ' . date('r'));
-        echo $xml;
-        exit;
-    }
-
-    /**
-     * @param $method
-     * @return bool
-     */
-    public function hasMethod($method) {
-        return in_array($method, array_keys($this->callbacks));
-    }
-
-    public function setCapabilities() {
-        // Initialises capabilities array
-        $this->capabilities = array(
-            'xmlrpc'           => array(
-                'specUrl'     => 'http://www.xmlrpc.com/spec',
-                'specVersion' => 1
-            ),
-            'faults_interop'   => array(
-                'specUrl'     => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
-                'specVersion' => 20010516
-            ),
-            'system.multicall' => array(
-                'specUrl'     => 'http://www.xmlrpc.com/discuss/msgReader$1208',
-                'specVersion' => 1
-            )
-        );
-    }
-
-    /**
-     * @param $args
-     * @return mixed
-     */
-    public function getCapabilities($args) {
-        return $this->capabilities;
-    }
-
-    public function setCallbacks() {
-        $this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
-        $this->callbacks['system.listMethods']     = 'this:listMethods';
-        $this->callbacks['system.multicall']       = 'this:multiCall';
-    }
-
-    /**
-     * @param $args
-     * @return array
-     */
-    public function listMethods($args) {
-        // Returns a list of methods - uses array_reverse to ensure user defined
-        // methods are listed before server defined methods
-        return array_reverse(array_keys($this->callbacks));
-    }
-
-    /**
-     * @param $methodcalls
-     * @return array
-     */
-    public function multiCall($methodcalls) {
-        // See http://www.xmlrpc.com/discuss/msgReader$1208
-        $return = array();
-        foreach ($methodcalls as $call) {
-            $method = $call['methodName'];
-            $params = $call['params'];
-            if ($method === 'system.multicall') {
-                $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
-            } else {
-                $result = $this->call($method, $params);
-            }
-            if (is_a($result, 'IXR_Error')) {
-                $return[] = array(
-                    'faultCode'   => $result->code,
-                    'faultString' => $result->message
-                );
-            } else {
-                $return[] = array($result);
-            }
-        }
-
-        return $return;
-    }
+		// Send it
+		$this->output($xml);
+	}
+
+	/**
+	 * @param $methodname
+	 * @param $args
+	 * @return IXR_Error|mixed
+	 */
+	public function call($methodname, $args) {
+		if (!$this->hasMethod($methodname)) {
+			return new IXR_Error(-32601, 'server error. requested method ' . $methodname . ' does not exist.');
+		}
+		$method = $this->callbacks[$methodname];
+		// Perform the callback and send the response
+		if (count($args) == 1) {
+			// If only one paramater just send that instead of the whole array
+			$args = $args[0];
+		}
+		// Are we dealing with a function or a method?
+		if (substr($method, 0, 5) === 'this:') {
+			// It's a class method - check it exists
+			$method = substr($method, 5);
+			if (!method_exists($this, $method)) {
+				return new IXR_Error(-32601, 'server error. requested class method "' . $method . '" does not exist.');
+			}
+			// Call the method
+			$result = $this->$method($args);
+		} else {
+			// It's a function - does it exist?
+			if (is_array($method)) {
+				if (!method_exists($method[0], $method[1])) {
+					return new IXR_Error(-32601,
+										 'server error. requested object method "' . $method[1] . '" does not exist.');
+				}
+			} elseif (!function_exists($method)) {
+				return new IXR_Error(-32601, 'server error. requested function "' . $method . '" does not exist.');
+			}
+			// Call the function
+			$result = call_user_func($method, $args);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @param      $error
+	 * @param bool $message
+	 */
+	public function error($error, $message = false) {
+		// Accepts either an error object or an error code and message
+		if ($message && !is_object($error)) {
+			$error = new IXR_Error($error, $message);
+		}
+		$this->output($error->getXml());
+	}
+
+	/**
+	 * @param $xml
+	 */
+	public function output($xml) {
+		$xml    = '<?xml version="1.0"?>' . "\n" . $xml;
+		$length = strlen($xml);
+		header('Connection: close');
+		header('Content-Length: ' . $length);
+		header('Content-Type: text/xml');
+		header('Date: ' . date('r'));
+		echo $xml;
+		exit;
+	}
+
+	/**
+	 * @param $method
+	 * @return bool
+	 */
+	public function hasMethod($method) {
+		return in_array($method, array_keys($this->callbacks));
+	}
+
+	public function setCapabilities() {
+		// Initialises capabilities array
+		$this->capabilities = array(
+			'xmlrpc'           => array(
+				'specUrl'     => 'http://www.xmlrpc.com/spec',
+				'specVersion' => 1
+			),
+			'faults_interop'   => array(
+				'specUrl'     => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
+				'specVersion' => 20010516
+			),
+			'system.multicall' => array(
+				'specUrl'     => 'http://www.xmlrpc.com/discuss/msgReader$1208',
+				'specVersion' => 1
+			)
+		);
+	}
+
+	/**
+	 * @param $args
+	 * @return mixed
+	 */
+	public function getCapabilities($args) {
+		return $this->capabilities;
+	}
+
+	public function setCallbacks() {
+		$this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
+		$this->callbacks['system.listMethods']     = 'this:listMethods';
+		$this->callbacks['system.multicall']       = 'this:multiCall';
+	}
+
+	/**
+	 * @param $args
+	 * @return array
+	 */
+	public function listMethods($args) {
+		// Returns a list of methods - uses array_reverse to ensure user defined
+		// methods are listed before server defined methods
+		return array_reverse(array_keys($this->callbacks));
+	}
+
+	/**
+	 * @param $methodcalls
+	 * @return array
+	 */
+	public function multiCall($methodcalls) {
+		// See http://www.xmlrpc.com/discuss/msgReader$1208
+		$return = array();
+		foreach ($methodcalls as $call) {
+			$method = $call['methodName'];
+			$params = $call['params'];
+			if ($method === 'system.multicall') {
+				$result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
+			} else {
+				$result = $this->call($method, $params);
+			}
+			if (is_a($result, 'IXR_Error')) {
+				$return[] = array(
+					'faultCode'   => $result->code,
+					'faultString' => $result->message
+				);
+			} else {
+				$return[] = array($result);
+			}
+		}
+
+		return $return;
+	}
 }
 
 /**
@@ -546,47 +546,47 @@ 
  */
 class IXR_Request
 {
-    public $method;
-    public $args;
-    public $xml;
-
-    /**
-     * IXR_Request constructor.
-     * @param $method
-     * @param $args
-     */
-    public function __construct($method, $args) {
-        $this->method = $method;
-        $this->args   = $args;
-        $this->xml    = <<<EOD
+	public $method;
+	public $args;
+	public $xml;
+
+	/**
+	 * IXR_Request constructor.
+	 * @param $method
+	 * @param $args
+	 */
+	public function __construct($method, $args) {
+		$this->method = $method;
+		$this->args   = $args;
+		$this->xml    = <<<EOD
 <?xml version="1.0"?>
 <methodCall>
 <methodName>{$this->method}</methodName>
 <params>
 
 EOD;
-        foreach ($this->args as $arg) {
-            $this->xml .= '<param><value>';
-            $v = new IXR_Value($arg);
-            $this->xml .= $v->getXml();
-            $this->xml .= "</value></param>\n";
-        }
-        $this->xml .= '</params></methodCall>';
-    }
-
-    /**
-     * @return int
-     */
-    public function getLength() {
-        return strlen($this->xml);
-    }
-
-    /**
-     * @return string
-     */
-    public function getXml() {
-        return $this->xml;
-    }
+		foreach ($this->args as $arg) {
+			$this->xml .= '<param><value>';
+			$v = new IXR_Value($arg);
+			$this->xml .= $v->getXml();
+			$this->xml .= "</value></param>\n";
+		}
+		$this->xml .= '</params></methodCall>';
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getLength() {
+		return strlen($this->xml);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXml() {
+		return $this->xml;
+	}
 }
 
 /**
@@ -594,144 +594,144 @@ 
  */
 class IXR_Client
 {
-    public $server;
-    public $port;
-    public $path;
-    public $useragent;
-    public $response;
-    public $timeout;
-    public $vendor  = '';
-    public $message = false;
-    public $debug   = false;
-    // Storage place for an error message
-    public $error = false;
-
-    /**
-     * IXR_Client constructor.
-     * @param        $server
-     * @param bool   $path
-     * @param int    $port
-     * @param int    $timeout
-     * @param string $vendor
-     */
-    public function __construct($server, $path = false, $port = 80, $timeout = 30, $vendor = '') {
-        if (!$path) {
-            // Assume we have been given a URL instead
-            $bits         = parse_url($server);
-            $this->server = $bits['host'];
-            $this->port   = isset($bits['port']) ? $bits['port'] : 80;
-            $this->path   = isset($bits['path']) ? $bits['path'] : '/';
-            // Make absolutely sure we have a path
-            if (!$this->path) {
-                $this->path = '/';
-            }
-        } else {
-            $this->server  = $server;
-            $this->path    = $path;
-            $this->port    = $port;
-            $this->timeout = $timeout;
-        }
-        $this->useragent = 'The Incutio XML-RPC PHP Library';
-    }
-
-    /**
-     * @return bool
-     */
-    public function query() {
-        $args    = func_get_args();
-        $method  = array_shift($args);
-        $request = new IXR_Request($method, $args);
-        $length  = $request->getLength();
-        $xml     = $request->getXml();
-        $r       = "\r\n";
-        $request = "POST {$this->path} HTTP/1.0$r";
-        $request .= "Host: {$this->server}$r";
-        $request .= "Content-Type: text/xml$r";
-        $request .= "User-Agent: {$this->useragent}$r";
-        $request .= "Content-length: {$length}$r$r";
-        $request .= $xml;
-        // Now send the request
-        if ($this->debug) {
-            echo '<pre>' . htmlspecialchars($request) . "\n</pre>\n\n";
-        }
-        $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
-        if (!$fp) {
-            $this->error = new IXR_Error(-32300, 'transport error - could not open socket');
-
-            return false;
-        }
-        fwrite($fp, $request);
-        $contents       = '';
-        $gotFirstLine   = false;
-        $gettingHeaders = true;
-        while (!feof($fp)) {
-            $line = fgets($fp, 4096);
-            if (!$gotFirstLine) {
-                // Check line for '200'
-                if (false === strpos($line, '200')) {
-                    $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
-
-                    return false;
-                }
-                $gotFirstLine = true;
-            }
-            if (trim($line) == '') {
-                $gettingHeaders = false;
-            }
-            if (!$gettingHeaders) {
-                $contents .= trim($line) . "\n";
-            }
-        }
-        if ($this->debug) {
-            echo '<pre>' . htmlspecialchars($contents) . "\n</pre>\n\n";
-        }
-        // Now parse what we've got back
-        $this->message = new IXR_Message($contents);
-        if (!$this->message->parse()) {
-            // XML error
-            $this->error = new IXR_Error(-32700, 'parse error. not well formed');
-
-            return false;
-        }
-        // Is the message a fault?
-        if ($this->message->messageType === 'fault') {
-            $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
-
-            return false;
-        }
-
-        // Message must be OK
-        return true;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getResponse() {
-        // methodResponses can only have one param - return that
-        return $this->message->params[0];
-    }
-
-    /**
-     * @return bool
-     */
-    public function isError() {
-        return is_object($this->error);
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getErrorCode() {
-        return $this->error->code;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getErrorMessage() {
-        return $this->error->message;
-    }
+	public $server;
+	public $port;
+	public $path;
+	public $useragent;
+	public $response;
+	public $timeout;
+	public $vendor  = '';
+	public $message = false;
+	public $debug   = false;
+	// Storage place for an error message
+	public $error = false;
+
+	/**
+	 * IXR_Client constructor.
+	 * @param        $server
+	 * @param bool   $path
+	 * @param int    $port
+	 * @param int    $timeout
+	 * @param string $vendor
+	 */
+	public function __construct($server, $path = false, $port = 80, $timeout = 30, $vendor = '') {
+		if (!$path) {
+			// Assume we have been given a URL instead
+			$bits         = parse_url($server);
+			$this->server = $bits['host'];
+			$this->port   = isset($bits['port']) ? $bits['port'] : 80;
+			$this->path   = isset($bits['path']) ? $bits['path'] : '/';
+			// Make absolutely sure we have a path
+			if (!$this->path) {
+				$this->path = '/';
+			}
+		} else {
+			$this->server  = $server;
+			$this->path    = $path;
+			$this->port    = $port;
+			$this->timeout = $timeout;
+		}
+		$this->useragent = 'The Incutio XML-RPC PHP Library';
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function query() {
+		$args    = func_get_args();
+		$method  = array_shift($args);
+		$request = new IXR_Request($method, $args);
+		$length  = $request->getLength();
+		$xml     = $request->getXml();
+		$r       = "\r\n";
+		$request = "POST {$this->path} HTTP/1.0$r";
+		$request .= "Host: {$this->server}$r";
+		$request .= "Content-Type: text/xml$r";
+		$request .= "User-Agent: {$this->useragent}$r";
+		$request .= "Content-length: {$length}$r$r";
+		$request .= $xml;
+		// Now send the request
+		if ($this->debug) {
+			echo '<pre>' . htmlspecialchars($request) . "\n</pre>\n\n";
+		}
+		$fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout);
+		if (!$fp) {
+			$this->error = new IXR_Error(-32300, 'transport error - could not open socket');
+
+			return false;
+		}
+		fwrite($fp, $request);
+		$contents       = '';
+		$gotFirstLine   = false;
+		$gettingHeaders = true;
+		while (!feof($fp)) {
+			$line = fgets($fp, 4096);
+			if (!$gotFirstLine) {
+				// Check line for '200'
+				if (false === strpos($line, '200')) {
+					$this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200');
+
+					return false;
+				}
+				$gotFirstLine = true;
+			}
+			if (trim($line) == '') {
+				$gettingHeaders = false;
+			}
+			if (!$gettingHeaders) {
+				$contents .= trim($line) . "\n";
+			}
+		}
+		if ($this->debug) {
+			echo '<pre>' . htmlspecialchars($contents) . "\n</pre>\n\n";
+		}
+		// Now parse what we've got back
+		$this->message = new IXR_Message($contents);
+		if (!$this->message->parse()) {
+			// XML error
+			$this->error = new IXR_Error(-32700, 'parse error. not well formed');
+
+			return false;
+		}
+		// Is the message a fault?
+		if ($this->message->messageType === 'fault') {
+			$this->error = new IXR_Error($this->message->faultCode, $this->message->faultString);
+
+			return false;
+		}
+
+		// Message must be OK
+		return true;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getResponse() {
+		// methodResponses can only have one param - return that
+		return $this->message->params[0];
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isError() {
+		return is_object($this->error);
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getErrorCode() {
+		return $this->error->code;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getErrorMessage() {
+		return $this->error->message;
+	}
 }
 
 /**
@@ -739,24 +739,24 @@ 
  */
 class IXR_Error
 {
-    public $code;
-    public $message;
-
-    /**
-     * IXR_Error constructor.
-     * @param $code
-     * @param $message
-     */
-    public function __construct($code, $message) {
-        $this->code    = $code;
-        $this->message = $message;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXml() {
-        $xml = <<<EOD
+	public $code;
+	public $message;
+
+	/**
+	 * IXR_Error constructor.
+	 * @param $code
+	 * @param $message
+	 */
+	public function __construct($code, $message) {
+		$this->code    = $code;
+		$this->message = $message;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXml() {
+		$xml = <<<EOD
 <methodResponse>
   <fault>
     <value>
@@ -776,8 +776,8 @@ 
 
 EOD;
 
-        return $xml;
-    }
+		return $xml;
+	}
 }
 
 /**
@@ -785,73 +785,73 @@ 
  */
 class IXR_Date
 {
-    public $year;
-    public $month;
-    public $day;
-    public $hour;
-    public $minute;
-    public $second;
-    public $timezone;
-
-    /**
-     * IXR_Date constructor.
-     * @param $time
-     */
-    public function __construct($time) {
-        // $time can be a PHP timestamp or an ISO one
-        if (is_numeric($time)) {
-            $this->parseTimestamp($time);
-        } else {
-            $this->parseIso($time);
-        }
-    }
-
-    /**
-     * @param $timestamp
-     */
-    public function parseTimestamp($timestamp) {
-        $this->year   = date('Y', $timestamp);
-        $this->month  = date('Y', $timestamp);
-        $this->day    = date('Y', $timestamp);
-        $this->hour   = date('H', $timestamp);
-        $this->minute = date('i', $timestamp);
-        $this->second = date('s', $timestamp);
-    }
-
-    /**
-     * @param $iso
-     */
-    public function parseIso($iso) {
-        $this->year     = substr($iso, 0, 4);
-        $this->month    = substr($iso, 4, 2);
-        $this->day      = substr($iso, 6, 2);
-        $this->hour     = substr($iso, 9, 2);
-        $this->minute   = substr($iso, 12, 2);
-        $this->second   = substr($iso, 15, 2);
-        $this->timezone = substr($iso, 17);
-    }
-
-    /**
-     * @return string
-     */
-    public function getIso() {
-        return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second
-               . $this->timezone;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXml() {
-        return '<dateTime.iso8601>' . $this->getIso() . '</dateTime.iso8601>';
-    }
-
-    /**
-     * @return int
-     */
-    public function getTimestamp() {
-        return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
-    }
+	public $year;
+	public $month;
+	public $day;
+	public $hour;
+	public $minute;
+	public $second;
+	public $timezone;
+
+	/**
+	 * IXR_Date constructor.
+	 * @param $time
+	 */
+	public function __construct($time) {
+		// $time can be a PHP timestamp or an ISO one
+		if (is_numeric($time)) {
+			$this->parseTimestamp($time);
+		} else {
+			$this->parseIso($time);
+		}
+	}
+
+	/**
+	 * @param $timestamp
+	 */
+	public function parseTimestamp($timestamp) {
+		$this->year   = date('Y', $timestamp);
+		$this->month  = date('Y', $timestamp);
+		$this->day    = date('Y', $timestamp);
+		$this->hour   = date('H', $timestamp);
+		$this->minute = date('i', $timestamp);
+		$this->second = date('s', $timestamp);
+	}
+
+	/**
+	 * @param $iso
+	 */
+	public function parseIso($iso) {
+		$this->year     = substr($iso, 0, 4);
+		$this->month    = substr($iso, 4, 2);
+		$this->day      = substr($iso, 6, 2);
+		$this->hour     = substr($iso, 9, 2);
+		$this->minute   = substr($iso, 12, 2);
+		$this->second   = substr($iso, 15, 2);
+		$this->timezone = substr($iso, 17);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getIso() {
+		return $this->year . $this->month . $this->day . 'T' . $this->hour . ':' . $this->minute . ':' . $this->second
+			   . $this->timezone;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXml() {
+		return '<dateTime.iso8601>' . $this->getIso() . '</dateTime.iso8601>';
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getTimestamp() {
+		return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
+	}
 }
 
 /**
@@ -859,22 +859,22 @@ 
  */
 class IXR_Base64
 {
-    public $data;
-
-    /**
-     * IXR_Base64 constructor.
-     * @param $data
-     */
-    public function __construct($data) {
-        $this->data = $data;
-    }
-
-    /**
-     * @return string
-     */
-    public function getXml() {
-        return '<base64>' . base64_encode($this->data) . '</base64>';
-    }
+	public $data;
+
+	/**
+	 * IXR_Base64 constructor.
+	 * @param $data
+	 */
+	public function __construct($data) {
+		$this->data = $data;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getXml() {
+		return '<base64>' . base64_encode($this->data) . '</base64>';
+	}
 }
 
 /**
@@ -882,161 +882,161 @@ 
  */
 class IXR_IntrospectionServer extends IXR_Server
 {
-    public $signatures;
-    public $help;
-
-    /**
-     * IXR_IntrospectionServer constructor.
-     */
-    public function __construct() {
-        $this->setCallbacks();
-        $this->setCapabilities();
-        $this->capabilities['introspection'] = array(
-            'specUrl'     => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
-            'specVersion' => 1
-        );
-        $this->addCallback('system.methodSignature', 'this:methodSignature', array('array', 'string'),
-                           'Returns an array describing the return type and required parameters of a method');
-        $this->addCallback('system.getCapabilities', 'this:getCapabilities', array('struct'),
-                           'Returns a struct describing the XML-RPC specifications supported by this server');
-        $this->addCallback('system.listMethods', 'this:listMethods', array('array'),
-                           'Returns an array of available methods on this server');
-        $this->addCallback('system.methodHelp', 'this:methodHelp', array('string', 'string'),
-                           'Returns a documentation string for the specified method');
-    }
-
-    /**
-     * @param $method
-     * @param $callback
-     * @param $args
-     * @param $help
-     */
-    public function addCallback($method, $callback, $args, $help) {
-        $this->callbacks[$method]  = $callback;
-        $this->signatures[$method] = $args;
-        $this->help[$method]       = $help;
-    }
-
-    /**
-     * @param $methodname
-     * @param $args
-     * @return IXR_Error|mixed
-     */
-    public function call($methodname, $args) {
-        // Make sure it's in an array
-        if ($args && !is_array($args)) {
-            $args = array($args);
-        }
-        // Over-rides default call method, adds signature check
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601,
-                                 'server error. requested method "' . $this->message->methodName . '" not specified.');
-        }
-        $method     = $this->callbacks[$methodname];
-        $signature  = $this->signatures[$methodname];
-        $returnType = array_shift($signature);
-        // 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');
-        }
-        // Check the argument types
-        $ok         = true;
-        $argsbackup = $args;
-        for ($i = 0, $j = count($args); $i < $j; ++$i) {
-            $arg  = array_shift($args);
-            $type = array_shift($signature);
-            switch ($type) {
-                case 'int':
-                case 'i4':
-                    if (is_array($arg) || !is_int($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'base64':
-                case 'string':
-                    if (!is_string($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'boolean':
-                    if ($arg !== false && $arg !== true) {
-                        $ok = false;
-                    }
-                    break;
-                case 'float':
-                case 'double':
-                    if (!is_float($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'date':
-                case 'dateTime.iso8601':
-                    if (!is_a($arg, 'IXR_Date')) {
-                        $ok = false;
-                    }
-                    break;
-            }
-            if (!$ok) {
-                return new IXR_Error(-32602, 'server error. invalid method parameters');
-            }
-        }
-
-        // It passed the test - run the "real" method call
-        return parent::call($methodname, $argsbackup);
-    }
-
-    /**
-     * @param $method
-     * @return array|IXR_Error
-     */
-    public function methodSignature($method) {
-        if (!$this->hasMethod($method)) {
-            return new IXR_Error(-32601, 'server error. requested method "' . $method . '" not specified.');
-        }
-        // We should be returning an array of types
-        $types  = $this->signatures[$method];
-        $return = array();
-        foreach ($types as $type) {
-            switch ($type) {
-                case 'string':
-                    $return[] = 'string';
-                    break;
-                case 'int':
-                case 'i4':
-                    $return[] = 42;
-                    break;
-                case 'double':
-                    $return[] = 3.1415;
-                    break;
-                case 'dateTime.iso8601':
-                    $return[] = new IXR_Date(time());
-                    break;
-                case 'boolean':
-                    $return[] = true;
-                    break;
-                case 'base64':
-                    $return[] = new IXR_Base64('base64');
-                    break;
-                case 'array':
-                    $return[] = array('array');
-                    break;
-                case 'struct':
-                    $return[] = array('struct' => 'struct');
-                    break;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * @param $method
-     * @return mixed
-     */
-    public function methodHelp($method) {
-        return $this->help[$method];
-    }
+	public $signatures;
+	public $help;
+
+	/**
+	 * IXR_IntrospectionServer constructor.
+	 */
+	public function __construct() {
+		$this->setCallbacks();
+		$this->setCapabilities();
+		$this->capabilities['introspection'] = array(
+			'specUrl'     => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
+			'specVersion' => 1
+		);
+		$this->addCallback('system.methodSignature', 'this:methodSignature', array('array', 'string'),
+						   'Returns an array describing the return type and required parameters of a method');
+		$this->addCallback('system.getCapabilities', 'this:getCapabilities', array('struct'),
+						   'Returns a struct describing the XML-RPC specifications supported by this server');
+		$this->addCallback('system.listMethods', 'this:listMethods', array('array'),
+						   'Returns an array of available methods on this server');
+		$this->addCallback('system.methodHelp', 'this:methodHelp', array('string', 'string'),
+						   'Returns a documentation string for the specified method');
+	}
+
+	/**
+	 * @param $method
+	 * @param $callback
+	 * @param $args
+	 * @param $help
+	 */
+	public function addCallback($method, $callback, $args, $help) {
+		$this->callbacks[$method]  = $callback;
+		$this->signatures[$method] = $args;
+		$this->help[$method]       = $help;
+	}
+
+	/**
+	 * @param $methodname
+	 * @param $args
+	 * @return IXR_Error|mixed
+	 */
+	public function call($methodname, $args) {
+		// Make sure it's in an array
+		if ($args && !is_array($args)) {
+			$args = array($args);
+		}
+		// Over-rides default call method, adds signature check
+		if (!$this->hasMethod($methodname)) {
+			return new IXR_Error(-32601,
+								 'server error. requested method "' . $this->message->methodName . '" not specified.');
+		}
+		$method     = $this->callbacks[$methodname];
+		$signature  = $this->signatures[$methodname];
+		$returnType = array_shift($signature);
+		// 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');
+		}
+		// Check the argument types
+		$ok         = true;
+		$argsbackup = $args;
+		for ($i = 0, $j = count($args); $i < $j; ++$i) {
+			$arg  = array_shift($args);
+			$type = array_shift($signature);
+			switch ($type) {
+				case 'int':
+				case 'i4':
+					if (is_array($arg) || !is_int($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'base64':
+				case 'string':
+					if (!is_string($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'boolean':
+					if ($arg !== false && $arg !== true) {
+						$ok = false;
+					}
+					break;
+				case 'float':
+				case 'double':
+					if (!is_float($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'date':
+				case 'dateTime.iso8601':
+					if (!is_a($arg, 'IXR_Date')) {
+						$ok = false;
+					}
+					break;
+			}
+			if (!$ok) {
+				return new IXR_Error(-32602, 'server error. invalid method parameters');
+			}
+		}
+
+		// It passed the test - run the "real" method call
+		return parent::call($methodname, $argsbackup);
+	}
+
+	/**
+	 * @param $method
+	 * @return array|IXR_Error
+	 */
+	public function methodSignature($method) {
+		if (!$this->hasMethod($method)) {
+			return new IXR_Error(-32601, 'server error. requested method "' . $method . '" not specified.');
+		}
+		// We should be returning an array of types
+		$types  = $this->signatures[$method];
+		$return = array();
+		foreach ($types as $type) {
+			switch ($type) {
+				case 'string':
+					$return[] = 'string';
+					break;
+				case 'int':
+				case 'i4':
+					$return[] = 42;
+					break;
+				case 'double':
+					$return[] = 3.1415;
+					break;
+				case 'dateTime.iso8601':
+					$return[] = new IXR_Date(time());
+					break;
+				case 'boolean':
+					$return[] = true;
+					break;
+				case 'base64':
+					$return[] = new IXR_Base64('base64');
+					break;
+				case 'array':
+					$return[] = array('array');
+					break;
+				case 'struct':
+					$return[] = array('struct' => 'struct');
+					break;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * @param $method
+	 * @return mixed
+	 */
+	public function methodHelp($method) {
+		return $this->help[$method];
+	}
 }
 
 /**
@@ -1044,34 +1044,34 @@ 
  */
 class IXR_ClientMulticall extends IXR_Client
 {
-    public $calls = array();
-
-    /**
-     * IXR_ClientMulticall constructor.
-     * @param      $server
-     * @param bool $path
-     * @param int  $port
-     */
-    public function __construct($server, $path = false, $port = 80) {
-        parent::IXR_Client($server, $path, $port);
-        $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
-    }
-
-    public function addCall() {
-        $args          = func_get_args();
-        $methodName    = array_shift($args);
-        $struct        = array(
-            'methodName' => $methodName,
-            'params'     => $args
-        );
-        $this->calls[] = $struct;
-    }
-
-    /**
-     * @return bool
-     */
-    public function query() {
-        // Prepare multicall, then call the parent::query() method
-        return parent::query('system.multicall', $this->calls);
-    }
+	public $calls = array();
+
+	/**
+	 * IXR_ClientMulticall constructor.
+	 * @param      $server
+	 * @param bool $path
+	 * @param int  $port
+	 */
+	public function __construct($server, $path = false, $port = 80) {
+		parent::IXR_Client($server, $path, $port);
+		$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
+	}
+
+	public function addCall() {
+		$args          = func_get_args();
+		$methodName    = array_shift($args);
+		$struct        = array(
+			'methodName' => $methodName,
+			'params'     => $args
+		);
+		$this->calls[] = $struct;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function query() {
+		// Prepare multicall, then call the parent::query() method
+		return parent::query('system.multicall', $this->calls);
+	}
 }

class/xmlparser.php

Indentation +153 added lines, -153 removed lines

@@ -43,169 +43,169 @@
  **/
 class xmlparser extends MagpieRSS
 {
-    public $content;
-    public $charset_in;
-    public $charset_out;
+	public $content;
+	public $charset_in;
+	public $charset_out;
 
-    /**
-     *  Set up XML parser, parse source, and return populated RSS object..
-     *
-     * @param string      $content    string containing the RSS to be parsed
-     *
-     *
-     * @param string      $input_charset
-     * @param null|string $output_charset
-     * @param array       $tags
-     * @internal param string $output_encoding output the parsed RSS in this character
-     *                                set defaults to ISO-8859-1 as this is PHP's
-     *                                default.
-     *
-     * @internal param string $input_encoding the character set of the incoming RSS source.
-     *                                Leave blank and Magpie will try to figure it
-     *                                out.
-     */
-    public function __construct($content, $input_charset, $output_charset = _CHARSET, $tags = array()) {
-        if (!in_array(strtoupper($input_charset), array('UTF-8', 'US-ASCII', 'ISO-8859-1'))) {
-            $content       = XoopsLocal::convert_encoding($content, 'UTF-8', $input_charset);
-            $content       = preg_replace('/(<\?xml.*encoding=[\'"])(.*?)([\'"].*\?>)/m', '$1UTF-8$3', $content);
-            $input_charset = 'UTF-8';
-        }
-        $this->content     = $content;
-        $this->charset_in  = $input_charset;
-        $this->charset_out = $output_charset;
+	/**
+	 *  Set up XML parser, parse source, and return populated RSS object..
+	 *
+	 * @param string      $content    string containing the RSS to be parsed
+	 *
+	 *
+	 * @param string      $input_charset
+	 * @param null|string $output_charset
+	 * @param array       $tags
+	 * @internal param string $output_encoding output the parsed RSS in this character
+	 *                                set defaults to ISO-8859-1 as this is PHP's
+	 *                                default.
+	 *
+	 * @internal param string $input_encoding the character set of the incoming RSS source.
+	 *                                Leave blank and Magpie will try to figure it
+	 *                                out.
+	 */
+	public function __construct($content, $input_charset, $output_charset = _CHARSET, $tags = array()) {
+		if (!in_array(strtoupper($input_charset), array('UTF-8', 'US-ASCII', 'ISO-8859-1'))) {
+			$content       = XoopsLocal::convert_encoding($content, 'UTF-8', $input_charset);
+			$content       = preg_replace('/(<\?xml.*encoding=[\'"])(.*?)([\'"].*\?>)/m', '$1UTF-8$3', $content);
+			$input_charset = 'UTF-8';
+		}
+		$this->content     = $content;
+		$this->charset_in  = $input_charset;
+		$this->charset_out = $output_charset;
 
-        /* TODO: parse specified tags only */
-        parent::__construct($content, $input_charset, $input_charset, false);
+		/* TODO: parse specified tags only */
+		parent::__construct($content, $input_charset, $input_charset, false);
 
-        //xoops_message($this);
-        unset($this->content);
-        $this->encoding_convert($tags);
-    }
+		//xoops_message($this);
+		unset($this->content);
+		$this->encoding_convert($tags);
+	}
 
-    /**
-     * @return bool|string
-     */
-    public function is_atom() {
-        if ($this->feed_type == ATOM) {
-            $this->feed_version = empty($this->feed_version) ? '0.3' : $this->feed_version;
+	/**
+	 * @return bool|string
+	 */
+	public function is_atom() {
+		if ($this->feed_type == ATOM) {
+			$this->feed_version = empty($this->feed_version) ? '0.3' : $this->feed_version;
 
-            return $this->feed_version;
-        } else {
-            return false;
-        }
-    }
+			return $this->feed_version;
+		} else {
+			return false;
+		}
+	}
 
-    public function normalize() {
-        if ($this->is_atom()):
-            if (empty($this->channel['tagline'])) {
-                /* ATOM */
-                $this->channel['tagline'] = @$this->channel['subtitle'];
-                unset($this->channel['subtitle']);
-            }
-            for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-                // ATOM time
-                if ($date = @$this->items[$i]['modified']) {
-                    continue;
-                }
-                if (empty($date)) {
-                    $date = @$this->items[$i]['updated'];
-                }
-                if (empty($date)) {
-                    $date = @$this->items[$i]['issued'];
-                }
-                if (empty($date)) {
-                    $date = @$this->items[$i]['created'];
-                }
-                if (empty($date)) {
-                    $date = @$this->items[$i]['created'];
-                }
-                $this->items[$i]['modified'] = $date;
-            }
-        elseif ($this->is_rss() !== '1.0'):
-            for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-                if ($date = @$this->items[$i]['pubdate']) {
-                    continue;
-                }
-                $this->items[$i]['pubdate'] = @$this->items[$i]['dc']['date'];
-            }
-        endif;
-        parent::normalize();
-        /* ATOM */
-        if (empty($this->channel['language']) && !empty($this->channel['dc']['language'])) {
-            $this->channel['language'] = $this->channel['dc']['language'];
-            unset($this->channel['dc']['language']);
-        }
-        if (empty($this->channel['language'])
-            && preg_match('/<link.*hreflang=[\'"](.*?)[\'"].*?>/m', $this->content, $match)
-        ) {
-            $this->channel['language'] = $match[1];
-        }
-        if (empty($this->channel['language'])
-            && preg_match('/<feed.*xml:lang=[\'"](.*?)[\'"].*?>/m', $this->content, $match)
-        ) {
-            $this->channel['language'] = $match[1];
-        }
-        /* remove to avoid redundant encoding conversion */
-        if (!empty($this->channel['tagline'])) {
-            unset($this->channel['tagline']);
-        }
+	public function normalize() {
+		if ($this->is_atom()):
+			if (empty($this->channel['tagline'])) {
+				/* ATOM */
+				$this->channel['tagline'] = @$this->channel['subtitle'];
+				unset($this->channel['subtitle']);
+			}
+			for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+				// ATOM time
+				if ($date = @$this->items[$i]['modified']) {
+					continue;
+				}
+				if (empty($date)) {
+					$date = @$this->items[$i]['updated'];
+				}
+				if (empty($date)) {
+					$date = @$this->items[$i]['issued'];
+				}
+				if (empty($date)) {
+					$date = @$this->items[$i]['created'];
+				}
+				if (empty($date)) {
+					$date = @$this->items[$i]['created'];
+				}
+				$this->items[$i]['modified'] = $date;
+			}
+		elseif ($this->is_rss() !== '1.0'):
+			for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+				if ($date = @$this->items[$i]['pubdate']) {
+					continue;
+				}
+				$this->items[$i]['pubdate'] = @$this->items[$i]['dc']['date'];
+			}
+		endif;
+		parent::normalize();
+		/* ATOM */
+		if (empty($this->channel['language']) && !empty($this->channel['dc']['language'])) {
+			$this->channel['language'] = $this->channel['dc']['language'];
+			unset($this->channel['dc']['language']);
+		}
+		if (empty($this->channel['language'])
+			&& preg_match('/<link.*hreflang=[\'"](.*?)[\'"].*?>/m', $this->content, $match)
+		) {
+			$this->channel['language'] = $match[1];
+		}
+		if (empty($this->channel['language'])
+			&& preg_match('/<feed.*xml:lang=[\'"](.*?)[\'"].*?>/m', $this->content, $match)
+		) {
+			$this->channel['language'] = $match[1];
+		}
+		/* remove to avoid redundant encoding conversion */
+		if (!empty($this->channel['tagline'])) {
+			unset($this->channel['tagline']);
+		}
 
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            if ($date_timestamp = @$this->items[$i]['date_timestamp']) {
-                continue;
-            }
-            if ($date_timestamp = @$this->items[$i]['pubdate']) {
-                $this->items[$i]['date_timestamp'] = $date_timestamp;
-            } elseif ($date_timestamp = @$this->items[$i]['dc']['date']) {
-                $this->items[$i]['date_timestamp'] = $date_timestamp;
-            } else {
-                $this->items[$i]['date_timestamp'] = time();
-            }
-            if (!is_numeric($this->items[$i]['date_timestamp'])) {
-                if ($date = parse_w3cdtf($this->items[$i]['date_timestamp'])) {
-                    $this->items[$i]['date_timestamp'] = $date;
-                } elseif ($date = strtotime($this->items[$i]['date_timestamp'])) {
-                    $this->items[$i]['date_timestamp'] = $date;
-                }
-            }
+		for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+			if ($date_timestamp = @$this->items[$i]['date_timestamp']) {
+				continue;
+			}
+			if ($date_timestamp = @$this->items[$i]['pubdate']) {
+				$this->items[$i]['date_timestamp'] = $date_timestamp;
+			} elseif ($date_timestamp = @$this->items[$i]['dc']['date']) {
+				$this->items[$i]['date_timestamp'] = $date_timestamp;
+			} else {
+				$this->items[$i]['date_timestamp'] = time();
+			}
+			if (!is_numeric($this->items[$i]['date_timestamp'])) {
+				if ($date = parse_w3cdtf($this->items[$i]['date_timestamp'])) {
+					$this->items[$i]['date_timestamp'] = $date;
+				} elseif ($date = strtotime($this->items[$i]['date_timestamp'])) {
+					$this->items[$i]['date_timestamp'] = $date;
+				}
+			}
 
-            /* remove to avoid redundant encoding conversion */
-            if (isset($this->items[$i]['summary'])) {
-                unset($this->items[$i]['summary']);
-            }
-            if (isset($this->items[$i]['atom_content'])) {
-                unset($this->items[$i]['atom_content']);
-            }
-        }
+			/* remove to avoid redundant encoding conversion */
+			if (isset($this->items[$i]['summary'])) {
+				unset($this->items[$i]['summary']);
+			}
+			if (isset($this->items[$i]['atom_content'])) {
+				unset($this->items[$i]['atom_content']);
+			}
+		}
 
-        return;
-    }
+		return;
+	}
 
-    /**
-     * @param array $tags
-     */
-    public function encoding_convert($tags = array()) {
-        if (empty($tags) || in_array('channel', $tags)) {
-            $this->channel = $this->_encoding($this->channel);
-        }
-        if (empty($tags) || in_array('items', $tags)) {
-            $this->items = $this->_encoding($this->items);
-        }
-    }
+	/**
+	 * @param array $tags
+	 */
+	public function encoding_convert($tags = array()) {
+		if (empty($tags) || in_array('channel', $tags)) {
+			$this->channel = $this->_encoding($this->channel);
+		}
+		if (empty($tags) || in_array('items', $tags)) {
+			$this->items = $this->_encoding($this->items);
+		}
+	}
 
-    /**
-     * @param $val
-     * @return array|mixed|string
-     */
-    public function _encoding($val) {
-        if (is_array($val)) {
-            foreach (array_keys($val) as $key) {
-                $val[$key] = $this->_encoding($val[$key]);
-            }
-        } else {
-            $val = XoopsLocal::convert_encoding($val, $this->charset_out, $this->charset_in);
-        }
+	/**
+	 * @param $val
+	 * @return array|mixed|string
+	 */
+	public function _encoding($val) {
+		if (is_array($val)) {
+			foreach (array_keys($val) as $key) {
+				$val[$key] = $this->_encoding($val[$key]);
+			}
+		} else {
+			$val = XoopsLocal::convert_encoding($val, $this->charset_out, $this->charset_in);
+		}
 
-        return $val;
-    }
+		return $val;
+	}
 }

class/xmlpc.php

Indentation +56 added lines, -56 removed lines

@@ -30,70 +30,70 @@
 mod_loadFunctions('', $GLOBALS['moddirname']);
 
 if (!class_exists('Xmlrpc_client')) {
-    /**
-     * Class Xmlrpc_client
-     */
-    class Xmlrpc_client
-    {
-        /**
-         * Xmlrpc_client constructor.
-         */
-        public function __construct() {
-        }
+	/**
+	 * Class Xmlrpc_client
+	 */
+	class Xmlrpc_client
+	{
+		/**
+		 * Xmlrpc_client constructor.
+		 */
+		public function __construct() {
+		}
 
-        /**
-         * @param $article
-         */
-        public function setObject(&$article) {
-            $this->$var = $val;
-        }
+		/**
+		 * @param $article
+		 */
+		public function setObject(&$article) {
+			$this->$var = $val;
+		}
 
-        /**
-         * @param $var
-         * @param $val
-         */
-        public function setVar($var, $val) {
-            $this->$var = $val;
-        }
+		/**
+		 * @param $var
+		 * @param $val
+		 */
+		public function setVar($var, $val) {
+			$this->$var = $val;
+		}
 
-        /**
-         * @param $var
-         * @return mixed
-         */
-        public function getVar($var) {
-            return $this->$var;
-        }
-    }
+		/**
+		 * @param $var
+		 * @return mixed
+		 */
+		public function getVar($var) {
+			return $this->$var;
+		}
+	}
 }
 
 if (!class_exists('Xmlrpc_server')) {
-    /**
-     * Class Xmlrpc_server
-     */
-    class Xmlrpc_server
-    {
-        /**
-         * Xmlrpc_server constructor.
-         */
-        public function __construct() {
-        }
+	/**
+	 * Class Xmlrpc_server
+	 */
+	class Xmlrpc_server
+	{
+		/**
+		 * Xmlrpc_server constructor.
+		 */
+		public function __construct() {
+		}
 
-        /**
-         * @param $var
-         * @param $val
-         */
-        public function setVar($var, $val) {
-            $this->$var = $val;
-        }
+		/**
+		 * @param $var
+		 * @param $val
+		 */
+		public function setVar($var, $val) {
+			$this->$var = $val;
+		}
 
-        /**
-         * @param $var
-         * @return mixed
-         */
-        public function getVar($var) {
-            return $this->$var;
-        }
-    }
+		/**
+		 * @param $var
+		 * @return mixed
+		 */
+		public function getVar($var) {
+			return $this->$var;
+		}
+	}
 }
 
 planet_parse_class('

class/bookmark.php

Indentation +18 added lines, -18 removed lines

@@ -44,24 +44,24 @@
  **/
 if (!class_exists('Bookmark')):
 
-    /**
-     * Class Bookmark
-     */
-    class Bookmark extends XoopsObject
-    {
-        /**
-         * Constructor
-         */
-        public function __construct() {
-            //            $this->ArtObject();
-            $this->table = planet_DB_prefix('bookmark');
-            $this->initVar('bm_id', XOBJ_DTYPE_INT, null, false);
-            /* user ID */
-            $this->initVar('bm_uid', XOBJ_DTYPE_INT, 0, true);
-            /* blog ID */
-            $this->initVar('blog_id', XOBJ_DTYPE_INT, 0, true);
-        }
-    }
+	/**
+	 * Class Bookmark
+	 */
+	class Bookmark extends XoopsObject
+	{
+		/**
+		 * Constructor
+		 */
+		public function __construct() {
+			//            $this->ArtObject();
+			$this->table = planet_DB_prefix('bookmark');
+			$this->initVar('bm_id', XOBJ_DTYPE_INT, null, false);
+			/* user ID */
+			$this->initVar('bm_uid', XOBJ_DTYPE_INT, 0, true);
+			/* blog ID */
+			$this->initVar('blog_id', XOBJ_DTYPE_INT, 0, true);
+		}
+	}
 endif;
 /**
  * Topic object handler class.