miarau /
rssfeed
@@ -11,14 +11,14 @@ discard block |
||
| 11 | 11 | * @param string $class The fully-qualified class name. |
| 12 | 12 | * @return void |
| 13 | 13 | */ |
| 14 | -spl_autoload_register(function ($class) { |
|
| 14 | +spl_autoload_register(function($class) { |
|
| 15 | 15 | |
| 16 | 16 | // project-specific namespace prefix |
| 17 | 17 | //$prefix = 'Foo\\Bar\\'; |
| 18 | 18 | $prefix = 'Miax\\'; |
| 19 | 19 | |
| 20 | 20 | // base directory for the namespace prefix |
| 21 | - $base_dir = __DIR__ . '/src/'; |
|
| 21 | + $base_dir = __DIR__.'/src/'; |
|
| 22 | 22 | |
| 23 | 23 | // does the class use the namespace prefix? |
| 24 | 24 | $len = strlen($prefix); |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | // replace the namespace prefix with the base directory, replace namespace |
| 34 | 34 | // separators with directory separators in the relative class name, append |
| 35 | 35 | // with .php |
| 36 | - $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php'; |
|
| 36 | + $file = $base_dir.str_replace('\\', '/', $relative_class).'.php'; |
|
| 37 | 37 | |
| 38 | 38 | // if the file exists, require it |
| 39 | 39 | if (file_exists($file)) { |
@@ -960,6 +960,10 @@ discard block |
||
| 960 | 960 | return null; |
| 961 | 961 | } |
| 962 | 962 | |
| 963 | + /** |
|
| 964 | + * @param string $namespace |
|
| 965 | + * @param string $tag |
|
| 966 | + */ |
|
| 963 | 967 | public function get_channel_tags($namespace, $tag) |
| 964 | 968 | { |
| 965 | 969 | $type = $this->get_type(); |
@@ -1003,6 +1007,10 @@ discard block |
||
| 1003 | 1007 | return null; |
| 1004 | 1008 | } |
| 1005 | 1009 | |
| 1010 | + /** |
|
| 1011 | + * @param string $namespace |
|
| 1012 | + * @param string $tag |
|
| 1013 | + */ |
|
| 1006 | 1014 | public function get_image_tags($namespace, $tag) |
| 1007 | 1015 | { |
| 1008 | 1016 | $type = $this->get_type(); |
@@ -1039,6 +1047,9 @@ discard block |
||
| 1039 | 1047 | return null; |
| 1040 | 1048 | } |
| 1041 | 1049 | |
| 1050 | + /** |
|
| 1051 | + * @return string |
|
| 1052 | + */ |
|
| 1042 | 1053 | public function get_base($element = array()) |
| 1043 | 1054 | { |
| 1044 | 1055 | if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base'])) |
@@ -1316,6 +1327,9 @@ discard block |
||
| 1316 | 1327 | } |
| 1317 | 1328 | } |
| 1318 | 1329 | |
| 1330 | + /** |
|
| 1331 | + * @return string |
|
| 1332 | + */ |
|
| 1319 | 1333 | public function get_link($key = 0, $rel = 'alternate') |
| 1320 | 1334 | { |
| 1321 | 1335 | $links = $this->get_links($rel); |
@@ -1960,6 +1974,9 @@ discard block |
||
| 1960 | 1974 | abstract class SimplePie_Cache_DB implements SimplePie_Cache_Base |
| 1961 | 1975 | { |
| 1962 | 1976 | |
| 1977 | + /** |
|
| 1978 | + * @param SimplePie $data |
|
| 1979 | + */ |
|
| 1963 | 1980 | protected static function prepare_simplepie_object_for_cache($data) |
| 1964 | 1981 | { |
| 1965 | 1982 | $items = $data->get_items(); |
@@ -3049,6 +3066,9 @@ discard block |
||
| 3049 | 3066 | } |
| 3050 | 3067 | } |
| 3051 | 3068 | |
| 3069 | + /** |
|
| 3070 | + * @param string $chars |
|
| 3071 | + */ |
|
| 3052 | 3072 | public function consume_range($chars) |
| 3053 | 3073 | { |
| 3054 | 3074 | if ($len = strspn($this->data, $chars, $this->position)) |
@@ -4682,6 +4702,9 @@ discard block |
||
| 4682 | 4702 | trigger_error("Cannot write property $name", E_USER_ERROR); |
| 4683 | 4703 | } |
| 4684 | 4704 | |
| 4705 | + /** |
|
| 4706 | + * @param string $data |
|
| 4707 | + */ |
|
| 4685 | 4708 | public function __construct($data) |
| 4686 | 4709 | { |
| 4687 | 4710 | $this->compressed_data = $data; |
@@ -5295,6 +5318,9 @@ discard block |
||
| 5295 | 5318 | $this->set_iri($iri); |
| 5296 | 5319 | } |
| 5297 | 5320 | |
| 5321 | + /** |
|
| 5322 | + * @param SimplePie_IRI $base |
|
| 5323 | + */ |
|
| 5298 | 5324 | public static function absolutize($base, $relative) |
| 5299 | 5325 | { |
| 5300 | 5326 | if (!($relative instanceof SimplePie_IRI)) |
@@ -5382,6 +5408,9 @@ discard block |
||
| 5382 | 5408 | } |
| 5383 | 5409 | } |
| 5384 | 5410 | |
| 5411 | + /** |
|
| 5412 | + * @param string $iri |
|
| 5413 | + */ |
|
| 5385 | 5414 | protected function parse_iri($iri) |
| 5386 | 5415 | { |
| 5387 | 5416 | $iri = trim($iri, "\x20\x09\x0A\x0C\x0D"); |
@@ -5470,6 +5499,9 @@ discard block |
||
| 5470 | 5499 | return $output . $input; |
| 5471 | 5500 | } |
| 5472 | 5501 | |
| 5502 | + /** |
|
| 5503 | + * @param string $extra_chars |
|
| 5504 | + */ |
|
| 5473 | 5505 | protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) |
| 5474 | 5506 | { |
| 5475 | 5507 | // Normalize as many pct-encoded sections as possible |
@@ -5808,6 +5840,9 @@ discard block |
||
| 5808 | 5840 | } |
| 5809 | 5841 | } |
| 5810 | 5842 | |
| 5843 | + /** |
|
| 5844 | + * @param string|null $scheme |
|
| 5845 | + */ |
|
| 5811 | 5846 | public function set_scheme($scheme) |
| 5812 | 5847 | { |
| 5813 | 5848 | if ($scheme === null) |
@@ -5826,6 +5861,9 @@ discard block |
||
| 5826 | 5861 | return true; |
| 5827 | 5862 | } |
| 5828 | 5863 | |
| 5864 | + /** |
|
| 5865 | + * @param string|null $authority |
|
| 5866 | + */ |
|
| 5829 | 5867 | public function set_authority($authority) |
| 5830 | 5868 | { |
| 5831 | 5869 | static $cache; |
@@ -5881,6 +5919,9 @@ discard block |
||
| 5881 | 5919 | } |
| 5882 | 5920 | } |
| 5883 | 5921 | |
| 5922 | + /** |
|
| 5923 | + * @param string|null $iuserinfo |
|
| 5924 | + */ |
|
| 5884 | 5925 | public function set_userinfo($iuserinfo) |
| 5885 | 5926 | { |
| 5886 | 5927 | if ($iuserinfo === null) |
@@ -5940,6 +5981,9 @@ discard block |
||
| 5940 | 5981 | return true; |
| 5941 | 5982 | } |
| 5942 | 5983 | |
| 5984 | + /** |
|
| 5985 | + * @param null|string $port |
|
| 5986 | + */ |
|
| 5943 | 5987 | public function set_port($port) |
| 5944 | 5988 | { |
| 5945 | 5989 | if ($port === null) |
@@ -5960,6 +6004,9 @@ discard block |
||
| 5960 | 6004 | } |
| 5961 | 6005 | } |
| 5962 | 6006 | |
| 6007 | + /** |
|
| 6008 | + * @param string|null $ipath |
|
| 6009 | + */ |
|
| 5963 | 6010 | public function set_path($ipath) |
| 5964 | 6011 | { |
| 5965 | 6012 | static $cache; |
@@ -5983,6 +6030,9 @@ discard block |
||
| 5983 | 6030 | return true; |
| 5984 | 6031 | } |
| 5985 | 6032 | |
| 6033 | + /** |
|
| 6034 | + * @param string|null $iquery |
|
| 6035 | + */ |
|
| 5986 | 6036 | public function set_query($iquery) |
| 5987 | 6037 | { |
| 5988 | 6038 | if ($iquery === null) |
@@ -5997,6 +6047,9 @@ discard block |
||
| 5997 | 6047 | return true; |
| 5998 | 6048 | } |
| 5999 | 6049 | |
| 6050 | + /** |
|
| 6051 | + * @param string|null $ifragment |
|
| 6052 | + */ |
|
| 6000 | 6053 | public function set_fragment($ifragment) |
| 6001 | 6054 | { |
| 6002 | 6055 | if ($ifragment === null) |
@@ -6011,6 +6064,9 @@ discard block |
||
| 6011 | 6064 | return true; |
| 6012 | 6065 | } |
| 6013 | 6066 | |
| 6067 | + /** |
|
| 6068 | + * @param false|string $string |
|
| 6069 | + */ |
|
| 6014 | 6070 | public function to_uri($string) |
| 6015 | 6071 | { |
| 6016 | 6072 | static $non_ascii; |
@@ -6135,6 +6191,10 @@ discard block |
||
| 6135 | 6191 | } |
| 6136 | 6192 | } |
| 6137 | 6193 | |
| 6194 | + /** |
|
| 6195 | + * @param string $namespace |
|
| 6196 | + * @param string $tag |
|
| 6197 | + */ |
|
| 6138 | 6198 | public function get_item_tags($namespace, $tag) |
| 6139 | 6199 | { |
| 6140 | 6200 | if (isset($this->data['child'][$namespace][$tag])) |
@@ -6147,11 +6207,17 @@ discard block |
||
| 6147 | 6207 | } |
| 6148 | 6208 | } |
| 6149 | 6209 | |
| 6210 | + /** |
|
| 6211 | + * @return string |
|
| 6212 | + */ |
|
| 6150 | 6213 | public function get_base($element = array()) |
| 6151 | 6214 | { |
| 6152 | 6215 | return $this->feed->get_base($element); |
| 6153 | 6216 | } |
| 6154 | 6217 | |
| 6218 | + /** |
|
| 6219 | + * @return string |
|
| 6220 | + */ |
|
| 6155 | 6221 | public function sanitize($data, $type, $base = '') |
| 6156 | 6222 | { |
| 6157 | 6223 | return $this->feed->sanitize($data, $type, $base); |
@@ -8755,6 +8821,10 @@ discard block |
||
| 8755 | 8821 | return null; |
| 8756 | 8822 | } |
| 8757 | 8823 | } |
| 8824 | + |
|
| 8825 | + /** |
|
| 8826 | + * @param string $name |
|
| 8827 | + */ |
|
| 8758 | 8828 | protected function search_elements_by_tag($name, &$done, $feeds) |
| 8759 | 8829 | { |
| 8760 | 8830 | if ($this->dom === null) |
@@ -9102,6 +9172,11 @@ discard block |
||
| 9102 | 9172 | return strtr($string, $convert_table); |
| 9103 | 9173 | } |
| 9104 | 9174 | |
| 9175 | + /** |
|
| 9176 | + * @param string $data |
|
| 9177 | + * @param string $input |
|
| 9178 | + * @param string $output |
|
| 9179 | + */ |
|
| 9105 | 9180 | public static function change_encoding($data, $input, $output) |
| 9106 | 9181 | { |
| 9107 | 9182 | $input = SimplePie_Misc::encoding($input); |
@@ -10243,6 +10318,10 @@ discard block |
||
| 10243 | 10318 | return $charset; |
| 10244 | 10319 | } |
| 10245 | 10320 | } |
| 10321 | + |
|
| 10322 | + /** |
|
| 10323 | + * @return string |
|
| 10324 | + */ |
|
| 10246 | 10325 | public static function get_curl_version() |
| 10247 | 10326 | { |
| 10248 | 10327 | if (is_array($curl = curl_version())) |
@@ -10287,6 +10366,9 @@ discard block |
||
| 10287 | 10366 | return $parser->parse($dt); |
| 10288 | 10367 | } |
| 10289 | 10368 | |
| 10369 | + /** |
|
| 10370 | + * @param string|false $data |
|
| 10371 | + */ |
|
| 10290 | 10372 | public static function entities_decode($data) |
| 10291 | 10373 | { |
| 10292 | 10374 | $decoder = new SimplePie_Decode_HTML_Entities($data); |
@@ -10766,6 +10848,9 @@ discard block |
||
| 10766 | 10848 | return $ip; |
| 10767 | 10849 | } |
| 10768 | 10850 | |
| 10851 | + /** |
|
| 10852 | + * @param string $ip |
|
| 10853 | + */ |
|
| 10769 | 10854 | public static function compress($ip) |
| 10770 | 10855 | { |
| 10771 | 10856 | // Prepare the IP to be compressed |
@@ -11852,6 +11937,10 @@ discard block |
||
| 11852 | 11937 | { |
| 11853 | 11938 | return $this->data; |
| 11854 | 11939 | } |
| 11940 | + |
|
| 11941 | + /** |
|
| 11942 | + * @param string $tag |
|
| 11943 | + */ |
|
| 11855 | 11944 | public function tag_open($parser, $tag, $attributes) |
| 11856 | 11945 | { |
| 11857 | 11946 | list($this->namespace[], $this->element[]) = $this->split_ns($tag); |
@@ -11914,6 +12003,10 @@ discard block |
||
| 11914 | 12003 | } |
| 11915 | 12004 | } |
| 11916 | 12005 | } |
| 12006 | + |
|
| 12007 | + /** |
|
| 12008 | + * @param string $cdata |
|
| 12009 | + */ |
|
| 11917 | 12010 | public function cdata($parser, $cdata) |
| 11918 | 12011 | { |
| 11919 | 12012 | if ($this->current_xhtml_construct >= 0) |
@@ -11925,6 +12018,10 @@ discard block |
||
| 11925 | 12018 | $this->data['data'] .= $cdata; |
| 11926 | 12019 | } |
| 11927 | 12020 | } |
| 12021 | + |
|
| 12022 | + /** |
|
| 12023 | + * @param string $tag |
|
| 12024 | + */ |
|
| 11928 | 12025 | public function tag_close($parser, $tag) |
| 11929 | 12026 | { |
| 11930 | 12027 | if ($this->current_xhtml_construct >= 0) |
@@ -12057,6 +12154,10 @@ discard block |
||
| 12057 | 12154 | |
| 12058 | 12155 | public function __construct() { } |
| 12059 | 12156 | |
| 12157 | + /** |
|
| 12158 | + * @param string $type |
|
| 12159 | + * @param string $class |
|
| 12160 | + */ |
|
| 12060 | 12161 | public function register($type, $class, $legacy = false) |
| 12061 | 12162 | { |
| 12062 | 12163 | if (!is_subclass_of($class, $this->default[$type])) |
@@ -12084,6 +12185,9 @@ discard block |
||
| 12084 | 12185 | return null; |
| 12085 | 12186 | } |
| 12086 | 12187 | |
| 12188 | + /** |
|
| 12189 | + * @param string $type |
|
| 12190 | + */ |
|
| 12087 | 12191 | public function &create($type, $parameters = array()) |
| 12088 | 12192 | { |
| 12089 | 12193 | $class = $this->get_class($type); |
@@ -12115,6 +12219,10 @@ discard block |
||
| 12115 | 12219 | return $instance; |
| 12116 | 12220 | } |
| 12117 | 12221 | |
| 12222 | + /** |
|
| 12223 | + * @param string $type |
|
| 12224 | + * @param string $method |
|
| 12225 | + */ |
|
| 12118 | 12226 | public function &call($type, $method, $parameters = array()) |
| 12119 | 12227 | { |
| 12120 | 12228 | $class = $this->get_class($type); |
@@ -12146,6 +12254,10 @@ discard block |
||
| 12146 | 12254 | |
| 12147 | 12255 | var $value; |
| 12148 | 12256 | |
| 12257 | + /** |
|
| 12258 | + * @param string $relationship |
|
| 12259 | + * @param string $value |
|
| 12260 | + */ |
|
| 12149 | 12261 | public function __construct($relationship = null, $type = null, $value = null) |
| 12150 | 12262 | { |
| 12151 | 12263 | $this->relationship = $relationship; |
@@ -12472,6 +12584,10 @@ discard block |
||
| 12472 | 12584 | } |
| 12473 | 12585 | return $data; |
| 12474 | 12586 | } |
| 12587 | + |
|
| 12588 | + /** |
|
| 12589 | + * @param string $html |
|
| 12590 | + */ |
|
| 12475 | 12591 | protected function preprocess($html, $type) |
| 12476 | 12592 | { |
| 12477 | 12593 | $ret = ''; |
@@ -12493,6 +12609,10 @@ discard block |
||
| 12493 | 12609 | $ret .= '</head><body>' . $html . '</body></html>'; |
| 12494 | 12610 | return $ret; |
| 12495 | 12611 | } |
| 12612 | + |
|
| 12613 | + /** |
|
| 12614 | + * @param DOMDocument $document |
|
| 12615 | + */ |
|
| 12496 | 12616 | public function replace_urls($document, $tag, $attributes) |
| 12497 | 12617 | { |
| 12498 | 12618 | if (!is_array($attributes)) |
@@ -12542,6 +12662,10 @@ discard block |
||
| 12542 | 12662 | return ''; |
| 12543 | 12663 | } |
| 12544 | 12664 | } |
| 12665 | + |
|
| 12666 | + /** |
|
| 12667 | + * @param DOMDocument $document |
|
| 12668 | + */ |
|
| 12545 | 12669 | protected function strip_tag($tag, $document, $type) |
| 12546 | 12670 | { |
| 12547 | 12671 | $xpath = new DOMXPath($document); |
@@ -12617,6 +12741,10 @@ discard block |
||
| 12617 | 12741 | } |
| 12618 | 12742 | } |
| 12619 | 12743 | } |
| 12744 | + |
|
| 12745 | + /** |
|
| 12746 | + * @param DOMDocument $document |
|
| 12747 | + */ |
|
| 12620 | 12748 | protected function strip_attr($attrib, $document) |
| 12621 | 12749 | { |
| 12622 | 12750 | $xpath = new DOMXPath($document); |
@@ -12645,6 +12773,11 @@ discard block |
||
| 12645 | 12773 | { |
| 12646 | 12774 | return md5(serialize($this->data)); |
| 12647 | 12775 | } |
| 12776 | + |
|
| 12777 | + /** |
|
| 12778 | + * @param string $namespace |
|
| 12779 | + * @param string $tag |
|
| 12780 | + */ |
|
| 12648 | 12781 | public function get_source_tags($namespace, $tag) |
| 12649 | 12782 | { |
| 12650 | 12783 | if (isset($this->data['child'][$namespace][$tag])) |
@@ -12656,6 +12789,10 @@ discard block |
||
| 12656 | 12789 | return null; |
| 12657 | 12790 | } |
| 12658 | 12791 | } |
| 12792 | + |
|
| 12793 | + /** |
|
| 12794 | + * @return string |
|
| 12795 | + */ |
|
| 12659 | 12796 | public function get_base($element = array()) |
| 12660 | 12797 | { |
| 12661 | 12798 | return $this->item->get_base($element); |
@@ -50,8 +50,8 @@ discard block |
||
| 50 | 50 | define('SIMPLEPIE_VERSION', '1.3.1'); |
| 51 | 51 | define('SIMPLEPIE_BUILD', '20121030175911'); |
| 52 | 52 | define('SIMPLEPIE_URL', 'http://simplepie.org'); |
| 53 | -define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD); |
|
| 54 | -define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>'); |
|
| 53 | +define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME.'/'.SIMPLEPIE_VERSION.' (Feed Parser; '.SIMPLEPIE_URL.'; Allow like Gecko) Build/'.SIMPLEPIE_BUILD); |
|
| 54 | +define('SIMPLEPIE_LINKBACK', '<a href="'.SIMPLEPIE_URL.'" title="'.SIMPLEPIE_NAME.' '.SIMPLEPIE_VERSION.'">'.SIMPLEPIE_NAME.'</a>'); |
|
| 55 | 55 | define('SIMPLEPIE_LOCATOR_NONE', 0); |
| 56 | 56 | define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', 1); |
| 57 | 57 | define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', 2); |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | if ($file instanceof SimplePie_File) |
| 257 | 257 | { |
| 258 | 258 | $this->feed_url = $file->url; |
| 259 | - $this->file =& $file; |
|
| 259 | + $this->file = & $file; |
|
| 260 | 260 | return true; |
| 261 | 261 | } |
| 262 | 262 | return false; |
@@ -483,7 +483,7 @@ discard block |
||
| 483 | 483 | { |
| 484 | 484 | if ($page !== false) |
| 485 | 485 | { |
| 486 | - $this->sanitize->set_image_handler($page . '?' . $qs . '='); |
|
| 486 | + $this->sanitize->set_image_handler($page.'?'.$qs.'='); |
|
| 487 | 487 | } |
| 488 | 488 | else |
| 489 | 489 | { |
@@ -713,7 +713,7 @@ discard block |
||
| 713 | 713 | { |
| 714 | 714 | $headers['if-none-match'] = $this->data['headers']['etag']; |
| 715 | 715 | } |
| 716 | - $file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen)); |
|
| 716 | + $file = $this->registry->create('File', array($this->feed_url, $this->timeout / 10, 5, $headers, $this->useragent, $this->force_fsockopen)); |
|
| 717 | 717 | if ($file->success) |
| 718 | 718 | { |
| 719 | 719 | if ($file->status_code === 304) |
@@ -747,7 +747,7 @@ discard block |
||
| 747 | 747 | { |
| 748 | 748 | if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url) |
| 749 | 749 | { |
| 750 | - $file =& $this->file; |
|
| 750 | + $file = & $this->file; |
|
| 751 | 751 | } |
| 752 | 752 | else |
| 753 | 753 | { |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | { |
| 776 | 776 | if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds))) |
| 777 | 777 | { |
| 778 | - $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."; |
|
| 778 | + $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."; |
|
| 779 | 779 | $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__)); |
| 780 | 780 | return false; |
| 781 | 781 | } |
@@ -829,7 +829,7 @@ discard block |
||
| 829 | 829 | $header = "Content-type: $mime;"; |
| 830 | 830 | if ($this->get_encoding()) |
| 831 | 831 | { |
| 832 | - $header .= ' charset=' . $this->get_encoding(); |
|
| 832 | + $header .= ' charset='.$this->get_encoding(); |
|
| 833 | 833 | } |
| 834 | 834 | else |
| 835 | 835 | { |
@@ -1378,19 +1378,19 @@ discard block |
||
| 1378 | 1378 | { |
| 1379 | 1379 | if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key))) |
| 1380 | 1380 | { |
| 1381 | - if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key])) |
|
| 1381 | + if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key])) |
|
| 1382 | 1382 | { |
| 1383 | - $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]); |
|
| 1384 | - $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]; |
|
| 1383 | + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]); |
|
| 1384 | + $this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]; |
|
| 1385 | 1385 | } |
| 1386 | 1386 | else |
| 1387 | 1387 | { |
| 1388 | - $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key]; |
|
| 1388 | + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key]; |
|
| 1389 | 1389 | } |
| 1390 | 1390 | } |
| 1391 | 1391 | elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY) |
| 1392 | 1392 | { |
| 1393 | - $this->data['links'][substr($key, 41)] =& $this->data['links'][$key]; |
|
| 1393 | + $this->data['links'][substr($key, 41)] = & $this->data['links'][$key]; |
|
| 1394 | 1394 | } |
| 1395 | 1395 | $this->data['links'][$key] = array_unique($this->data['links'][$key]); |
| 1396 | 1396 | } |
@@ -1803,7 +1803,7 @@ discard block |
||
| 1803 | 1803 | trigger_error('Favicon handling has been removed, please use your own handling', $level); |
| 1804 | 1804 | if (($url = $this->get_link()) !== null) |
| 1805 | 1805 | { |
| 1806 | - return 'http://g.etfv.co/' . urlencode($url); |
|
| 1806 | + return 'http://g.etfv.co/'.urlencode($url); |
|
| 1807 | 1807 | } |
| 1808 | 1808 | return false; |
| 1809 | 1809 | } |
@@ -1981,19 +1981,19 @@ discard block |
||
| 1981 | 1981 | } |
| 1982 | 1982 | if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0])) |
| 1983 | 1983 | { |
| 1984 | - $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]; |
|
| 1984 | + $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]; |
|
| 1985 | 1985 | } |
| 1986 | 1986 | elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0])) |
| 1987 | 1987 | { |
| 1988 | - $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]; |
|
| 1988 | + $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]; |
|
| 1989 | 1989 | } |
| 1990 | 1990 | elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0])) |
| 1991 | 1991 | { |
| 1992 | - $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]; |
|
| 1992 | + $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]; |
|
| 1993 | 1993 | } |
| 1994 | 1994 | elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0])) |
| 1995 | 1995 | { |
| 1996 | - $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]; |
|
| 1996 | + $channel = & $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]; |
|
| 1997 | 1997 | } |
| 1998 | 1998 | else |
| 1999 | 1999 | { |
@@ -2126,7 +2126,7 @@ discard block |
||
| 2126 | 2126 | $this->options['host'] = empty($parsed['host']) ? $this->options['host'] : $parsed['host']; |
| 2127 | 2127 | $this->options['port'] = empty($parsed['port']) ? $this->options['port'] : $parsed['port']; |
| 2128 | 2128 | $this->options['extras'] = array_merge($this->options['extras'], $parsed['extras']); |
| 2129 | - $this->name = $this->options['extras']['prefix'] . md5("$name:$type"); |
|
| 2129 | + $this->name = $this->options['extras']['prefix'].md5("$name:$type"); |
|
| 2130 | 2130 | $this->cache = new Memcache(); |
| 2131 | 2131 | $this->cache->addServer($this->options['host'], (int) $this->options['port']); |
| 2132 | 2132 | } |
@@ -2209,7 +2209,7 @@ discard block |
||
| 2209 | 2209 | $this->mysql = null; |
| 2210 | 2210 | return; |
| 2211 | 2211 | } |
| 2212 | - $this->id = $name . $type; |
|
| 2212 | + $this->id = $name.$type; |
|
| 2213 | 2213 | if (!$query = $this->mysql->query('SHOW TABLES')) |
| 2214 | 2214 | { |
| 2215 | 2215 | $this->mysql = null; |
@@ -2220,17 +2220,17 @@ discard block |
||
| 2220 | 2220 | { |
| 2221 | 2221 | $db[] = $row; |
| 2222 | 2222 | } |
| 2223 | - if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db)) |
|
| 2223 | + if (!in_array($this->options['extras']['prefix'].'cache_data', $db)) |
|
| 2224 | 2224 | { |
| 2225 | - $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)))'); |
|
| 2225 | + $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)))'); |
|
| 2226 | 2226 | if ($query === false) |
| 2227 | 2227 | { |
| 2228 | 2228 | $this->mysql = null; |
| 2229 | 2229 | } |
| 2230 | 2230 | } |
| 2231 | - if (!in_array($this->options['extras']['prefix'] . 'items', $db)) |
|
| 2231 | + if (!in_array($this->options['extras']['prefix'].'items', $db)) |
|
| 2232 | 2232 | { |
| 2233 | - $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)))'); |
|
| 2233 | + $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)))'); |
|
| 2234 | 2234 | if ($query === false) |
| 2235 | 2235 | { |
| 2236 | 2236 | $this->mysql = null; |
@@ -2248,7 +2248,7 @@ discard block |
||
| 2248 | 2248 | { |
| 2249 | 2249 | $data = clone $data; |
| 2250 | 2250 | $prepared = self::prepare_simplepie_object_for_cache($data); |
| 2251 | - $query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed'); |
|
| 2251 | + $query = $this->mysql->prepare('SELECT COUNT(*) FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed'); |
|
| 2252 | 2252 | $query->bindValue(':feed', $this->id); |
| 2253 | 2253 | if ($query->execute()) |
| 2254 | 2254 | { |
@@ -2257,13 +2257,13 @@ discard block |
||
| 2257 | 2257 | $items = count($prepared[1]); |
| 2258 | 2258 | if ($items) |
| 2259 | 2259 | { |
| 2260 | - $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed'; |
|
| 2260 | + $sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed'; |
|
| 2261 | 2261 | $query = $this->mysql->prepare($sql); |
| 2262 | 2262 | $query->bindValue(':items', $items); |
| 2263 | 2263 | } |
| 2264 | 2264 | else |
| 2265 | 2265 | { |
| 2266 | - $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed'; |
|
| 2266 | + $sql = 'UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed'; |
|
| 2267 | 2267 | $query = $this->mysql->prepare($sql); |
| 2268 | 2268 | } |
| 2269 | 2269 | $query->bindValue(':data', $prepared[0]); |
@@ -2276,7 +2276,7 @@ discard block |
||
| 2276 | 2276 | } |
| 2277 | 2277 | else |
| 2278 | 2278 | { |
| 2279 | - $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)'); |
|
| 2279 | + $query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)'); |
|
| 2280 | 2280 | $query->bindValue(':feed', $this->id); |
| 2281 | 2281 | $query->bindValue(':count', count($prepared[1])); |
| 2282 | 2282 | $query->bindValue(':data', $prepared[0]); |
@@ -2293,7 +2293,7 @@ discard block |
||
| 2293 | 2293 | { |
| 2294 | 2294 | $database_ids[] = $this->mysql->quote($id); |
| 2295 | 2295 | } |
| 2296 | - $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed'); |
|
| 2296 | + $query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'items` WHERE `id` = '.implode(' OR `id` = ', $database_ids).' AND `feed_id` = :feed'); |
|
| 2297 | 2297 | $query->bindValue(':feed', $this->id); |
| 2298 | 2298 | if ($query->execute()) |
| 2299 | 2299 | { |
@@ -2309,7 +2309,7 @@ discard block |
||
| 2309 | 2309 | { |
| 2310 | 2310 | $date = time(); |
| 2311 | 2311 | } |
| 2312 | - $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)'); |
|
| 2312 | + $query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)'); |
|
| 2313 | 2313 | $query->bindValue(':feed', $this->id); |
| 2314 | 2314 | $query->bindValue(':id', $new_id); |
| 2315 | 2315 | $query->bindValue(':data', serialize($prepared[1][$new_id]->data)); |
@@ -2330,13 +2330,13 @@ discard block |
||
| 2330 | 2330 | } |
| 2331 | 2331 | else |
| 2332 | 2332 | { |
| 2333 | - $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed'); |
|
| 2333 | + $query = $this->mysql->prepare('SELECT `id` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :feed'); |
|
| 2334 | 2334 | $query->bindValue(':feed', $this->id); |
| 2335 | 2335 | if ($query->execute()) |
| 2336 | 2336 | { |
| 2337 | 2337 | if ($query->rowCount() > 0) |
| 2338 | 2338 | { |
| 2339 | - $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed'); |
|
| 2339 | + $query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed'); |
|
| 2340 | 2340 | $query->bindValue(':data', serialize($data)); |
| 2341 | 2341 | $query->bindValue(':time', time()); |
| 2342 | 2342 | $query->bindValue(':feed', $this->id); |
@@ -2347,7 +2347,7 @@ discard block |
||
| 2347 | 2347 | } |
| 2348 | 2348 | else |
| 2349 | 2349 | { |
| 2350 | - $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)'); |
|
| 2350 | + $query = $this->mysql->prepare('INSERT INTO `'.$this->options['extras']['prefix'].'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)'); |
|
| 2351 | 2351 | $query->bindValue(':id', $this->id); |
| 2352 | 2352 | $query->bindValue(':data', serialize($data)); |
| 2353 | 2353 | $query->bindValue(':time', time()); |
@@ -2367,7 +2367,7 @@ discard block |
||
| 2367 | 2367 | { |
| 2368 | 2368 | return false; |
| 2369 | 2369 | } |
| 2370 | - $query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id'); |
|
| 2370 | + $query = $this->mysql->prepare('SELECT `items`, `data` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id'); |
|
| 2371 | 2371 | $query->bindValue(':id', $this->id); |
| 2372 | 2372 | if ($query->execute() && ($row = $query->fetch())) |
| 2373 | 2373 | { |
@@ -2384,19 +2384,19 @@ discard block |
||
| 2384 | 2384 | { |
| 2385 | 2385 | if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0])) |
| 2386 | 2386 | { |
| 2387 | - $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]; |
|
| 2387 | + $feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]; |
|
| 2388 | 2388 | } |
| 2389 | 2389 | elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0])) |
| 2390 | 2390 | { |
| 2391 | - $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]; |
|
| 2391 | + $feed = & $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]; |
|
| 2392 | 2392 | } |
| 2393 | 2393 | elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0])) |
| 2394 | 2394 | { |
| 2395 | - $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]; |
|
| 2395 | + $feed = & $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]; |
|
| 2396 | 2396 | } |
| 2397 | 2397 | elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0])) |
| 2398 | 2398 | { |
| 2399 | - $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]; |
|
| 2399 | + $feed = & $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]; |
|
| 2400 | 2400 | } |
| 2401 | 2401 | else |
| 2402 | 2402 | { |
@@ -2404,10 +2404,10 @@ discard block |
||
| 2404 | 2404 | } |
| 2405 | 2405 | if ($feed !== null) |
| 2406 | 2406 | { |
| 2407 | - $sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC'; |
|
| 2407 | + $sql = 'SELECT `data` FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC'; |
|
| 2408 | 2408 | if ($items > 0) |
| 2409 | 2409 | { |
| 2410 | - $sql .= ' LIMIT ' . $items; |
|
| 2410 | + $sql .= ' LIMIT '.$items; |
|
| 2411 | 2411 | } |
| 2412 | 2412 | $query = $this->mysql->prepare($sql); |
| 2413 | 2413 | $query->bindValue(':feed', $this->id); |
@@ -2435,7 +2435,7 @@ discard block |
||
| 2435 | 2435 | { |
| 2436 | 2436 | return false; |
| 2437 | 2437 | } |
| 2438 | - $query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id'); |
|
| 2438 | + $query = $this->mysql->prepare('SELECT `mtime` FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id'); |
|
| 2439 | 2439 | $query->bindValue(':id', $this->id); |
| 2440 | 2440 | if ($query->execute() && ($time = $query->fetchColumn())) |
| 2441 | 2441 | { |
@@ -2453,7 +2453,7 @@ discard block |
||
| 2453 | 2453 | { |
| 2454 | 2454 | return false; |
| 2455 | 2455 | } |
| 2456 | - $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id'); |
|
| 2456 | + $query = $this->mysql->prepare('UPDATE `'.$this->options['extras']['prefix'].'cache_data` SET `mtime` = :time WHERE `id` = :id'); |
|
| 2457 | 2457 | $query->bindValue(':time', time()); |
| 2458 | 2458 | $query->bindValue(':id', $this->id); |
| 2459 | 2459 | if ($query->execute() && $query->rowCount() > 0) |
@@ -2472,9 +2472,9 @@ discard block |
||
| 2472 | 2472 | { |
| 2473 | 2473 | return false; |
| 2474 | 2474 | } |
| 2475 | - $query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id'); |
|
| 2475 | + $query = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'cache_data` WHERE `id` = :id'); |
|
| 2476 | 2476 | $query->bindValue(':id', $this->id); |
| 2477 | - $query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id'); |
|
| 2477 | + $query2 = $this->mysql->prepare('DELETE FROM `'.$this->options['extras']['prefix'].'items` WHERE `feed_id` = :id'); |
|
| 2478 | 2478 | $query2->bindValue(':id', $this->id); |
| 2479 | 2479 | if ($query->execute() && $query2->execute()) |
| 2480 | 2480 | { |
@@ -3985,7 +3985,7 @@ discard block |
||
| 3985 | 3985 | $length = $this->get_length(); |
| 3986 | 3986 | if ($length !== null) |
| 3987 | 3987 | { |
| 3988 | - return round($length/1048576, 2); |
|
| 3988 | + return round($length / 1048576, 2); |
|
| 3989 | 3989 | } |
| 3990 | 3990 | else |
| 3991 | 3991 | { |
@@ -4054,7 +4054,7 @@ discard block |
||
| 4054 | 4054 | } |
| 4055 | 4055 | } |
| 4056 | 4056 | |
| 4057 | - public function native_embed($options='') |
|
| 4057 | + public function native_embed($options = '') |
|
| 4058 | 4058 | { |
| 4059 | 4059 | return $this->embed($options, true); |
| 4060 | 4060 | } |
@@ -4082,7 +4082,7 @@ discard block |
||
| 4082 | 4082 | else |
| 4083 | 4083 | { |
| 4084 | 4084 | $options = explode(',', $options); |
| 4085 | - foreach($options as $option) |
|
| 4085 | + foreach ($options as $option) |
|
| 4086 | 4086 | { |
| 4087 | 4087 | $opt = explode(':', $option, 2); |
| 4088 | 4088 | if (isset($opt[0], $opt[1])) |
@@ -4138,11 +4138,11 @@ discard block |
||
| 4138 | 4138 | } |
| 4139 | 4139 | elseif ($widescreen) |
| 4140 | 4140 | { |
| 4141 | - $width = round((intval($height)/9)*16); |
|
| 4141 | + $width = round((intval($height) / 9) * 16); |
|
| 4142 | 4142 | } |
| 4143 | 4143 | else |
| 4144 | 4144 | { |
| 4145 | - $width = round((intval($height)/3)*4); |
|
| 4145 | + $width = round((intval($height) / 3) * 4); |
|
| 4146 | 4146 | } |
| 4147 | 4147 | } |
| 4148 | 4148 | else |
@@ -4171,11 +4171,11 @@ discard block |
||
| 4171 | 4171 | } |
| 4172 | 4172 | elseif ($widescreen) |
| 4173 | 4173 | { |
| 4174 | - $height = round((intval($width)/16)*9); |
|
| 4174 | + $height = round((intval($width) / 16) * 9); |
|
| 4175 | 4175 | } |
| 4176 | 4176 | else |
| 4177 | 4177 | { |
| 4178 | - $height = round((intval($width)/4)*3); |
|
| 4178 | + $height = round((intval($width) / 4) * 3); |
|
| 4179 | 4179 | } |
| 4180 | 4180 | } |
| 4181 | 4181 | else |
@@ -4202,11 +4202,11 @@ discard block |
||
| 4202 | 4202 | { |
| 4203 | 4203 | if ($native) |
| 4204 | 4204 | { |
| 4205 | - $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>"; |
|
| 4205 | + $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>"; |
|
| 4206 | 4206 | } |
| 4207 | 4207 | else |
| 4208 | 4208 | { |
| 4209 | - $embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>"; |
|
| 4209 | + $embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '".$this->get_link()."', '$loop', '$type');</script>"; |
|
| 4210 | 4210 | } |
| 4211 | 4211 | } |
| 4212 | 4212 | // Flash Media Player file types. |
@@ -4216,11 +4216,11 @@ discard block |
||
| 4216 | 4216 | $height += 20; |
| 4217 | 4217 | if ($native) |
| 4218 | 4218 | { |
| 4219 | - $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>"; |
|
| 4219 | + $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>"; |
|
| 4220 | 4220 | } |
| 4221 | 4221 | else |
| 4222 | 4222 | { |
| 4223 | - $embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>"; |
|
| 4223 | + $embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."', '$placeholder', '$loop', '$mediaplayer');</script>"; |
|
| 4224 | 4224 | } |
| 4225 | 4225 | } |
| 4226 | 4226 | // QuickTime 7 file types. Need to test with QuickTime 6. |
@@ -4232,16 +4232,16 @@ discard block |
||
| 4232 | 4232 | { |
| 4233 | 4233 | if ($placeholder !== '') |
| 4234 | 4234 | { |
| 4235 | - $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>"; |
|
| 4235 | + $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>"; |
|
| 4236 | 4236 | } |
| 4237 | 4237 | else |
| 4238 | 4238 | { |
| 4239 | - $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>"; |
|
| 4239 | + $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>"; |
|
| 4240 | 4240 | } |
| 4241 | 4241 | } |
| 4242 | 4242 | else |
| 4243 | 4243 | { |
| 4244 | - $embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>"; |
|
| 4244 | + $embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '".$this->get_link()."', '$placeholder', '$loop');</script>"; |
|
| 4245 | 4245 | } |
| 4246 | 4246 | } |
| 4247 | 4247 | // Windows Media |
@@ -4250,15 +4250,15 @@ discard block |
||
| 4250 | 4250 | $height += 45; |
| 4251 | 4251 | if ($native) |
| 4252 | 4252 | { |
| 4253 | - $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>"; |
|
| 4253 | + $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>"; |
|
| 4254 | 4254 | } |
| 4255 | 4255 | else |
| 4256 | 4256 | { |
| 4257 | - $embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>"; |
|
| 4257 | + $embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '".$this->get_link()."');</script>"; |
|
| 4258 | 4258 | } |
| 4259 | 4259 | } |
| 4260 | 4260 | // Everything else |
| 4261 | - else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>'; |
|
| 4261 | + else $embed .= '<a href="'.$this->get_link().'" class="'.$altclass.'">'.$alt.'</a>'; |
|
| 4262 | 4262 | return $embed; |
| 4263 | 4263 | } |
| 4264 | 4264 | |
@@ -4266,7 +4266,7 @@ discard block |
||
| 4266 | 4266 | { |
| 4267 | 4267 | // Mime-types by handler. |
| 4268 | 4268 | $types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash |
| 4269 | - $types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player |
|
| 4269 | + $types_fmedia = array('video/flv', 'video/x-flv', 'flv-application/octet-stream'); // Flash Media Player |
|
| 4270 | 4270 | $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 |
| 4271 | 4271 | $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 |
| 4272 | 4272 | $types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3 |
@@ -4481,7 +4481,7 @@ discard block |
||
| 4481 | 4481 | } |
| 4482 | 4482 | if (curl_errno($fp)) |
| 4483 | 4483 | { |
| 4484 | - $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp); |
|
| 4484 | + $this->error = 'cURL error '.curl_errno($fp).': '.curl_error($fp); |
|
| 4485 | 4485 | $this->success = false; |
| 4486 | 4486 | } |
| 4487 | 4487 | else |
@@ -4523,7 +4523,7 @@ discard block |
||
| 4523 | 4523 | $fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout); |
| 4524 | 4524 | if (!$fp) |
| 4525 | 4525 | { |
| 4526 | - $this->error = 'fsockopen error: ' . $errstr; |
|
| 4526 | + $this->error = 'fsockopen error: '.$errstr; |
|
| 4527 | 4527 | $this->success = false; |
| 4528 | 4528 | } |
| 4529 | 4529 | else |
@@ -4553,7 +4553,7 @@ discard block |
||
| 4553 | 4553 | } |
| 4554 | 4554 | if (isset($url_parts['user']) && isset($url_parts['pass'])) |
| 4555 | 4555 | { |
| 4556 | - $out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n"; |
|
| 4556 | + $out .= "Authorization: Basic ".base64_encode("$url_parts[user]:$url_parts[pass]")."\r\n"; |
|
| 4557 | 4557 | } |
| 4558 | 4558 | foreach ($headers as $key => $value) |
| 4559 | 4559 | { |
@@ -4961,7 +4961,7 @@ discard block |
||
| 4961 | 4961 | // We should only use the last Content-Type header. c.f. issue #1 |
| 4962 | 4962 | if (isset($this->headers[$this->name]) && $this->name !== 'content-type') |
| 4963 | 4963 | { |
| 4964 | - $this->headers[$this->name] .= ', ' . $this->value; |
|
| 4964 | + $this->headers[$this->name] .= ', '.$this->value; |
|
| 4965 | 4965 | } |
| 4966 | 4966 | else |
| 4967 | 4967 | { |
@@ -5137,7 +5137,7 @@ discard block |
||
| 5137 | 5137 | $encoded = $this->body; |
| 5138 | 5138 | while (true) |
| 5139 | 5139 | { |
| 5140 | - $is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches ); |
|
| 5140 | + $is_chunked = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches); |
|
| 5141 | 5141 | if (!$is_chunked) |
| 5142 | 5142 | { |
| 5143 | 5143 | // Looks like it's not chunked after all |
@@ -5208,9 +5208,9 @@ discard block |
||
| 5208 | 5208 | |
| 5209 | 5209 | public function __set($name, $value) |
| 5210 | 5210 | { |
| 5211 | - if (method_exists($this, 'set_' . $name)) |
|
| 5211 | + if (method_exists($this, 'set_'.$name)) |
|
| 5212 | 5212 | { |
| 5213 | - call_user_func(array($this, 'set_' . $name), $value); |
|
| 5213 | + call_user_func(array($this, 'set_'.$name), $value); |
|
| 5214 | 5214 | } |
| 5215 | 5215 | elseif ( |
| 5216 | 5216 | $name === 'iauthority' |
@@ -5221,7 +5221,7 @@ discard block |
||
| 5221 | 5221 | || $name === 'ifragment' |
| 5222 | 5222 | ) |
| 5223 | 5223 | { |
| 5224 | - call_user_func(array($this, 'set_' . substr($name, 1)), $value); |
|
| 5224 | + call_user_func(array($this, 'set_'.substr($name, 1)), $value); |
|
| 5225 | 5225 | } |
| 5226 | 5226 | } |
| 5227 | 5227 | |
@@ -5244,7 +5244,7 @@ discard block |
||
| 5244 | 5244 | $return = $this->$name; |
| 5245 | 5245 | } |
| 5246 | 5246 | // host -> ihost |
| 5247 | - elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) |
|
| 5247 | + elseif (($prop = 'i'.$name) && array_key_exists($prop, $props)) |
|
| 5248 | 5248 | { |
| 5249 | 5249 | $name = $prop; |
| 5250 | 5250 | $return = $this->$prop; |
@@ -5257,7 +5257,7 @@ discard block |
||
| 5257 | 5257 | } |
| 5258 | 5258 | else |
| 5259 | 5259 | { |
| 5260 | - trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE); |
|
| 5260 | + trigger_error('Undefined property: '.get_class($this).'::'.$name, E_USER_NOTICE); |
|
| 5261 | 5261 | $return = null; |
| 5262 | 5262 | } |
| 5263 | 5263 | if ($return === null && isset($this->normalization[$this->scheme][$name])) |
@@ -5272,7 +5272,7 @@ discard block |
||
| 5272 | 5272 | |
| 5273 | 5273 | public function __isset($name) |
| 5274 | 5274 | { |
| 5275 | - if (method_exists($this, 'get_' . $name) || isset($this->$name)) |
|
| 5275 | + if (method_exists($this, 'get_'.$name) || isset($this->$name)) |
|
| 5276 | 5276 | { |
| 5277 | 5277 | return true; |
| 5278 | 5278 | } |
@@ -5284,9 +5284,9 @@ discard block |
||
| 5284 | 5284 | |
| 5285 | 5285 | public function __unset($name) |
| 5286 | 5286 | { |
| 5287 | - if (method_exists($this, 'set_' . $name)) |
|
| 5287 | + if (method_exists($this, 'set_'.$name)) |
|
| 5288 | 5288 | { |
| 5289 | - call_user_func(array($this, 'set_' . $name), ''); |
|
| 5289 | + call_user_func(array($this, 'set_'.$name), ''); |
|
| 5290 | 5290 | } |
| 5291 | 5291 | } |
| 5292 | 5292 | |
@@ -5339,11 +5339,11 @@ discard block |
||
| 5339 | 5339 | } |
| 5340 | 5340 | elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') |
| 5341 | 5341 | { |
| 5342 | - $target->ipath = '/' . $relative->ipath; |
|
| 5342 | + $target->ipath = '/'.$relative->ipath; |
|
| 5343 | 5343 | } |
| 5344 | 5344 | elseif (($last_segment = strrpos($base->ipath, '/')) !== false) |
| 5345 | 5345 | { |
| 5346 | - $target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath; |
|
| 5346 | + $target->ipath = substr($base->ipath, 0, $last_segment + 1).$relative->ipath; |
|
| 5347 | 5347 | } |
| 5348 | 5348 | else |
| 5349 | 5349 | { |
@@ -5467,7 +5467,7 @@ discard block |
||
| 5467 | 5467 | $input = ''; |
| 5468 | 5468 | } |
| 5469 | 5469 | } |
| 5470 | - return $output . $input; |
|
| 5470 | + return $output.$input; |
|
| 5471 | 5471 | } |
| 5472 | 5472 | |
| 5473 | 5473 | protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) |
@@ -5687,7 +5687,7 @@ discard block |
||
| 5687 | 5687 | { |
| 5688 | 5688 | for ($j = $start; $j <= $i; $j++) |
| 5689 | 5689 | { |
| 5690 | - $string .= '%' . strtoupper($bytes[$j]); |
|
| 5690 | + $string .= '%'.strtoupper($bytes[$j]); |
|
| 5691 | 5691 | } |
| 5692 | 5692 | } |
| 5693 | 5693 | else |
@@ -5705,7 +5705,7 @@ discard block |
||
| 5705 | 5705 | { |
| 5706 | 5706 | for ($j = $start; $j < $len; $j++) |
| 5707 | 5707 | { |
| 5708 | - $string .= '%' . strtoupper($bytes[$j]); |
|
| 5708 | + $string .= '%'.strtoupper($bytes[$j]); |
|
| 5709 | 5709 | } |
| 5710 | 5710 | } |
| 5711 | 5711 | return $string; |
@@ -5906,7 +5906,7 @@ discard block |
||
| 5906 | 5906 | { |
| 5907 | 5907 | if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1))) |
| 5908 | 5908 | { |
| 5909 | - $this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']'; |
|
| 5909 | + $this->ihost = '['.SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)).']'; |
|
| 5910 | 5910 | } |
| 5911 | 5911 | else |
| 5912 | 5912 | { |
@@ -5977,7 +5977,7 @@ discard block |
||
| 5977 | 5977 | $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/'); |
| 5978 | 5978 | $removed = $this->remove_dot_segments($valid); |
| 5979 | 5979 | $cache[$ipath] = array($valid, $removed); |
| 5980 | - $this->ipath = ($this->scheme !== null) ? $removed : $valid; |
|
| 5980 | + $this->ipath = ($this->scheme !== null) ? $removed : $valid; |
|
| 5981 | 5981 | } |
| 5982 | 5982 | $this->scheme_normalization(); |
| 5983 | 5983 | return true; |
@@ -6038,11 +6038,11 @@ discard block |
||
| 6038 | 6038 | $iri = ''; |
| 6039 | 6039 | if ($this->scheme !== null) |
| 6040 | 6040 | { |
| 6041 | - $iri .= $this->scheme . ':'; |
|
| 6041 | + $iri .= $this->scheme.':'; |
|
| 6042 | 6042 | } |
| 6043 | 6043 | if (($iauthority = $this->get_iauthority()) !== null) |
| 6044 | 6044 | { |
| 6045 | - $iri .= '//' . $iauthority; |
|
| 6045 | + $iri .= '//'.$iauthority; |
|
| 6046 | 6046 | } |
| 6047 | 6047 | if ($this->ipath !== '') |
| 6048 | 6048 | { |
@@ -6054,11 +6054,11 @@ discard block |
||
| 6054 | 6054 | } |
| 6055 | 6055 | if ($this->iquery !== null) |
| 6056 | 6056 | { |
| 6057 | - $iri .= '?' . $this->iquery; |
|
| 6057 | + $iri .= '?'.$this->iquery; |
|
| 6058 | 6058 | } |
| 6059 | 6059 | if ($this->ifragment !== null) |
| 6060 | 6060 | { |
| 6061 | - $iri .= '#' . $this->ifragment; |
|
| 6061 | + $iri .= '#'.$this->ifragment; |
|
| 6062 | 6062 | } |
| 6063 | 6063 | return $iri; |
| 6064 | 6064 | } |
@@ -6075,7 +6075,7 @@ discard block |
||
| 6075 | 6075 | $iauthority = ''; |
| 6076 | 6076 | if ($this->iuserinfo !== null) |
| 6077 | 6077 | { |
| 6078 | - $iauthority .= $this->iuserinfo . '@'; |
|
| 6078 | + $iauthority .= $this->iuserinfo.'@'; |
|
| 6079 | 6079 | } |
| 6080 | 6080 | if ($this->ihost !== null) |
| 6081 | 6081 | { |
@@ -6083,7 +6083,7 @@ discard block |
||
| 6083 | 6083 | } |
| 6084 | 6084 | if ($this->port !== null) |
| 6085 | 6085 | { |
| 6086 | - $iauthority .= ':' . $this->port; |
|
| 6086 | + $iauthority .= ':'.$this->port; |
|
| 6087 | 6087 | } |
| 6088 | 6088 | return $iauthority; |
| 6089 | 6089 | } |
@@ -6201,7 +6201,7 @@ discard block |
||
| 6201 | 6201 | } |
| 6202 | 6202 | if ($this->get_permalink() !== null || $this->get_title() !== null) |
| 6203 | 6203 | { |
| 6204 | - return md5($this->get_permalink() . $this->get_title()); |
|
| 6204 | + return md5($this->get_permalink().$this->get_title()); |
|
| 6205 | 6205 | } |
| 6206 | 6206 | else |
| 6207 | 6207 | { |
@@ -6787,19 +6787,19 @@ discard block |
||
| 6787 | 6787 | { |
| 6788 | 6788 | if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key))) |
| 6789 | 6789 | { |
| 6790 | - if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key])) |
|
| 6790 | + if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key])) |
|
| 6791 | 6791 | { |
| 6792 | - $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]); |
|
| 6793 | - $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]; |
|
| 6792 | + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]); |
|
| 6793 | + $this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]; |
|
| 6794 | 6794 | } |
| 6795 | 6795 | else |
| 6796 | 6796 | { |
| 6797 | - $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key]; |
|
| 6797 | + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key]; |
|
| 6798 | 6798 | } |
| 6799 | 6799 | } |
| 6800 | 6800 | elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY) |
| 6801 | 6801 | { |
| 6802 | - $this->data['links'][substr($key, 41)] =& $this->data['links'][$key]; |
|
| 6802 | + $this->data['links'][substr($key, 41)] = & $this->data['links'][$key]; |
|
| 6803 | 6803 | } |
| 6804 | 6804 | $this->data['links'][$key] = array_unique($this->data['links'][$key]); |
| 6805 | 6805 | } |
@@ -7456,7 +7456,7 @@ discard block |
||
| 7456 | 7456 | // If we have media:group tags, loop through them. |
| 7457 | 7457 | foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group) |
| 7458 | 7458 | { |
| 7459 | - if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'])) |
|
| 7459 | + if (isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'])) |
|
| 7460 | 7460 | { |
| 7461 | 7461 | // If we have media:content tags, loop through them. |
| 7462 | 7462 | foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content) |
@@ -8918,11 +8918,11 @@ discard block |
||
| 8918 | 8918 | $seconds = $remainder % 60; |
| 8919 | 8919 | if ($minutes < 10 && $hours > 0) |
| 8920 | 8920 | { |
| 8921 | - $minutes = '0' . $minutes; |
|
| 8921 | + $minutes = '0'.$minutes; |
|
| 8922 | 8922 | } |
| 8923 | 8923 | if ($seconds < 10) |
| 8924 | 8924 | { |
| 8925 | - $seconds = '0' . $seconds; |
|
| 8925 | + $seconds = '0'.$seconds; |
|
| 8926 | 8926 | } |
| 8927 | 8927 | $time .= $minutes.':'; |
| 8928 | 8928 | $time .= $seconds; |
@@ -8942,7 +8942,7 @@ discard block |
||
| 8942 | 8942 | { |
| 8943 | 8943 | $return = array(); |
| 8944 | 8944 | $name = preg_quote($realname, '/'); |
| 8945 | - if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) |
|
| 8945 | + if (preg_match_all("/<($name)".SIMPLEPIE_PCRE_HTML_ATTRIBUTE."(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) |
|
| 8946 | 8946 | { |
| 8947 | 8947 | for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++) |
| 8948 | 8948 | { |
@@ -8959,7 +8959,7 @@ discard block |
||
| 8959 | 8959 | $return[$i]['content'] = $matches[$i][4][0]; |
| 8960 | 8960 | } |
| 8961 | 8961 | $return[$i]['attribs'] = array(); |
| 8962 | - 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)) |
|
| 8962 | + 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)) |
|
| 8963 | 8963 | { |
| 8964 | 8964 | for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++) |
| 8965 | 8965 | { |
@@ -8980,7 +8980,7 @@ discard block |
||
| 8980 | 8980 | foreach ($element['attribs'] as $key => $value) |
| 8981 | 8981 | { |
| 8982 | 8982 | $key = strtolower($key); |
| 8983 | - $full .= " $key=\"" . htmlspecialchars($value['data']) . '"'; |
|
| 8983 | + $full .= " $key=\"".htmlspecialchars($value['data']).'"'; |
|
| 8984 | 8984 | } |
| 8985 | 8985 | if ($element['self_closing']) |
| 8986 | 8986 | { |
@@ -10279,7 +10279,7 @@ discard block |
||
| 10279 | 10279 | $data = ''; |
| 10280 | 10280 | } |
| 10281 | 10281 | } |
| 10282 | - return $output . $data; |
|
| 10282 | + return $output.$data; |
|
| 10283 | 10283 | } |
| 10284 | 10284 | public static function parse_date($dt) |
| 10285 | 10285 | { |
@@ -10464,15 +10464,15 @@ discard block |
||
| 10464 | 10464 | } |
| 10465 | 10465 | else if ($codepoint <= 0x7ff) |
| 10466 | 10466 | { |
| 10467 | - return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f)); |
|
| 10467 | + return chr(0xc0 | ($codepoint >> 6)).chr(0x80 | ($codepoint & 0x3f)); |
|
| 10468 | 10468 | } |
| 10469 | 10469 | else if ($codepoint <= 0xffff) |
| 10470 | 10470 | { |
| 10471 | - return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f)); |
|
| 10471 | + return chr(0xe0 | ($codepoint >> 12)).chr(0x80 | (($codepoint >> 6) & 0x3f)).chr(0x80 | ($codepoint & 0x3f)); |
|
| 10472 | 10472 | } |
| 10473 | 10473 | else if ($codepoint <= 0x10ffff) |
| 10474 | 10474 | { |
| 10475 | - return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f)); |
|
| 10475 | + return chr(0xf0 | ($codepoint >> 18)).chr(0x80 | (($codepoint >> 12) & 0x3f)).chr(0x80 | (($codepoint >> 6) & 0x3f)).chr(0x80 | ($codepoint & 0x3f)); |
|
| 10476 | 10476 | } |
| 10477 | 10477 | else |
| 10478 | 10478 | { |
@@ -10607,7 +10607,7 @@ discard block |
||
| 10607 | 10607 | } |
| 10608 | 10608 | header('Content-type: text/javascript; charset: UTF-8'); |
| 10609 | 10609 | header('Cache-Control: must-revalidate'); |
| 10610 | - header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days |
|
| 10610 | + header('Expires: '.gmdate('D, d M Y H:i:s', time() + 604800).' GMT'); // 7 days |
|
| 10611 | 10611 | ?> |
| 10612 | 10612 | function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) { |
| 10613 | 10613 | if (placeholder != '') { |
@@ -10632,14 +10632,14 @@ discard block |
||
| 10632 | 10632 | public static function get_build() |
| 10633 | 10633 | { |
| 10634 | 10634 | $root = dirname(dirname(__FILE__)); |
| 10635 | - if (file_exists($root . '/.git/index')) |
|
| 10635 | + if (file_exists($root.'/.git/index')) |
|
| 10636 | 10636 | { |
| 10637 | - return filemtime($root . '/.git/index'); |
|
| 10637 | + return filemtime($root.'/.git/index'); |
|
| 10638 | 10638 | } |
| 10639 | - elseif (file_exists($root . '/SimplePie')) |
|
| 10639 | + elseif (file_exists($root.'/SimplePie')) |
|
| 10640 | 10640 | { |
| 10641 | 10641 | $time = 0; |
| 10642 | - foreach (glob($root . '/SimplePie/*.php') as $file) |
|
| 10642 | + foreach (glob($root.'/SimplePie/*.php') as $file) |
|
| 10643 | 10643 | { |
| 10644 | 10644 | if (($mtime = filemtime($file)) > $time) |
| 10645 | 10645 | { |
@@ -10648,9 +10648,9 @@ discard block |
||
| 10648 | 10648 | } |
| 10649 | 10649 | return $time; |
| 10650 | 10650 | } |
| 10651 | - elseif (file_exists(dirname(__FILE__) . '/Core.php')) |
|
| 10651 | + elseif (file_exists(dirname(__FILE__).'/Core.php')) |
|
| 10652 | 10652 | { |
| 10653 | - return filemtime(dirname(__FILE__) . '/Core.php'); |
|
| 10653 | + return filemtime(dirname(__FILE__).'/Core.php'); |
|
| 10654 | 10654 | } |
| 10655 | 10655 | else |
| 10656 | 10656 | { |
@@ -10660,11 +10660,11 @@ discard block |
||
| 10660 | 10660 | |
| 10661 | 10661 | public static function debug(&$sp) |
| 10662 | 10662 | { |
| 10663 | - $info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n"; |
|
| 10664 | - $info .= 'PHP ' . PHP_VERSION . "\n"; |
|
| 10663 | + $info = 'SimplePie '.SIMPLEPIE_VERSION.' Build '.SIMPLEPIE_BUILD."\n"; |
|
| 10664 | + $info .= 'PHP '.PHP_VERSION."\n"; |
|
| 10665 | 10665 | if ($sp->error() !== null) |
| 10666 | 10666 | { |
| 10667 | - $info .= 'Error occurred: ' . $sp->error() . "\n"; |
|
| 10667 | + $info .= 'Error occurred: '.$sp->error()."\n"; |
|
| 10668 | 10668 | } |
| 10669 | 10669 | else |
| 10670 | 10670 | { |
@@ -10680,20 +10680,20 @@ discard block |
||
| 10680 | 10680 | switch ($ext) |
| 10681 | 10681 | { |
| 10682 | 10682 | case 'pcre': |
| 10683 | - $info .= ' Version ' . PCRE_VERSION . "\n"; |
|
| 10683 | + $info .= ' Version '.PCRE_VERSION."\n"; |
|
| 10684 | 10684 | break; |
| 10685 | 10685 | case 'curl': |
| 10686 | 10686 | $version = curl_version(); |
| 10687 | - $info .= ' Version ' . $version['version'] . "\n"; |
|
| 10687 | + $info .= ' Version '.$version['version']."\n"; |
|
| 10688 | 10688 | break; |
| 10689 | 10689 | case 'mbstring': |
| 10690 | - $info .= ' Overloading: ' . mb_get_info('func_overload') . "\n"; |
|
| 10690 | + $info .= ' Overloading: '.mb_get_info('func_overload')."\n"; |
|
| 10691 | 10691 | break; |
| 10692 | 10692 | case 'iconv': |
| 10693 | - $info .= ' Version ' . ICONV_VERSION . "\n"; |
|
| 10693 | + $info .= ' Version '.ICONV_VERSION."\n"; |
|
| 10694 | 10694 | break; |
| 10695 | 10695 | case 'xml': |
| 10696 | - $info .= ' Version ' . LIBXML_DOTTED_VERSION . "\n"; |
|
| 10696 | + $info .= ' Version '.LIBXML_DOTTED_VERSION."\n"; |
|
| 10697 | 10697 | break; |
| 10698 | 10698 | } |
| 10699 | 10699 | } |
@@ -10759,7 +10759,7 @@ discard block |
||
| 10759 | 10759 | // xxx::xxx |
| 10760 | 10760 | else |
| 10761 | 10761 | { |
| 10762 | - $fill = ':' . str_repeat('0:', 6 - $c2 - $c1); |
|
| 10762 | + $fill = ':'.str_repeat('0:', 6 - $c2 - $c1); |
|
| 10763 | 10763 | $ip = str_replace('::', $fill, $ip); |
| 10764 | 10764 | } |
| 10765 | 10765 | } |
@@ -11299,8 +11299,8 @@ discard block |
||
| 11299 | 11299 | |
| 11300 | 11300 | public function __construct() |
| 11301 | 11301 | { |
| 11302 | - $this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')'; |
|
| 11303 | - $this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')'; |
|
| 11302 | + $this->day_pcre = '('.implode(array_keys($this->day), '|').')'; |
|
| 11303 | + $this->month_pcre = '('.implode(array_keys($this->month), '|').')'; |
|
| 11304 | 11304 | static $cache; |
| 11305 | 11305 | if (!isset($cache[get_class($this)])) |
| 11306 | 11306 | { |
@@ -11369,7 +11369,7 @@ discard block |
||
| 11369 | 11369 | $month = $day = $hour = $minute = $second = '([0-9]{2})'; |
| 11370 | 11370 | $decimal = '([0-9]*)'; |
| 11371 | 11371 | $zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))'; |
| 11372 | - $pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/'; |
|
| 11372 | + $pcre = '/^'.$year.'(?:-?'.$month.'(?:-?'.$day.'(?:[Tt\x09\x20]+'.$hour.'(?::?'.$minute.'(?::?'.$second.'(?:.'.$decimal.')?)?)?'.$zone.')?)?)?$/'; |
|
| 11373 | 11373 | } |
| 11374 | 11374 | if (preg_match($pcre, $date, $match)) |
| 11375 | 11375 | { |
@@ -11476,8 +11476,8 @@ discard block |
||
| 11476 | 11476 | if (!$pcre) |
| 11477 | 11477 | { |
| 11478 | 11478 | $wsp = '[\x09\x20]'; |
| 11479 | - $fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)'; |
|
| 11480 | - $optional_fws = $fws . '?'; |
|
| 11479 | + $fws = '(?:'.$wsp.'+|'.$wsp.'*(?:\x0D\x0A'.$wsp.'+)+)'; |
|
| 11480 | + $optional_fws = $fws.'?'; |
|
| 11481 | 11481 | $day_name = $this->day_pcre; |
| 11482 | 11482 | $month = $this->month_pcre; |
| 11483 | 11483 | $day = '([0-9]{1,2})'; |
@@ -11485,8 +11485,8 @@ discard block |
||
| 11485 | 11485 | $year = '([0-9]{2,4})'; |
| 11486 | 11486 | $num_zone = '([+\-])([0-9]{2})([0-9]{2})'; |
| 11487 | 11487 | $character_zone = '([A-Z]{1,5})'; |
| 11488 | - $zone = '(?:' . $num_zone . '|' . $character_zone . ')'; |
|
| 11489 | - $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'; |
|
| 11488 | + $zone = '(?:'.$num_zone.'|'.$character_zone.')'; |
|
| 11489 | + $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'; |
|
| 11490 | 11490 | } |
| 11491 | 11491 | if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match)) |
| 11492 | 11492 | { |
@@ -11563,7 +11563,7 @@ discard block |
||
| 11563 | 11563 | $day = '([0-9]{1,2})'; |
| 11564 | 11564 | $year = $hour = $minute = $second = '([0-9]{2})'; |
| 11565 | 11565 | $zone = '([A-Z]{1,5})'; |
| 11566 | - $pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i'; |
|
| 11566 | + $pcre = '/^'.$day_name.','.$space.$day.'-'.$month.'-'.$year.$space.$hour.':'.$minute.':'.$second.$space.$zone.'$/i'; |
|
| 11567 | 11567 | } |
| 11568 | 11568 | if (preg_match($pcre, $date, $match)) |
| 11569 | 11569 | { |
@@ -11619,7 +11619,7 @@ discard block |
||
| 11619 | 11619 | $hour = $sec = $min = '([0-9]{2})'; |
| 11620 | 11620 | $year = '([0-9]{4})'; |
| 11621 | 11621 | $terminator = '\x0A?\x00?'; |
| 11622 | - $pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i'; |
|
| 11622 | + $pcre = '/^'.$wday_name.$space.$mon_name.$space.$day.$space.$hour.':'.$min.':'.$sec.$space.$year.$terminator.'$/i'; |
|
| 11623 | 11623 | } |
| 11624 | 11624 | if (preg_match($pcre, $date, $match)) |
| 11625 | 11625 | { |
@@ -11720,7 +11720,7 @@ discard block |
||
| 11720 | 11720 | if ($declaration->parse()) |
| 11721 | 11721 | { |
| 11722 | 11722 | $data = substr($data, $pos + 2); |
| 11723 | - $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data; |
|
| 11723 | + $data = '<?xml version="'.$declaration->version.'" encoding="'.$encoding.'" standalone="'.(($declaration->standalone) ? 'yes' : 'no').'"?>'.$data; |
|
| 11724 | 11724 | } |
| 11725 | 11725 | else |
| 11726 | 11726 | { |
@@ -11771,7 +11771,7 @@ discard block |
||
| 11771 | 11771 | case constant('XMLReader::END_ELEMENT'): |
| 11772 | 11772 | if ($xml->namespaceURI !== '') |
| 11773 | 11773 | { |
| 11774 | - $tagName = $xml->namespaceURI . $this->separator . $xml->localName; |
|
| 11774 | + $tagName = $xml->namespaceURI.$this->separator.$xml->localName; |
|
| 11775 | 11775 | } |
| 11776 | 11776 | else |
| 11777 | 11777 | { |
@@ -11783,7 +11783,7 @@ discard block |
||
| 11783 | 11783 | $empty = $xml->isEmptyElement; |
| 11784 | 11784 | if ($xml->namespaceURI !== '') |
| 11785 | 11785 | { |
| 11786 | - $tagName = $xml->namespaceURI . $this->separator . $xml->localName; |
|
| 11786 | + $tagName = $xml->namespaceURI.$this->separator.$xml->localName; |
|
| 11787 | 11787 | } |
| 11788 | 11788 | else |
| 11789 | 11789 | { |
@@ -11794,7 +11794,7 @@ discard block |
||
| 11794 | 11794 | { |
| 11795 | 11795 | if ($xml->namespaceURI !== '') |
| 11796 | 11796 | { |
| 11797 | - $attrName = $xml->namespaceURI . $this->separator . $xml->localName; |
|
| 11797 | + $attrName = $xml->namespaceURI.$this->separator.$xml->localName; |
|
| 11798 | 11798 | } |
| 11799 | 11799 | else |
| 11800 | 11800 | { |
@@ -11888,12 +11888,12 @@ discard block |
||
| 11888 | 11888 | $this->current_xhtml_construct++; |
| 11889 | 11889 | if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML) |
| 11890 | 11890 | { |
| 11891 | - $this->data['data'] .= '<' . end($this->element); |
|
| 11891 | + $this->data['data'] .= '<'.end($this->element); |
|
| 11892 | 11892 | if (isset($attribs[''])) |
| 11893 | 11893 | { |
| 11894 | 11894 | foreach ($attribs[''] as $name => $value) |
| 11895 | 11895 | { |
| 11896 | - $this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"'; |
|
| 11896 | + $this->data['data'] .= ' '.$name.'="'.htmlspecialchars($value, ENT_COMPAT, $this->encoding).'"'; |
|
| 11897 | 11897 | } |
| 11898 | 11898 | } |
| 11899 | 11899 | $this->data['data'] .= '>'; |
@@ -11901,8 +11901,8 @@ discard block |
||
| 11901 | 11901 | } |
| 11902 | 11902 | else |
| 11903 | 11903 | { |
| 11904 | - $this->datas[] =& $this->data; |
|
| 11905 | - $this->data =& $this->data['child'][end($this->namespace)][end($this->element)][]; |
|
| 11904 | + $this->datas[] = & $this->data; |
|
| 11905 | + $this->data = & $this->data['child'][end($this->namespace)][end($this->element)][]; |
|
| 11906 | 11906 | $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)); |
| 11907 | 11907 | 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') |
| 11908 | 11908 | || (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 @@ discard block |
||
| 11932 | 11932 | $this->current_xhtml_construct--; |
| 11933 | 11933 | 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'))) |
| 11934 | 11934 | { |
| 11935 | - $this->data['data'] .= '</' . end($this->element) . '>'; |
|
| 11935 | + $this->data['data'] .= '</'.end($this->element).'>'; |
|
| 11936 | 11936 | } |
| 11937 | 11937 | } |
| 11938 | 11938 | if ($this->current_xhtml_construct === -1) |
| 11939 | 11939 | { |
| 11940 | - $this->data =& $this->datas[count($this->datas) - 1]; |
|
| 11940 | + $this->data = & $this->datas[count($this->datas) - 1]; |
|
| 11941 | 11941 | array_pop($this->datas); |
| 11942 | 11942 | } |
| 11943 | 11943 | array_pop($this->element); |
@@ -11969,7 +11969,7 @@ discard block |
||
| 11969 | 11969 | $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 || |
| 11970 | 11970 | $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 || |
| 11971 | 11971 | $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 || |
| 11972 | - $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 ) |
|
| 11972 | + $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5) |
|
| 11973 | 11973 | { |
| 11974 | 11974 | $namespace = SIMPLEPIE_NAMESPACE_MEDIARSS; |
| 11975 | 11975 | } |
@@ -12345,7 +12345,7 @@ discard block |
||
| 12345 | 12345 | { |
| 12346 | 12346 | if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML) |
| 12347 | 12347 | { |
| 12348 | - 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)) |
|
| 12348 | + 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)) |
|
| 12349 | 12349 | { |
| 12350 | 12350 | $type |= SIMPLEPIE_CONSTRUCT_HTML; |
| 12351 | 12351 | } |
@@ -12411,7 +12411,7 @@ discard block |
||
| 12411 | 12411 | $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $image_url, 'spi')); |
| 12412 | 12412 | if ($cache->load()) |
| 12413 | 12413 | { |
| 12414 | - $img->setAttribute('src', $this->image_handler . $image_url); |
|
| 12414 | + $img->setAttribute('src', $this->image_handler.$image_url); |
|
| 12415 | 12415 | } |
| 12416 | 12416 | else |
| 12417 | 12417 | { |
@@ -12421,7 +12421,7 @@ discard block |
||
| 12421 | 12421 | { |
| 12422 | 12422 | if ($cache->save(array('headers' => $file->headers, 'body' => $file->body))) |
| 12423 | 12423 | { |
| 12424 | - $img->setAttribute('src', $this->image_handler . $image_url); |
|
| 12424 | + $img->setAttribute('src', $this->image_handler.$image_url); |
|
| 12425 | 12425 | } |
| 12426 | 12426 | else |
| 12427 | 12427 | { |
@@ -12445,12 +12445,12 @@ discard block |
||
| 12445 | 12445 | $data = trim($document->saveHTML()); |
| 12446 | 12446 | if ($this->remove_div) |
| 12447 | 12447 | { |
| 12448 | - $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data); |
|
| 12448 | + $data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '', $data); |
|
| 12449 | 12449 | $data = preg_replace('/<\/div>$/', '', $data); |
| 12450 | 12450 | } |
| 12451 | 12451 | else |
| 12452 | 12452 | { |
| 12453 | - $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data); |
|
| 12453 | + $data = preg_replace('/^<div'.SIMPLEPIE_PCRE_XML_ATTRIBUTE.'>/', '<div>', $data); |
|
| 12454 | 12454 | } |
| 12455 | 12455 | } |
| 12456 | 12456 | if ($type & SIMPLEPIE_CONSTRUCT_IRI) |
@@ -12479,7 +12479,7 @@ discard block |
||
| 12479 | 12479 | { |
| 12480 | 12480 | // Atom XHTML constructs are wrapped with a div by default |
| 12481 | 12481 | // Note: No protection if $html contains a stray </div>! |
| 12482 | - $html = '<div>' . $html . '</div>'; |
|
| 12482 | + $html = '<div>'.$html.'</div>'; |
|
| 12483 | 12483 | $ret .= '<!DOCTYPE html>'; |
| 12484 | 12484 | $content_type = 'text/html'; |
| 12485 | 12485 | } |
@@ -12489,8 +12489,8 @@ discard block |
||
| 12489 | 12489 | $content_type = 'application/xhtml+xml'; |
| 12490 | 12490 | } |
| 12491 | 12491 | $ret .= '<html><head>'; |
| 12492 | - $ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />'; |
|
| 12493 | - $ret .= '</head><body>' . $html . '</body></html>'; |
|
| 12492 | + $ret .= '<meta http-equiv="Content-Type" content="'.$content_type.'; charset=utf-8" />'; |
|
| 12493 | + $ret .= '</head><body>'.$html.'</body></html>'; |
|
| 12494 | 12494 | return $ret; |
| 12495 | 12495 | } |
| 12496 | 12496 | public function replace_urls($document, $tag, $attributes) |
@@ -12545,7 +12545,7 @@ discard block |
||
| 12545 | 12545 | protected function strip_tag($tag, $document, $type) |
| 12546 | 12546 | { |
| 12547 | 12547 | $xpath = new DOMXPath($document); |
| 12548 | - $elements = $xpath->query('body//' . $tag); |
|
| 12548 | + $elements = $xpath->query('body//'.$tag); |
|
| 12549 | 12549 | if ($this->encode_instead_of_strip) |
| 12550 | 12550 | { |
| 12551 | 12551 | foreach ($elements as $element) |
@@ -12554,7 +12554,7 @@ discard block |
||
| 12554 | 12554 | // For elements which aren't script or style, include the tag itself |
| 12555 | 12555 | if (!in_array($tag, array('script', 'style'))) |
| 12556 | 12556 | { |
| 12557 | - $text = '<' . $tag; |
|
| 12557 | + $text = '<'.$tag; |
|
| 12558 | 12558 | if ($element->hasAttributes()) |
| 12559 | 12559 | { |
| 12560 | 12560 | $attrs = array(); |
@@ -12573,9 +12573,9 @@ discard block |
||
| 12573 | 12573 | continue; |
| 12574 | 12574 | } |
| 12575 | 12575 | // Standard attribute text |
| 12576 | - $attrs[] = $name . '="' . $attr->value . '"'; |
|
| 12576 | + $attrs[] = $name.'="'.$attr->value.'"'; |
|
| 12577 | 12577 | } |
| 12578 | - $text .= ' ' . implode(' ', $attrs); |
|
| 12578 | + $text .= ' '.implode(' ', $attrs); |
|
| 12579 | 12579 | } |
| 12580 | 12580 | $text .= '>'; |
| 12581 | 12581 | $fragment->appendChild(new DOMText($text)); |
@@ -12588,7 +12588,7 @@ discard block |
||
| 12588 | 12588 | } |
| 12589 | 12589 | if (!in_array($tag, array('script', 'style'))) |
| 12590 | 12590 | { |
| 12591 | - $fragment->appendChild(new DOMText('</' . $tag . '>')); |
|
| 12591 | + $fragment->appendChild(new DOMText('</'.$tag.'>')); |
|
| 12592 | 12592 | } |
| 12593 | 12593 | $element->parentNode->replaceChild($fragment, $element); |
| 12594 | 12594 | } |
@@ -12620,7 +12620,7 @@ discard block |
||
| 12620 | 12620 | protected function strip_attr($attrib, $document) |
| 12621 | 12621 | { |
| 12622 | 12622 | $xpath = new DOMXPath($document); |
| 12623 | - $elements = $xpath->query('//*[@' . $attrib . ']'); |
|
| 12623 | + $elements = $xpath->query('//*[@'.$attrib.']'); |
|
| 12624 | 12624 | foreach ($elements as $element) |
| 12625 | 12625 | { |
| 12626 | 12626 | $element->removeAttribute($attrib); |
@@ -12978,19 +12978,19 @@ discard block |
||
| 12978 | 12978 | { |
| 12979 | 12979 | if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key))) |
| 12980 | 12980 | { |
| 12981 | - if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key])) |
|
| 12981 | + if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key])) |
|
| 12982 | 12982 | { |
| 12983 | - $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]); |
|
| 12984 | - $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]; |
|
| 12983 | + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]); |
|
| 12984 | + $this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]; |
|
| 12985 | 12985 | } |
| 12986 | 12986 | else |
| 12987 | 12987 | { |
| 12988 | - $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key]; |
|
| 12988 | + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key]; |
|
| 12989 | 12989 | } |
| 12990 | 12990 | } |
| 12991 | 12991 | elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY) |
| 12992 | 12992 | { |
| 12993 | - $this->data['links'][substr($key, 41)] =& $this->data['links'][$key]; |
|
| 12993 | + $this->data['links'][substr($key, 41)] = & $this->data['links'][$key]; |
|
| 12994 | 12994 | } |
| 12995 | 12995 | $this->data['links'][$key] = array_unique($this->data['links'][$key]); |
| 12996 | 12996 | } |
@@ -26,12 +26,12 @@ |
||
| 26 | 26 | public function getFeed() { |
| 27 | 27 | $html = '<article>'; |
| 28 | 28 | $html .= "<h1>Senaste nytt från IDG</h1>"; |
| 29 | - foreach($this->object->get_items() as $content) { |
|
| 29 | + foreach ($this->object->get_items() as $content) { |
|
| 30 | 30 | $html .= '<div class="feed-content">'; |
| 31 | - $html .= "<h2>" . $content->get_title() . "</h2>" ; |
|
| 32 | - $html .= "<small>Postad ". $content->get_date('Y-m-d | H:i:s')."</small>"; |
|
| 31 | + $html .= "<h2>".$content->get_title()."</h2>"; |
|
| 32 | + $html .= "<small>Postad ".$content->get_date('Y-m-d | H:i:s')."</small>"; |
|
| 33 | 33 | $html .= "<p>{$content->get_content()}</p>"; |
| 34 | - $html .= "<p><a href='" . $content->get_permalink() . "'>Läs mer</a>"; |
|
| 34 | + $html .= "<p><a href='".$content->get_permalink()."'>Läs mer</a>"; |
|
| 35 | 35 | $html .= '</div>'; |
| 36 | 36 | } |
| 37 | 37 | $html .= "</article>"; |
