mambax7 / planet

class/article.php

Doc Comments -1 removed lines

@@ -109,7 +109,6 @@
     /**
      * get summary of the article
      * 
-     * @param bool 	$actionOnEmpty flag for truncating content if summary is empty
      * @return string
      */
     function &getSummary($length = 0)

Indentation +78 added lines, -78 removed lines

@@ -48,73 +48,73 @@ 
 
 class Barticle extends ArtObject
 {
-    /**
-     * Constructor
-     *
-     * @param int $id ID of the article
-     */
-    function Barticle($id = null)
-    {
-	    $this->ArtObject();
-        $this->table = planet_DB_prefix("article");
-        $this->initVar("art_id", XOBJ_DTYPE_INT, null, false);
-        $this->initVar("blog_id", XOBJ_DTYPE_INT, 0, true);
+	/**
+	 * Constructor
+	 *
+	 * @param int $id ID of the article
+	 */
+	function Barticle($id = null)
+	{
+		$this->ArtObject();
+		$this->table = planet_DB_prefix("article");
+		$this->initVar("art_id", XOBJ_DTYPE_INT, null, false);
+		$this->initVar("blog_id", XOBJ_DTYPE_INT, 0, true);
 
-        $this->initVar("art_title", XOBJ_DTYPE_TXTBOX, "");
-        $this->initVar("art_content", XOBJ_DTYPE_TXTAREA, "");
-        $this->initVar("art_link", XOBJ_DTYPE_TXTBOX, "");
-        $this->initVar("art_time", XOBJ_DTYPE_INT, 0);
-        $this->initVar("art_author", XOBJ_DTYPE_TXTBOX, "");
+		$this->initVar("art_title", XOBJ_DTYPE_TXTBOX, "");
+		$this->initVar("art_content", XOBJ_DTYPE_TXTAREA, "");
+		$this->initVar("art_link", XOBJ_DTYPE_TXTBOX, "");
+		$this->initVar("art_time", XOBJ_DTYPE_INT, 0);
+		$this->initVar("art_author", XOBJ_DTYPE_TXTBOX, "");
 
-        $this->initVar("art_views", XOBJ_DTYPE_INT, 0);
-        $this->initVar("art_rating", XOBJ_DTYPE_INT, 0);
-        $this->initVar("art_rates", XOBJ_DTYPE_INT, 0);
-        $this->initVar("art_comments", XOBJ_DTYPE_INT, 0);
+		$this->initVar("art_views", XOBJ_DTYPE_INT, 0);
+		$this->initVar("art_rating", XOBJ_DTYPE_INT, 0);
+		$this->initVar("art_rates", XOBJ_DTYPE_INT, 0);
+		$this->initVar("art_comments", XOBJ_DTYPE_INT, 0);
 
-        $this->initVar("dohtml", XOBJ_DTYPE_INT, 1);
-        $this->initVar("dosmiley", XOBJ_DTYPE_INT, 1);
-        $this->initVar("doxcode", XOBJ_DTYPE_INT, 1);
-        $this->initVar("doimage", XOBJ_DTYPE_INT, 1);
-        $this->initVar("dobr", XOBJ_DTYPE_INT, 1);
-    }
+		$this->initVar("dohtml", XOBJ_DTYPE_INT, 1);
+		$this->initVar("dosmiley", XOBJ_DTYPE_INT, 1);
+		$this->initVar("doxcode", XOBJ_DTYPE_INT, 1);
+		$this->initVar("doimage", XOBJ_DTYPE_INT, 1);
+		$this->initVar("dobr", XOBJ_DTYPE_INT, 1);
+	}
 
-    /**
-     * get title of the article
-     * 
-     * @return string
-     */
-    function getTitle()
-    {
-	    $title = $this->getVar("art_title");
+	/**
+	 * get title of the article
+	 * 
+	 * @return string
+	 */
+	function getTitle()
+	{
+		$title = $this->getVar("art_title");
 		return $title;
-    }
+	}
 
-    /**
-     * get formatted publish time of the article
-     * 
- 	 * {@link Config} 
- 	 *
-     * @param string $format format of time
-     * @return string
-     */
-    function getTime($format = "c")
-    {
-	    $time = $this->getVar("art_time");
-	    if(empty($time)) $time = time();
-	    $time = planet_formatTimestamp($time, $format);
+	/**
+	 * get formatted publish time of the article
+	 * 
+	 * {@link Config} 
+	 *
+	 * @param string $format format of time
+	 * @return string
+	 */
+	function getTime($format = "c")
+	{
+		$time = $this->getVar("art_time");
+		if(empty($time)) $time = time();
+		$time = planet_formatTimestamp($time, $format);
 		return $time;
-    }
+	}
 
     
-    /**
-     * get summary of the article
-     * 
-     * @param bool 	$actionOnEmpty flag for truncating content if summary is empty
-     * @return string
-     */
-    function &getSummary($length = 0)
-    {
-	    $content = $this->getVar("art_content");
+	/**
+	 * get summary of the article
+	 * 
+	 * @param bool 	$actionOnEmpty flag for truncating content if summary is empty
+	 * @return string
+	 */
+	function &getSummary($length = 0)
+	{
+		$content = $this->getVar("art_content");
 		$summary = planet_html2text($content);
 		if(empty($length)){
 			$length = $GLOBALS["xoopsModuleConfig"]["display_summary"];
@@ -122,29 +122,29 @@ 
 		if(!empty($length)){
 			$summary = xoops_substr($summary, 0, $length);
 		}
-	    return $summary;
-    }
+		return $summary;
+	}
 
 
-    /**
-     * get rating average of the article
-     * 
-     * @param int $decimals decimal length
-     * @return numeric
-     */
-    function getRatingAverage($decimals = 1)
-    {
-	    $ave=3;
-	    if($this->getVar("art_rates")){
-	    	$ave = number_format($this->getVar("art_rating")/$this->getVar("art_rates"),$decimals);
-    	}
-	    return $ave;
-    }
+	/**
+	 * get rating average of the article
+	 * 
+	 * @param int $decimals decimal length
+	 * @return numeric
+	 */
+	function getRatingAverage($decimals = 1)
+	{
+		$ave=3;
+		if($this->getVar("art_rates")){
+			$ave = number_format($this->getVar("art_rating")/$this->getVar("art_rates"),$decimals);
+		}
+		return $ave;
+	}
 
-    function getStar()
-    {
-	    return $this->getRatingAverage(0);
-    }
+	function getStar()
+	{
+		return $this->getRatingAverage(0);
+	}
 }
 endif;
 

Spacing +7 added lines, -7 removed lines

@@ -44,7 +44,7 @@ 
  *
  * {@link XoopsObject} 
  **/
-if(!class_exists("Barticle")):
+if (!class_exists("Barticle")):
 
 class Barticle extends ArtObject
 {
@@ -100,7 +100,7 @@ 
     function getTime($format = "c")
     {
 	    $time = $this->getVar("art_time");
-	    if(empty($time)) $time = time();
+	    if (empty($time)) $time = time();
 	    $time = planet_formatTimestamp($time, $format);
 		return $time;
     }
@@ -116,10 +116,10 @@ 
     {
 	    $content = $this->getVar("art_content");
 		$summary = planet_html2text($content);
-		if(empty($length)){
+		if (empty($length)) {
 			$length = $GLOBALS["xoopsModuleConfig"]["display_summary"];
 		}
-		if(!empty($length)){
+		if (!empty($length)) {
 			$summary = xoops_substr($summary, 0, $length);
 		}
 	    return $summary;
@@ -134,9 +134,9 @@ 
      */
     function getRatingAverage($decimals = 1)
     {
-	    $ave=3;
-	    if($this->getVar("art_rates")){
-	    	$ave = number_format($this->getVar("art_rating")/$this->getVar("art_rates"),$decimals);
+	    $ave = 3;
+	    if ($this->getVar("art_rates")) {
+	    	$ave = number_format($this->getVar("art_rating")/$this->getVar("art_rates"), $decimals);
     	}
 	    return $ave;
     }

Braces +3 added lines, -1 removed lines

@@ -100,7 +100,9 @@
     function getTime($format = "c")
     {
 	    $time = $this->getVar("art_time");
-	    if(empty($time)) $time = time();
+	    if(empty($time)) {
+	    	$time = time();
+	    }
 	    $time = planet_formatTimestamp($time, $format);
 		return $time;
     }

class/class-IXR.php

Doc Comments +11 added lines

@@ -650,6 +650,10 @@ 
 
 class IXR_Base64 {
     var $data;
+
+    /**
+     * @param string $data
+     */
     function IXR_Base64($data) {
         $this->data = $data;
     }
@@ -694,6 +698,13 @@ 
             'Returns a documentation string for the specified method'
         );
     }
+
+    /**
+     * @param string $method
+     * @param string $callback
+     * @param string[] $args
+     * @param string $help
+     */
     function addCallback($method, $callback, $args, $help) {
         $this->callbacks[$method] = $callback;
         $this->signatures[$method] = $args;

Indentation +734 added lines, -734 removed lines

@@ -11,305 +11,305 @@ 
 
 
 class IXR_Value {
-    var $data;
-    var $type;
-    function IXR_Value ($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]);
-            }
-        }
-    }
-    function calculateType() {
-        if ($this->data === true || $this->data === false) {
-            return 'boolean';
-        }
-        if (is_integer($this->data)) {
-            return 'int';
-        }
-        if (is_double($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)) {
+	var $data;
+	var $type;
+	function IXR_Value ($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]);
+			}
+		}
+	}
+	function calculateType() {
+		if ($this->data === true || $this->data === false) {
+			return 'boolean';
+		}
+		if (is_integer($this->data)) {
+			return 'int';
+		}
+		if (is_double($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';
-        }
-    }
-    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;
-    }
-    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;
-    }
+			$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';
+		}
+	}
+	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;
+	}
+	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;
+	}
 }
 
 
 class IXR_Message {
-    var $message;
-    var $messageType;  // methodCall / methodResponse / fault
-    var $faultCode;
-    var $faultString;
-    var $methodName;
-    var $params;
-    // Current variable stacks
-    var $_arraystructs = array();   // The stack used to keep track of the current array/struct
-    var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
-    var $_currentStructName = array();  // A stack as well
-    var $_param;
-    var $_value;
-    var $_currentTag;
-    var $_currentTagContents;
-    // The XML parser
-    var $_parser;
-    function IXR_Message ($message) {
-        $this->message = $message;
-    }
-    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',
+	var $message;
+	var $messageType;  // methodCall / methodResponse / fault
+	var $faultCode;
+	var $faultString;
+	var $methodName;
+	var $params;
+	// Current variable stacks
+	var $_arraystructs = array();   // The stack used to keep track of the current array/struct
+	var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
+	var $_currentStructName = array();  // A stack as well
+	var $_param;
+	var $_value;
+	var $_currentTag;
+	var $_currentTagContents;
+	// The XML parser
+	var $_parser;
+	function IXR_Message ($message) {
+		$this->message = $message;
+	}
+	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;
-    }
-    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;
-        }
-    }
-    function cdata($parser, $cdata) {
-        $this->_currentTagContents .= $cdata;
-    }
-    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;
+	}
+	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;
+		}
+	}
+	function cdata($parser, $cdata) {
+		$this->_currentTagContents .= $cdata;
+	}
+	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;
+			}
+		}
+	}       
 }
 
 
 class IXR_Server {
-    var $data;
-    var $callbacks = array();
-    var $message;
-    var $capabilities;
-    function IXR_Server($callbacks = false, $data = false) {
-        $this->setCapabilities();
-        if ($callbacks) {
-            $this->callbacks = $callbacks;
-        }
-        $this->setCallbacks();
-        $this->serve($data);
-    }
-    function serve($data = false) {
-        if (!$data) {
-            global $HTTP_RAW_POST_DATA;
-            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
+	var $data;
+	var $callbacks = array();
+	var $message;
+	var $capabilities;
+	function IXR_Server($callbacks = false, $data = false) {
+		$this->setCapabilities();
+		if ($callbacks) {
+			$this->callbacks = $callbacks;
+		}
+		$this->setCallbacks();
+		$this->serve($data);
+	}
+	function serve($data = false) {
+		if (!$data) {
+			global $HTTP_RAW_POST_DATA;
+			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>
@@ -321,265 +321,265 @@ 
 </methodResponse>
 
 EOD;
-        // Send it
-        $this->output($xml);
-    }
-    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.');
-            	}
-            } else if (!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;
-    }
+		// Send it
+		$this->output($xml);
+	}
+	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.');
+				}
+			} else if (!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;
+	}
 
-    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());
-    }
-    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;
-    }
-    function hasMethod($method) {
-        return in_array($method, array_keys($this->callbacks));
-    }
-    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
-            ),
-        );   
-    }
-    function getCapabilities($args) {
-        return $this->capabilities;
-    }
-    function setCallbacks() {
-        $this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
-        $this->callbacks['system.listMethods'] = 'this:listMethods';
-        $this->callbacks['system.multicall'] = 'this:multiCall';
-    }
-    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));
-    }
-    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;
-    }
+	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());
+	}
+	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;
+	}
+	function hasMethod($method) {
+		return in_array($method, array_keys($this->callbacks));
+	}
+	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
+			),
+		);   
+	}
+	function getCapabilities($args) {
+		return $this->capabilities;
+	}
+	function setCallbacks() {
+		$this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
+		$this->callbacks['system.listMethods'] = 'this:listMethods';
+		$this->callbacks['system.multicall'] = 'this:multiCall';
+	}
+	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));
+	}
+	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;
+	}
 }
 
 class IXR_Request {
-    var $method;
-    var $args;
-    var $xml;
-    function IXR_Request($method, $args) {
-        $this->method = $method;
-        $this->args = $args;
-        $this->xml = <<<EOD
+	var $method;
+	var $args;
+	var $xml;
+	function IXR_Request($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>';
-    }
-    function getLength() {
-        return strlen($this->xml);
-    }
-    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>';
+	}
+	function getLength() {
+		return strlen($this->xml);
+	}
+	function getXml() {
+		return $this->xml;
+	}
 }
 
 
 class IXR_Client {
-    var $server;
-    var $port;
-    var $path;
-    var $useragent;
-    var $response;
-    var $timeout;
-    var $vendor = '';
-    var $message = false;
-    var $debug = false;
-    // Storage place for an error message
-    var $error = false;
-    function IXR_Client($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';
-    }
-    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;
-        }
-        fputs($fp, $request);
-        $contents = '';
-        $gotFirstLine = false;
-        $gettingHeaders = true;
-        while (!feof($fp)) {
-            $line = fgets($fp, 4096);
-            if (!$gotFirstLine) {
-                // Check line for '200'
-                if (strstr($line, '200') === false) {
-                    $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;
-    }
-    function getResponse() {
-        // methodResponses can only have one param - return that
-        return $this->message->params[0];
-    }
-    function isError() {
-        return (is_object($this->error));
-    }
-    function getErrorCode() {
-        return $this->error->code;
-    }
-    function getErrorMessage() {
-        return $this->error->message;
-    }
+	var $server;
+	var $port;
+	var $path;
+	var $useragent;
+	var $response;
+	var $timeout;
+	var $vendor = '';
+	var $message = false;
+	var $debug = false;
+	// Storage place for an error message
+	var $error = false;
+	function IXR_Client($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';
+	}
+	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;
+		}
+		fputs($fp, $request);
+		$contents = '';
+		$gotFirstLine = false;
+		$gettingHeaders = true;
+		while (!feof($fp)) {
+			$line = fgets($fp, 4096);
+			if (!$gotFirstLine) {
+				// Check line for '200'
+				if (strstr($line, '200') === false) {
+					$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;
+	}
+	function getResponse() {
+		// methodResponses can only have one param - return that
+		return $this->message->params[0];
+	}
+	function isError() {
+		return (is_object($this->error));
+	}
+	function getErrorCode() {
+		return $this->error->code;
+	}
+	function getErrorMessage() {
+		return $this->error->message;
+	}
 }
 
 
 class IXR_Error {
-    var $code;
-    var $message;
-    function IXR_Error($code, $message) {
-        $this->code = $code;
-        $this->message = $message;
-    }
-    function getXml() {
-        $xml = <<<EOD
+	var $code;
+	var $message;
+	function IXR_Error($code, $message) {
+		$this->code = $code;
+		$this->message = $message;
+	}
+	function getXml() {
+		$xml = <<<EOD
 <methodResponse>
   <fault>
     <value>
@@ -598,231 +598,231 @@ 
 </methodResponse> 
 
 EOD;
-        return $xml;
-    }
+		return $xml;
+	}
 }
 
 
 class IXR_Date {
-    var $year;
-    var $month;
-    var $day;
-    var $hour;
-    var $minute;
-    var $second;
-    var $timezone;
-    function IXR_Date($time) {
-        // $time can be a PHP timestamp or an ISO one
-        if (is_numeric($time)) {
-            $this->parseTimestamp($time);
-        } else {
-            $this->parseIso($time);
-        }
-    }
-    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);
-    }
-    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);
-    }
-    function getIso() {
-        return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
-    }
-    function getXml() {
-        return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
-    }
-    function getTimestamp() {
-        return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
-    }
+	var $year;
+	var $month;
+	var $day;
+	var $hour;
+	var $minute;
+	var $second;
+	var $timezone;
+	function IXR_Date($time) {
+		// $time can be a PHP timestamp or an ISO one
+		if (is_numeric($time)) {
+			$this->parseTimestamp($time);
+		} else {
+			$this->parseIso($time);
+		}
+	}
+	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);
+	}
+	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);
+	}
+	function getIso() {
+		return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone;
+	}
+	function getXml() {
+		return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
+	}
+	function getTimestamp() {
+		return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
+	}
 }
 
 
 class IXR_Base64 {
-    var $data;
-    function IXR_Base64($data) {
-        $this->data = $data;
-    }
-    function getXml() {
-        return '<base64>'.base64_encode($this->data).'</base64>';
-    }
+	var $data;
+	function IXR_Base64($data) {
+		$this->data = $data;
+	}
+	function getXml() {
+		return '<base64>'.base64_encode($this->data).'</base64>';
+	}
 }
 
 
 class IXR_IntrospectionServer extends IXR_Server {
-    var $signatures;
-    var $help;
-    function IXR_IntrospectionServer() {
-        $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'
-        );
-    }
-    function addCallback($method, $callback, $args, $help) {
-        $this->callbacks[$method] = $callback;
-        $this->signatures[$method] = $args;
-        $this->help[$method] = $help;
-    }
-    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);
-    }
-    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;
-    }
-    function methodHelp($method) {
-        return $this->help[$method];
-    }
+	var $signatures;
+	var $help;
+	function IXR_IntrospectionServer() {
+		$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'
+		);
+	}
+	function addCallback($method, $callback, $args, $help) {
+		$this->callbacks[$method] = $callback;
+		$this->signatures[$method] = $args;
+		$this->help[$method] = $help;
+	}
+	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);
+	}
+	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;
+	}
+	function methodHelp($method) {
+		return $this->help[$method];
+	}
 }
 
 
 class IXR_ClientMulticall extends IXR_Client {
-    var $calls = array();
-    function IXR_ClientMulticall($server, $path = false, $port = 80) {
-        parent::IXR_Client($server, $path, $port);
-        $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
-    }
-    function addCall() {
-        $args = func_get_args();
-        $methodName = array_shift($args);
-        $struct = array(
-            'methodName' => $methodName,
-            'params' => $args
-        );
-        $this->calls[] = $struct;
-    }
-    function query() {
-        // Prepare multicall, then call the parent::query() method
-        return parent::query('system.multicall', $this->calls);
-    }
+	var $calls = array();
+	function IXR_ClientMulticall($server, $path = false, $port = 80) {
+		parent::IXR_Client($server, $path, $port);
+		$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
+	}
+	function addCall() {
+		$args = func_get_args();
+		$methodName = array_shift($args);
+		$struct = array(
+			'methodName' => $methodName,
+			'params' => $args
+		);
+		$this->calls[] = $struct;
+	}
+	function query() {
+		// Prepare multicall, then call the parent::query() method
+		return parent::query('system.multicall', $this->calls);
+	}
 }
 
 ?>
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -13,7 +13,7 @@ 
 class IXR_Value {
     var $data;
     var $type;
-    function IXR_Value ($data, $type = false) {
+    function IXR_Value($data, $type = false) {
         $this->data = $data;
         if (!$type) {
             $type = $this->calculateType();
@@ -26,7 +26,7 @@ 
             }
         }
         if ($type == 'array') {
-            for ($i = 0, $j = count($this->data); $i < $j; $i++) {
+            for ($i = 0, $j = count($this->data); $i<$j; $i++) {
                 $this->data[$i] = new IXR_Value($this->data[$i]);
             }
         }
@@ -60,7 +60,7 @@ 
         /* We have an array - is it an array or a struct ? */
         if ($this->isStruct($this->data)) {
             return 'struct';
-        } else {
+        }else {
             return 'array';
         }
     }
@@ -107,7 +107,7 @@ 
         /* Nasty function to check if an array is a struct or not */
         $expected = 0;
         foreach ($array as $key => $value) {
-            if ((string)$key != (string)$expected) {
+            if ((string) $key != (string) $expected) {
                 return true;
             }
             $expected++;
@@ -119,22 +119,22 @@ 
 
 class IXR_Message {
     var $message;
-    var $messageType;  // methodCall / methodResponse / fault
+    var $messageType; // methodCall / methodResponse / fault
     var $faultCode;
     var $faultString;
     var $methodName;
     var $params;
     // Current variable stacks
-    var $_arraystructs = array();   // The stack used to keep track of the current array/struct
+    var $_arraystructs = array(); // The stack used to keep track of the current array/struct
     var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
-    var $_currentStructName = array();  // A stack as well
+    var $_currentStructName = array(); // A stack as well
     var $_param;
     var $_value;
     var $_currentTag;
     var $_currentTagContents;
     // The XML parser
     var $_parser;
-    function IXR_Message ($message) {
+    function IXR_Message($message) {
         $this->message = $message;
     }
     function parse() {
@@ -166,7 +166,7 @@ 
     }
     function tag_open($parser, $tag, $attr) {
         $this->currentTag = $tag;
-        switch($tag) {
+        switch ($tag) {
             case 'methodCall':
             case 'methodResponse':
             case 'fault':
@@ -188,20 +188,20 @@ 
     }
     function tag_close($parser, $tag) {
         $valueFlag = false;
-        switch($tag) {
+        switch ($tag) {
             case 'int':
             case 'i4':
-                $value = (int)trim($this->_currentTagContents);
+                $value = (int) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'double':
-                $value = (double)trim($this->_currentTagContents);
+                $value = (double) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'string':
-                $value = (string)trim($this->_currentTagContents);
+                $value = (string) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
@@ -214,18 +214,18 @@ 
             case 'value':
                 // "If no type is indicated, the type is string."
                 if (trim($this->_currentTagContents) != '') {
-                    $value = (string)$this->_currentTagContents;
+                    $value = (string) $this->_currentTagContents;
                     $this->_currentTagContents = '';
                     $valueFlag = true;
                 }
                 break;
             case 'boolean':
-                $value = (boolean)trim($this->_currentTagContents);
+                $value = (boolean) trim($this->_currentTagContents);
                 $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
             case 'base64':
-                $value = base64_decode( trim($this->_currentTagContents) );
+                $value = base64_decode(trim($this->_currentTagContents));
                 $this->_currentTagContents = '';
                 $valueFlag = true;
                 break;
@@ -254,16 +254,16 @@ 
                 $value = trim($value);
             }
             */
-            if (count($this->_arraystructs) > 0) {
+            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 {
+                }else {
                     // Add to array
                     $this->_arraystructs[count($this->_arraystructs)-1][] = $value;
                 }
-            } else {
+            }else {
                 // Just add as a paramater
                 $this->params[] = $value;
             }
@@ -343,13 +343,13 @@ 
             }
             // Call the method
             $result = $this->$method($args);
-        } else {
+        }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.');
             	}
-            } else if (!function_exists($method)) {
+            }else if (!function_exists($method)) {
                 return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
             }
             // Call the function
@@ -416,7 +416,7 @@ 
             $params = $call['params'];
             if ($method == 'system.multicall') {
                 $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
-            } else {
+            }else {
                 $result = $this->call($method, $params);
             }
             if (is_a($result, 'IXR_Error')) {
@@ -424,7 +424,7 @@ 
                     'faultCode' => $result->code,
                     'faultString' => $result->message
                 );
-            } else {
+            }else {
                 $return[] = array($result);
             }
         }
@@ -486,7 +486,7 @@ 
             if (!$this->path) {
                 $this->path = '/';
             }
-        } else {
+        }else {
             $this->server = $server;
             $this->path = $path;
             $this->port = $port;
@@ -615,7 +615,7 @@ 
         // $time can be a PHP timestamp or an ISO one
         if (is_numeric($time)) {
             $this->parseTimestamp($time);
-        } else {
+        }else {
             $this->parseIso($time);
         }
     }
@@ -719,7 +719,7 @@ 
         // Check the argument types
         $ok = true;
         $argsbackup = $args;
-        for ($i = 0, $j = count($args); $i < $j; $i++) {
+        for ($i = 0, $j = count($args); $i<$j; $i++) {
             $arg = array_shift($args);
             $type = array_shift($signature);
             switch ($type) {

class/feedcreator.class.php

Doc Comments +9 added lines, -2 removed lines

@@ -359,6 +359,9 @@ 
 class UniversalFeedCreator extends FeedCreator {
 	var $_feed;
 
+	/**
+	 * @param string $format
+	 */
 	function _setFormat($format) {
 		switch (strtoupper($format)) {
 
@@ -540,6 +543,7 @@ 
 	 * Adds an FeedItem to the feed.
 	 *
 	 * @param object FeedItem $item The FeedItem to add to the feed.
+	 * @param FeedItem $item
 	 * @access public
 	 */
 	function addItem($item) {
@@ -557,6 +561,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
 	 */
 	function iTrunc($string, $length) {
@@ -655,6 +660,7 @@ 
 	/**
 	 * @since 1.4
 	 * @access private
+	 * @param string $filename
 	 */
 	function _redirect($filename) {
 		// attention, heavily-commented-out-area
@@ -788,7 +794,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
 	 */
 	function rfc822() {
 		//return gmdate("r",$this->unix);
@@ -800,7 +806,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
 	 */
 	function iso8601() {
 		$date = gmdate("Y-m-d\TH:i:sO",$this->unix);
@@ -922,6 +928,7 @@ 
 	/**
 	 * Sets this RSS feed's version number.
 	 * @access private
+	 * @param string $version
 	 */
 	function _setRSSVersion($version) {
 		$this->RSSVersion = $version;

Indentation +8 added lines, -8 removed lines

@@ -467,8 +467,8 @@ 
     * @param timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
     */
    function useCached($format="RSS0.91", $filename="", $timeout=3600) {
-      $this->_setFormat($format);
-      $this->_feed->useCached($filename, $timeout);
+	  $this->_setFormat($format);
+	  $this->_feed->useCached($filename, $timeout);
    }
 
 }
@@ -496,9 +496,9 @@ 
 	var $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.
-	*/
+	 * The url of the external xsl stylesheet used to format the naked rss feed.
+	 * Ignored in the output when empty.
+	 */
 	var $xslStyleSheet = "";
 
 	var $cssStyleSheet = "";
@@ -1046,9 +1046,9 @@ 
  */
 class RSSCreator20 extends RSSCreator091 {
 
-    function RSSCreator20() {
-        parent::_setRSSVersion("2.0");
-    }
+	function RSSCreator20() {
+		parent::_setRSSVersion("2.0");
+	}
 
 }
 

Spacing +284 added lines, -284 removed lines

@@ -333,10 +333,10 @@ 
 			$result = "";
 		}	elseif ($this->syndicateHtml) {
 			$result = "<![CDATA[".$this->rawFieldContent."]]>";
-		} else {
+		}else {
 			if ($this->truncSize and is_int($this->truncSize)) {
-				$result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent),$this->truncSize);
-			} else {
+				$result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent), $this->truncSize);
+			}else {
 				$result = htmlspecialchars($this->rawFieldContent);
 			}
 		}
@@ -448,7 +448,7 @@ 
 	 * @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()).
 	 * @param	boolean	displayContents	optional	send the content of the file or not. If true, the file will be sent in the body of the response.
 	 */
-	function saveFeed($format="RSS0.91", $filename="", $displayContents=true) {
+	function saveFeed($format = "RSS0.91", $filename = "", $displayContents = true) {
 		$this->_setFormat($format);
 		$this->_feed->saveFeed($filename, $displayContents);
 	}
@@ -466,7 +466,7 @@ 
     * @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 timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
     */
-   function useCached($format="RSS0.91", $filename="", $timeout=3600) {
+   function useCached($format = "RSS0.91", $filename = "", $timeout = 3600) {
       $this->_setFormat($format);
       $this->_feed->useCached($filename, $timeout);
    }
@@ -564,25 +564,25 @@ 
 			return $string;
 		}
 
-		$pos = strrpos($string,".");
+		$pos = strrpos($string, ".");
 		if ($pos>=$length-4) {
-			$string = substr($string,0,$length-4);
-			$pos = strrpos($string,".");
+			$string = substr($string, 0, $length-4);
+			$pos = strrpos($string, ".");
 		}
 		if ($pos>=$length*0.4) {
-			return substr($string,0,$pos+1)." ...";
+			return substr($string, 0, $pos+1)." ...";
 		}
 
-		$pos = strrpos($string," ");
+		$pos = strrpos($string, " ");
 		if ($pos>=$length-4) {
-			$string = substr($string,0,$length-4);
-			$pos = strrpos($string," ");
+			$string = substr($string, 0, $length-4);
+			$pos = strrpos($string, " ");
 		}
 		if ($pos>=$length*0.4) {
-			return substr($string,0,$pos)." ...";
+			return substr($string, 0, $pos)." ...";
 		}
 
-		return substr($string,0,$length-4)." ...";
+		return substr($string, 0, $length-4)." ...";
 
 	}
 
@@ -604,11 +604,11 @@ 
 	 * @param indentString	string	a string that will be inserted before every generated line
 	 * @return    string    the XML tags corresponding to $additionalElements
 	 */
-	function _createAdditionalElements($elements, $indentString="") {
+	function _createAdditionalElements($elements, $indentString = "") {
 		$ae = "";
 		if (is_array($elements)) {
-			foreach($elements AS $key => $value) {
-				$ae.= $indentString."<$key>$value</$key>\n";
+			foreach ($elements AS $key => $value) {
+				$ae .= $indentString."<$key>$value</$key>\n";
 			}
 		}
 		return $ae;
@@ -648,7 +648,7 @@ 
 	 */
 	function _generateFilename() {
 		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".xml";
+		return substr($fileInfo["basename"], 0, -(strlen($fileInfo["extension"])+1)).".xml";
 	}
 
 
@@ -686,12 +686,12 @@ 
 	 * @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 timeout	int		optional	the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
 	 */
-	function useCached($filename="", $timeout=3600) {
+	function useCached($filename = "", $timeout = 3600) {
 		$this->_timeout = $timeout;
-		if ($filename=="") {
+		if ($filename == "") {
 			$filename = $this->_generateFilename();
 		}
-		if (file_exists($filename) AND (time()-filemtime($filename) < $timeout)) {
+		if (file_exists($filename) AND (time()-filemtime($filename)<$timeout)) {
 			$this->_redirect($filename);
 		}
 	}
@@ -705,18 +705,18 @@ 
 	 * @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 redirect	boolean	optional	send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
 	 */
-	function saveFeed($filename="", $displayContents=true) {
-		if ($filename=="") {
+	function saveFeed($filename = "", $displayContents = true) {
+		if ($filename == "") {
 			$filename = $this->_generateFilename();
 		}
 		$feedFile = fopen($filename, "w+");
 		if ($feedFile) {
-			fputs($feedFile,$this->createFeed());
+			fputs($feedFile, $this->createFeed());
 			fclose($feedFile);
 			if ($displayContents) {
 				$this->_redirect($filename);
 			}
-		} else {
+		}else {
 			echo "<br /><b>Error creating feed file, please check write permissions.</b><br />";
 		}
 	}
@@ -736,29 +736,29 @@ 
 	 * 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.
 	 */
-	function FeedDate($dateString="") {
+	function FeedDate($dateString = "") {
 		$tzOffset = 0;
-		if ($dateString=="") $dateString = date("r");
+		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)=='+' OR substr($matches[7],0,1)=='-') {
-				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
-			} else {
-				if (strlen($matches[7])==1) {
+		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) == '+' OR 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") AND $matches[7]!="Z") {
-						$tzOffset = ($ord - ord("M")) * $oneHour;
-					} elseif ($matches[7]=="Z") {
+					if ($ord<ord("M")) {
+						$tzOffset = (ord("A")-$ord-1)*$oneHour;
+					} elseif ($ord>=ord("M") AND $matches[7] != "Z") {
+						$tzOffset = ($ord-ord("M"))*$oneHour;
+					} elseif ($matches[7] == "Z") {
 						$tzOffset = 0;
 					}
 				}
@@ -770,12 +770,12 @@ 
 			$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)=='+' OR substr($matches[7],0,1)=='-') {
-				$tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
-			} else {
-				if ($matches[7]=="Z") {
+		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) == '+' OR substr($matches[7], 0, 1) == '-') {
+				$tzOffset = (substr($matches[7], 0, 3)*60+substr($matches[7], -2))*60;
+			}else {
+				if ($matches[7] == "Z") {
 					$tzOffset = 0;
 				}
 			}
@@ -793,7 +793,7 @@ 
 	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);
+		if (TIME_ZONE != "") $date .= " ".str_replace(":", "", TIME_ZONE);
 		return $date;
 	}
 
@@ -803,9 +803,9 @@ 
 	 * @return a date in ISO 8601 format
 	 */
 	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);
+		$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;
 	}
 
@@ -836,63 +836,63 @@ 
 	 */
 	function createFeed() {
 		$feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
-		$feed.= $this->_createGeneratorComment();
-		if ($this->cssStyleSheet=="") {
+		$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";
+		$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;$i<count($this->items);$i++) {
-			$feed.= "                <rdf:li rdf:resource=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+		$feed .= "       <dc:date>".htmlspecialchars($now->iso8601())."</dc:date>\n";
+		$feed .= "        <items>\n";
+		$feed .= "            <rdf:Seq>\n";
+		for ($i = 0; $i<count($this->items); $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 .= "            </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, "    ");
+		$feed .= $this->_createAdditionalElements($this->additionalElements, "    ");
 
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <item rdf:about=\"".htmlspecialchars($this->items[$i]->link)."\">\n";
+		for ($i = 0; $i<count($this->items); $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) {
+			$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";
+				$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]->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";
+			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 .= "        <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";
+		$feed .= "</rdf:RDF>\n";
 		return $feed;
 	}
 }
@@ -934,78 +934,78 @@ 
 	 */
 	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";
+		$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";
+		$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";
+		$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->height != "") {
+				$feed .= "            <height>".$this->image->height."</height>\n";
 			}
-			if ($this->image->description!="") {
-				$feed.= "            <description>".$this->image->getDescription()."</description>\n";
+			if ($this->image->description != "") {
+				$feed .= "            <description>".$this->image->getDescription()."</description>\n";
 			}
-			$feed.= "        </image>\n";
+			$feed .= "        </image>\n";
 		}
-		if ($this->language!="") {
-			$feed.= "        <language>".$this->language."</language>\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->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->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->webmaster != "") {
+			$feed .= "        <webMaster>".FeedCreator::iTrunc(htmlspecialchars($this->webmaster), 100)."</webMaster>\n";
 		}
-		if ($this->pubDate!="") {
+		if ($this->pubDate != "") {
 			$pubDate = new FeedDate($this->pubDate);
-			$feed.= "        <pubDate>".htmlspecialchars($pubDate->rfc822())."</pubDate>\n";
+			$feed .= "        <pubDate>".htmlspecialchars($pubDate->rfc822())."</pubDate>\n";
 		}
-		if ($this->category!="") {
-			$feed.= "        <category>".htmlspecialchars($this->category)."</category>\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->docs != "") {
+			$feed .= "        <docs>".FeedCreator::iTrunc(htmlspecialchars($this->docs), 500)."</docs>\n";
 		}
-		if ($this->ttl!="") {
-			$feed.= "        <ttl>".htmlspecialchars($this->ttl)."</ttl>\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->rating != "") {
+			$feed .= "        <rating>".FeedCreator::iTrunc(htmlspecialchars($this->rating), 500)."</rating>\n";
 		}
-		if ($this->skipHours!="") {
-			$feed.= "        <skipHours>".htmlspecialchars($this->skipHours)."</skipHours>\n";
+		if ($this->skipHours != "") {
+			$feed .= "        <skipHours>".htmlspecialchars($this->skipHours)."</skipHours>\n";
 		}
-		if ($this->skipDays!="") {
-			$feed.= "        <skipDays>".htmlspecialchars($this->skipDays)."</skipDays>\n";
+		if ($this->skipDays != "") {
+			$feed .= "        <skipDays>".htmlspecialchars($this->skipDays)."</skipDays>\n";
 		}
-		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+		$feed .= $this->_createAdditionalElements($this->additionalElements, "    ");
 
-		for ($i=0;$i<count($this->items);$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";
+		for ($i = 0; $i<count($this->items); $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";
+			if ($this->items[$i]->author != "") {
+				$feed .= "            <author>".htmlspecialchars($this->items[$i]->author)."</author>\n";
 			}
 			/*
 			// on hold
@@ -1013,24 +1013,24 @@ 
 					$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]->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]->comments != "") {
+				$feed .= "            <comments>".htmlspecialchars($this->items[$i]->comments)."</comments>\n";
 			}
-			if ($this->items[$i]->date!="") {
+			if ($this->items[$i]->date != "") {
 			$itemDate = new FeedDate($this->items[$i]->date);
-				$feed.= "            <pubDate>".htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
+				$feed .= "            <pubDate>".htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
 			}
-			if ($this->items[$i]->guid!="") {
-				$feed.= "            <guid>".htmlspecialchars($this->items[$i]->guid)."</guid>\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 .= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+			$feed .= "        </item>\n";
 		}
-		$feed.= "    </channel>\n";
-		$feed.= "</rss>\n";
+		$feed .= "    </channel>\n";
+		$feed .= "</rss>\n";
 		return $feed;
 	}
 }
@@ -1069,35 +1069,35 @@ 
 
 	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";
+		$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;$i<count($this->items);$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";
+		$feed .= "    <subtitle>".$this->getDescription()."</subtitle>\n";
+		$feed .= "    <link>".$this->link."</link>\n";
+		for ($i = 0; $i<count($this->items); $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 .= "        <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 .= "        </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 .= "        <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";
+		$feed .= "</feed>\n";
 		return $feed;
 	}
 }
@@ -1128,53 +1128,53 @@ 
 
 	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 .= $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";
+		$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 .= "    <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 .= "    </author>\n";
 		}
-		$feed.= "    <generator>".FEEDCREATOR_VERSION."</generator>\n";
-		$feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
-		for ($i=0;$i<count($this->items);$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=="") {
+		$feed .= "    <generator>".FEEDCREATOR_VERSION."</generator>\n";
+		$feed .= $this->_createAdditionalElements($this->additionalElements, "    ");
+		for ($i = 0; $i<count($this->items); $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";
+			$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";
+			if ($this->items[$i]->description != "") {
+				$feed .= "        <summary>".htmlspecialchars($this->items[$i]->description)."</summary>\n";
 			}
-			$feed.= "    </entry>\n";
+			$feed .= "    </entry>\n";
 		}
-		$feed.= "</feed>\n";
+		$feed .= "</feed>\n";
 		return $feed;
 	}
 }
@@ -1195,25 +1195,25 @@ 
 	}
 
 	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');
+		$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) ) {
+		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++) {
+			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
+				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
+				} 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
+				if ((strlen($newline)+strlen($c))>=$line_max) { // CRLF is not counted
 					$output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
 					$newline = "";
 				}
@@ -1230,26 +1230,26 @@ 
 	 * @return    string    the feed's complete text
 	 */
 	function createFeed() {
-		for ($i=0;$i<count($this->items);$i++) {
-			if ($this->items[$i]->author!="") {
+		for ($i = 0; $i<count($this->items); $i++) {
+			if ($this->items[$i]->author != "") {
 				$from = $this->items[$i]->author;
-			} else {
+			}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";
+			$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";
+			$feed .= preg_replace("~\nFrom ([^\n]*)(\n?)~", "\n>From $1$2\n", $body);
+			$feed .= "\n";
+			$feed .= "\n";
 		}
 		return $feed;
 	}
@@ -1262,7 +1262,7 @@ 
 	 */
 	function _generateFilename() {
 		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".mbox";
+		return substr($fileInfo["basename"], 0, -(strlen($fileInfo["extension"])+1)).".mbox";
 	}
 }
 
@@ -1282,38 +1282,38 @@ 
 
 	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!="") {
+		$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";
+			$feed .= "         <dateCreated>".$date->rfc822()."</dateCreated>\n";
 		}
-		if ($this->lastBuildDate!="") {
+		if ($this->lastBuildDate != "") {
 			$date = new FeedDate($this->lastBuildDate);
-			$feed.= "         <dateModified>".$date->rfc822()."</dateModified>\n";
+			$feed .= "         <dateModified>".$date->rfc822()."</dateModified>\n";
 		}
-		if ($this->editor!="") {
-			$feed.= "         <ownerName>".$this->editor."</ownerName>\n";
+		if ($this->editor != "") {
+			$feed .= "         <ownerName>".$this->editor."</ownerName>\n";
 		}
-		if ($this->editorEmail!="") {
-			$feed.= "         <ownerEmail>".$this->editorEmail."</ownerEmail>\n";
+		if ($this->editorEmail != "") {
+			$feed .= "         <ownerEmail>".$this->editorEmail."</ownerEmail>\n";
 		}
-		$feed.= "    </head>\n";
-		$feed.= "    <body>\n";
-		for ($i=0;$i<count($this->items);$i++) {
-			$feed.= "    <outline type=\"rss\" ";
-			$title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")));
-			$feed.= " title=\"".$title."\"";
-			$feed.= " text=\"".$title."\"";
+		$feed .= "    </head>\n";
+		$feed .= "    <body>\n";
+		for ($i = 0; $i<count($this->items); $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 .= " url=\"".htmlspecialchars($this->items[$i]->link)."\"";
+			$feed .= "/>\n";
 		}
-		$feed.= "    </body>\n";
-		$feed.= "</opml>\n";
+		$feed .= "    </body>\n";
+		$feed .= "</opml>\n";
 		return $feed;
 	}
 }
@@ -1343,7 +1343,7 @@ 
 	/**
 	 * Contains HTML to be output at the end of the feed's html representation.
 	 */
-	var $footer ;
+	var $footer;
 
 	/**
 	 * Contains HTML to be output between entries. A separator is only used in
@@ -1362,7 +1362,7 @@ 
 	 */
 	var $openInNewWindow = true;
 
-	var $imageAlign ="right";
+	var $imageAlign = "right";
 
 	/**
 	 * In case of very simple output you may want to get rid of the style tags,
@@ -1371,7 +1371,7 @@ 
 	 * and when it is non-empty, ONLY the styleless output is printed, the rest is ignored
 	 * in the function createFeed().
 	 */
-	var $stylelessOutput ="";
+	var $stylelessOutput = "";
 
 	/**
 	 * Writes the HTML.
@@ -1379,12 +1379,12 @@ 
 	 */
 	function createFeed() {
 		// if there is styleless output, use the content of this variable and ignore the rest
-		if ($this->stylelessOutput!="") {
+		if ($this->stylelessOutput != "") {
 			return $this->stylelessOutput;
 		}
 
 		//if no stylePrefix is set, generate it yourself depending on the script name
-		if ($this->stylePrefix=="") {
+		if ($this->stylePrefix == "") {
 			$this->stylePrefix = str_replace(".", "_", $this->_generateFilename())."_";
 		}
 
@@ -1395,24 +1395,24 @@ 
 
 		// use this array to put the lines in and implode later with "document.write" javascript
 		$feedArray = array();
-		if ($this->image!=null) {
+		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).
+							FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100).
 							"' align='".$this->imageAlign."' ";
 			if ($this->image->width) {
-				$imageStr .=" width='".$this->image->width. "' ";
+				$imageStr .= " width='".$this->image->width."' ";
 			}
 			if ($this->image->height) {
-				$imageStr .=" height='".$this->image->height."' ";
+				$imageStr .= " height='".$this->image->height."' ";
 			}
-			$imageStr .="/></a>";
+			$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>";
+				FeedCreator::iTrunc(htmlspecialchars($this->title), 100)."</a></div>";
 		}
 		if ($this->getDescription()) {
 			$feedArray[] = "<div class='".$this->stylePrefix."description'>".
@@ -1424,8 +1424,8 @@ 
 			$feedArray[] = "<div class='".$this->stylePrefix."header'>".$this->header."</div>";
 		}
 
-		for ($i=0;$i<count($this->items);$i++) {
-			if ($this->separator and $i > 0) {
+		for ($i = 0; $i<count($this->items); $i++) {
+			if ($this->separator and $i>0) {
 				$feedArray[] = "<div class='".$this->stylePrefix."separator'>".$this->separator."</div>";
 			}
 
@@ -1433,12 +1433,12 @@ 
 				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).
+						"item_title'".$targetInsert.">".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100).
 						"</a></div>";
-				} else {
+				}else {
 					$feedArray[] =
 						"<div class='".$this->stylePrefix."item_title'>".
-						FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
+						FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100).
 						"</div>";
 				}
 			}
@@ -1453,7 +1453,7 @@ 
 			$feedArray[] = "<div class='".$this->stylePrefix."footer'>".$this->footer."</div>";
 		}
 
-		$feed= "".join($feedArray, "\r\n");
+		$feed = "".join($feedArray, "\r\n");
 		return $feed;
 	}
 
@@ -1466,7 +1466,7 @@ 
 	 */
 	function _generateFilename() {
 		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".html";
+		return substr($fileInfo["basename"], 0, -(strlen($fileInfo["extension"])+1)).".html";
 	}
 }
 
@@ -1487,7 +1487,7 @@ 
 	function createFeed()
 	{
 		$feed = parent::createFeed();
-		$feedArray = explode("\n",$feed);
+		$feedArray = explode("\n", $feed);
 
 		$jsFeed = "";
 		foreach ($feedArray as $value) {
@@ -1505,7 +1505,7 @@ 
 	 */
 	function _generateFilename() {
 		$fileInfo = pathinfo($_SERVER["PHP_SELF"]);
-		return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".js";
+		return substr($fileInfo["basename"], 0, -(strlen($fileInfo["extension"])+1)).".js";
 	}
 
 }

Braces +16 added lines, -6 removed lines

@@ -331,7 +331,7 @@ 
 		// - no truncation (truncating risks producing invalid html)
 		if (!$this->rawFieldContent) {
 			$result = "";
-		}	elseif ($this->syndicateHtml) {
+		} elseif ($this->syndicateHtml) {
 			$result = "<![CDATA[".$this->rawFieldContent."]]>";
 		} else {
 			if ($this->truncSize and is_int($this->truncSize)) {
@@ -616,8 +616,12 @@ 
 
 	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";
+		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;
 	}
 
@@ -738,7 +742,9 @@ 
 	 */
 	function FeedDate($dateString="") {
 		$tzOffset = 0;
-		if ($dateString=="") $dateString = date("r");
+		if ($dateString=="") {
+			$dateString = date("r");
+		}
 
 		//if (is_integer($dateString)) {
 		if (is_numeric($dateString)) {
@@ -793,7 +799,9 @@ 
 	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);
+		if (TIME_ZONE!="") {
+			$date .= " ".str_replace(":","",TIME_ZONE);
+		}
 		return $date;
 	}
 
@@ -805,7 +813,9 @@ 
 	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);
+		if (TIME_ZONE!="") {
+			$date = str_replace("+00:00",TIME_ZONE,$date);
+		}
 		return $date;
 	}
 

class/magpie.inc.php

Doc Comments +7 added lines

@@ -450,6 +450,10 @@ 
     /**
     * return XML parser, and possibly re-encoded source
     *
+    * @param string $source
+    * @param string $out_enc
+    * @param string|null $in_enc
+    * @param boolean $detect
     */
     function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
@@ -561,6 +565,9 @@ 
         }
     }
 
+    /**
+     * @param integer $lvl
+     */
     function error ($errormsg, $lvl=E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
         if ( !empty($php_errormsg) ) {

Indentation +468 added lines, -468 removed lines

@@ -32,492 +32,492 @@ 
 *
 */
 class MagpieRSS {
-    var $parser;
-
-    var $current_item   = array();  // item currently being parsed
-    var $items          = array();  // collection of parsed items
-    var $channel        = array();  // hash of channel fields
-    var $textinput      = array();
-    var $image          = array();
-    var $feed_type;
-    var $feed_version;
-    var $encoding       = '';       // output encoding of parsed rss
-
-    var $_source_encoding = '';     // only set if we have to parse xml prolog
-
-    var $ERROR = "";
-    var $WARNING = "";
-
-    // define some constants
-
-    var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
-    var $_KNOWN_ENCODINGS    = array('UTF-8', 'US-ASCII', 'ISO-8859-1');
-
-    // parser variables, useless if you're not a parser, treat as private
-    var $stack              = array(); // parser stack
-    var $inchannel          = false;
-    var $initem             = false;
-    var $incontent          = false; // if in Atom <content mode="xml"> field
-    var $intextinput        = false;
-    var $inimage            = false;
-    var $current_field      = '';
-    var $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)
-     *
-     */
-    function MagpieRSS ($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 );
-        }
+	var $parser;
+
+	var $current_item   = array();  // item currently being parsed
+	var $items          = array();  // collection of parsed items
+	var $channel        = array();  // hash of channel fields
+	var $textinput      = array();
+	var $image          = array();
+	var $feed_type;
+	var $feed_version;
+	var $encoding       = '';       // output encoding of parsed rss
+
+	var $_source_encoding = '';     // only set if we have to parse xml prolog
+
+	var $ERROR = "";
+	var $WARNING = "";
+
+	// define some constants
+
+	var $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
+	var $_KNOWN_ENCODINGS    = array('UTF-8', 'US-ASCII', 'ISO-8859-1');
+
+	// parser variables, useless if you're not a parser, treat as private
+	var $stack              = array(); // parser stack
+	var $inchannel          = false;
+	var $initem             = false;
+	var $incontent          = false; // if in Atom <content mode="xml"> field
+	var $intextinput        = false;
+	var $inimage            = false;
+	var $current_field      = '';
+	var $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)
+	 *
+	 */
+	function MagpieRSS ($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);
+		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 );
-        }
+		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;
+		$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' );
+		# 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' );
+		xml_set_character_data_handler( $this->parser, 'feed_cdata' );
 
-        $status = @xml_parse( $this->parser, $source );
+		$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";
+		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 );
-            }
-        }
+				$this->error( $errormsg );
+			}
+		}
 
-        xml_parser_free( $this->parser );
+		xml_parser_free( $this->parser );
 
-        $this->normalize();
+		$this->normalize();
         
-    }
+	}
 
-    function feed_start_element($p, $element, &$attrs) {
-        $el = $element = strtolower($element);
-        $attrs = array_change_key_case($attrs, CASE_LOWER);
+	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) = split( ':', $element, 2);
-        }
-        if ( $ns and $ns != 'rdf' ) {
-            $this->current_namespace = $ns;
-        }
+		// check for a namespace, and split if found
+		$ns = false;
+		if ( strpos( $element, ':' ) ) {
+			list($ns, $el) = split( ':', $element, 2);
+		}
+		if ( $ns and $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 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' or $el == 'entry' )
-        {
-            $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
-                $this->current_item['about'] = $attrs['rdf:about'];
-            }
-        }
+		if ( $el == 'channel' )
+		{
+			$this->inchannel = true;
+		}
+		elseif ($el == 'item' or $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 and
-            $this->current_namespace == '' and
-            $el == 'textinput' )
-        {
-            $this->intextinput = true;
-        }
+		// if we're in the default namespace of an RSS feed,
+		//  record textinput or image fields
+		elseif (
+			$this->feed_type == RSS and
+			$this->current_namespace == '' and
+			$el == 'textinput' )
+		{
+			$this->intextinput = true;
+		}
 
-        elseif (
-            $this->feed_type == RSS and
-            $this->current_namespace == '' and
-            $el == 'image' )
-        {
-            $this->inimage = true;
-        }
+		elseif (
+			$this->feed_type == RSS and
+			$this->current_namespace == '' and
+			$el == 'image' )
+		{
+			$this->inimage = true;
+		}
 
-        # handle atom content constructs
-        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {
-            // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
-                $el = 'atom_content';
-            }
+		# handle atom content constructs
+		elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		{
+			// avoid clashing w/ RSS mod_content
+			if ($el == 'content' ) {
+				$el = 'atom_content';
+			}
 
-            $this->incontent = $el;
+			$this->incontent = $el;
 
 
-        }
+		}
 
-        // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM and $this->incontent )
-        {
-            // if tags are inlined, then flatten
-            $attrs_str = join(' ',
-                    array_map('map_attrs',
-                    array_keys($attrs),
-                    array_values($attrs) ) );
+		// if inside an Atom content construct (e.g. content or summary) field treat tags as text
+		elseif ($this->feed_type == ATOM and $this->incontent )
+		{
+			// if tags are inlined, then flatten
+			$attrs_str = join(' ',
+					array_map('map_attrs',
+					array_keys($attrs),
+					array_values($attrs) ) );
 
-            $this->append_content( "<$element $attrs_str>"  );
+			$this->append_content( "<$element $attrs_str>"  );
 
-            array_unshift( $this->stack, $el );
-        }
+			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 and $el == 'link' )
-        {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
-            {
-                $link_el = 'link';
-            }
-            else {
-                $link_el = 'link_' . $attrs['rel'];
-            }
+		// 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 and $el == 'link' )
+		{
+			if ( isset($attrs['rel']) and $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);
-        }
-    }
+			$this->append($link_el, $attrs['href']);
+		}
+		// set stack[0] to current element
+		else {
+			array_unshift($this->stack, $el);
+		}
+	}
 
 
 
-    function feed_cdata ($p, $text) {
+	function feed_cdata ($p, $text) {
 
-        if ($this->feed_type == ATOM and $this->incontent)
-        {
-            $this->append_content( $text );
-        }
-        else {
-            $current_el = join('_', array_reverse($this->stack));
-            $this->append($current_el, $text);
-        }
-    }
+		if ($this->feed_type == ATOM and $this->incontent)
+		{
+			$this->append_content( $text );
+		}
+		else {
+			$current_el = join('_', array_reverse($this->stack));
+			$this->append($current_el, $text);
+		}
+	}
 
-    function feed_end_element ($p, $el) {
-        $el = strtolower($el);
+	function feed_end_element ($p, $el) {
+		$el = strtolower($el);
 
-        if ( $el == 'item' or $el == 'entry' )
-        {
-            $this->items[] = $this->current_item;
-            $this->current_item = array();
-            $this->initem = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
-        {
-            $this->intextinput = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
-        {
-            $this->inimage = false;
-        }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {
-            $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
-        {
-            $this->inchannel = false;
-        }
-        elseif ($this->feed_type == ATOM and $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 />");
-            }
+		if ( $el == 'item' or $el == 'entry' )
+		{
+			$this->items[] = $this->current_item;
+			$this->current_item = array();
+			$this->initem = false;
+		}
+		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
+		{
+			$this->intextinput = false;
+		}
+		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
+		{
+			$this->inimage = false;
+		}
+		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		{
+			$this->incontent = false;
+		}
+		elseif ($el == 'channel' or $el == 'feed' )
+		{
+			$this->inchannel = false;
+		}
+		elseif ($this->feed_type == ATOM and $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 );
-        }
+			array_shift( $this->stack );
+		}
+		else {
+			array_shift( $this->stack );
+		}
 
-        $this->current_namespace = false;
-    }
+		$this->current_namespace = false;
+	}
 
-    function concat (&$str1, $str2="") {
-        if (!isset($str1) ) {
-            $str1="";
-        }
-        $str1 .= $str2;
-    }
+	function concat (&$str1, $str2="") {
+		if (!isset($str1) ) {
+			$str1="";
+		}
+		$str1 .= $str2;
+	}
 
 
 
-    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 );
-        }
-    }
+	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
-    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 );
-            }
+	// smart append - field and namespace aware
+	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 );
+			}
 
-        }
-    }
-
-    function normalize () {
-        // if atom populate rss fields
-        if ( $this->is_atom() ) {
-            $this->channel['description'] = $this->channel['tagline'];
-            for ( $i = 0; $i < count($this->items); $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 and $epoch > 0) {
-                        $item['date_timestamp'] = $epoch;
-                    }
-                }
-
-                $this->items[$i] = $item;
-            }
-        }
-        elseif ( $this->is_rss() ) {
-            $this->channel['tagline'] = $this->channel['description'];
-            for ( $i = 0; $i < count($this->items); $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' and isset($item['dc']['date']) ) {
-                    $epoch = @parse_w3cdtf($item['dc']['date']);
-                    if ($epoch and $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;
-            }
-        }
-    }
+		}
+	}
 
+	function normalize () {
+		// if atom populate rss fields
+		if ( $this->is_atom() ) {
+			$this->channel['description'] = $this->channel['tagline'];
+			for ( $i = 0; $i < count($this->items); $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 and $epoch > 0) {
+						$item['date_timestamp'] = $epoch;
+					}
+				}
+
+				$this->items[$i] = $item;
+			}
+		}
+		elseif ( $this->is_rss() ) {
+			$this->channel['tagline'] = $this->channel['description'];
+			for ( $i = 0; $i < count($this->items); $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' and isset($item['dc']['date']) ) {
+					$epoch = @parse_w3cdtf($item['dc']['date']);
+					if ($epoch and $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;
+			}
+		}
+	}
 
-    function is_rss () {
-        if ( $this->feed_type == RSS ) {
-            return $this->feed_version;
-        }
-        else {
-            return false;
-        }
-    }
 
-    function is_atom() {
-        if ( $this->feed_type == ATOM ) {
-            return $this->feed_version;
-        }
-        else {
-            return false;
-        }
-    }
-
-    /**
-    * return XML parser, and possibly re-encoded source
-    *
-    */
-    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);
-        }
+	function is_rss () {
+		if ( $this->feed_type == RSS ) {
+			return $this->feed_version;
+		}
+		else {
+			return false;
+		}
+	}
 
-        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!
-    *
-    */
-    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
-    *
-    */
-    function php4_create_parser($source, $in_enc, $detect) {
-        if ( !$detect ) {
-            return array(xml_parser_create($in_enc), $source);
-        }
+	function is_atom() {
+		if ( $this->feed_type == ATOM ) {
+			return $this->feed_version;
+		}
+		else {
+			return false;
+		}
+	}
 
-        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';
-            }
-        }
+	/**
+	 * return XML parser, and possibly re-encoded source
+	 *
+	 */
+	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);
+		}
 
-        if ($this->known_encoding($in_enc)) {
-            return array(xml_parser_create($in_enc), $source);
-        }
+		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!
+	 *
+	 */
+	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
+	 *
+	 */
+	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
@@ -548,44 +548,44 @@ 
                      E_USER_NOTICE);
 		*/
 
-        return array(xml_parser_create(), $source);
-    }
+		return array(xml_parser_create(), $source);
+	}
 
-    function known_encoding($enc) {
-        $enc = strtoupper($enc);
-        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
-            return $enc;
-        }
-        else {
-            return false;
-        }
-    }
+	function known_encoding($enc) {
+		$enc = strtoupper($enc);
+		if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
+			return $enc;
+		}
+		else {
+			return false;
+		}
+	}
 
-    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);
-        }
+	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;
-        }
-    }
+		$notices = E_USER_NOTICE|E_NOTICE;
+		if ( $lvl&$notices ) {
+			$this->WARNING = $errormsg;
+		} else {
+			$this->ERROR = $errormsg;
+		}
+	}
 
 
 } // end class RSS
 
 function map_attrs($k, $v) {
-    return "$k=\"$v\"";
+	return "$k=\"$v\"";
 }
 
 

Spacing +114 added lines, -114 removed lines

@@ -34,16 +34,16 @@ 
 class MagpieRSS {
     var $parser;
 
-    var $current_item   = array();  // item currently being parsed
-    var $items          = array();  // collection of parsed items
-    var $channel        = array();  // hash of channel fields
+    var $current_item   = array(); // item currently being parsed
+    var $items          = array(); // collection of parsed items
+    var $channel        = array(); // hash of channel fields
     var $textinput      = array();
     var $image          = array();
     var $feed_type;
     var $feed_version;
-    var $encoding       = '';       // output encoding of parsed rss
+    var $encoding       = ''; // output encoding of parsed rss
 
-    var $_source_encoding = '';     // only set if we have to parse xml prolog
+    var $_source_encoding = ''; // only set if we have to parse xml prolog
 
     var $ERROR = "";
     var $WARNING = "";
@@ -92,15 +92,15 @@ 
      *                                  source encoding. (caveat emptor)
      *
      */
-    function MagpieRSS ($source, $output_encoding='ISO-8859-1',
-                        $input_encoding=null, $detect_encoding=true)
+    function MagpieRSS($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. " .
+            $this->error("Failed to load PHP's XML Extension. ".
                           "http://www.php.net/manual/en/ref.xml.php",
-                           E_USER_ERROR );
+                           E_USER_ERROR);
         }
 
         list($parser, $source) = $this->create_parser($source,
@@ -108,9 +108,9 @@ 
 
 
         if (!is_resource($parser)) {
-            $this->error( "Failed to create an instance of PHP's XML 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 );
+                          E_USER_ERROR);
         }
 
 
@@ -119,27 +119,27 @@ 
         # pass in parser, and a reference to this object
         # setup handlers
         #
-        xml_set_object( $this->parser, $this );
+        xml_set_object($this->parser, $this);
         xml_set_element_handler($this->parser,
-                'feed_start_element', 'feed_end_element' );
+                'feed_start_element', 'feed_end_element');
 
-        xml_set_character_data_handler( $this->parser, 'feed_cdata' );
+        xml_set_character_data_handler($this->parser, 'feed_cdata');
 
-        $status = @xml_parse( $this->parser, $source );
+        $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 );
+        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 );
+                $this->error($errormsg);
             }
         }
 
-        xml_parser_free( $this->parser );
+        xml_parser_free($this->parser);
 
         $this->normalize();
         
@@ -151,26 +151,26 @@ 
 
         // check for a namespace, and split if found
         $ns = false;
-        if ( strpos( $element, ':' ) ) {
-            list($ns, $el) = split( ':', $element, 2);
+        if (strpos($element, ':')) {
+            list($ns, $el) = split(':', $element, 2);
         }
-        if ( $ns and $ns != 'rdf' ) {
+        if ($ns and $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' ) {
+        if (!isset($this->feed_type)) {
+            if ($el == 'rdf') {
                 $this->feed_type = RSS;
                 $this->feed_version = '1.0';
             }
-            elseif ( $el == 'rss' ) {
+            elseif ($el == 'rss') {
                 $this->feed_type = RSS;
                 $this->feed_version = $attrs['version'];
             }
-            elseif ( $el == 'feed' ) {
+            elseif ($el == 'feed') {
                 $this->feed_type = ATOM;
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -178,14 +178,14 @@ 
             return;
         }
 
-        if ( $el == 'channel' )
+        if ($el == 'channel')
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' )
+        elseif ($el == 'item' or $el == 'entry')
         {
             $this->initem = true;
-            if ( isset($attrs['rdf:about']) ) {
+            if (isset($attrs['rdf:about'])) {
                 $this->current_item['about'] = $attrs['rdf:about'];
             }
         }
@@ -209,10 +209,10 @@ 
         }
 
         # handle atom content constructs
-        elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             // avoid clashing w/ RSS mod_content
-            if ($el == 'content' ) {
+            if ($el == 'content') {
                 $el = 'atom_content';
             }
 
@@ -222,31 +222,31 @@ 
         }
 
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM and $this->incontent )
+        elseif ($this->feed_type == ATOM and $this->incontent)
         {
             // if tags are inlined, then flatten
             $attrs_str = join(' ',
                     array_map('map_attrs',
                     array_keys($attrs),
-                    array_values($attrs) ) );
+                    array_values($attrs)));
 
-            $this->append_content( "<$element $attrs_str>"  );
+            $this->append_content("<$element $attrs_str>");
 
-            array_unshift( $this->stack, $el );
+            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 and $el == 'link' )
+        elseif ($this->feed_type == ATOM and $el == 'link')
         {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
+            if (isset($attrs['rel']) and $attrs['rel'] == 'alternate')
             {
                 $link_el = 'link';
             }
             else {
-                $link_el = 'link_' . $attrs['rel'];
+                $link_el = 'link_'.$attrs['rel'];
             }
 
             $this->append($link_el, $attrs['href']);
@@ -259,11 +259,11 @@ 
 
 
 
-    function feed_cdata ($p, $text) {
+    function feed_cdata($p, $text) {
 
         if ($this->feed_type == ATOM and $this->incontent)
         {
-            $this->append_content( $text );
+            $this->append_content($text);
         }
         else {
             $current_el = join('_', array_reverse($this->stack));
@@ -271,35 +271,35 @@ 
         }
     }
 
-    function feed_end_element ($p, $el) {
+    function feed_end_element($p, $el) {
         $el = strtolower($el);
 
-        if ( $el == 'item' or $el == 'entry' )
+        if ($el == 'item' or $el == 'entry')
         {
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput')
         {
             $this->intextinput = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image')
         {
             $this->inimage = false;
         }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
         {
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' )
+        elseif ($el == 'channel' or $el == 'feed')
         {
             $this->inchannel = false;
         }
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
+        elseif ($this->feed_type == ATOM and $this->incontent) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el )
+            if ($this->stack[0] == $el)
             {
                 $this->append_content("</$el>");
             }
@@ -307,18 +307,18 @@ 
                 $this->append_content("<$el />");
             }
 
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
         else {
-            array_shift( $this->stack );
+            array_shift($this->stack);
         }
 
         $this->current_namespace = false;
     }
 
-    function concat (&$str1, $str2="") {
-        if (!isset($str1) ) {
-            $str1="";
+    function concat(&$str1, $str2 = "") {
+        if (!isset($str1)) {
+            $str1 = "";
         }
         $str1 .= $str2;
     }
@@ -326,11 +326,11 @@ 
 
 
     function append_content($text) {
-        if ( $this->initem ) {
-            $this->concat( $this->current_item[ $this->incontent ], $text );
+        if ($this->initem) {
+            $this->concat($this->current_item[$this->incontent], $text);
         }
-        elseif ( $this->inchannel ) {
-            $this->concat( $this->channel[ $this->incontent ], $text );
+        elseif ($this->inchannel) {
+            $this->concat($this->channel[$this->incontent], $text);
         }
     }
 
@@ -339,61 +339,61 @@ 
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace )
+        if ($this->current_namespace)
         {
-            if ( $this->initem ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $this->current_namespace ][ $el ], $text);
+                    $this->current_item[$this->current_namespace][$el], $text);
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $this->current_namespace][ $el ], $text );
+                    $this->channel[$this->current_namespace][$el], $text );
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $this->current_namespace][ $el ], $text );
+                    $this->textinput[$this->current_namespace][$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $this->current_namespace ][ $el ], $text );
+                    $this->image[$this->current_namespace][$el], $text );
             }
         }
         else {
-            if ( $this->initem ) {
+            if ($this->initem) {
                 $this->concat(
-                    $this->current_item[ $el ], $text);
+                    $this->current_item[$el], $text);
             }
             elseif ($this->intextinput) {
                 $this->concat(
-                    $this->textinput[ $el ], $text );
+                    $this->textinput[$el], $text );
             }
             elseif ($this->inimage) {
                 $this->concat(
-                    $this->image[ $el ], $text );
+                    $this->image[$el], $text );
             }
             elseif ($this->inchannel) {
                 $this->concat(
-                    $this->channel[ $el ], $text );
+                    $this->channel[$el], $text );
             }
 
         }
     }
 
-    function normalize () {
+    function normalize() {
         // if atom populate rss fields
-        if ( $this->is_atom() ) {
+        if ($this->is_atom()) {
             $this->channel['description'] = $this->channel['tagline'];
-            for ( $i = 0; $i < count($this->items); $i++) {
+            for ($i = 0; $i<count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
+                if (isset($item['summary']))
                     $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
+                if (isset($item['atom_content']))
                     $item['content']['encoded'] = $item['atom_content'];
 
-                $atom_date = (isset($item['issued']) ) ? $item['issued'] : @$item['modified'];
-                if ( $atom_date ) {
+                $atom_date = (isset($item['issued'])) ? $item['issued'] : @$item['modified'];
+                if ($atom_date) {
                     $epoch = @parse_w3cdtf($atom_date);
-                    if ($epoch and $epoch > 0) {
+                    if ($epoch and $epoch>0) {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
@@ -401,24 +401,24 @@ 
                 $this->items[$i] = $item;
             }
         }
-        elseif ( $this->is_rss() ) {
+        elseif ($this->is_rss()) {
             $this->channel['tagline'] = $this->channel['description'];
-            for ( $i = 0; $i < count($this->items); $i++) {
+            for ($i = 0; $i<count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['description']))
+                if (isset($item['description']))
                     $item['summary'] = $item['description'];
-                if ( isset($item['content']['encoded'] ) )
+                if (isset($item['content']['encoded']))
                     $item['atom_content'] = $item['content']['encoded'];
 
-                if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
+                if ($this->is_rss() == '1.0' and isset($item['dc']['date'])) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
-                    if ($epoch and $epoch > 0) {
+                    if ($epoch and $epoch>0) {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
-                elseif ( isset($item['pubdate']) ) {
+                elseif (isset($item['pubdate'])) {
                     $epoch = @strtotime($item['pubdate']);
-                    if ($epoch > 0) {
+                    if ($epoch>0) {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
@@ -429,8 +429,8 @@ 
     }
 
 
-    function is_rss () {
-        if ( $this->feed_type == RSS ) {
+    function is_rss() {
+        if ($this->feed_type == RSS) {
             return $this->feed_version;
         }
         else {
@@ -439,7 +439,7 @@ 
     }
 
     function is_atom() {
-        if ( $this->feed_type == ATOM ) {
+        if ($this->feed_type == ATOM) {
             return $this->feed_version;
         }
         else {
@@ -452,7 +452,7 @@ 
     *
     */
     function create_parser($source, $out_enc, $in_enc, $detect) {
-        if ( substr(phpversion(),0,1) == 5) {
+        if (substr(phpversion(), 0, 1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
         }
         else {
@@ -477,7 +477,7 @@ 
     */
     function php5_create_parser($in_enc, $detect) {
         // by default php5 does a fine job of detecting input encodings
-        if(!$detect && $in_enc) {
+        if (!$detect && $in_enc) {
             return xml_parser_create($in_enc);
         }
         else {
@@ -501,7 +501,7 @@ 
     *
     */
     function php4_create_parser($source, $in_enc, $detect) {
-        if ( !$detect ) {
+        if (!$detect) {
             return array(xml_parser_create($in_enc), $source);
         }
 
@@ -553,7 +553,7 @@ 
 
     function known_encoding($enc) {
         $enc = strtoupper($enc);
-        if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
+        if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
             return $enc;
         }
         else {
@@ -561,22 +561,22 @@ 
         }
     }
 
-    function error ($errormsg, $lvl=E_USER_WARNING) {
+    function error($errormsg, $lvl = E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( !empty($php_errormsg) ) {
+        if (!empty($php_errormsg)) {
             $errormsg .= " ($php_errormsg)";
         }
-        if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);
+        if (MAGPIE_DEBUG) {
+            trigger_error($errormsg, $lvl);
         }
         else {
-            error_log( $errormsg, 0);
+            error_log($errormsg, 0);
         }
 
-        $notices = E_USER_NOTICE|E_NOTICE;
-        if ( $lvl&$notices ) {
+        $notices = E_USER_NOTICE | E_NOTICE;
+        if ($lvl & $notices) {
             $this->WARNING = $errormsg;
-        } else {
+        }else {
             $this->ERROR = $errormsg;
         }
     }
@@ -589,41 +589,41 @@ 
 }
 
 
-function parse_w3cdtf ( $date_str ) {
+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]);
+	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( intval($hours), intval($minutes), intval($seconds), intval($month), intval($day), intval($year));
+		$epoch = gmmktime(intval($hours), intval($minutes), intval($seconds), intval($month), intval($day), intval($year));
 
 		$offset = 0;
-		if ( $match[10] == 'Z' ) {
+		if ($match[10] == 'Z') {
 			# zulu time, aka GMT
 		}
 		else {
-			list( $tz_mod, $tz_hour, $tz_min ) =
-				array( $match[8], $match[9], $match[10]);
+			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; }
+			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;
+			if ($tz_mod == '+') {
+				$offset_secs = $offset_secs*-1;
 			}
 
 			$offset = $offset_secs;
 		}
-		$epoch = $epoch + $offset;
+		$epoch = $epoch+$offset;
 		return $epoch;
 	}
 	else {

Braces +44 added lines, -73 removed lines

@@ -165,12 +165,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->feed_type = RSS;
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->feed_type = RSS;
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->feed_type = ATOM;
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -181,8 +179,7 @@ 
         if ( $el == 'channel' )
         {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
+        } elseif ($el == 'item' or $el == 'entry' )
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
@@ -198,9 +195,7 @@ 
             $el == 'textinput' )
         {
             $this->intextinput = true;
-        }
-
-        elseif (
+        } elseif (
             $this->feed_type == RSS and
             $this->current_namespace == '' and
             $el == 'image' )
@@ -244,8 +239,7 @@ 
             if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
 
@@ -264,8 +258,7 @@ 
         if ($this->feed_type == ATOM and $this->incontent)
         {
             $this->append_content( $text );
-        }
-        else {
+        } else {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
         }
@@ -279,37 +272,30 @@ 
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
+        } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
         {
             $this->intextinput = false;
-        }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
+        } elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
         {
             $this->inimage = false;
-        }
-        elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        } elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
+        } elseif ($el == 'channel' or $el == 'feed' )
         {
             $this->inchannel = false;
-        }
-        elseif ($this->feed_type == ATOM and $this->incontent  ) {
+        } elseif ($this->feed_type == ATOM and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
             if ( $this->stack[0] == $el )
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift( $this->stack );
-        }
-        else {
+        } else {
             array_shift( $this->stack );
         }
 
@@ -328,8 +314,7 @@ 
     function append_content($text) {
         if ( $this->initem ) {
             $this->concat( $this->current_item[ $this->incontent ], $text );
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat( $this->channel[ $this->incontent ], $text );
         }
     }
@@ -344,34 +329,27 @@ 
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $this->current_namespace][ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $this->current_namespace ][ $el ], $text );
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat(
                     $this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat(
                     $this->textinput[ $el ], $text );
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat(
                     $this->image[ $el ], $text );
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat(
                     $this->channel[ $el ], $text );
             }
@@ -385,10 +363,12 @@ 
             $this->channel['description'] = $this->channel['tagline'];
             for ( $i = 0; $i < count($this->items); $i++) {
                 $item = $this->items[$i];
-                if ( isset($item['summary']) )
-                    $item['description'] = $item['summary'];
-                if ( isset($item['atom_content']))
-                    $item['content']['encoded'] = $item['atom_content'];
+                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 ) {
@@ -400,23 +380,23 @@ 
 
                 $this->items[$i] = $item;
             }
-        }
-        elseif ( $this->is_rss() ) {
+        } elseif ( $this->is_rss() ) {
             $this->channel['tagline'] = $this->channel['description'];
             for ( $i = 0; $i < count($this->items); $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 ( isset($item['description'])) {
+                                    $item['summary'] = $item['description'];
+                }
+                if ( isset($item['content']['encoded'] ) ) {
+                                    $item['atom_content'] = $item['content']['encoded'];
+                }
 
                 if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
                     if ($epoch and $epoch > 0) {
                         $item['date_timestamp'] = $epoch;
                     }
-                }
-                elseif ( isset($item['pubdate']) ) {
+                } elseif ( isset($item['pubdate']) ) {
                     $epoch = @strtotime($item['pubdate']);
                     if ($epoch > 0) {
                         $item['date_timestamp'] = $epoch;
@@ -432,8 +412,7 @@ 
     function is_rss () {
         if ( $this->feed_type == RSS ) {
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -441,8 +420,7 @@ 
     function is_atom() {
         if ( $this->feed_type == ATOM ) {
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -454,8 +432,7 @@ 
     function create_parser($source, $out_enc, $in_enc, $detect) {
         if ( substr(phpversion(),0,1) == 5) {
             $parser = $this->php5_create_parser($in_enc, $detect);
-        }
-        else {
+        } else {
             list($parser, $source) = $this->php4_create_parser($source, $in_enc, $detect);
         }
         if ($out_enc) {
@@ -479,8 +456,7 @@ 
         // by default php5 does a fine job of detecting input encodings
         if(!$detect && $in_enc) {
             return xml_parser_create($in_enc);
-        }
-        else {
+        } else {
             return xml_parser_create('');
         }
     }
@@ -509,8 +485,7 @@ 
             if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
                 $in_enc = strtoupper($m[1]);
                 $this->source_encoding = $in_enc;
-            }
-            else {
+            } else {
                 $in_enc = 'UTF-8';
             }
         }
@@ -555,8 +530,7 @@ 
         $enc = strtoupper($enc);
         if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
             return $enc;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -568,8 +542,7 @@ 
         }
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
 
@@ -604,8 +577,7 @@ 
 		$offset = 0;
 		if ( $match[10] == 'Z' ) {
 			# zulu time, aka GMT
-		}
-		else {
+		} else {
 			list( $tz_mod, $tz_hour, $tz_min ) =
 				array( $match[8], $match[9], $match[10]);
 
@@ -625,8 +597,7 @@ 
 		}
 		$epoch = $epoch + $offset;
 		return $epoch;
-	}
-	else {
+	} else {
 		return -1;
 	}
 }

class/xml.php

Doc Comments +4 added lines

@@ -93,6 +93,10 @@
         $this->version = $version;
     }
 
+    /**
+     * @param string $var
+     * @param FeedImage $val
+     */
     function setVar($var, $val, $encoding = false)
     {
 	    if(!empty($encoding)) $val = $this->convert_encoding($val);

Indentation +56 added lines, -56 removed lines

@@ -84,63 +84,63 @@
 if(!class_exists("Xmlfeed")){
 class Bxmlfeed extends UniversalFeedCreator
 {
-    var $version;
-    var $filename= "";
-
-    function Bxmlfeed($version)
-    {
-    	$this->filename= XOOPS_CACHE_PATH."/feed.xml";
-        $this->version = $version;
-    }
-
-    function setVar($var, $val, $encoding = false)
-    {
-	    if(!empty($encoding)) $val = $this->convert_encoding($val);
-        $this->$var = $val;
-    }
+	var $version;
+	var $filename= "";
+
+	function Bxmlfeed($version)
+	{
+		$this->filename= XOOPS_CACHE_PATH."/feed.xml";
+		$this->version = $version;
+	}
+
+	function setVar($var, $val, $encoding = false)
+	{
+		if(!empty($encoding)) $val = $this->convert_encoding($val);
+		$this->$var = $val;
+	}
     
-    function convert_encoding($val)    
-    {
-	    if(is_array($val)){
-		    foreach(array_keys($val) as $key){
-			    $val[$key] = $this->convert_encoding($val[$key]);
-		    }
-	    }else{
-		    $val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
-	    }
-	    return $val;
-    }
-
-    function getVar($var)
-    {
-        return $this->$var;
-    }
-
-    function setImage(&$img)
-    {
-	    $image = new FeedImage();
-	    foreach($img as $key=>$val){
-		    $image->$key = $this->convert_encoding($val);
-	    }
-	    $this->setVar("image", $image);
-    }
-
-    function _addItem(&$itm)
-    {
-    	$item = new FeedItem();
-	    foreach($itm as $key=>$val){
-		    $item->$key = $this->convert_encoding($val);
-	    }
-	    $this->addItem($item);
-    }
-
-    function addItems(&$items)
-    {
-	    if(!is_array($items) || count($items)==0) return;
-	    foreach($items as $item){
-		    $this->_addItem($item);
-	    }
-    }
+	function convert_encoding($val)    
+	{
+		if(is_array($val)){
+			foreach(array_keys($val) as $key){
+				$val[$key] = $this->convert_encoding($val[$key]);
+			}
+		}else{
+			$val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
+		}
+		return $val;
+	}
+
+	function getVar($var)
+	{
+		return $this->$var;
+	}
+
+	function setImage(&$img)
+	{
+		$image = new FeedImage();
+		foreach($img as $key=>$val){
+			$image->$key = $this->convert_encoding($val);
+		}
+		$this->setVar("image", $image);
+	}
+
+	function _addItem(&$itm)
+	{
+		$item = new FeedItem();
+		foreach($itm as $key=>$val){
+			$item->$key = $this->convert_encoding($val);
+		}
+		$this->addItem($item);
+	}
+
+	function addItems(&$items)
+	{
+		if(!is_array($items) || count($items)==0) return;
+		foreach($items as $item){
+			$this->_addItem($item);
+		}
+	}
 }
 }
 

Spacing +14 added lines, -14 removed lines

@@ -25,7 +25,7 @@ 
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-if (!defined('XOOPS_ROOT_PATH')){ exit(); }
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
 include_once dirname(dirname(__FILE__))."/include/vars.php";
 mod_loadFunctions("", $GLOBALS["moddirname"]);
 
@@ -66,8 +66,8 @@ 
 
 // your local timezone, set to "" to disable or for GMT
 $server_TZ = abs(intval($GLOBALS['xoopsConfig']['server_TZ']*3600.0));
-$prefix = ($GLOBALS['xoopsConfig']['server_TZ']<0)?"-":"+";
-$TIME_ZONE = $prefix.date("H:i",$server_TZ);
+$prefix = ($GLOBALS['xoopsConfig']['server_TZ']<0) ? "-" : "+";
+$TIME_ZONE = $prefix.date("H:i", $server_TZ);
 define("TIME_ZONE", $TIME_ZONE);
 // Version string.
 define("FEEDCREATOR_VERSION", "ARTICLE @ XOOPS powered by FeedCreator");
@@ -81,31 +81,31 @@ 
  * @return type description
  * @link
  */
-if(!class_exists("Xmlfeed")){
+if (!class_exists("Xmlfeed")) {
 class Bxmlfeed extends UniversalFeedCreator
 {
     var $version;
-    var $filename= "";
+    var $filename = "";
 
     function Bxmlfeed($version)
     {
-    	$this->filename= XOOPS_CACHE_PATH."/feed.xml";
+    	$this->filename = XOOPS_CACHE_PATH."/feed.xml";
         $this->version = $version;
     }
 
     function setVar($var, $val, $encoding = false)
     {
-	    if(!empty($encoding)) $val = $this->convert_encoding($val);
+	    if (!empty($encoding)) $val = $this->convert_encoding($val);
         $this->$var = $val;
     }
     
     function convert_encoding($val)    
     {
-	    if(is_array($val)){
-		    foreach(array_keys($val) as $key){
+	    if (is_array($val)) {
+		    foreach (array_keys($val) as $key) {
 			    $val[$key] = $this->convert_encoding($val[$key]);
 		    }
-	    }else{
+	    }else {
 		    $val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
 	    }
 	    return $val;
@@ -119,7 +119,7 @@ 
     function setImage(&$img)
     {
 	    $image = new FeedImage();
-	    foreach($img as $key=>$val){
+	    foreach ($img as $key=>$val) {
 		    $image->$key = $this->convert_encoding($val);
 	    }
 	    $this->setVar("image", $image);
@@ -128,7 +128,7 @@ 
     function _addItem(&$itm)
     {
     	$item = new FeedItem();
-	    foreach($itm as $key=>$val){
+	    foreach ($itm as $key=>$val) {
 		    $item->$key = $this->convert_encoding($val);
 	    }
 	    $this->addItem($item);
@@ -136,8 +136,8 @@ 
 
     function addItems(&$items)
     {
-	    if(!is_array($items) || count($items)==0) return;
-	    foreach($items as $item){
+	    if (!is_array($items) || count($items) == 0) return;
+	    foreach ($items as $item) {
 		    $this->_addItem($item);
 	    }
     }

Braces +7 added lines, -3 removed lines

@@ -95,7 +95,9 @@ 
 
     function setVar($var, $val, $encoding = false)
     {
-	    if(!empty($encoding)) $val = $this->convert_encoding($val);
+	    if(!empty($encoding)) {
+	    	$val = $this->convert_encoding($val);
+	    }
         $this->$var = $val;
     }
     
@@ -105,7 +107,7 @@ 
 		    foreach(array_keys($val) as $key){
 			    $val[$key] = $this->convert_encoding($val[$key]);
 		    }
-	    }else{
+	    } else{
 		    $val = XoopsLocal::convert_encoding($val, $this->encoding, _CHARSET);
 	    }
 	    return $val;
@@ -136,7 +138,9 @@ 
 
     function addItems(&$items)
     {
-	    if(!is_array($items) || count($items)==0) return;
+	    if(!is_array($items) || count($items)==0) {
+	    	return;
+	    }
 	    foreach($items as $item){
 		    $this->_addItem($item);
 	    }

class/xmlparser.php

Doc Comments -7 removed lines

@@ -53,13 +53,6 @@
      *  @param string $content           string containing the RSS to be parsed
      *
      *
-     *  @param string $output_encoding  output the parsed RSS in this character
-     *                                  set defaults to ISO-8859-1 as this is PHP's
-     *                                  default.
-     *
-     *  @param string $input_encoding   the character set of the incoming RSS source.
-     *                                  Leave blank and Magpie will try to figure it
-     *                                  out.
      *
      */
     function XmlParser ($content, $input_charset, $output_charset = _CHARSET, $tags = array())

Indentation +106 added lines, -106 removed lines

@@ -47,23 +47,23 @@ 
 	var $charset_in;
 	var $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 $output_encoding  output the parsed RSS in this character
-     *                                  set defaults to ISO-8859-1 as this is PHP's
-     *                                  default.
-     *
-     *  @param string $input_encoding   the character set of the incoming RSS source.
-     *                                  Leave blank and Magpie will try to figure it
-     *                                  out.
-     *
-     */
-    function XmlParser ($content, $input_charset, $output_charset = _CHARSET, $tags = array())
-    {
+	/**
+	 *  Set up XML parser, parse source, and return populated RSS object..
+	 *
+	 *  @param string $content           string containing the RSS to be parsed
+	 *
+	 *
+	 *  @param string $output_encoding  output the parsed RSS in this character
+	 *                                  set defaults to ISO-8859-1 as this is PHP's
+	 *                                  default.
+	 *
+	 *  @param string $input_encoding   the character set of the incoming RSS source.
+	 *                                  Leave blank and Magpie will try to figure it
+	 *                                  out.
+	 *
+	 */
+	function XmlParser ($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);
@@ -79,109 +79,109 @@ 
 		//xoops_message($this);
 		unset($this->content);
 		$this->encoding_convert($tags);
-    }
+	}
 
-    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;
-        }
-    }
+	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;
+		}
+	}
     
-    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; $i < count($this->items); $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; $i < count($this->items); $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"]) )  {
+	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; $i < count($this->items); $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; $i < count($this->items); $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) )  {
+		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) )  {
+		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"]);
-	    }
+		if(!empty($this->channel["tagline"])){
+			unset($this->channel["tagline"]);
+		}
 		
-        for ( $i = 0; $i < count($this->items); $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; $i < count($this->items); $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']);
-        }
-	    return;
-    }
+			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;
+	}
     
-    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);
-    	}
-    }
+	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);
+		}
+	}
     
-    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;
-    }
+	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;
+	}
 }
 ?>
\ No newline at end of file

Spacing +38 added lines, -38 removed lines

@@ -62,9 +62,9 @@ 
      *                                  out.
      *
      */
-    function XmlParser ($content, $input_charset, $output_charset = _CHARSET, $tags = array())
+    function XmlParser($content, $input_charset, $output_charset = _CHARSET, $tags = array())
     {
-		if(!in_array(strtoupper($input_charset), array("UTF-8", "US-ASCII", "ISO-8859-1"))) {
+		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";
@@ -74,7 +74,7 @@ 
 		$this->charset_out = $output_charset;
 		
 		/* TODO: parse specified tags only */
-		$this->MagpieRSS( $content, $input_charset, $input_charset, false );
+		$this->MagpieRSS($content, $input_charset, $input_charset, false);
 		
 		//xoops_message($this);
 		unset($this->content);
@@ -82,8 +82,8 @@ 
     }
 
     function is_atom() {
-        if ( $this->feed_type == ATOM ) {
-	        $this->feed_version = empty($this->feed_version)?"0.3":$this->feed_version;
+        if ($this->feed_type == ATOM) {
+	        $this->feed_version = empty($this->feed_version) ? "0.3" : $this->feed_version;
             return $this->feed_version;
         }
         else {
@@ -91,94 +91,94 @@ 
         }
     }
     
-    function normalize () {
-        if ( $this->is_atom() ):
-	    if(empty($this->channel["tagline"])){
+    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; $i < count($this->items); $i++) {
+        for ($i = 0; $i<count($this->items); $i++) {
 	        // ATOM time
-	        if($date = @$this->items[$i]['modified']) continue;
-	        if(empty($date)){
+	        if ($date = @$this->items[$i]['modified']) continue;
+	        if (empty($date)) {
                 $date = @$this->items[$i]['updated'];
         	}
-	        if(empty($date)){
+	        if (empty($date)) {
                 $date = @$this->items[$i]['issued'];
         	}
-	        if(empty($date)){
+	        if (empty($date)) {
                 $date = @$this->items[$i]['created'];
         	}
-	        if(empty($date)){
+	        if (empty($date)) {
                 $date = @$this->items[$i]['created'];
         	}
 	        $this->items[$i]['modified'] = $date;
         }
-        elseif($this->is_rss() != '1.0'):
-        for ( $i = 0; $i < count($this->items); $i++) {
-	        if($date = @$this->items[$i]['pubdate']) continue;
+        elseif ($this->is_rss() != '1.0'):
+        for ($i = 0; $i<count($this->items); $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"]) )  {
+	    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) )  {
+	    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) )  {
+	    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"])){
+	    if (!empty($this->channel["tagline"])) {
 		    unset($this->channel["tagline"]);
 	    }
 		
-        for ( $i = 0; $i < count($this->items); $i++) {
-	        if($date_timestamp = @$this->items[$i]['date_timestamp']) continue;
-	        if($date_timestamp = @$this->items[$i]['pubdate']){
+        for ($i = 0; $i<count($this->items); $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']){
+            }elseif ($date_timestamp = @$this->items[$i]['dc']['date']) {
                 $this->items[$i]['date_timestamp'] = $date_timestamp;
-        	}else{
+        	}else {
 	        	$this->items[$i]['date_timestamp'] = time();
         	}
-	        if(!is_numeric($this->items[$i]['date_timestamp'])){
-		        if($date = parse_w3cdtf($this->items[$i]['date_timestamp'])) {
+	        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'])) {
+	        	}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']) )
+            if (isset($this->items[$i]['summary']))
                 unset($this->items[$i]['summary']);
-            if ( isset($this->items[$i]['atom_content']))
+            if (isset($this->items[$i]['atom_content']))
                 unset($this->items[$i]['atom_content']);
         }
 	    return;
     }
     
-    function encoding_convert($tags = array()){
-	    if(empty($tags) || in_array("channel", $tags)){
+    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)){
+	    if (empty($tags) || in_array("items", $tags)) {
 	    	$this->items = $this->_encoding($this->items);
     	}
     }
     
-    function _encoding($val){
-	    if(is_array($val)){
-		    foreach(array_keys($val) as $key){
+    function _encoding($val) {
+	    if (is_array($val)) {
+		    foreach (array_keys($val) as $key) {
 			    $val[$key] = $this->_encoding($val[$key]);
 		    }
-	    }else{
+	    }else {
 		    $val = XoopsLocal::convert_encoding($val, $this->charset_out, $this->charset_in);
 	    }
 	    return $val;

Braces +21 added lines, -15 removed lines

@@ -85,8 +85,7 @@ 
         if ( $this->feed_type == ATOM ) {
 	        $this->feed_version = empty($this->feed_version)?"0.3":$this->feed_version;
             return $this->feed_version;
-        }
-        else {
+        } else {
             return false;
         }
     }
@@ -100,7 +99,9 @@ 
     	}
         for ( $i = 0; $i < count($this->items); $i++) {
 	        // ATOM time
-	        if($date = @$this->items[$i]['modified']) continue;
+	        if($date = @$this->items[$i]['modified']) {
+	        	continue;
+	        }
 	        if(empty($date)){
                 $date = @$this->items[$i]['updated'];
         	}
@@ -114,10 +115,11 @@ 
                 $date = @$this->items[$i]['created'];
         	}
 	        $this->items[$i]['modified'] = $date;
-        }
-        elseif($this->is_rss() != '1.0'):
+        } elseif($this->is_rss() != '1.0'):
         for ( $i = 0; $i < count($this->items); $i++) {
-	        if($date = @$this->items[$i]['pubdate']) continue;
+	        if($date = @$this->items[$i]['pubdate']) {
+	        	continue;
+	        }
 	        $this->items[$i]['pubdate'] = @$this->items[$i]['dc']['date'];
         }
         endif;
@@ -139,27 +141,31 @@ 
 	    }
 		
         for ( $i = 0; $i < count($this->items); $i++) {
-	        if($date_timestamp = @$this->items[$i]['date_timestamp']) continue;
+	        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']){
+            } elseif($date_timestamp = @$this->items[$i]['dc']['date']){
                 $this->items[$i]['date_timestamp'] = $date_timestamp;
-        	}else{
+        	} 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'])) {
+	        	} 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']);
+            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;
     }
@@ -178,7 +184,7 @@ 
 		    foreach(array_keys($val) as $key){
 			    $val[$key] = $this->_encoding($val[$key]);
 		    }
-	    }else{
+	    } else{
 		    $val = XoopsLocal::convert_encoding($val, $this->charset_out, $this->charset_in);
 	    }
 	    return $val;

include/functions.ini.php

Doc Comments +6 added lines

@@ -37,11 +37,17 @@
 if(!defined("PLANET_FUNCTIONS_INI")):
 define("PLANET_FUNCTIONS_INI",1);
 
+/**
+ * @param string $name
+ */
 function planet_constant($name)
 {
 	return mod_constant($name);
 }
 
+/**
+ * @param string $name
+ */
 function planet_DB_prefix($name, $isRel = false)
 {
 	return mod_DB_prefix($name, $isRel);

Indentation +12 added lines, -12 removed lines

@@ -59,24 +59,24 @@
 		return $moduleConfig;
 	}
 	
-    if(is_object($GLOBALS["xoopsModule"]) && $GLOBALS["xoopsModule"]->getVar("dirname") == $GLOBALS["moddirname"]){
-	    $moduleConfig =& $GLOBALS["xoopsModuleConfig"];
-    }else{
+	if(is_object($GLOBALS["xoopsModule"]) && $GLOBALS["xoopsModule"]->getVar("dirname") == $GLOBALS["moddirname"]){
+		$moduleConfig =& $GLOBALS["xoopsModuleConfig"];
+	}else{
 		$module_handler = &xoops_gethandler('module');
 		$module = $module_handler->getByDirname($GLOBALS["moddirname"]);
 	
-	    $config_handler = &xoops_gethandler('config');
-	    $criteria = new CriteriaCompo(new Criteria('conf_modid', $module->getVar('mid')));
-	    $configs =& $config_handler->getConfigs($criteria);
-	    foreach(array_keys($configs) as $i){
-		    $moduleConfig[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
-	    }
-	    unset($configs);
-    }
+		$config_handler = &xoops_gethandler('config');
+		$criteria = new CriteriaCompo(new Criteria('conf_modid', $module->getVar('mid')));
+		$configs =& $config_handler->getConfigs($criteria);
+		foreach(array_keys($configs) as $i){
+			$moduleConfig[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
+		}
+		unset($configs);
+	}
 	if($customConfig = @include(XOOPS_ROOT_PATH."/modules/".$GLOBALS["moddirname"]."/include/plugin.php")){
 		$moduleConfig = array_merge($moduleConfig, $customConfig);
 	}
-    return $moduleConfig;
+	return $moduleConfig;
 }
 
 function planet_define_url_delimiter()

Spacing +16 added lines, -16 removed lines

@@ -30,12 +30,12 @@ 
 The functions loaded on initializtion
 */
 
-if (!defined('XOOPS_ROOT_PATH')){ exit(); }
-if (!defined('PLANET_INI')){ exit(); }
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
+if (!defined('PLANET_INI')) { exit(); }
 
 
-if(!defined("PLANET_FUNCTIONS_INI")):
-define("PLANET_FUNCTIONS_INI",1);
+if (!defined("PLANET_FUNCTIONS_INI")):
+define("PLANET_FUNCTIONS_INI", 1);
 
 function planet_constant($name)
 {
@@ -55,25 +55,25 @@ 
 function planet_load_config()
 {
 	static $moduleConfig;
-	if(isset($moduleConfig)){
+	if (isset($moduleConfig)) {
 		return $moduleConfig;
 	}
 	
-    if(is_object($GLOBALS["xoopsModule"]) && $GLOBALS["xoopsModule"]->getVar("dirname") == $GLOBALS["moddirname"]){
-	    $moduleConfig =& $GLOBALS["xoopsModuleConfig"];
-    }else{
+    if (is_object($GLOBALS["xoopsModule"]) && $GLOBALS["xoopsModule"]->getVar("dirname") == $GLOBALS["moddirname"]) {
+	    $moduleConfig = & $GLOBALS["xoopsModuleConfig"];
+    }else {
 		$module_handler = &xoops_gethandler('module');
 		$module = $module_handler->getByDirname($GLOBALS["moddirname"]);
 	
 	    $config_handler = &xoops_gethandler('config');
 	    $criteria = new CriteriaCompo(new Criteria('conf_modid', $module->getVar('mid')));
-	    $configs =& $config_handler->getConfigs($criteria);
-	    foreach(array_keys($configs) as $i){
+	    $configs = & $config_handler->getConfigs($criteria);
+	    foreach (array_keys($configs) as $i) {
 		    $moduleConfig[$configs[$i]->getVar('conf_name')] = $configs[$i]->getConfValueForOutput();
 	    }
 	    unset($configs);
     }
-	if($customConfig = @include(XOOPS_ROOT_PATH."/modules/".$GLOBALS["moddirname"]."/include/plugin.php")){
+	if ($customConfig = @include(XOOPS_ROOT_PATH."/modules/".$GLOBALS["moddirname"]."/include/plugin.php")) {
 		$moduleConfig = array_merge($moduleConfig, $customConfig);
 	}
     return $moduleConfig;
@@ -81,13 +81,13 @@ 
 
 function planet_define_url_delimiter()
 {
-	if(defined("URL_DELIMITER")){
-		if(!in_array(URL_DELIMITER, array("?","/"))) die("Exit on security");
-	}else{
+	if (defined("URL_DELIMITER")) {
+		if (!in_array(URL_DELIMITER, array("?", "/"))) die("Exit on security");
+	}else {
 		$moduleConfig = planet_load_config();
-		if(empty($moduleConfig["do_urw"])){
+		if (empty($moduleConfig["do_urw"])) {
 			define("URL_DELIMITER", "?");
-		}else{
+		}else {
 			define("URL_DELIMITER", "/");
 		}
 	}

Braces +6 added lines, -4 removed lines

@@ -61,7 +61,7 @@ 
 	
     if(is_object($GLOBALS["xoopsModule"]) && $GLOBALS["xoopsModule"]->getVar("dirname") == $GLOBALS["moddirname"]){
 	    $moduleConfig =& $GLOBALS["xoopsModuleConfig"];
-    }else{
+    } else{
 		$module_handler = &xoops_gethandler('module');
 		$module = $module_handler->getByDirname($GLOBALS["moddirname"]);
 	
@@ -82,12 +82,14 @@ 
 function planet_define_url_delimiter()
 {
 	if(defined("URL_DELIMITER")){
-		if(!in_array(URL_DELIMITER, array("?","/"))) die("Exit on security");
-	}else{
+		if(!in_array(URL_DELIMITER, array("?","/"))) {
+			die("Exit on security");
+		}
+	} else{
 		$moduleConfig = planet_load_config();
 		if(empty($moduleConfig["do_urw"])){
 			define("URL_DELIMITER", "?");
-		}else{
+		} else{
 			define("URL_DELIMITER", "/");
 		}
 	}

include/functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -98,7 +98,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="")
 {
@@ -131,7 +131,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="")
 {

Indentation +28 added lines, -28 removed lines

@@ -175,7 +175,7 @@ 
 	if(!is_array($userid))  $userid = array($userid);
 	$users = mod_getUnameFromIds($userid, $usereal, $linked);
 
-    return $users;
+	return $users;
 }
 
 
@@ -190,14 +190,14 @@ 
 {
 	$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;
+	$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;
 }
 
 function planet_getTemplate($pagename)
@@ -379,9 +379,9 @@ 
 
 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;
+	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;
 }
 
@@ -391,33 +391,33 @@ 
 	$snoopy = new Snoopy;
 	$data = "";
 	if (@$snoopy->fetch($url)){
-    	$data = (is_array($snoopy->results))?implode("\n",$snoopy->results):$snoopy->results;
+		$data = (is_array($snoopy->results))?implode("\n",$snoopy->results):$snoopy->results;
 	}
 	return $data;
 }
 
 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;
+	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;
 }
 
 function planet_fetch_fopen($url)
 {
 	if(!$fp = @fopen ($url, 'r')) return false;
-    $data = "";
-    while (!feof($fp)) {
-        $data .= fgets ($fp, 1024);
-    }
-    fclose($fp);
+	$data = "";
+	while (!feof($fp)) {
+		$data .= fgets ($fp, 1024);
+	}
+	fclose($fp);
 	return $data;
 }
 

Spacing +78 added lines, -78 removed lines

@@ -25,15 +25,15 @@ 
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
 
-if (!defined('XOOPS_ROOT_PATH')){ exit(); }
+if (!defined('XOOPS_ROOT_PATH')) { exit(); }
 
 $current_path = __FILE__;
-if ( DIRECTORY_SEPARATOR != '/' ) $current_path = str_replace( strpos( $current_path, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $current_path);
-$url_arr = explode('/',strstr($current_path,'/modules/'));
+if (DIRECTORY_SEPARATOR != '/') $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);
+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");
@@ -44,9 +44,9 @@ 
  * 
  * @var mixed 	$messages
  */
-function planet_message( $message )
+function planet_message($message)
 {
-	return mod_message( $message );
+	return mod_message($message);
 }
 
 /**
@@ -65,30 +65,30 @@ 
 */
 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_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)){
+	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)){
+		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))){
+				}elseif (false === strpos($var, "=")) {
+					if (is_numeric(substr($var, 1))) {
 						$args[$args_abb[strtolower($var{0})]] = intval(substr($var, 1));
-					}else{
+					}else {
 						$args_string[] = urldecode($var);
 					}
-				}else{
+				}else {
 					parse_str($var, $args);
 				}
 			}
 		}
 	}
-	return (count($args)+count($args_numeric)+count($args_string) == 0)?null:true;
+	return (count($args)+count($args_numeric)+count($args_string) == 0) ? null : true;
 }
 
 /**
@@ -100,21 +100,21 @@ 
  *
  * @return bool	true on success
  */
-function planet_parse_class($class_string, $pattern="", $replacement="")
+function planet_parse_class($class_string, $pattern = "", $replacement = "")
 {
-	if(empty($class_string)) return;
+	if (empty($class_string)) return;
 	$patterns = array("/\[CLASS_PREFIX\]/");
 	$replacements = array(ucfirst(strtolower($GLOBALS["moddirname"])));
-	if(!empty($pattern) && !is_array($pattern) && !is_array($replacement)){
+	if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
 		$pattern = array($pattern);
 		$replacement = array($replacement);
 	}
-	if(is_array($pattern) && count($pattern)>0){
+	if (is_array($pattern) && count($pattern)>0) {
 		$ii = 0;
-		foreach($pattern as $pat){
-			if(!in_array($pat, $patterns)){
+		foreach ($pattern as $pat) {
+			if (!in_array($pat, $patterns)) {
 				$patterns[] = $pat;
-				$replacements[] = isset($replacement[$ii])?$replacement[$ii]:"";
+				$replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : "";
 			}
 			$ii++;
 		}
@@ -133,21 +133,21 @@ 
  *
  * @return bool	true on success
  */
-function planet_parse_function($function_string, $pattern="", $replacement="")
+function planet_parse_function($function_string, $pattern = "", $replacement = "")
 {
-	if(empty($function_string)) return;
+	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)){
+	if (!empty($pattern) && !is_array($pattern) && !is_array($replacement)) {
 		$pattern = array($pattern);
 		$replacement = array($replacement);
 	}
-	if(is_array($pattern) && count($pattern)>0){
+	if (is_array($pattern) && count($pattern)>0) {
 		$ii = 0;
-		foreach($pattern as $pat){
-			if(!in_array($pat, $patterns)){
+		foreach ($pattern as $pat) {
+			if (!in_array($pat, $patterns)) {
 				$patterns[] = $pat;
-				$replacements[] = isset($replacement[$ii])?$replacement[$ii]:"";
+				$replacements[] = isset($replacement[$ii]) ? $replacement[$ii] : "";
 			}
 			$ii++;
 		}
@@ -162,7 +162,7 @@ 
  */
 function planet_formatTimestamp($time, $format = "")
 {
-	if(empty($time)) return "";
+	if (empty($time)) return "";
 	return formatTimestamp($time, $format);
 }
 
@@ -170,9 +170,9 @@ 
  * Function to a list of user names associated with their user IDs
  * 
  */
-function &planet_getUnameFromId( $userid, $usereal = 0, $linked = false )
+function &planet_getUnameFromId($userid, $usereal = 0, $linked = false)
 {
-	if(!is_array($userid))  $userid = array($userid);
+	if (!is_array($userid))  $userid = array($userid);
 	$users = mod_getUnameFromIds($userid, $usereal, $linked);
 
     return $users;
@@ -188,12 +188,12 @@ 
  */
 function &planet_parseLinks($text)
 {
-	$myts =& MyTextSanitizer::getInstance();
+	$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 (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));
     }
@@ -205,7 +205,7 @@ 
 	return $GLOBALS["VAR_PREFIX"]."_".$pagename.".html";
 }
 
-function planet_adminmenu ($currentoption = -1)
+function planet_adminmenu($currentoption = -1)
 {
 	loadModuleAdminMenu($currentoption, "");
 	return;
@@ -218,10 +218,10 @@ 
  */
 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));
+	$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);
 }
@@ -236,7 +236,7 @@ 
 	$title = xoops_utf8_encode($title);
 	$excerpt = xoops_utf8_encode($excerpt);
 	$blog_name = xoops_utf8_encode($blog_name);
-	$charset="utf-8";
+	$charset = "utf-8";
 	$title1 = urlencode($title);
 	$excerpt1 = urlencode($excerpt);
 	$name1 = urlencode($blog_name);
@@ -244,34 +244,34 @@ 
 	$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  = '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 .= "User-Agent: XOOPS Blogs/".XOOPS_VERSION;
 	$http_request .= "\r\n\r\n";
 	$http_request .= $query_string;
-	if ( '' == $trackback_url['port'] ){
+	if ('' == $trackback_url['port']) {
 		$trackback_url['port'] = 80;
 	}
 	$fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4);
 	@fputs($fs, $http_request);
-	if($xoopsModuleConfig["do_debug"]) {
+	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)) {
+		while (!@feof($fs)) {
 			$fr .= @fgets($fs, 4096);
 		}
 		$fr .= "\n\n";
 
-		if($fp = fopen($debug_file, "a")){
+		if ($fp = fopen($debug_file, "a")) {
 			fwrite($fp, $fr);
 			fclose($fp);
-		}else{
+		}else {
 		}
 	}
 	@fclose($fs);
@@ -282,8 +282,8 @@ 
  * Function to ping servers
  */
 function planet_ping($server, $id) {
-	if(is_array($server)){
-		foreach($server as $serv){
+	if (is_array($server)) {
+		foreach ($server as $serv) {
 			planet_ping($serv, $id);
 		}
 	}
@@ -301,7 +301,7 @@ 
 	$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
+	if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) // then try a normal ping
 		$client->query('weblogUpdates.ping', $blogname, $home);
 }
 
@@ -319,7 +319,7 @@ 
 		echo "<message>$error_message</message>\n";
 		echo "</response>";
 		die();
-	} else {
+	}else {
 		echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n";
 		echo "<response>\n";
 		echo "<error>0</error>\n";
@@ -334,10 +334,10 @@ 
  */
 function planet_setcookie($name, $string = '', $expire = 0)
 {
-	if(is_array($string)) {
+	if (is_array($string)) {
 		$value = array();
-		foreach ($string as $key => $val){
-			$value[]=$key."|".$val;
+		foreach ($string as $key => $val) {
+			$value[] = $key."|".$val;
 		}
 		$string = implode(",", $value);
 	}
@@ -347,12 +347,12 @@ 
 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();
+	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));
+		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);
@@ -379,9 +379,9 @@ 
 
 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;
+    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;
 }
 
@@ -390,20 +390,20 @@ 
 	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;
+	if (@$snoopy->fetch($url)) {
+    	$data = (is_array($snoopy->results)) ? implode("\n", $snoopy->results) : $snoopy->results;
 	}
 	return $data;
 }
 
 function planet_fetch_CURL($url)
 {
-    if (!function_exists('curl_init') ) return false;
-    $ch = curl_init();    // initialize curl handle
+    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_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);
@@ -412,25 +412,25 @@ 
 
 function planet_fetch_fopen($url)
 {
-	if(!$fp = @fopen ($url, 'r')) return false;
+	if (!$fp = @fopen($url, 'r')) return false;
     $data = "";
     while (!feof($fp)) {
-        $data .= fgets ($fp, 1024);
+        $data .= fgets($fp, 1024);
     }
     fclose($fp);
 	return $data;
 }
 
-function planet_strrpos($haystack, $needle, $offset = 0 )
+function planet_strrpos($haystack, $needle, $offset = 0)
 {
-	if( substr(phpversion(),0,1) == 5 ){
+	if (substr(phpversion(), 0, 1) == 5) {
 		return strrpos($haystack, $needle, $offset);
 	}
 	$index = strpos(strrev($haystack), strrev($needle));
-	if($index === false) {
+	if ($index === false) {
 		return false;
 	}
-	$index = strlen($haystack) - strlen($needle) - $index;
+	$index = strlen($haystack)-strlen($needle)-$index;
 	return $index;	
 }
 endif;

Braces +50 added lines, -20 removed lines

@@ -28,7 +28,9 @@ 
 if (!defined('XOOPS_ROOT_PATH')){ exit(); }
 
 $current_path = __FILE__;
-if ( DIRECTORY_SEPARATOR != '/' ) $current_path = str_replace( strpos( $current_path, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $current_path);
+if ( DIRECTORY_SEPARATOR != '/' ) {
+	$current_path = str_replace( strpos( $current_path, '\\\\', 2 ) ? '\\\\' : DIRECTORY_SEPARATOR, '/', $current_path);
+}
 $url_arr = explode('/',strstr($current_path,'/modules/'));
 $GLOBALS["moddirname"] = $url_arr[2];
 
@@ -76,13 +78,13 @@ 
 			foreach($vars as $var){
 				if(is_numeric($var)){
 					$args_numeric[] = $var;
-				}elseif(false === strpos($var, "=")){
+				} elseif(false === strpos($var, "=")){
 					if(is_numeric(substr($var, 1))){
 						$args[$args_abb[strtolower($var{0})]] = intval(substr($var, 1));
-					}else{
+					} else{
 						$args_string[] = urldecode($var);
 					}
-				}else{
+				} else{
 					parse_str($var, $args);
 				}
 			}
@@ -102,7 +104,9 @@ 
  */
 function planet_parse_class($class_string, $pattern="", $replacement="")
 {
-	if(empty($class_string)) return;
+	if(empty($class_string)) {
+		return;
+	}
 	$patterns = array("/\[CLASS_PREFIX\]/");
 	$replacements = array(ucfirst(strtolower($GLOBALS["moddirname"])));
 	if(!empty($pattern) && !is_array($pattern) && !is_array($replacement)){
@@ -135,7 +139,9 @@ 
  */
 function planet_parse_function($function_string, $pattern="", $replacement="")
 {
-	if(empty($function_string)) return;
+	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)){
@@ -162,7 +168,9 @@ 
  */
 function planet_formatTimestamp($time, $format = "")
 {
-	if(empty($time)) return "";
+	if(empty($time)) {
+		return "";
+	}
 	return formatTimestamp($time, $format);
 }
 
@@ -172,7 +180,9 @@ 
  */
 function &planet_getUnameFromId( $userid, $usereal = 0, $linked = false )
 {
-	if(!is_array($userid))  $userid = array($userid);
+	if(!is_array($userid)) {
+		$userid = array($userid);
+	}
 	$users = mod_getUnameFromIds($userid, $usereal, $linked);
 
     return $users;
@@ -191,9 +201,13 @@ 
 	$myts =& MyTextSanitizer::getInstance();
 	$link_array = preg_split("/(\r\n|\r|\n)( *)/", $text);
     $links = array();
-    if(count($link_array)>0) foreach($link_array as $link){
+    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($url)) {
+	    	continue;
+	    }
 	    //if(empty($title)) $title = $url;
 	    $links[] = array("url"=>$url, "title"=>$myts->htmlSpecialChars($title));
     }
@@ -220,7 +234,9 @@ 
 {
 	$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;
+	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);
@@ -271,7 +287,7 @@ 
 		if($fp = fopen($debug_file, "a")){
 			fwrite($fp, $fr);
 			fclose($fp);
-		}else{
+		} else{
 		}
 	}
 	@fclose($fs);
@@ -301,9 +317,11 @@ 
 	$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
+	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
@@ -350,8 +368,10 @@ 
 	if($isArray) {
 		$_value = ($value)?explode(",", $value):array();
 		$value = array();
-		if(count($_value)>0) foreach($_value as $string){
+		if(count($_value)>0) {
+			foreach($_value as $string){
 			$key = substr($string, 0, strpos($string,"|"));
+		}
 			$val = substr($string, (strpos($string,"|")+1));
 			$value[$key] = $val;
 		}
@@ -379,9 +399,15 @@ 
 
 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;
+    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;
 }
 
@@ -398,7 +424,9 @@ 
 
 function planet_fetch_CURL($url)
 {
-    if (!function_exists('curl_init') ) return false;
+    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);
@@ -412,7 +440,9 @@ 
 
 function planet_fetch_fopen($url)
 {
-	if(!$fp = @fopen ($url, 'r')) return false;
+	if(!$fp = @fopen ($url, 'r')) {
+		return false;
+	}
     $data = "";
     while (!feof($fp)) {
         $data .= fgets ($fp, 1024);

index.php

Switch Indentation +12 added lines, -12 removed lines

@@ -165,18 +165,18 @@
 
 $tags = empty($list)?"":array($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)){

Spacing +72 added lines, -72 removed lines

@@ -26,46 +26,46 @@ 
 // ------------------------------------------------------------------------ //
 include "header.php";
 
-if(preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)){
+if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) {
 	include XOOPS_ROOT_PATH.'/include/notification_update.php';
 	exit();
 }
 
-if($REQUEST_URI_parsed = planet_parse_args($args_num, $args, $args_str)){
+if ($REQUEST_URI_parsed = planet_parse_args($args_num, $args, $args_str)) {
 	$args["start"] = @$args_num[0];
 	$args["sort"] = @$args_str[0];
 }
 
 /* Start */
-$start = intval( empty($_GET["start"])?@$args["start"]:$_GET["start"] );
+$start = intval(empty($_GET["start"]) ? @$args["start"] : $_GET["start"]);
 /* Specified Category */
-$category_id = intval( empty($_GET["category"])?@$args["category"]:$_GET["category"] );
+$category_id = intval(empty($_GET["category"]) ? @$args["category"] : $_GET["category"]);
 /* Specified Blog */
-$blog_id = intval( empty($_GET["blog"])?@$args["blog"]:$_GET["blog"] );
+$blog_id = intval(empty($_GET["blog"]) ? @$args["blog"] : $_GET["blog"]);
 /* Specified Bookmar(Favorite) UID */
-$uid = intval( empty($_GET["uid"])?@$args["uid"]:$_GET["uid"] );
+$uid = intval(empty($_GET["uid"]) ? @$args["uid"] : $_GET["uid"]);
 /* Sort by term */
-$sort = empty($_GET["sort"])?@$args["sort"]:$_GET["sort"];
+$sort = empty($_GET["sort"]) ? @$args["sort"] : $_GET["sort"];
 /* Display as list */
-$list = intval( empty($_GET["list"])?@$args["list"]:$_GET["list"] );
+$list = intval(empty($_GET["list"]) ? @$args["list"] : $_GET["list"]);
 
 // restore $_SERVER['REQUEST_URI']
-if(!empty($REQUEST_URI_parsed)){
+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};
+	$_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($blog_id)) {
+		$args_REQUEST_URI[] = "blog=".$blog_id;
 	}
-	if(!empty($category_id)){
-		$args_REQUEST_URI[] = "category=". $category_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));
+		(empty($args_REQUEST_URI) ? "" : "?".implode("&", $args_REQUEST_URI));
 }
 
 $xoopsOption["template_main"] = planet_getTemplate("index");
@@ -76,20 +76,20 @@ 
 	';
 
 $xoopsOption["xoops_module_header"] = $xoops_module_header;
-include_once( XOOPS_ROOT_PATH . "/header.php" );
+include_once(XOOPS_ROOT_PATH."/header.php");
 include XOOPS_ROOT_PATH."/modules/".$xoopsModule->getVar("dirname")."/include/vars.php";
 
 // Following part will not be executed after cache
-$category_handler =& xoops_getmodulehandler("category", $GLOBALS["moddirname"]);
-$blog_handler =& xoops_getmodulehandler("blog", $GLOBALS["moddirname"]);
-$article_handler =& xoops_getmodulehandler("article", $GLOBALS["moddirname"]);
+$category_handler = & xoops_getmodulehandler("category", $GLOBALS["moddirname"]);
+$blog_handler = & xoops_getmodulehandler("blog", $GLOBALS["moddirname"]);
+$article_handler = & xoops_getmodulehandler("article", $GLOBALS["moddirname"]);
 
-$limit = empty($list)? $xoopsModuleConfig["articles_perpage"] : $xoopsModuleConfig["list_perpage"];
+$limit = empty($list) ? $xoopsModuleConfig["articles_perpage"] : $xoopsModuleConfig["list_perpage"];
 $query_type = "";
 $criteria = new CriteriaCompo();
 $article_prefix = "";
 /* Specific category */
-if($category_id >0){
+if ($category_id>0) {
 	$category_obj = $category_handler->get($category_id);
 	$criteria->add(new Criteria("bc.cat_id", $category_id));
 	$uid = 0;
@@ -99,15 +99,15 @@ 
 	$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"))
-		){
+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"]);
+		$bookmark_handler = & xoops_getmodulehandler("bookmark", $GLOBALS["moddirname"]);
 		$blog_data = array(
 			"id"=>$blog_id,
 			"title"=>$blog_obj->getVar("blog_title"),
@@ -126,11 +126,11 @@ 
 	$article_prefix = "";
 }
 /* User bookmarks(favorites) */
-if($uid >0){
+if ($uid>0) {
 	$criteria->add(new Criteria("bm.bm_uid", $uid));
 	$category_id = 0;
 	$blog_id = 0;
-	$bookmark_handler =& xoops_getmodulehandler("bookmark", $GLOBALS["moddirname"]);
+	$bookmark_handler = & xoops_getmodulehandler("bookmark", $GLOBALS["moddirname"]);
 	$user_data = array(
 		"uid"=>$uid, 
 		"name"=>XoopsUser::getUnameFromID($uid),
@@ -142,8 +142,8 @@ 
 
 /* Sort */
 $order = "DESC";
-$sort = empty($sort)?"time":$sort;
-switch($sort){
+$sort = empty($sort) ? "time" : $sort;
+switch ($sort) {
 	case "views":
 		$sortby = $article_prefix."art_views";
 		break;
@@ -163,25 +163,25 @@ 
 $criteria->setStart($start);
 $criteria->setLimit($limit);
 
-$tags = empty($list)?"":array($article_prefix."art_title", $article_prefix."blog_id", $article_prefix."art_time");
-switch($query_type){
+$tags = empty($list) ? "" : array($article_prefix."art_title", $article_prefix."blog_id", $article_prefix."art_time");
+switch ($query_type) {
 case "category":
-	$articles_obj =& $article_handler->getByCategory($criteria, $tags);
+	$articles_obj = & $article_handler->getByCategory($criteria, $tags);
 	$count_article = $article_handler->getCountByCategory($criteria);
 	break;
 case "bookmark":
-	$articles_obj =& $article_handler->getByBookmark($criteria, $tags);
+	$articles_obj = & $article_handler->getByBookmark($criteria, $tags);
 	$count_article = $article_handler->getCountByBookmark($criteria);
 	break;
 default:
-	$articles_obj =& $article_handler->getAll($criteria, $tags);
+	$articles_obj = & $article_handler->getAll($criteria, $tags);
 	$count_article = $article_handler->getCount($criteria);
 	break;
 }
 
-if(!empty($blog_data)){
+if (!empty($blog_data)) {
 	$blogs[$blog_data["id"]] = $blog_data["title"];
-}else{
+}else {
 	$blog_array = array();
 	foreach (array_keys($articles_obj) as $id) {
 		$blog_array[$articles_obj[$id]->getVar("blog_id")] = 1;
@@ -199,7 +199,7 @@ 
 		"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)){
+	if (empty($list)) {
 		$_article = array_merge($_article, array(
 			"author" => $articles_obj[$id]->getVar("art_author"),
 			"views"=> $articles_obj[$id]->getVar("art_views"),
@@ -208,9 +208,9 @@ 
 			"rates"=> $articles_obj[$id]->getVar("art_rates")
 			)
 		);
-		if(!empty($xoopsModuleConfig["display_summary"])){
+		if (!empty($xoopsModuleConfig["display_summary"])) {
 			$_article["content"] = $articles_obj[$id]->getSummary();
-		}else{
+		}else {
 			$_article["content"] = $articles_obj[$id]->getVar("art_content");
 		}
 	}
@@ -219,46 +219,46 @@ 
 }
 unset($articles_obj);
 
-if ( $count_article > $limit) {
+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;
+	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("&", $start_link));
 	$pagenav = $nav->renderNav(4);
-} else {
+}else {
 	$pagenav = "";
 }
 
-$xoopsTpl -> assign("xoops_module_header", $xoops_module_header );
-$xoopsTpl -> assign("dirname", $GLOBALS["moddirname"] );
+$xoopsTpl -> assign("xoops_module_header", $xoops_module_header);
+$xoopsTpl -> assign("dirname", $GLOBALS["moddirname"]);
 
-if($category_id || $blog_id || $uid){
+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>");
 }
 
 $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).
+	(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)){
+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>");
 }
 
-if($xoopsModuleConfig["newblog_submit"]==1 || is_object($xoopsUser)){
+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>");
 }
 
@@ -270,21 +270,21 @@ 
 $xoopsTpl -> assign("pagenav", $pagenav);
 $xoopsTpl -> assign("is_list", !empty($list));
 
-$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("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);
 }
 
 $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");
+	(empty($category_id) ? "" : "/c".$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"));
 $sortlinks = array();
-foreach($valid_sorts as $val=>$name){
-	if($val == $sort) continue;
+foreach ($valid_sorts as $val=>$name) {
+	if ($val == $sort) continue;
 	$sortlinks[] = "<a href=\"".$sort_link."/".$val."\">".$name."</a>";
 }
 $xoopsTpl -> assign("link_sort", implode(" | ", $sortlinks));
@@ -293,7 +293,7 @@ 
 $xoopsTpl->assign('do_pseudocron', $xoopsModuleConfig["do_pseudocron"]);
 
 // for notification
-if(!empty($blog_id)){
+if (!empty($blog_id)) {
 	//$_SERVER['REQUEST_URI'] = XOOPS_URL."/modules/".$GLOBALS["moddirname"]."/index.php";
 	$_GET["blog"] = $blog_id;
 }

Braces +18 added lines, -8 removed lines

@@ -181,7 +181,7 @@ 
 
 if(!empty($blog_data)){
 	$blogs[$blog_data["id"]] = $blog_data["title"];
-}else{
+} else{
 	$blog_array = array();
 	foreach (array_keys($articles_obj) as $id) {
 		$blog_array[$articles_obj[$id]->getVar("blog_id")] = 1;
@@ -210,7 +210,7 @@ 
 		);
 		if(!empty($xoopsModuleConfig["display_summary"])){
 			$_article["content"] = $articles_obj[$id]->getSummary();
-		}else{
+		} else{
 			$_article["content"] = $articles_obj[$id]->getVar("art_content");
 		}
 	}
@@ -222,10 +222,18 @@ 
 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;
+	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("&", $start_link));
 	$pagenav = $nav->renderNav(4);
 } else {
@@ -272,7 +280,7 @@ 
 
 $xoopsTpl -> assign("user_level", !is_object($xoopsUser)?0:($xoopsUser->isAdmin()?2:1));
 if(empty($xoopsModuleConfig["anonymous_rate"]) && !is_object($xoopsUser)){
-}elseif($blog_id>0){
+} elseif($blog_id>0){
 	$xoopsTpl -> assign("canrate", 1);
 }
 
@@ -284,7 +292,9 @@ 
 $valid_sorts = array("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;
+	if($val == $sort) {
+		continue;
+	}
 	$sortlinks[] = "<a href=\"".$sort_link."/".$val."\">".$name."</a>";
 }
 $xoopsTpl -> assign("link_sort", implode(" | ", $sortlinks));