@@ -38,9 +38,9 @@ discard block |
||
38 | 38 | if (!defined('planet_FUNCTIONS')): |
39 | 39 | define('planet_FUNCTIONS', 1); |
40 | 40 | |
41 | - require XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/vars.php'; |
|
42 | - require_once XOOPS_ROOT_PATH . '/class/xoopslists.php'; |
|
43 | - require_once XOOPS_ROOT_PATH . '/Frameworks/art/functions.php'; |
|
41 | + require XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/include/vars.php'; |
|
42 | + require_once XOOPS_ROOT_PATH.'/class/xoopslists.php'; |
|
43 | + require_once XOOPS_ROOT_PATH.'/Frameworks/art/functions.php'; |
|
44 | 44 | |
45 | 45 | /** |
46 | 46 | * Class PlanetUtility |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | */ |
76 | 76 | public static function planetParseArguments(&$args_numeric, &$args, &$args_string) |
77 | 77 | { |
78 | - $args_abb = [ |
|
78 | + $args_abb = [ |
|
79 | 79 | 'a' => 'article', |
80 | 80 | 'b' => 'blog', |
81 | 81 | 'c' => 'category', |
@@ -90,24 +90,24 @@ discard block |
||
90 | 90 | if (preg_match("/[^\?]*\.php[\/|\?]([^\?]*)/i", Request::getUrl('REQUEST_URI', '', 'SERVER'), $matches)) { |
91 | 91 | $vars = preg_split("/[\/|&]/", $matches[1]); |
92 | 92 | $vars = array_map('trim', $vars); |
93 | - if (count($vars) > 0) { |
|
93 | + if (count($vars)>0) { |
|
94 | 94 | foreach ($vars as $var) { |
95 | 95 | if (is_numeric($var)) { |
96 | 96 | $args_numeric[] = $var; |
97 | 97 | } elseif (false === strpos($var, '=')) { |
98 | 98 | if (is_numeric(substr($var, 1))) { |
99 | - $args[$args_abb[strtolower($var{0})]] = (int)substr($var, 1); |
|
100 | - } else { |
|
99 | + $args[$args_abb[strtolower($var{0})]] = (int) substr($var, 1); |
|
100 | + }else { |
|
101 | 101 | $args_string[] = urldecode($var); |
102 | 102 | } |
103 | - } else { |
|
103 | + }else { |
|
104 | 104 | parse_str($var, $args); |
105 | 105 | } |
106 | 106 | } |
107 | 107 | } |
108 | 108 | } |
109 | 109 | |
110 | - return (0 == count($args) + count($args_numeric) + count($args_string)) ? null : true; |
|
110 | + return (0 == count($args)+count($args_numeric)+count($args_string)) ? null : true; |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $pattern = [$pattern]; |
131 | 131 | $replacement = [$replacement]; |
132 | 132 | } |
133 | - if (is_array($pattern) && count($pattern) > 0) { |
|
133 | + if (is_array($pattern) && count($pattern)>0) { |
|
134 | 134 | $ii = 0; |
135 | 135 | foreach ($pattern as $pat) { |
136 | 136 | if (!in_array($pat, $patterns)) { |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | $pattern = [$pattern]; |
167 | 167 | $replacement = [$replacement]; |
168 | 168 | } |
169 | - if (is_array($pattern) && count($pattern) > 0) { |
|
169 | + if (is_array($pattern) && count($pattern)>0) { |
|
170 | 170 | $ii = 0; |
171 | 171 | foreach ($pattern as $pat) { |
172 | 172 | if (!in_array($pat, $patterns)) { |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | if (!is_array($userid)) { |
210 | 210 | $userid = [$userid]; |
211 | 211 | } |
212 | - $users =& mod_getUnameFromIds($userid, $usereal, $linked); |
|
212 | + $users = & mod_getUnameFromIds($userid, $usereal, $linked); |
|
213 | 213 | |
214 | 214 | return $users; |
215 | 215 | } |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | $myts = MyTextSanitizer::getInstance(); |
227 | 227 | $link_array = preg_split("/(\r\n|\r|\n)( *)/", $text); |
228 | 228 | $links = []; |
229 | - if (count($link_array) > 0) { |
|
229 | + if (count($link_array)>0) { |
|
230 | 230 | foreach ($link_array as $link) { |
231 | 231 | @list($url, $title) = array_map('trim', preg_split('/ /', $link, 2)); |
232 | 232 | if (empty($url)) { |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | */ |
247 | 247 | public static function planetGetTemplate($pagename) |
248 | 248 | { |
249 | - return $GLOBALS['VAR_PREFIX'] . '_' . $pagename . '.tpl'; |
|
249 | + return $GLOBALS['VAR_PREFIX'].'_'.$pagename.'.tpl'; |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | /** |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | } |
276 | 276 | |
277 | 277 | @list($pat, $rep) = array_map('trim', preg_split("#[\s]+#", $pattern)); |
278 | - $trackback_url = preg_replace('#' . $pat . '#', $rep, $article_obj->getVar('art_link')); |
|
278 | + $trackback_url = preg_replace('#'.$pat.'#', $rep, $article_obj->getVar('art_link')); |
|
279 | 279 | |
280 | 280 | return static::planetTrackback($trackback_url, $article); |
281 | 281 | } |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | |
292 | 292 | $title = $article->getVar('art_title'); |
293 | 293 | $excerpt = $article->getVar('art_content'); |
294 | - $blog_name = $xoopsConfig['sitename'] . '-' . $xoopsModule->getVar('name'); |
|
294 | + $blog_name = $xoopsConfig['sitename'].'-'.$xoopsModule->getVar('name'); |
|
295 | 295 | $title = xoops_utf8_encode($title); |
296 | 296 | $excerpt = xoops_utf8_encode($excerpt); |
297 | 297 | $blog_name = xoops_utf8_encode($blog_name); |
@@ -299,15 +299,15 @@ discard block |
||
299 | 299 | $title1 = urlencode($title); |
300 | 300 | $excerpt1 = urlencode($excerpt); |
301 | 301 | $name1 = urlencode($blog_name); |
302 | - $url = urlencode(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article->getVar('art_id')); |
|
302 | + $url = urlencode(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article->getVar('art_id')); |
|
303 | 303 | $query_string = "title=$title1&url=$url&blog_name=$name1&excerpt=$excerpt1&charset=$charset"; |
304 | 304 | $trackback_url = parse_url($trackback_url); |
305 | 305 | |
306 | - $http_request = 'POST ' . $trackback_url['path'] . ($trackback_url['query'] ? '?' . $trackback_url['query'] : '') . " HTTP/1.0\r\n"; |
|
307 | - $http_request .= 'Host: ' . $trackback_url['host'] . "\r\n"; |
|
308 | - $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . $charset . "\r\n"; |
|
309 | - $http_request .= 'Content-Length: ' . strlen($query_string) . "\r\n"; |
|
310 | - $http_request .= 'User-Agent: XOOPS Blogs/' . XOOPS_VERSION; |
|
306 | + $http_request = 'POST '.$trackback_url['path'].($trackback_url['query'] ? '?'.$trackback_url['query'] : '')." HTTP/1.0\r\n"; |
|
307 | + $http_request .= 'Host: '.$trackback_url['host']."\r\n"; |
|
308 | + $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset='.$charset."\r\n"; |
|
309 | + $http_request .= 'Content-Length: '.strlen($query_string)."\r\n"; |
|
310 | + $http_request .= 'User-Agent: XOOPS Blogs/'.XOOPS_VERSION; |
|
311 | 311 | $http_request .= "\r\n\r\n"; |
312 | 312 | $http_request .= $query_string; |
313 | 313 | if ('' == $trackback_url['port']) { |
@@ -316,11 +316,11 @@ discard block |
||
316 | 316 | $fs = @fsockopen($trackback_url['host'], $trackback_url['port'], $errno, $errstr, 4); |
317 | 317 | @fwrite($fs, $http_request); |
318 | 318 | if ($xoopsModuleConfig['do_debug']) { |
319 | - $debug_file = XOOPS_CACHE_PATH . '/' . $GLOBALS['moddirname'] . '_trackback.log'; |
|
319 | + $debug_file = XOOPS_CACHE_PATH.'/'.$GLOBALS['moddirname'].'_trackback.log'; |
|
320 | 320 | $fr = "\n*****\nRequest:\n\n$http_request\n\nResponse:\n\n"; |
321 | 321 | $fr .= "CHARSET:$charset\n"; |
322 | 322 | $fr .= "NAME:$blog_name\n"; |
323 | - $fr .= 'TITLE:' . $title . "\n"; |
|
323 | + $fr .= 'TITLE:'.$title."\n"; |
|
324 | 324 | $fr .= "EXCERPT:$excerpt\n\n"; |
325 | 325 | while (!@feof($fs)) { |
326 | 326 | $fr .= @fgets($fs, 4096); |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | if ($fp = fopen($debug_file, 'a')) { |
331 | 331 | fwrite($fp, $fr); |
332 | 332 | fclose($fp); |
333 | - } else { |
|
333 | + }else { |
|
334 | 334 | } |
335 | 335 | } |
336 | 336 | @fclose($fs); |
@@ -350,19 +350,19 @@ discard block |
||
350 | 350 | PlanetUtility::planetGetPing($serv, $id); |
351 | 351 | } |
352 | 352 | } |
353 | - require_once XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/class-IXR.php'; |
|
353 | + require_once XOOPS_ROOT_PATH.'/modules/'.$GLOBALS['moddirname'].'/class-IXR.php'; |
|
354 | 354 | |
355 | 355 | // using a timeout of 3 seconds should be enough to cover slow servers |
356 | 356 | $client = new IXR_Client($server, false); |
357 | 357 | $client->timeout = 3; |
358 | - $client->useragent .= ' -- XOOPS Article/' . XOOPS_VERSION; |
|
358 | + $client->useragent .= ' -- XOOPS Article/'.XOOPS_VERSION; |
|
359 | 359 | |
360 | 360 | // when set to true, this outputs debug messages by itself |
361 | 361 | $client->debug = false; |
362 | 362 | |
363 | 363 | $blogname = xoops_utf8_encode($GLOBALS['xoopsModule']->getVar('name')); |
364 | - $home = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/'; |
|
365 | - $rss2_url = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/xml.php' . URL_DELIMITER . 'rss2.0/' . $id; |
|
364 | + $home = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/'; |
|
365 | + $rss2_url = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/xml.php'.URL_DELIMITER.'rss2.0/'.$id; |
|
366 | 366 | |
367 | 367 | if (!$client->query('weblogUpdates.extendedPing', $blogname, $home, $rss2_url)) { // then try a normal ping |
368 | 368 | $client->query('weblogUpdates.ping', $blogname, $home); |
@@ -378,16 +378,16 @@ discard block |
||
378 | 378 | { |
379 | 379 | $charset = 'utf-8'; |
380 | 380 | $error_message = xoops_utf8_encode($error_message); |
381 | - header('Content-Type: text/xml; charset="' . $charset . '"'); |
|
381 | + header('Content-Type: text/xml; charset="'.$charset.'"'); |
|
382 | 382 | if ($error) { |
383 | - echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n"; |
|
383 | + echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n"; |
|
384 | 384 | echo "<response>\n"; |
385 | 385 | echo "<error>1</error>\n"; |
386 | 386 | echo "<message>$error_message</message>\n"; |
387 | 387 | echo '</response>'; |
388 | 388 | die(); |
389 | - } else { |
|
390 | - echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n"; |
|
389 | + }else { |
|
390 | + echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n"; |
|
391 | 391 | echo "<response>\n"; |
392 | 392 | echo "<error>0</error>\n"; |
393 | 393 | echo '</response>'; |
@@ -407,11 +407,11 @@ discard block |
||
407 | 407 | if (is_array($string)) { |
408 | 408 | $value = []; |
409 | 409 | foreach ($string as $key => $val) { |
410 | - $value[] = $key . '|' . $val; |
|
410 | + $value[] = $key.'|'.$val; |
|
411 | 411 | } |
412 | 412 | $string = implode(',', $value); |
413 | 413 | } |
414 | - setcookie($GLOBALS['VAR_PREFIX'] . $name, $string, (int)$expire, '/'); |
|
414 | + setcookie($GLOBALS['VAR_PREFIX'].$name, $string, (int) $expire, '/'); |
|
415 | 415 | } |
416 | 416 | |
417 | 417 | /** |
@@ -421,14 +421,14 @@ discard block |
||
421 | 421 | */ |
422 | 422 | public static function planetGetCookie($name, $isArray = false) |
423 | 423 | { |
424 | - $value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'] . $name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'] . $name] : null; |
|
424 | + $value = isset($_COOKIE[$GLOBALS['VAR_PREFIX'].$name]) ? $_COOKIE[$GLOBALS['VAR_PREFIX'].$name] : null; |
|
425 | 425 | if ($isArray) { |
426 | 426 | $_value = $value ? explode(',', $value) : []; |
427 | 427 | $value = []; |
428 | - if (count($_value) > 0) { |
|
428 | + if (count($_value)>0) { |
|
429 | 429 | foreach ($_value as $string) { |
430 | 430 | $key = substr($string, 0, strpos($string, '|')); |
431 | - $val = substr($string, strpos($string, '|') + 1); |
|
431 | + $val = substr($string, strpos($string, '|')+1); |
|
432 | 432 | $value[$key] = $val; |
433 | 433 | } |
434 | 434 | } |
@@ -487,7 +487,7 @@ discard block |
||
487 | 487 | */ |
488 | 488 | public static function planetFetchSnoopy($url) |
489 | 489 | { |
490 | - require_once XOOPS_ROOT_PATH . '/class/snoopy.php'; |
|
490 | + require_once XOOPS_ROOT_PATH.'/class/snoopy.php'; |
|
491 | 491 | $snoopy = new Snoopy; |
492 | 492 | $data = ''; |
493 | 493 | if (@$snoopy->fetch($url)) { |
@@ -506,10 +506,10 @@ discard block |
||
506 | 506 | if (!function_exists('curl_init')) { |
507 | 507 | return false; |
508 | 508 | } |
509 | - $ch = curl_init(); // initialize curl handle |
|
509 | + $ch = curl_init(); // initialize curl handle |
|
510 | 510 | curl_setopt($ch, CURLOPT_URL, $url); // set url to post to |
511 | 511 | curl_setopt($ch, CURLOPT_FAILONERROR, 1); |
512 | - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);// allow redirects |
|
512 | + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); // allow redirects |
|
513 | 513 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // return into a variable |
514 | 514 | curl_setopt($ch, CURLOPT_TIMEOUT, 30); // times out after 31s |
515 | 515 | $data = curl_exec($ch); // run the whole process |
@@ -551,7 +551,7 @@ discard block |
||
551 | 551 | if (false === $index) { |
552 | 552 | return false; |
553 | 553 | } |
554 | - $index = strlen($haystack) - strlen($needle) - $index; |
|
554 | + $index = strlen($haystack)-strlen($needle)-$index; |
|
555 | 555 | |
556 | 556 | return $index; |
557 | 557 | } |
@@ -342,11 +342,11 @@ discard block |
||
342 | 342 | if (!$this->rawFieldContent) { |
343 | 343 | $result = ''; |
344 | 344 | } elseif ($this->syndicateHtml) { |
345 | - $result = '<![CDATA[' . $this->rawFieldContent . ']]>'; |
|
346 | - } else { |
|
345 | + $result = '<![CDATA['.$this->rawFieldContent.']]>'; |
|
346 | + }else { |
|
347 | 347 | if ($this->truncSize && is_int($this->truncSize)) { |
348 | 348 | $result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent), $this->truncSize); |
349 | - } else { |
|
349 | + }else { |
|
350 | 350 | $result = htmlspecialchars($this->rawFieldContent); |
351 | 351 | } |
352 | 352 | } |
@@ -589,29 +589,29 @@ discard block |
||
589 | 589 | */ |
590 | 590 | public function iTrunc($string, $length) |
591 | 591 | { |
592 | - if (strlen($string) <= $length) { |
|
592 | + if (strlen($string)<=$length) { |
|
593 | 593 | return $string; |
594 | 594 | } |
595 | 595 | |
596 | 596 | $pos = strrpos($string, '.'); |
597 | - if ($pos >= $length - 4) { |
|
598 | - $string = substr($string, 0, $length - 4); |
|
597 | + if ($pos>=$length-4) { |
|
598 | + $string = substr($string, 0, $length-4); |
|
599 | 599 | $pos = strrpos($string, '.'); |
600 | 600 | } |
601 | - if ($pos >= $length * 0.4) { |
|
602 | - return substr($string, 0, $pos + 1) . ' ...'; |
|
601 | + if ($pos>=$length*0.4) { |
|
602 | + return substr($string, 0, $pos+1).' ...'; |
|
603 | 603 | } |
604 | 604 | |
605 | 605 | $pos = strrpos($string, ' '); |
606 | - if ($pos >= $length - 4) { |
|
607 | - $string = substr($string, 0, $length - 4); |
|
606 | + if ($pos>=$length-4) { |
|
607 | + $string = substr($string, 0, $length-4); |
|
608 | 608 | $pos = strrpos($string, ' '); |
609 | 609 | } |
610 | - if ($pos >= $length * 0.4) { |
|
611 | - return substr($string, 0, $pos) . ' ...'; |
|
610 | + if ($pos>=$length*0.4) { |
|
611 | + return substr($string, 0, $pos).' ...'; |
|
612 | 612 | } |
613 | 613 | |
614 | - return substr($string, 0, $length - 4) . ' ...'; |
|
614 | + return substr($string, 0, $length-4).' ...'; |
|
615 | 615 | } |
616 | 616 | |
617 | 617 | /** |
@@ -621,7 +621,7 @@ discard block |
||
621 | 621 | */ |
622 | 622 | public function _createGeneratorComment() |
623 | 623 | { |
624 | - return "<!-- generator=\"" . FEEDCREATOR_VERSION . "\" -->\n"; |
|
624 | + return "<!-- generator=\"".FEEDCREATOR_VERSION."\" -->\n"; |
|
625 | 625 | } |
626 | 626 | |
627 | 627 | /** |
@@ -638,7 +638,7 @@ discard block |
||
638 | 638 | $ae = ''; |
639 | 639 | if (is_array($elements)) { |
640 | 640 | foreach ($elements as $key => $value) { |
641 | - $ae .= $indentString . "<$key>$value</$key>\n"; |
|
641 | + $ae .= $indentString."<$key>$value</$key>\n"; |
|
642 | 642 | } |
643 | 643 | } |
644 | 644 | |
@@ -652,10 +652,10 @@ discard block |
||
652 | 652 | { |
653 | 653 | $xml = ''; |
654 | 654 | if ($this->cssStyleSheet) { |
655 | - $xml .= "<?xml-stylesheet href=\"" . $this->cssStyleSheet . "\" type=\"text/css\"?>\n"; |
|
655 | + $xml .= "<?xml-stylesheet href=\"".$this->cssStyleSheet."\" type=\"text/css\"?>\n"; |
|
656 | 656 | } |
657 | 657 | if ($this->xslStyleSheet) { |
658 | - $xml .= "<?xml-stylesheet href=\"" . $this->xslStyleSheet . "\" type=\"text/xsl\"?>\n"; |
|
658 | + $xml .= "<?xml-stylesheet href=\"".$this->xslStyleSheet."\" type=\"text/xsl\"?>\n"; |
|
659 | 659 | } |
660 | 660 | |
661 | 661 | return $xml; |
@@ -690,7 +690,7 @@ discard block |
||
690 | 690 | { |
691 | 691 | $fileInfo = pathinfo($_SERVER['PHP_SELF']); |
692 | 692 | |
693 | - return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.xml'; |
|
693 | + return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension'])+1)).'.xml'; |
|
694 | 694 | } |
695 | 695 | |
696 | 696 | /** |
@@ -713,8 +713,8 @@ discard block |
||
713 | 713 | // HTTP redirect, some feed readers' simple HTTP implementations don't follow it |
714 | 714 | //Header("Location: ".$filename); |
715 | 715 | |
716 | - header('Content-Type: ' . $this->contentType . '; charset=' . $this->encoding . '; filename=' . basename($filename)); |
|
717 | - header('Content-Disposition: inline; filename=' . basename($filename)); |
|
716 | + header('Content-Type: '.$this->contentType.'; charset='.$this->encoding.'; filename='.basename($filename)); |
|
717 | + header('Content-Disposition: inline; filename='.basename($filename)); |
|
718 | 718 | readfile($filename, 'r'); |
719 | 719 | die(); |
720 | 720 | } |
@@ -736,7 +736,7 @@ discard block |
||
736 | 736 | if ('' == $filename) { |
737 | 737 | $filename = $this->_generateFilename(); |
738 | 738 | } |
739 | - if (file_exists($filename) && (time() - filemtime($filename) < $timeout)) { |
|
739 | + if (file_exists($filename) && (time()-filemtime($filename)<$timeout)) { |
|
740 | 740 | $this->_redirect($filename); |
741 | 741 | } |
742 | 742 | } |
@@ -762,7 +762,7 @@ discard block |
||
762 | 762 | if ($displayContents) { |
763 | 763 | $this->_redirect($filename); |
764 | 764 | } |
765 | - } else { |
|
765 | + }else { |
|
766 | 766 | echo '<br><b>Error creating feed file, please check write permissions.</b><br>'; |
767 | 767 | } |
768 | 768 | } |
@@ -795,7 +795,7 @@ discard block |
||
795 | 795 | return; |
796 | 796 | } |
797 | 797 | if (preg_match("~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~", $dateString, $matches)) { |
798 | - $months = [ |
|
798 | + $months = [ |
|
799 | 799 | 'Jan' => 1, |
800 | 800 | 'Feb' => 2, |
801 | 801 | 'Mar' => 3, |
@@ -811,15 +811,15 @@ discard block |
||
811 | 811 | ]; |
812 | 812 | $this->unix = mktime($matches[4], $matches[5], $matches[6], $months[$matches[2]], $matches[1], $matches[3]); |
813 | 813 | if ('+' == substr($matches[7], 0, 1) || '-' == substr($matches[7], 0, 1)) { |
814 | - $tzOffset = (substr($matches[7], 0, 3) * 60 + substr($matches[7], -2)) * 60; |
|
815 | - } else { |
|
814 | + $tzOffset = (substr($matches[7], 0, 3)*60+substr($matches[7], -2))*60; |
|
815 | + }else { |
|
816 | 816 | if (1 == strlen($matches[7])) { |
817 | 817 | $oneHour = 3600; |
818 | 818 | $ord = ord($matches[7]); |
819 | - if ($ord < ord('M')) { |
|
820 | - $tzOffset = (ord('A') - $ord - 1) * $oneHour; |
|
821 | - } elseif ($ord >= ord('M') && 'Z' !== $matches[7]) { |
|
822 | - $tzOffset = ($ord - ord('M')) * $oneHour; |
|
819 | + if ($ord<ord('M')) { |
|
820 | + $tzOffset = (ord('A')-$ord-1)*$oneHour; |
|
821 | + } elseif ($ord>=ord('M') && 'Z' !== $matches[7]) { |
|
822 | + $tzOffset = ($ord-ord('M'))*$oneHour; |
|
823 | 823 | } elseif ('Z' === $matches[7]) { |
824 | 824 | $tzOffset = 0; |
825 | 825 | } |
@@ -837,8 +837,8 @@ discard block |
||
837 | 837 | if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~", $dateString, $matches)) { |
838 | 838 | $this->unix = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]); |
839 | 839 | if ('+' == substr($matches[7], 0, 1) || '-' == substr($matches[7], 0, 1)) { |
840 | - $tzOffset = (substr($matches[7], 0, 3) * 60 + substr($matches[7], -2)) * 60; |
|
841 | - } else { |
|
840 | + $tzOffset = (substr($matches[7], 0, 3)*60+substr($matches[7], -2))*60; |
|
841 | + }else { |
|
842 | 842 | if ('Z' === $matches[7]) { |
843 | 843 | $tzOffset = 0; |
844 | 844 | } |
@@ -860,7 +860,7 @@ discard block |
||
860 | 860 | //return gmdate("r",$this->unix); |
861 | 861 | $date = gmdate('D, d M Y H:i:s', $this->unix); |
862 | 862 | if (TIME_ZONE != '') { |
863 | - $date .= ' ' . str_replace(':', '', TIME_ZONE); |
|
863 | + $date .= ' '.str_replace(':', '', TIME_ZONE); |
|
864 | 864 | } |
865 | 865 | |
866 | 866 | return $date; |
@@ -874,7 +874,7 @@ discard block |
||
874 | 874 | public function iso8601() |
875 | 875 | { |
876 | 876 | $date = gmdate("Y-m-d\TH:i:sO", $this->unix); |
877 | - $date = substr($date, 0, 22) . ':' . substr($date, -2); |
|
877 | + $date = substr($date, 0, 22).':'.substr($date, -2); |
|
878 | 878 | if (TIME_ZONE != '') { |
879 | 879 | $date = str_replace('+00:00', TIME_ZONE, $date); |
880 | 880 | } |
@@ -909,7 +909,7 @@ discard block |
||
909 | 909 | */ |
910 | 910 | public function createFeed() |
911 | 911 | { |
912 | - $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n"; |
|
912 | + $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n"; |
|
913 | 913 | $feed .= $this->_createGeneratorComment(); |
914 | 914 | if ('' == $this->cssStyleSheet) { |
915 | 915 | $cssStyleSheet = 'http://www.w3.org/2000/08/w3c-synd/style.css'; |
@@ -920,49 +920,49 @@ discard block |
||
920 | 920 | $feed .= " xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n"; |
921 | 921 | $feed .= " xmlns:slash=\"http://purl.org/rss/1.0/modules/slash/\"\n"; |
922 | 922 | $feed .= " xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n"; |
923 | - $feed .= " <channel rdf:about=\"" . $this->syndicationURL . "\">\n"; |
|
924 | - $feed .= ' <title>' . htmlspecialchars($this->title) . "</title>\n"; |
|
925 | - $feed .= ' <description>' . htmlspecialchars($this->description) . "</description>\n"; |
|
926 | - $feed .= ' <link>' . $this->link . "</link>\n"; |
|
923 | + $feed .= " <channel rdf:about=\"".$this->syndicationURL."\">\n"; |
|
924 | + $feed .= ' <title>'.htmlspecialchars($this->title)."</title>\n"; |
|
925 | + $feed .= ' <description>'.htmlspecialchars($this->description)."</description>\n"; |
|
926 | + $feed .= ' <link>'.$this->link."</link>\n"; |
|
927 | 927 | if (null != $this->image) { |
928 | - $feed .= " <image rdf:resource=\"" . $this->image->url . "\">\n"; |
|
928 | + $feed .= " <image rdf:resource=\"".$this->image->url."\">\n"; |
|
929 | 929 | } |
930 | - $now = new FeedDate(); |
|
931 | - $feed .= ' <dc:date>' . htmlspecialchars($now->iso8601()) . "</dc:date>\n"; |
|
930 | + $now = new FeedDate(); |
|
931 | + $feed .= ' <dc:date>'.htmlspecialchars($now->iso8601())."</dc:date>\n"; |
|
932 | 932 | $feed .= " <items>\n"; |
933 | 933 | $feed .= " <rdf:Seq>\n"; |
934 | - for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) { |
|
935 | - $feed .= " <rdf:li rdf:resource=\"" . htmlspecialchars($this->items[$i]->link) . "\">\n"; |
|
934 | + for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) { |
|
935 | + $feed .= " <rdf:li rdf:resource=\"".htmlspecialchars($this->items[$i]->link)."\">\n"; |
|
936 | 936 | } |
937 | 937 | $feed .= " </rdf:Seq>\n"; |
938 | 938 | $feed .= " </items>\n"; |
939 | 939 | $feed .= " </channel>\n"; |
940 | 940 | if (null != $this->image) { |
941 | - $feed .= " <image rdf:about=\"" . $this->image->url . "\">\n"; |
|
942 | - $feed .= ' <title>' . $this->image->title . "</title>\n"; |
|
943 | - $feed .= ' <link>' . $this->image->link . "</link>\n"; |
|
944 | - $feed .= ' <url>' . $this->image->url . "</url>\n"; |
|
941 | + $feed .= " <image rdf:about=\"".$this->image->url."\">\n"; |
|
942 | + $feed .= ' <title>'.$this->image->title."</title>\n"; |
|
943 | + $feed .= ' <link>'.$this->image->link."</link>\n"; |
|
944 | + $feed .= ' <url>'.$this->image->url."</url>\n"; |
|
945 | 945 | $feed .= " </image>\n"; |
946 | 946 | } |
947 | 947 | $feed .= $this->_createAdditionalElements($this->additionalElements, ' '); |
948 | 948 | |
949 | - for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) { |
|
950 | - $feed .= " <item rdf:about=\"" . htmlspecialchars($this->items[$i]->link) . "\">\n"; |
|
949 | + for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) { |
|
950 | + $feed .= " <item rdf:about=\"".htmlspecialchars($this->items[$i]->link)."\">\n"; |
|
951 | 951 | //$feed.= " <dc:type>Posting</dc:type>\n"; |
952 | 952 | $feed .= " <dc:format>text/html</dc:format>\n"; |
953 | 953 | if (null != $this->items[$i]->date) { |
954 | 954 | $itemDate = new FeedDate($this->items[$i]->date); |
955 | - $feed .= ' <dc:date>' . htmlspecialchars($itemDate->iso8601()) . "</dc:date>\n"; |
|
955 | + $feed .= ' <dc:date>'.htmlspecialchars($itemDate->iso8601())."</dc:date>\n"; |
|
956 | 956 | } |
957 | 957 | if ('' != $this->items[$i]->source) { |
958 | - $feed .= ' <dc:source>' . htmlspecialchars($this->items[$i]->source) . "</dc:source>\n"; |
|
958 | + $feed .= ' <dc:source>'.htmlspecialchars($this->items[$i]->source)."</dc:source>\n"; |
|
959 | 959 | } |
960 | 960 | if ('' != $this->items[$i]->author) { |
961 | - $feed .= ' <dc:creator>' . htmlspecialchars($this->items[$i]->author) . "</dc:creator>\n"; |
|
961 | + $feed .= ' <dc:creator>'.htmlspecialchars($this->items[$i]->author)."</dc:creator>\n"; |
|
962 | 962 | } |
963 | - $feed .= ' <title>' . htmlspecialchars(strip_tags(strtr($this->items[$i]->title, "\n\r", ' '))) . "</title>\n"; |
|
964 | - $feed .= ' <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n"; |
|
965 | - $feed .= ' <description>' . htmlspecialchars($this->items[$i]->description) . "</description>\n"; |
|
963 | + $feed .= ' <title>'.htmlspecialchars(strip_tags(strtr($this->items[$i]->title, "\n\r", ' ')))."</title>\n"; |
|
964 | + $feed .= ' <link>'.htmlspecialchars($this->items[$i]->link)."</link>\n"; |
|
965 | + $feed .= ' <description>'.htmlspecialchars($this->items[$i]->description)."</description>\n"; |
|
966 | 966 | $feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, ' '); |
967 | 967 | $feed .= " </item>\n"; |
968 | 968 | } |
@@ -1013,79 +1013,79 @@ discard block |
||
1013 | 1013 | */ |
1014 | 1014 | public function createFeed() |
1015 | 1015 | { |
1016 | - $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n"; |
|
1016 | + $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n"; |
|
1017 | 1017 | $feed .= $this->_createGeneratorComment(); |
1018 | 1018 | $feed .= $this->_createStylesheetReferences(); |
1019 | - $feed .= "<rss version=\"" . $this->RSSVersion . "\">\n"; |
|
1019 | + $feed .= "<rss version=\"".$this->RSSVersion."\">\n"; |
|
1020 | 1020 | $feed .= " <channel>\n"; |
1021 | - $feed .= ' <title>' . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . "</title>\n"; |
|
1021 | + $feed .= ' <title>'.FeedCreator::iTrunc(htmlspecialchars($this->title), 100)."</title>\n"; |
|
1022 | 1022 | $this->descriptionTruncSize = 500; |
1023 | - $feed .= ' <description>' . $this->getDescription() . "</description>\n"; |
|
1024 | - $feed .= ' <link>' . $this->link . "</link>\n"; |
|
1023 | + $feed .= ' <description>'.$this->getDescription()."</description>\n"; |
|
1024 | + $feed .= ' <link>'.$this->link."</link>\n"; |
|
1025 | 1025 | $now = new FeedDate(); |
1026 | - $feed .= ' <lastBuildDate>' . htmlspecialchars($now->rfc822()) . "</lastBuildDate>\n"; |
|
1027 | - $feed .= ' <generator>' . FEEDCREATOR_VERSION . "</generator>\n"; |
|
1026 | + $feed .= ' <lastBuildDate>'.htmlspecialchars($now->rfc822())."</lastBuildDate>\n"; |
|
1027 | + $feed .= ' <generator>'.FEEDCREATOR_VERSION."</generator>\n"; |
|
1028 | 1028 | |
1029 | 1029 | if (null != $this->image) { |
1030 | 1030 | $feed .= " <image>\n"; |
1031 | - $feed .= ' <url>' . $this->image->url . "</url>\n"; |
|
1032 | - $feed .= ' <title>' . FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100) . "</title>\n"; |
|
1033 | - $feed .= ' <link>' . $this->image->link . "</link>\n"; |
|
1031 | + $feed .= ' <url>'.$this->image->url."</url>\n"; |
|
1032 | + $feed .= ' <title>'.FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100)."</title>\n"; |
|
1033 | + $feed .= ' <link>'.$this->image->link."</link>\n"; |
|
1034 | 1034 | if ('' != $this->image->width) { |
1035 | - $feed .= ' <width>' . $this->image->width . "</width>\n"; |
|
1035 | + $feed .= ' <width>'.$this->image->width."</width>\n"; |
|
1036 | 1036 | } |
1037 | 1037 | if ('' != $this->image->height) { |
1038 | - $feed .= ' <height>' . $this->image->height . "</height>\n"; |
|
1038 | + $feed .= ' <height>'.$this->image->height."</height>\n"; |
|
1039 | 1039 | } |
1040 | 1040 | if ('' != $this->image->description) { |
1041 | - $feed .= ' <description>' . $this->image->getDescription() . "</description>\n"; |
|
1041 | + $feed .= ' <description>'.$this->image->getDescription()."</description>\n"; |
|
1042 | 1042 | } |
1043 | 1043 | $feed .= " </image>\n"; |
1044 | 1044 | } |
1045 | 1045 | if ('' != $this->language) { |
1046 | - $feed .= ' <language>' . $this->language . "</language>\n"; |
|
1046 | + $feed .= ' <language>'.$this->language."</language>\n"; |
|
1047 | 1047 | } |
1048 | 1048 | if ('' != $this->copyright) { |
1049 | - $feed .= ' <copyright>' . FeedCreator::iTrunc(htmlspecialchars($this->copyright), 100) . "</copyright>\n"; |
|
1049 | + $feed .= ' <copyright>'.FeedCreator::iTrunc(htmlspecialchars($this->copyright), 100)."</copyright>\n"; |
|
1050 | 1050 | } |
1051 | 1051 | if ('' != $this->editor) { |
1052 | - $feed .= ' <managingEditor>' . FeedCreator::iTrunc(htmlspecialchars($this->editor), 100) . "</managingEditor>\n"; |
|
1052 | + $feed .= ' <managingEditor>'.FeedCreator::iTrunc(htmlspecialchars($this->editor), 100)."</managingEditor>\n"; |
|
1053 | 1053 | } |
1054 | 1054 | if ('' != $this->webmaster) { |
1055 | - $feed .= ' <webMaster>' . FeedCreator::iTrunc(htmlspecialchars($this->webmaster), 100) . "</webMaster>\n"; |
|
1055 | + $feed .= ' <webMaster>'.FeedCreator::iTrunc(htmlspecialchars($this->webmaster), 100)."</webMaster>\n"; |
|
1056 | 1056 | } |
1057 | 1057 | if ('' != $this->pubDate) { |
1058 | 1058 | $pubDate = new FeedDate($this->pubDate); |
1059 | - $feed .= ' <pubDate>' . htmlspecialchars($pubDate->rfc822()) . "</pubDate>\n"; |
|
1059 | + $feed .= ' <pubDate>'.htmlspecialchars($pubDate->rfc822())."</pubDate>\n"; |
|
1060 | 1060 | } |
1061 | 1061 | if ('' != $this->category) { |
1062 | - $feed .= ' <category>' . htmlspecialchars($this->category) . "</category>\n"; |
|
1062 | + $feed .= ' <category>'.htmlspecialchars($this->category)."</category>\n"; |
|
1063 | 1063 | } |
1064 | 1064 | if ('' != $this->docs) { |
1065 | - $feed .= ' <docs>' . FeedCreator::iTrunc(htmlspecialchars($this->docs), 500) . "</docs>\n"; |
|
1065 | + $feed .= ' <docs>'.FeedCreator::iTrunc(htmlspecialchars($this->docs), 500)."</docs>\n"; |
|
1066 | 1066 | } |
1067 | 1067 | if ('' != $this->ttl) { |
1068 | - $feed .= ' <ttl>' . htmlspecialchars($this->ttl) . "</ttl>\n"; |
|
1068 | + $feed .= ' <ttl>'.htmlspecialchars($this->ttl)."</ttl>\n"; |
|
1069 | 1069 | } |
1070 | 1070 | if ('' != $this->rating) { |
1071 | - $feed .= ' <rating>' . FeedCreator::iTrunc(htmlspecialchars($this->rating), 500) . "</rating>\n"; |
|
1071 | + $feed .= ' <rating>'.FeedCreator::iTrunc(htmlspecialchars($this->rating), 500)."</rating>\n"; |
|
1072 | 1072 | } |
1073 | 1073 | if ('' != $this->skipHours) { |
1074 | - $feed .= ' <skipHours>' . htmlspecialchars($this->skipHours) . "</skipHours>\n"; |
|
1074 | + $feed .= ' <skipHours>'.htmlspecialchars($this->skipHours)."</skipHours>\n"; |
|
1075 | 1075 | } |
1076 | 1076 | if ('' != $this->skipDays) { |
1077 | - $feed .= ' <skipDays>' . htmlspecialchars($this->skipDays) . "</skipDays>\n"; |
|
1077 | + $feed .= ' <skipDays>'.htmlspecialchars($this->skipDays)."</skipDays>\n"; |
|
1078 | 1078 | } |
1079 | 1079 | $feed .= $this->_createAdditionalElements($this->additionalElements, ' '); |
1080 | 1080 | |
1081 | - for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) { |
|
1081 | + for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) { |
|
1082 | 1082 | $feed .= " <item>\n"; |
1083 | - $feed .= ' <title>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100) . "</title>\n"; |
|
1084 | - $feed .= ' <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n"; |
|
1085 | - $feed .= ' <description>' . $this->items[$i]->getDescription() . "</description>\n"; |
|
1083 | + $feed .= ' <title>'.FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100)."</title>\n"; |
|
1084 | + $feed .= ' <link>'.htmlspecialchars($this->items[$i]->link)."</link>\n"; |
|
1085 | + $feed .= ' <description>'.$this->items[$i]->getDescription()."</description>\n"; |
|
1086 | 1086 | |
1087 | 1087 | if ('' != $this->items[$i]->author) { |
1088 | - $feed .= ' <author>' . htmlspecialchars($this->items[$i]->author) . "</author>\n"; |
|
1088 | + $feed .= ' <author>'.htmlspecialchars($this->items[$i]->author)."</author>\n"; |
|
1089 | 1089 | } |
1090 | 1090 | /* |
1091 | 1091 | // on hold |
@@ -1094,17 +1094,17 @@ discard block |
||
1094 | 1094 | } |
1095 | 1095 | */ |
1096 | 1096 | if ('' != $this->items[$i]->category) { |
1097 | - $feed .= ' <category>' . htmlspecialchars($this->items[$i]->category) . "</category>\n"; |
|
1097 | + $feed .= ' <category>'.htmlspecialchars($this->items[$i]->category)."</category>\n"; |
|
1098 | 1098 | } |
1099 | 1099 | if ('' != $this->items[$i]->comments) { |
1100 | - $feed .= ' <comments>' . htmlspecialchars($this->items[$i]->comments) . "</comments>\n"; |
|
1100 | + $feed .= ' <comments>'.htmlspecialchars($this->items[$i]->comments)."</comments>\n"; |
|
1101 | 1101 | } |
1102 | 1102 | if ('' != $this->items[$i]->date) { |
1103 | 1103 | $itemDate = new FeedDate($this->items[$i]->date); |
1104 | - $feed .= ' <pubDate>' . htmlspecialchars($itemDate->rfc822()) . "</pubDate>\n"; |
|
1104 | + $feed .= ' <pubDate>'.htmlspecialchars($itemDate->rfc822())."</pubDate>\n"; |
|
1105 | 1105 | } |
1106 | 1106 | if ('' != $this->items[$i]->guid) { |
1107 | - $feed .= ' <guid>' . htmlspecialchars($this->items[$i]->guid) . "</guid>\n"; |
|
1107 | + $feed .= ' <guid>'.htmlspecialchars($this->items[$i]->guid)."</guid>\n"; |
|
1108 | 1108 | } |
1109 | 1109 | $feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, ' '); |
1110 | 1110 | $feed .= " </item>\n"; |
@@ -1157,32 +1157,32 @@ discard block |
||
1157 | 1157 | */ |
1158 | 1158 | public function createFeed() |
1159 | 1159 | { |
1160 | - $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n"; |
|
1160 | + $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n"; |
|
1161 | 1161 | $feed .= $this->_createStylesheetReferences(); |
1162 | 1162 | $feed .= "<feed version=\"0.1\" xmlns=\"http://example.com/newformat#\">\n"; |
1163 | - $feed .= ' <title>' . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . "</title>\n"; |
|
1163 | + $feed .= ' <title>'.FeedCreator::iTrunc(htmlspecialchars($this->title), 100)."</title>\n"; |
|
1164 | 1164 | $this->truncSize = 500; |
1165 | - $feed .= ' <subtitle>' . $this->getDescription() . "</subtitle>\n"; |
|
1166 | - $feed .= ' <link>' . $this->link . "</link>\n"; |
|
1167 | - for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) { |
|
1165 | + $feed .= ' <subtitle>'.$this->getDescription()."</subtitle>\n"; |
|
1166 | + $feed .= ' <link>'.$this->link."</link>\n"; |
|
1167 | + for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) { |
|
1168 | 1168 | $feed .= " <entry>\n"; |
1169 | - $feed .= ' <title>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100) . "</title>\n"; |
|
1170 | - $feed .= ' <link>' . htmlspecialchars($this->items[$i]->link) . "</link>\n"; |
|
1169 | + $feed .= ' <title>'.FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100)."</title>\n"; |
|
1170 | + $feed .= ' <link>'.htmlspecialchars($this->items[$i]->link)."</link>\n"; |
|
1171 | 1171 | $itemDate = new FeedDate($this->items[$i]->date); |
1172 | - $feed .= ' <created>' . htmlspecialchars($itemDate->iso8601()) . "</created>\n"; |
|
1173 | - $feed .= ' <issued>' . htmlspecialchars($itemDate->iso8601()) . "</issued>\n"; |
|
1174 | - $feed .= ' <modified>' . htmlspecialchars($itemDate->iso8601()) . "</modified>\n"; |
|
1175 | - $feed .= ' <id>' . htmlspecialchars($this->items[$i]->guid) . "</id>\n"; |
|
1172 | + $feed .= ' <created>'.htmlspecialchars($itemDate->iso8601())."</created>\n"; |
|
1173 | + $feed .= ' <issued>'.htmlspecialchars($itemDate->iso8601())."</issued>\n"; |
|
1174 | + $feed .= ' <modified>'.htmlspecialchars($itemDate->iso8601())."</modified>\n"; |
|
1175 | + $feed .= ' <id>'.htmlspecialchars($this->items[$i]->guid)."</id>\n"; |
|
1176 | 1176 | if ('' != $this->items[$i]->author) { |
1177 | 1177 | $feed .= " <author>\n"; |
1178 | - $feed .= ' <name>' . htmlspecialchars($this->items[$i]->author) . "</name>\n"; |
|
1178 | + $feed .= ' <name>'.htmlspecialchars($this->items[$i]->author)."</name>\n"; |
|
1179 | 1179 | if ('' != $this->items[$i]->authorEmail) { |
1180 | - $feed .= ' <email>' . $this->items[$i]->authorEmail . "</email>\n"; |
|
1180 | + $feed .= ' <email>'.$this->items[$i]->authorEmail."</email>\n"; |
|
1181 | 1181 | } |
1182 | 1182 | $feed .= " </author>\n"; |
1183 | 1183 | } |
1184 | 1184 | $feed .= " <content type=\"text/html\" xml:lang=\"en-us\">\n"; |
1185 | - $feed .= " <div xmlns=\"http://www.w3.org/1999/xhtml\">" . $this->items[$i]->getDescription() . "</div>\n"; |
|
1185 | + $feed .= " <div xmlns=\"http://www.w3.org/1999/xhtml\">".$this->items[$i]->getDescription()."</div>\n"; |
|
1186 | 1186 | $feed .= " </content>\n"; |
1187 | 1187 | $feed .= " </entry>\n"; |
1188 | 1188 | } |
@@ -1224,50 +1224,50 @@ discard block |
||
1224 | 1224 | */ |
1225 | 1225 | public function createFeed() |
1226 | 1226 | { |
1227 | - $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n"; |
|
1227 | + $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n"; |
|
1228 | 1228 | $feed .= $this->_createGeneratorComment(); |
1229 | 1229 | $feed .= $this->_createStylesheetReferences(); |
1230 | 1230 | $feed .= "<feed version=\"0.3\" xmlns=\"http://purl.org/atom/ns#\""; |
1231 | 1231 | if ('' != $this->language) { |
1232 | - $feed .= " xml:lang=\"" . $this->language . "\""; |
|
1232 | + $feed .= " xml:lang=\"".$this->language."\""; |
|
1233 | 1233 | } |
1234 | 1234 | $feed .= ">\n"; |
1235 | - $feed .= ' <title>' . htmlspecialchars($this->title) . "</title>\n"; |
|
1236 | - $feed .= ' <tagline>' . htmlspecialchars($this->description) . "</tagline>\n"; |
|
1237 | - $feed .= " <link rel=\"alternate\" type=\"text/html\" href=\"" . htmlspecialchars($this->link) . "\">\n"; |
|
1238 | - $feed .= ' <id>' . htmlspecialchars($this->link) . "</id>\n"; |
|
1239 | - $now = new FeedDate(); |
|
1240 | - $feed .= ' <modified>' . htmlspecialchars($now->iso8601()) . "</modified>\n"; |
|
1235 | + $feed .= ' <title>'.htmlspecialchars($this->title)."</title>\n"; |
|
1236 | + $feed .= ' <tagline>'.htmlspecialchars($this->description)."</tagline>\n"; |
|
1237 | + $feed .= " <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->link)."\">\n"; |
|
1238 | + $feed .= ' <id>'.htmlspecialchars($this->link)."</id>\n"; |
|
1239 | + $now = new FeedDate(); |
|
1240 | + $feed .= ' <modified>'.htmlspecialchars($now->iso8601())."</modified>\n"; |
|
1241 | 1241 | if ('' != $this->editor) { |
1242 | 1242 | $feed .= " <author>\n"; |
1243 | - $feed .= ' <name>' . $this->editor . "</name>\n"; |
|
1243 | + $feed .= ' <name>'.$this->editor."</name>\n"; |
|
1244 | 1244 | if ('' != $this->editorEmail) { |
1245 | - $feed .= ' <email>' . $this->editorEmail . "</email>\n"; |
|
1245 | + $feed .= ' <email>'.$this->editorEmail."</email>\n"; |
|
1246 | 1246 | } |
1247 | 1247 | $feed .= " </author>\n"; |
1248 | 1248 | } |
1249 | - $feed .= ' <generator>' . FEEDCREATOR_VERSION . "</generator>\n"; |
|
1249 | + $feed .= ' <generator>'.FEEDCREATOR_VERSION."</generator>\n"; |
|
1250 | 1250 | $feed .= $this->_createAdditionalElements($this->additionalElements, ' '); |
1251 | - for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) { |
|
1251 | + for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) { |
|
1252 | 1252 | $feed .= " <entry>\n"; |
1253 | - $feed .= ' <title>' . htmlspecialchars(strip_tags($this->items[$i]->title)) . "</title>\n"; |
|
1254 | - $feed .= " <link rel=\"alternate\" type=\"text/html\" href=\"" . htmlspecialchars($this->items[$i]->link) . "\">\n"; |
|
1253 | + $feed .= ' <title>'.htmlspecialchars(strip_tags($this->items[$i]->title))."</title>\n"; |
|
1254 | + $feed .= " <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->items[$i]->link)."\">\n"; |
|
1255 | 1255 | if ('' == $this->items[$i]->date) { |
1256 | 1256 | $this->items[$i]->date = time(); |
1257 | 1257 | } |
1258 | 1258 | $itemDate = new FeedDate($this->items[$i]->date); |
1259 | - $feed .= ' <created>' . htmlspecialchars($itemDate->iso8601()) . "</created>\n"; |
|
1260 | - $feed .= ' <issued>' . htmlspecialchars($itemDate->iso8601()) . "</issued>\n"; |
|
1261 | - $feed .= ' <modified>' . htmlspecialchars($itemDate->iso8601()) . "</modified>\n"; |
|
1262 | - $feed .= ' <id>' . htmlspecialchars($this->items[$i]->link) . "</id>\n"; |
|
1259 | + $feed .= ' <created>'.htmlspecialchars($itemDate->iso8601())."</created>\n"; |
|
1260 | + $feed .= ' <issued>'.htmlspecialchars($itemDate->iso8601())."</issued>\n"; |
|
1261 | + $feed .= ' <modified>'.htmlspecialchars($itemDate->iso8601())."</modified>\n"; |
|
1262 | + $feed .= ' <id>'.htmlspecialchars($this->items[$i]->link)."</id>\n"; |
|
1263 | 1263 | $feed .= $this->_createAdditionalElements($this->items[$i]->additionalElements, ' '); |
1264 | 1264 | if ('' != $this->items[$i]->author) { |
1265 | 1265 | $feed .= " <author>\n"; |
1266 | - $feed .= ' <name>' . htmlspecialchars($this->items[$i]->author) . "</name>\n"; |
|
1266 | + $feed .= ' <name>'.htmlspecialchars($this->items[$i]->author)."</name>\n"; |
|
1267 | 1267 | $feed .= " </author>\n"; |
1268 | 1268 | } |
1269 | 1269 | if ('' != $this->items[$i]->description) { |
1270 | - $feed .= ' <summary>' . htmlspecialchars($this->items[$i]->description) . "</summary>\n"; |
|
1270 | + $feed .= ' <summary>'.htmlspecialchars($this->items[$i]->description)."</summary>\n"; |
|
1271 | 1271 | } |
1272 | 1272 | $feed .= " </entry>\n"; |
1273 | 1273 | } |
@@ -1312,23 +1312,23 @@ discard block |
||
1312 | 1312 | //$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary |
1313 | 1313 | $linlen = strlen($line); |
1314 | 1314 | $newline = ''; |
1315 | - for ($i = 0; $i < $linlen; ++$i) { |
|
1315 | + for ($i = 0; $i<$linlen; ++$i) { |
|
1316 | 1316 | $c = substr($line, $i, 1); |
1317 | 1317 | $dec = ord($c); |
1318 | - if ((32 == $dec) && ($i == ($linlen - 1))) { // convert space at eol only |
|
1318 | + if ((32 == $dec) && ($i == ($linlen-1))) { // convert space at eol only |
|
1319 | 1319 | $c = '=20'; |
1320 | - } elseif ((61 == $dec) || ($dec < 32) || ($dec > 126)) { // always encode "\t", which is *not* required |
|
1321 | - $h2 = floor($dec / 16); |
|
1322 | - $h1 = floor($dec % 16); |
|
1323 | - $c = $escape . $hex["$h2"] . $hex["$h1"]; |
|
1320 | + } elseif ((61 == $dec) || ($dec<32) || ($dec>126)) { // always encode "\t", which is *not* required |
|
1321 | + $h2 = floor($dec/16); |
|
1322 | + $h1 = floor($dec%16); |
|
1323 | + $c = $escape.$hex["$h2"].$hex["$h1"]; |
|
1324 | 1324 | } |
1325 | - if ((strlen($newline) + strlen($c)) >= $line_max) { // CRLF is not counted |
|
1326 | - $output .= $newline . $escape . $eol; // soft line break; " =\r\n" is okay |
|
1325 | + if ((strlen($newline)+strlen($c))>=$line_max) { // CRLF is not counted |
|
1326 | + $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay |
|
1327 | 1327 | $newline = ''; |
1328 | 1328 | } |
1329 | 1329 | $newline .= $c; |
1330 | 1330 | } // end of for |
1331 | - $output .= $newline . $eol; |
|
1331 | + $output .= $newline.$eol; |
|
1332 | 1332 | } |
1333 | 1333 | |
1334 | 1334 | return trim($output); |
@@ -1340,23 +1340,23 @@ discard block |
||
1340 | 1340 | */ |
1341 | 1341 | public function createFeed() |
1342 | 1342 | { |
1343 | - for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) { |
|
1343 | + for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) { |
|
1344 | 1344 | if ('' != $this->items[$i]->author) { |
1345 | 1345 | $from = $this->items[$i]->author; |
1346 | - } else { |
|
1346 | + }else { |
|
1347 | 1347 | $from = $this->title; |
1348 | 1348 | } |
1349 | 1349 | $itemDate = new FeedDate($this->items[$i]->date); |
1350 | - $feed .= 'From ' . strtr(MBOXCreator::qp_enc($from), ' ', '_') . ' ' . date('D M d H:i:s Y', $itemDate->unix()) . "\n"; |
|
1350 | + $feed .= 'From '.strtr(MBOXCreator::qp_enc($from), ' ', '_').' '.date('D M d H:i:s Y', $itemDate->unix())."\n"; |
|
1351 | 1351 | $feed .= "Content-Type: text/plain;\n"; |
1352 | - $feed .= " charset=\"" . $this->encoding . "\"\n"; |
|
1352 | + $feed .= " charset=\"".$this->encoding."\"\n"; |
|
1353 | 1353 | $feed .= "Content-Transfer-Encoding: quoted-printable\n"; |
1354 | 1354 | $feed .= "Content-Type: text/plain\n"; |
1355 | - $feed .= "From: \"" . MBOXCreator::qp_enc($from) . "\"\n"; |
|
1356 | - $feed .= 'Date: ' . $itemDate->rfc822() . "\n"; |
|
1357 | - $feed .= 'Subject: ' . MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title, 100)) . "\n"; |
|
1355 | + $feed .= "From: \"".MBOXCreator::qp_enc($from)."\"\n"; |
|
1356 | + $feed .= 'Date: '.$itemDate->rfc822()."\n"; |
|
1357 | + $feed .= 'Subject: '.MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title, 100))."\n"; |
|
1358 | 1358 | $feed .= "\n"; |
1359 | - $body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description)); |
|
1359 | + $body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description)); |
|
1360 | 1360 | $feed .= preg_replace("~\nFrom ([^\n]*)(\n?)~", "\n>From $1$2\n", $body); |
1361 | 1361 | $feed .= "\n"; |
1362 | 1362 | $feed .= "\n"; |
@@ -1375,7 +1375,7 @@ discard block |
||
1375 | 1375 | { |
1376 | 1376 | $fileInfo = pathinfo($_SERVER['PHP_SELF']); |
1377 | 1377 | |
1378 | - return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.mbox'; |
|
1378 | + return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension'])+1)).'.mbox'; |
|
1379 | 1379 | } |
1380 | 1380 | } |
1381 | 1381 | |
@@ -1401,35 +1401,35 @@ discard block |
||
1401 | 1401 | */ |
1402 | 1402 | public function createFeed() |
1403 | 1403 | { |
1404 | - $feed = "<?xml version=\"1.0\" encoding=\"" . $this->encoding . "\"?>\n"; |
|
1404 | + $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n"; |
|
1405 | 1405 | $feed .= $this->_createGeneratorComment(); |
1406 | 1406 | $feed .= $this->_createStylesheetReferences(); |
1407 | 1407 | $feed .= "<opml xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n"; |
1408 | 1408 | $feed .= " <head>\n"; |
1409 | - $feed .= ' <title>' . htmlspecialchars($this->title) . "</title>\n"; |
|
1409 | + $feed .= ' <title>'.htmlspecialchars($this->title)."</title>\n"; |
|
1410 | 1410 | if ('' != $this->pubDate) { |
1411 | 1411 | $date = new FeedDate($this->pubDate); |
1412 | - $feed .= ' <dateCreated>' . $date->rfc822() . "</dateCreated>\n"; |
|
1412 | + $feed .= ' <dateCreated>'.$date->rfc822()."</dateCreated>\n"; |
|
1413 | 1413 | } |
1414 | 1414 | if ('' != $this->lastBuildDate) { |
1415 | 1415 | $date = new FeedDate($this->lastBuildDate); |
1416 | - $feed .= ' <dateModified>' . $date->rfc822() . "</dateModified>\n"; |
|
1416 | + $feed .= ' <dateModified>'.$date->rfc822()."</dateModified>\n"; |
|
1417 | 1417 | } |
1418 | 1418 | if ('' != $this->editor) { |
1419 | - $feed .= ' <ownerName>' . $this->editor . "</ownerName>\n"; |
|
1419 | + $feed .= ' <ownerName>'.$this->editor."</ownerName>\n"; |
|
1420 | 1420 | } |
1421 | 1421 | if ('' != $this->editorEmail) { |
1422 | - $feed .= ' <ownerEmail>' . $this->editorEmail . "</ownerEmail>\n"; |
|
1422 | + $feed .= ' <ownerEmail>'.$this->editorEmail."</ownerEmail>\n"; |
|
1423 | 1423 | } |
1424 | 1424 | $feed .= " </head>\n"; |
1425 | 1425 | $feed .= " <body>\n"; |
1426 | - for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) { |
|
1426 | + for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) { |
|
1427 | 1427 | $feed .= " <outline type=\"rss\" "; |
1428 | 1428 | $title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title, "\n\r", ' '))); |
1429 | - $feed .= " title=\"" . $title . "\""; |
|
1430 | - $feed .= " text=\"" . $title . "\""; |
|
1429 | + $feed .= " title=\"".$title."\""; |
|
1430 | + $feed .= " text=\"".$title."\""; |
|
1431 | 1431 | //$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\""; |
1432 | - $feed .= " url=\"" . htmlspecialchars($this->items[$i]->link) . "\""; |
|
1432 | + $feed .= " url=\"".htmlspecialchars($this->items[$i]->link)."\""; |
|
1433 | 1433 | $feed .= ">\n"; |
1434 | 1434 | } |
1435 | 1435 | $feed .= " </body>\n"; |
@@ -1513,7 +1513,7 @@ discard block |
||
1513 | 1513 | |
1514 | 1514 | //if no stylePrefix is set, generate it yourself depending on the script name |
1515 | 1515 | if ('' == $this->stylePrefix) { |
1516 | - $this->stylePrefix = str_replace('.', '_', $this->_generateFilename()) . '_'; |
|
1516 | + $this->stylePrefix = str_replace('.', '_', $this->_generateFilename()).'_'; |
|
1517 | 1517 | } |
1518 | 1518 | |
1519 | 1519 | //set an openInNewWindow_token_to be inserted or not |
@@ -1524,49 +1524,49 @@ discard block |
||
1524 | 1524 | // use this array to put the lines in and implode later with "document.write" javascript |
1525 | 1525 | $feedArray = []; |
1526 | 1526 | if (null != $this->image) { |
1527 | - $imageStr = "<a href='" . $this->image->link . "'" . $targetInsert . '>' . "<img src='" . $this->image->url . "' border='0' alt='" . FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100) . "' align='" . $this->imageAlign . "' "; |
|
1527 | + $imageStr = "<a href='".$this->image->link."'".$targetInsert.'>'."<img src='".$this->image->url."' border='0' alt='".FeedCreator::iTrunc(htmlspecialchars($this->image->title), 100)."' align='".$this->imageAlign."' "; |
|
1528 | 1528 | if ($this->image->width) { |
1529 | - $imageStr .= " width='" . $this->image->width . "' "; |
|
1529 | + $imageStr .= " width='".$this->image->width."' "; |
|
1530 | 1530 | } |
1531 | 1531 | if ($this->image->height) { |
1532 | - $imageStr .= " height='" . $this->image->height . "' "; |
|
1532 | + $imageStr .= " height='".$this->image->height."' "; |
|
1533 | 1533 | } |
1534 | - $imageStr .= '></a>'; |
|
1534 | + $imageStr .= '></a>'; |
|
1535 | 1535 | $feedArray[] = $imageStr; |
1536 | 1536 | } |
1537 | 1537 | |
1538 | 1538 | if ($this->title) { |
1539 | - $feedArray[] = "<div class='" . $this->stylePrefix . "title'><a href='" . $this->link . "' " . $targetInsert . " class='" . $this->stylePrefix . "title'>" . FeedCreator::iTrunc(htmlspecialchars($this->title), 100) . '</a></div>'; |
|
1539 | + $feedArray[] = "<div class='".$this->stylePrefix."title'><a href='".$this->link."' ".$targetInsert." class='".$this->stylePrefix."title'>".FeedCreator::iTrunc(htmlspecialchars($this->title), 100).'</a></div>'; |
|
1540 | 1540 | } |
1541 | 1541 | if ($this->getDescription()) { |
1542 | - $feedArray[] = "<div class='" . $this->stylePrefix . "description'>" . str_replace(']]>', '', str_replace('<![CDATA[', '', $this->getDescription())) . '</div>'; |
|
1542 | + $feedArray[] = "<div class='".$this->stylePrefix."description'>".str_replace(']]>', '', str_replace('<![CDATA[', '', $this->getDescription())).'</div>'; |
|
1543 | 1543 | } |
1544 | 1544 | |
1545 | 1545 | if ($this->header) { |
1546 | - $feedArray[] = "<div class='" . $this->stylePrefix . "header'>" . $this->header . '</div>'; |
|
1546 | + $feedArray[] = "<div class='".$this->stylePrefix."header'>".$this->header.'</div>'; |
|
1547 | 1547 | } |
1548 | 1548 | |
1549 | - for ($i = 0, $iMax = count($this->items); $i < $iMax; ++$i) { |
|
1550 | - if ($this->separator && $i > 0) { |
|
1551 | - $feedArray[] = "<div class='" . $this->stylePrefix . "separator'>" . $this->separator . '</div>'; |
|
1549 | + for ($i = 0, $iMax = count($this->items); $i<$iMax; ++$i) { |
|
1550 | + if ($this->separator && $i>0) { |
|
1551 | + $feedArray[] = "<div class='".$this->stylePrefix."separator'>".$this->separator.'</div>'; |
|
1552 | 1552 | } |
1553 | 1553 | |
1554 | 1554 | if ($this->items[$i]->title) { |
1555 | 1555 | if ($this->items[$i]->link) { |
1556 | - $feedArray[] = "<div class='" . $this->stylePrefix . "item_title'><a href='" . $this->items[$i]->link . "' class='" . $this->stylePrefix . "item_title'" . $targetInsert . '>' . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100) . '</a></div>'; |
|
1557 | - } else { |
|
1558 | - $feedArray[] = "<div class='" . $this->stylePrefix . "item_title'>" . FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100) . '</div>'; |
|
1556 | + $feedArray[] = "<div class='".$this->stylePrefix."item_title'><a href='".$this->items[$i]->link."' class='".$this->stylePrefix."item_title'".$targetInsert.'>'.FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100).'</a></div>'; |
|
1557 | + }else { |
|
1558 | + $feedArray[] = "<div class='".$this->stylePrefix."item_title'>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)), 100).'</div>'; |
|
1559 | 1559 | } |
1560 | 1560 | } |
1561 | 1561 | if ($this->items[$i]->getDescription()) { |
1562 | - $feedArray[] = "<div class='" . $this->stylePrefix . "item_description'>" . str_replace(']]>', '', str_replace('<![CDATA[', '', $this->items[$i]->getDescription())) . '</div>'; |
|
1562 | + $feedArray[] = "<div class='".$this->stylePrefix."item_description'>".str_replace(']]>', '', str_replace('<![CDATA[', '', $this->items[$i]->getDescription())).'</div>'; |
|
1563 | 1563 | } |
1564 | 1564 | } |
1565 | 1565 | if ($this->footer) { |
1566 | - $feedArray[] = "<div class='" . $this->stylePrefix . "footer'>" . $this->footer . '</div>'; |
|
1566 | + $feedArray[] = "<div class='".$this->stylePrefix."footer'>".$this->footer.'</div>'; |
|
1567 | 1567 | } |
1568 | 1568 | |
1569 | - $feed = '' . implode($feedArray, "\r\n"); |
|
1569 | + $feed = ''.implode($feedArray, "\r\n"); |
|
1570 | 1570 | |
1571 | 1571 | return $feed; |
1572 | 1572 | } |
@@ -1582,7 +1582,7 @@ discard block |
||
1582 | 1582 | { |
1583 | 1583 | $fileInfo = pathinfo($_SERVER['PHP_SELF']); |
1584 | 1584 | |
1585 | - return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.html'; |
|
1585 | + return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension'])+1)).'.html'; |
|
1586 | 1586 | } |
1587 | 1587 | } |
1588 | 1588 | |
@@ -1614,7 +1614,7 @@ discard block |
||
1614 | 1614 | |
1615 | 1615 | $jsFeed = ''; |
1616 | 1616 | foreach ($feedArray as $value) { |
1617 | - $jsFeed .= "document.write('" . trim(addslashes($value)) . "');\n"; |
|
1617 | + $jsFeed .= "document.write('".trim(addslashes($value))."');\n"; |
|
1618 | 1618 | } |
1619 | 1619 | |
1620 | 1620 | return $jsFeed; |
@@ -1631,7 +1631,7 @@ discard block |
||
1631 | 1631 | { |
1632 | 1632 | $fileInfo = pathinfo($_SERVER['PHP_SELF']); |
1633 | 1633 | |
1634 | - return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension']) + 1)) . '.js'; |
|
1634 | + return substr($fileInfo['basename'], 0, -(strlen($fileInfo['extension'])+1)).'.js'; |
|
1635 | 1635 | } |
1636 | 1636 | } |
1637 | 1637 |
@@ -26,26 +26,26 @@ discard block |
||
26 | 26 | // ------------------------------------------------------------------------ // |
27 | 27 | use Xmf\Request; |
28 | 28 | |
29 | -include __DIR__ . '/header.php'; |
|
29 | +include __DIR__.'/header.php'; |
|
30 | 30 | |
31 | -$art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET');//(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0)); |
|
31 | +$art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET'); //(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0)); |
|
32 | 32 | if (empty($art_id)) { |
33 | 33 | redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID')); |
34 | 34 | } |
35 | 35 | if (!$xoopsUser->isAdmin()) { |
36 | 36 | redirect_header('javascript:history.go(-1);', 2, _NOPERM); |
37 | 37 | } |
38 | -include XOOPS_ROOT_PATH . '/header.php'; |
|
39 | -include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php'; |
|
38 | +include XOOPS_ROOT_PATH.'/header.php'; |
|
39 | +include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php'; |
|
40 | 40 | |
41 | 41 | $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']); |
42 | 42 | $article_obj = $articleHandler->get($art_id); |
43 | 43 | |
44 | -$op = Request::getCmd('op', 'check', 'POST');//isset($_POST['op']) ? $_POST['op'] : ''; |
|
44 | +$op = Request::getCmd('op', 'check', 'POST'); //isset($_POST['op']) ? $_POST['op'] : ''; |
|
45 | 45 | |
46 | 46 | if ('del' === $op || !empty(Request::getString('del', '', 'POST'))) { |
47 | 47 | $articleHandler->delete($article_obj); |
48 | - $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'; |
|
48 | + $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'; |
|
49 | 49 | $message = planet_constant('MD_SAVED'); |
50 | 50 | redirect_header($redirect, 2, $message); |
51 | 51 | } elseif ('save' === $op) { |
@@ -66,15 +66,15 @@ discard block |
||
66 | 66 | |
67 | 67 | $art_id_new = $articleHandler->insert($article_obj); |
68 | 68 | if (!$article_obj->getVar('art_id')) { |
69 | - $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php'; |
|
69 | + $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'; |
|
70 | 70 | $message = planet_constant('MD_INSERTERROR'); |
71 | - } else { |
|
72 | - $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id'); |
|
71 | + }else { |
|
72 | + $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_obj->getVar('art_id'); |
|
73 | 73 | $message = planet_constant('MD_SAVED'); |
74 | 74 | } |
75 | 75 | redirect_header($redirect, 2, $message); |
76 | -} else { |
|
77 | - require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; |
|
76 | +}else { |
|
77 | + require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php'; |
|
78 | 78 | |
79 | 79 | $form = new XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true); |
80 | 80 | |
@@ -93,9 +93,9 @@ discard block |
||
93 | 93 | $butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'"); |
94 | 94 | $button_tray->addElement($butt_del); |
95 | 95 | $butt_cancel = new XoopsFormButton('', 'cancel', _CANCEL, 'button'); |
96 | - $butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . (int)$art_id . "\"'"); |
|
96 | + $butt_cancel->setExtra("onclick='window.document.location=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.(int) $art_id."\"'"); |
|
97 | 97 | $button_tray->addElement($butt_cancel); |
98 | 98 | $form->addElement($button_tray); |
99 | 99 | $form->display(); |
100 | 100 | } |
101 | -include XOOPS_ROOT_PATH . '/footer.php'; |
|
101 | +include XOOPS_ROOT_PATH.'/footer.php'; |