mambax7 / planet

class/feedcreator.class.php

Indentation +1199 added lines, -1199 removed lines

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

counter.php

Indentation +2 added lines, -2 removed lines

@@ -27,10 +27,10 @@
 include __DIR__ . '/header.php';
 $article_id = empty($_GET['article']) ? 0 : (int)$_GET['article'];
 if (empty($article_id)) {
-    return;
+	return;
 }
 if (planet_getcookie('art_' . $article_id) > 0) {
-    return;
+	return;
 }
 $article_handler = xoops_getModuleHandler('article', $xoopsModule->getVar('dirname'));
 $article_obj     =& $article_handler->get($article_id);

view.article.php

Indentation +33 added lines, -33 removed lines

@@ -32,17 +32,17 @@ 
  *
  */
 if (preg_match("/(\/comment_[^\.]*\.php\?.*=.*)/i", $_SERVER['REQUEST_URI'], $matches)) {
-    header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
-    exit();
+	header('location: ' . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . $matches[1]);
+	exit();
 }
 if (preg_match("/\/notification_update\.php/i", $_SERVER['REQUEST_URI'], $matches)) {
-    include XOOPS_ROOT_PATH . '/include/notification_update.php';
-    exit();
+	include XOOPS_ROOT_PATH . '/include/notification_update.php';
+	exit();
 }
 
 if ($REQUEST_URI_parsed = planet_parse_args($args_num, $args, $args_str)) {
-    $args['article'] = @$args_num[0];
-    $args['blog']    = @$args['blog'];
+	$args['article'] = @$args_num[0];
+	$args['blog']    = @$args['blog'];
 }
 
 $article_id = (int)(empty($_GET['article']) ? @$args['article'] : $_GET['article']);
@@ -55,8 +55,8 @@ 
 
 // restore $_SERVER['REQUEST_URI']
 if (!empty($REQUEST_URI_parsed)) {
-    $_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php'
-                              . (empty($article_id) ? '' : '?article=' . $article_id);
+	$_SERVER['REQUEST_URI'] = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php'
+							  . (empty($article_id) ? '' : '?article=' . $article_id);
 }
 
 $xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . $article_obj->getVar('art_title');
@@ -65,32 +65,32 @@ 
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
 
 $article_data = array(
-    'id'       => $article_id,
-    'title'    => $article_obj->getVar('art_title'),
-    'content'  => $article_obj->getVar('art_content'),
-    'author'   => $article_obj->getVar('art_author'),
-    'time'     => $article_obj->getTime(),
-    'link'     => $article_obj->getVar('art_link'),
-    'views'    => $article_obj->getVar('art_views'),
-    'comments' => $article_obj->getVar('art_comments'),
-    'star'     => $article_obj->getStar(),
-    'rates'    => $article_obj->getVar('art_rates'),
-    'blog'     => array('id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title'))
+	'id'       => $article_id,
+	'title'    => $article_obj->getVar('art_title'),
+	'content'  => $article_obj->getVar('art_content'),
+	'author'   => $article_obj->getVar('art_author'),
+	'time'     => $article_obj->getTime(),
+	'link'     => $article_obj->getVar('art_link'),
+	'views'    => $article_obj->getVar('art_views'),
+	'comments' => $article_obj->getVar('art_comments'),
+	'star'     => $article_obj->getStar(),
+	'rates'    => $article_obj->getVar('art_rates'),
+	'blog'     => array('id' => $article_obj->getVar('blog_id'), 'title' => $blog_obj->getVar('blog_title'))
 );
 
 if (!empty($xoopsModuleConfig['do_sibling'])) {
-    $articles_sibling =& $article_handler->getSibling($article_obj, $blog_id);
-    if (!empty($articles_sibling['previous'])) {
-        $articles_sibling['previous']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php'
-                                                 . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b'
-                                                 . $blog_id;
-        $articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
-    }
-    if (!empty($articles_sibling['next'])) {
-        $articles_sibling['next']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php'
-                                             . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
-        $articles_sibling['next']['title'] = $articles_sibling['next']['title'];
-    }
+	$articles_sibling =& $article_handler->getSibling($article_obj, $blog_id);
+	if (!empty($articles_sibling['previous'])) {
+		$articles_sibling['previous']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php'
+												 . URL_DELIMITER . '' . $articles_sibling['previous']['id'] . '/b'
+												 . $blog_id;
+		$articles_sibling['previous']['title'] = $articles_sibling['previous']['title'];
+	}
+	if (!empty($articles_sibling['next'])) {
+		$articles_sibling['next']['url']   = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php'
+											 . URL_DELIMITER . '' . $articles_sibling['next']['id'] . '/b' . $blog_id;
+		$articles_sibling['next']['title'] = $articles_sibling['next']['title'];
+	}
 }
 
 $xoopsTpl->assign('modulename', $xoopsModule->getVar('name'));
@@ -101,11 +101,11 @@ 
 $xoopsTpl->assign('user_level', !is_object($xoopsUser) ? 0 : ($xoopsUser->isAdmin() ? 2 : 1));
 if (empty($xoopsModuleConfig['anonymous_rate']) && !is_object($xoopsUser)) {
 } else {
-    $xoopsTpl->assign('canrate', 1);
+	$xoopsTpl->assign('canrate', 1);
 }
 
 if ($transferbar = @include XOOPS_ROOT_PATH . '/Frameworks/transfer/bar.transfer.php') {
-    $xoopsTpl->assign('transfer', $transferbar);
+	$xoopsTpl->assign('transfer', $transferbar);
 }
 
 // Loading module meta data, NOT THE RIGHT WAY DOING IT

search.php

Indentation +97 added lines, -97 removed lines

@@ -31,7 +31,7 @@ 
 $config_handler    = xoops_getHandler('config');
 $xoopsConfigSearch =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (empty($xoopsConfigSearch['enable_search'])) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php', 2, planet_constant('MD_NOACCESS'));
 }
 
 $xoopsConfig['module_cache'][$xoopsModule->getVar('mid')] = 0;
@@ -49,92 +49,92 @@ 
 $blog     = (int)(isset($_POST['blog']) ? $_POST['blog'] : (isset($_GET['blog']) ? $_GET['blog'] : null));
 $uid      = (int)(isset($_POST['uid']) ? $_POST['uid'] : (isset($_GET['uid']) ? $_GET['uid'] : null));
 $searchin = isset($_POST['searchin']) ? $_POST['searchin'] : (isset($_GET['searchin']) ? explode('|',
-                                                                                                 $_GET['searchin']) : array());
+																								 $_GET['searchin']) : array());
 $sortby   = isset($_POST['sortby']) ? $_POST['sortby'] : (isset($_GET['sortby']) ? $_GET['sortby'] : null);
 $term     = isset($_POST['term']) ? $_POST['term'] : (isset($_GET['term']) ? $_GET['term'] : '');
 
 $andor  = in_array(strtoupper($andor), array('OR', 'AND', 'EXACT')) ? strtoupper($andor) : 'OR';
 $sortby = in_array(strtolower($sortby), array(
-    'a.art_id desc',
-    'a.art_time desc',
-    'a.art_title',
-    'a.blog_id',
-    'b.blog_id',
-    'b.blog_feed',
-    'b.blog_title',
-    'b.blog_time'
+	'a.art_id desc',
+	'a.art_time desc',
+	'a.art_title',
+	'a.blog_id',
+	'b.blog_id',
+	'b.blog_feed',
+	'b.blog_title',
+	'b.blog_time'
 )) ? strtolower($sortby) : '';
 
 if (!(empty($_POST['submit']) && empty($_GET['term']))) {
-    $next_search['category'] = $category;
-    $next_search['blog']     = $blog;
-    $next_search['uid']      = $uid;
-    $next_search['andor']    = $andor;
+	$next_search['category'] = $category;
+	$next_search['blog']     = $blog;
+	$next_search['uid']      = $uid;
+	$next_search['andor']    = $andor;
 
-    $next_search['term'] = $term;
-    $query               = trim($term);
+	$next_search['term'] = $term;
+	$query               = trim($term);
 
-    if ($andor !== 'EXACT') {
-        $ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
-        $temp_queries    = preg_split("/[\s,]+/", $query);
-        foreach ($temp_queries as $q) {
-            $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
-                $queries[] = $myts->addSlashes($q);
-            } else {
-                $ignored_queries[] = $myts->addSlashes($q);
-            }
-        }
-        if (count($queries) == 0) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2,
-                            sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-    } else {
-        if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
-            redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2,
-                            sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-        $queries = array($myts->addSlashes($query));
-    }
+	if ($andor !== 'EXACT') {
+		$ignored_queries = array(); // holds kewords that are shorter than allowed minmum length
+		$temp_queries    = preg_split("/[\s,]+/", $query);
+		foreach ($temp_queries as $q) {
+			$q = trim($q);
+			if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
+				$queries[] = $myts->addSlashes($q);
+			} else {
+				$ignored_queries[] = $myts->addSlashes($q);
+			}
+		}
+		if (count($queries) == 0) {
+			redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2,
+							sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+	} else {
+		if (strlen($query) < $xoopsConfigSearch['keyword_min']) {
+			redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php', 2,
+							sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+		$queries = array($myts->addSlashes($query));
+	}
 
-    $next_search['sortby']   = $sortby;
-    $next_search['searchin'] = implode('|', $searchin);
+	$next_search['sortby']   = $sortby;
+	$next_search['searchin'] = implode('|', $searchin);
 
-    /* To be added: year-month
+	/* To be added: year-month
      * see view.archive.php
      */
-    if (!empty($time)) {
-        $extra = '';
-    } else {
-        $extra = '';
-    }
+	if (!empty($time)) {
+		$extra = '';
+	} else {
+		$extra = '';
+	}
 
-    $results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra);
+	$results = planet_search($queries, $andor, $limit, $start, $uid, $category, $blog, $sortby, $searchin, $extra);
 
-    /*
+	/*
     if ( count($results) < 1 ) {
         redirect_header("javascript:history.go(-1);", 2, _SR_NOMATCH);
     } else
     */
-    {
-        $xoopsTpl->assign('results', $results);
+	{
+		$xoopsTpl->assign('results', $results);
 
-        if (count($next_search) > 0) {
-            $items = array();
-            foreach ($next_search as $para => $val) {
-                if (!empty($val)) {
-                    $items[] = "$para=$val";
-                }
-            }
-            if (count($items) > 0) {
-                $paras = implode('&', $items);
-            }
-            unset($next_search);
-            unset($items);
-        }
-        $search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
+		if (count($next_search) > 0) {
+			$items = array();
+			foreach ($next_search as $para => $val) {
+				if (!empty($val)) {
+					$items[] = "$para=$val";
+				}
+			}
+			if (count($items) > 0) {
+				$paras = implode('&', $items);
+			}
+			unset($next_search);
+			unset($items);
+		}
+		$search_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/search.php?' . $paras;
 
-        /*
+		/*
          $next_results =& planet_search($queries, $andor, 1, $start + $limit, $uid, $category, $sortby, $searchin, $extra);
       $next_count = count($next_results);
       $has_next = false;
@@ -143,41 +143,41 @@ 
       }
       if (false != $has_next)
       */
-        if (count($results)) {
-            $next            = $start + $limit;
-            $queries         = implode(',', $queries);
-            $search_url_next = $search_url . "&start=$next";
-            $search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
-            $xoopsTpl->assign('search_next', $search_next);
-        }
-        if ($start > 0) {
-            $prev            = $start - $limit;
-            $search_url_prev = $search_url . "&start=$prev";
-            $search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
-            $xoopsTpl->assign('search_prev', $search_prev);
-        }
-    }
+		if (count($results)) {
+			$next            = $start + $limit;
+			$queries         = implode(',', $queries);
+			$search_url_next = $search_url . "&start=$next";
+			$search_next     = "<a href=\"" . htmlspecialchars($search_url_next) . "\">" . _SR_NEXT . '</a>';
+			$xoopsTpl->assign('search_next', $search_next);
+		}
+		if ($start > 0) {
+			$prev            = $start - $limit;
+			$search_url_prev = $search_url . "&start=$prev";
+			$search_prev     = "<a href=\"" . htmlspecialchars($search_url_prev) . "\">" . _SR_PREVIOUS . '</a>';
+			$xoopsTpl->assign('search_prev', $search_prev);
+		}
+	}
 
-    unset($results);
-    $search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
-    $xoopsTpl->assign('search_info', $search_info);
+	unset($results);
+	$search_info = _SR_KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
+	$xoopsTpl->assign('search_info', $search_info);
 }
 
 /* type */
 $type_select = "<select name=\"andor\">";
 $type_select .= "<option value=\"OR\"";
 if ('OR' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_ANY . '</option>';
 $type_select .= "<option value=\"AND\"";
 if ('AND' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_ALL . '</option>';
 $type_select .= "<option value=\"EXACT\"";
 if ('exact' === $andor) {
-    $type_select .= " selected=\"selected\"";
+	$type_select .= " selected=\"selected\"";
 }
 $type_select .= '>' . _SR_EXACT . '</option>';
 $type_select .= '</select>';
@@ -186,32 +186,32 @@ 
 $searchin_select = '';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"title\"";
 if (in_array('title', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . planet_constant('MD_TITLE') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"text\"";
 if (in_array('text', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . planet_constant('MD_BODY') . '&nbsp;&nbsp;||&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"blog\"";
 if (in_array('blog', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . planet_constant('MD_BLOG') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"feed\"";
 if (in_array('feed', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . planet_constant('MD_FEED') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"desc\"";
 if (in_array('desc', $searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . planet_constant('MD_DESC') . '&nbsp;&nbsp;';
 $searchin_select .= "<input type=\"checkbox\" name=\"searchin[]\" value=\"all\"";
 if (empty($searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . _ALL . '&nbsp;&nbsp;';
 
@@ -219,28 +219,28 @@ 
 $sortby_select = "<select name=\"sortby\">";
 $sortby_select .= "<option value=\"\"";
 if (empty($sortby)) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . _NONE . '</option>';
 $sortby_select .= "<option value=\"a.art_time\"";
 if ('a.art_time' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_TIME') . '</option>';
 $sortby_select .= "<option value=\"a.art_title\"";
 if ('a.art_title' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_TITLE') . '</option>';
 $sortby_select .= "<option value=\"\">&nbsp;&nbsp;----&nbsp;&nbsp;</option>";
 $sortby_select .= "<option value=\"a.blog_title\"";
 if ('a.blog_title' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_BLOG') . '</option>';
 $sortby_select .= "<option value=\"a.blog_time\"";
 if ('b.blog_time' === $sortby) {
-    $sortby_select .= " selected=\"selected\"";
+	$sortby_select .= " selected=\"selected\"";
 }
 $sortby_select .= '>' . planet_constant('MD_UPDATE') . '</option>';
 $sortby_select .= '</select>';
@@ -257,7 +257,7 @@ 
 $xoopsTpl->assign('uid', $uid);
 
 if ($xoopsConfigSearch['keyword_min'] > 0) {
-    $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
+	$xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 
 include XOOPS_ROOT_PATH . '/footer.php';

xoops_version.php

Indentation +127 added lines, -127 removed lines

@@ -30,14 +30,14 @@ 
 include __DIR__ . '/include/vars.php';
 
 $modversion                 = array(
-    'name'        => planet_constant('MI_NAME'),
-    'version'     => 2.10,
-    'description' => planet_constant('MI_DESC'),
-    'credits'     => 'XOOPS Project',
-    'image'       => 'assets/images/logoModule.png',
-    'dirname'     => $GLOBALS['moddirname'],
-    'author'      => 'D.J. (phppp)',
-    'help'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/readme.html'
+	'name'        => planet_constant('MI_NAME'),
+	'version'     => 2.10,
+	'description' => planet_constant('MI_DESC'),
+	'credits'     => 'XOOPS Project',
+	'image'       => 'assets/images/logoModule.png',
+	'dirname'     => $GLOBALS['moddirname'],
+	'author'      => 'D.J. (phppp)',
+	'help'        => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/readme.html'
 );
 $modversion['help']         = 'page=help';
 $modversion['license']      = 'GNU see LICENSE';
@@ -57,19 +57,19 @@ 
 $modversion['min_xoops']           = '2.5.8';
 $modversion['min_admin']           = '1.2';
 $modversion['min_db']              = array(
-    'mysql'  => '5.0.7',
-    'mysqli' => '5.0.7'
+	'mysql'  => '5.0.7',
+	'mysqli' => '5.0.7'
 );
 
 // database tables
 $modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
 $modversion['tables']           = array(
-    $GLOBALS['MOD_DB_PREFIX'] . '_category',
-    $GLOBALS['MOD_DB_PREFIX'] . '_article',
-    $GLOBALS['MOD_DB_PREFIX'] . '_blog',
-    $GLOBALS['MOD_DB_PREFIX'] . '_blogcat',
-    $GLOBALS['MOD_DB_PREFIX'] . '_bookmark',
-    $GLOBALS['MOD_DB_PREFIX'] . '_rate'
+	$GLOBALS['MOD_DB_PREFIX'] . '_category',
+	$GLOBALS['MOD_DB_PREFIX'] . '_article',
+	$GLOBALS['MOD_DB_PREFIX'] . '_blog',
+	$GLOBALS['MOD_DB_PREFIX'] . '_blogcat',
+	$GLOBALS['MOD_DB_PREFIX'] . '_bookmark',
+	$GLOBALS['MOD_DB_PREFIX'] . '_rate'
 );
 
 // Admin things
@@ -151,162 +151,162 @@ 
 // Configs
 // Config items
 $modversion['config'][] = array(
-    'name'        => 'do_debug',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
+	'name'        => 'do_debug',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DODEBUG_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
 );
 
 $modversion['config'][] = array(
-    'name'        => 'do_urw',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => in_array(php_sapi_name(), array('apache', 'apache2handler'))
+	'name'        => 'do_urw',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOURLREWRITE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => in_array(php_sapi_name(), array('apache', 'apache2handler'))
 );
 
 $modversion['config'][] = array(
-    'name'        => 'theme_set',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'text',
-    'options'     => array(_NONE => '0'),
-    'default'     => ''
+	'name'        => 'theme_set',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_THEMESET_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'text',
+	'options'     => array(_NONE => '0'),
+	'default'     => ''
 );
 
 $modversion['config'][] = array(
-    'name'        => 'timeformat',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'text',
-    'options'     => array(
-        _DATESTRING                                       => 'l',
-        _MEDIUMDATESTRING                                 => 'm',
-        _SHORTDATESTRING                                  => 's',
-        $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_CUSTOM' => 'c'
-    ),
-    'default'     => 'c'
+	'name'        => 'timeformat',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'text',
+	'options'     => array(
+		_DATESTRING                                       => 'l',
+		_MEDIUMDATESTRING                                 => 'm',
+		_SHORTDATESTRING                                  => 's',
+		$GLOBALS['VAR_PREFIXU'] . '_MI_TIMEFORMAT_CUSTOM' => 'c'
+	),
+	'default'     => 'c'
 );
 
 $modversion['config'][] = array(
-    'name'        => 'articles_perpage',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 10
+	'name'        => 'articles_perpage',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLESPERPAGE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 10
 );
 
 $modversion['config'][] = array(
-    'name'        => 'list_perpage',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 20
+	'name'        => 'list_perpage',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_LISTPERPAGE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 20
 );
 
 $modversion['config'][] = array(
-    'name'        => 'blogs_perupdate',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 10
+	'name'        => 'blogs_perupdate',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_BLOGSPERUPDATE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 10
 );
 
 $modversion['config'][] = array(
-    'name'        => 'article_expire',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 30
+	'name'        => 'article_expire',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ARTICLE_EXPIRE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 30
 );
 
 $modversion['config'][] = array(
-    'name'        => 'display_summary',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 0
+	'name'        => 'display_summary',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DISPLAY_SUMMARY_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 0
 );
 
 $modversion['config'][] = array(
-    'name'        => 'do_sibling',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
+	'name'        => 'do_sibling',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_DOSIBLING_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
 );
 
 $modversion['config'][] = array(
-    'name'        => 'pings',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PING',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING_DESC',
-    'formtype'    => 'textarea',
-    'valuetype'   => 'text',
-    'default'     => ''
+	'name'        => 'pings',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PING',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PING_DESC',
+	'formtype'    => 'textarea',
+	'valuetype'   => 'text',
+	'default'     => ''
 );
 
 $modversion['config'][] = array(
-    'name'        => 'trackback_option',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'int',
-    'default'     => 0,
-    'options'     => array(planet_constant('MI_MODERATION') => 0, _ALL => 1, _NONE => 2)
+	'name'        => 'trackback_option',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_TRACKBACK_OPTION_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'int',
+	'default'     => 0,
+	'options'     => array(planet_constant('MI_MODERATION') => 0, _ALL => 1, _NONE => 2)
 );
 
 $modversion['config'][] = array(
-    'name'        => 'copyright',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => 'Copyright© %s & ' . $xoopsConfig['sitename']
+	'name'        => 'copyright',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_COPYRIGHT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => 'Copyright© %s & ' . $xoopsConfig['sitename']
 );
 
 $modversion['config'][] = array(
-    'name'        => 'newblog_submit',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'int',
-    'default'     => 2,
-    'options'     => array(
-        _NONE                            => 0,
-        planet_constant('MI_MODERATION') => 1,
-        planet_constant('MI_MEMBER')     => 2,
-        _ALL                             => 3
-    )
-    // 0 - Only admin; 1 - all but need approval; 2 - members auto approved; 3 - all
+	'name'        => 'newblog_submit',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_NEWBLOG_SUBMIT_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'int',
+	'default'     => 2,
+	'options'     => array(
+		_NONE                            => 0,
+		planet_constant('MI_MODERATION') => 1,
+		planet_constant('MI_MEMBER')     => 2,
+		_ALL                             => 3
+	)
+	// 0 - Only admin; 1 - all but need approval; 2 - members auto approved; 3 - all
 );
 
 $modversion['config'][] = array(
-    'name'        => 'anonymous_rate',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
+	'name'        => 'anonymous_rate',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_ANONYMOUSRATE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
 );
 
 $modversion['config'][] = array(
-    'name'        => 'do_pseudocron',
-    'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON',
-    'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
+	'name'        => 'do_pseudocron',
+	'title'       => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON',
+	'description' => $GLOBALS['VAR_PREFIXU'] . '_MI_PSEUDOCRON_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
 );
 
 // Notification

admin/admin_header.php

Indentation +2 added lines, -2 removed lines

@@ -32,9 +32,9 @@
 
 // include the default language file for the admin interface
 if (!@include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/'
-                   . $xoopsConfig['language'] . '/main.php'
+				   . $xoopsConfig['language'] . '/main.php'
 ) {
-    include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/main.php';
+	include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/main.php';
 }
 
 planet_define_url_delimiter();

admin/menu.php

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 $pathLanguage    = $path . $pathModuleAdmin;
 
 if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+	$fileinc = $pathLanguage . '/language/english/main.php';
 }
 
 include_once $fileinc;