miarau / rssfeed

src/RSSFeed/simplepie/simplepie_1.3.1.mini.php

Doc Comments +137 added lines

@@ -960,6 +960,10 @@ 
         return null;
     }
     
+    /**
+     * @param string $namespace
+     * @param string $tag
+     */
     public function get_channel_tags($namespace, $tag)
     {
         $type = $this->get_type();
@@ -1003,6 +1007,10 @@ 
         return null;
     }
     
+    /**
+     * @param string $namespace
+     * @param string $tag
+     */
     public function get_image_tags($namespace, $tag)
     {
         $type = $this->get_type();
@@ -1039,6 +1047,9 @@ 
         return null;
     }
     
+    /**
+     * @return string
+     */
     public function get_base($element = array())
     {
         if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
@@ -1316,6 +1327,9 @@ 
         }
     }
     
+    /**
+     * @return string
+     */
     public function get_link($key = 0, $rel = 'alternate')
     {
         $links = $this->get_links($rel);
@@ -1960,6 +1974,9 @@ 
 abstract class SimplePie_Cache_DB implements SimplePie_Cache_Base
 {
     
+    /**
+     * @param SimplePie $data
+     */
     protected static function prepare_simplepie_object_for_cache($data)
     {
         $items = $data->get_items();
@@ -3049,6 +3066,9 @@ 
         }
     }
     
+    /**
+     * @param string $chars
+     */
     public function consume_range($chars)
     {
         if ($len = strspn($this->data, $chars, $this->position))
@@ -4682,6 +4702,9 @@ 
         trigger_error("Cannot write property $name", E_USER_ERROR);
     }
     
+    /**
+     * @param string $data
+     */
     public function __construct($data)
     {
         $this->compressed_data = $data;
@@ -5295,6 +5318,9 @@ 
         $this->set_iri($iri);
     }
     
+    /**
+     * @param SimplePie_IRI $base
+     */
     public static function absolutize($base, $relative)
     {
         if (!($relative instanceof SimplePie_IRI))
@@ -5382,6 +5408,9 @@ 
         }
     }
     
+    /**
+     * @param string $iri
+     */
     protected function parse_iri($iri)
     {
         $iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
@@ -5470,6 +5499,9 @@ 
         return $output . $input;
     }
     
+    /**
+     * @param string $extra_chars
+     */
     protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false)
     {
         // Normalize as many pct-encoded sections as possible
@@ -5808,6 +5840,9 @@ 
         }
     }
     
+    /**
+     * @param string|null $scheme
+     */
     public function set_scheme($scheme)
     {
         if ($scheme === null)
@@ -5826,6 +5861,9 @@ 
         return true;
     }
     
+    /**
+     * @param string|null $authority
+     */
     public function set_authority($authority)
     {
         static $cache;
@@ -5881,6 +5919,9 @@ 
         }
     }
     
+    /**
+     * @param string|null $iuserinfo
+     */
     public function set_userinfo($iuserinfo)
     {
         if ($iuserinfo === null)
@@ -5940,6 +5981,9 @@ 
         return true;
     }
     
+    /**
+     * @param null|string $port
+     */
     public function set_port($port)
     {
         if ($port === null)
@@ -5960,6 +6004,9 @@ 
         }
     }
     
+    /**
+     * @param string|null $ipath
+     */
     public function set_path($ipath)
     {
         static $cache;
@@ -5983,6 +6030,9 @@ 
         return true;
     }
     
+    /**
+     * @param string|null $iquery
+     */
     public function set_query($iquery)
     {
         if ($iquery === null)
@@ -5997,6 +6047,9 @@ 
         return true;
     }
     
+    /**
+     * @param string|null $ifragment
+     */
     public function set_fragment($ifragment)
     {
         if ($ifragment === null)
@@ -6011,6 +6064,9 @@ 
         return true;
     }
     
+    /**
+     * @param false|string $string
+     */
     public function to_uri($string)
     {
         static $non_ascii;
@@ -6135,6 +6191,10 @@ 
         }
     }
     
+    /**
+     * @param string $namespace
+     * @param string $tag
+     */
     public function get_item_tags($namespace, $tag)
     {
         if (isset($this->data['child'][$namespace][$tag]))
@@ -6147,11 +6207,17 @@ 
         }
     }
     
+    /**
+     * @return string
+     */
     public function get_base($element = array())
     {
         return $this->feed->get_base($element);
     }
     
+    /**
+     * @return string
+     */
     public function sanitize($data, $type, $base = '')
     {
         return $this->feed->sanitize($data, $type, $base);
@@ -8755,6 +8821,10 @@ 
             return null;
         }
     }
+
+    /**
+     * @param string $name
+     */
     protected function search_elements_by_tag($name, &$done, $feeds)
     {
         if ($this->dom === null)
@@ -9102,6 +9172,11 @@ 
         return strtr($string, $convert_table);
     }
     
+    /**
+     * @param string $data
+     * @param string $input
+     * @param string $output
+     */
     public static function change_encoding($data, $input, $output)
     {
         $input = SimplePie_Misc::encoding($input);
@@ -10243,6 +10318,10 @@ 
                 return $charset;
         }
     }
+
+    /**
+     * @return string
+     */
     public static function get_curl_version()
     {
         if (is_array($curl = curl_version()))
@@ -10287,6 +10366,9 @@ 
         return $parser->parse($dt);
     }
     
+    /**
+     * @param string|false $data
+     */
     public static function entities_decode($data)
     {
         $decoder = new SimplePie_Decode_HTML_Entities($data);
@@ -10766,6 +10848,9 @@ 
         return $ip;
     }
     
+    /**
+     * @param string $ip
+     */
     public static function compress($ip)
     {
         // Prepare the IP to be compressed
@@ -11852,6 +11937,10 @@ 
     {
         return $this->data;
     }
+
+    /**
+     * @param string $tag
+     */
     public function tag_open($parser, $tag, $attributes)
     {
         list($this->namespace[], $this->element[]) = $this->split_ns($tag);
@@ -11914,6 +12003,10 @@ 
             }
         }
     }
+
+    /**
+     * @param string $cdata
+     */
     public function cdata($parser, $cdata)
     {
         if ($this->current_xhtml_construct >= 0)
@@ -11925,6 +12018,10 @@ 
             $this->data['data'] .= $cdata;
         }
     }
+
+    /**
+     * @param string $tag
+     */
     public function tag_close($parser, $tag)
     {
         if ($this->current_xhtml_construct >= 0)
@@ -12057,6 +12154,10 @@ 
     
     public function __construct() { }
     
+    /**
+     * @param string $type
+     * @param string $class
+     */
     public function register($type, $class, $legacy = false)
     {
         if (!is_subclass_of($class, $this->default[$type]))
@@ -12084,6 +12185,9 @@ 
         return null;
     }
     
+    /**
+     * @param string $type
+     */
     public function &create($type, $parameters = array())
     {
         $class = $this->get_class($type);
@@ -12115,6 +12219,10 @@ 
         return $instance;
     }
     
+    /**
+     * @param string $type
+     * @param string $method
+     */
     public function &call($type, $method, $parameters = array())
     {
         $class = $this->get_class($type);
@@ -12146,6 +12254,10 @@ 
     
     var $value;
     
+    /**
+     * @param string $relationship
+     * @param string $value
+     */
     public function __construct($relationship = null, $type = null, $value = null)
     {
         $this->relationship = $relationship;
@@ -12472,6 +12584,10 @@ 
         }
         return $data;
     }
+
+    /**
+     * @param string $html
+     */
     protected function preprocess($html, $type)
     {
         $ret = '';
@@ -12493,6 +12609,10 @@ 
         $ret .= '</head><body>' . $html . '</body></html>';
         return $ret;
     }
+
+    /**
+     * @param DOMDocument $document
+     */
     public function replace_urls($document, $tag, $attributes)
     {
         if (!is_array($attributes))
@@ -12542,6 +12662,10 @@ 
             return '';
         }
     }
+
+    /**
+     * @param DOMDocument $document
+     */
     protected function strip_tag($tag, $document, $type)
     {
         $xpath = new DOMXPath($document);
@@ -12617,6 +12741,10 @@ 
             }
         }
     }
+
+    /**
+     * @param DOMDocument $document
+     */
     protected function strip_attr($attrib, $document)
     {
         $xpath = new DOMXPath($document);
@@ -12645,6 +12773,11 @@ 
     {
         return md5(serialize($this->data));
     }
+
+    /**
+     * @param string $namespace
+     * @param string $tag
+     */
     public function get_source_tags($namespace, $tag)
     {
         if (isset($this->data['child'][$namespace][$tag]))
@@ -12656,6 +12789,10 @@ 
             return null;
         }
     }
+
+    /**
+     * @return string
+     */
     public function get_base($element = array())
     {
         return $this->item->get_base($element);

Indentation +25 added lines, -25 removed lines

@@ -3505,7 +3505,7 @@ 
                 }
                 if ($match !== null)
                 {
-                     $this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1);
+                        $this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1);
                     $this->position += strlen($entities[$match]) - strlen($consumed) - 1;
                 }
                 break;
@@ -5213,7 +5213,7 @@ 
             call_user_func(array($this, 'set_' . $name), $value);
         }
         elseif (
-               $name === 'iauthority'
+                $name === 'iauthority'
             || $name === 'iuserinfo'
             || $name === 'ihost'
             || $name === 'ipath'
@@ -5560,13 +5560,13 @@ 
                 || $character >= 0xFDD0 && $character <= 0xFDEF
                 || (
                     // Everything else not in ucschar
-                       $character > 0xD7FF && $character < 0xF900
+                        $character > 0xD7FF && $character < 0xF900
                     || $character < 0xA0
                     || $character > 0xEFFFD
                 )
                 && (
                     // Everything not in iprivate, if it applies
-                       !$iprivate
+                        !$iprivate
                     || $character < 0xE000
                     || $character > 0x10FFFD
                 )
@@ -5775,13 +5775,13 @@ 
         elseif (isset($cache[$iri]))
         {
             list($this->scheme,
-                 $this->iuserinfo,
-                 $this->ihost,
-                 $this->port,
-                 $this->ipath,
-                 $this->iquery,
-                 $this->ifragment,
-                 $return) = $cache[$iri];
+                    $this->iuserinfo,
+                    $this->ihost,
+                    $this->port,
+                    $this->ipath,
+                    $this->iquery,
+                    $this->ifragment,
+                    $return) = $cache[$iri];
             return $return;
         }
         else
@@ -5797,13 +5797,13 @@ 
                 && $this->set_query($parsed['query'])
                 && $this->set_fragment($parsed['fragment']);
             $cache[$iri] = array($this->scheme,
-                                 $this->iuserinfo,
-                                 $this->ihost,
-                                 $this->port,
-                                 $this->ipath,
-                                 $this->iquery,
-                                 $this->ifragment,
-                                 $return);
+                                    $this->iuserinfo,
+                                    $this->ihost,
+                                    $this->port,
+                                    $this->ipath,
+                                    $this->iquery,
+                                    $this->ifragment,
+                                    $return);
             return $return;
         }
     }
@@ -5841,9 +5841,9 @@ 
         elseif (isset($cache[$authority]))
         {
             list($this->iuserinfo,
-                 $this->ihost,
-                 $this->port,
-                 $return) = $cache[$authority];
+                    $this->ihost,
+                    $this->port,
+                    $return) = $cache[$authority];
             return $return;
         }
         else
@@ -5874,9 +5874,9 @@ 
                       $this->set_host($remaining) &&
                       $this->set_port($port);
             $cache[$authority] = array($this->iuserinfo,
-                                       $this->ihost,
-                                       $this->port,
-                                       $return);
+                                        $this->ihost,
+                                        $this->port,
+                                        $return);
             return $return;
         }
     }
@@ -9128,7 +9128,7 @@ 
         elseif (function_exists('mb_convert_encoding') && ($return = SimplePie_Misc::change_encoding_mbstring($data, $input, $output)))
         {
             return $return;
-         }
+            }
         // This is last, as behaviour of this varies with OS userland and PHP version
         elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output)))
         {

Spacing +159 added lines, -159 removed lines

@@ -50,8 +50,8 @@ 
 define('SIMPLEPIE_VERSION', '1.3.1');
 define('SIMPLEPIE_BUILD', '20121030175911');
 define('SIMPLEPIE_URL', 'http://simplepie.org');
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME.'/'.SIMPLEPIE_VERSION.' (Feed Parser; '.SIMPLEPIE_URL.'; Allow like Gecko) Build/'.SIMPLEPIE_BUILD);
+define('SIMPLEPIE_LINKBACK', '<a href="'.SIMPLEPIE_URL.'" title="'.SIMPLEPIE_NAME.' '.SIMPLEPIE_VERSION.'">'.SIMPLEPIE_NAME.'</a>');
 define('SIMPLEPIE_LOCATOR_NONE', 0);
 define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', 1);
 define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', 2);
@@ -256,7 +256,7 @@ 
         if ($file instanceof SimplePie_File)
         {
             $this->feed_url = $file->url;
-            $this->file =& $file;
+            $this->file = & $file;
             return true;
         }
         return false;
@@ -483,7 +483,7 @@ 
     {
         if ($page !== false)
         {
-            $this->sanitize->set_image_handler($page . '?' . $qs . '=');
+            $this->sanitize->set_image_handler($page.'?'.$qs.'=');
         }
         else
         {
@@ -713,7 +713,7 @@ 
                         {
                             $headers['if-none-match'] = $this->data['headers']['etag'];
                         }
-                        $file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen));
+                        $file = $this->registry->create('File', array($this->feed_url, $this->timeout / 10, 5, $headers, $this->useragent, $this->force_fsockopen));
                         if ($file->success)
                         {
                             if ($file->status_code === 304)
@@ -747,7 +747,7 @@ 
         {
             if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
             {
-                $file =& $this->file;
+                $file = & $this->file;
             }
             else
             {
@@ -775,7 +775,7 @@ 
                 {
                     if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds)))
                     {
-                        $this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
+                        $this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or ".SIMPLEPIE_NAME." was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed.";
                         $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
                         return false;
                     }
@@ -829,7 +829,7 @@ 
             $header = "Content-type: $mime;";
             if ($this->get_encoding())
             {
-                $header .= ' charset=' . $this->get_encoding();
+                $header .= ' charset='.$this->get_encoding();
             }
             else
             {
@@ -1378,19 +1378,19 @@ 
             {
                 if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
                 {
-                    if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+                    if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
                     {
-                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-                        $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+                        $this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
                     }
                     else
                     {
-                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
                     }
                 }
                 elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
                 {
-                    $this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+                    $this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
                 }
                 $this->data['links'][$key] = array_unique($this->data['links'][$key]);
             }
@@ -1803,7 +1803,7 @@ 
         trigger_error('Favicon handling has been removed, please use your own handling', $level);
         if (($url = $this->get_link()) !== null)
         {
-            return 'http://g.etfv.co/' . urlencode($url);
+            return 'http://g.etfv.co/'.urlencode($url);
         }
         return false;
     }
@@ -1981,19 +1981,19 @@ 
             }
             if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
             {
-                $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+                $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
             }
             elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
             {
-                $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+                $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
             }
             elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
             {
-                $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+                $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
             }
             elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
             {
-                $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
+                $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
             }
             else
             {
@@ -2126,7 +2126,7 @@ 
         $this->options['host'] = empty($parsed['host']) ? $this->options['host'] : $parsed['host'];
         $this->options['port'] = empty($parsed['port']) ? $this->options['port'] : $parsed['port'];
         $this->options['extras'] = array_merge($this->options['extras'], $parsed['extras']);
-        $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+        $this->name = $this->options['extras']['prefix'].md5("$name:$type");
         $this->cache = new Memcache();
         $this->cache->addServer($this->options['host'], (int) $this->options['port']);
     }
@@ -2209,7 +2209,7 @@ 
             $this->mysql = null;
             return;
         }
-        $this->id = $name . $type;
+        $this->id = $name.$type;
         if (!$query = $this->mysql->query('SHOW TABLES'))
         {
             $this->mysql = null;
@@ -2220,17 +2220,17 @@ 
         {
             $db[] = $row;
         }
-        if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db))
+        if (!in_array($this->options['extras']['prefix'].'cache_data', $db))
         {
-            $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
+            $query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
             if ($query === false)
             {
                 $this->mysql = null;
             }
         }
-        if (!in_array($this->options['extras']['prefix'] . 'items', $db))
+        if (!in_array($this->options['extras']['prefix'].'items', $db))
         {
-            $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` TEXT CHARACTER SET utf8 NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
+            $query = $this->mysql->exec('CREATE TABLE `'.$this->options['extras']['prefix'].'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` TEXT CHARACTER SET utf8 NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
             if ($query === false)
             {
                 $this->mysql = null;
@@ -2248,7 +2248,7 @@ 
         {
             $data = clone $data;
             $prepared = self::prepare_simplepie_object_for_cache($data);
-            $query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+            $query = $this->mysql->prepare('SELECT COUNT(*) FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
             $query->bindValue(':feed', $this->id);
             if ($query->execute())
             {
@@ -2257,13 +2257,13 @@ 
                     $items = count($prepared[1]);
                     if ($items)
                     {
-                        $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
+                        $sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
                         $query = $this->mysql->prepare($sql);
                         $query->bindValue(':items', $items);
                     }
                     else
                     {
-                        $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
+                        $sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
                         $query = $this->mysql->prepare($sql);
                     }
                     $query->bindValue(':data', $prepared[0]);
@@ -2276,7 +2276,7 @@ 
                 }
                 else
                 {
-                    $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
+                    $query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
                     $query->bindValue(':feed', $this->id);
                     $query->bindValue(':count', count($prepared[1]));
                     $query->bindValue(':data', $prepared[0]);
@@ -2293,7 +2293,7 @@ 
                     {
                         $database_ids[] = $this->mysql->quote($id);
                     }
-                    $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
+                    $query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'items` WHERE `id` = '.implode(' OR `id` = ', $database_ids).' AND `feed_id` = :feed');
                     $query->bindValue(':feed', $this->id);
                     if ($query->execute())
                     {
@@ -2309,7 +2309,7 @@ 
                             {
                                 $date = time();
                             }
-                            $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
+                            $query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
                             $query->bindValue(':feed', $this->id);
                             $query->bindValue(':id', $new_id);
                             $query->bindValue(':data', serialize($prepared[1][$new_id]->data));
@@ -2330,13 +2330,13 @@ 
         }
         else
         {
-            $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+            $query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed');
             $query->bindValue(':feed', $this->id);
             if ($query->execute())
             {
                 if ($query->rowCount() > 0)
                 {
-                    $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
+                    $query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
                     $query->bindValue(':data', serialize($data));
                     $query->bindValue(':time', time());
                     $query->bindValue(':feed', $this->id);
@@ -2347,7 +2347,7 @@ 
                 }
                 else
                 {
-                    $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
+                    $query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
                     $query->bindValue(':id', $this->id);
                     $query->bindValue(':data', serialize($data));
                     $query->bindValue(':time', time());
@@ -2367,7 +2367,7 @@ 
         {
             return false;
         }
-        $query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+        $query = $this->mysql->prepare('SELECT `items`, `data` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
         $query->bindValue(':id', $this->id);
         if ($query->execute() && ($row = $query->fetch()))
         {
@@ -2384,19 +2384,19 @@ 
             {
                 if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
                 {
-                    $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+                    $feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
                 }
                 elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
                 {
-                    $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+                    $feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
                 }
                 elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
                 {
-                    $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+                    $feed = & $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
                 }
                 elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
                 {
-                    $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
+                    $feed = & $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
                 }
                 else
                 {
@@ -2404,10 +2404,10 @@ 
                 }
                 if ($feed !== null)
                 {
-                    $sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
+                    $sql = 'SELECT `data` FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
                     if ($items > 0)
                     {
-                        $sql .= ' LIMIT ' . $items;
+                        $sql .= ' LIMIT '.$items;
                     }
                     $query = $this->mysql->prepare($sql);
                     $query->bindValue(':feed', $this->id);
@@ -2435,7 +2435,7 @@ 
         {
             return false;
         }
-        $query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+        $query = $this->mysql->prepare('SELECT `mtime` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
         $query->bindValue(':id', $this->id);
         if ($query->execute() && ($time = $query->fetchColumn()))
         {
@@ -2453,7 +2453,7 @@ 
         {
             return false;
         }
-        $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
+        $query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `mtime` = :time WHERE `id` = :id');
         $query->bindValue(':time', time());
         $query->bindValue(':id', $this->id);
         if ($query->execute() && $query->rowCount() > 0)
@@ -2472,9 +2472,9 @@ 
         {
             return false;
         }
-        $query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+        $query = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id');
         $query->bindValue(':id', $this->id);
-        $query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
+        $query2 = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :id');
         $query2->bindValue(':id', $this->id);
         if ($query->execute() && $query2->execute())
         {
@@ -3985,7 +3985,7 @@ 
         $length = $this->get_length();
         if ($length !== null)
         {
-            return round($length/1048576, 2);
+            return round($length / 1048576, 2);
         }
         else
         {
@@ -4054,7 +4054,7 @@ 
         }
     }
     
-    public function native_embed($options='')
+    public function native_embed($options = '')
     {
         return $this->embed($options, true);
     }
@@ -4082,7 +4082,7 @@ 
         else
         {
             $options = explode(',', $options);
-            foreach($options as $option)
+            foreach ($options as $option)
             {
                 $opt = explode(':', $option, 2);
                 if (isset($opt[0], $opt[1]))
@@ -4138,11 +4138,11 @@ 
                 }
                 elseif ($widescreen)
                 {
-                    $width = round((intval($height)/9)*16);
+                    $width = round((intval($height) / 9) * 16);
                 }
                 else
                 {
-                    $width = round((intval($height)/3)*4);
+                    $width = round((intval($height) / 3) * 4);
                 }
             }
             else
@@ -4171,11 +4171,11 @@ 
                 }
                 elseif ($widescreen)
                 {
-                    $height = round((intval($width)/16)*9);
+                    $height = round((intval($width) / 16) * 9);
                 }
                 else
                 {
-                    $height = round((intval($width)/4)*3);
+                    $height = round((intval($width) / 4) * 3);
                 }
             }
             else
@@ -4202,11 +4202,11 @@ 
         {
             if ($native)
             {
-                $embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
+                $embed .= "<embed src=\"".$this->get_link()."\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
             }
             else
             {
-                $embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
+                $embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '".$this->get_link()."', '$loop', '$type');</script>";
             }
         }
         // Flash Media Player file types.
@@ -4216,11 +4216,11 @@ 
             $height += 20;
             if ($native)
             {
-                $embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
+                $embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
             }
             else
             {
-                $embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
+                $embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."', '$placeholder', '$loop', '$mediaplayer');</script>";
             }
         }
         // QuickTime 7 file types.  Need to test with QuickTime 6.
@@ -4232,16 +4232,16 @@ 
             {
                 if ($placeholder !== '')
                 {
-                    $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+                    $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"".$this->get_link()."\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
                 }
                 else
                 {
-                    $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+                    $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"".$this->get_link()."\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
                 }
             }
             else
             {
-                $embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
+                $embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '".$this->get_link()."', '$placeholder', '$loop');</script>";
             }
         }
         // Windows Media
@@ -4250,15 +4250,15 @@ 
             $height += 45;
             if ($native)
             {
-                $embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
+                $embed .= "<embed type=\"application/x-mplayer2\" src=\"".$this->get_link()."\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
             }
             else
             {
-                $embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
+                $embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '".$this->get_link()."');</script>";
             }
         }
         // Everything else
-        else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+        else $embed .= '<a href="'.$this->get_link().'" class="'.$altclass.'">'.$alt.'</a>';
         return $embed;
     }
     
@@ -4266,7 +4266,7 @@ 
     {
         // Mime-types by handler.
         $types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
-        $types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player
+        $types_fmedia = array('video/flv', 'video/x-flv', 'flv-application/octet-stream'); // Flash Media Player
         $types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
         $types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
         $types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
@@ -4481,7 +4481,7 @@ 
                 }
                 if (curl_errno($fp))
                 {
-                    $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
+                    $this->error = 'cURL error '.curl_errno($fp).': '.curl_error($fp);
                     $this->success = false;
                 }
                 else
@@ -4523,7 +4523,7 @@ 
                 $fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
                 if (!$fp)
                 {
-                    $this->error = 'fsockopen error: ' . $errstr;
+                    $this->error = 'fsockopen error: '.$errstr;
                     $this->success = false;
                 }
                 else
@@ -4553,7 +4553,7 @@ 
                     }
                     if (isset($url_parts['user']) && isset($url_parts['pass']))
                     {
-                        $out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
+                        $out .= "Authorization: Basic ".base64_encode("$url_parts[user]:$url_parts[pass]")."\r\n";
                     }
                     foreach ($headers as $key => $value)
                     {
@@ -4961,7 +4961,7 @@ 
             // We should only use the last Content-Type header. c.f. issue #1
             if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
             {
-                $this->headers[$this->name] .= ', ' . $this->value;
+                $this->headers[$this->name] .= ', '.$this->value;
             }
             else
             {
@@ -5137,7 +5137,7 @@ 
         $encoded = $this->body;
         while (true)
         {
-            $is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches );
+            $is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches);
             if (!$is_chunked)
             {
                 // Looks like it's not chunked after all
@@ -5208,9 +5208,9 @@ 
     
     public function __set($name, $value)
     {
-        if (method_exists($this, 'set_' . $name))
+        if (method_exists($this, 'set_'.$name))
         {
-            call_user_func(array($this, 'set_' . $name), $value);
+            call_user_func(array($this, 'set_'.$name), $value);
         }
         elseif (
                $name === 'iauthority'
@@ -5221,7 +5221,7 @@ 
             || $name === 'ifragment'
         )
         {
-            call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+            call_user_func(array($this, 'set_'.substr($name, 1)), $value);
         }
     }
     
@@ -5244,7 +5244,7 @@ 
             $return = $this->$name;
         }
         // host -> ihost
-        elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
+        elseif (($prop = 'i'.$name) && array_key_exists($prop, $props))
         {
             $name = $prop;
             $return = $this->$prop;
@@ -5257,7 +5257,7 @@ 
         }
         else
         {
-            trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+            trigger_error('Undefined property: '.get_class($this).'::'.$name, E_USER_NOTICE);
             $return = null;
         }
         if ($return === null && isset($this->normalization[$this->scheme][$name]))
@@ -5272,7 +5272,7 @@ 
     
     public function __isset($name)
     {
-        if (method_exists($this, 'get_' . $name) || isset($this->$name))
+        if (method_exists($this, 'get_'.$name) || isset($this->$name))
         {
             return true;
         }
@@ -5284,9 +5284,9 @@ 
     
     public function __unset($name)
     {
-        if (method_exists($this, 'set_' . $name))
+        if (method_exists($this, 'set_'.$name))
         {
-            call_user_func(array($this, 'set_' . $name), '');
+            call_user_func(array($this, 'set_'.$name), '');
         }
     }
     
@@ -5339,11 +5339,11 @@ 
                             }
                             elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
                             {
-                                $target->ipath = '/' . $relative->ipath;
+                                $target->ipath = '/'.$relative->ipath;
                             }
                             elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
                             {
-                                $target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+                                $target->ipath = substr($base->ipath, 0, $last_segment + 1).$relative->ipath;
                             }
                             else
                             {
@@ -5467,7 +5467,7 @@ 
                 $input = '';
             }
         }
-        return $output . $input;
+        return $output.$input;
     }
     
     protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false)
@@ -5687,7 +5687,7 @@ 
                 {
                     for ($j = $start; $j <= $i; $j++)
                     {
-                        $string .= '%' . strtoupper($bytes[$j]);
+                        $string .= '%'.strtoupper($bytes[$j]);
                     }
                 }
                 else
@@ -5705,7 +5705,7 @@ 
         {
             for ($j = $start; $j < $len; $j++)
             {
-                $string .= '%' . strtoupper($bytes[$j]);
+                $string .= '%'.strtoupper($bytes[$j]);
             }
         }
         return $string;
@@ -5906,7 +5906,7 @@ 
         {
             if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
             {
-                $this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
+                $this->ihost = '['.SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)).']';
             }
             else
             {
@@ -5977,7 +5977,7 @@ 
             $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
             $removed = $this->remove_dot_segments($valid);
             $cache[$ipath] = array($valid, $removed);
-            $this->ipath =  ($this->scheme !== null) ? $removed : $valid;
+            $this->ipath = ($this->scheme !== null) ? $removed : $valid;
         }
         $this->scheme_normalization();
         return true;
@@ -6038,11 +6038,11 @@ 
         $iri = '';
         if ($this->scheme !== null)
         {
-            $iri .= $this->scheme . ':';
+            $iri .= $this->scheme.':';
         }
         if (($iauthority = $this->get_iauthority()) !== null)
         {
-            $iri .= '//' . $iauthority;
+            $iri .= '//'.$iauthority;
         }
         if ($this->ipath !== '')
         {
@@ -6054,11 +6054,11 @@ 
         }
         if ($this->iquery !== null)
         {
-            $iri .= '?' . $this->iquery;
+            $iri .= '?'.$this->iquery;
         }
         if ($this->ifragment !== null)
         {
-            $iri .= '#' . $this->ifragment;
+            $iri .= '#'.$this->ifragment;
         }
         return $iri;
     }
@@ -6075,7 +6075,7 @@ 
             $iauthority = '';
             if ($this->iuserinfo !== null)
             {
-                $iauthority .= $this->iuserinfo . '@';
+                $iauthority .= $this->iuserinfo.'@';
             }
             if ($this->ihost !== null)
             {
@@ -6083,7 +6083,7 @@ 
             }
             if ($this->port !== null)
             {
-                $iauthority .= ':' . $this->port;
+                $iauthority .= ':'.$this->port;
             }
             return $iauthority;
         }
@@ -6201,7 +6201,7 @@ 
         }
         if ($this->get_permalink() !== null || $this->get_title() !== null)
         {
-            return md5($this->get_permalink() . $this->get_title());
+            return md5($this->get_permalink().$this->get_title());
         }
         else
         {
@@ -6787,19 +6787,19 @@ 
             {
                 if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
                 {
-                    if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+                    if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
                     {
-                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-                        $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+                        $this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
                     }
                     else
                     {
-                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
                     }
                 }
                 elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
                 {
-                    $this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+                    $this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
                 }
                 $this->data['links'][$key] = array_unique($this->data['links'][$key]);
             }
@@ -7456,7 +7456,7 @@ 
             // If we have media:group tags, loop through them.
             foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
             {
-                if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+                if (isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
                 {
                     // If we have media:content tags, loop through them.
                     foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
@@ -8918,11 +8918,11 @@ 
         $seconds = $remainder % 60;
         if ($minutes < 10 && $hours > 0)
         {
-            $minutes = '0' . $minutes;
+            $minutes = '0'.$minutes;
         }
         if ($seconds < 10)
         {
-            $seconds = '0' . $seconds;
+            $seconds = '0'.$seconds;
         }
         $time .= $minutes.':';
         $time .= $seconds;
@@ -8942,7 +8942,7 @@ 
     {
         $return = array();
         $name = preg_quote($realname, '/');
-        if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+        if (preg_match_all("/<($name)".SIMPLEPIE_PCRE_HTML_ATTRIBUTE."(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
         {
             for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
             {
@@ -8959,7 +8959,7 @@ 
                     $return[$i]['content'] = $matches[$i][4][0];
                 }
                 $return[$i]['attribs'] = array();
-                if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
+                if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' '.$matches[$i][2][0].' ', $attribs, PREG_SET_ORDER))
                 {
                     for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
                     {
@@ -8980,7 +8980,7 @@ 
         foreach ($element['attribs'] as $key => $value)
         {
             $key = strtolower($key);
-            $full .= " $key=\"" . htmlspecialchars($value['data']) . '"';
+            $full .= " $key=\"".htmlspecialchars($value['data']).'"';
         }
         if ($element['self_closing'])
         {
@@ -10279,7 +10279,7 @@ 
                 $data = '';
             }
         }
-        return $output . $data;
+        return $output.$data;
     }
     public static function parse_date($dt)
     {
@@ -10464,15 +10464,15 @@ 
         }
         else if ($codepoint <= 0x7ff)
         {
-            return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
+            return chr(0xc0 | ($codepoint >> 6)).chr(0x80 | ($codepoint & 0x3f));
         }
         else if ($codepoint <= 0xffff)
         {
-            return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+            return chr(0xe0 | ($codepoint >> 12)).chr(0x80 | (($codepoint >> 6) & 0x3f)).chr(0x80 | ($codepoint & 0x3f));
         }
         else if ($codepoint <= 0x10ffff)
         {
-            return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+            return chr(0xf0 | ($codepoint >> 18)).chr(0x80 | (($codepoint >> 12) & 0x3f)).chr(0x80 | (($codepoint >> 6) & 0x3f)).chr(0x80 | ($codepoint & 0x3f));
         }
         else
         {
@@ -10607,7 +10607,7 @@ 
         }
         header('Content-type: text/javascript; charset: UTF-8');
         header('Cache-Control: must-revalidate');
-        header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
+        header('Expires: '.gmdate('D, d M Y H:i:s', time() + 604800).' GMT'); // 7 days
         ?>
 function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
     if (placeholder != '') {
@@ -10632,14 +10632,14 @@ 
     public static function get_build()
     {
         $root = dirname(dirname(__FILE__));
-        if (file_exists($root . '/.git/index'))
+        if (file_exists($root.'/.git/index'))
         {
-            return filemtime($root . '/.git/index');
+            return filemtime($root.'/.git/index');
         }
-        elseif (file_exists($root . '/SimplePie'))
+        elseif (file_exists($root.'/SimplePie'))
         {
             $time = 0;
-            foreach (glob($root . '/SimplePie/*.php') as $file)
+            foreach (glob($root.'/SimplePie/*.php') as $file)
             {
                 if (($mtime = filemtime($file)) > $time)
                 {
@@ -10648,9 +10648,9 @@ 
             }
             return $time;
         }
-        elseif (file_exists(dirname(__FILE__) . '/Core.php'))
+        elseif (file_exists(dirname(__FILE__).'/Core.php'))
         {
-            return filemtime(dirname(__FILE__) . '/Core.php');
+            return filemtime(dirname(__FILE__).'/Core.php');
         }
         else
         {
@@ -10660,11 +10660,11 @@ 
     
     public static function debug(&$sp)
     {
-        $info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
-        $info .= 'PHP ' . PHP_VERSION . "\n";
+        $info = 'SimplePie '.SIMPLEPIE_VERSION.' Build '.SIMPLEPIE_BUILD."\n";
+        $info .= 'PHP '.PHP_VERSION."\n";
         if ($sp->error() !== null)
         {
-            $info .= 'Error occurred: ' . $sp->error() . "\n";
+            $info .= 'Error occurred: '.$sp->error()."\n";
         }
         else
         {
@@ -10680,20 +10680,20 @@ 
                 switch ($ext)
                 {
                     case 'pcre':
-                        $info .= '      Version ' . PCRE_VERSION . "\n";
+                        $info .= '      Version '.PCRE_VERSION."\n";
                         break;
                     case 'curl':
                         $version = curl_version();
-                        $info .= '      Version ' . $version['version'] . "\n";
+                        $info .= '      Version '.$version['version']."\n";
                         break;
                     case 'mbstring':
-                        $info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
+                        $info .= '      Overloading: '.mb_get_info('func_overload')."\n";
                         break;
                     case 'iconv':
-                        $info .= '      Version ' . ICONV_VERSION . "\n";
+                        $info .= '      Version '.ICONV_VERSION."\n";
                         break;
                     case 'xml':
-                        $info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
+                        $info .= '      Version '.LIBXML_DOTTED_VERSION."\n";
                         break;
                 }
             }
@@ -10759,7 +10759,7 @@ 
             // xxx::xxx
             else
             {
-                $fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+                $fill = ':'.str_repeat('0:', 6 - $c2 - $c1);
                 $ip = str_replace('::', $fill, $ip);
             }
         }
@@ -11299,8 +11299,8 @@ 
     
     public function __construct()
     {
-        $this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
-        $this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
+        $this->day_pcre = '('.implode(array_keys($this->day), '|').')';
+        $this->month_pcre = '('.implode(array_keys($this->month), '|').')';
         static $cache;
         if (!isset($cache[get_class($this)]))
         {
@@ -11369,7 +11369,7 @@ 
             $month = $day = $hour = $minute = $second = '([0-9]{2})';
             $decimal = '([0-9]*)';
             $zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))';
-            $pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/';
+            $pcre = '/^'.$year.'(?:-?'.$month.'(?:-?'.$day.'(?:[Tt\x09\x20]+'.$hour.'(?::?'.$minute.'(?::?'.$second.'(?:.'.$decimal.')?)?)?'.$zone.')?)?)?$/';
         }
         if (preg_match($pcre, $date, $match))
         {
@@ -11476,8 +11476,8 @@ 
         if (!$pcre)
         {
             $wsp = '[\x09\x20]';
-            $fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
-            $optional_fws = $fws . '?';
+            $fws = '(?:'.$wsp.'+|'.$wsp.'*(?:\x0D\x0A'.$wsp.'+)+)';
+            $optional_fws = $fws.'?';
             $day_name = $this->day_pcre;
             $month = $this->month_pcre;
             $day = '([0-9]{1,2})';
@@ -11485,8 +11485,8 @@ 
             $year = '([0-9]{2,4})';
             $num_zone = '([+\-])([0-9]{2})([0-9]{2})';
             $character_zone = '([A-Z]{1,5})';
-            $zone = '(?:' . $num_zone . '|' . $character_zone . ')';
-            $pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
+            $zone = '(?:'.$num_zone.'|'.$character_zone.')';
+            $pcre = '/(?:'.$optional_fws.$day_name.$optional_fws.',)?'.$optional_fws.$day.$fws.$month.$fws.$year.$fws.$hour.$optional_fws.':'.$optional_fws.$minute.'(?:'.$optional_fws.':'.$optional_fws.$second.')?'.$fws.$zone.'/i';
         }
         if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match))
         {
@@ -11563,7 +11563,7 @@ 
             $day = '([0-9]{1,2})';
             $year = $hour = $minute = $second = '([0-9]{2})';
             $zone = '([A-Z]{1,5})';
-            $pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
+            $pcre = '/^'.$day_name.','.$space.$day.'-'.$month.'-'.$year.$space.$hour.':'.$minute.':'.$second.$space.$zone.'$/i';
         }
         if (preg_match($pcre, $date, $match))
         {
@@ -11619,7 +11619,7 @@ 
             $hour = $sec = $min = '([0-9]{2})';
             $year = '([0-9]{4})';
             $terminator = '\x0A?\x00?';
-            $pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
+            $pcre = '/^'.$wday_name.$space.$mon_name.$space.$day.$space.$hour.':'.$min.':'.$sec.$space.$year.$terminator.'$/i';
         }
         if (preg_match($pcre, $date, $match))
         {
@@ -11720,7 +11720,7 @@ 
             if ($declaration->parse())
             {
                 $data = substr($data, $pos + 2);
-                $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
+                $data = '<?xml version="'.$declaration->version.'" encoding="'.$encoding.'" standalone="'.(($declaration->standalone) ? 'yes' : 'no').'"?>'.$data;
             }
             else
             {
@@ -11771,7 +11771,7 @@ 
                     case constant('XMLReader::END_ELEMENT'):
                         if ($xml->namespaceURI !== '')
                         {
-                            $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+                            $tagName = $xml->namespaceURI.$this->separator.$xml->localName;
                         }
                         else
                         {
@@ -11783,7 +11783,7 @@ 
                         $empty = $xml->isEmptyElement;
                         if ($xml->namespaceURI !== '')
                         {
-                            $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+                            $tagName = $xml->namespaceURI.$this->separator.$xml->localName;
                         }
                         else
                         {
@@ -11794,7 +11794,7 @@ 
                         {
                             if ($xml->namespaceURI !== '')
                             {
-                                $attrName = $xml->namespaceURI . $this->separator . $xml->localName;
+                                $attrName = $xml->namespaceURI.$this->separator.$xml->localName;
                             }
                             else
                             {
@@ -11888,12 +11888,12 @@ 
             $this->current_xhtml_construct++;
             if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
             {
-                $this->data['data'] .= '<' . end($this->element);
+                $this->data['data'] .= '<'.end($this->element);
                 if (isset($attribs['']))
                 {
                     foreach ($attribs[''] as $name => $value)
                     {
-                        $this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+                        $this->data['data'] .= ' '.$name.'="'.htmlspecialchars($value, ENT_COMPAT, $this->encoding).'"';
                     }
                 }
                 $this->data['data'] .= '>';
@@ -11901,8 +11901,8 @@ 
         }
         else
         {
-            $this->datas[] =& $this->data;
-            $this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
+            $this->datas[] = & $this->data;
+            $this->data = & $this->data['child'][end($this->namespace)][end($this->element)][];
             $this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
             if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
             || (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
@@ -11932,12 +11932,12 @@ 
             $this->current_xhtml_construct--;
             if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
             {
-                $this->data['data'] .= '</' . end($this->element) . '>';
+                $this->data['data'] .= '</'.end($this->element).'>';
             }
         }
         if ($this->current_xhtml_construct === -1)
         {
-            $this->data =& $this->datas[count($this->datas) - 1];
+            $this->data = & $this->datas[count($this->datas) - 1];
             array_pop($this->datas);
         }
         array_pop($this->element);
@@ -11969,7 +11969,7 @@ 
                     $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
                     $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
                     $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
-                    $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
+                    $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5)
                 {
                     $namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
                 }
@@ -12345,7 +12345,7 @@ 
         {
             if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
             {
-                if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
+                if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*'.SIMPLEPIE_PCRE_HTML_ATTRIBUTE.'>)/', $data))
                 {
                     $type |= SIMPLEPIE_CONSTRUCT_HTML;
                 }
@@ -12411,7 +12411,7 @@ 
                             $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $image_url, 'spi'));
                             if ($cache->load())
                             {
-                                $img->setAttribute('src', $this->image_handler . $image_url);
+                                $img->setAttribute('src', $this->image_handler.$image_url);
                             }
                             else
                             {
@@ -12421,7 +12421,7 @@ 
                                 {
                                     if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
                                     {
-                                        $img->setAttribute('src', $this->image_handler . $image_url);
+                                        $img->setAttribute('src', $this->image_handler.$image_url);
                                     }
                                     else
                                     {
@@ -12445,12 +12445,12 @@ 
                 $data = trim($document->saveHTML());
                 if ($this->remove_div)
                 {
-                    $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
+                    $data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '', $data);
                     $data = preg_replace('/<\/div>$/', '', $data);
                 }
                 else
                 {
-                    $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
+                    $data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '<div>', $data);
                 }
             }
             if ($type & SIMPLEPIE_CONSTRUCT_IRI)
@@ -12479,7 +12479,7 @@ 
         {
             // Atom XHTML constructs are wrapped with a div by default
             // Note: No protection if $html contains a stray </div>!
-            $html = '<div>' . $html . '</div>';
+            $html = '<div>'.$html.'</div>';
             $ret .= '<!DOCTYPE html>';
             $content_type = 'text/html';
         }
@@ -12489,8 +12489,8 @@ 
             $content_type = 'application/xhtml+xml';
         }
         $ret .= '<html><head>';
-        $ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
-        $ret .= '</head><body>' . $html . '</body></html>';
+        $ret .= '<meta http-equiv="Content-Type" content="'.$content_type.'; charset=utf-8" />';
+        $ret .= '</head><body>'.$html.'</body></html>';
         return $ret;
     }
     public function replace_urls($document, $tag, $attributes)
@@ -12545,7 +12545,7 @@ 
     protected function strip_tag($tag, $document, $type)
     {
         $xpath = new DOMXPath($document);
-        $elements = $xpath->query('body//' . $tag);
+        $elements = $xpath->query('body//'.$tag);
         if ($this->encode_instead_of_strip)
         {
             foreach ($elements as $element)
@@ -12554,7 +12554,7 @@ 
                 // For elements which aren't script or style, include the tag itself
                 if (!in_array($tag, array('script', 'style')))
                 {
-                    $text = '<' . $tag;
+                    $text = '<'.$tag;
                     if ($element->hasAttributes())
                     {
                         $attrs = array();
@@ -12573,9 +12573,9 @@ 
                                 continue;
                             }
                             // Standard attribute text
-                            $attrs[] = $name . '="' . $attr->value . '"';
+                            $attrs[] = $name.'="'.$attr->value.'"';
                         }
-                        $text .= ' ' . implode(' ', $attrs);
+                        $text .= ' '.implode(' ', $attrs);
                     }
                     $text .= '>';
                     $fragment->appendChild(new DOMText($text));
@@ -12588,7 +12588,7 @@ 
                 }
                 if (!in_array($tag, array('script', 'style')))
                 {
-                    $fragment->appendChild(new DOMText('</' . $tag . '>'));
+                    $fragment->appendChild(new DOMText('</'.$tag.'>'));
                 }
                 $element->parentNode->replaceChild($fragment, $element);
             }
@@ -12620,7 +12620,7 @@ 
     protected function strip_attr($attrib, $document)
     {
         $xpath = new DOMXPath($document);
-        $elements = $xpath->query('//*[@' . $attrib . ']');
+        $elements = $xpath->query('//*[@'.$attrib.']');
         foreach ($elements as $element)
         {
             $element->removeAttribute($attrib);
@@ -12978,19 +12978,19 @@ 
             {
                 if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
                 {
-                    if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+                    if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
                     {
-                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-                        $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+                        $this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
                     }
                     else
                     {
-                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+                        $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
                     }
                 }
                 elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
                 {
-                    $this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+                    $this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
                 }
                 $this->data['links'][$key] = array_unique($this->data['links'][$key]);
             }

Braces +614 added lines, -1189 removed lines

@@ -244,8 +244,7 @@ 
             {
                 $this->multifeed_url[] = $this->registry->call('Misc', 'fix_protocol', array($value, 1));
             }
-        }
-        else
+        } else
         {
             $this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1));
         }
@@ -307,8 +306,7 @@ 
         if ($encoding)
         {
             $this->input_encoding = (string) $encoding;
-        }
-        else
+        } else
         {
             $this->input_encoding = false;
         }
@@ -484,8 +482,7 @@ 
         if ($page !== false)
         {
             $this->sanitize->set_image_handler($page . '?' . $qs . '=');
-        }
-        else
+        } else
         {
             $this->image_handler = '';
         }
@@ -546,8 +543,7 @@ 
                 $i++;
             }
             return (bool) $success;
-        }
-        elseif ($this->feed_url === null && $this->raw_data === null)
+        } elseif ($this->feed_url === null && $this->raw_data === null)
         {
             return false;
         }
@@ -567,8 +563,7 @@ 
             if (($fetched = $this->fetch_data($cache)) === true)
             {
                 return true;
-            }
-            elseif ($fetched === false) {
+            } elseif ($fetched === false) {
                 return false;
             }
             list($headers, $sniffed) = $fetched;
@@ -593,8 +588,7 @@ 
                 }
                 $encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
                 $encodings[] = 'UTF-8';
-            }
-            elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
+            } elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
             {
                 if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
                 {
@@ -650,8 +644,7 @@ 
         {
             // We have an error, just set SimplePie_Misc::error to it and quit
             $this->error = sprintf('This XML document is invalid, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
-        }
-        else
+        } else
         {
             $this->error = 'The data could not be converted to UTF-8. You MUST have either the iconv or mbstring extension installed. Upgrading to PHP 5.x (which includes iconv) is highly recommended.';
         }
@@ -721,8 +714,7 @@ 
                                 $cache->touch();
                                 return true;
                             }
-                        }
-                        else
+                        } else
                         {
                             unset($file);
                         }
@@ -748,8 +740,7 @@ 
             if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
             {
                 $file =& $this->file;
-            }
-            else
+            } else
             {
                 $headers = array(
                     'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
@@ -779,8 +770,7 @@ 
                         $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
                         return false;
                     }
-                }
-                catch (SimplePie_Exception $e)
+                } catch (SimplePie_Exception $e)
                 {
                     // This is usually because DOMDocument doesn't exist
                     $this->error = $e->getMessage();
@@ -830,8 +820,7 @@ 
             if ($this->get_encoding())
             {
                 $header .= ' charset=' . $this->get_encoding();
-            }
-            else
+            } else
             {
                 $header .= ' charset=UTF-8';
             }
@@ -847,12 +836,10 @@ 
             if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
             {
                 $this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
-            }
-            elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
+            } elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
             {
                 $this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
-            }
-            elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
+            } elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
             {
                 if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
                 || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
@@ -868,8 +855,7 @@ 
                 {
                     $this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
                 }
-            }
-            elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
+            } elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
             {
                 $this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
                 if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
@@ -905,8 +891,7 @@ 
                             break;
                     }
                 }
-            }
-            else
+            } else
             {
                 $this->data['type'] = SIMPLEPIE_TYPE_NONE;
             }
@@ -919,8 +904,7 @@ 
         if ($this->feed_url !== null)
         {
             return $this->sanitize($this->feed_url, SIMPLEPIE_CONSTRUCT_IRI);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1044,12 +1028,10 @@ 
         if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
         {
             return $element['xml_base'];
-        }
-        elseif ($this->get_link() !== null)
+        } elseif ($this->get_link() !== null)
         {
             return $this->get_link();
-        }
-        else
+        } else
         {
             return $this->subscribe_url();
         }
@@ -1065,32 +1047,25 @@ 
         if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1102,8 +1077,7 @@ 
         if (isset($categories[$key]))
         {
             return $categories[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1139,8 +1113,7 @@ 
             if (isset($category['attribs']['']['domain']))
             {
                 $scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            else
+            } else
             {
                 $scheme = null;
             }
@@ -1157,8 +1130,7 @@ 
         if (!empty($categories))
         {
             return array_unique($categories);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1170,8 +1142,7 @@ 
         if (isset($authors[$key]))
         {
             return $authors[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1239,8 +1210,7 @@ 
         if (!empty($authors))
         {
             return array_unique($authors);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1252,8 +1222,7 @@ 
         if (isset($contributors[$key]))
         {
             return $contributors[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1309,8 +1278,7 @@ 
         if (!empty($contributors))
         {
             return array_unique($contributors);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1322,8 +1290,7 @@ 
         if (isset($links[$key]))
         {
             return $links[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1382,13 +1349,11 @@ 
                     {
                         $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
                         $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-                    }
-                    else
+                    } else
                     {
                         $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
                     }
-                }
-                elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+                } elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
                 {
                     $this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
                 }
@@ -1398,8 +1363,7 @@ 
         if (isset($this->data['links'][$rel]))
         {
             return $this->data['links'][$rel];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1414,40 +1378,31 @@ 
         if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1458,24 +1413,19 @@ 
         if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1486,32 +1436,25 @@ 
         if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
+        } elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
         {
             return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
+        } elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
         {
             return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
+        } elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
         {
             return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif (isset($this->data['headers']['content-language']))
+        } elseif (isset($this->data['headers']['content-language']))
         {
             return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1522,12 +1465,10 @@ 
         if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
         {
             return (float) $return[0]['data'];
-        }
-        elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+        } elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
         {
             return (float) $match[1];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1538,16 +1479,13 @@ 
         if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
         {
             return (float) $return[0]['data'];
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
         {
             return (float) $return[0]['data'];
-        }
-        elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+        } elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
         {
             return (float) $match[2];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1558,24 +1496,19 @@ 
         if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+        } elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+        } elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+        } elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+        } elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1586,28 +1519,22 @@ 
         if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
         {
             return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+        } elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
+        } elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
+        } elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+        } elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1618,16 +1545,13 @@ 
         if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+        } elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+        } elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1638,12 +1562,10 @@ 
         if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
         {
             return round($return[0]['data']);
-        }
-        elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+        } elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
         {
             return 88.0;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1654,12 +1576,10 @@ 
         if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
         {
             return round($return[0]['data']);
-        }
-        elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+        } elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
         {
             return 31.0;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1672,8 +1592,7 @@ 
         if ($max === 0)
         {
             return $qty;
-        }
-        else
+        } else
         {
             return ($qty > $max) ? $max : $qty;
         }
@@ -1685,8 +1604,7 @@ 
         if (isset($items[$key]))
         {
             return $items[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1699,8 +1617,7 @@ 
             if (!empty($this->multifeed_objects))
             {
                 $this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
-            }
-            else
+            } else
             {
                 $this->data['items'] = array();
                 if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
@@ -1769,8 +1686,7 @@ 
                     }
                 }
                 $items = $this->data['ordered_items'];
-            }
-            else
+            } else
             {
                 $items = $this->data['items'];
             }
@@ -1778,13 +1694,11 @@ 
             if ($end === 0)
             {
                 return array_slice($items, $start);
-            }
-            else
+            } else
             {
                 return array_slice($items, $start, $end);
             }
-        }
-        else
+        } else
         {
             return array();
         }
@@ -1844,8 +1758,7 @@ 
                 if ($arg instanceof SimplePie)
                 {
                     $items = array_merge($items, $arg->get_items(0, $limit));
-                }
-                else
+                } else
                 {
                     trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
                 }
@@ -1867,13 +1780,11 @@ 
             if ($end === 0)
             {
                 return array_slice($items, $start);
-            }
-            else
+            } else
             {
                 return array_slice($items, $start, $end);
             }
-        }
-        else
+        } else
         {
             trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
             return array();
@@ -1907,8 +1818,7 @@ 
         if ($this->name !== null)
         {
             return $this->name;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1919,8 +1829,7 @@ 
         if ($this->link !== null)
         {
             return $this->link;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1931,8 +1840,7 @@ 
         if ($this->email !== null)
         {
             return $this->email;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -1982,20 +1890,16 @@ 
             if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
             {
                 $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
-            }
-            elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+            } elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
             {
                 $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
-            }
-            elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+            } elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
             {
                 $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
-            }
-            elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
+            } elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
             {
                 $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
-            }
-            else
+            } else
             {
                 $channel = null;
             }
@@ -2203,8 +2107,7 @@ 
         try
         {
             $this->mysql = new PDO("mysql:dbname={$this->options['dbname']};host={$this->options['host']};port={$this->options['port']}", $this->options['user'], $this->options['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
-        }
-        catch (PDOException $e)
+        } catch (PDOException $e)
         {
             $this->mysql = null;
             return;
@@ -2260,8 +2163,7 @@ 
                         $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
                         $query = $this->mysql->prepare($sql);
                         $query->bindValue(':items', $items);
-                    }
-                    else
+                    } else
                     {
                         $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
                         $query = $this->mysql->prepare($sql);
@@ -2273,8 +2175,7 @@ 
                     {
                         return false;
                     }
-                }
-                else
+                } else
                 {
                     $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
                     $query->bindValue(':feed', $this->id);
@@ -2321,14 +2222,12 @@ 
                         }
                         return true;
                     }
-                }
-                else
+                } else
                 {
                     return true;
                 }
             }
-        }
-        else
+        } else
         {
             $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
             $query->bindValue(':feed', $this->id);
@@ -2344,8 +2243,7 @@ 
                     {
                         return true;
                     }
-                }
-                else
+                } else
                 {
                     $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
                     $query->bindValue(':id', $this->id);
@@ -2375,8 +2273,7 @@ 
             if (isset($this->options['items'][0]))
             {
                 $items = (int) $this->options['items'][0];
-            }
-            else
+            } else
             {
                 $items = (int) $row[0];
             }
@@ -2385,20 +2282,16 @@ 
                 if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
                 {
                     $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
-                }
-                elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+                } elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
                 {
                     $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
-                }
-                elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+                } elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
                 {
                     $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
-                }
-                elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
+                } elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
                 {
                     $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
-                }
-                else
+                } else
                 {
                     $feed = null;
                 }
@@ -2417,8 +2310,7 @@ 
                         {
                             $feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row);
                         }
-                    }
-                    else
+                    } else
                     {
                         return false;
                     }
@@ -2440,8 +2332,7 @@ 
         if ($query->execute() && ($time = $query->fetchColumn()))
         {
             return $time;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -2459,8 +2350,7 @@ 
         if ($query->execute() && $query->rowCount() > 0)
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -2479,8 +2369,7 @@ 
         if ($query->execute() && $query2->execute())
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -2563,8 +2452,7 @@ 
         if ($this->endTime !== null)
         {
             return $this->endTime;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2575,8 +2463,7 @@ 
         if ($this->lang !== null)
         {
             return $this->lang;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2587,8 +2474,7 @@ 
         if ($this->startTime !== null)
         {
             return $this->startTime;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2599,8 +2485,7 @@ 
         if ($this->text !== null)
         {
             return $this->text;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2611,8 +2496,7 @@ 
         if ($this->type !== null)
         {
             return $this->type;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2645,8 +2529,7 @@ 
         if ($this->term !== null)
         {
             return $this->term;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2657,8 +2540,7 @@ 
         if ($this->scheme !== null)
         {
             return $this->scheme;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2669,8 +2551,7 @@ 
         if ($this->label !== null)
         {
             return $this->label;
-        }
-        else
+        } else
         {
             return $this->get_term();
         }
@@ -2701,8 +2582,7 @@ 
             if (($pos = strpos($this->file->headers['content-type'], ';')) !== false)
             {
                 $official = substr($this->file->headers['content-type'], 0, $pos);
-            }
-            else
+            } else
             {
                 $official = $this->file->headers['content-type'];
             }
@@ -2711,34 +2591,28 @@ 
                 || $official === 'application/unknown')
             {
                 return $this->unknown();
-            }
-            elseif (substr($official, -4) === '+xml'
+            } elseif (substr($official, -4) === '+xml'
                 || $official === 'text/xml'
                 || $official === 'application/xml')
             {
                 return $official;
-            }
-            elseif (substr($official, 0, 6) === 'image/')
+            } elseif (substr($official, 0, 6) === 'image/')
             {
                 if ($return = $this->image())
                 {
                     return $return;
-                }
-                else
+                } else
                 {
                     return $official;
                 }
-            }
-            elseif ($official === 'text/html')
+            } elseif ($official === 'text/html')
             {
                 return $this->feed_or_html();
-            }
-            else
+            } else
             {
                 return $official;
             }
-        }
-        else
+        } else
         {
             return $this->unknown();
         }
@@ -2752,12 +2626,10 @@ 
             || substr($this->file->body, 0, 3) === "\xEF\xBB\xBF")
         {
             return 'text/plain';
-        }
-        elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
+        } elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
         {
             return 'application/octect-stream';
-        }
-        else
+        } else
         {
             return 'text/plain';
         }
@@ -2771,37 +2643,29 @@ 
             || strtolower(substr($this->file->body, $ws, 7)) === '<script')
         {
             return 'text/html';
-        }
-        elseif (substr($this->file->body, 0, 5) === '%PDF-')
+        } elseif (substr($this->file->body, 0, 5) === '%PDF-')
         {
             return 'application/pdf';
-        }
-        elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
+        } elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
         {
             return 'application/postscript';
-        }
-        elseif (substr($this->file->body, 0, 6) === 'GIF87a'
+        } elseif (substr($this->file->body, 0, 6) === 'GIF87a'
             || substr($this->file->body, 0, 6) === 'GIF89a')
         {
             return 'image/gif';
-        }
-        elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+        } elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
         {
             return 'image/png';
-        }
-        elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+        } elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
         {
             return 'image/jpeg';
-        }
-        elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+        } elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
         {
             return 'image/bmp';
-        }
-        elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+        } elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
         {
             return 'image/vnd.microsoft.icon';
-        }
-        else
+        } else
         {
             return $this->text_or_binary();
         }
@@ -2813,24 +2677,19 @@ 
             || substr($this->file->body, 0, 6) === 'GIF89a')
         {
             return 'image/gif';
-        }
-        elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+        } elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
         {
             return 'image/png';
-        }
-        elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+        } elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
         {
             return 'image/jpeg';
-        }
-        elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+        } elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
         {
             return 'image/bmp';
-        }
-        elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+        } elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
         {
             return 'image/vnd.microsoft.icon';
-        }
-        else
+        } else
         {
             return false;
         }
@@ -2862,44 +2721,36 @@ 
                 if ($pos < $len && ($pos = strpos($this->file->body, '-->', $pos)) !== false)
                 {
                     $pos += 3;
-                }
-                else
+                } else
                 {
                     return 'text/html';
                 }
-            }
-            elseif (substr($this->file->body, $pos, 1) === '!')
+            } elseif (substr($this->file->body, $pos, 1) === '!')
             {
                 if ($pos < $len && ($pos = strpos($this->file->body, '>', $pos)) !== false)
                 {
                     $pos++;
-                }
-                else
+                } else
                 {
                     return 'text/html';
                 }
-            }
-            elseif (substr($this->file->body, $pos, 1) === '?')
+            } elseif (substr($this->file->body, $pos, 1) === '?')
             {
                 if ($pos < $len && ($pos = strpos($this->file->body, '?>', $pos)) !== false)
                 {
                     $pos += 2;
-                }
-                else
+                } else
                 {
                     return 'text/html';
                 }
-            }
-            elseif (substr($this->file->body, $pos, 3) === 'rss'
+            } elseif (substr($this->file->body, $pos, 3) === 'rss'
                 || substr($this->file->body, $pos, 7) === 'rdf:RDF')
             {
                 return 'application/rss+xml';
-            }
-            elseif (substr($this->file->body, $pos, 4) === 'feed')
+            } elseif (substr($this->file->body, $pos, 4) === 'feed')
             {
                 return 'application/atom+xml';
-            }
-            else
+            } else
             {
                 return 'text/html';
             }
@@ -2931,8 +2782,7 @@ 
         if ($this->url !== null)
         {
             return $this->url;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2943,8 +2793,7 @@ 
         if ($this->label !== null)
         {
             return $this->label;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2980,8 +2829,7 @@ 
         if ($this->role !== null)
         {
             return $this->role;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -2992,8 +2840,7 @@ 
         if ($this->scheme !== null)
         {
             return $this->scheme;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3004,8 +2851,7 @@ 
         if ($this->name !== null)
         {
             return $this->name;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3042,8 +2888,7 @@ 
         {
             $this->consumed .= $this->data[$this->position];
             return $this->data[$this->position++];
-        }
-        else
+        } else
         {
             return false;
         }
@@ -3057,8 +2902,7 @@ 
             $this->consumed .= $data;
             $this->position += $len;
             return $data;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -3104,16 +2948,14 @@ 
                     if ($hex)
                     {
                         $codepoint = hexdec($codepoint);
-                    }
-                    else
+                    } else
                     {
                         $codepoint = intval($codepoint);
                     }
                     if (isset($windows_1252_specials[$codepoint]))
                     {
                         $replacement = $windows_1252_specials[$codepoint];
-                    }
-                    else
+                    } else
                     {
                         $replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
                     }
@@ -3616,8 +3458,7 @@ 
         if ($this->bitrate !== null)
         {
             return $this->bitrate;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3629,8 +3470,7 @@ 
         if (isset($captions[$key]))
         {
             return $captions[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3641,8 +3481,7 @@ 
         if ($this->captions !== null)
         {
             return $this->captions;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3654,8 +3493,7 @@ 
         if (isset($categories[$key]))
         {
             return $categories[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3666,8 +3504,7 @@ 
         if ($this->categories !== null)
         {
             return $this->categories;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3678,8 +3515,7 @@ 
         if ($this->channels !== null)
         {
             return $this->channels;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3690,8 +3526,7 @@ 
         if ($this->copyright !== null)
         {
             return $this->copyright;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3703,8 +3538,7 @@ 
         if (isset($credits[$key]))
         {
             return $credits[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3715,8 +3549,7 @@ 
         if ($this->credits !== null)
         {
             return $this->credits;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3727,8 +3560,7 @@ 
         if ($this->description !== null)
         {
             return $this->description;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3742,13 +3574,11 @@ 
             {
                 $time = SimplePie_Misc::time_hms($this->duration);
                 return $time;
-            }
-            else
+            } else
             {
                 return $this->duration;
             }
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3759,8 +3589,7 @@ 
         if ($this->expression !== null)
         {
             return $this->expression;
-        }
-        else
+        } else
         {
             return 'full';
         }
@@ -3784,8 +3613,7 @@ 
         if ($this->framerate !== null)
         {
             return $this->framerate;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3802,8 +3630,7 @@ 
         if (isset($hashes[$key]))
         {
             return $hashes[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3814,8 +3641,7 @@ 
         if ($this->hashes !== null)
         {
             return $this->hashes;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3826,8 +3652,7 @@ 
         if ($this->height !== null)
         {
             return $this->height;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3838,8 +3663,7 @@ 
         if ($this->lang !== null)
         {
             return $this->lang;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3851,8 +3675,7 @@ 
         if (isset($keywords[$key]))
         {
             return $keywords[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3863,8 +3686,7 @@ 
         if ($this->keywords !== null)
         {
             return $this->keywords;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3875,8 +3697,7 @@ 
         if ($this->length !== null)
         {
             return $this->length;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3887,8 +3708,7 @@ 
         if ($this->link !== null)
         {
             return urldecode($this->link);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3899,8 +3719,7 @@ 
         if ($this->medium !== null)
         {
             return $this->medium;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3911,8 +3730,7 @@ 
         if ($this->player !== null)
         {
             return $this->player;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3924,8 +3742,7 @@ 
         if (isset($ratings[$key]))
         {
             return $ratings[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3936,8 +3753,7 @@ 
         if ($this->ratings !== null)
         {
             return $this->ratings;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3949,8 +3765,7 @@ 
         if (isset($restrictions[$key]))
         {
             return $restrictions[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3961,8 +3776,7 @@ 
         if ($this->restrictions !== null)
         {
             return $this->restrictions;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3973,8 +3787,7 @@ 
         if ($this->samplingrate !== null)
         {
             return $this->samplingrate;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3986,8 +3799,7 @@ 
         if ($length !== null)
         {
             return round($length/1048576, 2);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -3999,8 +3811,7 @@ 
         if (isset($thumbnails[$key]))
         {
             return $thumbnails[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -4011,8 +3822,7 @@ 
         if ($this->thumbnails !== null)
         {
             return $this->thumbnails;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -4023,8 +3833,7 @@ 
         if ($this->title !== null)
         {
             return $this->title;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -4035,8 +3844,7 @@ 
         if ($this->type !== null)
         {
             return $this->type;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -4047,8 +3855,7 @@ 
         if ($this->width !== null)
         {
             return $this->width;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -4078,8 +3885,7 @@ 
         if (is_array($options))
         {
             extract($options);
-        }
-        else
+        } else
         {
             $options = explode(',', $options);
             foreach($options as $option)
@@ -4135,17 +3941,14 @@ 
                 if ($height === 'auto')
                 {
                     $width = 480;
-                }
-                elseif ($widescreen)
+                } elseif ($widescreen)
                 {
                     $width = round((intval($height)/9)*16);
-                }
-                else
+                } else
                 {
                     $width = round((intval($height)/3)*4);
                 }
-            }
-            else
+            } else
             {
                 $width = '100%';
             }
@@ -4155,35 +3958,29 @@ 
             if ($mime === 'audio')
             {
                 $height = 0;
-            }
-            elseif ($mime === 'video')
+            } elseif ($mime === 'video')
             {
                 if ($width === 'auto')
                 {
                     if ($widescreen)
                     {
                         $height = 270;
-                    }
-                    else
+                    } else
                     {
                         $height = 360;
                     }
-                }
-                elseif ($widescreen)
+                } elseif ($widescreen)
                 {
                     $height = round((intval($width)/16)*9);
-                }
-                else
+                } else
                 {
                     $height = round((intval($width)/4)*3);
                 }
-            }
-            else
+            } else
             {
                 $height = 376;
             }
-        }
-        elseif ($mime === 'audio')
+        } elseif ($mime === 'audio')
         {
             $height = 0;
         }
@@ -4191,8 +3988,7 @@ 
         if ($mime === 'audio')
         {
             $placeholder = $audio;
-        }
-        elseif ($mime === 'video')
+        } elseif ($mime === 'video')
         {
             $placeholder = $video;
         }
@@ -4203,8 +3999,7 @@ 
             if ($native)
             {
                 $embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
-            }
-            else
+            } else
             {
                 $embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
             }
@@ -4217,8 +4012,7 @@ 
             if ($native)
             {
                 $embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
-            }
-            else
+            } else
             {
                 $embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
             }
@@ -4233,13 +4027,11 @@ 
                 if ($placeholder !== '')
                 {
                     $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
-                }
-                else
+                } else
                 {
                     $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
                 }
-            }
-            else
+            } else
             {
                 $embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
             }
@@ -4251,14 +4043,15 @@ 
             if ($native)
             {
                 $embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
-            }
-            else
+            } else
             {
                 $embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
             }
         }
         // Everything else
-        else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+        else {
+            $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+        }
         return $embed;
     }
     
@@ -4273,8 +4066,7 @@ 
         if ($this->get_type() !== null)
         {
             $type = strtolower($this->type);
-        }
-        else
+        } else
         {
             $type = null;
         }
@@ -4384,29 +4176,23 @@ 
             if (in_array($type, $types_flash))
             {
                 return 'flash';
-            }
-            elseif (in_array($type, $types_fmedia))
+            } elseif (in_array($type, $types_fmedia))
             {
                 return 'fmedia';
-            }
-            elseif (in_array($type, $types_quicktime))
+            } elseif (in_array($type, $types_quicktime))
             {
                 return 'quicktime';
-            }
-            elseif (in_array($type, $types_wmedia))
+            } elseif (in_array($type, $types_wmedia))
             {
                 return 'wmedia';
-            }
-            elseif (in_array($type, $types_mp3))
+            } elseif (in_array($type, $types_mp3))
             {
                 return 'mp3';
-            }
-            else
+            } else
             {
                 return null;
             }
-        }
-        else
+        } else
         {
             return $type;
         }
@@ -4483,8 +4269,7 @@ 
                 {
                     $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
                     $this->success = false;
-                }
-                else
+                } else
                 {
                     $info = curl_getinfo($fp);
                     curl_close($fp);
@@ -4505,8 +4290,7 @@ 
                         }
                     }
                 }
-            }
-            else
+            } else
             {
                 $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
                 $url_parts = parse_url($url);
@@ -4525,8 +4309,7 @@ 
                 {
                     $this->error = 'fsockopen error: ' . $errstr;
                     $this->success = false;
-                }
-                else
+                } else
                 {
                     stream_set_timeout($fp, $timeout);
                     if (isset($url_parts['path']))
@@ -4534,13 +4317,11 @@ 
                         if (isset($url_parts['query']))
                         {
                             $get = "$url_parts[path]?$url_parts[query]";
-                        }
-                        else
+                        } else
                         {
                             $get = $url_parts['path'];
                         }
-                    }
-                    else
+                    } else
                     {
                         $get = '/';
                     }
@@ -4594,8 +4375,7 @@ 
                                         {
                                             $this->error = 'Unable to decode HTTP "gzip" stream';
                                             $this->success = false;
-                                        }
-                                        else
+                                        } else
                                         {
                                             $this->body = $decoder->data;
                                         }
@@ -4604,16 +4384,13 @@ 
                                         if (($decompressed = gzinflate($this->body)) !== false)
                                         {
                                             $this->body = $decompressed;
-                                        }
-                                        else if (($decompressed = gzuncompress($this->body)) !== false)
+                                        } else if (($decompressed = gzuncompress($this->body)) !== false)
                                         {
                                             $this->body = $decompressed;
-                                        }
-                                        else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
+                                        } else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
                                         {
                                             $this->body = $decompressed;
-                                        }
-                                        else
+                                        } else
                                         {
                                             $this->error = 'Unable to decode HTTP "deflate" stream';
                                             $this->success = false;
@@ -4625,8 +4402,7 @@ 
                                 }
                             }
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->error = 'fsocket timed out';
                         $this->success = false;
@@ -4634,8 +4410,7 @@ 
                     fclose($fp);
                 }
             }
-        }
-        else
+        } else
         {
             $this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
             if (!$this->body = file_get_contents($url))
@@ -4740,8 +4515,7 @@ 
                     // Set the extra field to the given data
                     $this->extra_field = substr($this->compressed_data, $this->position, $len);
                     $this->position += $len;
-                }
-                else
+                } else
                 {
                     return false;
                 }
@@ -4758,8 +4532,7 @@ 
                     // Set the original filename to the given string
                     $this->filename = substr($this->compressed_data, $this->position, $len);
                     $this->position += $len + 1;
-                }
-                else
+                } else
                 {
                     return false;
                 }
@@ -4776,8 +4549,7 @@ 
                     // Set the original comment to the given string
                     $this->comment = substr($this->compressed_data, $this->position, $len);
                     $this->position += $len + 1;
-                }
-                else
+                } else
                 {
                     return false;
                 }
@@ -4795,13 +4567,11 @@ 
                     if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
                     {
                         $this->position += 2;
-                    }
-                    else
+                    } else
                     {
                         return false;
                     }
-                }
-                else
+                } else
                 {
                     return false;
                 }
@@ -4810,8 +4580,7 @@ 
             if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false)
             {
                 return false;
-            }
-            else
+            } else
             {
                 $this->position = $this->compressed_size - 8;
             }
@@ -4831,8 +4600,7 @@ 
             }
             // Wow, against all odds, we've actually got a valid gzip string
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -4880,8 +4648,7 @@ 
         if ($this->state === 'emit' || $this->state === 'body')
         {
             return true;
-        }
-        else
+        } else
         {
             $this->http_version = '';
             $this->status_code = '';
@@ -4918,13 +4685,11 @@ 
                 $this->http_version = (float) $this->http_version;
                 $this->position += strspn($this->data, "\x09\x20", $this->position);
                 $this->state = 'status';
-            }
-            else
+            } else
             {
                 $this->state = false;
             }
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -4937,8 +4702,7 @@ 
             $this->status_code = (int) substr($this->data, $this->position, $len);
             $this->position += $len;
             $this->state = 'reason';
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -4962,8 +4726,7 @@ 
             if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
             {
                 $this->headers[$this->name] .= ', ' . $this->value;
-            }
-            else
+            } else
             {
                 $this->headers[$this->name] = $this->value;
             }
@@ -4974,13 +4737,11 @@ 
         {
             $this->position += 2;
             $this->state = 'body';
-        }
-        elseif ($this->data[$this->position] === "\x0A")
+        } elseif ($this->data[$this->position] === "\x0A")
         {
             $this->position++;
             $this->state = 'body';
-        }
-        else
+        } else
         {
             $this->state = 'name';
         }
@@ -4995,15 +4756,13 @@ 
             {
                 $this->position += $len;
                 $this->state = 'new_line';
-            }
-            else
+            } else
             {
                 $this->name = substr($this->data, $this->position, $len);
                 $this->position += $len + 1;
                 $this->state = 'value';
             }
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -5016,8 +4775,7 @@ 
             if (substr($this->data, $this->position, 2) === "\x0D\x0A")
             {
                 $this->position += 2;
-            }
-            elseif ($this->data[$this->position] === "\x0A")
+            } elseif ($this->data[$this->position] === "\x0A")
             {
                 $this->position++;
             }
@@ -5031,8 +4789,7 @@ 
         if ($this->is_linear_whitespace())
         {
             $this->linear_whitespace();
-        }
-        else
+        } else
         {
             switch ($this->data[$this->position])
             {
@@ -5073,8 +4830,7 @@ 
         if ($this->is_linear_whitespace())
         {
             $this->linear_whitespace();
-        }
-        else
+        } else
         {
             switch ($this->data[$this->position])
             {
@@ -5119,8 +4875,7 @@ 
         {
             unset($this->headers['transfer-encoding']);
             $this->state = 'chunked';
-        }
-        else
+        } else
         {
             $this->state = 'emit';
         }
@@ -5211,8 +4966,7 @@ 
         if (method_exists($this, 'set_' . $name))
         {
             call_user_func(array($this, 'set_' . $name), $value);
-        }
-        elseif (
+        } elseif (
                $name === 'iauthority'
             || $name === 'iuserinfo'
             || $name === 'ihost'
@@ -5238,8 +4992,7 @@ 
         )
         {
             $return = $this->{"get_$name"}();
-        }
-        elseif (array_key_exists($name, $props))
+        } elseif (array_key_exists($name, $props))
         {
             $return = $this->$name;
         }
@@ -5254,8 +5007,7 @@ 
         {
             $name = $prop;
             $return = $this->$prop;
-        }
-        else
+        } else
         {
             trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
             $return = null;
@@ -5263,8 +5015,7 @@ 
         if ($return === null && isset($this->normalization[$this->scheme][$name]))
         {
             return $this->normalization[$this->scheme][$name];
-        }
-        else
+        } else
         {
             return $return;
         }
@@ -5275,8 +5026,7 @@ 
         if (method_exists($this, 'get_' . $name) || isset($this->$name))
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -5304,12 +5054,10 @@ 
         if (!$relative->is_valid())
         {
             return false;
-        }
-        elseif ($relative->scheme !== null)
+        } elseif ($relative->scheme !== null)
         {
             return clone $relative;
-        }
-        else
+        } else
         {
             if (!($base instanceof SimplePie_IRI))
             {
@@ -5323,8 +5071,7 @@ 
                     {
                         $target = clone $relative;
                         $target->scheme = $base->scheme;
-                    }
-                    else
+                    } else
                     {
                         $target = new SimplePie_IRI;
                         $target->scheme = $base->scheme;
@@ -5336,46 +5083,39 @@ 
                             if ($relative->ipath[0] === '/')
                             {
                                 $target->ipath = $relative->ipath;
-                            }
-                            elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
+                            } elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
                             {
                                 $target->ipath = '/' . $relative->ipath;
-                            }
-                            elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
+                            } elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
                             {
                                 $target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
-                            }
-                            else
+                            } else
                             {
                                 $target->ipath = $relative->ipath;
                             }
                             $target->ipath = $target->remove_dot_segments($target->ipath);
                             $target->iquery = $relative->iquery;
-                        }
-                        else
+                        } else
                         {
                             $target->ipath = $base->ipath;
                             if ($relative->iquery !== null)
                             {
                                 $target->iquery = $relative->iquery;
-                            }
-                            elseif ($base->iquery !== null)
+                            } elseif ($base->iquery !== null)
                             {
                                 $target->iquery = $base->iquery;
                             }
                         }
                         $target->ifragment = $relative->ifragment;
                     }
-                }
-                else
+                } else
                 {
                     $target = clone $base;
                     $target->ifragment = null;
                 }
                 $target->scheme_normalization();
                 return $target;
-            }
-            else
+            } else
             {
                 return false;
             }
@@ -5408,8 +5148,7 @@ 
                 $match['fragment'] = null;
             }
             return $match;
-        }
-        else
+        } else
         {
             // This can occur when a paragraph is accidentally parsed as a URI
             return false;
@@ -5425,8 +5164,7 @@ 
             if (strpos($input, '../') === 0)
             {
                 $input = substr($input, 3);
-            }
-            elseif (strpos($input, './') === 0)
+            } elseif (strpos($input, './') === 0)
             {
                 $input = substr($input, 2);
             }
@@ -5434,8 +5172,7 @@ 
             elseif (strpos($input, '/./') === 0)
             {
                 $input = substr($input, 2);
-            }
-            elseif ($input === '/.')
+            } elseif ($input === '/.')
             {
                 $input = '/';
             }
@@ -5444,8 +5181,7 @@ 
             {
                 $input = substr($input, 3);
                 $output = substr_replace($output, '', strrpos($output, '/'));
-            }
-            elseif ($input === '/..')
+            } elseif ($input === '/..')
             {
                 $input = '/';
                 $output = substr_replace($output, '', strrpos($output, '/'));
@@ -5460,8 +5196,7 @@ 
             {
                 $output .= substr($input, 0, $pos);
                 $input = substr_replace($input, '', 0, $pos);
-            }
-            else
+            } else
             {
                 $output .= $input;
                 $input = '';
@@ -5539,8 +5274,7 @@ 
                             break;
                         }
                     }
-                }
-                else
+                } else
                 {
                     $position = $strlen - 1;
                     $valid = false;
@@ -5573,8 +5307,9 @@ 
             )
             {
                 // If we were a character, pretend we weren't, but rather an error.
-                if ($valid)
-                    $position--;
+                if ($valid) {
+                                    $position--;
+                }
                 for ($j = $start; $j <= $position; $j++)
                 {
                     $string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
@@ -5689,8 +5424,7 @@ 
                     {
                         $string .= '%' . strtoupper($bytes[$j]);
                     }
-                }
-                else
+                } else
                 {
                     for ($j = $start; $j <= $i; $j++)
                     {
@@ -5771,8 +5505,7 @@ 
         if ($iri === null)
         {
             return true;
-        }
-        elseif (isset($cache[$iri]))
+        } elseif (isset($cache[$iri]))
         {
             list($this->scheme,
                  $this->iuserinfo,
@@ -5783,8 +5516,7 @@ 
                  $this->ifragment,
                  $return) = $cache[$iri];
             return $return;
-        }
-        else
+        } else
         {
             $parsed = $this->parse_iri((string) $iri);
             if (!$parsed)
@@ -5813,13 +5545,11 @@ 
         if ($scheme === null)
         {
             $this->scheme = null;
-        }
-        elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
+        } elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
         {
             $this->scheme = null;
             return false;
-        }
-        else
+        } else
         {
             $this->scheme = strtolower($scheme);
         }
@@ -5829,32 +5559,30 @@ 
     public function set_authority($authority)
     {
         static $cache;
-        if (!$cache)
-            $cache = array();
+        if (!$cache) {
+                    $cache = array();
+        }
         if ($authority === null)
         {
             $this->iuserinfo = null;
             $this->ihost = null;
             $this->port = null;
             return true;
-        }
-        elseif (isset($cache[$authority]))
+        } elseif (isset($cache[$authority]))
         {
             list($this->iuserinfo,
                  $this->ihost,
                  $this->port,
                  $return) = $cache[$authority];
             return $return;
-        }
-        else
+        } else
         {
             $remaining = $authority;
             if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
             {
                 $iuserinfo = substr($remaining, 0, $iuserinfo_end);
                 $remaining = substr($remaining, $iuserinfo_end + 1);
-            }
-            else
+            } else
             {
                 $iuserinfo = null;
             }
@@ -5865,8 +5593,7 @@ 
                     $port = null;
                 }
                 $remaining = substr($remaining, 0, $port_start);
-            }
-            else
+            } else
             {
                 $port = null;
             }
@@ -5886,8 +5613,7 @@ 
         if ($iuserinfo === null)
         {
             $this->iuserinfo = null;
-        }
-        else
+        } else
         {
             $this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
             $this->scheme_normalization();
@@ -5901,20 +5627,17 @@ 
         {
             $this->ihost = null;
             return true;
-        }
-        elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
+        } elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
         {
             if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
             {
                 $this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
-            }
-            else
+            } else
             {
                 $this->ihost = null;
                 return false;
             }
-        }
-        else
+        } else
         {
             $ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
             // Lowercase, but ignore pct-encoded sections (as they should
@@ -5927,8 +5650,7 @@ 
                 if ($ihost[$position] === '%')
                 {
                     $position += 3;
-                }
-                else
+                } else
                 {
                     $ihost[$position] = strtolower($ihost[$position]);
                     $position++;
@@ -5946,14 +5668,12 @@ 
         {
             $this->port = null;
             return true;
-        }
-        elseif (strspn($port, '0123456789') === strlen($port))
+        } elseif (strspn($port, '0123456789') === strlen($port))
         {
             $this->port = (int) $port;
             $this->scheme_normalization();
             return true;
-        }
-        else
+        } else
         {
             $this->port = null;
             return false;
@@ -5971,8 +5691,7 @@ 
         if (isset($cache[$ipath]))
         {
             $this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-        }
-        else
+        } else
         {
             $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
             $removed = $this->remove_dot_segments($valid);
@@ -5988,8 +5707,7 @@ 
         if ($iquery === null)
         {
             $this->iquery = null;
-        }
-        else
+        } else
         {
             $this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
             $this->scheme_normalization();
@@ -6002,8 +5720,7 @@ 
         if ($ifragment === null)
         {
             $this->ifragment = null;
-        }
-        else
+        } else
         {
             $this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
             $this->scheme_normalization();
@@ -6047,8 +5764,7 @@ 
         if ($this->ipath !== '')
         {
             $iri .= $this->ipath;
-        }
-        elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
+        } elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
         {
             $iri .= $this->normalization[$this->scheme]['ipath'];
         }
@@ -6086,8 +5802,7 @@ 
                 $iauthority .= ':' . $this->port;
             }
             return $iauthority;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6096,10 +5811,11 @@ 
     protected function get_authority()
     {
         $iauthority = $this->get_iauthority();
-        if (is_string($iauthority))
-            return $this->to_uri($iauthority);
-        else
-            return $iauthority;
+        if (is_string($iauthority)) {
+                    return $this->to_uri($iauthority);
+        } else {
+                    return $iauthority;
+        }
     }
 }
 class SimplePie_Item
@@ -6140,8 +5856,7 @@ 
         if (isset($this->data['child'][$namespace][$tag]))
         {
             return $this->data['child'][$namespace][$tag];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6169,32 +5884,25 @@ 
             if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
             {
                 return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
             {
                 return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
             {
                 return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
             {
                 return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
             {
                 return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
+            } elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
             {
                 return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            elseif (($return = $this->get_permalink()) !== null)
+            } elseif (($return = $this->get_permalink()) !== null)
             {
                 return $return;
-            }
-            elseif (($return = $this->get_title()) !== null)
+            } elseif (($return = $this->get_title()) !== null)
             {
                 return $return;
             }
@@ -6202,8 +5910,7 @@ 
         if ($this->get_permalink() !== null || $this->get_title() !== null)
         {
             return md5($this->get_permalink() . $this->get_title());
-        }
-        else
+        } else
         {
             return md5(serialize($this->data));
         }
@@ -6216,32 +5923,25 @@ 
             if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
             {
                 $this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
             {
                 $this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
             {
                 $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
             {
                 $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
             {
                 $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
             {
                 $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
             {
                 $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            else
+            } else
             {
                 $this->data['title'] = null;
             }
@@ -6254,44 +5954,34 @@ 
         if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
-        }
-        elseif (!$description_only)
+        } elseif (!$description_only)
         {
             return $this->get_content(true);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6302,20 +5992,16 @@ 
         if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-        }
-        elseif (!$content_only)
+        } elseif (!$content_only)
         {
             return $this->get_description(true);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6327,8 +6013,7 @@ 
         if (isset($categories[$key]))
         {
             return $categories[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6364,8 +6049,7 @@ 
             if (isset($category['attribs']['']['domain']))
             {
                 $scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            else
+            } else
             {
                 $scheme = null;
             }
@@ -6382,8 +6066,7 @@ 
         if (!empty($categories))
         {
             return array_unique($categories);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6395,8 +6078,7 @@ 
         if (isset($authors[$key]))
         {
             return $authors[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6408,8 +6090,7 @@ 
         if (isset($contributors[$key]))
         {
             return $contributors[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6465,8 +6146,7 @@ 
         if (!empty($contributors))
         {
             return array_unique($contributors);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6538,16 +6218,13 @@ 
         if (!empty($authors))
         {
             return array_unique($authors);
-        }
-        elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
+        } elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
         {
             return $authors;
-        }
-        elseif ($authors = $this->feed->get_authors())
+        } elseif ($authors = $this->feed->get_authors())
         {
             return $authors;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6558,16 +6235,13 @@ 
         if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6580,32 +6254,25 @@ 
             if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
             {
                 $this->data['date']['raw'] = $return[0]['data'];
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
             {
                 $this->data['date']['raw'] = $return[0]['data'];
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
             {
                 $this->data['date']['raw'] = $return[0]['data'];
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
             {
                 $this->data['date']['raw'] = $return[0]['data'];
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
             {
                 $this->data['date']['raw'] = $return[0]['data'];
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
             {
                 $this->data['date']['raw'] = $return[0]['data'];
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
             {
                 $this->data['date']['raw'] = $return[0]['data'];
-            }
-            elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
+            } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
             {
                 $this->data['date']['raw'] = $return[0]['data'];
             }
@@ -6613,8 +6280,7 @@ 
             {
                 $parser = $this->registry->call('Parse_Date', 'get');
                 $this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
-            }
-            else
+            } else
             {
                 $this->data['date'] = null;
             }
@@ -6631,8 +6297,7 @@ 
                 default:
                     return date($date_format, $this->data['date']['parsed']);
             }
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6650,8 +6315,7 @@ 
             {
                 $parser = $this->registry->call('Parse_Date', 'get');
                 $this->data['updated']['parsed'] = $parser->parse($this->data['date']['raw']);
-            }
-            else
+            } else
             {
                 $this->data['updated'] = null;
             }
@@ -6668,8 +6332,7 @@ 
                 default:
                     return date($date_format, $this->data['updated']['parsed']);
             }
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6680,12 +6343,10 @@ 
         if (!$date_format)
         {
             return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif (($date = $this->get_date('U')) !== null && $date !== false)
+        } elseif (($date = $this->get_date('U')) !== null && $date !== false)
         {
             return strftime($date_format, $date);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6718,12 +6379,10 @@ 
         if ($link !== null)
         {
             return $link;
-        }
-        elseif ($enclosure !== null)
+        } elseif ($enclosure !== null)
         {
             return $enclosure->get_link();
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6735,8 +6394,7 @@ 
         if ($links[$key] !== null)
         {
             return $links[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6791,13 +6449,11 @@ 
                     {
                         $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
                         $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-                    }
-                    else
+                    } else
                     {
                         $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
                     }
-                }
-                elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+                } elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
                 {
                     $this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
                 }
@@ -6807,8 +6463,7 @@ 
         if (isset($this->data['links'][$rel]))
         {
             return $this->data['links'][$rel];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6820,8 +6475,7 @@ 
         if (isset($enclosures[$key]))
         {
             return $enclosures[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -6880,8 +6534,7 @@ 
                     }
                     $captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
                 }
-            }
-            elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+            } elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
             {
                 foreach ($captions as $caption)
                 {
@@ -6930,8 +6583,7 @@ 
                 if (isset($category['attribs']['']['scheme']))
                 {
                     $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                }
-                else
+                } else
                 {
                     $scheme = 'http://search.yahoo.com/mrss/category_schema';
                 }
@@ -6953,8 +6605,7 @@ 
                 if (isset($category['attribs']['']['scheme']))
                 {
                     $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                }
-                else
+                } else
                 {
                     $scheme = 'http://search.yahoo.com/mrss/category_schema';
                 }
@@ -7004,8 +6655,7 @@ 
                     $copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                 }
                 $copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-            }
-            elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+            } elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
             {
                 $copyright_url = null;
                 $copyright_label = null;
@@ -7034,8 +6684,7 @@ 
                     if (isset($credit['attribs']['']['scheme']))
                     {
                         $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                    }
-                    else
+                    } else
                     {
                         $credit_scheme = 'urn:ebu';
                     }
@@ -7045,8 +6694,7 @@ 
                     }
                     $credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
                 }
-            }
-            elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+            } elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
             {
                 foreach ($credits as $credit)
                 {
@@ -7060,8 +6708,7 @@ 
                     if (isset($credit['attribs']['']['scheme']))
                     {
                         $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                    }
-                    else
+                    } else
                     {
                         $credit_scheme = 'urn:ebu';
                     }
@@ -7083,8 +6730,7 @@ 
                 {
                     $description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                 }
-            }
-            elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+            } elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
             {
                 if (isset($description_parent[0]['data']))
                 {
@@ -7132,15 +6778,13 @@ 
                     if (isset($hash['attribs']['']['algo']))
                     {
                         $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                    }
-                    else
+                    } else
                     {
                         $algo = 'md5';
                     }
                     $hashes_parent[] = $algo.':'.$value;
                 }
-            }
-            elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+            } elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
             {
                 foreach ($hashes_iterator as $hash)
                 {
@@ -7153,8 +6797,7 @@ 
                     if (isset($hash['attribs']['']['algo']))
                     {
                         $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                    }
-                    else
+                    } else
                     {
                         $algo = 'md5';
                     }
@@ -7177,8 +6820,7 @@ 
                     }
                 }
                 unset($temp);
-            }
-            elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+            } elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
             {
                 if (isset($keywords[0]['data']))
                 {
@@ -7189,8 +6831,7 @@ 
                     }
                 }
                 unset($temp);
-            }
-            elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+            } elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
             {
                 if (isset($keywords[0]['data']))
                 {
@@ -7201,8 +6842,7 @@ 
                     }
                 }
                 unset($temp);
-            }
-            elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+            } elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
             {
                 if (isset($keywords[0]['data']))
                 {
@@ -7225,8 +6865,7 @@ 
                 {
                     $player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
                 }
-            }
-            elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+            } elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
             {
                 if (isset($player_parent[0]['attribs']['']['url']))
                 {
@@ -7243,8 +6882,7 @@ 
                     if (isset($rating['attribs']['']['scheme']))
                     {
                         $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                    }
-                    else
+                    } else
                     {
                         $rating_scheme = 'urn:simple';
                     }
@@ -7254,8 +6892,7 @@ 
                     }
                     $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
                 }
-            }
-            elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+            } elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
             {
                 foreach ($ratings as $rating)
                 {
@@ -7267,8 +6904,7 @@ 
                     }
                     $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
                 }
-            }
-            elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+            } elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
             {
                 foreach ($ratings as $rating)
                 {
@@ -7277,8 +6913,7 @@ 
                     if (isset($rating['attribs']['']['scheme']))
                     {
                         $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                    }
-                    else
+                    } else
                     {
                         $rating_scheme = 'urn:simple';
                     }
@@ -7288,8 +6923,7 @@ 
                     }
                     $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
                 }
-            }
-            elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+            } elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
             {
                 foreach ($ratings as $rating)
                 {
@@ -7328,8 +6962,7 @@ 
                     }
                     $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
                 }
-            }
-            elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+            } elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
             {
                 foreach ($restrictions as $restriction)
                 {
@@ -7342,8 +6975,7 @@ 
                     }
                     $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
                 }
-            }
-            elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+            } elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
             {
                 foreach ($restrictions as $restriction)
                 {
@@ -7364,8 +6996,7 @@ 
                     }
                     $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
                 }
-            }
-            elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+            } elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
             {
                 foreach ($restrictions as $restriction)
                 {
@@ -7382,8 +7013,7 @@ 
             if (is_array($restrictions_parent))
             {
                 $restrictions_parent = array_values(array_unique($restrictions_parent));
-            }
-            else
+            } else
             {
                 $restrictions_parent = array(new SimplePie_Restriction('allow', null, 'default'));
             }
@@ -7397,8 +7027,7 @@ 
                         $thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
                     }
                 }
-            }
-            elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+            } elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
             {
                 foreach ($thumbnails as $thumbnail)
                 {
@@ -7415,8 +7044,7 @@ 
                 {
                     $title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                 }
-            }
-            elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+            } elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
             {
                 if (isset($title_parent[0]['data']))
                 {
@@ -7503,8 +7131,7 @@ 
                             if (isset($content['attribs']['']['duration']))
                             {
                                 $duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-                            }
-                            else
+                            } else
                             {
                                 $duration = $duration_parent;
                             }
@@ -7582,8 +7209,7 @@ 
                                 {
                                     $captions = array_values(array_unique($captions));
                                 }
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
                             {
                                 foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
                                 {
@@ -7618,8 +7244,7 @@ 
                                 {
                                     $captions = array_values(array_unique($captions));
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $captions = $captions_parent;
                             }
@@ -7638,8 +7263,7 @@ 
                                     if (isset($category['attribs']['']['scheme']))
                                     {
                                         $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                    }
-                                    else
+                                    } else
                                     {
                                         $scheme = 'http://search.yahoo.com/mrss/category_schema';
                                     }
@@ -7664,8 +7288,7 @@ 
                                     if (isset($category['attribs']['']['scheme']))
                                     {
                                         $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                    }
-                                    else
+                                    } else
                                     {
                                         $scheme = 'http://search.yahoo.com/mrss/category_schema';
                                     }
@@ -7679,12 +7302,10 @@ 
                             if (is_array($categories) && is_array($categories_parent))
                             {
                                 $categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-                            }
-                            elseif (is_array($categories))
+                            } elseif (is_array($categories))
                             {
                                 $categories = array_values(array_unique($categories));
-                            }
-                            elseif (is_array($categories_parent))
+                            } elseif (is_array($categories_parent))
                             {
                                 $categories = array_values(array_unique($categories_parent));
                             }
@@ -7702,8 +7323,7 @@ 
                                     $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                 }
                                 $copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
                             {
                                 $copyright_url = null;
                                 $copyright_label = null;
@@ -7716,8 +7336,7 @@ 
                                     $copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                                 }
                                 $copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-                            }
-                            else
+                            } else
                             {
                                 $copyrights = $copyrights_parent;
                             }
@@ -7736,8 +7355,7 @@ 
                                     if (isset($credit['attribs']['']['scheme']))
                                     {
                                         $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                    }
-                                    else
+                                    } else
                                     {
                                         $credit_scheme = 'urn:ebu';
                                     }
@@ -7751,8 +7369,7 @@ 
                                 {
                                     $credits = array_values(array_unique($credits));
                                 }
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
                             {
                                 foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
                                 {
@@ -7766,8 +7383,7 @@ 
                                     if (isset($credit['attribs']['']['scheme']))
                                     {
                                         $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                    }
-                                    else
+                                    } else
                                     {
                                         $credit_scheme = 'urn:ebu';
                                     }
@@ -7781,8 +7397,7 @@ 
                                 {
                                     $credits = array_values(array_unique($credits));
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $credits = $credits_parent;
                             }
@@ -7790,12 +7405,10 @@ 
                             if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
                             {
                                 $description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
                             {
                                 $description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                            }
-                            else
+                            } else
                             {
                                 $description = $description_parent;
                             }
@@ -7813,8 +7426,7 @@ 
                                     if (isset($hash['attribs']['']['algo']))
                                     {
                                         $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                    }
-                                    else
+                                    } else
                                     {
                                         $algo = 'md5';
                                     }
@@ -7824,8 +7436,7 @@ 
                                 {
                                     $hashes = array_values(array_unique($hashes));
                                 }
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
                             {
                                 foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
                                 {
@@ -7838,8 +7449,7 @@ 
                                     if (isset($hash['attribs']['']['algo']))
                                     {
                                         $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                    }
-                                    else
+                                    } else
                                     {
                                         $algo = 'md5';
                                     }
@@ -7849,8 +7459,7 @@ 
                                 {
                                     $hashes = array_values(array_unique($hashes));
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $hashes = $hashes_parent;
                             }
@@ -7870,8 +7479,7 @@ 
                                 {
                                     $keywords = array_values(array_unique($keywords));
                                 }
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
                             {
                                 if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
                                 {
@@ -7886,8 +7494,7 @@ 
                                 {
                                     $keywords = array_values(array_unique($keywords));
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $keywords = $keywords_parent;
                             }
@@ -7895,12 +7502,10 @@ 
                             if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
                             {
                                 $player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
                             {
                                 $player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                            }
-                            else
+                            } else
                             {
                                 $player = $player_parent;
                             }
@@ -7914,8 +7519,7 @@ 
                                     if (isset($rating['attribs']['']['scheme']))
                                     {
                                         $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                    }
-                                    else
+                                    } else
                                     {
                                         $rating_scheme = 'urn:simple';
                                     }
@@ -7929,8 +7533,7 @@ 
                                 {
                                     $ratings = array_values(array_unique($ratings));
                                 }
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
                             {
                                 foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
                                 {
@@ -7939,8 +7542,7 @@ 
                                     if (isset($rating['attribs']['']['scheme']))
                                     {
                                         $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                    }
-                                    else
+                                    } else
                                     {
                                         $rating_scheme = 'urn:simple';
                                     }
@@ -7954,8 +7556,7 @@ 
                                 {
                                     $ratings = array_values(array_unique($ratings));
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $ratings = $ratings_parent;
                             }
@@ -7985,8 +7586,7 @@ 
                                 {
                                     $restrictions = array_values(array_unique($restrictions));
                                 }
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
                             {
                                 foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
                                 {
@@ -8011,8 +7611,7 @@ 
                                 {
                                     $restrictions = array_values(array_unique($restrictions));
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $restrictions = $restrictions_parent;
                             }
@@ -8027,8 +7626,7 @@ 
                                 {
                                     $thumbnails = array_values(array_unique($thumbnails));
                                 }
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
                             {
                                 foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
                                 {
@@ -8038,8 +7636,7 @@ 
                                 {
                                     $thumbnails = array_values(array_unique($thumbnails));
                                 }
-                            }
-                            else
+                            } else
                             {
                                 $thumbnails = $thumbnails_parent;
                             }
@@ -8047,12 +7644,10 @@ 
                             if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
                             {
                                 $title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                            }
-                            elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+                            } elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
                             {
                                 $title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                            }
-                            else
+                            } else
                             {
                                 $title = $title_parent;
                             }
@@ -8108,8 +7703,7 @@ 
                         if (isset($content['attribs']['']['duration']))
                         {
                             $duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-                        }
-                        else
+                        } else
                         {
                             $duration = $duration_parent;
                         }
@@ -8190,8 +7784,7 @@ 
                             {
                                 $captions = array_values(array_unique($captions));
                             }
-                        }
-                        else
+                        } else
                         {
                             $captions = $captions_parent;
                         }
@@ -8210,8 +7803,7 @@ 
                                 if (isset($category['attribs']['']['scheme']))
                                 {
                                     $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                }
-                                else
+                                } else
                                 {
                                     $scheme = 'http://search.yahoo.com/mrss/category_schema';
                                 }
@@ -8225,16 +7817,13 @@ 
                         if (is_array($categories) && is_array($categories_parent))
                         {
                             $categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-                        }
-                        elseif (is_array($categories))
+                        } elseif (is_array($categories))
                         {
                             $categories = array_values(array_unique($categories));
-                        }
-                        elseif (is_array($categories_parent))
+                        } elseif (is_array($categories_parent))
                         {
                             $categories = array_values(array_unique($categories_parent));
-                        }
-                        else
+                        } else
                         {
                             $categories = null;
                         }
@@ -8252,8 +7841,7 @@ 
                                 $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
                             }
                             $copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-                        }
-                        else
+                        } else
                         {
                             $copyrights = $copyrights_parent;
                         }
@@ -8272,8 +7860,7 @@ 
                                 if (isset($credit['attribs']['']['scheme']))
                                 {
                                     $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                }
-                                else
+                                } else
                                 {
                                     $credit_scheme = 'urn:ebu';
                                 }
@@ -8287,8 +7874,7 @@ 
                             {
                                 $credits = array_values(array_unique($credits));
                             }
-                        }
-                        else
+                        } else
                         {
                             $credits = $credits_parent;
                         }
@@ -8296,8 +7882,7 @@ 
                         if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
                         {
                             $description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                        }
-                        else
+                        } else
                         {
                             $description = $description_parent;
                         }
@@ -8315,8 +7900,7 @@ 
                                 if (isset($hash['attribs']['']['algo']))
                                 {
                                     $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                }
-                                else
+                                } else
                                 {
                                     $algo = 'md5';
                                 }
@@ -8326,8 +7910,7 @@ 
                             {
                                 $hashes = array_values(array_unique($hashes));
                             }
-                        }
-                        else
+                        } else
                         {
                             $hashes = $hashes_parent;
                         }
@@ -8347,8 +7930,7 @@ 
                             {
                                 $keywords = array_values(array_unique($keywords));
                             }
-                        }
-                        else
+                        } else
                         {
                             $keywords = $keywords_parent;
                         }
@@ -8356,8 +7938,7 @@ 
                         if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
                         {
                             $player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-                        }
-                        else
+                        } else
                         {
                             $player = $player_parent;
                         }
@@ -8371,8 +7952,7 @@ 
                                 if (isset($rating['attribs']['']['scheme']))
                                 {
                                     $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-                                }
-                                else
+                                } else
                                 {
                                     $rating_scheme = 'urn:simple';
                                 }
@@ -8386,8 +7966,7 @@ 
                             {
                                 $ratings = array_values(array_unique($ratings));
                             }
-                        }
-                        else
+                        } else
                         {
                             $ratings = $ratings_parent;
                         }
@@ -8417,8 +7996,7 @@ 
                             {
                                 $restrictions = array_values(array_unique($restrictions));
                             }
-                        }
-                        else
+                        } else
                         {
                             $restrictions = $restrictions_parent;
                         }
@@ -8433,8 +8011,7 @@ 
                             {
                                 $thumbnails = array_values(array_unique($thumbnails));
                             }
-                        }
-                        else
+                        } else
                         {
                             $thumbnails = $thumbnails_parent;
                         }
@@ -8442,8 +8019,7 @@ 
                         if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
                         {
                             $title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-                        }
-                        else
+                        } else
                         {
                             $title = $title_parent;
                         }
@@ -8557,8 +8133,7 @@ 
         if (!empty($this->data['enclosures']))
         {
             return $this->data['enclosures'];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -8569,12 +8144,10 @@ 
         if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
         {
             return (float) $return[0]['data'];
-        }
-        elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+        } elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
         {
             return (float) $match[1];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -8585,16 +8158,13 @@ 
         if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
         {
             return (float) $return[0]['data'];
-        }
-        elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+        } elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
         {
             return (float) $return[0]['data'];
-        }
-        elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+        } elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
         {
             return (float) $match[2];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -8605,8 +8175,7 @@ 
         if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'source'))
         {
             return $this->registry->create('Source', array($this, $return[0]));
-        }
-        else
+        } else
         {
             return null;
         }
@@ -8638,8 +8207,7 @@ 
             set_error_handler(array('SimplePie_Misc', 'silence_errors'));
             $this->dom->loadHTML($this->file->body);
             restore_error_handler();
-        }
-        else
+        } else
         {
             $this->dom = null;
         }
@@ -8700,17 +8268,14 @@ 
             if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml')))
             {
                 return true;
-            }
-            else
+            } else
             {
                 return false;
             }
-        }
-        elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
+        } elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -8749,8 +8314,7 @@ 
         if (!empty($feeds))
         {
             return array_values($feeds);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -8775,8 +8339,7 @@ 
                 if ($this->base_location < $line)
                 {
                     $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
-                }
-                else
+                } else
                 {
                     $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
                 }
@@ -8819,8 +8382,7 @@ 
                     if ($this->base_location < $link->getLineNo())
                     {
                         $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
-                    }
-                    else
+                    } else
                     {
                         $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
                     }
@@ -8832,8 +8394,7 @@ 
                     if ($parsed['authority'] === '' || $parsed['authority'] === $current['authority'])
                     {
                         $this->local[] = $href;
-                    }
-                    else
+                    } else
                     {
                         $this->elsewhere[] = $href;
                     }
@@ -8866,8 +8427,7 @@ 
                 if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
                 {
                     return $feed;
-                }
-                else
+                } else
                 {
                     unset($array[$key]);
                 }
@@ -8893,8 +8453,7 @@ 
                 if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
                 {
                     return $feed;
-                }
-                else
+                } else
                 {
                     unset($array[$key]);
                 }
@@ -8952,8 +8511,7 @@ 
                 if (strlen($matches[$i][3][0]) <= 2)
                 {
                     $return[$i]['self_closing'] = true;
-                }
-                else
+                } else
                 {
                     $return[$i]['self_closing'] = false;
                     $return[$i]['content'] = $matches[$i][4][0];
@@ -8985,8 +8543,7 @@ 
         if ($element['self_closing'])
         {
             $full .= ' />';
-        }
-        else
+        } else
         {
             $full .= ">$element[content]</$element[tag]>";
         }
@@ -9043,16 +8600,13 @@ 
         if ($http === 2 && $parsed['scheme'] !== '')
         {
             return "feed:$url";
-        }
-        elseif ($http === 3 && strtolower($parsed['scheme']) === 'http')
+        } elseif ($http === 3 && strtolower($parsed['scheme']) === 'http')
         {
             return substr_replace($url, 'podcast', 0, 4);
-        }
-        elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
+        } elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
         {
             return substr_replace($url, 'itpc', 0, 4);
-        }
-        else
+        } else
         {
             return $url;
         }
@@ -9089,8 +8643,7 @@ 
         if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer === 0x2D || $integer === 0x2E || $integer === 0x5F || $integer === 0x7E)
         {
             return chr($integer);
-        }
-        else
+        } else
         {
             return strtoupper($match[0]);
         }
@@ -10248,16 +9801,13 @@ 
         if (is_array($curl = curl_version()))
         {
             $curl = $curl['version'];
-        }
-        elseif (substr($curl, 0, 5) === 'curl/')
+        } elseif (substr($curl, 0, 5) === 'curl/')
         {
             $curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5));
-        }
-        elseif (substr($curl, 0, 8) === 'libcurl/')
+        } elseif (substr($curl, 0, 8) === 'libcurl/')
         {
             $curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8));
-        }
-        else
+        } else
         {
             $curl = 0;
         }
@@ -10273,8 +9823,7 @@ 
             if (($end = strpos($data, '-->', $start)) !== false)
             {
                 $data = substr_replace($data, '', 0, $end + 3);
-            }
-            else
+            } else
             {
                 $data = '';
             }
@@ -10314,8 +9863,7 @@ 
                     {
                         $position++;
                         continue;
-                    }
-                    elseif (isset($string[$position]))
+                    } elseif (isset($string[$position]))
                     {
                         switch ($string[$position])
                         {
@@ -10327,14 +9875,12 @@ 
                                 break;
                         }
                         $position++;
-                    }
-                    else
+                    } else
                     {
                         break;
                     }
                 }
-            }
-            else
+            } else
             {
                 $output .= '(';
             }
@@ -10347,8 +9893,7 @@ 
         if (($pos = strpos($mime, ';')) === false)
         {
             return trim($mime);
-        }
-        else
+        } else
         {
             return trim(substr($mime, 0, $pos));
         }
@@ -10358,8 +9903,7 @@ 
         if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) === 'base64'))
         {
             $mode = SIMPLEPIE_CONSTRUCT_BASE64;
-        }
-        else
+        } else
         {
             $mode = SIMPLEPIE_CONSTRUCT_NONE;
         }
@@ -10379,8 +9923,7 @@ 
                 default:
                     return SIMPLEPIE_CONSTRUCT_NONE | $mode;
             }
-        }
-        else
+        } else
         {
             return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
         }
@@ -10420,13 +9963,11 @@ 
             if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) === 'text/')
             {
                 return SIMPLEPIE_CONSTRUCT_NONE;
-            }
-            else
+            } else
             {
                 return SIMPLEPIE_CONSTRUCT_BASE64;
             }
-        }
-        else
+        } else
         {
             return SIMPLEPIE_CONSTRUCT_TEXT;
         }
@@ -10457,24 +9998,19 @@ 
         if ($codepoint < 0)
         {
             return false;
-        }
-        else if ($codepoint <= 0x7f)
+        } else if ($codepoint <= 0x7f)
         {
             return chr($codepoint);
-        }
-        else if ($codepoint <= 0x7ff)
+        } else if ($codepoint <= 0x7ff)
         {
             return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
-        }
-        else if ($codepoint <= 0xffff)
+        } else if ($codepoint <= 0xffff)
         {
             return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
-        }
-        else if ($codepoint <= 0x10ffff)
+        } else if ($codepoint <= 0x10ffff)
         {
             return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
-        }
-        else
+        } else
         {
             // U+FFFD REPLACEMENT CHARACTER
             return "\xEF\xBF\xBD";
@@ -10491,8 +10027,7 @@ 
             {
                 list($name, $value) = explode('=', $section, 2);
                 $return[urldecode($name)][] = urldecode($value);
-            }
-            else
+            } else
             {
                 $return[urldecode($section)][] = null;
             }
@@ -10635,8 +10170,7 @@ 
         if (file_exists($root . '/.git/index'))
         {
             return filemtime($root . '/.git/index');
-        }
-        elseif (file_exists($root . '/SimplePie'))
+        } elseif (file_exists($root . '/SimplePie'))
         {
             $time = 0;
             foreach (glob($root . '/SimplePie/*.php') as $file)
@@ -10647,12 +10181,10 @@ 
                 }
             }
             return $time;
-        }
-        elseif (file_exists(dirname(__FILE__) . '/Core.php'))
+        } elseif (file_exists(dirname(__FILE__) . '/Core.php'))
         {
             return filemtime(dirname(__FILE__) . '/Core.php');
-        }
-        else
+        } else
         {
             return filemtime(__FILE__);
         }
@@ -10665,8 +10197,7 @@ 
         if ($sp->error() !== null)
         {
             $info .= 'Error occurred: ' . $sp->error() . "\n";
-        }
-        else
+        } else
         {
             $info .= "No error found.\n";
         }
@@ -10696,8 +10227,7 @@ 
                         $info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
                         break;
                 }
-            }
-            else
+            } else
             {
                 $info .= "    $ext not loaded\n";
             }
@@ -10722,16 +10252,14 @@ 
             if ($ip1 === '')
             {
                 $c1 = -1;
-            }
-            else
+            } else
             {
                 $c1 = substr_count($ip1, ':');
             }
             if ($ip2 === '')
             {
                 $c2 = -1;
-            }
-            else
+            } else
             {
                 $c2 = substr_count($ip2, ':');
             }
@@ -10791,8 +10319,7 @@ 
         if ($ip_parts[1] !== '')
         {
             return implode(':', $ip_parts);
-        }
-        else
+        } else
         {
             return $ip_parts[0];
         }
@@ -10806,8 +10333,7 @@ 
             $ipv6_part = substr($ip, 0, $pos);
             $ipv4_part = substr($ip, $pos + 1);
             return array($ipv6_part, $ipv4_part);
-        }
-        else
+        } else
         {
             return array($ip, '');
         }
@@ -10824,32 +10350,36 @@ 
             foreach ($ipv6 as $ipv6_part)
             {
                 // The section can't be empty
-                if ($ipv6_part === '')
-                    return false;
+                if ($ipv6_part === '') {
+                                    return false;
+                }
                 // Nor can it be over four characters
-                if (strlen($ipv6_part) > 4)
-                    return false;
+                if (strlen($ipv6_part) > 4) {
+                                    return false;
+                }
                 // Remove leading zeros (this is safe because of the above)
                 $ipv6_part = ltrim($ipv6_part, '0');
-                if ($ipv6_part === '')
-                    $ipv6_part = '0';
+                if ($ipv6_part === '') {
+                                    $ipv6_part = '0';
+                }
                 // Check the value is valid
                 $value = hexdec($ipv6_part);
-                if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF)
-                    return false;
+                if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) {
+                                    return false;
+                }
             }
             if (count($ipv4) === 4)
             {
                 foreach ($ipv4 as $ipv4_part)
                 {
                     $value = (int) $ipv4_part;
-                    if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF)
-                        return false;
+                    if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) {
+                                            return false;
+                    }
                 }
             }
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -11353,8 +10883,7 @@ 
         if (is_callable($callback))
         {
             $this->user[] = $callback;
-        }
-        else
+        } else
         {
             trigger_error('User-supplied function must be a valid callback', E_USER_WARNING);
         }
@@ -11405,16 +10934,14 @@ 
                 {
                     $timezone = 0 - $timezone;
                 }
-            }
-            else
+            } else
             {
                 $timezone = 0;
             }
             // Convert the number of seconds to an integer, taking decimals into account
             $second = round($match[6] + $match[7] / pow(10, strlen($match[7])));
             return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -11441,8 +10968,7 @@ 
                     {
                         $position++;
                         continue;
-                    }
-                    elseif (isset($string[$position]))
+                    } elseif (isset($string[$position]))
                     {
                         switch ($string[$position])
                         {
@@ -11454,14 +10980,12 @@ 
                                 break;
                         }
                         $position++;
-                    }
-                    else
+                    } else
                     {
                         break;
                     }
                 }
-            }
-            else
+            } else
             {
                 $output .= '(';
             }
@@ -11530,8 +11054,7 @@ 
             if ($match[4] < 50)
             {
                 $match[4] += 2000;
-            }
-            elseif ($match[4] < 1000)
+            } elseif ($match[4] < 1000)
             {
                 $match[4] += 1900;
             }
@@ -11539,14 +11062,12 @@ 
             if ($match[7] !== '')
             {
                 $second = $match[7];
-            }
-            else
+            } else
             {
                 $second = 0;
             }
             return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -11594,14 +11115,12 @@ 
             if ($match[4] < 50)
             {
                 $match[4] += 2000;
-            }
-            else
+            } else
             {
                 $match[4] += 1900;
             }
             return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -11635,8 +11154,7 @@ 
             */
             $month = $this->month[strtolower($match[2])];
             return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]);
-        }
-        else
+        } else
         {
             return false;
         }
@@ -11648,8 +11166,7 @@ 
         if ($strtotime === -1 || $strtotime === false)
         {
             return false;
-        }
-        else
+        } else
         {
             return $strtotime;
         }
@@ -11683,8 +11200,7 @@ 
         if (strtoupper($encoding) === 'US-ASCII')
         {
             $this->encoding = 'UTF-8';
-        }
-        else
+        } else
         {
             $this->encoding = $encoding;
         }
@@ -11721,8 +11237,7 @@ 
             {
                 $data = substr($data, $pos + 2);
                 $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data;
-            }
-            else
+            } else
             {
                 $this->error_string = 'SimplePie bug! Please report this!';
                 return false;
@@ -11758,8 +11273,7 @@ 
             $this->current_byte = xml_get_current_byte_index($xml);
             xml_parser_free($xml);
             return $return;
-        }
-        else
+        } else
         {
             libxml_clear_errors();
             $xml = new XMLReader();
@@ -11772,8 +11286,7 @@ 
                         if ($xml->namespaceURI !== '')
                         {
                             $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-                        }
-                        else
+                        } else
                         {
                             $tagName = $xml->localName;
                         }
@@ -11784,8 +11297,7 @@ 
                         if ($xml->namespaceURI !== '')
                         {
                             $tagName = $xml->namespaceURI . $this->separator . $xml->localName;
-                        }
-                        else
+                        } else
                         {
                             $tagName = $xml->localName;
                         }
@@ -11795,8 +11307,7 @@ 
                             if ($xml->namespaceURI !== '')
                             {
                                 $attrName = $xml->namespaceURI . $this->separator . $xml->localName;
-                            }
-                            else
+                            } else
                             {
                                 $attrName = $xml->localName;
                             }
@@ -11821,8 +11332,7 @@ 
                 $this->current_line = $error->line;
                 $this->current_column = $error->column;
                 return false;
-            }
-            else
+            } else
             {
                 return true;
             }
@@ -11869,8 +11379,7 @@ 
                 $this->xml_base[] = $base;
                 $this->xml_base_explicit[] = true;
             }
-        }
-        else
+        } else
         {
             $this->xml_base[] = end($this->xml_base);
             $this->xml_base_explicit[] = end($this->xml_base_explicit);
@@ -11878,8 +11387,7 @@ 
         if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
         {
             $this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
-        }
-        else
+        } else
         {
             $this->xml_lang[] = end($this->xml_lang);
         }
@@ -11898,8 +11406,7 @@ 
                 }
                 $this->data['data'] .= '>';
             }
-        }
-        else
+        } else
         {
             $this->datas[] =& $this->data;
             $this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
@@ -11919,8 +11426,7 @@ 
         if ($this->current_xhtml_construct >= 0)
         {
             $this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
-        }
-        else
+        } else
         {
             $this->data['data'] .= $cdata;
         }
@@ -11974,8 +11480,7 @@ 
                     $namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
                 }
                 $cache[$string] = array($namespace, $local_name);
-            }
-            else
+            } else
             {
                 $cache[$string] = array('', $string);
             }
@@ -12007,8 +11512,7 @@ 
         if ($this->scheme !== null)
         {
             return $this->scheme;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12019,8 +11523,7 @@ 
         if ($this->value !== null)
         {
             return $this->value;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12102,8 +11605,7 @@ 
         if (!method_exists($class, '__construct'))
         {
             $instance = new $class;
-        }
-        else
+        } else
         {
             $reflector = new ReflectionClass($class);
             $instance = $reflector->newInstanceArgs($parameters);
@@ -12164,8 +11666,7 @@ 
         if ($this->relationship !== null)
         {
             return $this->relationship;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12176,8 +11677,7 @@ 
         if ($this->type !== null)
         {
             return $this->type;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12188,8 +11688,7 @@ 
         if ($this->value !== null)
         {
             return $this->value;
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12228,8 +11727,7 @@ 
         if ($page)
         {
             $this->image_handler = (string) $page;
-        }
-        else
+        } else
         {
             $this->image_handler = false;
         }
@@ -12275,13 +11773,11 @@ 
             if (is_array($tags))
             {
                 $this->strip_htmltags = $tags;
-            }
-            else
+            } else
             {
                 $this->strip_htmltags = explode(',', $tags);
             }
-        }
-        else
+        } else
         {
             $this->strip_htmltags = false;
         }
@@ -12297,13 +11793,11 @@ 
             if (is_array($attribs))
             {
                 $this->strip_attributes = $attribs;
-            }
-            else
+            } else
             {
                 $this->strip_attributes = explode(',', $attribs);
             }
-        }
-        else
+        } else
         {
             $this->strip_attributes = false;
         }
@@ -12348,8 +11842,7 @@ 
                 if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
                 {
                     $type |= SIMPLEPIE_CONSTRUCT_HTML;
-                }
-                else
+                } else
                 {
                     $type |= SIMPLEPIE_CONSTRUCT_TEXT;
                 }
@@ -12412,8 +11905,7 @@ 
                             if ($cache->load())
                             {
                                 $img->setAttribute('src', $this->image_handler . $image_url);
-                            }
-                            else
+                            } else
                             {
                                 $file = $this->registry->create('File', array($img['attribs']['src']['data'], $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen));
                                 $headers = $file->headers;
@@ -12422,8 +11914,7 @@ 
                                     if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
                                     {
                                         $img->setAttribute('src', $this->image_handler . $image_url);
-                                    }
-                                    else
+                                    } else
                                     {
                                         trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
                                     }
@@ -12447,8 +11938,7 @@ 
                 {
                     $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
                     $data = preg_replace('/<\/div>$/', '', $data);
-                }
-                else
+                } else
                 {
                     $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
                 }
@@ -12482,8 +11972,7 @@ 
             $html = '<div>' . $html . '</div>';
             $ret .= '<!DOCTYPE html>';
             $content_type = 'text/html';
-        }
-        else
+        } else
         {
             $ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
             $content_type = 'application/xhtml+xml';
@@ -12527,17 +12016,14 @@ 
                 $match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
                 $match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
                 return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
-            }
-            else
+            } else
             {
                 return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
             }
-        }
-        elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+        } elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
         {
             return $match[4];
-        }
-        else
+        } else
         {
             return '';
         }
@@ -12593,16 +12079,14 @@ 
                 $element->parentNode->replaceChild($fragment, $element);
             }
             return;
-        }
-        elseif (in_array($tag, array('script', 'style')))
+        } elseif (in_array($tag, array('script', 'style')))
         {
             foreach ($elements as $element)
             {
                 $element->parentNode->removeChild($element);
             }
             return;
-        }
-        else
+        } else
         {
             foreach ($elements as $element)
             {
@@ -12650,8 +12134,7 @@ 
         if (isset($this->data['child'][$namespace][$tag]))
         {
             return $this->data['child'][$namespace][$tag];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12673,32 +12156,25 @@ 
         if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12709,8 +12185,7 @@ 
         if (isset($categories[$key]))
         {
             return $categories[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12745,8 +12220,7 @@ 
             if (isset($category['attribs']['']['domain']))
             {
                 $scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-            }
-            else
+            } else
             {
                 $scheme = null;
             }
@@ -12763,8 +12237,7 @@ 
         if (!empty($categories))
         {
             return array_unique($categories);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12775,8 +12248,7 @@ 
         if (isset($authors[$key]))
         {
             return $authors[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12843,8 +12315,7 @@ 
         if (!empty($authors))
         {
             return array_unique($authors);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12855,8 +12326,7 @@ 
         if (isset($contributors[$key]))
         {
             return $contributors[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12911,8 +12381,7 @@ 
         if (!empty($contributors))
         {
             return array_unique($contributors);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12923,8 +12392,7 @@ 
         if (isset($links[$key]))
         {
             return $links[$key];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -12982,13 +12450,11 @@ 
                     {
                         $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
                         $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-                    }
-                    else
+                    } else
                     {
                         $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
                     }
-                }
-                elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+                } elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
                 {
                     $this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
                 }
@@ -12998,8 +12464,7 @@ 
         if (isset($this->data['links'][$rel]))
         {
             return $this->data['links'][$rel];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -13009,40 +12474,31 @@ 
         if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-        }
-        else
+        } else
         {
             return null;
         }
@@ -13052,24 +12508,19 @@ 
         if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
         {
             return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -13079,20 +12530,16 @@ 
         if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        elseif (isset($this->data['xml_lang']))
+        } elseif (isset($this->data['xml_lang']))
         {
             return $this->sanitize($this->data['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-        }
-        else
+        } else
         {
             return null;
         }
@@ -13102,12 +12549,10 @@ 
         if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
         {
             return (float) $return[0]['data'];
-        }
-        elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+        } elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
         {
             return (float) $match[1];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -13117,16 +12562,13 @@ 
         if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
         {
             return (float) $return[0]['data'];
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
         {
             return (float) $return[0]['data'];
-        }
-        elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+        } elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
         {
             return (float) $match[2];
-        }
-        else
+        } else
         {
             return null;
         }
@@ -13136,16 +12578,13 @@ 
         if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
         {
             return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+        } elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
         {
             return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-        }
-        else
+        } else
         {
             return null;
         }
@@ -13185,8 +12624,7 @@ 
         if ($this->state === 'emit')
         {
             return true;
-        }
-        else
+        } else
         {
             $this->version = '';
             $this->encoding = '';
@@ -13228,8 +12666,7 @@ 
         if ($this->skip_whitespace())
         {
             $this->state = 'version_name';
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -13241,8 +12678,7 @@ 
             $this->position += 7;
             $this->skip_whitespace();
             $this->state = 'version_equals';
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -13254,8 +12690,7 @@ 
             $this->position++;
             $this->skip_whitespace();
             $this->state = 'version_value';
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -13268,13 +12703,11 @@ 
             if ($this->has_data())
             {
                 $this->state = 'encoding_name';
-            }
-            else
+            } else
             {
                 $this->state = 'emit';
             }
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -13286,8 +12719,7 @@ 
             $this->position += 8;
             $this->skip_whitespace();
             $this->state = 'encoding_equals';
-        }
-        else
+        } else
         {
             $this->state = 'standalone_name';
         }
@@ -13299,8 +12731,7 @@ 
             $this->position++;
             $this->skip_whitespace();
             $this->state = 'encoding_value';
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -13313,13 +12744,11 @@ 
             if ($this->has_data())
             {
                 $this->state = 'standalone_name';
-            }
-            else
+            } else
             {
                 $this->state = 'emit';
             }
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -13331,8 +12760,7 @@ 
             $this->position += 10;
             $this->skip_whitespace();
             $this->state = 'standalone_equals';
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -13344,8 +12772,7 @@ 
             $this->position++;
             $this->skip_whitespace();
             $this->state = 'standalone_value';
-        }
-        else
+        } else
         {
             $this->state = false;
         }
@@ -13370,13 +12797,11 @@ 
             if ($this->has_data())
             {
                 $this->state = false;
-            }
-            else
+            } else
             {
                 $this->state = 'emit';
             }
-        }
-        else
+        } else
         {
             $this->state = false;
         }