mambax7 / planet

class/class-IXR.php

Doc Comments +6 added lines, -6 removed lines

@@ -166,7 +166,7 @@ 
 
     /**
      * IXR_Message constructor.
-     * @param $message
+     * @param string|boolean $message
      */
     public function __construct($message) {
         $this->message = $message;
@@ -863,7 +863,7 @@ 
 
     /**
      * IXR_Base64 constructor.
-     * @param $data
+     * @param string $data
      */
     public function __construct($data) {
         $this->data = $data;
@@ -906,10 +906,10 @@ 
     }
 
     /**
-     * @param $method
-     * @param $callback
-     * @param $args
-     * @param $help
+     * @param string $method
+     * @param string $callback
+     * @param string[] $args
+     * @param string $help
      */
     public function addCallback($method, $callback, $args, $help) {
         $this->callbacks[$method]  = $callback;

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/feedcreator.class.php

Doc Comments +7 added lines, -6 removed lines

@@ -352,7 +352,7 @@ 
     public $_feed;
 
     /**
-     * @param $format
+     * @param string $format
      */
     public function _setFormat($format) {
         switch (strtoupper($format)) {
@@ -529,7 +529,7 @@ 
     /**
      * Adds an FeedItem to the feed.
      *
-     * @param $item
+     * @param FeedItem $item
      * @internal param FeedItem $object $item The FeedItem to add to the feed.
      * @access   public
      */
@@ -547,6 +547,7 @@ 
      * @static
      * @param string     string A string to be truncated.
      * @param int        length the maximum length the string should be truncated to
+     * @param integer $length
      * @return string the truncated string
      */
     public function iTrunc($string, $length) {
@@ -652,7 +653,7 @@ 
     /**
      * @since  1.4
      * @access private
-     * @param $filename
+     * @param string $filename
      */
     public function _redirect($filename) {
         // attention, heavily-commented-out-area
@@ -807,7 +808,7 @@ 
     /**
      * Gets the date stored in this FeedDate as an RFC 822 date.
      *
-     * @return a date in RFC 822 format
+     * @return string date in RFC 822 format
      */
     public function rfc822() {
         //return gmdate("r",$this->unix);
@@ -822,7 +823,7 @@ 
     /**
      * Gets the date stored in this FeedDate as an ISO 8601 date.
      *
-     * @return a date in ISO 8601 format
+     * @return string date in ISO 8601 format
      */
     public function iso8601() {
         $date = gmdate("Y-m-d\TH:i:sO", $this->unix);
@@ -949,7 +950,7 @@ 
     /**
      * Sets this RSS feed's version number.
      * @access private
-     * @param $version
+     * @param string $version
      */
     public function _setRSSVersion($version) {
         $this->RSSVersion = $version;

Indentation +1199 added lines, -1199 removed lines

@@ -197,43 +197,43 @@ 
  */
 class FeedItem extends HtmlDescribable
 {
-    /**
-     * Mandatory attributes of an item.
-     */
-    public $title, $description, $link;
-
-    /**
-     * Optional attributes of an item.
-     */
-    public $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator;
-
-    /**
-     * Publishing date of an item. May be in one of the following formats:
-     *
-     *  RFC 822:
-     *  "Mon, 20 Jan 03 18:05:41 +0400"
-     *  "20 Jan 03 18:05:41 +0000"
-     *
-     *  ISO 8601:
-     *  "2003-01-20T18:05:41+04:00"
-     *
-     *  Unix:
-     *  1043082341
-     */
-    public $date;
-
-    /**
-     * Any additional elements to include as an assiciated array. All $key => $value pairs
-     * will be included unencoded in the feed item in the form
-     *     <$key>$value</$key>
-     * Again: No encoding will be used! This means you can invalidate or enhance the feed
-     * if $value contains markup. This may be abused to embed tags not implemented by
-     * the FeedCreator class used.
-     */
-    public $additionalElements = array();
-
-    // on hold
-    // var $source;
+	/**
+	 * Mandatory attributes of an item.
+	 */
+	public $title, $description, $link;
+
+	/**
+	 * Optional attributes of an item.
+	 */
+	public $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator;
+
+	/**
+	 * Publishing date of an item. May be in one of the following formats:
+	 *
+	 *  RFC 822:
+	 *  "Mon, 20 Jan 03 18:05:41 +0400"
+	 *  "20 Jan 03 18:05:41 +0000"
+	 *
+	 *  ISO 8601:
+	 *  "2003-01-20T18:05:41+04:00"
+	 *
+	 *  Unix:
+	 *  1043082341
+	 */
+	public $date;
+
+	/**
+	 * Any additional elements to include as an assiciated array. All $key => $value pairs
+	 * will be included unencoded in the feed item in the form
+	 *     <$key>$value</$key>
+	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
+	 * if $value contains markup. This may be abused to embed tags not implemented by
+	 * the FeedCreator class used.
+	 */
+	public $additionalElements = array();
+
+	// on hold
+	// var $source;
 }
 
 /**
@@ -243,15 +243,15 @@ 
  */
 class FeedImage extends HtmlDescribable
 {
-    /**
-     * Mandatory attributes of an image.
-     */
-    public $title, $url, $link;
-
-    /**
-     * Optional attributes of an image.
-     */
-    public $width, $height, $description;
+	/**
+	 * Mandatory attributes of an image.
+	 */
+	public $title, $url, $link;
+
+	/**
+	 * Optional attributes of an image.
+	 */
+	public $width, $height, $description;
 }
 
 /**
@@ -260,28 +260,28 @@ 
  */
 class HtmlDescribable
 {
-    /**
-     * Indicates whether the description field should be rendered in HTML.
-     */
-    public $descriptionHtmlSyndicated;
-
-    /**
-     * Indicates whether and to how many characters a description should be truncated.
-     */
-    public $descriptionTruncSize;
-
-    /**
-     * Returns a formatted description field, depending on descriptionHtmlSyndicated and
-     * $descriptionTruncSize properties
-     * @return string the formatted description
-     */
-    public function getDescription() {
-        $descriptionField                = new FeedHtmlField($this->description);
-        $descriptionField->syndicateHtml = $this->descriptionHtmlSyndicated;
-        $descriptionField->truncSize     = $this->descriptionTruncSize;
-
-        return $descriptionField->output();
-    }
+	/**
+	 * Indicates whether the description field should be rendered in HTML.
+	 */
+	public $descriptionHtmlSyndicated;
+
+	/**
+	 * Indicates whether and to how many characters a description should be truncated.
+	 */
+	public $descriptionTruncSize;
+
+	/**
+	 * Returns a formatted description field, depending on descriptionHtmlSyndicated and
+	 * $descriptionTruncSize properties
+	 * @return string the formatted description
+	 */
+	public function getDescription() {
+		$descriptionField                = new FeedHtmlField($this->description);
+		$descriptionField->syndicateHtml = $this->descriptionHtmlSyndicated;
+		$descriptionField->truncSize     = $this->descriptionTruncSize;
+
+		return $descriptionField->output();
+	}
 }
 
 /**
@@ -292,50 +292,50 @@ 
  */
 class FeedHtmlField
 {
-    /**
-     * Mandatory attributes of a FeedHtmlField.
-     */
-    public $rawFieldContent;
-
-    /**
-     * Optional attributes of a FeedHtmlField.
-     *
-     */
-    public $truncSize, $syndicateHtml;
-
-    /**
-     * Creates a new instance of FeedHtmlField.
-     * @param $parFieldContent
-     * @internal param $string : if given, sets the rawFieldContent property
-     */
-    public function __construct($parFieldContent) {
-        if ($parFieldContent) {
-            $this->rawFieldContent = $parFieldContent;
-        }
-    }
-
-    /**
-     * Creates the right output, depending on $truncSize, $syndicateHtml properties.
-     * @return string the formatted field
-     */
-    public function output() {
-        // when field available and syndicated in html we assume
-        // - valid html in $rawFieldContent and we enclose in CDATA tags
-        // - no truncation (truncating risks producing invalid html)
-        if (!$this->rawFieldContent) {
-            $result = '';
-        } elseif ($this->syndicateHtml) {
-            $result = '<![CDATA[' . $this->rawFieldContent . ']]>';
-        } else {
-            if ($this->truncSize && is_int($this->truncSize)) {
-                $result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent), $this->truncSize);
-            } else {
-                $result = htmlspecialchars($this->rawFieldContent);
-            }
-        }
-
-        return $result;
-    }
+	/**
+	 * Mandatory attributes of a FeedHtmlField.
+	 */
+	public $rawFieldContent;
+
+	/**
+	 * Optional attributes of a FeedHtmlField.
+	 *
+	 */
+	public $truncSize, $syndicateHtml;
+
+	/**
+	 * Creates a new instance of FeedHtmlField.
+	 * @param $parFieldContent
+	 * @internal param $string : if given, sets the rawFieldContent property
+	 */
+	public function __construct($parFieldContent) {
+		if ($parFieldContent) {
+			$this->rawFieldContent = $parFieldContent;
+		}
+	}
+
+	/**
+	 * Creates the right output, depending on $truncSize, $syndicateHtml properties.
+	 * @return string the formatted field
+	 */
+	public function output() {
+		// when field available and syndicated in html we assume
+		// - valid html in $rawFieldContent and we enclose in CDATA tags
+		// - no truncation (truncating risks producing invalid html)
+		if (!$this->rawFieldContent) {
+			$result = '';
+		} elseif ($this->syndicateHtml) {
+			$result = '<![CDATA[' . $this->rawFieldContent . ']]>';
+		} else {
+			if ($this->truncSize && is_int($this->truncSize)) {
+				$result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent), $this->truncSize);
+			} else {
+				$result = htmlspecialchars($this->rawFieldContent);
+			}
+		}
+
+		return $result;
+	}
 }
 
 /**
@@ -349,125 +349,125 @@ 
  */
 class UniversalFeedCreator extends FeedCreator
 {
-    public $_feed;
-
-    /**
-     * @param $format
-     */
-    public function _setFormat($format) {
-        switch (strtoupper($format)) {
-
-            case '2.0':
-                // fall through
-            case 'RSS2.0':
-                $this->_feed = new RSSCreator20();
-                break;
-
-            case '1.0':
-                // fall through
-            case 'RSS1.0':
-                $this->_feed = new RSSCreator10();
-                break;
-
-            case '0.91':
-                // fall through
-            case 'RSS0.91':
-                $this->_feed = new RSSCreator091();
-                break;
-
-            case 'PIE0.1':
-                $this->_feed = new PIECreator01();
-                break;
-
-            case 'MBOX':
-                $this->_feed = new MBOXCreator();
-                break;
-
-            case 'OPML':
-                $this->_feed = new OPMLCreator();
-                break;
-
-            case 'ATOM':
-                // fall through: always the latest ATOM version
-
-            case 'ATOM0.3':
-                $this->_feed = new AtomCreator03();
-                break;
-
-            case 'HTML':
-                $this->_feed = new HTMLCreator();
-                break;
-
-            case 'JS':
-                // fall through
-            case 'JAVASCRIPT':
-                $this->_feed = new JSCreator();
-                break;
-
-            default:
-                $this->_feed = new RSSCreator091();
-                break;
-        }
-
-        $vars = get_object_vars($this);
-        foreach ($vars as $key => $value) {
-            // prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself
-            //if (!in_array($key, array("_feed", "contentType", "encoding"))) {
-            $this->_feed->{$key} = $this->{$key};
-            //}
-        }
-    }
-
-    /**
-     * Creates a syndication feed based on the items previously added.
-     *
-     * @see        FeedCreator::addItem()
-     * @param    string    format    format the feed should comply to. Valid values are:
-     *                     "PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS"
-     * @return string the contents of the feed.
-     */
-    public function createFeed($format = 'RSS0.91') {
-        $this->_setFormat($format);
-
-        return $this->_feed->createFeed();
-    }
-
-    /**
-     * Saves this feed as a file on the local disk. After the file is saved, an HTTP redirect
-     * header may be sent to redirect the use to the newly created file.
-     * @since    1.4
-     *
-     * @param string $format
-     * @param string $filename
-     * @param bool   $displayContents displayContents optional    send the content of the file or not. If true, the file will be sent in the body of the response.
-     * @internal param format $string format the feed should comply to. Valid values are:
-     *                                "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS"
-     * @internal param filename $string optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-     */
-    public function saveFeed($format = 'RSS0.91', $filename = '', $displayContents = true) {
-        $this->_setFormat($format);
-        $this->_feed->saveFeed($filename, $displayContents);
-    }
-
-    /**
-     * Turns on caching and checks if there is a recent version of this feed in the cache.
-     * If there is, an HTTP redirect header is sent.
-     * To effectively use caching, you should create the FeedCreator object and call this method
-     * before anything else, especially before you do the time consuming task to build the feed
-     * (web fetching, for example).
-     *
-     * @param string $format
-     * @param string $filename
-     * @param int    $timeout
-     * @internal param format $string format the feed should comply to. Valid values are:
-     *                     "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
-     * @internal param string $filename optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-     * @internal param int $timeout optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
-     */
-    public function useCached($format = 'RSS0.91', $filename = '', $timeout = 3600) {
-        $this->_setFormat($format);
-        $this->_feed->useCached($filename, $timeout);
-    }
+	public $_feed;
+
+	/**
+	 * @param $format
+	 */
+	public function _setFormat($format) {
+		switch (strtoupper($format)) {
+
+			case '2.0':
+				// fall through
+			case 'RSS2.0':
+				$this->_feed = new RSSCreator20();
+				break;
+
+			case '1.0':
+				// fall through
+			case 'RSS1.0':
+				$this->_feed = new RSSCreator10();
+				break;
+
+			case '0.91':
+				// fall through
+			case 'RSS0.91':
+				$this->_feed = new RSSCreator091();
+				break;
+
+			case 'PIE0.1':
+				$this->_feed = new PIECreator01();
+				break;
+
+			case 'MBOX':
+				$this->_feed = new MBOXCreator();
+				break;
+
+			case 'OPML':
+				$this->_feed = new OPMLCreator();
+				break;
+
+			case 'ATOM':
+				// fall through: always the latest ATOM version
+
+			case 'ATOM0.3':
+				$this->_feed = new AtomCreator03();
+				break;
+
+			case 'HTML':
+				$this->_feed = new HTMLCreator();
+				break;
+
+			case 'JS':
+				// fall through
+			case 'JAVASCRIPT':
+				$this->_feed = new JSCreator();
+				break;
+
+			default:
+				$this->_feed = new RSSCreator091();
+				break;
+		}
+
+		$vars = get_object_vars($this);
+		foreach ($vars as $key => $value) {
+			// prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself
+			//if (!in_array($key, array("_feed", "contentType", "encoding"))) {
+			$this->_feed->{$key} = $this->{$key};
+			//}
+		}
+	}
+
+	/**
+	 * Creates a syndication feed based on the items previously added.
+	 *
+	 * @see        FeedCreator::addItem()
+	 * @param    string    format    format the feed should comply to. Valid values are:
+	 *                     "PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS"
+	 * @return string the contents of the feed.
+	 */
+	public function createFeed($format = 'RSS0.91') {
+		$this->_setFormat($format);
+
+		return $this->_feed->createFeed();
+	}
+
+	/**
+	 * Saves this feed as a file on the local disk. After the file is saved, an HTTP redirect
+	 * header may be sent to redirect the use to the newly created file.
+	 * @since    1.4
+	 *
+	 * @param string $format
+	 * @param string $filename
+	 * @param bool   $displayContents displayContents optional    send the content of the file or not. If true, the file will be sent in the body of the response.
+	 * @internal param format $string format the feed should comply to. Valid values are:
+	 *                                "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS"
+	 * @internal param filename $string optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 */
+	public function saveFeed($format = 'RSS0.91', $filename = '', $displayContents = true) {
+		$this->_setFormat($format);
+		$this->_feed->saveFeed($filename, $displayContents);
+	}
+
+	/**
+	 * Turns on caching and checks if there is a recent version of this feed in the cache.
+	 * If there is, an HTTP redirect header is sent.
+	 * To effectively use caching, you should create the FeedCreator object and call this method
+	 * before anything else, especially before you do the time consuming task to build the feed
+	 * (web fetching, for example).
+	 *
+	 * @param string $format
+	 * @param string $filename
+	 * @param int    $timeout
+	 * @internal param format $string format the feed should comply to. Valid values are:
+	 *                     "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
+	 * @internal param string $filename optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @internal param int $timeout optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+	 */
+	public function useCached($format = 'RSS0.91', $filename = '', $timeout = 3600) {
+		$this->_setFormat($format);
+		$this->_feed->useCached($filename, $timeout);
+	}
 }
 
 /**
@@ -480,246 +480,246 @@ 
  */
 class FeedCreator extends HtmlDescribable
 {
-    /**
-     * Mandatory attributes of a feed.
-     */
-    public $title, $description, $link;
-
-    /**
-     * Optional attributes of a feed.
-     */
-    public $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays;
-
-    /**
-     * The url of the external xsl stylesheet used to format the naked rss feed.
-     * Ignored in the output when empty.
-     */
-    public $xslStyleSheet = '';
-
-    public $cssStyleSheet = '';
-
-    /**
-     * @access private
-     */
-    public $items = array();
-
-    /**
-     * This feed's MIME content type.
-     * @since  1.4
-     * @access private
-     */
-    public $contentType = 'application/xml';
-
-    /**
-     * This feed's character encoding.
-     * @since 1.6.1
-     **/
-    public $encoding = 'ISO-8859-1';
-
-    /**
-     * Any additional elements to include as an assiciated array. All $key => $value pairs
-     * will be included unencoded in the feed in the form
-     *     <$key>$value</$key>
-     * Again: No encoding will be used! This means you can invalidate or enhance the feed
-     * if $value contains markup. This may be abused to embed tags not implemented by
-     * the FeedCreator class used.
-     */
-    public $additionalElements = array();
-
-    /**
-     * Adds an FeedItem to the feed.
-     *
-     * @param $item
-     * @internal param FeedItem $object $item The FeedItem to add to the feed.
-     * @access   public
-     */
-    public function addItem($item) {
-        $this->items[] = $item;
-    }
-
-    /**
-     * Truncates a string to a certain length at the most sensible point.
-     * First, if there's a '.' character near the end of the string, the string is truncated after this character.
-     * If there is no '.', the string is truncated after the last ' ' character.
-     * If the string is truncated, " ..." is appended.
-     * If the string is already shorter than $length, it is returned unchanged.
-     *
-     * @static
-     * @param string     string A string to be truncated.
-     * @param int        length the maximum length the string should be truncated to
-     * @return string the truncated string
-     */
-    public function iTrunc($string, $length) {
-        if (strlen($string) <= $length) {
-            return $string;
-        }
-
-        $pos = strrpos($string, '.');
-        if ($pos >= $length - 4) {
-            $string = substr($string, 0, $length - 4);
-            $pos    = strrpos($string, '.');
-        }
-        if ($pos >= $length * 0.4) {
-            return substr($string, 0, $pos + 1) . ' ...';
-        }
-
-        $pos = strrpos($string, ' ');
-        if ($pos >= $length - 4) {
-            $string = substr($string, 0, $length - 4);
-            $pos    = strrpos($string, ' ');
-        }
-        if ($pos >= $length * 0.4) {
-            return substr($string, 0, $pos) . ' ...';
-        }
-
-        return substr($string, 0, $length - 4) . ' ...';
-    }
-
-    /**
-     * Creates a comment indicating the generator of this feed.
-     * The format of this comment seems to be recognized by
-     * Syndic8.com.
-     */
-    public function _createGeneratorComment() {
-        return "<!-- generator=\"" . FEEDCREATOR_VERSION . "\" -->\n";
-    }
-
-    /**
-     * Creates a string containing all additional elements specified in
-     * $additionalElements.
-     * @param array  $elements
-     * @param string $indentString
-     * @return string the XML tags corresponding to $additionalElements
-     * @internal param array $elements an associative array containing key => value pairs
-     * @internal param string $indentString a string that will be inserted before every generated line
-     */
-    public function _createAdditionalElements($elements, $indentString = '') {
-        $ae = '';
-        if (is_array($elements)) {
-            foreach ($elements as $key => $value) {
-                $ae .= $indentString . "<$key>$value</$key>\n";
-            }
-        }
-
-        return $ae;
-    }
-
-    /**
-     * @return string
-     */
-    public function _createStylesheetReferences() {
-        $xml = '';
-        if ($this->cssStyleSheet) {
-            $xml .= "<?xml-stylesheet href=\"" . $this->cssStyleSheet . "\" type=\"text/css\"?>\n";
-        }
-        if ($this->xslStyleSheet) {
-            $xml .= "<?xml-stylesheet href=\"" . $this->xslStyleSheet . "\" type=\"text/xsl\"?>\n";
-        }
-
-        return $xml;
-    }
-
-    /**
-     * Builds the feed's text.
-     * @abstract
-     * @return string the feed's complete text
-     */
-    public function createFeed() {
-    }
-
-    /**
-     * Generate a filename for the feed cache file. The result will be $_SERVER["PHP_SELF"] with the extension changed to .xml.
-     * For example:
-     *
-     * echo $_SERVER["PHP_SELF"]."\n";
-     * echo FeedCreator::_generateFilename();
-     *
-     * would produce:
-     *
-     * /rss/latestnews.php
-     * latestnews.xml
-     *
-     * @return string the feed cache filename
-     * @since  1.4
-     * @access private
-     */
-    public function _generateFilename() {
-        $fileInfo = pathinfo($_SERVER['PHP_SELF']);
-
-        return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.xml';
-    }
-
-    /**
-     * @since  1.4
-     * @access private
-     * @param $filename
-     */
-    public function _redirect($filename) {
-        // attention, heavily-commented-out-area
-
-        // maybe use this in addition to file time checking
-        //Header("Expires: ".date("r",time()+$this->_timeout));
-
-        /* no caching at all, doesn't seem to work as good:
+	/**
+	 * Mandatory attributes of a feed.
+	 */
+	public $title, $description, $link;
+
+	/**
+	 * Optional attributes of a feed.
+	 */
+	public $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays;
+
+	/**
+	 * The url of the external xsl stylesheet used to format the naked rss feed.
+	 * Ignored in the output when empty.
+	 */
+	public $xslStyleSheet = '';
+
+	public $cssStyleSheet = '';
+
+	/**
+	 * @access private
+	 */
+	public $items = array();
+
+	/**
+	 * This feed's MIME content type.
+	 * @since  1.4
+	 * @access private
+	 */
+	public $contentType = 'application/xml';
+
+	/**
+	 * This feed's character encoding.
+	 * @since 1.6.1
+	 **/
+	public $encoding = 'ISO-8859-1';
+
+	/**
+	 * Any additional elements to include as an assiciated array. All $key => $value pairs
+	 * will be included unencoded in the feed in the form
+	 *     <$key>$value</$key>
+	 * Again: No encoding will be used! This means you can invalidate or enhance the feed
+	 * if $value contains markup. This may be abused to embed tags not implemented by
+	 * the FeedCreator class used.
+	 */
+	public $additionalElements = array();
+
+	/**
+	 * Adds an FeedItem to the feed.
+	 *
+	 * @param $item
+	 * @internal param FeedItem $object $item The FeedItem to add to the feed.
+	 * @access   public
+	 */
+	public function addItem($item) {
+		$this->items[] = $item;
+	}
+
+	/**
+	 * Truncates a string to a certain length at the most sensible point.
+	 * First, if there's a '.' character near the end of the string, the string is truncated after this character.
+	 * If there is no '.', the string is truncated after the last ' ' character.
+	 * If the string is truncated, " ..." is appended.
+	 * If the string is already shorter than $length, it is returned unchanged.
+	 *
+	 * @static
+	 * @param string     string A string to be truncated.
+	 * @param int        length the maximum length the string should be truncated to
+	 * @return string the truncated string
+	 */
+	public function iTrunc($string, $length) {
+		if (strlen($string) <= $length) {
+			return $string;
+		}
+
+		$pos = strrpos($string, '.');
+		if ($pos >= $length - 4) {
+			$string = substr($string, 0, $length - 4);
+			$pos    = strrpos($string, '.');
+		}
+		if ($pos >= $length * 0.4) {
+			return substr($string, 0, $pos + 1) . ' ...';
+		}
+
+		$pos = strrpos($string, ' ');
+		if ($pos >= $length - 4) {
+			$string = substr($string, 0, $length - 4);
+			$pos    = strrpos($string, ' ');
+		}
+		if ($pos >= $length * 0.4) {
+			return substr($string, 0, $pos) . ' ...';
+		}
+
+		return substr($string, 0, $length - 4) . ' ...';
+	}
+
+	/**
+	 * Creates a comment indicating the generator of this feed.
+	 * The format of this comment seems to be recognized by
+	 * Syndic8.com.
+	 */
+	public function _createGeneratorComment() {
+		return "<!-- generator=\"" . FEEDCREATOR_VERSION . "\" -->\n";
+	}
+
+	/**
+	 * Creates a string containing all additional elements specified in
+	 * $additionalElements.
+	 * @param array  $elements
+	 * @param string $indentString
+	 * @return string the XML tags corresponding to $additionalElements
+	 * @internal param array $elements an associative array containing key => value pairs
+	 * @internal param string $indentString a string that will be inserted before every generated line
+	 */
+	public function _createAdditionalElements($elements, $indentString = '') {
+		$ae = '';
+		if (is_array($elements)) {
+			foreach ($elements as $key => $value) {
+				$ae .= $indentString . "<$key>$value</$key>\n";
+			}
+		}
+
+		return $ae;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function _createStylesheetReferences() {
+		$xml = '';
+		if ($this->cssStyleSheet) {
+			$xml .= "<?xml-stylesheet href=\"" . $this->cssStyleSheet . "\" type=\"text/css\"?>\n";
+		}
+		if ($this->xslStyleSheet) {
+			$xml .= "<?xml-stylesheet href=\"" . $this->xslStyleSheet . "\" type=\"text/xsl\"?>\n";
+		}
+
+		return $xml;
+	}
+
+	/**
+	 * Builds the feed's text.
+	 * @abstract
+	 * @return string the feed's complete text
+	 */
+	public function createFeed() {
+	}
+
+	/**
+	 * Generate a filename for the feed cache file. The result will be $_SERVER["PHP_SELF"] with the extension changed to .xml.
+	 * For example:
+	 *
+	 * echo $_SERVER["PHP_SELF"]."\n";
+	 * echo FeedCreator::_generateFilename();
+	 *
+	 * would produce:
+	 *
+	 * /rss/latestnews.php
+	 * latestnews.xml
+	 *
+	 * @return string the feed cache filename
+	 * @since  1.4
+	 * @access private
+	 */
+	public function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER['PHP_SELF']);
+
+		return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.xml';
+	}
+
+	/**
+	 * @since  1.4
+	 * @access private
+	 * @param $filename
+	 */
+	public function _redirect($filename) {
+		// attention, heavily-commented-out-area
+
+		// maybe use this in addition to file time checking
+		//Header("Expires: ".date("r",time()+$this->_timeout));
+
+		/* no caching at all, doesn't seem to work as good:
         Header("Cache-Control: no-cache");
         Header("Pragma: no-cache");
         */
 
-        // HTTP redirect, some feed readers' simple HTTP implementations don't follow it
-        //Header("Location: ".$filename);
-
-        header('Content-Type: ' . $this->contentType . '; charset=' . $this->encoding . '; filename='
-               . basename($filename));
-        header('Content-Disposition: inline; filename=' . basename($filename));
-        readfile($filename, 'r');
-        die();
-    }
-
-    /**
-     * Turns on caching and checks if there is a recent version of this feed in the cache.
-     * If there is, an HTTP redirect header is sent.
-     * To effectively use caching, you should create the FeedCreator object and call this method
-     * before anything else, especially before you do the time consuming task to build the feed
-     * (web fetching, for example).
-     * @since    1.4
-     * @param     filename  string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-     * @param int $timeout
-     * @internal param int $timeout optional    the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
-     */
-    public function useCached($filename = '', $timeout = 3600) {
-        $this->_timeout = $timeout;
-        if ($filename == '') {
-            $filename = $this->_generateFilename();
-        }
-        if (file_exists($filename) && (time() - filemtime($filename) < $timeout)) {
-            $this->_redirect($filename);
-        }
-    }
-
-    /**
-     * Saves this feed as a file on the local disk. After the file is saved, a redirect
-     * header may be sent to redirect the user to the newly created file.
-     * @since    1.4
-     *
-     * @param      filename  string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
-     * @param bool $displayContents
-     * @internal param bool $redirect optional    send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
-     */
-    public function saveFeed($filename = '', $displayContents = true) {
-        if ($filename == '') {
-            $filename = $this->_generateFilename();
-        }
-        $feedFile = fopen($filename, 'w+');
-        if ($feedFile) {
-            fwrite($feedFile, $this->createFeed());
-            fclose($feedFile);
-            if ($displayContents) {
-                $this->_redirect($filename);
-            }
-        } else {
-            echo '<br><b>Error creating feed file, please check write permissions.</b><br>';
-        }
-    }
+		// HTTP redirect, some feed readers' simple HTTP implementations don't follow it
+		//Header("Location: ".$filename);
+
+		header('Content-Type: ' . $this->contentType . '; charset=' . $this->encoding . '; filename='
+			   . basename($filename));
+		header('Content-Disposition: inline; filename=' . basename($filename));
+		readfile($filename, 'r');
+		die();
+	}
+
+	/**
+	 * Turns on caching and checks if there is a recent version of this feed in the cache.
+	 * If there is, an HTTP redirect header is sent.
+	 * To effectively use caching, you should create the FeedCreator object and call this method
+	 * before anything else, especially before you do the time consuming task to build the feed
+	 * (web fetching, for example).
+	 * @since    1.4
+	 * @param     filename  string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @param int $timeout
+	 * @internal param int $timeout optional    the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+	 */
+	public function useCached($filename = '', $timeout = 3600) {
+		$this->_timeout = $timeout;
+		if ($filename == '') {
+			$filename = $this->_generateFilename();
+		}
+		if (file_exists($filename) && (time() - filemtime($filename) < $timeout)) {
+			$this->_redirect($filename);
+		}
+	}
+
+	/**
+	 * Saves this feed as a file on the local disk. After the file is saved, a redirect
+	 * header may be sent to redirect the user to the newly created file.
+	 * @since    1.4
+	 *
+	 * @param      filename  string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+	 * @param bool $displayContents
+	 * @internal param bool $redirect optional    send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
+	 */
+	public function saveFeed($filename = '', $displayContents = true) {
+		if ($filename == '') {
+			$filename = $this->_generateFilename();
+		}
+		$feedFile = fopen($filename, 'w+');
+		if ($feedFile) {
+			fwrite($feedFile, $this->createFeed());
+			fclose($feedFile);
+			if ($displayContents) {
+				$this->_redirect($filename);
+			}
+		} else {
+			echo '<br><b>Error creating feed file, please check write permissions.</b><br>';
+		}
+	}
 }
 
 /**
@@ -728,120 +728,120 @@ 
  */
 class FeedDate
 {
-    public $unix;
-
-    /**
-     * Creates a new instance of FeedDate representing a given date.
-     * Accepts RFC 822, ISO 8601 date formats as well as unix time stamps.
-     * @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and time is used.
-     */
-    public function __construct($dateString = '') {
-        $tzOffset = 0;
-        if ($dateString == '') {
-            $dateString = date('r');
-        }
-
-        //if (is_integer($dateString)) {
-        if (is_numeric($dateString)) {
-            $this->unix = $dateString;
-
-            return;
-        }
-        if (preg_match("~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~",
-                       $dateString, $matches)) {
-            $months     = array(
-                'Jan' => 1,
-                'Feb' => 2,
-                'Mar' => 3,
-                'Apr' => 4,
-                'May' => 5,
-                'Jun' => 6,
-                'Jul' => 7,
-                'Aug' => 8,
-                'Sep' => 9,
-                'Oct' => 10,
-                'Nov' => 11,
-                'Dec' => 12
-            );
-            $this->unix = mktime($matches[4], $matches[5], $matches[6], $months[$matches[2]], $matches[1], $matches[3]);
-            if (substr($matches[7], 0, 1) == '+' || substr($matches[7], 0, 1) == '-') {
-                $tzOffset = (substr($matches[7], 0, 3) * 60 + substr($matches[7], -2)) * 60;
-            } else {
-                if (strlen($matches[7]) == 1) {
-                    $oneHour = 3600;
-                    $ord     = ord($matches[7]);
-                    if ($ord < ord('M')) {
-                        $tzOffset = (ord('A') - $ord - 1) * $oneHour;
-                    } elseif ($ord >= ord('M') && $matches[7] !== 'Z') {
-                        $tzOffset = ($ord - ord('M')) * $oneHour;
-                    } elseif ($matches[7] === 'Z') {
-                        $tzOffset = 0;
-                    }
-                }
-                switch ($matches[7]) {
-                    case 'UT':
-                    case 'GMT':
-                        $tzOffset = 0;
-                }
-            }
-            $this->unix += $tzOffset;
-
-            return;
-        }
-        if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~", $dateString, $matches)) {
-            $this->unix = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
-            if (substr($matches[7], 0, 1) == '+' || substr($matches[7], 0, 1) == '-') {
-                $tzOffset = (substr($matches[7], 0, 3) * 60 + substr($matches[7], -2)) * 60;
-            } else {
-                if ($matches[7] === 'Z') {
-                    $tzOffset = 0;
-                }
-            }
-            $this->unix += $tzOffset;
-
-            return;
-        }
-        $this->unix = 0;
-    }
-
-    /**
-     * Gets the date stored in this FeedDate as an RFC 822 date.
-     *
-     * @return a date in RFC 822 format
-     */
-    public function rfc822() {
-        //return gmdate("r",$this->unix);
-        $date = gmdate('D, d M Y H:i:s', $this->unix);
-        if (TIME_ZONE != '') {
-            $date .= ' ' . str_replace(':', '', TIME_ZONE);
-        }
-
-        return $date;
-    }
-
-    /**
-     * Gets the date stored in this FeedDate as an ISO 8601 date.
-     *
-     * @return a date in ISO 8601 format
-     */
-    public function iso8601() {
-        $date = gmdate("Y-m-d\TH:i:sO", $this->unix);
-        $date = substr($date, 0, 22) . ':' . substr($date, -2);
-        if (TIME_ZONE != '') {
-            $date = str_replace('+00:00', TIME_ZONE, $date);
-        }
-
-        return $date;
-    }
-
-    /**
-     * Gets the date stored in this FeedDate as unix time stamp.
-     *
-     * @return a date as a unix time stamp
-     */
-    public function unix() {
-        return $this->unix;
-    }
+	public $unix;
+
+	/**
+	 * Creates a new instance of FeedDate representing a given date.
+	 * Accepts RFC 822, ISO 8601 date formats as well as unix time stamps.
+	 * @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and time is used.
+	 */
+	public function __construct($dateString = '') {
+		$tzOffset = 0;
+		if ($dateString == '') {
+			$dateString = date('r');
+		}
+
+		//if (is_integer($dateString)) {
+		if (is_numeric($dateString)) {
+			$this->unix = $dateString;
+
+			return;
+		}
+		if (preg_match("~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~",
+					   $dateString, $matches)) {
+			$months     = array(
+				'Jan' => 1,
+				'Feb' => 2,
+				'Mar' => 3,
+				'Apr' => 4,
+				'May' => 5,
+				'Jun' => 6,
+				'Jul' => 7,
+				'Aug' => 8,
+				'Sep' => 9,
+				'Oct' => 10,
+				'Nov' => 11,
+				'Dec' => 12
+			);
+			$this->unix = mktime($matches[4], $matches[5], $matches[6], $months[$matches[2]], $matches[1], $matches[3]);
+			if (substr($matches[7], 0, 1) == '+' || substr($matches[7], 0, 1) == '-') {
+				$tzOffset = (substr($matches[7], 0, 3) * 60 + substr($matches[7], -2)) * 60;
+			} else {
+				if (strlen($matches[7]) == 1) {
+					$oneHour = 3600;
+					$ord     = ord($matches[7]);
+					if ($ord < ord('M')) {
+						$tzOffset = (ord('A') - $ord - 1) * $oneHour;
+					} elseif ($ord >= ord('M') && $matches[7] !== 'Z') {
+						$tzOffset = ($ord - ord('M')) * $oneHour;
+					} elseif ($matches[7] === 'Z') {
+						$tzOffset = 0;
+					}
+				}
+				switch ($matches[7]) {
+					case 'UT':
+					case 'GMT':
+						$tzOffset = 0;
+				}
+			}
+			$this->unix += $tzOffset;
+
+			return;
+		}
+		if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~", $dateString, $matches)) {
+			$this->unix = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+			if (substr($matches[7], 0, 1) == '+' || substr($matches[7], 0, 1) == '-') {
+				$tzOffset = (substr($matches[7], 0, 3) * 60 + substr($matches[7], -2)) * 60;
+			} else {
+				if ($matches[7] === 'Z') {
+					$tzOffset = 0;
+				}
+			}
+			$this->unix += $tzOffset;
+
+			return;
+		}
+		$this->unix = 0;
+	}
+
+	/**
+	 * Gets the date stored in this FeedDate as an RFC 822 date.
+	 *
+	 * @return a date in RFC 822 format
+	 */
+	public function rfc822() {
+		//return gmdate("r",$this->unix);
+		$date = gmdate('D, d M Y H:i:s', $this->unix);
+		if (TIME_ZONE != '') {
+			$date .= ' ' . str_replace(':', '', TIME_ZONE);
+		}
+
+		return $date;
+	}
+
+	/**
+	 * Gets the date stored in this FeedDate as an ISO 8601 date.
+	 *
+	 * @return a date in ISO 8601 format
+	 */
+	public function iso8601() {
+		$date = gmdate("Y-m-d\TH:i:sO", $this->unix);
+		$date = substr($date, 0, 22) . ':' . substr($date, -2);
+		if (TIME_ZONE != '') {
+			$date = str_replace('+00:00', TIME_ZONE, $date);
+		}
+
+		return $date;
+	}
+
+	/**
+	 * Gets the date stored in this FeedDate as unix time stamp.
+	 *
+	 * @return a date as a unix time stamp
+	 */
+	public function unix() {
+		return $this->unix;
+	}
 }
 
 /**
@@ -853,74 +853,74 @@ 
  */
 class RSSCreator10 extends FeedCreator
 {
-    /**
-     * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
-     * The feed will contain all items previously added in the same order.
-     * @return string the feed's complete text
-     */
-    public function createFeed() {
-        $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
-        $feed .= $this->_createGeneratorComment();
-        if ($this->cssStyleSheet == '') {
-            $cssStyleSheet = 'http://www.w3.org/2000/08/w3c-synd/style.css';
-        }
-        $feed .= $this->_createStylesheetReferences();
-        $feed .= "<rdf:RDF\n";
-        $feed .= "    xmlns=\"http://purl.org/rss/1.0/\"\n";
-        $feed .= "    xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n";
-        $feed .= "    xmlns:slash=\"http://purl.org/rss/1.0/modules/slash/\"\n";
-        $feed .= "    xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
-        $feed .= "    <channel rdf:about=\"" . $this->syndicationURL . "\">\n";
-        $feed .= '        <title>' . htmlspecialchars($this->title) . "</title>\n";
-        $feed .= '        <description>' . htmlspecialchars($this->description) . "</description>\n";
-        $feed .= '        <link>' . $this->link . "</link>\n";
-        if ($this->image != null) {
-            $feed .= "        <image rdf:resource=\"" . $this->image->url . "\" />\n";
-        }
-        $now = new FeedDate();
-        $feed .= '       <dc:date>' . htmlspecialchars($now->iso8601()) . "</dc:date>\n";
-        $feed .= "        <items>\n";
-        $feed .= "            <rdf:Seq>\n";
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            $feed .= "                <rdf:li rdf:resource=\"" . htmlspecialchars($this->items[$i]->link) . "\"/>\n";
-        }
-        $feed .= "            </rdf:Seq>\n";
-        $feed .= "        </items>\n";
-        $feed .= "    </channel>\n";
-        if ($this->image != null) {
-            $feed .= "    <image rdf:about=\"" . $this->image->url . "\">\n";
-            $feed .= '        <title>' . $this->image->title . "</title>\n";
-            $feed .= '        <link>' . $this->image->link . "</link>\n";
-            $feed .= '        <url>' . $this->image->url . "</url>\n";
-            $feed .= "    </image>\n";
-        }
-        $feed .= $this->_createAdditionalElements($this->additionalElements, '    ');
-
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            $feed .= "    <item rdf:about=\"" . htmlspecialchars($this->items[$i]->link) . "\">\n";
-            //$feed.= "        <dc:type>Posting</dc:type>\n";
-            $feed .= "        <dc:format>text/html</dc:format>\n";
-            if ($this->items[$i]->date != null) {
-                $itemDate = new FeedDate($this->items[$i]->date);
-                $feed .= '        <dc:date>' . htmlspecialchars($itemDate->iso8601()) . "</dc:date>\n";
-            }
-            if ($this->items[$i]->source != '') {
-                $feed .= '        <dc:source>' . htmlspecialchars($this->items[$i]->source) . "</dc:source>\n";
-            }
-            if ($this->items[$i]->author != '') {
-                $feed .= '        <dc:creator>' . htmlspecialchars($this->items[$i]->author) . "</dc:creator>\n";
-            }
-            $feed .= '        <title>' . htmlspecialchars(strip_tags(strtr($this->items[$i]->title, "\n\r", '  ')))
-                     . "</title>\n";
-            $feed .= '        <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n";
-            $feed .= '        <description>' . htmlspecialchars($this->items[$i]->description) . "</description>\n";
-            $feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, '        ');
-            $feed .= "    </item>\n";
-        }
-        $feed .= "</rdf:RDF>\n";
-
-        return $feed;
-    }
+	/**
+	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
+	 * The feed will contain all items previously added in the same order.
+	 * @return string the feed's complete text
+	 */
+	public function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+		$feed .= $this->_createGeneratorComment();
+		if ($this->cssStyleSheet == '') {
+			$cssStyleSheet = 'http://www.w3.org/2000/08/w3c-synd/style.css';
+		}
+		$feed .= $this->_createStylesheetReferences();
+		$feed .= "<rdf:RDF\n";
+		$feed .= "    xmlns=\"http://purl.org/rss/1.0/\"\n";
+		$feed .= "    xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n";
+		$feed .= "    xmlns:slash=\"http://purl.org/rss/1.0/modules/slash/\"\n";
+		$feed .= "    xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
+		$feed .= "    <channel rdf:about=\"" . $this->syndicationURL . "\">\n";
+		$feed .= '        <title>' . htmlspecialchars($this->title) . "</title>\n";
+		$feed .= '        <description>' . htmlspecialchars($this->description) . "</description>\n";
+		$feed .= '        <link>' . $this->link . "</link>\n";
+		if ($this->image != null) {
+			$feed .= "        <image rdf:resource=\"" . $this->image->url . "\" />\n";
+		}
+		$now = new FeedDate();
+		$feed .= '       <dc:date>' . htmlspecialchars($now->iso8601()) . "</dc:date>\n";
+		$feed .= "        <items>\n";
+		$feed .= "            <rdf:Seq>\n";
+		for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+			$feed .= "                <rdf:li rdf:resource=\"" . htmlspecialchars($this->items[$i]->link) . "\"/>\n";
+		}
+		$feed .= "            </rdf:Seq>\n";
+		$feed .= "        </items>\n";
+		$feed .= "    </channel>\n";
+		if ($this->image != null) {
+			$feed .= "    <image rdf:about=\"" . $this->image->url . "\">\n";
+			$feed .= '        <title>' . $this->image->title . "</title>\n";
+			$feed .= '        <link>' . $this->image->link . "</link>\n";
+			$feed .= '        <url>' . $this->image->url . "</url>\n";
+			$feed .= "    </image>\n";
+		}
+		$feed .= $this->_createAdditionalElements($this->additionalElements, '    ');
+
+		for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+			$feed .= "    <item rdf:about=\"" . htmlspecialchars($this->items[$i]->link) . "\">\n";
+			//$feed.= "        <dc:type>Posting</dc:type>\n";
+			$feed .= "        <dc:format>text/html</dc:format>\n";
+			if ($this->items[$i]->date != null) {
+				$itemDate = new FeedDate($this->items[$i]->date);
+				$feed .= '        <dc:date>' . htmlspecialchars($itemDate->iso8601()) . "</dc:date>\n";
+			}
+			if ($this->items[$i]->source != '') {
+				$feed .= '        <dc:source>' . htmlspecialchars($this->items[$i]->source) . "</dc:source>\n";
+			}
+			if ($this->items[$i]->author != '') {
+				$feed .= '        <dc:creator>' . htmlspecialchars($this->items[$i]->author) . "</dc:creator>\n";
+			}
+			$feed .= '        <title>' . htmlspecialchars(strip_tags(strtr($this->items[$i]->title, "\n\r", '  ')))
+					 . "</title>\n";
+			$feed .= '        <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n";
+			$feed .= '        <description>' . htmlspecialchars($this->items[$i]->description) . "</description>\n";
+			$feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, '        ');
+			$feed .= "    </item>\n";
+		}
+		$feed .= "</rdf:RDF>\n";
+
+		return $feed;
+	}
 }
 
 /**
@@ -932,141 +932,141 @@ 
  */
 class RSSCreator091 extends FeedCreator
 {
-    /**
-     * Stores this RSS feed's version number.
-     * @access private
-     */
-    public $RSSVersion;
-
-    /**
-     * RSSCreator091 constructor.
-     */
-    public function __construct() {
-        $this->_setRSSVersion('0.91');
-        $this->contentType = 'application/rss+xml';
-    }
-
-    /**
-     * Sets this RSS feed's version number.
-     * @access private
-     * @param $version
-     */
-    public function _setRSSVersion($version) {
-        $this->RSSVersion = $version;
-    }
-
-    /**
-     * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
-     * The feed will contain all items previously added in the same order.
-     * @return string the feed's complete text
-     */
-    public function createFeed() {
-        $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
-        $feed .= $this->_createGeneratorComment();
-        $feed .= $this->_createStylesheetReferences();
-        $feed .= "<rss version=\"" . $this->RSSVersion . "\">\n";
-        $feed .= "    <channel>\n";
-        $feed .= '        <title>' . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . "</title>\n";
-        $this->descriptionTruncSize = 500;
-        $feed .= '        <description>' . $this->getDescription() . "</description>\n";
-        $feed .= '        <link>' . $this->link . "</link>\n";
-        $now = new FeedDate();
-        $feed .= '        <lastBuildDate>' . htmlspecialchars($now->rfc822()) . "</lastBuildDate>\n";
-        $feed .= '        <generator>' . FEEDCREATOR_VERSION . "</generator>\n";
-
-        if ($this->image != null) {
-            $feed .= "        <image>\n";
-            $feed .= '            <url>' . $this->image->url . "</url>\n";
-            $feed .= '            <title>' . FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100)
-                     . "</title>\n";
-            $feed .= '            <link>' . $this->image->link . "</link>\n";
-            if ($this->image->width != '') {
-                $feed .= '            <width>' . $this->image->width . "</width>\n";
-            }
-            if ($this->image->height != '') {
-                $feed .= '            <height>' . $this->image->height . "</height>\n";
-            }
-            if ($this->image->description != '') {
-                $feed .= '            <description>' . $this->image->getDescription() . "</description>\n";
-            }
-            $feed .= "        </image>\n";
-        }
-        if ($this->language != '') {
-            $feed .= '        <language>' . $this->language . "</language>\n";
-        }
-        if ($this->copyright != '') {
-            $feed .= '        <copyright>' . FeedCreator::iTrunc(htmlspecialchars($this->copyright), 100)
-                     . "</copyright>\n";
-        }
-        if ($this->editor != '') {
-            $feed .= '        <managingEditor>' . FeedCreator::iTrunc(htmlspecialchars($this->editor), 100)
-                     . "</managingEditor>\n";
-        }
-        if ($this->webmaster != '') {
-            $feed .= '        <webMaster>' . FeedCreator::iTrunc(htmlspecialchars($this->webmaster), 100)
-                     . "</webMaster>\n";
-        }
-        if ($this->pubDate != '') {
-            $pubDate = new FeedDate($this->pubDate);
-            $feed .= '        <pubDate>' . htmlspecialchars($pubDate->rfc822()) . "</pubDate>\n";
-        }
-        if ($this->category != '') {
-            $feed .= '        <category>' . htmlspecialchars($this->category) . "</category>\n";
-        }
-        if ($this->docs != '') {
-            $feed .= '        <docs>' . FeedCreator::iTrunc(htmlspecialchars($this->docs), 500) . "</docs>\n";
-        }
-        if ($this->ttl != '') {
-            $feed .= '        <ttl>' . htmlspecialchars($this->ttl) . "</ttl>\n";
-        }
-        if ($this->rating != '') {
-            $feed .= '        <rating>' . FeedCreator::iTrunc(htmlspecialchars($this->rating), 500) . "</rating>\n";
-        }
-        if ($this->skipHours != '') {
-            $feed .= '        <skipHours>' . htmlspecialchars($this->skipHours) . "</skipHours>\n";
-        }
-        if ($this->skipDays != '') {
-            $feed .= '        <skipDays>' . htmlspecialchars($this->skipDays) . "</skipDays>\n";
-        }
-        $feed .= $this->_createAdditionalElements($this->additionalElements, '    ');
-
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            $feed .= "        <item>\n";
-            $feed .= '            <title>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),
-                                                                 100) . "</title>\n";
-            $feed .= '            <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n";
-            $feed .= '            <description>' . $this->items[$i]->getDescription() . "</description>\n";
-
-            if ($this->items[$i]->author != '') {
-                $feed .= '            <author>' . htmlspecialchars($this->items[$i]->author) . "</author>\n";
-            }
-            /*
+	/**
+	 * Stores this RSS feed's version number.
+	 * @access private
+	 */
+	public $RSSVersion;
+
+	/**
+	 * RSSCreator091 constructor.
+	 */
+	public function __construct() {
+		$this->_setRSSVersion('0.91');
+		$this->contentType = 'application/rss+xml';
+	}
+
+	/**
+	 * Sets this RSS feed's version number.
+	 * @access private
+	 * @param $version
+	 */
+	public function _setRSSVersion($version) {
+		$this->RSSVersion = $version;
+	}
+
+	/**
+	 * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
+	 * The feed will contain all items previously added in the same order.
+	 * @return string the feed's complete text
+	 */
+	public function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+		$feed .= $this->_createGeneratorComment();
+		$feed .= $this->_createStylesheetReferences();
+		$feed .= "<rss version=\"" . $this->RSSVersion . "\">\n";
+		$feed .= "    <channel>\n";
+		$feed .= '        <title>' . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . "</title>\n";
+		$this->descriptionTruncSize = 500;
+		$feed .= '        <description>' . $this->getDescription() . "</description>\n";
+		$feed .= '        <link>' . $this->link . "</link>\n";
+		$now = new FeedDate();
+		$feed .= '        <lastBuildDate>' . htmlspecialchars($now->rfc822()) . "</lastBuildDate>\n";
+		$feed .= '        <generator>' . FEEDCREATOR_VERSION . "</generator>\n";
+
+		if ($this->image != null) {
+			$feed .= "        <image>\n";
+			$feed .= '            <url>' . $this->image->url . "</url>\n";
+			$feed .= '            <title>' . FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100)
+					 . "</title>\n";
+			$feed .= '            <link>' . $this->image->link . "</link>\n";
+			if ($this->image->width != '') {
+				$feed .= '            <width>' . $this->image->width . "</width>\n";
+			}
+			if ($this->image->height != '') {
+				$feed .= '            <height>' . $this->image->height . "</height>\n";
+			}
+			if ($this->image->description != '') {
+				$feed .= '            <description>' . $this->image->getDescription() . "</description>\n";
+			}
+			$feed .= "        </image>\n";
+		}
+		if ($this->language != '') {
+			$feed .= '        <language>' . $this->language . "</language>\n";
+		}
+		if ($this->copyright != '') {
+			$feed .= '        <copyright>' . FeedCreator::iTrunc(htmlspecialchars($this->copyright), 100)
+					 . "</copyright>\n";
+		}
+		if ($this->editor != '') {
+			$feed .= '        <managingEditor>' . FeedCreator::iTrunc(htmlspecialchars($this->editor), 100)
+					 . "</managingEditor>\n";
+		}
+		if ($this->webmaster != '') {
+			$feed .= '        <webMaster>' . FeedCreator::iTrunc(htmlspecialchars($this->webmaster), 100)
+					 . "</webMaster>\n";
+		}
+		if ($this->pubDate != '') {
+			$pubDate = new FeedDate($this->pubDate);
+			$feed .= '        <pubDate>' . htmlspecialchars($pubDate->rfc822()) . "</pubDate>\n";
+		}
+		if ($this->category != '') {
+			$feed .= '        <category>' . htmlspecialchars($this->category) . "</category>\n";
+		}
+		if ($this->docs != '') {
+			$feed .= '        <docs>' . FeedCreator::iTrunc(htmlspecialchars($this->docs), 500) . "</docs>\n";
+		}
+		if ($this->ttl != '') {
+			$feed .= '        <ttl>' . htmlspecialchars($this->ttl) . "</ttl>\n";
+		}
+		if ($this->rating != '') {
+			$feed .= '        <rating>' . FeedCreator::iTrunc(htmlspecialchars($this->rating), 500) . "</rating>\n";
+		}
+		if ($this->skipHours != '') {
+			$feed .= '        <skipHours>' . htmlspecialchars($this->skipHours) . "</skipHours>\n";
+		}
+		if ($this->skipDays != '') {
+			$feed .= '        <skipDays>' . htmlspecialchars($this->skipDays) . "</skipDays>\n";
+		}
+		$feed .= $this->_createAdditionalElements($this->additionalElements, '    ');
+
+		for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+			$feed .= "        <item>\n";
+			$feed .= '            <title>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),
+																 100) . "</title>\n";
+			$feed .= '            <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n";
+			$feed .= '            <description>' . $this->items[$i]->getDescription() . "</description>\n";
+
+			if ($this->items[$i]->author != '') {
+				$feed .= '            <author>' . htmlspecialchars($this->items[$i]->author) . "</author>\n";
+			}
+			/*
             // on hold
             if ($this->items[$i]->source!="") {
                     $feed.= "            <source>".htmlspecialchars($this->items[$i]->source)."</source>\n";
             }
             */
-            if ($this->items[$i]->category != '') {
-                $feed .= '            <category>' . htmlspecialchars($this->items[$i]->category) . "</category>\n";
-            }
-            if ($this->items[$i]->comments != '') {
-                $feed .= '            <comments>' . htmlspecialchars($this->items[$i]->comments) . "</comments>\n";
-            }
-            if ($this->items[$i]->date != '') {
-                $itemDate = new FeedDate($this->items[$i]->date);
-                $feed .= '            <pubDate>' . htmlspecialchars($itemDate->rfc822()) . "</pubDate>\n";
-            }
-            if ($this->items[$i]->guid != '') {
-                $feed .= '            <guid>' . htmlspecialchars($this->items[$i]->guid) . "</guid>\n";
-            }
-            $feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, '        ');
-            $feed .= "        </item>\n";
-        }
-        $feed .= "    </channel>\n";
-        $feed .= "</rss>\n";
-
-        return $feed;
-    }
+			if ($this->items[$i]->category != '') {
+				$feed .= '            <category>' . htmlspecialchars($this->items[$i]->category) . "</category>\n";
+			}
+			if ($this->items[$i]->comments != '') {
+				$feed .= '            <comments>' . htmlspecialchars($this->items[$i]->comments) . "</comments>\n";
+			}
+			if ($this->items[$i]->date != '') {
+				$itemDate = new FeedDate($this->items[$i]->date);
+				$feed .= '            <pubDate>' . htmlspecialchars($itemDate->rfc822()) . "</pubDate>\n";
+			}
+			if ($this->items[$i]->guid != '') {
+				$feed .= '            <guid>' . htmlspecialchars($this->items[$i]->guid) . "</guid>\n";
+			}
+			$feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, '        ');
+			$feed .= "        </item>\n";
+		}
+		$feed .= "    </channel>\n";
+		$feed .= "</rss>\n";
+
+		return $feed;
+	}
 }
 
 /**
@@ -1078,12 +1078,12 @@ 
  */
 class RSSCreator20 extends RSSCreator091
 {
-    /**
-     * RSSCreator20 constructor.
-     */
-    public function __construct() {
-        parent::_setRSSVersion('2.0');
-    }
+	/**
+	 * RSSCreator20 constructor.
+	 */
+	public function __construct() {
+		parent::_setRSSVersion('2.0');
+	}
 }
 
 /**
@@ -1096,52 +1096,52 @@ 
  */
 class PIECreator01 extends FeedCreator
 {
-    /**
-     * PIECreator01 constructor.
-     */
-    public function __construct() {
-        $this->encoding = 'utf-8';
-    }
-
-    /**
-     * @return string
-     */
-    public function createFeed() {
-        $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
-        $feed .= $this->_createStylesheetReferences();
-        $feed .= "<feed version=\"0.1\" xmlns=\"http://example.com/newformat#\">\n";
-        $feed .= '    <title>' . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . "</title>\n";
-        $this->truncSize = 500;
-        $feed .= '    <subtitle>' . $this->getDescription() . "</subtitle>\n";
-        $feed .= '    <link>' . $this->link . "</link>\n";
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            $feed .= "    <entry>\n";
-            $feed .= '        <title>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100)
-                     . "</title>\n";
-            $feed .= '        <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n";
-            $itemDate = new FeedDate($this->items[$i]->date);
-            $feed .= '        <created>' . htmlspecialchars($itemDate->iso8601()) . "</created>\n";
-            $feed .= '        <issued>' . htmlspecialchars($itemDate->iso8601()) . "</issued>\n";
-            $feed .= '        <modified>' . htmlspecialchars($itemDate->iso8601()) . "</modified>\n";
-            $feed .= '        <id>' . htmlspecialchars($this->items[$i]->guid) . "</id>\n";
-            if ($this->items[$i]->author != '') {
-                $feed .= "        <author>\n";
-                $feed .= '            <name>' . htmlspecialchars($this->items[$i]->author) . "</name>\n";
-                if ($this->items[$i]->authorEmail != '') {
-                    $feed .= '            <email>' . $this->items[$i]->authorEmail . "</email>\n";
-                }
-                $feed .= "        </author>\n";
-            }
-            $feed .= "        <content type=\"text/html\" xml:lang=\"en-us\">\n";
-            $feed .= "            <div xmlns=\"http://www.w3.org/1999/xhtml\">" . $this->items[$i]->getDescription()
-                     . "</div>\n";
-            $feed .= "        </content>\n";
-            $feed .= "    </entry>\n";
-        }
-        $feed .= "</feed>\n";
-
-        return $feed;
-    }
+	/**
+	 * PIECreator01 constructor.
+	 */
+	public function __construct() {
+		$this->encoding = 'utf-8';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+		$feed .= $this->_createStylesheetReferences();
+		$feed .= "<feed version=\"0.1\" xmlns=\"http://example.com/newformat#\">\n";
+		$feed .= '    <title>' . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . "</title>\n";
+		$this->truncSize = 500;
+		$feed .= '    <subtitle>' . $this->getDescription() . "</subtitle>\n";
+		$feed .= '    <link>' . $this->link . "</link>\n";
+		for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+			$feed .= "    <entry>\n";
+			$feed .= '        <title>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100)
+					 . "</title>\n";
+			$feed .= '        <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n";
+			$itemDate = new FeedDate($this->items[$i]->date);
+			$feed .= '        <created>' . htmlspecialchars($itemDate->iso8601()) . "</created>\n";
+			$feed .= '        <issued>' . htmlspecialchars($itemDate->iso8601()) . "</issued>\n";
+			$feed .= '        <modified>' . htmlspecialchars($itemDate->iso8601()) . "</modified>\n";
+			$feed .= '        <id>' . htmlspecialchars($this->items[$i]->guid) . "</id>\n";
+			if ($this->items[$i]->author != '') {
+				$feed .= "        <author>\n";
+				$feed .= '            <name>' . htmlspecialchars($this->items[$i]->author) . "</name>\n";
+				if ($this->items[$i]->authorEmail != '') {
+					$feed .= '            <email>' . $this->items[$i]->authorEmail . "</email>\n";
+				}
+				$feed .= "        </author>\n";
+			}
+			$feed .= "        <content type=\"text/html\" xml:lang=\"en-us\">\n";
+			$feed .= "            <div xmlns=\"http://www.w3.org/1999/xhtml\">" . $this->items[$i]->getDescription()
+					 . "</div>\n";
+			$feed .= "        </content>\n";
+			$feed .= "    </entry>\n";
+		}
+		$feed .= "</feed>\n";
+
+		return $feed;
+	}
 }
 
 /**
@@ -1162,70 +1162,70 @@ 
  */
 class AtomCreator03 extends FeedCreator
 {
-    /**
-     * AtomCreator03 constructor.
-     */
-    public function __construct() {
-        $this->contentType = 'application/atom+xml';
-        $this->encoding    = 'utf-8';
-    }
-
-    /**
-     * @return string
-     */
-    public function createFeed() {
-        $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
-        $feed .= $this->_createGeneratorComment();
-        $feed .= $this->_createStylesheetReferences();
-        $feed .= "<feed version=\"0.3\" xmlns=\"http://purl.org/atom/ns#\"";
-        if ($this->language != '') {
-            $feed .= " xml:lang=\"" . $this->language . "\"";
-        }
-        $feed .= ">\n";
-        $feed .= '    <title>' . htmlspecialchars($this->title) . "</title>\n";
-        $feed .= '    <tagline>' . htmlspecialchars($this->description) . "</tagline>\n";
-        $feed .= "    <link rel=\"alternate\" type=\"text/html\" href=\"" . htmlspecialchars($this->link) . "\"/>\n";
-        $feed .= '    <id>' . htmlspecialchars($this->link) . "</id>\n";
-        $now = new FeedDate();
-        $feed .= '    <modified>' . htmlspecialchars($now->iso8601()) . "</modified>\n";
-        if ($this->editor != '') {
-            $feed .= "    <author>\n";
-            $feed .= '        <name>' . $this->editor . "</name>\n";
-            if ($this->editorEmail != '') {
-                $feed .= '        <email>' . $this->editorEmail . "</email>\n";
-            }
-            $feed .= "    </author>\n";
-        }
-        $feed .= '    <generator>' . FEEDCREATOR_VERSION . "</generator>\n";
-        $feed .= $this->_createAdditionalElements($this->additionalElements, '    ');
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            $feed .= "    <entry>\n";
-            $feed .= '        <title>' . htmlspecialchars(strip_tags($this->items[$i]->title)) . "</title>\n";
-            $feed .= "        <link rel=\"alternate\" type=\"text/html\" href=\""
-                     . htmlspecialchars($this->items[$i]->link) . "\"/>\n";
-            if ($this->items[$i]->date == '') {
-                $this->items[$i]->date = time();
-            }
-            $itemDate = new FeedDate($this->items[$i]->date);
-            $feed .= '        <created>' . htmlspecialchars($itemDate->iso8601()) . "</created>\n";
-            $feed .= '        <issued>' . htmlspecialchars($itemDate->iso8601()) . "</issued>\n";
-            $feed .= '        <modified>' . htmlspecialchars($itemDate->iso8601()) . "</modified>\n";
-            $feed .= '        <id>' . htmlspecialchars($this->items[$i]->link) . "</id>\n";
-            $feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, '        ');
-            if ($this->items[$i]->author != '') {
-                $feed .= "        <author>\n";
-                $feed .= '            <name>' . htmlspecialchars($this->items[$i]->author) . "</name>\n";
-                $feed .= "        </author>\n";
-            }
-            if ($this->items[$i]->description != '') {
-                $feed .= '        <summary>' . htmlspecialchars($this->items[$i]->description) . "</summary>\n";
-            }
-            $feed .= "    </entry>\n";
-        }
-        $feed .= "</feed>\n";
-
-        return $feed;
-    }
+	/**
+	 * AtomCreator03 constructor.
+	 */
+	public function __construct() {
+		$this->contentType = 'application/atom+xml';
+		$this->encoding    = 'utf-8';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+		$feed .= $this->_createGeneratorComment();
+		$feed .= $this->_createStylesheetReferences();
+		$feed .= "<feed version=\"0.3\" xmlns=\"http://purl.org/atom/ns#\"";
+		if ($this->language != '') {
+			$feed .= " xml:lang=\"" . $this->language . "\"";
+		}
+		$feed .= ">\n";
+		$feed .= '    <title>' . htmlspecialchars($this->title) . "</title>\n";
+		$feed .= '    <tagline>' . htmlspecialchars($this->description) . "</tagline>\n";
+		$feed .= "    <link rel=\"alternate\" type=\"text/html\" href=\"" . htmlspecialchars($this->link) . "\"/>\n";
+		$feed .= '    <id>' . htmlspecialchars($this->link) . "</id>\n";
+		$now = new FeedDate();
+		$feed .= '    <modified>' . htmlspecialchars($now->iso8601()) . "</modified>\n";
+		if ($this->editor != '') {
+			$feed .= "    <author>\n";
+			$feed .= '        <name>' . $this->editor . "</name>\n";
+			if ($this->editorEmail != '') {
+				$feed .= '        <email>' . $this->editorEmail . "</email>\n";
+			}
+			$feed .= "    </author>\n";
+		}
+		$feed .= '    <generator>' . FEEDCREATOR_VERSION . "</generator>\n";
+		$feed .= $this->_createAdditionalElements($this->additionalElements, '    ');
+		for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+			$feed .= "    <entry>\n";
+			$feed .= '        <title>' . htmlspecialchars(strip_tags($this->items[$i]->title)) . "</title>\n";
+			$feed .= "        <link rel=\"alternate\" type=\"text/html\" href=\""
+					 . htmlspecialchars($this->items[$i]->link) . "\"/>\n";
+			if ($this->items[$i]->date == '') {
+				$this->items[$i]->date = time();
+			}
+			$itemDate = new FeedDate($this->items[$i]->date);
+			$feed .= '        <created>' . htmlspecialchars($itemDate->iso8601()) . "</created>\n";
+			$feed .= '        <issued>' . htmlspecialchars($itemDate->iso8601()) . "</issued>\n";
+			$feed .= '        <modified>' . htmlspecialchars($itemDate->iso8601()) . "</modified>\n";
+			$feed .= '        <id>' . htmlspecialchars($this->items[$i]->link) . "</id>\n";
+			$feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, '        ');
+			if ($this->items[$i]->author != '') {
+				$feed .= "        <author>\n";
+				$feed .= '            <name>' . htmlspecialchars($this->items[$i]->author) . "</name>\n";
+				$feed .= "        </author>\n";
+			}
+			if ($this->items[$i]->description != '') {
+				$feed .= '        <summary>' . htmlspecialchars($this->items[$i]->description) . "</summary>\n";
+			}
+			$feed .= "    </entry>\n";
+		}
+		$feed .= "</feed>\n";
+
+		return $feed;
+	}
 }
 
 /**
@@ -1237,93 +1237,93 @@ 
  */
 class MBOXCreator extends FeedCreator
 {
-    /**
-     * MBOXCreator constructor.
-     */
-    public function __construct() {
-        $this->contentType = 'text/plain';
-        $this->encoding    = 'ISO-8859-15';
-    }
-
-    /**
-     * @param string $input
-     * @param int    $line_max
-     * @return string
-     */
-    public function qp_enc($input = '', $line_max = 76) {
-        $hex    = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
-        $lines  = preg_split("/(?:\r\n|\r|\n)/", $input);
-        $eol    = "\r\n";
-        $escape = '=';
-        $output = '';
-        while (list(, $line) = each($lines)) {
-            //$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary
-            $linlen  = strlen($line);
-            $newline = '';
-            for ($i = 0; $i < $linlen; ++$i) {
-                $c   = substr($line, $i, 1);
-                $dec = ord($c);
-                if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
-                    $c = '=20';
-                } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
-                    $h2 = floor($dec / 16);
-                    $h1 = floor($dec % 16);
-                    $c  = $escape . $hex["$h2"] . $hex["$h1"];
-                }
-                if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
-                    $output .= $newline . $escape . $eol; // soft line break; " =\r\n" is okay
-                    $newline = '';
-                }
-                $newline .= $c;
-            } // end of for
-            $output .= $newline . $eol;
-        }
-
-        return trim($output);
-    }
-
-    /**
-     * Builds the MBOX contents.
-     * @return string the feed's complete text
-     */
-    public function createFeed() {
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            if ($this->items[$i]->author != '') {
-                $from = $this->items[$i]->author;
-            } else {
-                $from = $this->title;
-            }
-            $itemDate = new FeedDate($this->items[$i]->date);
-            $feed .= 'From ' . strtr(MBOXCreator::qp_enc($from), ' ', '_') . ' ' . date('D M d H:i:s Y',
-                                                                                        $itemDate->unix()) . "\n";
-            $feed .= "Content-Type: text/plain;\n";
-            $feed .= "   charset=\"" . $this->encoding . "\"\n";
-            $feed .= "Content-Transfer-Encoding: quoted-printable\n";
-            $feed .= "Content-Type: text/plain\n";
-            $feed .= "From: \"" . MBOXCreator::qp_enc($from) . "\"\n";
-            $feed .= 'Date: ' . $itemDate->rfc822() . "\n";
-            $feed .= 'Subject: ' . MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title, 100)) . "\n";
-            $feed .= "\n";
-            $body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description));
-            $feed .= preg_replace("~\nFrom ([^\n]*)(\n?)~", "\n>From $1$2\n", $body);
-            $feed .= "\n";
-            $feed .= "\n";
-        }
-
-        return $feed;
-    }
-
-    /**
-     * Generate a filename for the feed cache file. Overridden from FeedCreator to prevent XML data types.
-     * @return string the feed cache filename
-     * @since  1.4
-     * @access private
-     */
-    public function _generateFilename() {
-        $fileInfo = pathinfo($_SERVER['PHP_SELF']);
-
-        return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.mbox';
-    }
+	/**
+	 * MBOXCreator constructor.
+	 */
+	public function __construct() {
+		$this->contentType = 'text/plain';
+		$this->encoding    = 'ISO-8859-15';
+	}
+
+	/**
+	 * @param string $input
+	 * @param int    $line_max
+	 * @return string
+	 */
+	public function qp_enc($input = '', $line_max = 76) {
+		$hex    = array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F');
+		$lines  = preg_split("/(?:\r\n|\r|\n)/", $input);
+		$eol    = "\r\n";
+		$escape = '=';
+		$output = '';
+		while (list(, $line) = each($lines)) {
+			//$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary
+			$linlen  = strlen($line);
+			$newline = '';
+			for ($i = 0; $i < $linlen; ++$i) {
+				$c   = substr($line, $i, 1);
+				$dec = ord($c);
+				if (($dec == 32) && ($i == ($linlen - 1))) { // convert space at eol only
+					$c = '=20';
+				} elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required
+					$h2 = floor($dec / 16);
+					$h1 = floor($dec % 16);
+					$c  = $escape . $hex["$h2"] . $hex["$h1"];
+				}
+				if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
+					$output .= $newline . $escape . $eol; // soft line break; " =\r\n" is okay
+					$newline = '';
+				}
+				$newline .= $c;
+			} // end of for
+			$output .= $newline . $eol;
+		}
+
+		return trim($output);
+	}
+
+	/**
+	 * Builds the MBOX contents.
+	 * @return string the feed's complete text
+	 */
+	public function createFeed() {
+		for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+			if ($this->items[$i]->author != '') {
+				$from = $this->items[$i]->author;
+			} else {
+				$from = $this->title;
+			}
+			$itemDate = new FeedDate($this->items[$i]->date);
+			$feed .= 'From ' . strtr(MBOXCreator::qp_enc($from), ' ', '_') . ' ' . date('D M d H:i:s Y',
+																						$itemDate->unix()) . "\n";
+			$feed .= "Content-Type: text/plain;\n";
+			$feed .= "   charset=\"" . $this->encoding . "\"\n";
+			$feed .= "Content-Transfer-Encoding: quoted-printable\n";
+			$feed .= "Content-Type: text/plain\n";
+			$feed .= "From: \"" . MBOXCreator::qp_enc($from) . "\"\n";
+			$feed .= 'Date: ' . $itemDate->rfc822() . "\n";
+			$feed .= 'Subject: ' . MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title, 100)) . "\n";
+			$feed .= "\n";
+			$body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description));
+			$feed .= preg_replace("~\nFrom ([^\n]*)(\n?)~", "\n>From $1$2\n", $body);
+			$feed .= "\n";
+			$feed .= "\n";
+		}
+
+		return $feed;
+	}
+
+	/**
+	 * Generate a filename for the feed cache file. Overridden from FeedCreator to prevent XML data types.
+	 * @return string the feed cache filename
+	 * @since  1.4
+	 * @access private
+	 */
+	public function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER['PHP_SELF']);
+
+		return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.mbox';
+	}
 }
 
 /**
@@ -1335,53 +1335,53 @@ 
  */
 class OPMLCreator extends FeedCreator
 {
-    /**
-     * OPMLCreator constructor.
-     */
-    public function __construct() {
-        $this->encoding = 'utf-8';
-    }
-
-    /**
-     * @return string
-     */
-    public function createFeed() {
-        $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
-        $feed .= $this->_createGeneratorComment();
-        $feed .= $this->_createStylesheetReferences();
-        $feed .= "<opml xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n";
-        $feed .= "    <head>\n";
-        $feed .= '        <title>' . htmlspecialchars($this->title) . "</title>\n";
-        if ($this->pubDate != '') {
-            $date = new FeedDate($this->pubDate);
-            $feed .= '         <dateCreated>' . $date->rfc822() . "</dateCreated>\n";
-        }
-        if ($this->lastBuildDate != '') {
-            $date = new FeedDate($this->lastBuildDate);
-            $feed .= '         <dateModified>' . $date->rfc822() . "</dateModified>\n";
-        }
-        if ($this->editor != '') {
-            $feed .= '         <ownerName>' . $this->editor . "</ownerName>\n";
-        }
-        if ($this->editorEmail != '') {
-            $feed .= '         <ownerEmail>' . $this->editorEmail . "</ownerEmail>\n";
-        }
-        $feed .= "    </head>\n";
-        $feed .= "    <body>\n";
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            $feed .= "    <outline type=\"rss\" ";
-            $title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title, "\n\r", '  ')));
-            $feed .= " title=\"" . $title . "\"";
-            $feed .= " text=\"" . $title . "\"";
-            //$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\"";
-            $feed .= " url=\"" . htmlspecialchars($this->items[$i]->link) . "\"";
-            $feed .= "/>\n";
-        }
-        $feed .= "    </body>\n";
-        $feed .= "</opml>\n";
-
-        return $feed;
-    }
+	/**
+	 * OPMLCreator constructor.
+	 */
+	public function __construct() {
+		$this->encoding = 'utf-8';
+	}
+
+	/**
+	 * @return string
+	 */
+	public function createFeed() {
+		$feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+		$feed .= $this->_createGeneratorComment();
+		$feed .= $this->_createStylesheetReferences();
+		$feed .= "<opml xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n";
+		$feed .= "    <head>\n";
+		$feed .= '        <title>' . htmlspecialchars($this->title) . "</title>\n";
+		if ($this->pubDate != '') {
+			$date = new FeedDate($this->pubDate);
+			$feed .= '         <dateCreated>' . $date->rfc822() . "</dateCreated>\n";
+		}
+		if ($this->lastBuildDate != '') {
+			$date = new FeedDate($this->lastBuildDate);
+			$feed .= '         <dateModified>' . $date->rfc822() . "</dateModified>\n";
+		}
+		if ($this->editor != '') {
+			$feed .= '         <ownerName>' . $this->editor . "</ownerName>\n";
+		}
+		if ($this->editorEmail != '') {
+			$feed .= '         <ownerEmail>' . $this->editorEmail . "</ownerEmail>\n";
+		}
+		$feed .= "    </head>\n";
+		$feed .= "    <body>\n";
+		for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+			$feed .= "    <outline type=\"rss\" ";
+			$title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title, "\n\r", '  ')));
+			$feed .= " title=\"" . $title . "\"";
+			$feed .= " text=\"" . $title . "\"";
+			//$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\"";
+			$feed .= " url=\"" . htmlspecialchars($this->items[$i]->link) . "\"";
+			$feed .= "/>\n";
+		}
+		$feed .= "    </body>\n";
+		$feed .= "</opml>\n";
+
+		return $feed;
+	}
 }
 
 /**
@@ -1397,146 +1397,146 @@ 
  */
 class HTMLCreator extends FeedCreator
 {
-    public $contentType = 'text/html';
-
-    /**
-     * Contains HTML to be output at the start of the feed's html representation.
-     */
-    public $header;
-
-    /**
-     * Contains HTML to be output at the end of the feed's html representation.
-     */
-    public $footer;
-
-    /**
-     * Contains HTML to be output between entries. A separator is only used in
-     * case of multiple entries.
-     */
-    public $separator;
-
-    /**
-     * Used to prefix the stylenames to make sure they are unique
-     * and do not clash with stylenames on the users' page.
-     */
-    public $stylePrefix;
-
-    /**
-     * Determines whether the links open in a new window or not.
-     */
-    public $openInNewWindow = true;
-
-    public $imageAlign = 'right';
-
-    /**
-     * In case of very simple output you may want to get rid of the style tags,
-     * hence this variable.  There's no equivalent on item level, but of course you can
-     * add strings to it while iterating over the items ($this->stylelessOutput .= ...)
-     * and when it is non-empty, ONLY the styleless output is printed, the rest is ignored
-     * in the function createFeed().
-     */
-    public $stylelessOutput = '';
-
-    /**
-     * Writes the HTML.
-     * @return string the scripts's complete text
-     */
-    public function createFeed() {
-        // if there is styleless output, use the content of this variable and ignore the rest
-        if ($this->stylelessOutput != '') {
-            return $this->stylelessOutput;
-        }
-
-        //if no stylePrefix is set, generate it yourself depending on the script name
-        if ($this->stylePrefix == '') {
-            $this->stylePrefix = str_replace('.', '_', $this->_generateFilename()) . '_';
-        }
-
-        //set an openInNewWindow_token_to be inserted or not
-        if ($this->openInNewWindow) {
-            $targetInsert = " target='_blank'";
-        }
-
-        // use this array to put the lines in and implode later with "document.write" javascript
-        $feedArray = array();
-        if ($this->image != null) {
-            $imageStr = "<a href='" . $this->image->link . "'" . $targetInsert . '>' . "<img src='" . $this->image->url
-                        . "' border='0' alt='" . FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100)
-                        . "' align='" . $this->imageAlign . "' ";
-            if ($this->image->width) {
-                $imageStr .= " width='" . $this->image->width . "' ";
-            }
-            if ($this->image->height) {
-                $imageStr .= " height='" . $this->image->height . "' ";
-            }
-            $imageStr .= '/></a>';
-            $feedArray[] = $imageStr;
-        }
-
-        if ($this->title) {
-            $feedArray[] = "<div class='" . $this->stylePrefix . "title'><a href='" . $this->link . "' " . $targetInsert
-                           . " class='" . $this->stylePrefix . "title'>"
-                           . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . '</a></div>';
-        }
-        if ($this->getDescription()) {
-            $feedArray[] = "<div class='" . $this->stylePrefix . "description'>" . str_replace(']]>', '',
-                                                                                               str_replace('<![CDATA[',
-                                                                                                           '',
-                                                                                                           $this->getDescription()))
-                           . '</div>';
-        }
-
-        if ($this->header) {
-            $feedArray[] = "<div class='" . $this->stylePrefix . "header'>" . $this->header . '</div>';
-        }
-
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            if ($this->separator && $i > 0) {
-                $feedArray[] = "<div class='" . $this->stylePrefix . "separator'>" . $this->separator . '</div>';
-            }
-
-            if ($this->items[$i]->title) {
-                if ($this->items[$i]->link) {
-                    $feedArray[] = "<div class='" . $this->stylePrefix . "item_title'><a href='"
-                                   . $this->items[$i]->link . "' class='" . $this->stylePrefix . "item_title'"
-                                   . $targetInsert . '>'
-                                   . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100)
-                                   . '</a></div>';
-                } else {
-                    $feedArray[] = "<div class='" . $this->stylePrefix . "item_title'>"
-                                   . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100)
-                                   . '</div>';
-                }
-            }
-            if ($this->items[$i]->getDescription()) {
-                $feedArray[] = "<div class='" . $this->stylePrefix . "item_description'>" . str_replace(']]>', '',
-                                                                                                        str_replace('<![CDATA[',
-                                                                                                                    '',
-                                                                                                                    $this->items[$i]->getDescription()))
-                               . '</div>';
-            }
-        }
-        if ($this->footer) {
-            $feedArray[] = "<div class='" . $this->stylePrefix . "footer'>" . $this->footer . '</div>';
-        }
-
-        $feed = '' . implode($feedArray, "\r\n");
-
-        return $feed;
-    }
-
-    /**
-     * Overrrides parent to produce .html extensions
-     *
-     * @return string the feed cache filename
-     * @since  1.4
-     * @access private
-     */
-    public function _generateFilename() {
-        $fileInfo = pathinfo($_SERVER['PHP_SELF']);
-
-        return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.html';
-    }
+	public $contentType = 'text/html';
+
+	/**
+	 * Contains HTML to be output at the start of the feed's html representation.
+	 */
+	public $header;
+
+	/**
+	 * Contains HTML to be output at the end of the feed's html representation.
+	 */
+	public $footer;
+
+	/**
+	 * Contains HTML to be output between entries. A separator is only used in
+	 * case of multiple entries.
+	 */
+	public $separator;
+
+	/**
+	 * Used to prefix the stylenames to make sure they are unique
+	 * and do not clash with stylenames on the users' page.
+	 */
+	public $stylePrefix;
+
+	/**
+	 * Determines whether the links open in a new window or not.
+	 */
+	public $openInNewWindow = true;
+
+	public $imageAlign = 'right';
+
+	/**
+	 * In case of very simple output you may want to get rid of the style tags,
+	 * hence this variable.  There's no equivalent on item level, but of course you can
+	 * add strings to it while iterating over the items ($this->stylelessOutput .= ...)
+	 * and when it is non-empty, ONLY the styleless output is printed, the rest is ignored
+	 * in the function createFeed().
+	 */
+	public $stylelessOutput = '';
+
+	/**
+	 * Writes the HTML.
+	 * @return string the scripts's complete text
+	 */
+	public function createFeed() {
+		// if there is styleless output, use the content of this variable and ignore the rest
+		if ($this->stylelessOutput != '') {
+			return $this->stylelessOutput;
+		}
+
+		//if no stylePrefix is set, generate it yourself depending on the script name
+		if ($this->stylePrefix == '') {
+			$this->stylePrefix = str_replace('.', '_', $this->_generateFilename()) . '_';
+		}
+
+		//set an openInNewWindow_token_to be inserted or not
+		if ($this->openInNewWindow) {
+			$targetInsert = " target='_blank'";
+		}
+
+		// use this array to put the lines in and implode later with "document.write" javascript
+		$feedArray = array();
+		if ($this->image != null) {
+			$imageStr = "<a href='" . $this->image->link . "'" . $targetInsert . '>' . "<img src='" . $this->image->url
+						. "' border='0' alt='" . FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100)
+						. "' align='" . $this->imageAlign . "' ";
+			if ($this->image->width) {
+				$imageStr .= " width='" . $this->image->width . "' ";
+			}
+			if ($this->image->height) {
+				$imageStr .= " height='" . $this->image->height . "' ";
+			}
+			$imageStr .= '/></a>';
+			$feedArray[] = $imageStr;
+		}
+
+		if ($this->title) {
+			$feedArray[] = "<div class='" . $this->stylePrefix . "title'><a href='" . $this->link . "' " . $targetInsert
+						   . " class='" . $this->stylePrefix . "title'>"
+						   . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . '</a></div>';
+		}
+		if ($this->getDescription()) {
+			$feedArray[] = "<div class='" . $this->stylePrefix . "description'>" . str_replace(']]>', '',
+																							   str_replace('<![CDATA[',
+																										   '',
+																										   $this->getDescription()))
+						   . '</div>';
+		}
+
+		if ($this->header) {
+			$feedArray[] = "<div class='" . $this->stylePrefix . "header'>" . $this->header . '</div>';
+		}
+
+		for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+			if ($this->separator && $i > 0) {
+				$feedArray[] = "<div class='" . $this->stylePrefix . "separator'>" . $this->separator . '</div>';
+			}
+
+			if ($this->items[$i]->title) {
+				if ($this->items[$i]->link) {
+					$feedArray[] = "<div class='" . $this->stylePrefix . "item_title'><a href='"
+								   . $this->items[$i]->link . "' class='" . $this->stylePrefix . "item_title'"
+								   . $targetInsert . '>'
+								   . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100)
+								   . '</a></div>';
+				} else {
+					$feedArray[] = "<div class='" . $this->stylePrefix . "item_title'>"
+								   . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100)
+								   . '</div>';
+				}
+			}
+			if ($this->items[$i]->getDescription()) {
+				$feedArray[] = "<div class='" . $this->stylePrefix . "item_description'>" . str_replace(']]>', '',
+																										str_replace('<![CDATA[',
+																													'',
+																													$this->items[$i]->getDescription()))
+							   . '</div>';
+			}
+		}
+		if ($this->footer) {
+			$feedArray[] = "<div class='" . $this->stylePrefix . "footer'>" . $this->footer . '</div>';
+		}
+
+		$feed = '' . implode($feedArray, "\r\n");
+
+		return $feed;
+	}
+
+	/**
+	 * Overrrides parent to produce .html extensions
+	 *
+	 * @return string the feed cache filename
+	 * @since  1.4
+	 * @access private
+	 */
+	public function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER['PHP_SELF']);
+
+		return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.html';
+	}
 }
 
 /**
@@ -1547,36 +1547,36 @@ 
  */
 class JSCreator extends HTMLCreator
 {
-    public $contentType = 'text/javascript';
-
-    /**
-     * writes the javascript
-     * @return string the scripts's complete text
-     */
-    public function createFeed() {
-        $feed      = parent::createFeed();
-        $feedArray = explode("\n", $feed);
-
-        $jsFeed = '';
-        foreach ($feedArray as $value) {
-            $jsFeed .= "document.write('" . trim(addslashes($value)) . "');\n";
-        }
-
-        return $jsFeed;
-    }
-
-    /**
-     * Overrrides parent to produce .js extensions
-     *
-     * @return string the feed cache filename
-     * @since  1.4
-     * @access private
-     */
-    public function _generateFilename() {
-        $fileInfo = pathinfo($_SERVER['PHP_SELF']);
-
-        return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.js';
-    }
+	public $contentType = 'text/javascript';
+
+	/**
+	 * writes the javascript
+	 * @return string the scripts's complete text
+	 */
+	public function createFeed() {
+		$feed      = parent::createFeed();
+		$feedArray = explode("\n", $feed);
+
+		$jsFeed = '';
+		foreach ($feedArray as $value) {
+			$jsFeed .= "document.write('" . trim(addslashes($value)) . "');\n";
+		}
+
+		return $jsFeed;
+	}
+
+	/**
+	 * Overrrides parent to produce .js extensions
+	 *
+	 * @return string the feed cache filename
+	 * @since  1.4
+	 * @access private
+	 */
+	public function _generateFilename() {
+		$fileInfo = pathinfo($_SERVER['PHP_SELF']);
+
+		return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.js';
+	}
 }
 
 /*** TEST SCRIPT *********************************************************

class/magpie.inc.php

Doc Comments +8 added lines, -8 removed lines

@@ -302,7 +302,7 @@ 
 
     // smart append - field and namespace aware
     /**
-     * @param $el
+     * @param string $el
      * @param $text
      */
     public function append($el, $text) {
@@ -384,7 +384,7 @@ 
     }
 
     /**
-     * @return bool
+     * @return string|false
      */
     public function is_rss() {
         if ($this->feed_type == RSS) {
@@ -395,7 +395,7 @@ 
     }
 
     /**
-     * @return bool
+     * @return string|false
      */
     public function is_atom() {
         if ($this->feed_type == ATOM) {
@@ -407,10 +407,10 @@ 
 
     /**
      * return XML parser, and possibly re-encoded source
-     * @param $source
-     * @param $out_enc
-     * @param $in_enc
-     * @param $detect
+     * @param string $source
+     * @param string $out_enc
+     * @param string|null $in_enc
+     * @param boolean $detect
      * @return array
      */
     public function create_parser($source, $out_enc, $in_enc, $detect) {
@@ -517,7 +517,7 @@ 
 
     /**
      * @param $enc
-     * @return bool|string
+     * @return string|false
      */
     public function known_encoding($enc) {
         $enc = strtoupper($enc);

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/xmlparser.php

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
     }
 
     /**
-     * @return bool|string
+     * @return string|false
      */
     public function is_atom() {
         if ($this->feed_type == ATOM) {

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;
+	}
 }

include/functions.php

Doc Comments +3 added lines, -3 removed lines

@@ -108,7 +108,7 @@ 
      * @var mixed  $pattern
      * @var mixed  $replacement
      *
-     * @return bool true on success
+     * @return null|boolean true on success
      */
     function planet_parse_class($class_string, $pattern = '', $replacement = '') {
         if (empty($class_string)) {
@@ -143,7 +143,7 @@ 
      * @var mixed  $pattern
      * @var mixed  $replacement
      *
-     * @return bool true on success
+     * @return null|boolean true on success
      */
     function planet_parse_function($function_string, $pattern = '', $replacement = '') {
         if (empty($function_string)) {
@@ -494,7 +494,7 @@ 
 
     /**
      * @param $url
-     * @return bool|string
+     * @return false|string
      */
     function planet_fetch_fopen($url) {
         if (!$fp = @fopen($url, 'r')) {

Indentation +490 added lines, -490 removed lines

@@ -29,502 +29,502 @@
 
 $current_path = __FILE__;
 if (DIRECTORY_SEPARATOR !== '/') {
-    $current_path = str_replace(strpos($current_path, '\\\\', 2) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $current_path);
+	$current_path = str_replace(strpos($current_path, '\\\\', 2) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $url_arr               = explode('/', strstr($current_path, '/modules/'));
 $GLOBALS['moddirname'] = $url_arr[2];
 
 if (!defined('planet_FUNCTIONS')):
-    define('planet_FUNCTIONS', 1);
-
-    require XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/vars.php';
-    include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-    include_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.php';
-
-    /**
-     * Function to display messages
-     *
-     * @var mixed $messages
-     * @return bool
-     */
-    function planet_message($message) {
-        return mod_message($message);
-    }
-
-    /**
-     * Function to parse arguments for a page according to $_SERVER['REQUEST_URI']
-     *
-     * @var array $args_numeric array of numeric variable values
-     * @var array $args         array of indexed variables: name and value
-     * @var array $args_string  array of string variable values
-     *
-     * @return bool true on args parsed
-     */
-
-    /* known issues:
+	define('planet_FUNCTIONS', 1);
+
+	require XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/vars.php';
+	include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+	include_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.php';
+
+	/**
+	 * Function to display messages
+	 *
+	 * @var mixed $messages
+	 * @return bool
+	 */
+	function planet_message($message) {
+		return mod_message($message);
+	}
+
+	/**
+	 * Function to parse arguments for a page according to $_SERVER['REQUEST_URI']
+	 *
+	 * @var array $args_numeric array of numeric variable values
+	 * @var array $args         array of indexed variables: name and value
+	 * @var array $args_string  array of string variable values
+	 *
+	 * @return bool true on args parsed
+	 */
+
+	/* known issues:
      * - "/" in a string
      * - "&" in a string
     */
-    function planet_parse_args(&$args_numeric, &$args, &$args_string) {
-        $args_abb     = array(
-            'a' => 'article',
-            'b' => 'blog',
-            'c' => 'category',
-            'l' => 'list',
-            'o' => 'sort',
-            's' => 'start',
-            'u' => 'uid'
-        );
-        $args         = array();
-        $args_numeric = array();
-        $args_string  = array();
-        if (preg_match("/[^\?]*\.php[\/|\?]([^\?]*)/i", $_SERVER['REQUEST_URI'], $matches)) {
-            $vars = preg_split("/[\/|&]/", $matches[1]);
-            $vars = array_map('trim', $vars);
-            if (count($vars) > 0) {
-                foreach ($vars as $var) {
-                    if (is_numeric($var)) {
-                        $args_numeric[] = $var;
-                    } elseif (false === strpos($var, '=')) {
-                        if (is_numeric(substr($var, 1))) {
-                            $args[$args_abb[strtolower($var{0})]] = (int)substr($var, 1);
-                        } else {
-                            $args_string[] = urldecode($var);
-                        }
-                    } else {
-                        parse_str($var, $args);
-                    }
-                }
-            }
-        }
-
-        return (count($args) + count($args_numeric) + count($args_string) == 0) ? null : true;
-    }
-
-    /**
-     * Function to parse class prefix
-     *
-     * @var string $class_string string to be parsed
-     * @var mixed  $pattern
-     * @var mixed  $replacement
-     *
-     * @return bool true on success
-     */
-    function planet_parse_class($class_string, $pattern = '', $replacement = '') {
-        if (empty($class_string)) {
-            return;
-        }
-        $patterns     = array("/\[CLASS_PREFIX\]/");
-        $replacements = array(ucfirst(strtolower($GLOBALS['moddirname'])));
-        if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
-            $pattern     = array($pattern);
-            $replacement = array($replacement);
-        }
-        if (is_array($pattern) && count($pattern) > 0) {
-            $ii = 0;
-            foreach ($pattern as $pat) {
-                if (!in_array($pat, $patterns)) {
-                    $patterns[]     = $pat;
-                    $replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
-                }
-                ++$ii;
-            }
-        }
-        $class_string = preg_replace($patterns, $replacements, $class_string);
-        eval($class_string);
-
-        return true;
-    }
-
-    /**
-     * Function to parse function prefix
-     *
-     * @var string $function_string string to be parsed
-     * @var mixed  $pattern
-     * @var mixed  $replacement
-     *
-     * @return bool true on success
-     */
-    function planet_parse_function($function_string, $pattern = '', $replacement = '') {
-        if (empty($function_string)) {
-            return;
-        }
-        $patterns     = array("/\[DIRNAME\]/", "/\[VAR_PREFIX\]/");
-        $replacements = array($GLOBALS['moddirname'], $GLOBALS['VAR_PREFIX']);
-        if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
-            $pattern     = array($pattern);
-            $replacement = array($replacement);
-        }
-        if (is_array($pattern) && count($pattern) > 0) {
-            $ii = 0;
-            foreach ($pattern as $pat) {
-                if (!in_array($pat, $patterns)) {
-                    $patterns[]     = $pat;
-                    $replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
-                }
-                ++$ii;
-            }
-        }
-        $function_string = preg_replace($patterns, $replacements, $function_string);
-        eval($function_string);
-
-        return true;
-    }
-
-    /**
-     * Function to convert UNIX time to formatted time string
-     * @param        $time
-     * @param string $format
-     * @return string
-     */
-    function planet_formatTimestamp($time, $format = '') {
-        if (empty($time)) {
-            return '';
-        }
-
-        return formatTimestamp($time, $format);
-    }
-
-    /**
-     * Function to a list of user names associated with their user IDs
-     * @param      $userid
-     * @param int  $usereal
-     * @param bool $linked
-     * @return array
-     */
-    function &planet_getUnameFromId($userid, $usereal = 0, $linked = false) {
-        if (!is_array($userid)) {
-            $userid = array($userid);
-        }
-        $users =& mod_getUnameFromIds($userid, $usereal, $linked);
-
-        return $users;
-    }
-
-    /**
-     * Function to parse links, links are delimited by link break, URL and title of a link are delimited by space
-     *
-     * @var string $text raw content
-     *
-     * @return array associative array of link url and title
-     */
-    function &planet_parseLinks($text) {
-        $myts       = MyTextSanitizer::getInstance();
-        $link_array = preg_split("/(\r\n|\r|\n)( *)/", $text);
-        $links      = array();
-        if (count($link_array) > 0) {
-            foreach ($link_array as $link) {
-                @list($url, $title) = array_map('trim', preg_split('/ /', $link, 2));
-                if (empty($url)) {
-                    continue;
-                }
-                //if(empty($title)) $title = $url;
-                $links[] = array('url' => $url, 'title' => $myts->htmlSpecialChars($title));
-            }
-        }
-
-        return $links;
-    }
-
-    /**
-     * @param $pagename
-     * @return string
-     */
-    function planet_getTemplate($pagename) {
-        return $GLOBALS['VAR_PREFIX'] . '_' . $pagename . '.tpl';
-    }
-
-    /**
-     * @param int $currentoption
-     */
-    function planet_adminmenu($currentoption = -1) {
-        loadModuleAdminMenu($currentoption, '');
-
-        return;
-    }
-
-    /**
-     * Function to send a trackback
-     *
-     * @param $article
-     * @param $comment
-     * @return bool
-     */
-    function planet_com_trackback(&$article, &$comment) {
-        $blog_handler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
-        $blog_obj     = $blog_handler->get($article->getVar('blog_id'));
-        if (!$pattern = $blog_obj->getVar('blog_trackback')) {
-            return false;
-        }
-        @list($pat, $rep) = array_map('trim', preg_split("#[\s]+#", $pattern));
-        $trackback_url = preg_replace('#' . $pat . '#', $rep, $article_obj->getVar('art_link'));
-
-        return planet_trackback($trackback_url, $article);
-    }
-
-    /**
-     * @param $trackback_url
-     * @param $article
-     * @return bool
-     */
-    function planet_trackback($trackback_url, &$article) {
-        global $myts, $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
-
-        $title         = $article->getVar('art_title');
-        $excerpt       = $article->getVar('art_content');
-        $blog_name     = $xoopsConfig['sitename'] . '-' . $xoopsModule->getVar('name');
-        $title         = xoops_utf8_encode($title);
-        $excerpt       = xoops_utf8_encode($excerpt);
-        $blog_name     = xoops_utf8_encode($blog_name);
-        $charset       = 'utf-8';
-        $title1        = urlencode($title);
-        $excerpt1      = urlencode($excerpt);
-        $name1         = urlencode($blog_name);
-        $url           = urlencode(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php'
-                                   . URL_DELIMITER . '' . $article->getVar('art_id'));
-        $query_string  = "title=$title1&url=$url&blog_name=$name1&excerpt=$excerpt1&charset=$charset";
-        $trackback_url = parse_url($trackback_url);
-
-        $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?'
-                                                                                      . $trackback_url['query'] : '')
-                        . " HTTP/1.0\r\n";
-        $http_request .= 'Host: ' . $trackback_url['host'] . "\r\n";
-        $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . $charset . "\r\n";
-        $http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
-        $http_request .= 'User-Agent: XOOPS Blogs/' . XOOPS_VERSION;
-        $http_request .= "\r\n\r\n";
-        $http_request .= $query_string;
-        if ('' == $trackback_url['port']) {
-            $trackback_url['port'] = 80;
-        }
-        $fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
-        @fwrite($fs, $http_request);
-        if ($xoopsModuleConfig['do_debug']) {
-            $debug_file = XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '_trackback.log';
-            $fr         = "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n";
-            $fr .= "CHARSET:$charset\n";
-            $fr .= "NAME:$blog_name\n";
-            $fr .= 'TITLE:' . $title . "\n";
-            $fr .= "EXCERPT:$excerpt\n\n";
-            while (!@feof($fs)) {
-                $fr .= @fgets($fs, 4096);
-            }
-            $fr .= "\n\n";
-
-            if ($fp = fopen($debug_file, 'a')) {
-                fwrite($fp, $fr);
-                fclose($fp);
-            } else {
-            }
-        }
-        @fclose($fs);
-
-        return true;
-    }
-
-    /**
-     * Function to ping servers
-     * @param $server
-     * @param $id
-     */
-    function planet_ping($server, $id) {
-        if (is_array($server)) {
-            foreach ($server as $serv) {
-                planet_ping($serv, $id);
-            }
-        }
-        include_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class-IXR.php';
-
-        // using a timeout of 3 seconds should be enough to cover slow servers
-        $client          = new IXR_Client($server, false);
-        $client->timeout = 3;
-        $client->useragent .= ' -- XOOPS Article/' . XOOPS_VERSION;
-
-        // when set to true, this outputs debug messages by itself
-        $client->debug = false;
-
-        $blogname = xoops_utf8_encode($GLOBALS['xoopsModule']->getVar('name'));
-        $home     = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/';
-        $rss2_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php' . URL_DELIMITER . 'rss2.0/' . $id;
-
-        if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) { // then try a normal ping
-            $client->query('weblogUpdates.ping', $blogname, $home);
-        }
-    }
-
-    /**
-     * Function to respond to a trackback
-     * @param int    $error
-     * @param string $error_message
-     */
-    function planet_trackback_response($error = 0, $error_message = '') {
-        $charset       = 'utf-8';
-        $error_message = xoops_utf8_encode($error_message);
-        header('Content-Type: text/xml; charset="' . $charset . '"');
-        if ($error) {
-            echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
-            echo "<response>\n";
-            echo "<error>1</error>\n";
-            echo "<message>$error_message</message>\n";
-            echo '</response>';
-            die();
-        } else {
-            echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
-            echo "<response>\n";
-            echo "<error>0</error>\n";
-            echo '</response>';
-        }
-    }
-
-    /**
-     * Function to set a cookie with module-specified name
-     *
-     * using customized serialization method
-     * @param        $name
-     * @param string $string
-     * @param int    $expire
-     */
-    function planet_setcookie($name, $string = '', $expire = 0) {
-        if (is_array($string)) {
-            $value = array();
-            foreach ($string as $key => $val) {
-                $value[] = $key . '|' . $val;
-            }
-            $string = implode(',', $value);
-        }
-        setcookie($GLOBALS['VAR_PREFIX'] . $name, $string, (int)$expire, '/');
-    }
-
-    /**
-     * @param      $name
-     * @param bool $isArray
-     * @return array|null
-     */
-    function planet_getcookie($name, $isArray = false) {
-        $value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'] . $name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'] . $name] : null;
-        if ($isArray) {
-            $_value = $value ? explode(',', $value) : array();
-            $value  = array();
-            if (count($_value) > 0) {
-                foreach ($_value as $string) {
-                    $key         = substr($string, 0, strpos($string, '|'));
-                    $val         = substr($string, strpos($string, '|') + 1);
-                    $value[$key] = $val;
-                }
-            }
-            unset($_value);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Function to filter text
-     *
-     * @param $document
-     * @return string filtered text
-     */
-    function &planet_html2text(&$document) {
-        $document = strip_tags($document);
-
-        return $document;
-    }
-
-    // Adapted from PMA_getIp() [phpmyadmin project]
-    /**
-     * @param bool $asString
-     * @return mixed
-     */
-    function planet_getIP($asString = false) {
-        return mod_getIP($asString);
-    }
-
-    /**
-     * @param $url
-     * @return bool|mixed|string
-     */
-    function planet_remote_content($url) {
-        if ($data = planet_fetch_snoopy($url)) {
-            return $data;
-        }
-        if ($data = planet_fetch_CURL($url)) {
-            return $data;
-        }
-        if ($data = planet_fetch_fopen($url)) {
-            return $data;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param $url
-     * @return string
-     */
-    function planet_fetch_snoopy($url) {
-        require_once XOOPS_ROOT_PATH . '/class/snoopy.php';
-        $snoopy = new Snoopy;
-        $data   = '';
-        if (@$snoopy->fetch($url)) {
-            $data = is_array($snoopy->results) ? implode("\n", $snoopy->results) : $snoopy->results;
-        }
-
-        return $data;
-    }
-
-    /**
-     * @param $url
-     * @return bool|mixed
-     */
-    function planet_fetch_CURL($url) {
-        if (!function_exists('curl_init')) {
-            return false;
-        }
-        $ch = curl_init();    // initialize curl handle
-        curl_setopt($ch, CURLOPT_URL, $url); // set url to post to
-        curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 31s
-        $data = curl_exec($ch); // run the whole process
-        curl_close($ch);
-
-        return $data;
-    }
-
-    /**
-     * @param $url
-     * @return bool|string
-     */
-    function planet_fetch_fopen($url) {
-        if (!$fp = @fopen($url, 'r')) {
-            return false;
-        }
-        $data = '';
-        while (!feof($fp)) {
-            $data .= fgets($fp, 1024);
-        }
-        fclose($fp);
-
-        return $data;
-    }
-
-    /**
-     * @param     $haystack
-     * @param     $needle
-     * @param int $offset
-     * @return bool|int
-     */
-    function planet_strrpos($haystack, $needle, $offset = 0) {
-        if (substr(phpversion(), 0, 1) == 5) {
-            return strrpos($haystack, $needle, $offset);
-        }
-        $index = strpos(strrev($haystack), strrev($needle));
-        if ($index === false) {
-            return false;
-        }
-        $index = strlen($haystack) - strlen($needle) - $index;
-
-        return $index;
-    }
+	function planet_parse_args(&$args_numeric, &$args, &$args_string) {
+		$args_abb     = array(
+			'a' => 'article',
+			'b' => 'blog',
+			'c' => 'category',
+			'l' => 'list',
+			'o' => 'sort',
+			's' => 'start',
+			'u' => 'uid'
+		);
+		$args         = array();
+		$args_numeric = array();
+		$args_string  = array();
+		if (preg_match("/[^\?]*\.php[\/|\?]([^\?]*)/i", $_SERVER['REQUEST_URI'], $matches)) {
+			$vars = preg_split("/[\/|&]/", $matches[1]);
+			$vars = array_map('trim', $vars);
+			if (count($vars) > 0) {
+				foreach ($vars as $var) {
+					if (is_numeric($var)) {
+						$args_numeric[] = $var;
+					} elseif (false === strpos($var, '=')) {
+						if (is_numeric(substr($var, 1))) {
+							$args[$args_abb[strtolower($var{0})]] = (int)substr($var, 1);
+						} else {
+							$args_string[] = urldecode($var);
+						}
+					} else {
+						parse_str($var, $args);
+					}
+				}
+			}
+		}
+
+		return (count($args) + count($args_numeric) + count($args_string) == 0) ? null : true;
+	}
+
+	/**
+	 * Function to parse class prefix
+	 *
+	 * @var string $class_string string to be parsed
+	 * @var mixed  $pattern
+	 * @var mixed  $replacement
+	 *
+	 * @return bool true on success
+	 */
+	function planet_parse_class($class_string, $pattern = '', $replacement = '') {
+		if (empty($class_string)) {
+			return;
+		}
+		$patterns     = array("/\[CLASS_PREFIX\]/");
+		$replacements = array(ucfirst(strtolower($GLOBALS['moddirname'])));
+		if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
+			$pattern     = array($pattern);
+			$replacement = array($replacement);
+		}
+		if (is_array($pattern) && count($pattern) > 0) {
+			$ii = 0;
+			foreach ($pattern as $pat) {
+				if (!in_array($pat, $patterns)) {
+					$patterns[]     = $pat;
+					$replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
+				}
+				++$ii;
+			}
+		}
+		$class_string = preg_replace($patterns, $replacements, $class_string);
+		eval($class_string);
+
+		return true;
+	}
+
+	/**
+	 * Function to parse function prefix
+	 *
+	 * @var string $function_string string to be parsed
+	 * @var mixed  $pattern
+	 * @var mixed  $replacement
+	 *
+	 * @return bool true on success
+	 */
+	function planet_parse_function($function_string, $pattern = '', $replacement = '') {
+		if (empty($function_string)) {
+			return;
+		}
+		$patterns     = array("/\[DIRNAME\]/", "/\[VAR_PREFIX\]/");
+		$replacements = array($GLOBALS['moddirname'], $GLOBALS['VAR_PREFIX']);
+		if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
+			$pattern     = array($pattern);
+			$replacement = array($replacement);
+		}
+		if (is_array($pattern) && count($pattern) > 0) {
+			$ii = 0;
+			foreach ($pattern as $pat) {
+				if (!in_array($pat, $patterns)) {
+					$patterns[]     = $pat;
+					$replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : '';
+				}
+				++$ii;
+			}
+		}
+		$function_string = preg_replace($patterns, $replacements, $function_string);
+		eval($function_string);
+
+		return true;
+	}
+
+	/**
+	 * Function to convert UNIX time to formatted time string
+	 * @param        $time
+	 * @param string $format
+	 * @return string
+	 */
+	function planet_formatTimestamp($time, $format = '') {
+		if (empty($time)) {
+			return '';
+		}
+
+		return formatTimestamp($time, $format);
+	}
+
+	/**
+	 * Function to a list of user names associated with their user IDs
+	 * @param      $userid
+	 * @param int  $usereal
+	 * @param bool $linked
+	 * @return array
+	 */
+	function &planet_getUnameFromId($userid, $usereal = 0, $linked = false) {
+		if (!is_array($userid)) {
+			$userid = array($userid);
+		}
+		$users =& mod_getUnameFromIds($userid, $usereal, $linked);
+
+		return $users;
+	}
+
+	/**
+	 * Function to parse links, links are delimited by link break, URL and title of a link are delimited by space
+	 *
+	 * @var string $text raw content
+	 *
+	 * @return array associative array of link url and title
+	 */
+	function &planet_parseLinks($text) {
+		$myts       = MyTextSanitizer::getInstance();
+		$link_array = preg_split("/(\r\n|\r|\n)( *)/", $text);
+		$links      = array();
+		if (count($link_array) > 0) {
+			foreach ($link_array as $link) {
+				@list($url, $title) = array_map('trim', preg_split('/ /', $link, 2));
+				if (empty($url)) {
+					continue;
+				}
+				//if(empty($title)) $title = $url;
+				$links[] = array('url' => $url, 'title' => $myts->htmlSpecialChars($title));
+			}
+		}
+
+		return $links;
+	}
+
+	/**
+	 * @param $pagename
+	 * @return string
+	 */
+	function planet_getTemplate($pagename) {
+		return $GLOBALS['VAR_PREFIX'] . '_' . $pagename . '.tpl';
+	}
+
+	/**
+	 * @param int $currentoption
+	 */
+	function planet_adminmenu($currentoption = -1) {
+		loadModuleAdminMenu($currentoption, '');
+
+		return;
+	}
+
+	/**
+	 * Function to send a trackback
+	 *
+	 * @param $article
+	 * @param $comment
+	 * @return bool
+	 */
+	function planet_com_trackback(&$article, &$comment) {
+		$blog_handler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
+		$blog_obj     = $blog_handler->get($article->getVar('blog_id'));
+		if (!$pattern = $blog_obj->getVar('blog_trackback')) {
+			return false;
+		}
+		@list($pat, $rep) = array_map('trim', preg_split("#[\s]+#", $pattern));
+		$trackback_url = preg_replace('#' . $pat . '#', $rep, $article_obj->getVar('art_link'));
+
+		return planet_trackback($trackback_url, $article);
+	}
+
+	/**
+	 * @param $trackback_url
+	 * @param $article
+	 * @return bool
+	 */
+	function planet_trackback($trackback_url, &$article) {
+		global $myts, $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
+
+		$title         = $article->getVar('art_title');
+		$excerpt       = $article->getVar('art_content');
+		$blog_name     = $xoopsConfig['sitename'] . '-' . $xoopsModule->getVar('name');
+		$title         = xoops_utf8_encode($title);
+		$excerpt       = xoops_utf8_encode($excerpt);
+		$blog_name     = xoops_utf8_encode($blog_name);
+		$charset       = 'utf-8';
+		$title1        = urlencode($title);
+		$excerpt1      = urlencode($excerpt);
+		$name1         = urlencode($blog_name);
+		$url           = urlencode(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php'
+								   . URL_DELIMITER . '' . $article->getVar('art_id'));
+		$query_string  = "title=$title1&url=$url&blog_name=$name1&excerpt=$excerpt1&charset=$charset";
+		$trackback_url = parse_url($trackback_url);
+
+		$http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?'
+																					  . $trackback_url['query'] : '')
+						. " HTTP/1.0\r\n";
+		$http_request .= 'Host: ' . $trackback_url['host'] . "\r\n";
+		$http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . $charset . "\r\n";
+		$http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n";
+		$http_request .= 'User-Agent: XOOPS Blogs/' . XOOPS_VERSION;
+		$http_request .= "\r\n\r\n";
+		$http_request .= $query_string;
+		if ('' == $trackback_url['port']) {
+			$trackback_url['port'] = 80;
+		}
+		$fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
+		@fwrite($fs, $http_request);
+		if ($xoopsModuleConfig['do_debug']) {
+			$debug_file = XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '_trackback.log';
+			$fr         = "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n";
+			$fr .= "CHARSET:$charset\n";
+			$fr .= "NAME:$blog_name\n";
+			$fr .= 'TITLE:' . $title . "\n";
+			$fr .= "EXCERPT:$excerpt\n\n";
+			while (!@feof($fs)) {
+				$fr .= @fgets($fs, 4096);
+			}
+			$fr .= "\n\n";
+
+			if ($fp = fopen($debug_file, 'a')) {
+				fwrite($fp, $fr);
+				fclose($fp);
+			} else {
+			}
+		}
+		@fclose($fs);
+
+		return true;
+	}
+
+	/**
+	 * Function to ping servers
+	 * @param $server
+	 * @param $id
+	 */
+	function planet_ping($server, $id) {
+		if (is_array($server)) {
+			foreach ($server as $serv) {
+				planet_ping($serv, $id);
+			}
+		}
+		include_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class-IXR.php';
+
+		// using a timeout of 3 seconds should be enough to cover slow servers
+		$client          = new IXR_Client($server, false);
+		$client->timeout = 3;
+		$client->useragent .= ' -- XOOPS Article/' . XOOPS_VERSION;
+
+		// when set to true, this outputs debug messages by itself
+		$client->debug = false;
+
+		$blogname = xoops_utf8_encode($GLOBALS['xoopsModule']->getVar('name'));
+		$home     = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/';
+		$rss2_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php' . URL_DELIMITER . 'rss2.0/' . $id;
+
+		if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) { // then try a normal ping
+			$client->query('weblogUpdates.ping', $blogname, $home);
+		}
+	}
+
+	/**
+	 * Function to respond to a trackback
+	 * @param int    $error
+	 * @param string $error_message
+	 */
+	function planet_trackback_response($error = 0, $error_message = '') {
+		$charset       = 'utf-8';
+		$error_message = xoops_utf8_encode($error_message);
+		header('Content-Type: text/xml; charset="' . $charset . '"');
+		if ($error) {
+			echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+			echo "<response>\n";
+			echo "<error>1</error>\n";
+			echo "<message>$error_message</message>\n";
+			echo '</response>';
+			die();
+		} else {
+			echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+			echo "<response>\n";
+			echo "<error>0</error>\n";
+			echo '</response>';
+		}
+	}
+
+	/**
+	 * Function to set a cookie with module-specified name
+	 *
+	 * using customized serialization method
+	 * @param        $name
+	 * @param string $string
+	 * @param int    $expire
+	 */
+	function planet_setcookie($name, $string = '', $expire = 0) {
+		if (is_array($string)) {
+			$value = array();
+			foreach ($string as $key => $val) {
+				$value[] = $key . '|' . $val;
+			}
+			$string = implode(',', $value);
+		}
+		setcookie($GLOBALS['VAR_PREFIX'] . $name, $string, (int)$expire, '/');
+	}
+
+	/**
+	 * @param      $name
+	 * @param bool $isArray
+	 * @return array|null
+	 */
+	function planet_getcookie($name, $isArray = false) {
+		$value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'] . $name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'] . $name] : null;
+		if ($isArray) {
+			$_value = $value ? explode(',', $value) : array();
+			$value  = array();
+			if (count($_value) > 0) {
+				foreach ($_value as $string) {
+					$key         = substr($string, 0, strpos($string, '|'));
+					$val         = substr($string, strpos($string, '|') + 1);
+					$value[$key] = $val;
+				}
+			}
+			unset($_value);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Function to filter text
+	 *
+	 * @param $document
+	 * @return string filtered text
+	 */
+	function &planet_html2text(&$document) {
+		$document = strip_tags($document);
+
+		return $document;
+	}
+
+	// Adapted from PMA_getIp() [phpmyadmin project]
+	/**
+	 * @param bool $asString
+	 * @return mixed
+	 */
+	function planet_getIP($asString = false) {
+		return mod_getIP($asString);
+	}
+
+	/**
+	 * @param $url
+	 * @return bool|mixed|string
+	 */
+	function planet_remote_content($url) {
+		if ($data = planet_fetch_snoopy($url)) {
+			return $data;
+		}
+		if ($data = planet_fetch_CURL($url)) {
+			return $data;
+		}
+		if ($data = planet_fetch_fopen($url)) {
+			return $data;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param $url
+	 * @return string
+	 */
+	function planet_fetch_snoopy($url) {
+		require_once XOOPS_ROOT_PATH . '/class/snoopy.php';
+		$snoopy = new Snoopy;
+		$data   = '';
+		if (@$snoopy->fetch($url)) {
+			$data = is_array($snoopy->results) ? implode("\n", $snoopy->results) : $snoopy->results;
+		}
+
+		return $data;
+	}
+
+	/**
+	 * @param $url
+	 * @return bool|mixed
+	 */
+	function planet_fetch_CURL($url) {
+		if (!function_exists('curl_init')) {
+			return false;
+		}
+		$ch = curl_init();    // initialize curl handle
+		curl_setopt($ch, CURLOPT_URL, $url); // set url to post to
+		curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable
+		curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 31s
+		$data = curl_exec($ch); // run the whole process
+		curl_close($ch);
+
+		return $data;
+	}
+
+	/**
+	 * @param $url
+	 * @return bool|string
+	 */
+	function planet_fetch_fopen($url) {
+		if (!$fp = @fopen($url, 'r')) {
+			return false;
+		}
+		$data = '';
+		while (!feof($fp)) {
+			$data .= fgets($fp, 1024);
+		}
+		fclose($fp);
+
+		return $data;
+	}
+
+	/**
+	 * @param     $haystack
+	 * @param     $needle
+	 * @param int $offset
+	 * @return bool|int
+	 */
+	function planet_strrpos($haystack, $needle, $offset = 0) {
+		if (substr(phpversion(), 0, 1) == 5) {
+			return strrpos($haystack, $needle, $offset);
+		}
+		$index = strpos(strrev($haystack), strrev($needle));
+		if ($index === false) {
+			return false;
+		}
+		$index = strlen($haystack) - strlen($needle) - $index;
+
+		return $index;
+	}
 endif;

view.archive.php

Doc Comments +1 added lines, -1 removed lines

@@ -293,7 +293,7 @@
 // Used in get_calendar
 /**
  * @param $num
- * @return mixed
+ * @return double
  */
 function planet_calendar_week_mod($num) {
     $base = 7;

Indentation +157 added lines, -157 removed lines

@@ -27,9 +27,9 @@ 
 include __DIR__ . '/header.php';
 
 if (planet_parse_args($args_num, $args, $args_str)) {
-    $args['year']  = @$args_num[0];
-    $args['month'] = @$args_num[1];
-    $args['day']   = @$args_num[2];
+	$args['year']  = @$args_num[0];
+	$args['month'] = @$args_num[1];
+	$args['day']   = @$args_num[2];
 }
 
 $day     = (int)(empty($_GET['day']) ? @$args['day'] : $_GET['day']);
@@ -50,31 +50,31 @@ 
 
 $year = empty($year) ? date('Y') : $year;
 if ($month < 1) {
-    $month        = $day = 0;
-    $page['time'] = sprintf(planet_constant('MD_TIME_Y'), $year);
+	$month        = $day = 0;
+	$page['time'] = sprintf(planet_constant('MD_TIME_Y'), $year);
 } elseif ($day < 1) {
-    $day          = 0;
-    $page['time'] = sprintf(planet_constant('MD_TIME_YM'), $year, $month);
+	$day          = 0;
+	$page['time'] = sprintf(planet_constant('MD_TIME_YM'), $year, $month);
 } else {
-    $page['time'] = sprintf(planet_constant('MD_TIME_YMD'), $year, $month, $day);
+	$page['time'] = sprintf(planet_constant('MD_TIME_YMD'), $year, $month, $day);
 }
 $time = array('year' => $year, 'month' => $month, 'day' => $day);
 if ($xoopsUser) {
-    $timeoffset = ($xoopsUser->getVar('timezone_offset') - $xoopsConfig['server_TZ']) * 3600;
+	$timeoffset = ($xoopsUser->getVar('timezone_offset') - $xoopsConfig['server_TZ']) * 3600;
 } else {
-    $timeoffset = ($xoopsConfig['default_TZ'] - $xoopsConfig['server_TZ']) * 3600;
+	$timeoffset = ($xoopsConfig['default_TZ'] - $xoopsConfig['server_TZ']) * 3600;
 }
 
 $criteria = new CriteriaCompo();
 if ($blog_id) {
-    $criteria->add(new Criteria('blog_id', $blog_id));
+	$criteria->add(new Criteria('blog_id', $blog_id));
 }
 $criteria->add(new Criteria("YEAR(FROM_UNIXTIME(art_time_publish - $timeoffset))", $year));
 if ($month) {
-    $criteria->add(new Criteria("MONTH(FROM_UNIXTIME(art_time_publish - $timeoffset))", $month));
-    if ($day) {
-        $criteria->add(new Criteria("DAY(FROM_UNIXTIME(art_time_publish - $timeoffset))", $day));
-    }
+	$criteria->add(new Criteria("MONTH(FROM_UNIXTIME(art_time_publish - $timeoffset))", $month));
+	if ($day) {
+		$criteria->add(new Criteria("DAY(FROM_UNIXTIME(art_time_publish - $timeoffset))", $day));
+	}
 }
 $criteria->setStart($start);
 $criteria->setLimit($xoopsModuleConfig['articles_perpage']);
@@ -85,123 +85,123 @@ 
 $articles = array();
 $blogs_id = array();
 foreach ($articles_obj as $id => $article) {
-    $articles[]                            = array(
-        'id'      => $id,
-        'blog'    => array('id' => $article->getVar('blog_id'), 'title' => ''),
-        'title'   => $article->getVar('art_title'),
-        'time'    => $article->getTime(),
-        'content' => $article->getVar('art_content')
-    );
-    $articles[]                            = $_article;
-    $blogs_id[$article->getVar('blog_id')] = 1;
-    unset($_article);
+	$articles[]                            = array(
+		'id'      => $id,
+		'blog'    => array('id' => $article->getVar('blog_id'), 'title' => ''),
+		'title'   => $article->getVar('art_title'),
+		'time'    => $article->getTime(),
+		'content' => $article->getVar('art_content')
+	);
+	$articles[]                            = $_article;
+	$blogs_id[$article->getVar('blog_id')] = 1;
+	unset($_article);
 }
 $criteria_blog = new Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
 $blogs         = $blog_handler->getList($criteria_blog);
 foreach (array_keys($articles) as $key) {
-    $articles[$key]['blog']['title'] = $blogs[$articles[$key]['blog']['id']];
+	$articles[$key]['blog']['title'] = $blogs[$articles[$key]['blog']['id']];
 }
 if ($blog_id > 0) {
-    $page['blog'] = $blogs[$blog_id];;
+	$page['blog'] = $blogs[$blog_id];;
 }
 
 if ($articles_count > $xoopsModuleConfig['articles_perpage']) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
-    $nav     = new XoopsPageNav($articles_count, $xoopsModuleConfig['articles_perpage'], $start, 'start',
-                                'month=' . $month . '&amp;day=' . $day . '&amp;year=' . $year . '&amp;blog='
-                                . (int)$blog_id);
-    $pagenav = $nav->renderNav(4);
+	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+	$nav     = new XoopsPageNav($articles_count, $xoopsModuleConfig['articles_perpage'], $start, 'start',
+								'month=' . $month . '&amp;day=' . $day . '&amp;year=' . $year . '&amp;blog='
+								. (int)$blog_id);
+	$pagenav = $nav->renderNav(4);
 } else {
-    $pagenav = '';
+	$pagenav = '';
 }
 
 $timenav  = null;
 $calendar = null;
 $months   = null;
 if (empty($start)) {
-    if ($blog_id) {
-        $blog_criteria = ' AND blog_id=' . $blog_id;
-    } else {
-        $blog_criteria = '';
-    }
-    // Get monthly list
-    if (empty($month)) {
-        $sql    = "SELECT MONTH(FROM_UNIXTIME(art_time - $timeoffset)) AS mon, COUNT(DISTINCT art_id) AS count
+	if ($blog_id) {
+		$blog_criteria = ' AND blog_id=' . $blog_id;
+	} else {
+		$blog_criteria = '';
+	}
+	// Get monthly list
+	if (empty($month)) {
+		$sql    = "SELECT MONTH(FROM_UNIXTIME(art_time - $timeoffset)) AS mon, COUNT(DISTINCT art_id) AS count
             FROM " . planet_DB_prefix('article') . "
             WHERE YEAR(FROM_UNIXTIME(art_time - $timeoffset)) = $year
             " . $blog_criteria . '
             GROUP BY mon
             ';
-        $result = $xoopsDB->query($sql);
-        $months = array();
-        while ($myrow = $xoopsDB->fetchArray($result)) {
-            $months[] = array(
-                'title' => planet_constant('MD_MONTH_' . (int)$myrow['mon']) . ' (' . (int)$myrow['count'] . ')',
-                'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
-                           . $year . '/' . $myrow['mon'] . '/b' . $blog_id
-            );
-        }
-        $timenav['prev'] = array(
-            'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
-                       . ($year - 1) . '/b' . $blog_id,
-            'title' => sprintf(planet_constant('MD_TIME_Y'), $year - 1)
-        );
-        if ($year < date('Y')) {
-            $timenav['next'] = array(
-                'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
-                           . ($year + 1) . '/b' . $blog_id,
-                'title' => sprintf(planet_constant('MD_TIME_Y'), $year + 1)
-            );
-        }
-    } // Get daily list
-    elseif (empty($day)) {
-        $sql    = "SELECT DAY(FROM_UNIXTIME(art_time - $timeoffset)) AS day, COUNT(DISTINCT a.art_id) AS count
+		$result = $xoopsDB->query($sql);
+		$months = array();
+		while ($myrow = $xoopsDB->fetchArray($result)) {
+			$months[] = array(
+				'title' => planet_constant('MD_MONTH_' . (int)$myrow['mon']) . ' (' . (int)$myrow['count'] . ')',
+				'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
+						   . $year . '/' . $myrow['mon'] . '/b' . $blog_id
+			);
+		}
+		$timenav['prev'] = array(
+			'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
+					   . ($year - 1) . '/b' . $blog_id,
+			'title' => sprintf(planet_constant('MD_TIME_Y'), $year - 1)
+		);
+		if ($year < date('Y')) {
+			$timenav['next'] = array(
+				'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
+						   . ($year + 1) . '/b' . $blog_id,
+				'title' => sprintf(planet_constant('MD_TIME_Y'), $year + 1)
+			);
+		}
+	} // Get daily list
+	elseif (empty($day)) {
+		$sql    = "SELECT DAY(FROM_UNIXTIME(art_time - $timeoffset)) AS day, COUNT(DISTINCT a.art_id) AS count
             FROM " . planet_DB_prefix('article') . "
             WHERE YEAR(FROM_UNIXTIME(art_time - $timeoffset)) = $year
             AND MONTH(FROM_UNIXTIME(art_time - $timeoffset)) = $month
             " . $blog_criteria . '
             GROUP BY day
             ';
-        $result = $xoopsDB->query($sql);
-        $days   = array();
-        while ($myrow = $xoopsDB->fetchArray($result)) {
-            $days[$myrow['day']]['count'] = $myrow['count'];
-        }
-        for ($i = 1; $i <= 31; ++$i) {
-            if (!isset($days[$i])) {
-                continue;
-            }
-            $days[$i] = array(
-                'title' => $days[$i]['count'],
-                'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
-                           . $year . '/' . $month . '/' . $i . '/b' . $blog_id
-            );
-        }
-        $calendar   = planet_getCalendar($year, $month, $days);
-        $month_next = $month + 1;
-        $month_prev = $month - 1;
-        $_year      = $year;
-        if ($month == 12) {
-            $month_next = 1;
-            $_year      = $year + 1;
-        }
-        if ($month == 1) {
-            $month_pre = 12;
-            $_year     = $year - 1;
-        }
-        $timenav['prev'] = array(
-            'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
-                       . $_year . '/' . $month_prev . '/b' . $blog_id,
-            'title' => planet_constant('MD_MONTH_' . $month_prev)
-        );
-        if ($year < date('Y') || $month < date('n')) {
-            $timenav['next'] = array(
-                'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
-                           . $_year . '/' . $month_next . '/b' . $blog_id,
-                'title' => planet_constant('MD_MONTH_' . $month_next)
-            );
-        }
-    }
+		$result = $xoopsDB->query($sql);
+		$days   = array();
+		while ($myrow = $xoopsDB->fetchArray($result)) {
+			$days[$myrow['day']]['count'] = $myrow['count'];
+		}
+		for ($i = 1; $i <= 31; ++$i) {
+			if (!isset($days[$i])) {
+				continue;
+			}
+			$days[$i] = array(
+				'title' => $days[$i]['count'],
+				'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
+						   . $year . '/' . $month . '/' . $i . '/b' . $blog_id
+			);
+		}
+		$calendar   = planet_getCalendar($year, $month, $days);
+		$month_next = $month + 1;
+		$month_prev = $month - 1;
+		$_year      = $year;
+		if ($month == 12) {
+			$month_next = 1;
+			$_year      = $year + 1;
+		}
+		if ($month == 1) {
+			$month_pre = 12;
+			$_year     = $year - 1;
+		}
+		$timenav['prev'] = array(
+			'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
+					   . $_year . '/' . $month_prev . '/b' . $blog_id,
+			'title' => planet_constant('MD_MONTH_' . $month_prev)
+		);
+		if ($year < date('Y') || $month < date('n')) {
+			$timenav['next'] = array(
+				'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . ''
+						   . $_year . '/' . $month_next . '/b' . $blog_id,
+				'title' => planet_constant('MD_MONTH_' . $month_next)
+			);
+		}
+	}
 }
 
 $xoopsTpl->assign('dirname', $GLOBALS['moddirname']);
@@ -227,67 +227,67 @@ 
  * @return string
  */
 function planet_getCalendar($year = null, $month = null, $days = null) {
-    $year      = empty($year) ? date('Y') : $year;
-    $month     = empty($month) ? date('n') : $month;
-    $unixmonth = mktime(0, 0, 0, $month, 1, $year);
+	$year      = empty($year) ? date('Y') : $year;
+	$month     = empty($month) ? date('n') : $month;
+	$unixmonth = mktime(0, 0, 0, $month, 1, $year);
 
-    ob_start();
-    echo '<table id="calendar">';
-    echo '<caption>';
-    printf(planet_constant('MD_TIME_YM'), $year, planet_constant('MD_MONTH_' . $month));
-    echo '</caption>';
+	ob_start();
+	echo '<table id="calendar">';
+	echo '<caption>';
+	printf(planet_constant('MD_TIME_YM'), $year, planet_constant('MD_MONTH_' . $month));
+	echo '</caption>';
 
-    for ($i = 1; $i <= 7; ++$i) {
-        echo "\n\t\t<th abbr=\"" . planet_constant('MD_WEEK_' . $i) . "\" scope=\"col\" title=\""
-             . planet_constant('MD_WEEK_' . $i) . "\">" . planet_constant('MD_WEEK_' . $i) . '</th>';
-    }
+	for ($i = 1; $i <= 7; ++$i) {
+		echo "\n\t\t<th abbr=\"" . planet_constant('MD_WEEK_' . $i) . "\" scope=\"col\" title=\""
+			 . planet_constant('MD_WEEK_' . $i) . "\">" . planet_constant('MD_WEEK_' . $i) . '</th>';
+	}
 
-    echo '<tr>';
+	echo '<tr>';
 
-    // See how much we should pad in the beginning
-    $week_begins = 1;
-    $pad         = planet_calendar_week_mod(date('w', $unixmonth) - $week_begins);
-    if (0 != $pad) {
-        echo "\n\t\t" . '<td colspan="' . $pad . '">&nbsp;</td>';
-    }
+	// See how much we should pad in the beginning
+	$week_begins = 1;
+	$pad         = planet_calendar_week_mod(date('w', $unixmonth) - $week_begins);
+	if (0 != $pad) {
+		echo "\n\t\t" . '<td colspan="' . $pad . '">&nbsp;</td>';
+	}
 
-    $daysinmonth = (int)date('t', $unixmonth);
-    for ($day = 1; $day <= $daysinmonth; ++$day) {
-        if (isset($newrow) && $newrow) {
-            echo "\n\t</tr>\n\t<tr>\n\t\t";
-        }
-        $newrow = false;
+	$daysinmonth = (int)date('t', $unixmonth);
+	for ($day = 1; $day <= $daysinmonth; ++$day) {
+		if (isset($newrow) && $newrow) {
+			echo "\n\t</tr>\n\t<tr>\n\t\t";
+		}
+		$newrow = false;
 
-        echo '<td>';
+		echo '<td>';
 
-        if (!empty($days[$day]['url'])) {
-            echo '<a href="' . $days[$day]['url'] . "\"";
-            if (!empty($days[$day]['title'])) {
-                echo "title=\"" . $days[$day]['title'] . "\"";
-            }
-            echo ">$day</a>";
-        } elseif (!empty($days[$day]['title'])) {
-            echo "<acronym title=\"" . $days[$day]['title'] . "\">$day</acronym>";
-        } else {
-            echo $day;
-        }
-        echo '</td>';
+		if (!empty($days[$day]['url'])) {
+			echo '<a href="' . $days[$day]['url'] . "\"";
+			if (!empty($days[$day]['title'])) {
+				echo "title=\"" . $days[$day]['title'] . "\"";
+			}
+			echo ">$day</a>";
+		} elseif (!empty($days[$day]['title'])) {
+			echo "<acronym title=\"" . $days[$day]['title'] . "\">$day</acronym>";
+		} else {
+			echo $day;
+		}
+		echo '</td>';
 
-        if (6 == planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year)) - $week_begins)) {
-            $newrow = true;
-        }
-    }
+		if (6 == planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year)) - $week_begins)) {
+			$newrow = true;
+		}
+	}
 
-    $pad = 7 - planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year)) - $week_begins);
-    if ($pad != 0 && $pad != 7) {
-        echo "\n\t\t" . '<td class="pad" colspan="' . $pad . '">&nbsp;</td>';
-    }
+	$pad = 7 - planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year)) - $week_begins);
+	if ($pad != 0 && $pad != 7) {
+		echo "\n\t\t" . '<td class="pad" colspan="' . $pad . '">&nbsp;</td>';
+	}
 
-    echo "\n\t</tr>\n\t</tbody>\n\t</table>";
-    $calendar = ob_get_contents();
-    ob_end_clean();
+	echo "\n\t</tr>\n\t</tbody>\n\t</table>";
+	$calendar = ob_get_contents();
+	ob_end_clean();
 
-    return $calendar;
+	return $calendar;
 }
 
 // Used in get_calendar
@@ -296,7 +296,7 @@ 
  * @return mixed
  */
 function planet_calendar_week_mod($num) {
-    $base = 7;
+	$base = 7;
 
-    return ($num - $base * floor($num / $base));
+	return ($num - $base * floor($num / $base));
 }

index.php

Indentation +175 added lines, -175 removed lines

@@ -27,13 +27,13 @@ 
 include __DIR__ . '/header.php';
 
 if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
-    exit();
+	include XOOPS_ROOT_PATH . '/include/notification_update.php';
+	exit();
 }
 
 if ($REQUEST_URI_parsed = planet_parse_args($args_num, $args, $args_str)) {
-    $args['start'] = @$args_num[0];
-    $args['sort']  = @$args_str[0];
+	$args['start'] = @$args_num[0];
+	$args['sort']  = @$args_str[0];
 }
 
 /* Start */
@@ -51,34 +51,34 @@ 
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $args_REQUEST_URI = array();
-    $_args            = array('start', 'sort', 'uid', 'list');
-    foreach ($_args as $arg) {
-        if (!empty(${$arg})) {
-            $args_REQUEST_URI[] = $arg . '=' . ${$arg};
-        }
-    }
-    if (!empty($blog_id)) {
-        $args_REQUEST_URI[] = 'blog=' . $blog_id;
-    }
-    if (!empty($category_id)) {
-        $args_REQUEST_URI[] = 'category=' . $category_id;
-    }
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
-                              . (empty($args_REQUEST_URI) ? '' : '?' . implode('&', $args_REQUEST_URI));
+	$args_REQUEST_URI = array();
+	$_args            = array('start', 'sort', 'uid', 'list');
+	foreach ($_args as $arg) {
+		if (!empty(${$arg})) {
+			$args_REQUEST_URI[] = $arg . '=' . ${$arg};
+		}
+	}
+	if (!empty($blog_id)) {
+		$args_REQUEST_URI[] = 'blog=' . $blog_id;
+	}
+	if (!empty($category_id)) {
+		$args_REQUEST_URI[] = 'category=' . $category_id;
+	}
+	$_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
+							  . (empty($args_REQUEST_URI) ? '' : '?' . implode('&', $args_REQUEST_URI));
 }
 
 $xoopsOption['template_main'] = planet_getTemplate('index');
 $xoops_module_header          = '
     <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . ' rss" href="'
-                                . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."rss/c'
-                                . $category_id . '/b' . $blog_id . '/u' . $uid . '" />
+								. XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."rss/c'
+								. $category_id . '/b' . $blog_id . '/u' . $uid . '" />
     <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . ' rdf" href="'
-                                . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."rdf/c'
-                                . $category_id . '/b' . $blog_id . '/u' . $uid . '" />
+								. XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."rdf/c'
+								. $category_id . '/b' . $blog_id . '/u' . $uid . '" />
     <link rel="alternate" type="application/atom+xml" title="' . $xoopsModule->getVar('name') . ' atom" href="'
-                                . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."atom/c'
-                                . $category_id . '/b' . $blog_id . '/u' . $uid . '" />
+								. XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php".URL_DELIMITER."atom/c'
+								. $category_id . '/b' . $blog_id . '/u' . $uid . '" />
     ';
 
 $xoopsOption['xoops_module_header'] = $xoops_module_header;
@@ -96,74 +96,74 @@ 
 $article_prefix = '';
 /* Specific category */
 if ($category_id > 0) {
-    $category_obj = $category_handler->get($category_id);
-    $criteria->add(new Criteria('bc.cat_id', $category_id));
-    $uid            = 0;
-    $blog_id        = 0;
-    $category_data  = array('id' => $category_id, 'title' => $category_obj->getVar('cat_title'));
-    $query_type     = 'category';
-    $article_prefix = 'a.';
+	$category_obj = $category_handler->get($category_id);
+	$criteria->add(new Criteria('bc.cat_id', $category_id));
+	$uid            = 0;
+	$blog_id        = 0;
+	$category_data  = array('id' => $category_id, 'title' => $category_obj->getVar('cat_title'));
+	$query_type     = 'category';
+	$article_prefix = 'a.';
 }
 /* Specific blog */
 if ($blog_id > 0) {
-    $blog_obj =& $blog_handler->get($blog_id);
-    if ($blog_obj->getVar('blog_status')
-        || (is_object($xoopsUser)
-            && $xoopsUser->getVar('uid') == $blog_obj->getVar('blog_submitter'))
-    ) {
-        $criteria->add(new Criteria('blog_id', $blog_id));
-        $category_id      = 0;
-        $uid              = 0;
-        $bookmark_handler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-        $blog_data        = array(
-            'id'    => $blog_id,
-            'title' => $blog_obj->getVar('blog_title'),
-            'image' => $blog_obj->getImage(),
-            'title' => $blog_obj->getVar('blog_title'),
-            'feed'  => $blog_obj->getVar('blog_feed'),
-            'link'  => $blog_obj->getVar('blog_link'),
-            'desc'  => $blog_obj->getVar('blog_desc'),
-            'time'  => $blog_obj->getTime(),
-            'star'  => $blog_obj->getStar(),
-            'rates' => $blog_obj->getVar('blog_rates'),
-            'marks' => $blog_obj->getVar('blog_marks')
-        );
-    }
-    $query_type     = 'blog';
-    $article_prefix = '';
+	$blog_obj =& $blog_handler->get($blog_id);
+	if ($blog_obj->getVar('blog_status')
+		|| (is_object($xoopsUser)
+			&& $xoopsUser->getVar('uid') == $blog_obj->getVar('blog_submitter'))
+	) {
+		$criteria->add(new Criteria('blog_id', $blog_id));
+		$category_id      = 0;
+		$uid              = 0;
+		$bookmark_handler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+		$blog_data        = array(
+			'id'    => $blog_id,
+			'title' => $blog_obj->getVar('blog_title'),
+			'image' => $blog_obj->getImage(),
+			'title' => $blog_obj->getVar('blog_title'),
+			'feed'  => $blog_obj->getVar('blog_feed'),
+			'link'  => $blog_obj->getVar('blog_link'),
+			'desc'  => $blog_obj->getVar('blog_desc'),
+			'time'  => $blog_obj->getTime(),
+			'star'  => $blog_obj->getStar(),
+			'rates' => $blog_obj->getVar('blog_rates'),
+			'marks' => $blog_obj->getVar('blog_marks')
+		);
+	}
+	$query_type     = 'blog';
+	$article_prefix = '';
 }
 /* User bookmarks(favorites) */
 if ($uid > 0) {
-    $criteria->add(new Criteria('bm.bm_uid', $uid));
-    $category_id      = 0;
-    $blog_id          = 0;
-    $bookmark_handler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
-    $user_data        = array(
-        'uid'   => $uid,
-        'name'  => XoopsUser::getUnameFromId($uid),
-        'marks' => $bookmark_handler->getCount(new Criteria('bm_uid', $uid))
-    );
-    $query_type       = 'bookmark';
-    $article_prefix   = 'a.';
+	$criteria->add(new Criteria('bm.bm_uid', $uid));
+	$category_id      = 0;
+	$blog_id          = 0;
+	$bookmark_handler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
+	$user_data        = array(
+		'uid'   => $uid,
+		'name'  => XoopsUser::getUnameFromId($uid),
+		'marks' => $bookmark_handler->getCount(new Criteria('bm_uid', $uid))
+	);
+	$query_type       = 'bookmark';
+	$article_prefix   = 'a.';
 }
 
 /* Sort */
 $order = 'DESC';
 $sort  = empty($sort) ? 'time' : $sort;
 switch ($sort) {
-    case 'views':
-        $sortby = $article_prefix . 'art_views';
-        break;
-    case 'rating':
-        $sortby = $article_prefix . 'art_rating';
-        break;
-    case 'time':
-        $sortby = $article_prefix . 'art_time';
-        break;
-    case 'default':
-    default:
-        $sortby = '';
-        break;
+	case 'views':
+		$sortby = $article_prefix . 'art_views';
+		break;
+	case 'rating':
+		$sortby = $article_prefix . 'art_rating';
+		break;
+	case 'time':
+		$sortby = $article_prefix . 'art_time';
+		break;
+	case 'default':
+	default:
+		$sortby = '';
+		break;
 }
 $criteria->setSort($sortby);
 $criteria->setOrder($order);
@@ -171,120 +171,120 @@ 
 $criteria->setLimit($limit);
 
 $tags = empty($list) ? '' : array(
-    $article_prefix . 'art_title',
-    $article_prefix . 'blog_id',
-    $article_prefix . 'art_time'
+	$article_prefix . 'art_title',
+	$article_prefix . 'blog_id',
+	$article_prefix . 'art_time'
 );
 switch ($query_type) {
-    case 'category':
-        $articles_obj  =& $article_handler->getByCategory($criteria, $tags);
-        $count_article = $article_handler->getCountByCategory($criteria);
-        break;
-    case 'bookmark':
-        $articles_obj  =& $article_handler->getByBookmark($criteria, $tags);
-        $count_article = $article_handler->getCountByBookmark($criteria);
-        break;
-    default:
-        $articles_obj  =& $article_handler->getAll($criteria, $tags);
-        $count_article = $article_handler->getCount($criteria);
-        break;
+	case 'category':
+		$articles_obj  =& $article_handler->getByCategory($criteria, $tags);
+		$count_article = $article_handler->getCountByCategory($criteria);
+		break;
+	case 'bookmark':
+		$articles_obj  =& $article_handler->getByBookmark($criteria, $tags);
+		$count_article = $article_handler->getCountByBookmark($criteria);
+		break;
+	default:
+		$articles_obj  =& $article_handler->getAll($criteria, $tags);
+		$count_article = $article_handler->getCount($criteria);
+		break;
 }
 
 if (!empty($blog_data)) {
-    $blogs[$blog_data['id']] = $blog_data['title'];
+	$blogs[$blog_data['id']] = $blog_data['title'];
 } else {
-    $blog_array = array();
-    foreach (array_keys($articles_obj) as $id) {
-        $blog_array[$articles_obj[$id]->getVar('blog_id')] = 1;
-    }
-    $criteria_blog = new Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
-    $blogs         = $blog_handler->getList($criteria_blog);
+	$blog_array = array();
+	foreach (array_keys($articles_obj) as $id) {
+		$blog_array[$articles_obj[$id]->getVar('blog_id')] = 1;
+	}
+	$criteria_blog = new Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
+	$blogs         = $blog_handler->getList($criteria_blog);
 }
 
 /* Objects to array */
 $articles = array();
 foreach (array_keys($articles_obj) as $id) {
-    $_article = array(
-        'id'    => $id,
-        'title' => $articles_obj[$id]->getVar('art_title'),
-        'time'  => $articles_obj[$id]->getTime(),
-        'blog'  => array(
-            'id'    => $articles_obj[$id]->getVar('blog_id'),
-            'title' => $blogs[$articles_obj[$id]->getVar('blog_id')]
-        )
-    );
-    if (empty($list)) {
-        $_article = array_merge($_article, array(
-            'author'   => $articles_obj[$id]->getVar('art_author'),
-            'views'    => $articles_obj[$id]->getVar('art_views'),
-            'comments' => $articles_obj[$id]->getVar('art_comments'),
-            'star'     => $articles_obj[$id]->getStar(),
-            'rates'    => $articles_obj[$id]->getVar('art_rates')
-        ));
-        if (!empty($xoopsModuleConfig['display_summary'])) {
-            $_article['content'] = $articles_obj[$id]->getSummary();
-        } else {
-            $_article['content'] = $articles_obj[$id]->getVar('art_content');
-        }
-    }
-    $articles[] = $_article;
-    unset($_article);
+	$_article = array(
+		'id'    => $id,
+		'title' => $articles_obj[$id]->getVar('art_title'),
+		'time'  => $articles_obj[$id]->getTime(),
+		'blog'  => array(
+			'id'    => $articles_obj[$id]->getVar('blog_id'),
+			'title' => $blogs[$articles_obj[$id]->getVar('blog_id')]
+		)
+	);
+	if (empty($list)) {
+		$_article = array_merge($_article, array(
+			'author'   => $articles_obj[$id]->getVar('art_author'),
+			'views'    => $articles_obj[$id]->getVar('art_views'),
+			'comments' => $articles_obj[$id]->getVar('art_comments'),
+			'star'     => $articles_obj[$id]->getStar(),
+			'rates'    => $articles_obj[$id]->getVar('art_rates')
+		));
+		if (!empty($xoopsModuleConfig['display_summary'])) {
+			$_article['content'] = $articles_obj[$id]->getSummary();
+		} else {
+			$_article['content'] = $articles_obj[$id]->getVar('art_content');
+		}
+	}
+	$articles[] = $_article;
+	unset($_article);
 }
 unset($articles_obj);
 
 if ($count_article > $limit) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
-    $start_link = array();
-    if ($sort) {
-        $start_link[] = 'sort=' . $sort;
-    }
-    if ($category_id) {
-        $start_link[] = 'category=' . $category_id;
-    }
-    if ($blog_id) {
-        $start_link[] = 'blog=' . $blog_id;
-    }
-    if ($list) {
-        $start_link[] = 'list=' . $list;
-    }
-    $nav     = new XoopsPageNav($count_article, $limit, $start, 'start', implode('&amp;', $start_link));
-    $pagenav = $nav->renderNav(4);
+	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+	$start_link = array();
+	if ($sort) {
+		$start_link[] = 'sort=' . $sort;
+	}
+	if ($category_id) {
+		$start_link[] = 'category=' . $category_id;
+	}
+	if ($blog_id) {
+		$start_link[] = 'blog=' . $blog_id;
+	}
+	if ($list) {
+		$start_link[] = 'list=' . $list;
+	}
+	$nav     = new XoopsPageNav($count_article, $limit, $start, 'start', implode('&amp;', $start_link));
+	$pagenav = $nav->renderNav(4);
 } else {
-    $pagenav = '';
+	$pagenav = '';
 }
 
 $xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 $xoopsTpl->assign('dirname', $GLOBALS['moddirname']);
 
 if ($category_id || $blog_id || $uid) {
-    $xoopsTpl->assign('link_index',
-                      "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\""
-                      . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
+	$xoopsTpl->assign('link_index',
+					  "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/index.php\" title=\""
+					  . planet_constant('MD_INDEX') . "\" target=\"_self\">" . planet_constant('MD_INDEX') . '</a>');
 }
 
 $link_switch = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
-               . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid)
-               . (empty($blog_id) ? '' : '/b' . $blog_id) . (empty($list) ? '/l1' : '') . "\" title=\""
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW')) . "\">"
-               . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW')) . '</a>';
+			   . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid)
+			   . (empty($blog_id) ? '' : '/b' . $blog_id) . (empty($list) ? '/l1' : '') . "\" title=\""
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW')) . "\">"
+			   . (empty($list) ? planet_constant('MD_LISTVIEW') : planet_constant('MD_FULLVIEW')) . '</a>';
 $xoopsTpl->assign('link_switch', $link_switch);
 
 $link_blogs = "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.blogs.php'
-              . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\""
-              . planet_constant('MD_BLOGS') . "\">" . planet_constant('MD_BLOGS') . '</a>';
+			  . (empty($category_id) ? '' : '/c' . $category_id) . (empty($uid) ? '' : '/u' . $uid) . "\" title=\""
+			  . planet_constant('MD_BLOGS') . "\">" . planet_constant('MD_BLOGS') . '</a>';
 $xoopsTpl->assign('link_blogs', $link_blogs);
 
 if (empty($uid) && is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_bookmark',
-                      "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER
-                      . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS')
-                      . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
+	$xoopsTpl->assign('link_bookmark',
+					  "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER
+					  . 'u' . $xoopsUser->getVar('uid') . "\" title=\"" . planet_constant('MD_BOOKMARKS')
+					  . "\" target=\"_self\">" . planet_constant('MD_BOOKMARKS') . '</a>');
 }
 
 if ($xoopsModuleConfig['newblog_submit'] == 1 || is_object($xoopsUser)) {
-    $xoopsTpl->assign('link_submit',
-                      "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\""
-                      . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
+	$xoopsTpl->assign('link_submit',
+					  "<a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . "/action.blog.php\" title=\""
+					  . _SUBMIT . "\" target=\"_blank\">" . _SUBMIT . '</a>');
 }
 
 $xoopsTpl->assign('pagetitle', $xoopsModule->getVar('name') . '::' . planet_constant('MD_ARTICLES'));
@@ -298,25 +298,25 @@ 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
 } elseif ($blog_id > 0) {
-    $xoopsTpl->assign('canrate', 1);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 $sort_link   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . (empty($category_id) ? '' : '/c'
-                                                                                                             . $category_id)
-               . (empty($uid) ? '' : '/u' . $uid) . (empty($blog_id) ? '' : '/b' . $blog_id)
-               . (empty($list) ? '' : '/l1');
+																											 . $category_id)
+			   . (empty($uid) ? '' : '/u' . $uid) . (empty($blog_id) ? '' : '/b' . $blog_id)
+			   . (empty($list) ? '' : '/l1');
 $valid_sorts = array(
-    'views'   => planet_constant('MD_VIEWS'),
-    'rating'  => planet_constant('MD_RATING'),
-    'time'    => planet_constant('MD_TIME'),
-    'default' => planet_constant('MD_DEFAULT')
+	'views'   => planet_constant('MD_VIEWS'),
+	'rating'  => planet_constant('MD_RATING'),
+	'time'    => planet_constant('MD_TIME'),
+	'default' => planet_constant('MD_DEFAULT')
 );
 $sortlinks   = array();
 foreach ($valid_sorts as $val => $name) {
-    if ($val == $sort) {
-        continue;
-    }
-    $sortlinks[] = "<a href=\"" . $sort_link . '/' . $val . "\">" . $name . '</a>';
+	if ($val == $sort) {
+		continue;
+	}
+	$sortlinks[] = "<a href=\"" . $sort_link . '/' . $val . "\">" . $name . '</a>';
 }
 $xoopsTpl->assign('link_sort', implode(' | ', $sortlinks));
 $xoopsTpl->assign('version', $xoopsModule->getVar('version'));
@@ -325,8 +325,8 @@ 
 
 // for notification
 if (!empty($blog_id)) {
-    //$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php";
-    $_GET['blog'] = $blog_id;
+	//$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php";
+	$_GET['blog'] = $blog_id;
 }
 
 include_once __DIR__ . '/footer.php';

action.blog.php

Indentation +108 added lines, -108 removed lines

@@ -32,15 +32,15 @@ 
 $blog_id = is_array($blog_id) ? array_map('intval', $blog_id) : (int)$blog_id;
 
 if (empty($xoopsModuleConfig['newblog_submit']) && (!is_object($xoopsUser) || !$xoopsUser->isAdmin())) {
-    redirect_header('index.php', 2, _NOPERM);
+	redirect_header('index.php', 2, _NOPERM);
 }
 
 if ($op === 'save' && !empty($_POST['fetch'])) {
-    $op = 'edit';
+	$op = 'edit';
 }
 
 if ($op === 'save' && !$GLOBALS['xoopsSecurity']->check()) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
 }
 include XOOPS_ROOT_PATH . '/header.php';
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
@@ -49,111 +49,111 @@ 
 $category_handler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 
 switch ($op) {
-    /* save a single blog */
-    case 'save':
-
-        if ($blog_id) {
-            $blog_obj =& $blog_handler->get($blog_id);
-            if ($xoopsUser->isAdmin()) {
-                $blog_obj->setVar('blog_status', @$_POST['blog_status']);
-            }
-        } else {
-            if ($blog_exists = $blog_handler->getCount(new Criteria('blog_feed',
-                                                                    $myts->addSlashes(trim($_POST['blog_feed']))))
-            ) {
-                redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
-            }
-
-            $blog_obj =& $blog_handler->create();
-            $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : planet_getIP(true));
-
-            switch ($xoopsModuleConfig['newblog_submit']) {
-                case 2:
-                    if (!is_object($xoopsUser)) {
-                        $status = 0;
-                    } else {
-                        $status = 1;
-                    }
-                    break;
-                case 0:
-                case 3:
-                    $status = 1;
-                    break;
-                case 1:
-                default:
-                    if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
-                        $status = 0;
-                    } else {
-                        $status = 1;
-                    }
-                    break;
-            }
-
-            $blog_obj->setVar('blog_status', $status);
-        }
-
-        $blog_obj->setVar('blog_title', $_POST['blog_title']);
-        $blog_obj->setVar('blog_desc', $_POST['blog_desc']);
-        $blog_obj->setVar('blog_image', $_POST['blog_image']);
-        $blog_obj->setVar('blog_feed', $_POST['blog_feed']);
-        $blog_obj->setVar('blog_link', $_POST['blog_link']);
-        $blog_obj->setVar('blog_language', $_POST['blog_language']);
-        $blog_obj->setVar('blog_charset', $_POST['blog_charset']);
-        $blog_obj->setVar('blog_trackback', $_POST['blog_trackback']);
-        if ($blog_obj->isNew()) {
-            $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : planet_getIP(true));
-        }
-
-        if (!$blog_handler->insert($blog_obj)) {
-        } elseif (!empty($_POST['categories'])) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, $_POST['categories'])) {
-                $_POST['categories'] = array();
-            }
-            $blog_handler->setCategories($blog_id, $_POST['categories']);
-        }
-        $message = planet_constant('MD_DBUPDATED');
-        redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
-
-    /* edit a single blog */
-    case 'edit':
-    default:
-        if (!empty($_POST['fetch'])) {
-            $blog_obj =& $blog_handler->fetch($_POST['blog_feed']);
-            $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj =& $blog_handler->get($blog_id);
-        }
-        $categories = isset($_POST['categories']) ? $_POST['categories'] : array();
-        if (in_array('-1', $categories)) {
-            $categories = array();
-        }
-        if (empty($categories) && $blog_id > 0) {
-            $crit       = new Criteria('bc.blog_id', $blog_id);
-            $categories = array_keys($category_handler->getByBlog($crit));
-        }
-        if (empty($categories)) {
-            $categories = array(0 => _NONE);
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
-        echo '<br>';
-        if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
-            $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
-            $blogs_obj =& $blog_handler->getList($criteria);
-            if (count($blogs_obj) > 0) {
-                echo "<div class=\"errorMsg\">" . planet_constant('MD_BLOGEXISTS');
-                foreach (array_keys($blogs_obj) as $bid) {
-                    echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
-                         . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
-                }
-                echo '</div>';
-                unset($blogs_obj, $criteria);
-            }
-        }
-        include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
-        echo '</fieldset>';
-        break;
+	/* save a single blog */
+	case 'save':
+
+		if ($blog_id) {
+			$blog_obj =& $blog_handler->get($blog_id);
+			if ($xoopsUser->isAdmin()) {
+				$blog_obj->setVar('blog_status', @$_POST['blog_status']);
+			}
+		} else {
+			if ($blog_exists = $blog_handler->getCount(new Criteria('blog_feed',
+																	$myts->addSlashes(trim($_POST['blog_feed']))))
+			) {
+				redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
+			}
+
+			$blog_obj =& $blog_handler->create();
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : planet_getIP(true));
+
+			switch ($xoopsModuleConfig['newblog_submit']) {
+				case 2:
+					if (!is_object($xoopsUser)) {
+						$status = 0;
+					} else {
+						$status = 1;
+					}
+					break;
+				case 0:
+				case 3:
+					$status = 1;
+					break;
+				case 1:
+				default:
+					if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
+						$status = 0;
+					} else {
+						$status = 1;
+					}
+					break;
+			}
+
+			$blog_obj->setVar('blog_status', $status);
+		}
+
+		$blog_obj->setVar('blog_title', $_POST['blog_title']);
+		$blog_obj->setVar('blog_desc', $_POST['blog_desc']);
+		$blog_obj->setVar('blog_image', $_POST['blog_image']);
+		$blog_obj->setVar('blog_feed', $_POST['blog_feed']);
+		$blog_obj->setVar('blog_link', $_POST['blog_link']);
+		$blog_obj->setVar('blog_language', $_POST['blog_language']);
+		$blog_obj->setVar('blog_charset', $_POST['blog_charset']);
+		$blog_obj->setVar('blog_trackback', $_POST['blog_trackback']);
+		if ($blog_obj->isNew()) {
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : planet_getIP(true));
+		}
+
+		if (!$blog_handler->insert($blog_obj)) {
+		} elseif (!empty($_POST['categories'])) {
+			$blog_id = $blog_obj->getVar('blog_id');
+			if (in_array(0, $_POST['categories'])) {
+				$_POST['categories'] = array();
+			}
+			$blog_handler->setCategories($blog_id, $_POST['categories']);
+		}
+		$message = planet_constant('MD_DBUPDATED');
+		redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+
+	/* edit a single blog */
+	case 'edit':
+	default:
+		if (!empty($_POST['fetch'])) {
+			$blog_obj =& $blog_handler->fetch($_POST['blog_feed']);
+			$blog_obj->setVar('blog_id', $blog_id);
+		} else {
+			$blog_obj =& $blog_handler->get($blog_id);
+		}
+		$categories = isset($_POST['categories']) ? $_POST['categories'] : array();
+		if (in_array('-1', $categories)) {
+			$categories = array();
+		}
+		if (empty($categories) && $blog_id > 0) {
+			$crit       = new Criteria('bc.blog_id', $blog_id);
+			$categories = array_keys($category_handler->getByBlog($crit));
+		}
+		if (empty($categories)) {
+			$categories = array(0 => _NONE);
+		}
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+		echo '<br>';
+		if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
+			$criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
+			$blogs_obj =& $blog_handler->getList($criteria);
+			if (count($blogs_obj) > 0) {
+				echo "<div class=\"errorMsg\">" . planet_constant('MD_BLOGEXISTS');
+				foreach (array_keys($blogs_obj) as $bid) {
+					echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'
+						 . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
+				}
+				echo '</div>';
+				unset($blogs_obj, $criteria);
+			}
+		}
+		include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
+		echo '</fieldset>';
+		break;
 }
 
 include XOOPS_ROOT_PATH . '/footer.php';

trackback.php

Indentation +150 added lines, -150 removed lines

@@ -37,167 +37,167 @@
 $charset    = trim($_POST['charset']);
 
 if (empty($xoopsModuleConfig['trackback_option'])) {
-    planet_trackback_response(1, 'Trackback is closed');
+	planet_trackback_response(1, 'Trackback is closed');
 }
 if (!strlen($title . $url . $blog_name)) {
-    planet_trackback_response(1, planet_constant('MD_INVALID'));
+	planet_trackback_response(1, planet_constant('MD_INVALID'));
 }
 
 if (!empty($article_id) && !empty($url)) {
-    $trackback_handler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
-    $criteria          = new CriteriaCompo(new Criteria('art_id', $article_id));
-    $criteria->add(new Criteria('tb_url', $url));
-    if ($trackback_handler->getCount($criteria) > 0) {
-        planet_trackback_response(1, 'We already have a ping from that URI for this article.');
-    }
+	$trackback_handler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
+	$criteria          = new CriteriaCompo(new Criteria('art_id', $article_id));
+	$criteria->add(new Criteria('tb_url', $url));
+	if ($trackback_handler->getCount($criteria) > 0) {
+		planet_trackback_response(1, 'We already have a ping from that URI for this article.');
+	}
 
-    $charset   = empty($charset) ? 'utf-8' : $charset;
-    $title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
-    $excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
-    $blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
-    $tb_status = (int)$xoopsModuleConfig['trackback_option'];
+	$charset   = empty($charset) ? 'utf-8' : $charset;
+	$title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
+	$excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
+	$blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
+	$tb_status = (int)$xoopsModuleConfig['trackback_option'];
 
-    $com_pid    = 0;
-    $com_itemid = $article_id;
-    $com_rootid = 0;
-    $com_title  = $title;
-    $com_text   = $excerpt;
-    $com_text .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
-    if (!empty($url)) {
-        $com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
-    } else {
-        $com_text .= $blog_name;
-    }
-    $com_modid = $xoopsModule->getVar('mid');
+	$com_pid    = 0;
+	$com_itemid = $article_id;
+	$com_rootid = 0;
+	$com_title  = $title;
+	$com_text   = $excerpt;
+	$com_text .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
+	if (!empty($url)) {
+		$com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
+	} else {
+		$com_text .= $blog_name;
+	}
+	$com_modid = $xoopsModule->getVar('mid');
 
-    $comment_handler = xoops_getHandler('comment');
-    $comment         = $comment_handler->create();
-    $comment->setVar('com_created', time());
-    $comment->setVar('com_pid', $com_pid);
-    $comment->setVar('com_itemid', $com_itemid);
-    $comment->setVar('com_rootid', $com_rootid);
-    $comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
-    switch ($tb_status) {
-        case 2:
-            $comment->setVar('com_status', 2);
-            $call_approvefunc = true;
-            $call_updatefunc  = true;
-            $notify_event     = 'comment';
-            break;
-        case 1:
-        default:
-            $comment->setVar('com_status', 1);
-            $notify_event = 'comment_submit';
-            break;
-    }
-    $comment->setVar('com_uid', 0);
-    $com_title = xoops_trim($com_title);
-    $com_title = empty($com_title) ? _NOTITLE : $com_title;
-    $comment->setVar('com_title', $com_title);
-    $comment->setVar('com_text', $com_text);
-    $comment->setVar('dohtml', 0);
-    $comment->setVar('dosmiley', 0);
-    $comment->setVar('doxcode', 1);
-    $comment->setVar('doimage', 0);
-    $comment->setVar('dobr', 1);
-    $comment->setVar('com_icon', '');
-    $comment->setVar('com_modified', time());
-    $comment->setVar('com_modid', $com_modid);
-    if (false != $comment_handler->insert($comment)) {
-        $newcid = $comment->getVar('com_id');
+	$comment_handler = xoops_getHandler('comment');
+	$comment         = $comment_handler->create();
+	$comment->setVar('com_created', time());
+	$comment->setVar('com_pid', $com_pid);
+	$comment->setVar('com_itemid', $com_itemid);
+	$comment->setVar('com_rootid', $com_rootid);
+	$comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
+	switch ($tb_status) {
+		case 2:
+			$comment->setVar('com_status', 2);
+			$call_approvefunc = true;
+			$call_updatefunc  = true;
+			$notify_event     = 'comment';
+			break;
+		case 1:
+		default:
+			$comment->setVar('com_status', 1);
+			$notify_event = 'comment_submit';
+			break;
+	}
+	$comment->setVar('com_uid', 0);
+	$com_title = xoops_trim($com_title);
+	$com_title = empty($com_title) ? _NOTITLE : $com_title;
+	$comment->setVar('com_title', $com_title);
+	$comment->setVar('com_text', $com_text);
+	$comment->setVar('dohtml', 0);
+	$comment->setVar('dosmiley', 0);
+	$comment->setVar('doxcode', 1);
+	$comment->setVar('doimage', 0);
+	$comment->setVar('dobr', 1);
+	$comment->setVar('com_icon', '');
+	$comment->setVar('com_modified', time());
+	$comment->setVar('com_modid', $com_modid);
+	if (false != $comment_handler->insert($comment)) {
+		$newcid = $comment->getVar('com_id');
 
-        // set own id as root id
-        $com_rootid = $newcid;
-        if (!$comment_handler->updateByField($comment, 'com_rootid', $com_rootid)) {
-            $comment_handler->delete($comment);
-            planet_trackback_response(1, xoops_error());
-        }
+		// set own id as root id
+		$com_rootid = $newcid;
+		if (!$comment_handler->updateByField($comment, 'com_rootid', $com_rootid)) {
+			$comment_handler->delete($comment);
+			planet_trackback_response(1, xoops_error());
+		}
 
-        // call custom approve function if any
-        if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
-            && trim($comment_config['callback']['approve']) != ''
-        ) {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['approve'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
-                    ) {
-                        include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['approve'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $comment_config['callback']['approve']($comment);
-            }
-        }
+		// call custom approve function if any
+		if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
+			&& trim($comment_config['callback']['approve']) != ''
+		) {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['approve'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ($callbackfile != ''
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
+					) {
+						include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['approve'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$comment_config['callback']['approve']($comment);
+			}
+		}
 
-        // call custom update function if any
-        if (false != $call_updatefunc && isset($comment_config['callback']['update'])
-            && trim($comment_config['callback']['update']) != ''
-        ) {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['update'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ($callbackfile != ''
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
-                    ) {
-                        include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['update'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
-                $criteria->add(new Criteria('com_itemid', $com_itemid));
-                $criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
-                $comment_count = $comment_handler->getCount($criteria);
-                $func          = $comment_config['callback']['update'];
-                call_user_func_array($func, array($com_itemid, $comment_count, $comment->getVar('com_id')));
-            }
-        }
+		// call custom update function if any
+		if (false != $call_updatefunc && isset($comment_config['callback']['update'])
+			&& trim($comment_config['callback']['update']) != ''
+		) {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['update'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ($callbackfile != ''
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)
+					) {
+						include_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['update'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$criteria = new CriteriaCompo(new Criteria('com_modid', $com_modid));
+				$criteria->add(new Criteria('com_itemid', $com_itemid));
+				$criteria->add(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+				$comment_count = $comment_handler->getCount($criteria);
+				$func          = $comment_config['callback']['update'];
+				call_user_func_array($func, array($com_itemid, $comment_count, $comment->getVar('com_id')));
+			}
+		}
 
-        // RMV-NOTIFY
-        // trigger notification event if necessary
-        if ($notify_event) {
-            $not_modid = $com_modid;
-            include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-            $not_catinfo  =& notificationCommentCategoryInfo($not_modid);
-            $not_category = $not_catinfo['name'];
-            $not_itemid   = $com_itemid;
-            $not_event    = $notify_event;
-            // Build an ABSOLUTE URL to view the comment.  Make sure we
-            // point to a viewable page (i.e. not the system administration
-            // module).
-            $comment_tags = array();
-            $not_module   =& $xoopsModule;
-            if (!isset($comment_url)) {
-                $com_config  =& $not_module->getInfo('comments');
-                $comment_url = $com_config['pageName'] . '?';
-                $comment_url .= $com_config['itemName'];
-            }
-            $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/'
-                                             . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid
-                                             . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode
-                                             . '&com_order=' . $com_order . '#comment' . $newcid;
-            $notification_handler          = xoops_getHandler('notification');
-            $notification_handler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false,
-                                                $not_modid);
-        }
+		// RMV-NOTIFY
+		// trigger notification event if necessary
+		if ($notify_event) {
+			$not_modid = $com_modid;
+			include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+			$not_catinfo  =& notificationCommentCategoryInfo($not_modid);
+			$not_category = $not_catinfo['name'];
+			$not_itemid   = $com_itemid;
+			$not_event    = $notify_event;
+			// Build an ABSOLUTE URL to view the comment.  Make sure we
+			// point to a viewable page (i.e. not the system administration
+			// module).
+			$comment_tags = array();
+			$not_module   =& $xoopsModule;
+			if (!isset($comment_url)) {
+				$com_config  =& $not_module->getInfo('comments');
+				$comment_url = $com_config['pageName'] . '?';
+				$comment_url .= $com_config['itemName'];
+			}
+			$comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/'
+											 . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid
+											 . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode
+											 . '&com_order=' . $com_order . '#comment' . $newcid;
+			$notification_handler          = xoops_getHandler('notification');
+			$notification_handler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false,
+												$not_modid);
+		}
 
-        planet_trackback_response(0);
-    } else {
-        planet_trackback_response(1, xoops_error($comment->getHtmlErrors()));
-    }
+		planet_trackback_response(0);
+	} else {
+		planet_trackback_response(1, xoops_error($comment->getHtmlErrors()));
+	}
 }