mambax7 / planet

class/bookmark.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
  */
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
-require_once __DIR__ . '/../include/vars.php';
+require_once __DIR__.'/../include/vars.php';
 //mod_loadFunctions('', $GLOBALS['moddirname']);
 
 /**

class/magpie.inc.php

Indentation +549 added lines, -549 removed lines

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

Spacing +32 added lines, -32 removed lines

@@ -35,16 +35,16 @@ 
 {
     public $parser;
 
-    public $current_item = [];  // item currently being parsed
-    public $items        = [];  // collection of parsed items
-    public $channel      = [];  // hash of channel fields
+    public $current_item = []; // item currently being parsed
+    public $items        = []; // collection of parsed items
+    public $channel      = []; // hash of channel fields
     public $textinput    = [];
     public $image        = [];
     public $feed_type;
     public $feed_version;
-    public $encoding     = '';       // output encoding of parsed rss
+    public $encoding     = ''; // output encoding of parsed rss
 
-    public $_source_encoding = '';     // only set if we have to parse xml prolog
+    public $_source_encoding = ''; // only set if we have to parse xml prolog
 
     public $ERROR   = '';
     public $WARNING = '';
@@ -101,13 +101,13 @@ 
         # 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);
+            $this->error("Failed to load PHP's XML Extension. ".'http://www.php.net/manual/en/ref.xml.php', E_USER_ERROR);
         }
 
         list($parser, $source) = $this->create_parser($source, $output_encoding, $input_encoding, $detect_encoding);
 
         if (!is_resource($parser)) {
-            $this->error("Failed to create an instance of PHP's XML parser. " . 'http://www.php.net/manual/en/ref.xml.php', E_USER_ERROR);
+            $this->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;
@@ -217,8 +217,8 @@ 
         elseif ($this->feed_type == ATOM && $el === 'link') {
             if (isset($attrs['rel']) && $attrs['rel'] === 'alternate') {
                 $link_el = 'link';
-            } else {
-                $link_el = 'link_' . $attrs['rel'];
+            }else {
+                $link_el = 'link_'.$attrs['rel'];
             }
 
             $this->append($link_el, $attrs['href']);
@@ -236,7 +236,7 @@ 
     {
         if ($this->feed_type == ATOM && $this->incontent) {
             $this->append_content($text);
-        } else {
+        }else {
             $current_el = implode('_', array_reverse($this->stack));
             $this->append($current_el, $text);
         }
@@ -267,12 +267,12 @@ 
             // 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);
         }
 
@@ -324,7 +324,7 @@ 
             } 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) {
@@ -342,7 +342,7 @@ 
         // if atom populate rss fields
         if ($this->is_atom()) {
             $this->channel['description'] = $this->channel['tagline'];
-            for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+            for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
                 $item = $this->items[$i];
                 if (isset($item['summary'])) {
                     $item['description'] = $item['summary'];
@@ -354,7 +354,7 @@ 
                 $atom_date = isset($item['issued']) ? $item['issued'] : @$item['modified'];
                 if ($atom_date) {
                     $epoch = @parse_w3cdtf($atom_date);
-                    if ($epoch && $epoch > 0) {
+                    if ($epoch && $epoch>0) {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
@@ -363,7 +363,7 @@ 
             }
         } elseif ($this->is_rss()) {
             $this->channel['tagline'] = $this->channel['description'];
-            for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+            for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
                 $item = $this->items[$i];
                 if (isset($item['description'])) {
                     $item['summary'] = $item['description'];
@@ -374,12 +374,12 @@ 
 
                 if ($this->is_rss() === '1.0' && isset($item['dc']['date'])) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
-                    if ($epoch && $epoch > 0) {
+                    if ($epoch && $epoch>0) {
                         $item['date_timestamp'] = $epoch;
                     }
                 } elseif (isset($item['pubdate'])) {
                     $epoch = @strtotime($item['pubdate']);
-                    if ($epoch > 0) {
+                    if ($epoch>0) {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
@@ -396,7 +396,7 @@ 
     {
         if ($this->feed_type == RSS) {
             return $this->feed_version;
-        } else {
+        }else {
             return false;
         }
     }
@@ -408,7 +408,7 @@ 
     {
         if ($this->feed_type == ATOM) {
             return $this->feed_version;
-        } else {
+        }else {
             return false;
         }
     }
@@ -425,7 +425,7 @@ 
     {
         if (substr(PHP_VERSION, 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) {
@@ -452,7 +452,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('');
         }
     }
@@ -485,7 +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';
             }
         }
@@ -535,7 +535,7 @@ 
         $enc = strtoupper($enc);
         if (in_array($enc, $this->_KNOWN_ENCODINGS)) {
             return $enc;
-        } else {
+        }else {
             return false;
         }
     }
@@ -552,14 +552,14 @@ 
         }
         if (MAGPIE_DEBUG) {
             trigger_error($errormsg, $lvl);
-        } else {
+        }else {
             error_log($errormsg, 0);
         }
 
         $notices = E_USER_NOTICE | E_NOTICE;
         if ($lvl & $notices) {
             $this->WARNING = $errormsg;
-        } else {
+        }else {
             $this->ERROR = $errormsg;
         }
     }
@@ -595,12 +595,12 @@ 
         ];
 
         # calc epoch for current date assuming GMT
-        $epoch = gmmktime((int)$hours, (int)$minutes, (int)$seconds, (int)$month, (int)$day, (int)$year);
+        $epoch = gmmktime((int) $hours, (int) $minutes, (int) $seconds, (int) $month, (int) $day, (int) $year);
 
         $offset = 0;
         if ($match[10] === 'Z') {
             # zulu time, aka GMT
-        } else {
+        }else {
             list($tz_mod, $tz_hour, $tz_min) = [$match[8], $match[9], $match[10]];
 
             # zero out the variables
@@ -611,20 +611,20 @@ 
                 $tz_min = 0;
             }
 
-            $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
+            $offset_secs = (($tz_hour*60)+$tz_min)*60;
 
             # is timezone ahead of GMT?  then subtract offset
             #
             if ($tz_mod == '+') {
-                $offset_secs = $offset_secs * -1;
+                $offset_secs = $offset_secs*-1;
             }
 
             $offset = $offset_secs;
         }
-        $epoch = $epoch + $offset;
+        $epoch = $epoch+$offset;
 
         return $epoch;
-    } else {
+    }else {
         return -1;
     }
 }

class/xmlparser.php

Indentation +155 added lines, -155 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
  */
 global $msg;
 
-require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class/magpie.inc.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/class/magpie.inc.php';
 
 /**
  * XmlParser
@@ -92,7 +92,7 @@ 
             $this->feed_version = empty($this->feed_version) ? '0.3' : $this->feed_version;
 
             return $this->feed_version;
-        } else {
+        }else {
             return false;
         }
     }
@@ -105,7 +105,7 @@ 
                 $this->channel['tagline'] = @$this->channel['subtitle'];
                 unset($this->channel['subtitle']);
             }
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
             // ATOM time
             if ($date = @$this->items[$i]['modified']) {
                 continue;
@@ -124,7 +124,7 @@ 
             }
             $this->items[$i]['modified'] = $date;
         } elseif ($this->is_rss() !== '1.0'):
-            for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+            for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
                 if ($date = @$this->items[$i]['pubdate']) {
                     continue;
                 }
@@ -150,7 +150,7 @@ 
             unset($this->channel['tagline']);
         }
 
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
             if ($date_timestamp = @$this->items[$i]['date_timestamp']) {
                 continue;
             }
@@ -158,7 +158,7 @@ 
                 $this->items[$i]['date_timestamp'] = $date_timestamp;
             } 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'])) {
@@ -204,7 +204,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);
         }
 

class/feedcreator.class.php

Indentation +1254 added lines, -1254 removed lines

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

Spacing +170 added lines, -170 removed lines

@@ -342,11 +342,11 @@ 
         if (!$this->rawFieldContent) {
             $result = '';
         } elseif ($this->syndicateHtml) {
-            $result = '<![CDATA[' . $this->rawFieldContent . ']]>';
-        } else {
+            $result = '<![CDATA['.$this->rawFieldContent.']]>';
+        }else {
             if ($this->truncSize && is_int($this->truncSize)) {
                 $result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent), $this->truncSize);
-            } else {
+            }else {
                 $result = htmlspecialchars($this->rawFieldContent);
             }
         }
@@ -589,29 +589,29 @@ 
      */
     public function iTrunc($string, $length)
     {
-        if (strlen($string) <= $length) {
+        if (strlen($string)<=$length) {
             return $string;
         }
 
         $pos = strrpos($string, '.');
-        if ($pos >= $length - 4) {
-            $string = substr($string, 0, $length - 4);
+        if ($pos>=$length-4) {
+            $string = substr($string, 0, $length-4);
             $pos    = strrpos($string, '.');
         }
-        if ($pos >= $length * 0.4) {
-            return substr($string, 0, $pos + 1) . ' ...';
+        if ($pos>=$length*0.4) {
+            return substr($string, 0, $pos+1).' ...';
         }
 
         $pos = strrpos($string, ' ');
-        if ($pos >= $length - 4) {
-            $string = substr($string, 0, $length - 4);
+        if ($pos>=$length-4) {
+            $string = substr($string, 0, $length-4);
             $pos    = strrpos($string, ' ');
         }
-        if ($pos >= $length * 0.4) {
-            return substr($string, 0, $pos) . ' ...';
+        if ($pos>=$length*0.4) {
+            return substr($string, 0, $pos).' ...';
         }
 
-        return substr($string, 0, $length - 4) . ' ...';
+        return substr($string, 0, $length-4).' ...';
     }
 
     /**
@@ -621,7 +621,7 @@ 
      */
     public function _createGeneratorComment()
     {
-        return "<!-- generator=\"" . FEEDCREATOR_VERSION . "\" -->\n";
+        return "<!-- generator=\"".FEEDCREATOR_VERSION."\" -->\n";
     }
 
     /**
@@ -638,7 +638,7 @@ 
         $ae = '';
         if (is_array($elements)) {
             foreach ($elements as $key => $value) {
-                $ae .= $indentString . "<$key>$value</$key>\n";
+                $ae .= $indentString."<$key>$value</$key>\n";
             }
         }
 
@@ -652,10 +652,10 @@ 
     {
         $xml = '';
         if ($this->cssStyleSheet) {
-            $xml .= "<?xml-stylesheet href=\"" . $this->cssStyleSheet . "\" type=\"text/css\"?>\n";
+            $xml .= "<?xml-stylesheet href=\"".$this->cssStyleSheet."\" type=\"text/css\"?>\n";
         }
         if ($this->xslStyleSheet) {
-            $xml .= "<?xml-stylesheet href=\"" . $this->xslStyleSheet . "\" type=\"text/xsl\"?>\n";
+            $xml .= "<?xml-stylesheet href=\"".$this->xslStyleSheet."\" type=\"text/xsl\"?>\n";
         }
 
         return $xml;
@@ -690,7 +690,7 @@ 
     {
         $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';
     }
 
     /**
@@ -713,8 +713,8 @@ 
         // HTTP redirect, some feed readers' simple HTTP implementations don't follow it
         //Header("Location: ".$filename);
 
-        header('Content-Type: ' . $this->contentType . '; charset=' . $this->encoding . '; filename=' . basename($filename));
-        header('Content-Disposition: inline; filename=' . basename($filename));
+        header('Content-Type: '.$this->contentType.'; charset='.$this->encoding.'; filename='.basename($filename));
+        header('Content-Disposition: inline; filename='.basename($filename));
         readfile($filename, 'r');
         die();
     }
@@ -736,7 +736,7 @@ 
         if ($filename == '') {
             $filename = $this->_generateFilename();
         }
-        if (file_exists($filename) && (time() - filemtime($filename) < $timeout)) {
+        if (file_exists($filename) && (time()-filemtime($filename)<$timeout)) {
             $this->_redirect($filename);
         }
     }
@@ -762,7 +762,7 @@ 
             if ($displayContents) {
                 $this->_redirect($filename);
             }
-        } else {
+        }else {
             echo '<br><b>Error creating feed file, please check write permissions.</b><br>';
         }
     }
@@ -795,7 +795,7 @@ 
             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     = [
+            $months = [
                 'Jan' => 1,
                 'Feb' => 2,
                 'Mar' => 3,
@@ -811,15 +811,15 @@ 
             ];
             $this->unix = mktime($matches[4], $matches[5], $matches[6], $months[$matches[2]], $matches[1], $matches[3]);
             if (substr($matches[7], 0, 1) == '+' || substr($matches[7], 0, 1) == '-') {
-                $tzOffset = (substr($matches[7], 0, 3) * 60 + substr($matches[7], -2)) * 60;
-            } else {
+                $tzOffset = (substr($matches[7], 0, 3)*60+substr($matches[7], -2))*60;
+            }else {
                 if (strlen($matches[7]) == 1) {
                     $oneHour = 3600;
                     $ord     = ord($matches[7]);
-                    if ($ord < ord('M')) {
-                        $tzOffset = (ord('A') - $ord - 1) * $oneHour;
-                    } elseif ($ord >= ord('M') && $matches[7] !== 'Z') {
-                        $tzOffset = ($ord - ord('M')) * $oneHour;
+                    if ($ord<ord('M')) {
+                        $tzOffset = (ord('A')-$ord-1)*$oneHour;
+                    } elseif ($ord>=ord('M') && $matches[7] !== 'Z') {
+                        $tzOffset = ($ord-ord('M'))*$oneHour;
                     } elseif ($matches[7] === 'Z') {
                         $tzOffset = 0;
                     }
@@ -837,8 +837,8 @@ 
         if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~", $dateString, $matches)) {
             $this->unix = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
             if (substr($matches[7], 0, 1) == '+' || substr($matches[7], 0, 1) == '-') {
-                $tzOffset = (substr($matches[7], 0, 3) * 60 + substr($matches[7], -2)) * 60;
-            } else {
+                $tzOffset = (substr($matches[7], 0, 3)*60+substr($matches[7], -2))*60;
+            }else {
                 if ($matches[7] === 'Z') {
                     $tzOffset = 0;
                 }
@@ -860,7 +860,7 @@ 
         //return gmdate("r",$this->unix);
         $date = gmdate('D, d M Y H:i:s', $this->unix);
         if (TIME_ZONE != '') {
-            $date .= ' ' . str_replace(':', '', TIME_ZONE);
+            $date .= ' '.str_replace(':', '', TIME_ZONE);
         }
 
         return $date;
@@ -874,7 +874,7 @@ 
     public function iso8601()
     {
         $date = gmdate("Y-m-d\TH:i:sO", $this->unix);
-        $date = substr($date, 0, 22) . ':' . substr($date, -2);
+        $date = substr($date, 0, 22).':'.substr($date, -2);
         if (TIME_ZONE != '') {
             $date = str_replace('+00:00', TIME_ZONE, $date);
         }
@@ -909,7 +909,7 @@ 
      */
     public function createFeed()
     {
-        $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+        $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
         $feed .= $this->_createGeneratorComment();
         if ($this->cssStyleSheet == '') {
             $cssStyleSheet = 'http://www.w3.org/2000/08/w3c-synd/style.css';
@@ -920,49 +920,49 @@ 
         $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";
+        $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 .= "        <image rdf:resource=\"".$this->image->url."\">\n";
         }
-        $now  = new FeedDate();
-        $feed .= '       <dc:date>' . htmlspecialchars($now->iso8601()) . "</dc:date>\n";
+        $now = new FeedDate();
+        $feed .= '       <dc:date>'.htmlspecialchars($now->iso8601())."</dc:date>\n";
         $feed .= "        <items>\n";
         $feed .= "            <rdf:Seq>\n";
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            $feed .= "                <rdf:li rdf:resource=\"" . htmlspecialchars($this->items[$i]->link) . "\">\n";
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
+            $feed .= "                <rdf:li rdf:resource=\"".htmlspecialchars($this->items[$i]->link)."\">\n";
         }
         $feed .= "            </rdf:Seq>\n";
         $feed .= "        </items>\n";
         $feed .= "    </channel>\n";
         if ($this->image != null) {
-            $feed .= "    <image rdf:about=\"" . $this->image->url . "\">\n";
-            $feed .= '        <title>' . $this->image->title . "</title>\n";
-            $feed .= '        <link>' . $this->image->link . "</link>\n";
-            $feed .= '        <url>' . $this->image->url . "</url>\n";
+            $feed .= "    <image rdf:about=\"".$this->image->url."\">\n";
+            $feed .= '        <title>'.$this->image->title."</title>\n";
+            $feed .= '        <link>'.$this->image->link."</link>\n";
+            $feed .= '        <url>'.$this->image->url."</url>\n";
             $feed .= "    </image>\n";
         }
         $feed .= $this->_createAdditionalElements($this->additionalElements, '    ');
 
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            $feed .= "    <item rdf:about=\"" . htmlspecialchars($this->items[$i]->link) . "\">\n";
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
+            $feed .= "    <item rdf:about=\"".htmlspecialchars($this->items[$i]->link)."\">\n";
             //$feed.= "        <dc:type>Posting</dc:type>\n";
             $feed .= "        <dc:format>text/html</dc:format>\n";
             if ($this->items[$i]->date != null) {
                 $itemDate = new FeedDate($this->items[$i]->date);
-                $feed     .= '        <dc:date>' . htmlspecialchars($itemDate->iso8601()) . "</dc:date>\n";
+                $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";
+                $feed .= '        <dc:source>'.htmlspecialchars($this->items[$i]->source)."</dc:source>\n";
             }
             if ($this->items[$i]->author != '') {
-                $feed .= '        <dc:creator>' . htmlspecialchars($this->items[$i]->author) . "</dc:creator>\n";
+                $feed .= '        <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 .= '        <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";
         }
@@ -1013,79 +1013,79 @@ 
      */
     public function createFeed()
     {
-        $feed                       = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+        $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
         $feed                       .= $this->_createGeneratorComment();
         $feed                       .= $this->_createStylesheetReferences();
-        $feed                       .= "<rss version=\"" . $this->RSSVersion . "\">\n";
+        $feed                       .= "<rss version=\"".$this->RSSVersion."\">\n";
         $feed                       .= "    <channel>\n";
-        $feed                       .= '        <title>' . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . "</title>\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";
+        $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";
+            $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 .= '            <width>'.$this->image->width."</width>\n";
             }
             if ($this->image->height != '') {
-                $feed .= '            <height>' . $this->image->height . "</height>\n";
+                $feed .= '            <height>'.$this->image->height."</height>\n";
             }
             if ($this->image->description != '') {
-                $feed .= '            <description>' . $this->image->getDescription() . "</description>\n";
+                $feed .= '            <description>'.$this->image->getDescription()."</description>\n";
             }
             $feed .= "        </image>\n";
         }
         if ($this->language != '') {
-            $feed .= '        <language>' . $this->language . "</language>\n";
+            $feed .= '        <language>'.$this->language."</language>\n";
         }
         if ($this->copyright != '') {
-            $feed .= '        <copyright>' . FeedCreator::iTrunc(htmlspecialchars($this->copyright), 100) . "</copyright>\n";
+            $feed .= '        <copyright>'.FeedCreator::iTrunc(htmlspecialchars($this->copyright), 100)."</copyright>\n";
         }
         if ($this->editor != '') {
-            $feed .= '        <managingEditor>' . FeedCreator::iTrunc(htmlspecialchars($this->editor), 100) . "</managingEditor>\n";
+            $feed .= '        <managingEditor>'.FeedCreator::iTrunc(htmlspecialchars($this->editor), 100)."</managingEditor>\n";
         }
         if ($this->webmaster != '') {
-            $feed .= '        <webMaster>' . FeedCreator::iTrunc(htmlspecialchars($this->webmaster), 100) . "</webMaster>\n";
+            $feed .= '        <webMaster>'.FeedCreator::iTrunc(htmlspecialchars($this->webmaster), 100)."</webMaster>\n";
         }
         if ($this->pubDate != '') {
             $pubDate = new FeedDate($this->pubDate);
-            $feed    .= '        <pubDate>' . htmlspecialchars($pubDate->rfc822()) . "</pubDate>\n";
+            $feed .= '        <pubDate>'.htmlspecialchars($pubDate->rfc822())."</pubDate>\n";
         }
         if ($this->category != '') {
-            $feed .= '        <category>' . htmlspecialchars($this->category) . "</category>\n";
+            $feed .= '        <category>'.htmlspecialchars($this->category)."</category>\n";
         }
         if ($this->docs != '') {
-            $feed .= '        <docs>' . FeedCreator::iTrunc(htmlspecialchars($this->docs), 500) . "</docs>\n";
+            $feed .= '        <docs>'.FeedCreator::iTrunc(htmlspecialchars($this->docs), 500)."</docs>\n";
         }
         if ($this->ttl != '') {
-            $feed .= '        <ttl>' . htmlspecialchars($this->ttl) . "</ttl>\n";
+            $feed .= '        <ttl>'.htmlspecialchars($this->ttl)."</ttl>\n";
         }
         if ($this->rating != '') {
-            $feed .= '        <rating>' . FeedCreator::iTrunc(htmlspecialchars($this->rating), 500) . "</rating>\n";
+            $feed .= '        <rating>'.FeedCreator::iTrunc(htmlspecialchars($this->rating), 500)."</rating>\n";
         }
         if ($this->skipHours != '') {
-            $feed .= '        <skipHours>' . htmlspecialchars($this->skipHours) . "</skipHours>\n";
+            $feed .= '        <skipHours>'.htmlspecialchars($this->skipHours)."</skipHours>\n";
         }
         if ($this->skipDays != '') {
-            $feed .= '        <skipDays>' . htmlspecialchars($this->skipDays) . "</skipDays>\n";
+            $feed .= '        <skipDays>'.htmlspecialchars($this->skipDays)."</skipDays>\n";
         }
         $feed .= $this->_createAdditionalElements($this->additionalElements, '    ');
 
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
             $feed .= "        <item>\n";
-            $feed .= '            <title>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100) . "</title>\n";
-            $feed .= '            <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n";
-            $feed .= '            <description>' . $this->items[$i]->getDescription() . "</description>\n";
+            $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";
+                $feed .= '            <author>'.htmlspecialchars($this->items[$i]->author)."</author>\n";
             }
             /*
             // on hold
@@ -1094,17 +1094,17 @@ 
             }
             */
             if ($this->items[$i]->category != '') {
-                $feed .= '            <category>' . htmlspecialchars($this->items[$i]->category) . "</category>\n";
+                $feed .= '            <category>'.htmlspecialchars($this->items[$i]->category)."</category>\n";
             }
             if ($this->items[$i]->comments != '') {
-                $feed .= '            <comments>' . htmlspecialchars($this->items[$i]->comments) . "</comments>\n";
+                $feed .= '            <comments>'.htmlspecialchars($this->items[$i]->comments)."</comments>\n";
             }
             if ($this->items[$i]->date != '') {
                 $itemDate = new FeedDate($this->items[$i]->date);
-                $feed     .= '            <pubDate>' . htmlspecialchars($itemDate->rfc822()) . "</pubDate>\n";
+                $feed .= '            <pubDate>'.htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
             }
             if ($this->items[$i]->guid != '') {
-                $feed .= '            <guid>' . htmlspecialchars($this->items[$i]->guid) . "</guid>\n";
+                $feed .= '            <guid>'.htmlspecialchars($this->items[$i]->guid)."</guid>\n";
             }
             $feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, '        ');
             $feed .= "        </item>\n";
@@ -1157,32 +1157,32 @@ 
      */
     public function createFeed()
     {
-        $feed            = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+        $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            .= '    <title>'.FeedCreator::iTrunc(htmlspecialchars($this->title), 100)."</title>\n";
         $this->truncSize = 500;
-        $feed            .= '    <subtitle>' . $this->getDescription() . "</subtitle>\n";
-        $feed            .= '    <link>' . $this->link . "</link>\n";
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+        $feed            .= '    <subtitle>'.$this->getDescription()."</subtitle>\n";
+        $feed            .= '    <link>'.$this->link."</link>\n";
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
             $feed     .= "    <entry>\n";
-            $feed     .= '        <title>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100) . "</title>\n";
-            $feed     .= '        <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n";
+            $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";
+            $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";
+                $feed .= '            <name>'.htmlspecialchars($this->items[$i]->author)."</name>\n";
                 if ($this->items[$i]->authorEmail != '') {
-                    $feed .= '            <email>' . $this->items[$i]->authorEmail . "</email>\n";
+                    $feed .= '            <email>'.$this->items[$i]->authorEmail."</email>\n";
                 }
                 $feed .= "        </author>\n";
             }
             $feed .= "        <content type=\"text/html\" xml:lang=\"en-us\">\n";
-            $feed .= "            <div xmlns=\"http://www.w3.org/1999/xhtml\">" . $this->items[$i]->getDescription() . "</div>\n";
+            $feed .= "            <div xmlns=\"http://www.w3.org/1999/xhtml\">".$this->items[$i]->getDescription()."</div>\n";
             $feed .= "        </content>\n";
             $feed .= "    </entry>\n";
         }
@@ -1224,50 +1224,50 @@ 
      */
     public function createFeed()
     {
-        $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+        $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 .= " xml:lang=\"".$this->language."\"";
         }
         $feed .= ">\n";
-        $feed .= '    <title>' . htmlspecialchars($this->title) . "</title>\n";
-        $feed .= '    <tagline>' . htmlspecialchars($this->description) . "</tagline>\n";
-        $feed .= "    <link rel=\"alternate\" type=\"text/html\" href=\"" . htmlspecialchars($this->link) . "\">\n";
-        $feed .= '    <id>' . htmlspecialchars($this->link) . "</id>\n";
-        $now  = new FeedDate();
-        $feed .= '    <modified>' . htmlspecialchars($now->iso8601()) . "</modified>\n";
+        $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";
+            $feed .= '        <name>'.$this->editor."</name>\n";
             if ($this->editorEmail != '') {
-                $feed .= '        <email>' . $this->editorEmail . "</email>\n";
+                $feed .= '        <email>'.$this->editorEmail."</email>\n";
             }
             $feed .= "    </author>\n";
         }
-        $feed .= '    <generator>' . FEEDCREATOR_VERSION . "</generator>\n";
+        $feed .= '    <generator>'.FEEDCREATOR_VERSION."</generator>\n";
         $feed .= $this->_createAdditionalElements($this->additionalElements, '    ');
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
             $feed .= "    <entry>\n";
-            $feed .= '        <title>' . htmlspecialchars(strip_tags($this->items[$i]->title)) . "</title>\n";
-            $feed .= "        <link rel=\"alternate\" type=\"text/html\" href=\"" . htmlspecialchars($this->items[$i]->link) . "\">\n";
+            $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     .= '        <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 .= '            <name>'.htmlspecialchars($this->items[$i]->author)."</name>\n";
                 $feed .= "        </author>\n";
             }
             if ($this->items[$i]->description != '') {
-                $feed .= '        <summary>' . htmlspecialchars($this->items[$i]->description) . "</summary>\n";
+                $feed .= '        <summary>'.htmlspecialchars($this->items[$i]->description)."</summary>\n";
             }
             $feed .= "    </entry>\n";
         }
@@ -1312,23 +1312,23 @@ 
             //$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
-                    $h2 = floor($dec / 16);
-                    $h1 = floor($dec % 16);
-                    $c  = $escape . $hex["$h2"] . $hex["$h1"];
+                } elseif (($dec == 61) || ($dec<32) || ($dec>126)) { // always encode "\t", which is *not* required
+                    $h2 = floor($dec/16);
+                    $h1 = floor($dec%16);
+                    $c  = $escape.$hex["$h2"].$hex["$h1"];
                 }
-                if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted
-                    $output  .= $newline . $escape . $eol; // soft line break; " =\r\n" is okay
+                if ((strlen($newline)+strlen($c))>=$line_max) { // CRLF is not counted
+                    $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
                     $newline = '';
                 }
                 $newline .= $c;
             } // end of for
-            $output .= $newline . $eol;
+            $output .= $newline.$eol;
         }
 
         return trim($output);
@@ -1340,23 +1340,23 @@ 
      */
     public function createFeed()
     {
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$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     .= '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     .= "   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     .= "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));
+            $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";
@@ -1375,7 +1375,7 @@ 
     {
         $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';
     }
 }
 
@@ -1401,35 +1401,35 @@ 
      */
     public function createFeed()
     {
-        $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n";
+        $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";
+        $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 != '') {
             $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";
+            $feed .= '         <ownerName>'.$this->editor."</ownerName>\n";
         }
         if ($this->editorEmail != '') {
-            $feed .= '         <ownerEmail>' . $this->editorEmail . "</ownerEmail>\n";
+            $feed .= '         <ownerEmail>'.$this->editorEmail."</ownerEmail>\n";
         }
         $feed .= "    </head>\n";
         $feed .= "    <body>\n";
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
             $feed  .= "    <outline type=\"rss\" ";
             $title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title, "\n\r", '  ')));
-            $feed  .= " title=\"" . $title . "\"";
-            $feed  .= " text=\"" . $title . "\"";
+            $feed  .= " title=\"".$title."\"";
+            $feed  .= " text=\"".$title."\"";
             //$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\"";
-            $feed .= " url=\"" . htmlspecialchars($this->items[$i]->link) . "\"";
+            $feed .= " url=\"".htmlspecialchars($this->items[$i]->link)."\"";
             $feed .= ">\n";
         }
         $feed .= "    </body>\n";
@@ -1513,7 +1513,7 @@ 
 
         //if no stylePrefix is set, generate it yourself depending on the script name
         if ($this->stylePrefix == '') {
-            $this->stylePrefix = str_replace('.', '_', $this->_generateFilename()) . '_';
+            $this->stylePrefix = str_replace('.', '_', $this->_generateFilename()).'_';
         }
 
         //set an openInNewWindow_token_to be inserted or not
@@ -1524,49 +1524,49 @@ 
         // use this array to put the lines in and implode later with "document.write" javascript
         $feedArray = [];
         if ($this->image != null) {
-            $imageStr = "<a href='" . $this->image->link . "'" . $targetInsert . '>' . "<img src='" . $this->image->url . "' border='0' alt='" . FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100) . "' align='" . $this->imageAlign . "' ";
+            $imageStr = "<a href='".$this->image->link."'".$targetInsert.'>'."<img src='".$this->image->url."' border='0' alt='".FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100)."' align='".$this->imageAlign."' ";
             if ($this->image->width) {
-                $imageStr .= " width='" . $this->image->width . "' ";
+                $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>';
+            $feedArray[] = "<div class='".$this->stylePrefix."title'><a href='".$this->link."' ".$targetInsert." class='".$this->stylePrefix."title'>".FeedCreator::iTrunc(htmlspecialchars($this->title), 100).'</a></div>';
         }
         if ($this->getDescription()) {
-            $feedArray[] = "<div class='" . $this->stylePrefix . "description'>" . str_replace(']]>', '', str_replace('<![CDATA[', '', $this->getDescription())) . '</div>';
+            $feedArray[] = "<div class='".$this->stylePrefix."description'>".str_replace(']]>', '', str_replace('<![CDATA[', '', $this->getDescription())).'</div>';
         }
 
         if ($this->header) {
-            $feedArray[] = "<div class='" . $this->stylePrefix . "header'>" . $this->header . '</div>';
+            $feedArray[] = "<div class='".$this->stylePrefix."header'>".$this->header.'</div>';
         }
 
-        for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) {
-            if ($this->separator && $i > 0) {
-                $feedArray[] = "<div class='" . $this->stylePrefix . "separator'>" . $this->separator . '</div>';
+        for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) {
+            if ($this->separator && $i>0) {
+                $feedArray[] = "<div class='".$this->stylePrefix."separator'>".$this->separator.'</div>';
             }
 
             if ($this->items[$i]->title) {
                 if ($this->items[$i]->link) {
-                    $feedArray[] = "<div class='" . $this->stylePrefix . "item_title'><a href='" . $this->items[$i]->link . "' class='" . $this->stylePrefix . "item_title'" . $targetInsert . '>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100) . '</a></div>';
-                } else {
-                    $feedArray[] = "<div class='" . $this->stylePrefix . "item_title'>" . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100) . '</div>';
+                    $feedArray[] = "<div class='".$this->stylePrefix."item_title'><a href='".$this->items[$i]->link."' class='".$this->stylePrefix."item_title'".$targetInsert.'>'.FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100).'</a></div>';
+                }else {
+                    $feedArray[] = "<div class='".$this->stylePrefix."item_title'>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100).'</div>';
                 }
             }
             if ($this->items[$i]->getDescription()) {
-                $feedArray[] = "<div class='" . $this->stylePrefix . "item_description'>" . str_replace(']]>', '', str_replace('<![CDATA[', '', $this->items[$i]->getDescription())) . '</div>';
+                $feedArray[] = "<div class='".$this->stylePrefix."item_description'>".str_replace(']]>', '', str_replace('<![CDATA[', '', $this->items[$i]->getDescription())).'</div>';
             }
         }
         if ($this->footer) {
-            $feedArray[] = "<div class='" . $this->stylePrefix . "footer'>" . $this->footer . '</div>';
+            $feedArray[] = "<div class='".$this->stylePrefix."footer'>".$this->footer.'</div>';
         }
 
-        $feed = '' . implode($feedArray, "\r\n");
+        $feed = ''.implode($feedArray, "\r\n");
 
         return $feed;
     }
@@ -1582,7 +1582,7 @@ 
     {
         $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';
     }
 }
 
@@ -1614,7 +1614,7 @@ 
 
         $jsFeed = '';
         foreach ($feedArray as $value) {
-            $jsFeed .= "document.write('" . trim(addslashes($value)) . "');\n";
+            $jsFeed .= "document.write('".trim(addslashes($value))."');\n";
         }
 
         return $jsFeed;
@@ -1631,7 +1631,7 @@ 
     {
         $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';
     }
 }
 

admin/admin.blog.php

Indentation +341 added lines, -341 removed lines

@@ -52,353 +52,353 @@
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 
 if ('save' === $op && !empty(Request::getString('fetch', '', 'POST'))) {
-    $op = 'edit';
+	$op = 'edit';
 }
 
 switch ($op) {
-    /* save a single blog */
-    case 'save':
-
-        if ($blog_id) {
-            $blog_obj = $blogHandler->get($blog_id);
-        } else {
-            if ($blog_exists = $blogHandler->getCount(new Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
-                redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
-            }
-            $blog_obj = $blogHandler->create();
-            $blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
-        }
-
-        $blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST')); //$_POST['blog_title']);
-        $blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST')); //$_POST['blog_desc']);
-        $blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST')); //$_POST['blog_image']);
-        $blog_obj->setVar('blog_feed', Request::getString('blog_feed', '', 'POST')); //$_POST['blog_feed']);
-        $blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST')); //$_POST['blog_link']);
-        $blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST')); //$_POST['blog_language']);
-        $blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST')); //$_POST['blog_charset']);
-        $blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST')); //$_POST['blog_trackback']);
-        $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); //$_POST['blog_status']);
-
-        if (!$blogHandler->insert($blog_obj)) {
-        } elseif (!empty(Request::getArray('categories', [], 'POST'))) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, Request::getArray('categories', [], 'POST'))) {
-                $_POST['categories'] = [];
-            }
-            $blogHandler->setCategories($blog_id, Request::getArray('categories', [], 'POST'));
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* fetch and add a list of blogs to a category */
-    // no break
-    case 'add':
-        $links = PlanetUtility::planetParseLinks(Request::getArray('links', [], 'POST'));
-        $blogs = [];
-        foreach ($links as $link) {
-            if ($blog_exist = $blogHandler->getCount(new Criteria('blog_feed', $link['url']))) {
-                continue;
-            }
-            $blog_obj = $blogHandler->fetch($link['url']);
-            if (!empty($link['title'])) {
-                $blog_obj->setVar('blog_title', $link['title']);
-            }
-            $blogHandler->insert($blog_obj);
-            $blogs[] = $blog_obj->getVar('blog_id');
-            unset($blog_obj);
-        }
-        if (!empty(Request::getArray('categories', [], 'POST'))) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            foreach (Request::getArray('categories', [], 'POST') as $cat_id) {
-                $categoryHandler->addBlogs($cat_id, $blogs);
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* update a list of blogs */
-    // no break
-    case 'update':
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->fetch($bid);
-            if (!$blogHandler->insert($blog_obj)) {
-            }
-            unset($blog_obj);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* add a list of blogs to a category */
-    // no break
-    case 'register':
-        if (!empty(Request::getArray('category_dest', [], 'POST'))) {
-            if (!is_array($blog_id)) {
-                $blog_id = [$blog_id];
-            }
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&start=' . $start, 2, $message);
-
-    /* remove a list of blogs from a category */
-    // no break
-    case 'remove':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        if (!empty($category_id)) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->removeBlogs($category_id, $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* delete a single blog or a list blogs */
-    // no break
-    case 'del':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->get($bid);
-            if (!$blogHandler->delete($blog_obj, true)) {
-            }
-            unset($blog_obj);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* empty a single blog or a list blogs */
-    // no break
-    case 'empty':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->get($bid);
-            if (!$blogHandler->do_empty($blog_obj)) {
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* approve a single blog or a list blogs */
-    // no break
-    case 'approve':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blogHandler->updateAll('blog_status', 1, $criteria, true);
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* mark a single blog or a list blogs as featured */
-    // no break
-    case 'feature':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blogHandler->updateAll('blog_status', 2, $criteria, true);
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* edit a single blog */
-    // no break
-    case 'edit':
-        if (!empty(Request::getString('fetch', '', 'POST'))) {
-            $blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
-            $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj = $blogHandler->get($blog_id);
-        }
-        $categories = Request::getArray('categories', [], 'POST');
-        if (empty($categories) && $blog_id > 0) {
-            $crit       = new Criteria('bc.blog_id', $blog_id);
-            $categories = array_keys($categoryHandler->getByBlog($crit));
-        }
-        if (empty($categories)) {
-            $categories = [0 => _NONE];
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
-        echo '<br>';
-        if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
-            $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
-            $blogs_obj = $blogHandler->getList($criteria);
-            if (count($blogs_obj) > 0) {
-                echo "<div class=\"errorMsg\">" . planet_constant('AM_BLOGEXISTS');
-                foreach (array_keys($blogs_obj) as $bid) {
-                    echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
-                }
-                echo '</div>';
-            }
-            unset($blogs_obj, $criteria);
-        }
-        include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
-        echo '</fieldset>';
-        break;
-
-    default:
-
-        $crit = new Criteria('1', 1);
-        $crit->setSort('cat_order');
-        $crit->setOrder('ASC');
-        $categories = $categoryHandler->getList($crit);
-
-        // Display category option form
-        $opform    = new XoopsSimpleForm('', 'opform', 'admin.blog.php', 'get');
-        $op_select = new XoopsFormSelect('', 'category', $category_id);
-        $op_select->setExtra('onchange="document.forms.opform.submit()"');
-        $options = [
-            '0'  => _ALL,
-            '-1' => planet_constant('MD_ACTIVE'),
-            '-2' => planet_constant('MD_FEATURED'),
-            '-3' => planet_constant('MD_PENDING')
-        ];
-        foreach (array_keys($categories) as $key) {
-            $options[$key] = $categories[$key];
-        }
-        $op_select->addOptionArray($options);
-        $opform->addElement($op_select);
-        $opform->display();
-
-        if ($category_id > 0) {
-            $criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
-            $criteria->add(new Criteria('bc.cat_id', $category_id));
-            $blog_count = $blogHandler->getCountByCategory($criteria);
-            $criteria->setStart($start);
-            $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            $blog_objs = $blogHandler->getByCategory($criteria);
-        } else {
-            /* All active blogs */
-            if ($category_id == 0) {
-                $criteria = new Criteria('1', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Active blogs */
-            } elseif ($category_id == -1) {
-                $criteria = new Criteria('blog_status', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Featured blogs */
-            } elseif ($category_id == -2) {
-                $criteria = new Criteria('blog_status', 2);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Pending blogs */
-            } else {
-                $criteria = new Criteria('blog_status', 0);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            }
-            $blog_count = $blogHandler->getCount($criteria);
-            $blog_objs  = $blogHandler->getAll($criteria);
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
-        echo "<br style=\"clear:both\">";
-
-        echo "<form name='list' id='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox'  onclick=\"xoopsCheckAll('list', 'blog_check');\"></td>";
-        echo "<th class='bg3'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_STATUS') . '</td>';
-        echo "<th class='bg3' width='40%'>" . planet_constant('AM_FEED') . '</td>';
-        //        echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
-        //        echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
-        echo "<th class='bg3' width='10%'>" . planet_constant('AM_ACTIONS') . '</td>';
-        echo '</tr>';
-
-        $status = [
-            '0' => planet_constant('MD_PENDING'),
-            '1' => planet_constant('MD_ACTIVE'),
-            '2' => planet_constant('MD_FEATURED')
-        ];
-        foreach (array_keys($blog_objs) as $bid) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox'></td>";
-            echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
-            echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
-            echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
-            echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
+	/* save a single blog */
+	case 'save':
+
+		if ($blog_id) {
+			$blog_obj = $blogHandler->get($blog_id);
+		} else {
+			if ($blog_exists = $blogHandler->getCount(new Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
+				redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
+			}
+			$blog_obj = $blogHandler->create();
+			$blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
+		}
+
+		$blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST')); //$_POST['blog_title']);
+		$blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST')); //$_POST['blog_desc']);
+		$blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST')); //$_POST['blog_image']);
+		$blog_obj->setVar('blog_feed', Request::getString('blog_feed', '', 'POST')); //$_POST['blog_feed']);
+		$blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST')); //$_POST['blog_link']);
+		$blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST')); //$_POST['blog_language']);
+		$blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST')); //$_POST['blog_charset']);
+		$blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST')); //$_POST['blog_trackback']);
+		$blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); //$_POST['blog_status']);
+
+		if (!$blogHandler->insert($blog_obj)) {
+		} elseif (!empty(Request::getArray('categories', [], 'POST'))) {
+			$blog_id = $blog_obj->getVar('blog_id');
+			if (in_array(0, Request::getArray('categories', [], 'POST'))) {
+				$_POST['categories'] = [];
+			}
+			$blogHandler->setCategories($blog_id, Request::getArray('categories', [], 'POST'));
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php', 2, $message);
+
+	/* fetch and add a list of blogs to a category */
+	// no break
+	case 'add':
+		$links = PlanetUtility::planetParseLinks(Request::getArray('links', [], 'POST'));
+		$blogs = [];
+		foreach ($links as $link) {
+			if ($blog_exist = $blogHandler->getCount(new Criteria('blog_feed', $link['url']))) {
+				continue;
+			}
+			$blog_obj = $blogHandler->fetch($link['url']);
+			if (!empty($link['title'])) {
+				$blog_obj->setVar('blog_title', $link['title']);
+			}
+			$blogHandler->insert($blog_obj);
+			$blogs[] = $blog_obj->getVar('blog_id');
+			unset($blog_obj);
+		}
+		if (!empty(Request::getArray('categories', [], 'POST'))) {
+			$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+			foreach (Request::getArray('categories', [], 'POST') as $cat_id) {
+				$categoryHandler->addBlogs($cat_id, $blogs);
+			}
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php', 2, $message);
+
+	/* update a list of blogs */
+	// no break
+	case 'update':
+		foreach ($blog_id as $bid) {
+			$blog_obj = $blogHandler->fetch($bid);
+			if (!$blogHandler->insert($blog_obj)) {
+			}
+			unset($blog_obj);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* add a list of blogs to a category */
+	// no break
+	case 'register':
+		if (!empty(Request::getArray('category_dest', [], 'POST'))) {
+			if (!is_array($blog_id)) {
+				$blog_id = [$blog_id];
+			}
+			$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+			$categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&amp;start=' . $start, 2, $message);
+
+	/* remove a list of blogs from a category */
+	// no break
+	case 'remove':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		if (!empty($category_id)) {
+			$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+			$categoryHandler->removeBlogs($category_id, $blog_id);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* delete a single blog or a list blogs */
+	// no break
+	case 'del':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		foreach ($blog_id as $bid) {
+			$blog_obj = $blogHandler->get($bid);
+			if (!$blogHandler->delete($blog_obj, true)) {
+			}
+			unset($blog_obj);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* empty a single blog or a list blogs */
+	// no break
+	case 'empty':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		foreach ($blog_id as $bid) {
+			$blog_obj = $blogHandler->get($bid);
+			if (!$blogHandler->do_empty($blog_obj)) {
+			}
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* approve a single blog or a list blogs */
+	// no break
+	case 'approve':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		$criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+		$blogHandler->updateAll('blog_status', 1, $criteria, true);
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* mark a single blog or a list blogs as featured */
+	// no break
+	case 'feature':
+		if (!is_array($blog_id)) {
+			$blog_id = [$blog_id];
+		}
+		$criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+		$blogHandler->updateAll('blog_status', 2, $criteria, true);
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+	/* edit a single blog */
+	// no break
+	case 'edit':
+		if (!empty(Request::getString('fetch', '', 'POST'))) {
+			$blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
+			$blog_obj->setVar('blog_id', $blog_id);
+		} else {
+			$blog_obj = $blogHandler->get($blog_id);
+		}
+		$categories = Request::getArray('categories', [], 'POST');
+		if (empty($categories) && $blog_id > 0) {
+			$crit       = new Criteria('bc.blog_id', $blog_id);
+			$categories = array_keys($categoryHandler->getByBlog($crit));
+		}
+		if (empty($categories)) {
+			$categories = [0 => _NONE];
+		}
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+		echo '<br>';
+		if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
+			$criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
+			$blogs_obj = $blogHandler->getList($criteria);
+			if (count($blogs_obj) > 0) {
+				echo "<div class=\"errorMsg\">" . planet_constant('AM_BLOGEXISTS');
+				foreach (array_keys($blogs_obj) as $bid) {
+					echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
+				}
+				echo '</div>';
+			}
+			unset($blogs_obj, $criteria);
+		}
+		include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
+		echo '</fieldset>';
+		break;
+
+	default:
+
+		$crit = new Criteria('1', 1);
+		$crit->setSort('cat_order');
+		$crit->setOrder('ASC');
+		$categories = $categoryHandler->getList($crit);
+
+		// Display category option form
+		$opform    = new XoopsSimpleForm('', 'opform', 'admin.blog.php', 'get');
+		$op_select = new XoopsFormSelect('', 'category', $category_id);
+		$op_select->setExtra('onchange="document.forms.opform.submit()"');
+		$options = [
+			'0'  => _ALL,
+			'-1' => planet_constant('MD_ACTIVE'),
+			'-2' => planet_constant('MD_FEATURED'),
+			'-3' => planet_constant('MD_PENDING')
+		];
+		foreach (array_keys($categories) as $key) {
+			$options[$key] = $categories[$key];
+		}
+		$op_select->addOptionArray($options);
+		$opform->addElement($op_select);
+		$opform->display();
+
+		if ($category_id > 0) {
+			$criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
+			$criteria->add(new Criteria('bc.cat_id', $category_id));
+			$blog_count = $blogHandler->getCountByCategory($criteria);
+			$criteria->setStart($start);
+			$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+			$blog_objs = $blogHandler->getByCategory($criteria);
+		} else {
+			/* All active blogs */
+			if ($category_id == 0) {
+				$criteria = new Criteria('1', 1);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+				/* Active blogs */
+			} elseif ($category_id == -1) {
+				$criteria = new Criteria('blog_status', 1);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+				/* Featured blogs */
+			} elseif ($category_id == -2) {
+				$criteria = new Criteria('blog_status', 2);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+				/* Pending blogs */
+			} else {
+				$criteria = new Criteria('blog_status', 0);
+				$criteria->setStart($start);
+				$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+			}
+			$blog_count = $blogHandler->getCount($criteria);
+			$blog_objs  = $blogHandler->getAll($criteria);
+		}
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+		echo "<br style=\"clear:both\">";
+
+		echo "<form name='list' id='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox'  onclick=\"xoopsCheckAll('list', 'blog_check');\"></td>";
+		echo "<th class='bg3'>" . planet_constant('AM_TITLE') . '</td>';
+		echo "<th class='bg3' width='5%'>" . planet_constant('AM_STATUS') . '</td>';
+		echo "<th class='bg3' width='40%'>" . planet_constant('AM_FEED') . '</td>';
+		//        echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
+		//        echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
+		echo "<th class='bg3' width='10%'>" . planet_constant('AM_ACTIONS') . '</td>';
+		echo '</tr>';
+
+		$status = [
+			'0' => planet_constant('MD_PENDING'),
+			'1' => planet_constant('MD_ACTIVE'),
+			'2' => planet_constant('MD_FEATURED')
+		];
+		foreach (array_keys($blog_objs) as $bid) {
+			echo "<tr class='odd' align='left'>";
+			echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox'></td>";
+			echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
+			echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
+			echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
+			echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
                       <a href='admin.blog.php?op=del&amp;blog=" . $bid . "' title='" . _DELETE . "'><img src='" . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . " title='" . _DELETE . " </a>&nbsp;
                       <a href='admin.blog.php?op=empty&amp;blog=" . $bid . "' title='" . planet_constant('MD_EMPTY_BLOG') . "'><img src='" . $pathIcon16 . "/empty.png '" . " alt='" . _EDIT . " title='" . planet_constant('MD_EMPTY_BLOG') . '</a></td>';
 
-            echo '</tr>';
-        }
-        echo "<tr class='even' align='center'>";
-        echo "<td colspan='7'>";
-        echo "<select name='op' onChange='if (this.options[this.selectedIndex].value==\"register\") {setVisible(\"catdiv\");} else {setHidden(\"catdiv\");}'>";
-        echo "<option value=''>" . _SELECT . '</option>';
-        echo "<option value='del'>" . _DELETE . '</option>';
-        echo "<option value='empty'>" . planet_constant('MD_EMPTY_BLOG') . '</option>';
-        echo "<option value='register'>" . planet_constant('AM_REGISTER') . '</option>';
-        if ($category_id > 0) {
-            echo "<option value='remove'>" . planet_constant('AM_REMOVE') . '</option>';
-        }
-        echo "<option value='approve'>" . planet_constant('AM_APPROVE') . '</option>';
-        echo "<option value='feature'>" . planet_constant('AM_FEATURE') . '</option>';
-        echo "<option value='update'>" . planet_constant('AM_UPDATE') . '</option>';
-
-        echo "<option value='pending'>" . planet_constant('AM_PENDING') . '</option>';
-        echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</option>';
-
-        echo '</select>';
-        echo "<div id='catdiv' style='visibility:hidden;display:inline;'>";
-        echo "<select name='category_dest'>";
-        echo "<option value=''>" . _SELECT . '</option>';
-        foreach ($categories as $cid => $name) {
-            echo "<option value='" . $cid . "'>" . $name . '</option>';
-        }
-        echo '</select>';
-        echo '</div>';
-        echo "<input name='start' value='" . $start . "' type='hidden'>";
-        echo "<input name='category' value='" . $category_id . "' type='hidden'>";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
-        echo "<input name='' value='" . _CANCEL . "' type='reset'>";
-        echo '</td>';
-        echo '</tr>';
-        if ($blog_count > $xoopsModuleConfig['list_perpage']) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
-            $pagenav = $nav->renderNav(4);
-            echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
-        }
-        echo '</table></form>';
-        echo "</fieldset><br style='clear:both;'>";
-
-        if (empty($start) && empty($category_id)) {
-            $form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'), 'post', true);
-            $form->addElement(new XoopsFormText(planet_constant('AM_FEED'), 'blog_feed', 50, 255), true);
-            $form->addElement(new XoopsFormHidden('op', 'edit'));
-            $button_tray = new XoopsFormElementTray('', '');
-            $butt_save   = new XoopsFormButton('', 'fetch', _SUBMIT, 'submit');
-            $button_tray->addElement($butt_save);
-            $butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
-            $button_tray->addElement($butt_cancel);
-            $form->addElement($button_tray);
-
-            $form_add = new XoopsThemeForm(_ADD, 'add', xoops_getenv('PHP_SELF'), 'post', true);
-            $form_add->addElement(new XoopsFormTextArea(planet_constant('AM_FEED'), 'links'));
-            $form_add->addElement(new XoopsFormHidden('op', 'add'));
-            $button_tray = new XoopsFormElementTray('', '');
-            $butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-            $button_tray->addElement($butt_save);
-            $butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
-            $button_tray->addElement($butt_cancel);
-            $form_add->addElement($button_tray);
-
-            echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
-            echo '<br>';
-            $form->display();
-            $form_add->display();
-            echo '</fieldset>';
-        }
-        break;
+			echo '</tr>';
+		}
+		echo "<tr class='even' align='center'>";
+		echo "<td colspan='7'>";
+		echo "<select name='op' onChange='if (this.options[this.selectedIndex].value==\"register\") {setVisible(\"catdiv\");} else {setHidden(\"catdiv\");}'>";
+		echo "<option value=''>" . _SELECT . '</option>';
+		echo "<option value='del'>" . _DELETE . '</option>';
+		echo "<option value='empty'>" . planet_constant('MD_EMPTY_BLOG') . '</option>';
+		echo "<option value='register'>" . planet_constant('AM_REGISTER') . '</option>';
+		if ($category_id > 0) {
+			echo "<option value='remove'>" . planet_constant('AM_REMOVE') . '</option>';
+		}
+		echo "<option value='approve'>" . planet_constant('AM_APPROVE') . '</option>';
+		echo "<option value='feature'>" . planet_constant('AM_FEATURE') . '</option>';
+		echo "<option value='update'>" . planet_constant('AM_UPDATE') . '</option>';
+
+		echo "<option value='pending'>" . planet_constant('AM_PENDING') . '</option>';
+		echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</option>';
+
+		echo '</select>';
+		echo "<div id='catdiv' style='visibility:hidden;display:inline;'>";
+		echo "<select name='category_dest'>";
+		echo "<option value=''>" . _SELECT . '</option>';
+		foreach ($categories as $cid => $name) {
+			echo "<option value='" . $cid . "'>" . $name . '</option>';
+		}
+		echo '</select>';
+		echo '</div>';
+		echo "<input name='start' value='" . $start . "' type='hidden'>";
+		echo "<input name='category' value='" . $category_id . "' type='hidden'>";
+		echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
+		echo "<input name='' value='" . _CANCEL . "' type='reset'>";
+		echo '</td>';
+		echo '</tr>';
+		if ($blog_count > $xoopsModuleConfig['list_perpage']) {
+			include XOOPS_ROOT_PATH . '/class/pagenav.php';
+			$nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
+			$pagenav = $nav->renderNav(4);
+			echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
+		}
+		echo '</table></form>';
+		echo "</fieldset><br style='clear:both;'>";
+
+		if (empty($start) && empty($category_id)) {
+			$form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'), 'post', true);
+			$form->addElement(new XoopsFormText(planet_constant('AM_FEED'), 'blog_feed', 50, 255), true);
+			$form->addElement(new XoopsFormHidden('op', 'edit'));
+			$button_tray = new XoopsFormElementTray('', '');
+			$butt_save   = new XoopsFormButton('', 'fetch', _SUBMIT, 'submit');
+			$button_tray->addElement($butt_save);
+			$butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
+			$button_tray->addElement($butt_cancel);
+			$form->addElement($button_tray);
+
+			$form_add = new XoopsThemeForm(_ADD, 'add', xoops_getenv('PHP_SELF'), 'post', true);
+			$form_add->addElement(new XoopsFormTextArea(planet_constant('AM_FEED'), 'links'));
+			$form_add->addElement(new XoopsFormHidden('op', 'add'));
+			$button_tray = new XoopsFormElementTray('', '');
+			$butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+			$button_tray->addElement($butt_save);
+			$butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
+			$button_tray->addElement($butt_cancel);
+			$form_add->addElement($button_tray);
+
+			echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+			echo '<br>';
+			$form->display();
+			$form_add->display();
+			echo '</fieldset>';
+		}
+		break;
 }
 
 xoops_cp_footer();

Switch Indentation +339 added lines, -339 removed lines

@@ -57,348 +57,348 @@
 
 switch ($op) {
     /* save a single blog */
-    case 'save':
-
-        if ($blog_id) {
-            $blog_obj = $blogHandler->get($blog_id);
-        } else {
-            if ($blog_exists = $blogHandler->getCount(new Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
-                redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
-            }
-            $blog_obj = $blogHandler->create();
-            $blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
-        }
-
-        $blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST')); //$_POST['blog_title']);
-        $blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST')); //$_POST['blog_desc']);
-        $blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST')); //$_POST['blog_image']);
-        $blog_obj->setVar('blog_feed', Request::getString('blog_feed', '', 'POST')); //$_POST['blog_feed']);
-        $blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST')); //$_POST['blog_link']);
-        $blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST')); //$_POST['blog_language']);
-        $blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST')); //$_POST['blog_charset']);
-        $blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST')); //$_POST['blog_trackback']);
-        $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); //$_POST['blog_status']);
-
-        if (!$blogHandler->insert($blog_obj)) {
-        } elseif (!empty(Request::getArray('categories', [], 'POST'))) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, Request::getArray('categories', [], 'POST'))) {
-                $_POST['categories'] = [];
-            }
-            $blogHandler->setCategories($blog_id, Request::getArray('categories', [], 'POST'));
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* fetch and add a list of blogs to a category */
-    // no break
-    case 'add':
-        $links = PlanetUtility::planetParseLinks(Request::getArray('links', [], 'POST'));
-        $blogs = [];
-        foreach ($links as $link) {
-            if ($blog_exist = $blogHandler->getCount(new Criteria('blog_feed', $link['url']))) {
-                continue;
-            }
-            $blog_obj = $blogHandler->fetch($link['url']);
-            if (!empty($link['title'])) {
-                $blog_obj->setVar('blog_title', $link['title']);
-            }
-            $blogHandler->insert($blog_obj);
-            $blogs[] = $blog_obj->getVar('blog_id');
-            unset($blog_obj);
-        }
-        if (!empty(Request::getArray('categories', [], 'POST'))) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            foreach (Request::getArray('categories', [], 'POST') as $cat_id) {
-                $categoryHandler->addBlogs($cat_id, $blogs);
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php', 2, $message);
-
-    /* update a list of blogs */
-    // no break
-    case 'update':
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->fetch($bid);
-            if (!$blogHandler->insert($blog_obj)) {
-            }
-            unset($blog_obj);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* add a list of blogs to a category */
-    // no break
-    case 'register':
-        if (!empty(Request::getArray('category_dest', [], 'POST'))) {
-            if (!is_array($blog_id)) {
-                $blog_id = [$blog_id];
-            }
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&start=' . $start, 2, $message);
-
-    /* remove a list of blogs from a category */
-    // no break
-    case 'remove':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        if (!empty($category_id)) {
-            $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
-            $categoryHandler->removeBlogs($category_id, $blog_id);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* delete a single blog or a list blogs */
-    // no break
-    case 'del':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->get($bid);
-            if (!$blogHandler->delete($blog_obj, true)) {
-            }
-            unset($blog_obj);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* empty a single blog or a list blogs */
-    // no break
-    case 'empty':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        foreach ($blog_id as $bid) {
-            $blog_obj = $blogHandler->get($bid);
-            if (!$blogHandler->do_empty($blog_obj)) {
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* approve a single blog or a list blogs */
-    // no break
-    case 'approve':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blogHandler->updateAll('blog_status', 1, $criteria, true);
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* mark a single blog or a list blogs as featured */
-    // no break
-    case 'feature':
-        if (!is_array($blog_id)) {
-            $blog_id = [$blog_id];
-        }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
-        $blogHandler->updateAll('blog_status', 2, $criteria, true);
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
-
-    /* edit a single blog */
-    // no break
-    case 'edit':
-        if (!empty(Request::getString('fetch', '', 'POST'))) {
-            $blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
-            $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj = $blogHandler->get($blog_id);
-        }
-        $categories = Request::getArray('categories', [], 'POST');
-        if (empty($categories) && $blog_id > 0) {
-            $crit       = new Criteria('bc.blog_id', $blog_id);
-            $categories = array_keys($categoryHandler->getByBlog($crit));
-        }
-        if (empty($categories)) {
-            $categories = [0 => _NONE];
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
-        echo '<br>';
-        if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
-            $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
-            $blogs_obj = $blogHandler->getList($criteria);
-            if (count($blogs_obj) > 0) {
-                echo "<div class=\"errorMsg\">" . planet_constant('AM_BLOGEXISTS');
-                foreach (array_keys($blogs_obj) as $bid) {
-                    echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
-                }
-                echo '</div>';
-            }
-            unset($blogs_obj, $criteria);
-        }
-        include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
-        echo '</fieldset>';
-        break;
-
-    default:
-
-        $crit = new Criteria('1', 1);
-        $crit->setSort('cat_order');
-        $crit->setOrder('ASC');
-        $categories = $categoryHandler->getList($crit);
-
-        // Display category option form
-        $opform    = new XoopsSimpleForm('', 'opform', 'admin.blog.php', 'get');
-        $op_select = new XoopsFormSelect('', 'category', $category_id);
-        $op_select->setExtra('onchange="document.forms.opform.submit()"');
-        $options = [
-            '0'  => _ALL,
-            '-1' => planet_constant('MD_ACTIVE'),
-            '-2' => planet_constant('MD_FEATURED'),
-            '-3' => planet_constant('MD_PENDING')
-        ];
-        foreach (array_keys($categories) as $key) {
-            $options[$key] = $categories[$key];
-        }
-        $op_select->addOptionArray($options);
-        $opform->addElement($op_select);
-        $opform->display();
-
-        if ($category_id > 0) {
-            $criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
-            $criteria->add(new Criteria('bc.cat_id', $category_id));
-            $blog_count = $blogHandler->getCountByCategory($criteria);
-            $criteria->setStart($start);
-            $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            $blog_objs = $blogHandler->getByCategory($criteria);
-        } else {
-            /* All active blogs */
-            if ($category_id == 0) {
-                $criteria = new Criteria('1', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Active blogs */
-            } elseif ($category_id == -1) {
-                $criteria = new Criteria('blog_status', 1);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Featured blogs */
-            } elseif ($category_id == -2) {
-                $criteria = new Criteria('blog_status', 2);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-                /* Pending blogs */
-            } else {
-                $criteria = new Criteria('blog_status', 0);
-                $criteria->setStart($start);
-                $criteria->setLimit($xoopsModuleConfig['list_perpage']);
-            }
-            $blog_count = $blogHandler->getCount($criteria);
-            $blog_objs  = $blogHandler->getAll($criteria);
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
-        echo "<br style=\"clear:both\">";
-
-        echo "<form name='list' id='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox'  onclick=\"xoopsCheckAll('list', 'blog_check');\"></td>";
-        echo "<th class='bg3'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_STATUS') . '</td>';
-        echo "<th class='bg3' width='40%'>" . planet_constant('AM_FEED') . '</td>';
-        //        echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
-        //        echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
-        echo "<th class='bg3' width='10%'>" . planet_constant('AM_ACTIONS') . '</td>';
-        echo '</tr>';
-
-        $status = [
-            '0' => planet_constant('MD_PENDING'),
-            '1' => planet_constant('MD_ACTIVE'),
-            '2' => planet_constant('MD_FEATURED')
-        ];
-        foreach (array_keys($blog_objs) as $bid) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox'></td>";
-            echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
-            echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
-            echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
-            echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
+    	case 'save':
+
+        	if ($blog_id) {
+            	$blog_obj = $blogHandler->get($blog_id);
+        	} else {
+            	if ($blog_exists = $blogHandler->getCount(new Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
+                	redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
+            	}
+            	$blog_obj = $blogHandler->create();
+            	$blog_obj->setVar('blog_submitter', $xoopsUser->getVar('uid'));
+        	}
+
+        	$blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST')); //$_POST['blog_title']);
+        	$blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST')); //$_POST['blog_desc']);
+        	$blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST')); //$_POST['blog_image']);
+        	$blog_obj->setVar('blog_feed', Request::getString('blog_feed', '', 'POST')); //$_POST['blog_feed']);
+        	$blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST')); //$_POST['blog_link']);
+        	$blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST')); //$_POST['blog_language']);
+        	$blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST')); //$_POST['blog_charset']);
+        	$blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST')); //$_POST['blog_trackback']);
+        	$blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); //$_POST['blog_status']);
+
+        	if (!$blogHandler->insert($blog_obj)) {
+        	} elseif (!empty(Request::getArray('categories', [], 'POST'))) {
+            	$blog_id = $blog_obj->getVar('blog_id');
+            	if (in_array(0, Request::getArray('categories', [], 'POST'))) {
+                	$_POST['categories'] = [];
+            	}
+            	$blogHandler->setCategories($blog_id, Request::getArray('categories', [], 'POST'));
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php', 2, $message);
+
+    	/* fetch and add a list of blogs to a category */
+    	// no break
+    	case 'add':
+        	$links = PlanetUtility::planetParseLinks(Request::getArray('links', [], 'POST'));
+        	$blogs = [];
+        	foreach ($links as $link) {
+            	if ($blog_exist = $blogHandler->getCount(new Criteria('blog_feed', $link['url']))) {
+                	continue;
+            	}
+            	$blog_obj = $blogHandler->fetch($link['url']);
+            	if (!empty($link['title'])) {
+                	$blog_obj->setVar('blog_title', $link['title']);
+            	}
+            	$blogHandler->insert($blog_obj);
+            	$blogs[] = $blog_obj->getVar('blog_id');
+            	unset($blog_obj);
+        	}
+        	if (!empty(Request::getArray('categories', [], 'POST'))) {
+            	$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	foreach (Request::getArray('categories', [], 'POST') as $cat_id) {
+                	$categoryHandler->addBlogs($cat_id, $blogs);
+            	}
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php', 2, $message);
+
+    	/* update a list of blogs */
+    	// no break
+    	case 'update':
+        	foreach ($blog_id as $bid) {
+            	$blog_obj = $blogHandler->fetch($bid);
+            	if (!$blogHandler->insert($blog_obj)) {
+            	}
+            	unset($blog_obj);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* add a list of blogs to a category */
+    	// no break
+    	case 'register':
+        	if (!empty(Request::getArray('category_dest', [], 'POST'))) {
+            	if (!is_array($blog_id)) {
+                	$blog_id = [$blog_id];
+            	}
+            	$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	$categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&amp;start=' . $start, 2, $message);
+
+    	/* remove a list of blogs from a category */
+    	// no break
+    	case 'remove':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	if (!empty($category_id)) {
+            	$categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
+            	$categoryHandler->removeBlogs($category_id, $blog_id);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* delete a single blog or a list blogs */
+    	// no break
+    	case 'del':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	foreach ($blog_id as $bid) {
+            	$blog_obj = $blogHandler->get($bid);
+            	if (!$blogHandler->delete($blog_obj, true)) {
+            	}
+            	unset($blog_obj);
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* empty a single blog or a list blogs */
+    	// no break
+    	case 'empty':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	foreach ($blog_id as $bid) {
+            	$blog_obj = $blogHandler->get($bid);
+            	if (!$blogHandler->do_empty($blog_obj)) {
+            	}
+        	}
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* approve a single blog or a list blogs */
+    	// no break
+    	case 'approve':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	$criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        	$blogHandler->updateAll('blog_status', 1, $criteria, true);
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* mark a single blog or a list blogs as featured */
+    	// no break
+    	case 'feature':
+        	if (!is_array($blog_id)) {
+            	$blog_id = [$blog_id];
+        	}
+        	$criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        	$blogHandler->updateAll('blog_status', 2, $criteria, true);
+        	$message = planet_constant('AM_DBUPDATED');
+        	redirect_header('admin.blog.php?category=' . $category_id . '&amp;start=' . $start, 2, $message);
+
+    	/* edit a single blog */
+    	// no break
+    	case 'edit':
+        	if (!empty(Request::getString('fetch', '', 'POST'))) {
+            	$blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
+            	$blog_obj->setVar('blog_id', $blog_id);
+        	} else {
+            	$blog_obj = $blogHandler->get($blog_id);
+        	}
+        	$categories = Request::getArray('categories', [], 'POST');
+        	if (empty($categories) && $blog_id > 0) {
+            	$crit       = new Criteria('bc.blog_id', $blog_id);
+            	$categories = array_keys($categoryHandler->getByBlog($crit));
+        	}
+        	if (empty($categories)) {
+            	$categories = [0 => _NONE];
+        	}
+
+        	echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        	echo '<br>';
+        	if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
+            	$criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
+            	$blogs_obj = $blogHandler->getList($criteria);
+            	if (count($blogs_obj) > 0) {
+                	echo "<div class=\"errorMsg\">" . planet_constant('AM_BLOGEXISTS');
+                	foreach (array_keys($blogs_obj) as $bid) {
+                    	echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
+                	}
+                	echo '</div>';
+            	}
+            	unset($blogs_obj, $criteria);
+        	}
+        	include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
+        	echo '</fieldset>';
+        	break;
+
+    	default:
+
+        	$crit = new Criteria('1', 1);
+        	$crit->setSort('cat_order');
+        	$crit->setOrder('ASC');
+        	$categories = $categoryHandler->getList($crit);
+
+        	// Display category option form
+        	$opform    = new XoopsSimpleForm('', 'opform', 'admin.blog.php', 'get');
+        	$op_select = new XoopsFormSelect('', 'category', $category_id);
+        	$op_select->setExtra('onchange="document.forms.opform.submit()"');
+        	$options = [
+            	'0'  => _ALL,
+            	'-1' => planet_constant('MD_ACTIVE'),
+            	'-2' => planet_constant('MD_FEATURED'),
+            	'-3' => planet_constant('MD_PENDING')
+        	];
+        	foreach (array_keys($categories) as $key) {
+            	$options[$key] = $categories[$key];
+        	}
+        	$op_select->addOptionArray($options);
+        	$opform->addElement($op_select);
+        	$opform->display();
+
+        	if ($category_id > 0) {
+            	$criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
+            	$criteria->add(new Criteria('bc.cat_id', $category_id));
+            	$blog_count = $blogHandler->getCountByCategory($criteria);
+            	$criteria->setStart($start);
+            	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+            	$blog_objs = $blogHandler->getByCategory($criteria);
+        	} else {
+            	/* All active blogs */
+            	if ($category_id == 0) {
+                	$criteria = new Criteria('1', 1);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Active blogs */
+            	} elseif ($category_id == -1) {
+                	$criteria = new Criteria('blog_status', 1);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Featured blogs */
+            	} elseif ($category_id == -2) {
+                	$criteria = new Criteria('blog_status', 2);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+                	/* Pending blogs */
+            	} else {
+                	$criteria = new Criteria('blog_status', 0);
+                	$criteria->setStart($start);
+                	$criteria->setLimit($xoopsModuleConfig['list_perpage']);
+            	}
+            	$blog_count = $blogHandler->getCount($criteria);
+            	$blog_objs  = $blogHandler->getAll($criteria);
+        	}
+
+        	echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+        	echo "<br style=\"clear:both\">";
+
+        	echo "<form name='list' id='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        	echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+        	echo "<tr align='center'>";
+        	echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox'  onclick=\"xoopsCheckAll('list', 'blog_check');\"></td>";
+        	echo "<th class='bg3'>" . planet_constant('AM_TITLE') . '</td>';
+        	echo "<th class='bg3' width='5%'>" . planet_constant('AM_STATUS') . '</td>';
+        	echo "<th class='bg3' width='40%'>" . planet_constant('AM_FEED') . '</td>';
+        	//        echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
+        	//        echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
+        	echo "<th class='bg3' width='10%'>" . planet_constant('AM_ACTIONS') . '</td>';
+        	echo '</tr>';
+
+        	$status = [
+            	'0' => planet_constant('MD_PENDING'),
+            	'1' => planet_constant('MD_ACTIVE'),
+            	'2' => planet_constant('MD_FEATURED')
+        	];
+        	foreach (array_keys($blog_objs) as $bid) {
+            	echo "<tr class='odd' align='left'>";
+            	echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox'></td>";
+            	echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
+            	echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
+            	echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
+            	echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
                       <a href='admin.blog.php?op=del&amp;blog=" . $bid . "' title='" . _DELETE . "'><img src='" . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . " title='" . _DELETE . " </a>&nbsp;
                       <a href='admin.blog.php?op=empty&amp;blog=" . $bid . "' title='" . planet_constant('MD_EMPTY_BLOG') . "'><img src='" . $pathIcon16 . "/empty.png '" . " alt='" . _EDIT . " title='" . planet_constant('MD_EMPTY_BLOG') . '</a></td>';
 
-            echo '</tr>';
-        }
-        echo "<tr class='even' align='center'>";
-        echo "<td colspan='7'>";
-        echo "<select name='op' onChange='if (this.options[this.selectedIndex].value==\"register\") {setVisible(\"catdiv\");} else {setHidden(\"catdiv\");}'>";
-        echo "<option value=''>" . _SELECT . '</option>';
-        echo "<option value='del'>" . _DELETE . '</option>';
-        echo "<option value='empty'>" . planet_constant('MD_EMPTY_BLOG') . '</option>';
-        echo "<option value='register'>" . planet_constant('AM_REGISTER') . '</option>';
-        if ($category_id > 0) {
-            echo "<option value='remove'>" . planet_constant('AM_REMOVE') . '</option>';
-        }
-        echo "<option value='approve'>" . planet_constant('AM_APPROVE') . '</option>';
-        echo "<option value='feature'>" . planet_constant('AM_FEATURE') . '</option>';
-        echo "<option value='update'>" . planet_constant('AM_UPDATE') . '</option>';
-
-        echo "<option value='pending'>" . planet_constant('AM_PENDING') . '</option>';
-        echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</option>';
-
-        echo '</select>';
-        echo "<div id='catdiv' style='visibility:hidden;display:inline;'>";
-        echo "<select name='category_dest'>";
-        echo "<option value=''>" . _SELECT . '</option>';
-        foreach ($categories as $cid => $name) {
-            echo "<option value='" . $cid . "'>" . $name . '</option>';
-        }
-        echo '</select>';
-        echo '</div>';
-        echo "<input name='start' value='" . $start . "' type='hidden'>";
-        echo "<input name='category' value='" . $category_id . "' type='hidden'>";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
-        echo "<input name='' value='" . _CANCEL . "' type='reset'>";
-        echo '</td>';
-        echo '</tr>';
-        if ($blog_count > $xoopsModuleConfig['list_perpage']) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
-            $pagenav = $nav->renderNav(4);
-            echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
-        }
-        echo '</table></form>';
-        echo "</fieldset><br style='clear:both;'>";
-
-        if (empty($start) && empty($category_id)) {
-            $form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'), 'post', true);
-            $form->addElement(new XoopsFormText(planet_constant('AM_FEED'), 'blog_feed', 50, 255), true);
-            $form->addElement(new XoopsFormHidden('op', 'edit'));
-            $button_tray = new XoopsFormElementTray('', '');
-            $butt_save   = new XoopsFormButton('', 'fetch', _SUBMIT, 'submit');
-            $button_tray->addElement($butt_save);
-            $butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
-            $button_tray->addElement($butt_cancel);
-            $form->addElement($button_tray);
-
-            $form_add = new XoopsThemeForm(_ADD, 'add', xoops_getenv('PHP_SELF'), 'post', true);
-            $form_add->addElement(new XoopsFormTextArea(planet_constant('AM_FEED'), 'links'));
-            $form_add->addElement(new XoopsFormHidden('op', 'add'));
-            $button_tray = new XoopsFormElementTray('', '');
-            $butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-            $button_tray->addElement($butt_save);
-            $butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
-            $button_tray->addElement($butt_cancel);
-            $form_add->addElement($button_tray);
-
-            echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
-            echo '<br>';
-            $form->display();
-            $form_add->display();
-            echo '</fieldset>';
-        }
-        break;
+            	echo '</tr>';
+        	}
+        	echo "<tr class='even' align='center'>";
+        	echo "<td colspan='7'>";
+        	echo "<select name='op' onChange='if (this.options[this.selectedIndex].value==\"register\") {setVisible(\"catdiv\");} else {setHidden(\"catdiv\");}'>";
+        	echo "<option value=''>" . _SELECT . '</option>';
+        	echo "<option value='del'>" . _DELETE . '</option>';
+        	echo "<option value='empty'>" . planet_constant('MD_EMPTY_BLOG') . '</option>';
+        	echo "<option value='register'>" . planet_constant('AM_REGISTER') . '</option>';
+        	if ($category_id > 0) {
+            	echo "<option value='remove'>" . planet_constant('AM_REMOVE') . '</option>';
+        	}
+        	echo "<option value='approve'>" . planet_constant('AM_APPROVE') . '</option>';
+        	echo "<option value='feature'>" . planet_constant('AM_FEATURE') . '</option>';
+        	echo "<option value='update'>" . planet_constant('AM_UPDATE') . '</option>';
+
+        	echo "<option value='pending'>" . planet_constant('AM_PENDING') . '</option>';
+        	echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</option>';
+
+        	echo '</select>';
+        	echo "<div id='catdiv' style='visibility:hidden;display:inline;'>";
+        	echo "<select name='category_dest'>";
+        	echo "<option value=''>" . _SELECT . '</option>';
+        	foreach ($categories as $cid => $name) {
+            	echo "<option value='" . $cid . "'>" . $name . '</option>';
+        	}
+        	echo '</select>';
+        	echo '</div>';
+        	echo "<input name='start' value='" . $start . "' type='hidden'>";
+        	echo "<input name='category' value='" . $category_id . "' type='hidden'>";
+        	echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
+        	echo "<input name='' value='" . _CANCEL . "' type='reset'>";
+        	echo '</td>';
+        	echo '</tr>';
+        	if ($blog_count > $xoopsModuleConfig['list_perpage']) {
+            	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+            	$nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
+            	$pagenav = $nav->renderNav(4);
+            	echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
+        	}
+        	echo '</table></form>';
+        	echo "</fieldset><br style='clear:both;'>";
+
+        	if (empty($start) && empty($category_id)) {
+            	$form = new XoopsThemeForm(_ADD, 'edit', xoops_getenv('PHP_SELF'), 'post', true);
+            	$form->addElement(new XoopsFormText(planet_constant('AM_FEED'), 'blog_feed', 50, 255), true);
+            	$form->addElement(new XoopsFormHidden('op', 'edit'));
+            	$button_tray = new XoopsFormElementTray('', '');
+            	$butt_save   = new XoopsFormButton('', 'fetch', _SUBMIT, 'submit');
+            	$button_tray->addElement($butt_save);
+            	$butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
+            	$button_tray->addElement($butt_cancel);
+            	$form->addElement($button_tray);
+
+            	$form_add = new XoopsThemeForm(_ADD, 'add', xoops_getenv('PHP_SELF'), 'post', true);
+            	$form_add->addElement(new XoopsFormTextArea(planet_constant('AM_FEED'), 'links'));
+            	$form_add->addElement(new XoopsFormHidden('op', 'add'));
+            	$button_tray = new XoopsFormElementTray('', '');
+            	$butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+            	$button_tray->addElement($butt_save);
+            	$butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
+            	$button_tray->addElement($butt_cancel);
+            	$form_add->addElement($button_tray);
+
+            	echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+            	echo '<br>';
+            	$form->display();
+            	$form_add->display();
+            	echo '</fieldset>';
+        	}
+        	break;
 }
 
 xoops_cp_footer();

Spacing +63 added lines, -63 removed lines

@@ -26,8 +26,8 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 xoops_cp_header();
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -39,14 +39,14 @@ 
  * This is a tricky fix for incomplete solution of module cone
  * it is expected to have a better solution in article 1.0
  */
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //planet_adminmenu(2);
 
-$op          = Request::getString('op', Request::getString('op', '', 'POST'), 'GET');//!empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
-$blog_id     = Request::getArray('blog', Request::getArray('blog', [], 'POST'), 'GET');//!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0);
-$blog_id     = is_array($blog_id) ? array_map('intval', $blog_id) : (int)$blog_id;
-$category_id = Request::getInt('category', Request::getInt('category', 0, 'POST'), 'GET');//(int)(!empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0));
-$start       = Request::getInt('start', Request::getInt('start', 0, 'POST'), 'GET');//(int)(!empty($_POST['start']) ? $_POST['start'] : (!empty($_GET['start']) ? $_GET['start'] : 0));
+$op          = Request::getString('op', Request::getString('op', '', 'POST'), 'GET'); //!empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
+$blog_id     = Request::getArray('blog', Request::getArray('blog', [], 'POST'), 'GET'); //!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0);
+$blog_id     = is_array($blog_id) ? array_map('intval', $blog_id) : (int) $blog_id;
+$category_id = Request::getInt('category', Request::getInt('category', 0, 'POST'), 'GET'); //(int)(!empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0));
+$start       = Request::getInt('start', Request::getInt('start', 0, 'POST'), 'GET'); //(int)(!empty($_POST['start']) ? $_POST['start'] : (!empty($_GET['start']) ? $_GET['start'] : 0));
 
 $blogHandler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -61,7 +61,7 @@ 
 
         if ($blog_id) {
             $blog_obj = $blogHandler->get($blog_id);
-        } else {
+        }else {
             if ($blog_exists = $blogHandler->getCount(new Criteria('blog_feed', Request::getString('blog_feed', '', 'POST')))) {
                 redirect_header('admin.blog.php', 2, planet_constant('AM_BLOGEXISTS'));
             }
@@ -126,7 +126,7 @@ 
             unset($blog_obj);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* add a list of blogs to a category */
     // no break
@@ -139,7 +139,7 @@ 
             $categoryHandler->addBlogs(Request::getArray('category_dest', [], 'POST'), $blog_id);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . Request::getArray('category_dest', [], 'POST') . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.Request::getArray('category_dest', [], 'POST').'&start='.$start, 2, $message);
 
     /* remove a list of blogs from a category */
     // no break
@@ -152,7 +152,7 @@ 
             $categoryHandler->removeBlogs($category_id, $blog_id);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* delete a single blog or a list blogs */
     // no break
@@ -167,7 +167,7 @@ 
             unset($blog_obj);
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* empty a single blog or a list blogs */
     // no break
@@ -181,7 +181,7 @@ 
             }
         }
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* approve a single blog or a list blogs */
     // no break
@@ -189,10 +189,10 @@ 
         if (!is_array($blog_id)) {
             $blog_id = [$blog_id];
         }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        $criteria = new Criteria('blog_id', '('.implode(',', $blog_id).')', 'IN');
         $blogHandler->updateAll('blog_status', 1, $criteria, true);
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* mark a single blog or a list blogs as featured */
     // no break
@@ -200,10 +200,10 @@ 
         if (!is_array($blog_id)) {
             $blog_id = [$blog_id];
         }
-        $criteria = new Criteria('blog_id', '(' . implode(',', $blog_id) . ')', 'IN');
+        $criteria = new Criteria('blog_id', '('.implode(',', $blog_id).')', 'IN');
         $blogHandler->updateAll('blog_status', 2, $criteria, true);
         $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.blog.php?category=' . $category_id . '&start=' . $start, 2, $message);
+        redirect_header('admin.blog.php?category='.$category_id.'&start='.$start, 2, $message);
 
     /* edit a single blog */
     // no break
@@ -211,11 +211,11 @@ 
         if (!empty(Request::getString('fetch', '', 'POST'))) {
             $blog_obj = $blogHandler->fetch(Request::getString('blog_feed', '', 'POST'));
             $blog_obj->setVar('blog_id', $blog_id);
-        } else {
+        }else {
             $blog_obj = $blogHandler->get($blog_id);
         }
         $categories = Request::getArray('categories', [], 'POST');
-        if (empty($categories) && $blog_id > 0) {
+        if (empty($categories) && $blog_id>0) {
             $crit       = new Criteria('bc.blog_id', $blog_id);
             $categories = array_keys($categoryHandler->getByBlog($crit));
         }
@@ -223,21 +223,21 @@ 
             $categories = [0 => _NONE];
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._EDIT.'</legend>';
         echo '<br>';
         if (empty($blog_id) && $blog_obj->getVar('blog_feed')) {
             $criteria  = new Criteria('blog_feed', $blog_obj->getVar('blog_feed'));
             $blogs_obj = $blogHandler->getList($criteria);
-            if (count($blogs_obj) > 0) {
-                echo "<div class=\"errorMsg\">" . planet_constant('AM_BLOGEXISTS');
+            if (count($blogs_obj)>0) {
+                echo "<div class=\"errorMsg\">".planet_constant('AM_BLOGEXISTS');
                 foreach (array_keys($blogs_obj) as $bid) {
-                    echo "<br><a href=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "\" target=\"_blank\">" . $blogs_obj[$bid] . '</a>';
+                    echo "<br><a href=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$bid."\" target=\"_blank\">".$blogs_obj[$bid].'</a>';
                 }
                 echo '</div>';
             }
             unset($blogs_obj, $criteria);
         }
-        include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
+        include XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/form.blog.php';
         echo '</fieldset>';
         break;
 
@@ -265,14 +265,14 @@ 
         $opform->addElement($op_select);
         $opform->display();
 
-        if ($category_id > 0) {
+        if ($category_id>0) {
             $criteria = new CriteriaCompo(new Criteria('b.blog_status', 0, '>'));
             $criteria->add(new Criteria('bc.cat_id', $category_id));
             $blog_count = $blogHandler->getCountByCategory($criteria);
             $criteria->setStart($start);
             $criteria->setLimit($xoopsModuleConfig['list_perpage']);
             $blog_objs = $blogHandler->getByCategory($criteria);
-        } else {
+        }else {
             /* All active blogs */
             if ($category_id == 0) {
                 $criteria = new Criteria('1', 1);
@@ -289,7 +289,7 @@ 
                 $criteria->setStart($start);
                 $criteria->setLimit($xoopsModuleConfig['list_perpage']);
                 /* Pending blogs */
-            } else {
+            }else {
                 $criteria = new Criteria('blog_status', 0);
                 $criteria->setStart($start);
                 $criteria->setLimit($xoopsModuleConfig['list_perpage']);
@@ -298,19 +298,19 @@ 
             $blog_objs  = $blogHandler->getAll($criteria);
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>".planet_constant('AM_LIST').'</legend>';
         echo "<br style=\"clear:both\">";
 
-        echo "<form name='list' id='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo "<form name='list' id='list' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
         echo "<th class='bg3' width='5%'><input name='blog_check' id='blog_check' value='1' type='checkbox'  onclick=\"xoopsCheckAll('list', 'blog_check');\"></td>";
-        echo "<th class='bg3'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_STATUS') . '</td>';
-        echo "<th class='bg3' width='40%'>" . planet_constant('AM_FEED') . '</td>';
+        echo "<th class='bg3'>".planet_constant('AM_TITLE').'</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_STATUS').'</td>';
+        echo "<th class='bg3' width='40%'>".planet_constant('AM_FEED').'</td>';
         //        echo "<th class='bg3' width='5%'>" . _EDIT . "</td>";
         //        echo "<th class='bg3' width='5%'>" . _DELETE . "</td>";
-        echo "<th class='bg3' width='10%'>" . planet_constant('AM_ACTIONS') . '</td>';
+        echo "<th class='bg3' width='10%'>".planet_constant('AM_ACTIONS').'</td>';
         echo '</tr>';
 
         $status = [
@@ -320,53 +320,53 @@ 
         ];
         foreach (array_keys($blog_objs) as $bid) {
             echo "<tr class='odd' align='left'>";
-            echo "<td align='center'><input name='blog[]' value='" . $bid . "' type='checkbox'></td>";
-            echo "<td><a href='" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $bid . "'>" . $blog_objs[$bid]->getVar('blog_title') . '</a></td>';
-            echo "<td align='center'>" . $status[$blog_objs[$bid]->getVar('blog_status')] . '</td>';
-            echo '<td>' . $blog_objs[$bid]->getVar('blog_feed') . '</td>';
-            echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=" . $bid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . " title='" . _EDIT . " </a>
-                      <a href='admin.blog.php?op=del&amp;blog=" . $bid . "' title='" . _DELETE . "'><img src='" . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . " title='" . _DELETE . " </a>&nbsp;
-                      <a href='admin.blog.php?op=empty&amp;blog=" . $bid . "' title='" . planet_constant('MD_EMPTY_BLOG') . "'><img src='" . $pathIcon16 . "/empty.png '" . " alt='" . _EDIT . " title='" . planet_constant('MD_EMPTY_BLOG') . '</a></td>';
+            echo "<td align='center'><input name='blog[]' value='".$bid."' type='checkbox'></td>";
+            echo "<td><a href='".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$bid."'>".$blog_objs[$bid]->getVar('blog_title').'</a></td>';
+            echo "<td align='center'>".$status[$blog_objs[$bid]->getVar('blog_status')].'</td>';
+            echo '<td>'.$blog_objs[$bid]->getVar('blog_feed').'</td>';
+            echo "<td align='center'><a href='admin.blog.php?op=edit&amp;blog=".$bid."' title='"._EDIT."'><img src='".$pathIcon16."/edit.png '"."alt='"._EDIT." title='"._EDIT." </a>
+                      <a href='admin.blog.php?op=del&amp;blog=" . $bid."' title='"._DELETE."'><img src='".$pathIcon16."/delete.png '"." alt='"._EDIT." title='"._DELETE." </a>&nbsp;
+                      <a href='admin.blog.php?op=empty&amp;blog=" . $bid."' title='".planet_constant('MD_EMPTY_BLOG')."'><img src='".$pathIcon16."/empty.png '"." alt='"._EDIT." title='".planet_constant('MD_EMPTY_BLOG').'</a></td>';
 
             echo '</tr>';
         }
         echo "<tr class='even' align='center'>";
         echo "<td colspan='7'>";
         echo "<select name='op' onChange='if (this.options[this.selectedIndex].value==\"register\") {setVisible(\"catdiv\");} else {setHidden(\"catdiv\");}'>";
-        echo "<option value=''>" . _SELECT . '</option>';
-        echo "<option value='del'>" . _DELETE . '</option>';
-        echo "<option value='empty'>" . planet_constant('MD_EMPTY_BLOG') . '</option>';
-        echo "<option value='register'>" . planet_constant('AM_REGISTER') . '</option>';
-        if ($category_id > 0) {
-            echo "<option value='remove'>" . planet_constant('AM_REMOVE') . '</option>';
+        echo "<option value=''>"._SELECT.'</option>';
+        echo "<option value='del'>"._DELETE.'</option>';
+        echo "<option value='empty'>".planet_constant('MD_EMPTY_BLOG').'</option>';
+        echo "<option value='register'>".planet_constant('AM_REGISTER').'</option>';
+        if ($category_id>0) {
+            echo "<option value='remove'>".planet_constant('AM_REMOVE').'</option>';
         }
-        echo "<option value='approve'>" . planet_constant('AM_APPROVE') . '</option>';
-        echo "<option value='feature'>" . planet_constant('AM_FEATURE') . '</option>';
-        echo "<option value='update'>" . planet_constant('AM_UPDATE') . '</option>';
+        echo "<option value='approve'>".planet_constant('AM_APPROVE').'</option>';
+        echo "<option value='feature'>".planet_constant('AM_FEATURE').'</option>';
+        echo "<option value='update'>".planet_constant('AM_UPDATE').'</option>';
 
-        echo "<option value='pending'>" . planet_constant('AM_PENDING') . '</option>';
-        echo "<option value='active'>" . planet_constant('AM_ACTIVE') . '</option>';
+        echo "<option value='pending'>".planet_constant('AM_PENDING').'</option>';
+        echo "<option value='active'>".planet_constant('AM_ACTIVE').'</option>';
 
         echo '</select>';
         echo "<div id='catdiv' style='visibility:hidden;display:inline;'>";
         echo "<select name='category_dest'>";
-        echo "<option value=''>" . _SELECT . '</option>';
+        echo "<option value=''>"._SELECT.'</option>';
         foreach ($categories as $cid => $name) {
-            echo "<option value='" . $cid . "'>" . $name . '</option>';
+            echo "<option value='".$cid."'>".$name.'</option>';
         }
         echo '</select>';
         echo '</div>';
-        echo "<input name='start' value='" . $start . "' type='hidden'>";
-        echo "<input name='category' value='" . $category_id . "' type='hidden'>";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
-        echo "<input name='' value='" . _CANCEL . "' type='reset'>";
+        echo "<input name='start' value='".$start."' type='hidden'>";
+        echo "<input name='category' value='".$category_id."' type='hidden'>";
+        echo "<input name='submit' value='"._SUBMIT."' type='submit'>";
+        echo "<input name='' value='"._CANCEL."' type='reset'>";
         echo '</td>';
         echo '</tr>';
-        if ($blog_count > $xoopsModuleConfig['list_perpage']) {
-            include XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category=' . $category_id);
+        if ($blog_count>$xoopsModuleConfig['list_perpage']) {
+            include XOOPS_ROOT_PATH.'/class/pagenav.php';
+            $nav     = new XoopsPageNav($blog_count, $xoopsModuleConfig['list_perpage'], $start, 'start', 'category='.$category_id);
             $pagenav = $nav->renderNav(4);
-            echo "<tr align='right'><td colspan='6'>" . $pagenav . '</td></tr>';
+            echo "<tr align='right'><td colspan='6'>".$pagenav.'</td></tr>';
         }
         echo '</table></form>';
         echo "</fieldset><br style='clear:both;'>";
@@ -392,7 +392,7 @@ 
             $button_tray->addElement($butt_cancel);
             $form_add->addElement($button_tray);
 
-            echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+            echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._ADD.'</legend>';
             echo '<br>';
             $form->display();
             $form_add->display();

admin/menu.php

Indentation +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 
 if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
 } else {
-    $moduleHelper = Xmf\Module\Helper::getHelper('system');
+	$moduleHelper = Xmf\Module\Helper::getHelper('system');
 }
 
 

Spacing +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
 $moduleDirName = basename(dirname(__DIR__));
 
 if (false !== ($moduleHelper = Xmf\Module\Helper::getHelper($moduleDirName))) {
-} else {
+}else {
     $moduleHelper = Xmf\Module\Helper::getHelper('system');
 }
 
@@ -42,24 +42,24 @@ 
 $i                      = 0;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_HOME;
 $adminmenu[$i]['link']  = 'admin/index.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/home.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/home.png';
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_INDEX');
 $adminmenu[$i]['link']  = 'admin/main.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/manage.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/manage.png';
 
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_CATEGORY');
 $adminmenu[$i]['link']  = 'admin/admin.category.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/category.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/category.png';
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_BLOG');
 $adminmenu[$i]['link']  = 'admin/admin.blog.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/translations.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/translations.png';
 ++$i;
 $adminmenu[$i]['title'] = planet_constant('MI_ADMENU_ARTICLE');
 $adminmenu[$i]['link']  = 'admin/admin.article.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/content.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/content.png';
 //++$i;
 //$adminmenu[$i]['title'] = planet_constant("MI_ADMENU_BLOCK");
 //$adminmenu[$i]['link'] = "admin/admin.block.php";
@@ -67,4 +67,4 @@ 
 ++$i;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
 $adminmenu[$i]['link']  = 'admin/about.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/about.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/about.png';

admin/admin.category.php

Indentation +129 added lines, -129 removed lines

@@ -41,136 +41,136 @@
 $blogHandler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 
 switch ($op) {
-    case 'save':
-        if ($cat_id) {
-            $category_obj = $categoryHandler->get($cat_id);
-        } else {
-            $category_obj = $categoryHandler->create();
-        }
-
-        $category_obj->setVar('cat_title', $_POST['cat_title']);
-        $category_obj->setVar('cat_order', $_POST['cat_order']);
-
-        if (!$categoryHandler->insert($category_obj)) {
-            $message = planet_constant('AM_ERROR');
-        } else {
-            $message = planet_constant('AM_DBUPDATED');
-        }
-        redirect_header('admin.category.php', 2, $message);
-
-        // no break
-    case 'del':
-        if (!is_array($cat_id)) {
-            $cat_id = [$cat_id];
-        }
-        foreach ($cat_id as $cid) {
-            $category_obj = $categoryHandler->get($cid);
-            if (!$categoryHandler->delete($category_obj)) {
-            }
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.category.php', 2, $message);
-
-        // no break
-    case 'order':
-        $count = count($_POST['cat_order']);
-        for ($i = 0; $i < $count; ++$i) {
-            $category_obj = $categoryHandler->get($_POST['cat'][$i]);
-            $category_obj->setVar('cat_order', $_POST['cat_order'][$i]);
-            $categoryHandler->insert($category_obj, true);
-            unset($category_obj);
-        }
-        $message = planet_constant('AM_DBUPDATED');
-        redirect_header('admin.category.php', 2, $message);
-
-        // no break
-    case 'edit':
-        $category_obj = $categoryHandler->get($cat_id);
-        $form         = new XoopsThemeForm(_EDIT, 'edit', xoops_getenv('PHP_SELF'), 'post', true);
-        $form->addElement(new XoopsFormText(planet_constant('AM_TITLE'), 'cat_title', 50, 80, $category_obj->getVar('cat_title', 'E')), true);
-        $form->addElement(new XoopsFormText(planet_constant('AM_ORDER'), 'cat_order', 5, 10, $category_obj->getVar('cat_order')), false);
-        $form->addElement(new XoopsFormHidden('category', $cat_id));
-        $form->addElement(new XoopsFormHidden('op', 'save'));
-
-        $button_tray = new XoopsFormElementTray('', '');
-        $butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-        $button_tray->addElement($butt_save);
-        $butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
-        $button_tray->addElement($butt_cancel);
-        $form->addElement($button_tray);
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
-        echo '<br>';
-        $form->display();
-        echo '</fieldset>';
-        break;
-
-    default:
-        $crit = new Criteria('1', 1);
-        $crit->setSort('cat_order');
-        $crit->setOrder('ASC');
-        $categories  = $categoryHandler->getList($crit);
-        $blog_counts = $blogHandler->getCountsByCategory();
-        foreach (array_keys($categories) as $cid) {
-            if (!empty($blog_counts[$cid])) {
-                $categories[$cid] .= ' (' . (int)$blog_counts[$cid] . ')';
-            }
-        }
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
-        echo "<br style=\"clear:both;\">";
-
-        echo "<form name='list' method='post'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ORDER') . '</td>';
-        echo "<th align='left' class='bg3' width='80%'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_BLOGCOUNT') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ACTIONS') . '</td>';
-        //        echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
-
-        echo '</tr>';
-
-        $ii = 0;
-        foreach (array_keys($categories) as $cid) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td><input type='hidden' name='cat[]' value='" . $cid . "'>";
-            echo "<input type='text' name='cat_order[]' value='" . ($ii * 10) . "'></td>";
-            echo '<td>' . $categories[$cid] . '</td>';
-            echo "<td align='center'>" . @$blog_counts[$cid] . '</td>';
-
-            echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='" . $cid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . "' title='" . _EDIT . "' </a>&nbsp;
+	case 'save':
+		if ($cat_id) {
+			$category_obj = $categoryHandler->get($cat_id);
+		} else {
+			$category_obj = $categoryHandler->create();
+		}
+
+		$category_obj->setVar('cat_title', $_POST['cat_title']);
+		$category_obj->setVar('cat_order', $_POST['cat_order']);
+
+		if (!$categoryHandler->insert($category_obj)) {
+			$message = planet_constant('AM_ERROR');
+		} else {
+			$message = planet_constant('AM_DBUPDATED');
+		}
+		redirect_header('admin.category.php', 2, $message);
+
+		// no break
+	case 'del':
+		if (!is_array($cat_id)) {
+			$cat_id = [$cat_id];
+		}
+		foreach ($cat_id as $cid) {
+			$category_obj = $categoryHandler->get($cid);
+			if (!$categoryHandler->delete($category_obj)) {
+			}
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.category.php', 2, $message);
+
+		// no break
+	case 'order':
+		$count = count($_POST['cat_order']);
+		for ($i = 0; $i < $count; ++$i) {
+			$category_obj = $categoryHandler->get($_POST['cat'][$i]);
+			$category_obj->setVar('cat_order', $_POST['cat_order'][$i]);
+			$categoryHandler->insert($category_obj, true);
+			unset($category_obj);
+		}
+		$message = planet_constant('AM_DBUPDATED');
+		redirect_header('admin.category.php', 2, $message);
+
+		// no break
+	case 'edit':
+		$category_obj = $categoryHandler->get($cat_id);
+		$form         = new XoopsThemeForm(_EDIT, 'edit', xoops_getenv('PHP_SELF'), 'post', true);
+		$form->addElement(new XoopsFormText(planet_constant('AM_TITLE'), 'cat_title', 50, 80, $category_obj->getVar('cat_title', 'E')), true);
+		$form->addElement(new XoopsFormText(planet_constant('AM_ORDER'), 'cat_order', 5, 10, $category_obj->getVar('cat_order')), false);
+		$form->addElement(new XoopsFormHidden('category', $cat_id));
+		$form->addElement(new XoopsFormHidden('op', 'save'));
+
+		$button_tray = new XoopsFormElementTray('', '');
+		$butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+		$button_tray->addElement($butt_save);
+		$butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
+		$button_tray->addElement($butt_cancel);
+		$form->addElement($button_tray);
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+		echo '<br>';
+		$form->display();
+		echo '</fieldset>';
+		break;
+
+	default:
+		$crit = new Criteria('1', 1);
+		$crit->setSort('cat_order');
+		$crit->setOrder('ASC');
+		$categories  = $categoryHandler->getList($crit);
+		$blog_counts = $blogHandler->getCountsByCategory();
+		foreach (array_keys($categories) as $cid) {
+			if (!empty($blog_counts[$cid])) {
+				$categories[$cid] .= ' (' . (int)$blog_counts[$cid] . ')';
+			}
+		}
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+		echo "<br style=\"clear:both;\">";
+
+		echo "<form name='list' method='post'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='5%'>" . planet_constant('AM_ORDER') . '</td>';
+		echo "<th align='left' class='bg3' width='80%'>" . planet_constant('AM_TITLE') . '</td>';
+		echo "<th class='bg3' width='5%'>" . planet_constant('AM_BLOGCOUNT') . '</td>';
+		echo "<th class='bg3' width='5%'>" . planet_constant('AM_ACTIONS') . '</td>';
+		//        echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
+
+		echo '</tr>';
+
+		$ii = 0;
+		foreach (array_keys($categories) as $cid) {
+			echo "<tr class='odd' align='left'>";
+			echo "<td><input type='hidden' name='cat[]' value='" . $cid . "'>";
+			echo "<input type='text' name='cat_order[]' value='" . ($ii * 10) . "'></td>";
+			echo '<td>' . $categories[$cid] . '</td>';
+			echo "<td align='center'>" . @$blog_counts[$cid] . '</td>';
+
+			echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='" . $cid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . "' title='" . _EDIT . "' </a>&nbsp;
                   <a href='admin.category.php?op=del &amp;category='" . $cid . "' title='" . _DELETE . "'><img src='" . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . "' title='" . _DELETE . "' </a></td>";
-            echo '</tr>';
-            ++$ii;
-        }
-        echo "<tr class='even' align='center'>";
-        echo "<td colspan='5'>";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
-        echo "<input name='' value='" . _CANCEL . "' type='reset'>";
-        echo "<input name='op' value='order' type='hidden'>";
-        echo '</td>';
-        echo '</tr>';
-        echo '</table></form>';
-        echo "</fieldset><br style='clear:both;'>";
-
-        $form = new XoopsThemeForm(_ADD, 'mod', xoops_getenv('PHP_SELF'), 'post', true);
-        $form->addElement(new XoopsFormText(planet_constant('AM_TITLE'), 'cat_title', 50, 80), true);
-        $form->addElement(new XoopsFormText(planet_constant('AM_ORDER'), 'cat_order', 5, 10), false);
-        $form->addElement(new XoopsFormHidden('op', 'save'));
-
-        $button_tray = new XoopsFormElementTray('', '');
-        $butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-        $button_tray->addElement($butt_save);
-        $butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
-        $button_tray->addElement($butt_cancel);
-        $form->addElement($button_tray);
-
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
-        echo '<br>';
-        $form->display();
-        echo '</fieldset>';
-        break;
+			echo '</tr>';
+			++$ii;
+		}
+		echo "<tr class='even' align='center'>";
+		echo "<td colspan='5'>";
+		echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
+		echo "<input name='' value='" . _CANCEL . "' type='reset'>";
+		echo "<input name='op' value='order' type='hidden'>";
+		echo '</td>';
+		echo '</tr>';
+		echo '</table></form>';
+		echo "</fieldset><br style='clear:both;'>";
+
+		$form = new XoopsThemeForm(_ADD, 'mod', xoops_getenv('PHP_SELF'), 'post', true);
+		$form->addElement(new XoopsFormText(planet_constant('AM_TITLE'), 'cat_title', 50, 80), true);
+		$form->addElement(new XoopsFormText(planet_constant('AM_ORDER'), 'cat_order', 5, 10), false);
+		$form->addElement(new XoopsFormHidden('op', 'save'));
+
+		$button_tray = new XoopsFormElementTray('', '');
+		$butt_save   = new XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+		$button_tray->addElement($butt_save);
+		$butt_cancel = new XoopsFormButton('', '', _CANCEL, 'reset');
+		$button_tray->addElement($butt_cancel);
+		$form->addElement($button_tray);
+
+		echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+		echo '<br>';
+		$form->display();
+		echo '</fieldset>';
+		break;
 }
 
 xoops_cp_footer();

Spacing +23 added lines, -23 removed lines

@@ -24,18 +24,18 @@ 
 // URL: https://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-require_once __DIR__ . '/admin_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 xoops_cp_header();
 $adminObject = \Xmf\Module\Admin::getInstance();
 $adminObject->displayNavigation(basename(__FILE__));
-require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 //planet_adminmenu(1);
 
 $op     = !empty($_POST['op']) ? $_POST['op'] : (!empty($_GET['op']) ? $_GET['op'] : '');
 $cat_id = !empty($_POST['category']) ? $_POST['category'] : (!empty($_GET['category']) ? $_GET['category'] : 0);
-$cat_id = is_array($cat_id) ? array_map('intval', $cat_id) : (int)$cat_id;
+$cat_id = is_array($cat_id) ? array_map('intval', $cat_id) : (int) $cat_id;
 
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 $blogHandler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
@@ -44,7 +44,7 @@ 
     case 'save':
         if ($cat_id) {
             $category_obj = $categoryHandler->get($cat_id);
-        } else {
+        }else {
             $category_obj = $categoryHandler->create();
         }
 
@@ -53,7 +53,7 @@ 
 
         if (!$categoryHandler->insert($category_obj)) {
             $message = planet_constant('AM_ERROR');
-        } else {
+        }else {
             $message = planet_constant('AM_DBUPDATED');
         }
         redirect_header('admin.category.php', 2, $message);
@@ -74,7 +74,7 @@ 
         // no break
     case 'order':
         $count = count($_POST['cat_order']);
-        for ($i = 0; $i < $count; ++$i) {
+        for ($i = 0; $i<$count; ++$i) {
             $category_obj = $categoryHandler->get($_POST['cat'][$i]);
             $category_obj->setVar('cat_order', $_POST['cat_order'][$i]);
             $categoryHandler->insert($category_obj, true);
@@ -99,7 +99,7 @@ 
         $button_tray->addElement($butt_cancel);
         $form->addElement($button_tray);
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _EDIT . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._EDIT.'</legend>';
         echo '<br>';
         $form->display();
         echo '</fieldset>';
@@ -113,20 +113,20 @@ 
         $blog_counts = $blogHandler->getCountsByCategory();
         foreach (array_keys($categories) as $cid) {
             if (!empty($blog_counts[$cid])) {
-                $categories[$cid] .= ' (' . (int)$blog_counts[$cid] . ')';
+                $categories[$cid] .= ' ('.(int) $blog_counts[$cid].')';
             }
         }
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . planet_constant('AM_LIST') . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>".planet_constant('AM_LIST').'</legend>';
         echo "<br style=\"clear:both;\">";
 
         echo "<form name='list' method='post'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ORDER') . '</td>';
-        echo "<th align='left' class='bg3' width='80%'>" . planet_constant('AM_TITLE') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_BLOGCOUNT') . '</td>';
-        echo "<th class='bg3' width='5%'>" . planet_constant('AM_ACTIONS') . '</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_ORDER').'</td>';
+        echo "<th align='left' class='bg3' width='80%'>".planet_constant('AM_TITLE').'</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_BLOGCOUNT').'</td>';
+        echo "<th class='bg3' width='5%'>".planet_constant('AM_ACTIONS').'</td>';
         //        echo "<td class='bg3' width='5%'>" . _DELETE . "</td>";
 
         echo '</tr>';
@@ -134,20 +134,20 @@ 
         $ii = 0;
         foreach (array_keys($categories) as $cid) {
             echo "<tr class='odd' align='left'>";
-            echo "<td><input type='hidden' name='cat[]' value='" . $cid . "'>";
-            echo "<input type='text' name='cat_order[]' value='" . ($ii * 10) . "'></td>";
-            echo '<td>' . $categories[$cid] . '</td>';
-            echo "<td align='center'>" . @$blog_counts[$cid] . '</td>';
+            echo "<td><input type='hidden' name='cat[]' value='".$cid."'>";
+            echo "<input type='text' name='cat_order[]' value='".($ii*10)."'></td>";
+            echo '<td>'.$categories[$cid].'</td>';
+            echo "<td align='center'>".@$blog_counts[$cid].'</td>';
 
-            echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='" . $cid . "' title='" . _EDIT . "'><img src='" . $pathIcon16 . "/edit.png '" . "alt='" . _EDIT . "' title='" . _EDIT . "' </a>&nbsp;
-                  <a href='admin.category.php?op=del &amp;category='" . $cid . "' title='" . _DELETE . "'><img src='" . $pathIcon16 . "/delete.png '" . " alt='" . _EDIT . "' title='" . _DELETE . "' </a></td>";
+            echo "<td align='center'><a href='admin.category.php?op=edit &amp;category='".$cid."' title='"._EDIT."'><img src='".$pathIcon16."/edit.png '"."alt='"._EDIT."' title='"._EDIT."' </a>&nbsp;
+                  <a href='admin.category.php?op=del &amp;category='" . $cid."' title='"._DELETE."'><img src='".$pathIcon16."/delete.png '"." alt='"._EDIT."' title='"._DELETE."' </a></td>";
             echo '</tr>';
             ++$ii;
         }
         echo "<tr class='even' align='center'>";
         echo "<td colspan='5'>";
-        echo "<input name='submit' value='" . _SUBMIT . "' type='submit'>";
-        echo "<input name='' value='" . _CANCEL . "' type='reset'>";
+        echo "<input name='submit' value='"._SUBMIT."' type='submit'>";
+        echo "<input name='' value='"._CANCEL."' type='reset'>";
         echo "<input name='op' value='order' type='hidden'>";
         echo '</td>';
         echo '</tr>';
@@ -166,7 +166,7 @@ 
         $button_tray->addElement($butt_cancel);
         $form->addElement($button_tray);
 
-        echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _ADD . '</legend>';
+        echo "<fieldset><legend style='font-weight: bold; color: #900;'>"._ADD.'</legend>';
         echo '<br>';
         $form->display();
         echo '</fieldset>';

print.php

Indentation +57 added lines, -57 removed lines

@@ -31,44 +31,44 @@ 
 error_reporting(0);
 
 if (empty(Request::getString('print_data', '', 'POST'))) {
-    //$_POST['print_data']))
+	//$_POST['print_data']))
 
-    if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-        $args['article'] = @$args_num[0];
-    }
+	if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
+		$args['article'] = @$args_num[0];
+	}
 
-    $article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
+	$article_id = Request::getInt('article', @$args['article'], 'POST');//(int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
 
-    $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj    = $articleHandler->get($article_id);
+	$articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj    = $articleHandler->get($article_id);
 
-    $article_data = [];
+	$article_data = [];
 
-    // title
-    $article_data['title'] = $article_obj->getVar('art_title');
+	// title
+	$article_data['title'] = $article_obj->getVar('art_title');
 
-    $article_data['author'] = $article_obj->getVar('art_author');
+	$article_data['author'] = $article_obj->getVar('art_author');
 
-    // source
-    $article_data['source'] = $article_obj->getVar('art_link');
+	// source
+	$article_data['source'] = $article_obj->getVar('art_link');
 
-    // publish time
-    $article_data['time'] = $article_obj->getTime('l');
+	// publish time
+	$article_data['time'] = $article_obj->getTime('l');
 
-    // summary
-    $article_data['summary'] =& $article_obj->getSummary();
+	// summary
+	$article_data['summary'] =& $article_obj->getSummary();
 
-    // text of page
-    $article_data['text'] = $article_obj->getVar('art_content');
+	// text of page
+	$article_data['text'] = $article_obj->getVar('art_content');
 
-    $print_data['title']   = $article_data['title'];
-    $print_data['author']  = $article_data['author'];
-    $print_data['date']    = $article_data['time'];
-    $print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'];
-    $print_data['content'] = $article_data['text'];
-    $print_data['url']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/view.article.php' . URL_DELIMITER . 'c' . $category_id . '/' . $article_id . '/p' . $page;
+	$print_data['title']   = $article_data['title'];
+	$print_data['author']  = $article_data['author'];
+	$print_data['date']    = $article_data['time'];
+	$print_data['summary'] = empty($article_data['summary']) ? '' : planet_constant('MD_SUMMARY') . ': ' . $article_data['summary'];
+	$print_data['content'] = $article_data['text'];
+	$print_data['url']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/view.article.php' . URL_DELIMITER . 'c' . $category_id . '/' . $article_id . '/p' . $page;
 } else {
-    $print_data = unserialize(base64_decode(Request::getString('print_data', '', 'POST')));//$_POST['print_data']));
+	$print_data = unserialize(base64_decode(Request::getString('print_data', '', 'POST')));//$_POST['print_data']));
 }
 
 $print_data['image']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image');
@@ -99,36 +99,36 @@ 
             </style>\n";
 echo "</head>\n";
 echo "<body style='background-color:#ffffff; color:#000000; font-family: Arial' onload='window.print()'>\n"
-     . "<div style='float:center; width: 750px; border: 1px solid #000; padding: 20px;'>\n"
-     . "<div style='text-align: center; display: block; margin: 0 0 6px 0; padding: 5px;'>\n"
-     . "<img src='"
-     . $print_data['image']
-     . "' border='0' alt='"
-     . $print_data['module']
-     . "'>\n"
-     . '<h2>'
-     . $print_data['title']
-     . "</h2>\n"
-     . "</div>\n"
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n";
+	 . "<div style='float:center; width: 750px; border: 1px solid #000; padding: 20px;'>\n"
+	 . "<div style='text-align: center; display: block; margin: 0 0 6px 0; padding: 5px;'>\n"
+	 . "<img src='"
+	 . $print_data['image']
+	 . "' border='0' alt='"
+	 . $print_data['module']
+	 . "'>\n"
+	 . '<h2>'
+	 . $print_data['title']
+	 . "</h2>\n"
+	 . "</div>\n"
+	 . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n";
 echo(empty($print_data['author']) ? '' : '<div>' . planet_constant('MD_AUTHOR') . ': ' . $print_data['author'] . "</div>\n")
-     . '<div>'
-     . planet_constant('MD_DATE')
-     . ': '
-     . $print_data['date']
-     . "</div>\n"
-     . (empty($article_data['summary']) ? '' : "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n" . '<div>' . $print_data['summary'] . "</div>\n")
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n"
-     . '<div>'
-     . $print_data['content']
-     . "</div>\n"
-     . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n"
-     . '<div>'
-     . $print_data['module']
-     . "</div>\n"
-     . '<div>URL: '
-     . $print_data['url']
-     . "</div>\n"
-     . "</div>\n"
-     . "</body>\n</html>\n";
+	 . '<div>'
+	 . planet_constant('MD_DATE')
+	 . ': '
+	 . $print_data['date']
+	 . "</div>\n"
+	 . (empty($article_data['summary']) ? '' : "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n" . '<div>' . $print_data['summary'] . "</div>\n")
+	 . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 1px solid #ccc;'></div>\n"
+	 . '<div>'
+	 . $print_data['content']
+	 . "</div>\n"
+	 . "<div style='margin-top: 12px; margin-bottom: 12px; border-top: 2px solid #ccc;'></div>\n"
+	 . '<div>'
+	 . $print_data['module']
+	 . "</div>\n"
+	 . '<div>URL: '
+	 . $print_data['url']
+	 . "</div>\n"
+	 . "</div>\n"
+	 . "</body>\n</html>\n";
 exit();

xml.php

Indentation +125 added lines, -125 removed lines

@@ -30,8 +30,8 @@ 
 include __DIR__ . '/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['article'] = @$args_num[0];
-    $args['type']    = @$args_str[0];
+	$args['article'] = @$args_num[0];
+	$args['type']    = @$args_str[0];
 }
 
 /* Specified Article */
@@ -48,14 +48,14 @@ 
 
 $valid_format = ['RSS0.91', 'RSS1.0', 'RSS2.0', 'PIE0.1', 'MBOX', 'OPML', 'ATOM', 'ATOM0.3', 'HTML', 'JS'];
 if ($type === 'RDF') {
-    $type = 'RSS1.0';
+	$type = 'RSS1.0';
 }
 if ($type === 'RSS') {
-    $type = 'RSS0.91';
+	$type = 'RSS0.91';
 }
 if (empty($type) || !in_array($type, $valid_format)) {
-    PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-    exit();
+	PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+	exit();
 }
 
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -64,30 +64,30 @@ 
 $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
 
 if (!empty($article_id)) {
-    $article_obj = $articleHandler->get($article_id);
-    if (!$article_obj->getVar('art_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_EXPIRED'));
-        exit();
-    }
-    $source = 'article';
+	$article_obj = $articleHandler->get($article_id);
+	if (!$article_obj->getVar('art_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_EXPIRED'));
+		exit();
+	}
+	$source = 'article';
 } elseif (!empty($blog_id)) {
-    $blog_obj = $blogHandler->get($blog_id);
-    if (!$blog_obj->getVar('blog_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-        exit();
-    }
-    $source = 'blog';
+	$blog_obj = $blogHandler->get($blog_id);
+	if (!$blog_obj->getVar('blog_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+		exit();
+	}
+	$source = 'blog';
 } elseif (!empty($category_id)) {
-    $source       = 'category';
-    $category_obj = $categoryHandler->get($category_id);
-    if (!$category_obj->getVar('cat_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-        exit();
-    }
+	$source       = 'category';
+	$category_obj = $categoryHandler->get($category_id);
+	if (!$category_obj->getVar('cat_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+		exit();
+	}
 } elseif (!empty($uid)) {
-    $source = 'bookmark';
+	$source = 'bookmark';
 } else {
-    $source = '';
+	$source = '';
 }
 
 $xml_charset = 'UTF-8';
@@ -97,102 +97,102 @@ 
 $tpl->xoops_setCacheTime(3600);
 $xoopsCachedTemplateId = md5($xoopsModule->getVar('mid') . ',' . $article_id . ',' . $category_id . ',' . $blog_id . ',' . $uid . ',' . $type);
 if (!$tpl->is_cached('db:system_dummy.tpl', $xoopsCachedTemplateId)) {
-    $criteria = new CriteriaCompo();
-    $criteria->setLimit($xoopsModuleConfig['articles_perpage']);
-    $articles_obj = [];
-    switch ($source) {
-        case 'article':
-            $pagetitle = planet_constant('MD_ARTICLE');
-            $rssdesc   = planet_constant('MD_XMLDESC_ARTICLE');
-
-            $articles_obj[$article_id] = $article_obj;
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
-            break;
-
-        case 'category':
-            $pagetitle = planet_constant('MD_CATEGORY');
-            $rssdesc   = sprintf(planet_constant('MD_XMLDESC_CATEGORY'), $category_obj->getVar('cat_title'));
-
-            $criteria->add(new Criteria('bc.cat_id', $category_id));
-            $articles_obj = $articleHandler->getByCategory($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c' . $category_id;
-            break;
-
-        case 'blog':
-            $pagetitle = planet_constant('MD_BLOG');
-            $rssdesc   = sprintf(planet_constant('MD_XMLDESC_BLOG'), $blog_obj->getVar('blog_title'));
-
-            $criteria->add(new Criteria('blog_id', $blog_id));
-            $articles_obj = $articleHandler->getAll($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id;
-            break;
-
-        case 'bookmark':
-            $author_name = XoopsUser::getUnameFromId($uid);
-            $pagetitle   = planet_constant('MD_BOOKMARKS');
-            $rssdesc     = sprintf(planet_constant('MD_XMLDESC_BOOKMARK'), $author_name);
-
-            $criteria->add(new Criteria('bm.bm_uid', $uid));
-            $articles_obj = $articleHandler->getByBookmark($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
-
-            break;
-
-        default:
-            $pagetitle = planet_constant('MD_INDEX');
-            $rssdesc   = planet_constant('MD_XMLDESC_INDEX');
-
-            $articles_obj = $articleHandler->getAll($criteria);
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
-            break;
-    }
-    $items = [];
-    foreach (array_keys($articles_obj) as $id) {
-        $content = $articles_obj[$id]->getVar('art_content');
-        $content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' ' . $articles_obj[$id]->getVar('art_author');
-        $items[] = [
-            'title'                     => $articles_obj[$id]->getVar('art_title'),
-            'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
-            'description'               => $content,
-            'descriptionHtmlSyndicated' => true,
-            'date'                      => $articles_obj[$id]->getTime('rss'),
-            'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
-            'author'                    => $articles_obj[$id]->getVar('art_author')
-        ];
-    }
-    unset($articles_obj, $criteria);
-
-    $xmlHandler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
-    $xml        = $xmlHandler->create($type);
-    $xml->setVar('encoding', $xml_charset);
-    $xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
-    $xml->setVar('description', $rssdesc, true);
-    $xml->setVar('descriptionHtmlSyndicated', true);
-    $xml->setVar('link', $xml_link);
-    $xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'), 'post', true);
-    $xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
-    $xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
-    $xml->setVar('category', $xoopsModule->getVar('name'), true);
-    $xml->setVar('generator', $xoopsModule->getInfo('version'));
-    $xml->setVar('language', _LANGCODE);
-
-    $dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'));
-    $image     = [
-        'width'       => $dimention[0],
-        'height'      => $dimention[1],
-        'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
-        'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
-        'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
-        'description' => $rssdesc
-    ];
-    $xml->setImage($image);
-
-    /*
+	$criteria = new CriteriaCompo();
+	$criteria->setLimit($xoopsModuleConfig['articles_perpage']);
+	$articles_obj = [];
+	switch ($source) {
+		case 'article':
+			$pagetitle = planet_constant('MD_ARTICLE');
+			$rssdesc   = planet_constant('MD_XMLDESC_ARTICLE');
+
+			$articles_obj[$article_id] = $article_obj;
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+			break;
+
+		case 'category':
+			$pagetitle = planet_constant('MD_CATEGORY');
+			$rssdesc   = sprintf(planet_constant('MD_XMLDESC_CATEGORY'), $category_obj->getVar('cat_title'));
+
+			$criteria->add(new Criteria('bc.cat_id', $category_id));
+			$articles_obj = $articleHandler->getByCategory($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c' . $category_id;
+			break;
+
+		case 'blog':
+			$pagetitle = planet_constant('MD_BLOG');
+			$rssdesc   = sprintf(planet_constant('MD_XMLDESC_BLOG'), $blog_obj->getVar('blog_title'));
+
+			$criteria->add(new Criteria('blog_id', $blog_id));
+			$articles_obj = $articleHandler->getAll($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id;
+			break;
+
+		case 'bookmark':
+			$author_name = XoopsUser::getUnameFromId($uid);
+			$pagetitle   = planet_constant('MD_BOOKMARKS');
+			$rssdesc     = sprintf(planet_constant('MD_XMLDESC_BOOKMARK'), $author_name);
+
+			$criteria->add(new Criteria('bm.bm_uid', $uid));
+			$articles_obj = $articleHandler->getByBookmark($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
+
+			break;
+
+		default:
+			$pagetitle = planet_constant('MD_INDEX');
+			$rssdesc   = planet_constant('MD_XMLDESC_INDEX');
+
+			$articles_obj = $articleHandler->getAll($criteria);
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+			break;
+	}
+	$items = [];
+	foreach (array_keys($articles_obj) as $id) {
+		$content = $articles_obj[$id]->getVar('art_content');
+		$content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' ' . $articles_obj[$id]->getVar('art_author');
+		$items[] = [
+			'title'                     => $articles_obj[$id]->getVar('art_title'),
+			'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
+			'description'               => $content,
+			'descriptionHtmlSyndicated' => true,
+			'date'                      => $articles_obj[$id]->getTime('rss'),
+			'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+			'author'                    => $articles_obj[$id]->getVar('art_author')
+		];
+	}
+	unset($articles_obj, $criteria);
+
+	$xmlHandler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
+	$xml        = $xmlHandler->create($type);
+	$xml->setVar('encoding', $xml_charset);
+	$xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
+	$xml->setVar('description', $rssdesc, true);
+	$xml->setVar('descriptionHtmlSyndicated', true);
+	$xml->setVar('link', $xml_link);
+	$xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'), 'post', true);
+	$xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
+	$xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
+	$xml->setVar('category', $xoopsModule->getVar('name'), true);
+	$xml->setVar('generator', $xoopsModule->getInfo('version'));
+	$xml->setVar('language', _LANGCODE);
+
+	$dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'));
+	$image     = [
+		'width'       => $dimention[0],
+		'height'      => $dimention[1],
+		'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
+		'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
+		'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+		'description' => $rssdesc
+	];
+	$xml->setImage($image);
+
+	/*
     $item = array(
         "title" => $datatitle,
         "link" => $dataurl,
@@ -203,11 +203,11 @@ 
         "author" => $dataauthor
         );
     */
-    $xml->addItems($items);
+	$xml->addItems($items);
 
-    $dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
+	$dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
 
-    $tpl->assign_by_ref('dummy_content', $dummy_content);
+	$tpl->assign_by_ref('dummy_content', $dummy_content);
 }
 //$content = ob_get_contents();
 ob_end_clean();

Spacing +20 added lines, -20 removed lines

@@ -27,7 +27,7 @@ 
 use Xmf\Request;
 
 ob_start();
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
     $args['article'] = @$args_num[0];
@@ -86,16 +86,16 @@ 
     }
 } elseif (!empty($uid)) {
     $source = 'bookmark';
-} else {
+}else {
     $source = '';
 }
 
 $xml_charset = 'UTF-8';
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 $tpl = new XoopsTpl();
 $tpl->xoops_setCaching(2);
 $tpl->xoops_setCacheTime(3600);
-$xoopsCachedTemplateId = md5($xoopsModule->getVar('mid') . ',' . $article_id . ',' . $category_id . ',' . $blog_id . ',' . $uid . ',' . $type);
+$xoopsCachedTemplateId = md5($xoopsModule->getVar('mid').','.$article_id.','.$category_id.','.$blog_id.','.$uid.','.$type);
 if (!$tpl->is_cached('db:system_dummy.tpl', $xoopsCachedTemplateId)) {
     $criteria = new CriteriaCompo();
     $criteria->setLimit($xoopsModuleConfig['articles_perpage']);
@@ -107,7 +107,7 @@ 
 
             $articles_obj[$article_id] = $article_obj;
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_obj->getVar('art_id');
             break;
 
         case 'category':
@@ -117,7 +117,7 @@ 
             $criteria->add(new Criteria('bc.cat_id', $category_id));
             $articles_obj = $articleHandler->getByCategory($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'c' . $category_id;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'c'.$category_id;
             break;
 
         case 'blog':
@@ -127,7 +127,7 @@ 
             $criteria->add(new Criteria('blog_id', $blog_id));
             $articles_obj = $articleHandler->getAll($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id;
             break;
 
         case 'bookmark':
@@ -138,7 +138,7 @@ 
             $criteria->add(new Criteria('bm.bm_uid', $uid));
             $articles_obj = $articleHandler->getByBookmark($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid;
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'u'.$uid;
 
             break;
 
@@ -148,20 +148,20 @@ 
 
             $articles_obj = $articleHandler->getAll($criteria);
 
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+            $xml_link = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
             break;
     }
     $items = [];
     foreach (array_keys($articles_obj) as $id) {
         $content = $articles_obj[$id]->getVar('art_content');
-        $content .= '<br>' . planet_constant('MD_SOURCE') . ': ' . $articles_obj[$id]->getVar('art_link') . ' ' . $articles_obj[$id]->getVar('art_author');
+        $content .= '<br>'.planet_constant('MD_SOURCE').': '.$articles_obj[$id]->getVar('art_link').' '.$articles_obj[$id]->getVar('art_author');
         $items[] = [
             'title'                     => $articles_obj[$id]->getVar('art_title'),
-            'link'                      => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $articles_obj[$id]->getVar('art_id'),
+            'link'                      => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$articles_obj[$id]->getVar('art_id'),
             'description'               => $content,
             'descriptionHtmlSyndicated' => true,
             'date'                      => $articles_obj[$id]->getTime('rss'),
-            'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+            'source'                    => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/',
             'author'                    => $articles_obj[$id]->getVar('art_author')
         ];
     }
@@ -170,24 +170,24 @@ 
     $xmlHandler = xoops_getModuleHandler('xml', $GLOBALS['moddirname']);
     $xml        = $xmlHandler->create($type);
     $xml->setVar('encoding', $xml_charset);
-    $xml->setVar('title', $xoopsConfig['sitename'] . ' :: ' . $pagetitle, 'UTF-8', $xml_charset, true);
+    $xml->setVar('title', $xoopsConfig['sitename'].' :: '.$pagetitle, 'UTF-8', $xml_charset, true);
     $xml->setVar('description', $rssdesc, true);
     $xml->setVar('descriptionHtmlSyndicated', true);
     $xml->setVar('link', $xml_link);
-    $xml->setVar('syndicationURL', XOOPS_URL . '/' . xoops_getenv('PHP_SELF'), 'post', true);
+    $xml->setVar('syndicationURL', XOOPS_URL.'/'.xoops_getenv('PHP_SELF'), 'post', true);
     $xml->setVar('webmaster', checkEmail($xoopsConfig['adminmail'], true));
     $xml->setVar('editor', checkEmail($xoopsConfig['adminmail'], true));
     $xml->setVar('category', $xoopsModule->getVar('name'), true);
     $xml->setVar('generator', $xoopsModule->getInfo('version'));
     $xml->setVar('language', _LANGCODE);
 
-    $dimention = @getimagesize(XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'));
+    $dimention = @getimagesize(XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/'.$xoopsModule->getInfo('image'));
     $image     = [
         'width'       => $dimention[0],
         'height'      => $dimention[1],
-        'title'       => $xoopsConfig['sitename'] . ' :: ' . $pagetitle,
-        'url'         => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/' . $xoopsModule->getInfo('image'),
-        'link'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+        'title'       => $xoopsConfig['sitename'].' :: '.$pagetitle,
+        'url'         => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/'.$xoopsModule->getInfo('image'),
+        'link'        => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/',
         'description' => $rssdesc
     ];
     $xml->setImage($image);
@@ -205,11 +205,11 @@ 
     */
     $xml->addItems($items);
 
-    $dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '.xml.tmp');
+    $dummy_content = $xmlHandler->display($xml, XOOPS_CACHE_PATH.'/'.$GLOBALS['moddirname'].'.xml.tmp');
 
     $tpl->assign_by_ref('dummy_content', $dummy_content);
 }
 //$content = ob_get_contents();
 ob_end_clean();
-header('Content-Type:text/xml; charset=' . $xml_charset);
+header('Content-Type:text/xml; charset='.$xml_charset);
 $tpl->display('db:system_dummy.tpl', $xoopsCachedTemplateId);