mambax7 / planet

class/bookmark.php

Spacing +1 added lines, -1 removed lines

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

class/magpie.inc.php

Spacing +32 added lines, -32 removed lines

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

class/xmlparser.php

Spacing +7 added lines, -7 removed lines

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

class/feedcreator.class.php

Spacing +170 added lines, -170 removed lines

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

admin/admin.blog.php

Spacing +63 added lines, -63 removed lines

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

admin/menu.php

Spacing +7 added lines, -7 removed lines

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

admin/admin.category.php

Spacing +23 added lines, -23 removed lines

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

xml.php

Spacing +20 added lines, -20 removed lines

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

view.archive.php

Spacing +59 added lines, -59 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
     $args['year']  = @$args_num[0];
@@ -45,26 +45,26 @@ 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $blogHandler    = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 
-$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name') . ' - ' . planet_constant('MD_ACHIVE');
+$xoopsOption['xoops_pagetitle'] = $xoopsModule->getVar('name').' - '.planet_constant('MD_ACHIVE');
 $xoopsOption['template_main']   = PlanetUtility::planetGetTemplate('archive');
-require_once XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 $year = empty($year) ? date('Y') : $year;
-if ($month < 1) {
+if ($month<1) {
     $month        = $day = 0;
     $page['time'] = sprintf(planet_constant('MD_TIME_Y'), $year);
-} elseif ($day < 1) {
+} elseif ($day<1) {
     $day          = 0;
     $page['time'] = sprintf(planet_constant('MD_TIME_YM'), $year, $month);
-} else {
+}else {
     $page['time'] = sprintf(planet_constant('MD_TIME_YMD'), $year, $month, $day);
 }
 $time = ['year' => $year, 'month' => $month, 'day' => $day];
 if ($xoopsUser) {
-    $timeoffset = ($xoopsUser->getVar('timezone_offset') - $xoopsConfig['server_TZ']) * 3600;
-} else {
-    $timeoffset = ($xoopsConfig['default_TZ'] - $xoopsConfig['server_TZ']) * 3600;
+    $timeoffset = ($xoopsUser->getVar('timezone_offset')-$xoopsConfig['server_TZ'])*3600;
+}else {
+    $timeoffset = ($xoopsConfig['default_TZ']-$xoopsConfig['server_TZ'])*3600;
 }
 
 $criteria = new CriteriaCompo();
@@ -87,7 +87,7 @@ 
 $articles = [];
 $blogs_id = [];
 foreach ($articles_obj as $id => $article) {
-    $articles[]                            = [
+    $articles[] = [
         'id'      => $id,
         'blog'    => ['id' => $article->getVar('blog_id'), 'title' => ''],
         'title'   => $article->getVar('art_title'),
@@ -98,20 +98,20 @@ 
     $blogs_id[$article->getVar('blog_id')] = 1;
     unset($_article);
 }
-$criteria_blog = new Criteria('blog_id', '(' . implode(',', array_keys($blog_array)) . ')', 'IN');
+$criteria_blog = new Criteria('blog_id', '('.implode(',', array_keys($blog_array)).')', 'IN');
 $blogs         = $blogHandler->getList($criteria_blog);
 foreach (array_keys($articles) as $key) {
     $articles[$key]['blog']['title'] = $blogs[$articles[$key]['blog']['id']];
 }
-if ($blog_id > 0) {
+if ($blog_id>0) {
     $page['blog'] = $blogs[$blog_id];
 }
 
-if ($articles_count > $xoopsModuleConfig['articles_perpage']) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
-    $nav     = new XoopsPageNav($articles_count, $xoopsModuleConfig['articles_perpage'], $start, 'start', 'month=' . $month . '&amp;day=' . $day . '&amp;year=' . $year . '&amp;blog=' . (int)$blog_id);
+if ($articles_count>$xoopsModuleConfig['articles_perpage']) {
+    include XOOPS_ROOT_PATH.'/class/pagenav.php';
+    $nav     = new XoopsPageNav($articles_count, $xoopsModuleConfig['articles_perpage'], $start, 'start', 'month='.$month.'&amp;day='.$day.'&amp;year='.$year.'&amp;blog='.(int) $blog_id);
     $pagenav = $nav->renderNav(4);
-} else {
+}else {
     $pagenav = '';
 }
 
@@ -120,43 +120,43 @@ 
 $months   = null;
 if (empty($start)) {
     if ($blog_id) {
-        $blog_criteria = ' AND blog_id=' . $blog_id;
-    } else {
+        $blog_criteria = ' AND blog_id='.$blog_id;
+    }else {
         $blog_criteria = '';
     }
     // Get monthly list
     if (empty($month)) {
-        $sql    = "SELECT MONTH(FROM_UNIXTIME(art_time - $timeoffset)) AS mon, COUNT(DISTINCT art_id) AS count
-            FROM " . planet_DB_prefix('article') . "
+        $sql = "SELECT MONTH(FROM_UNIXTIME(art_time - $timeoffset)) AS mon, COUNT(DISTINCT art_id) AS count
+            FROM ".planet_DB_prefix('article')."
             WHERE YEAR(FROM_UNIXTIME(art_time - $timeoffset)) = $year
-            " . $blog_criteria . '
+            ".$blog_criteria.'
             GROUP BY mon
             ';
         $result = $xoopsDB->query($sql);
         $months = [];
         while ($myrow = $xoopsDB->fetchArray($result)) {
             $months[] = [
-                'title' => planet_constant('MD_MONTH_' . (int)$myrow['mon']) . ' (' . (int)$myrow['count'] . ')',
-                'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . '' . $year . '/' . $myrow['mon'] . '/b' . $blog_id
+                'title' => planet_constant('MD_MONTH_'.(int) $myrow['mon']).' ('.(int) $myrow['count'].')',
+                'url'   => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.archive.php'.URL_DELIMITER.''.$year.'/'.$myrow['mon'].'/b'.$blog_id
             ];
         }
         $timenav['prev'] = [
-            'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . '' . ($year - 1) . '/b' . $blog_id,
-            'title' => sprintf(planet_constant('MD_TIME_Y'), $year - 1)
+            'url'   => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.archive.php'.URL_DELIMITER.''.($year-1).'/b'.$blog_id,
+            'title' => sprintf(planet_constant('MD_TIME_Y'), $year-1)
         ];
-        if ($year < date('Y')) {
+        if ($year<date('Y')) {
             $timenav['next'] = [
-                'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . '' . ($year + 1) . '/b' . $blog_id,
-                'title' => sprintf(planet_constant('MD_TIME_Y'), $year + 1)
+                'url'   => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.archive.php'.URL_DELIMITER.''.($year+1).'/b'.$blog_id,
+                'title' => sprintf(planet_constant('MD_TIME_Y'), $year+1)
             ];
         }
     } // Get daily list
     elseif (empty($day)) {
-        $sql    = "SELECT DAY(FROM_UNIXTIME(art_time - $timeoffset)) AS day, COUNT(DISTINCT a.art_id) AS count
-            FROM " . planet_DB_prefix('article') . "
+        $sql = "SELECT DAY(FROM_UNIXTIME(art_time - $timeoffset)) AS day, COUNT(DISTINCT a.art_id) AS count
+            FROM ".planet_DB_prefix('article')."
             WHERE YEAR(FROM_UNIXTIME(art_time - $timeoffset)) = $year
             AND MONTH(FROM_UNIXTIME(art_time - $timeoffset)) = $month
-            " . $blog_criteria . '
+            ".$blog_criteria.'
             GROUP BY day
             ';
         $result = $xoopsDB->query($sql);
@@ -164,35 +164,35 @@ 
         while ($myrow = $xoopsDB->fetchArray($result)) {
             $days[$myrow['day']]['count'] = $myrow['count'];
         }
-        for ($i = 1; $i <= 31; ++$i) {
+        for ($i = 1; $i<=31; ++$i) {
             if (!isset($days[$i])) {
                 continue;
             }
             $days[$i] = [
                 'title' => $days[$i]['count'],
-                'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . '' . $year . '/' . $month . '/' . $i . '/b' . $blog_id
+                'url'   => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.archive.php'.URL_DELIMITER.''.$year.'/'.$month.'/'.$i.'/b'.$blog_id
             ];
         }
         $calendar   = planet_getCalendar($year, $month, $days);
-        $month_next = $month + 1;
-        $month_prev = $month - 1;
+        $month_next = $month+1;
+        $month_prev = $month-1;
         $_year      = $year;
         if ($month == 12) {
             $month_next = 1;
-            $_year      = $year + 1;
+            $_year      = $year+1;
         }
         if ($month == 1) {
             $month_pre = 12;
-            $_year     = $year - 1;
+            $_year     = $year-1;
         }
         $timenav['prev'] = [
-            'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . '' . $_year . '/' . $month_prev . '/b' . $blog_id,
-            'title' => planet_constant('MD_MONTH_' . $month_prev)
+            'url'   => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.archive.php'.URL_DELIMITER.''.$_year.'/'.$month_prev.'/b'.$blog_id,
+            'title' => planet_constant('MD_MONTH_'.$month_prev)
         ];
-        if ($year < date('Y') || $month < date('n')) {
+        if ($year<date('Y') || $month<date('n')) {
             $timenav['next'] = [
-                'url'   => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.archive.php' . URL_DELIMITER . '' . $_year . '/' . $month_next . '/b' . $blog_id,
-                'title' => planet_constant('MD_MONTH_' . $month_next)
+                'url'   => XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.archive.php'.URL_DELIMITER.''.$_year.'/'.$month_next.'/b'.$blog_id,
+                'title' => planet_constant('MD_MONTH_'.$month_next)
             ];
         }
     }
@@ -212,7 +212,7 @@ 
 $xoopsTpl->assign('timenav', $timenav);
 $xoopsTpl->assign('pagenav', $pagenav);
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 
 /**
  * @param null $year
@@ -229,24 +229,24 @@ 
     ob_start();
     echo '<table id="calendar">';
     echo '<caption>';
-    printf(planet_constant('MD_TIME_YM'), $year, planet_constant('MD_MONTH_' . $month));
+    printf(planet_constant('MD_TIME_YM'), $year, planet_constant('MD_MONTH_'.$month));
     echo '</caption>';
 
-    for ($i = 1; $i <= 7; ++$i) {
-        echo "\n\t\t<th abbr=\"" . planet_constant('MD_WEEK_' . $i) . "\" scope=\"col\" title=\"" . planet_constant('MD_WEEK_' . $i) . "\">" . planet_constant('MD_WEEK_' . $i) . '</th>';
+    for ($i = 1; $i<=7; ++$i) {
+        echo "\n\t\t<th abbr=\"".planet_constant('MD_WEEK_'.$i)."\" scope=\"col\" title=\"".planet_constant('MD_WEEK_'.$i)."\">".planet_constant('MD_WEEK_'.$i).'</th>';
     }
 
     echo '<tr>';
 
     // See how much we should pad in the beginning
     $week_begins = 1;
-    $pad         = planet_calendar_week_mod(date('w', $unixmonth) - $week_begins);
+    $pad         = planet_calendar_week_mod(date('w', $unixmonth)-$week_begins);
     if (0 != $pad) {
-        echo "\n\t\t" . '<td colspan="' . $pad . '">&nbsp;</td>';
+        echo "\n\t\t".'<td colspan="'.$pad.'">&nbsp;</td>';
     }
 
-    $daysinmonth = (int)date('t', $unixmonth);
-    for ($day = 1; $day <= $daysinmonth; ++$day) {
+    $daysinmonth = (int) date('t', $unixmonth);
+    for ($day = 1; $day<=$daysinmonth; ++$day) {
         if (isset($newrow) && $newrow) {
             echo "\n\t</tr>\n\t<tr>\n\t\t";
         }
@@ -255,26 +255,26 @@ 
         echo '<td>';
 
         if (!empty($days[$day]['url'])) {
-            echo '<a href="' . $days[$day]['url'] . "\"";
+            echo '<a href="'.$days[$day]['url']."\"";
             if (!empty($days[$day]['title'])) {
-                echo "title=\"" . $days[$day]['title'] . "\"";
+                echo "title=\"".$days[$day]['title']."\"";
             }
             echo ">$day</a>";
         } elseif (!empty($days[$day]['title'])) {
-            echo "<acronym title=\"" . $days[$day]['title'] . "\">$day</acronym>";
-        } else {
+            echo "<acronym title=\"".$days[$day]['title']."\">$day</acronym>";
+        }else {
             echo $day;
         }
         echo '</td>';
 
-        if (6 == planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year)) - $week_begins)) {
+        if (6 == planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year))-$week_begins)) {
             $newrow = true;
         }
     }
 
-    $pad = 7 - planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year)) - $week_begins);
+    $pad = 7-planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year))-$week_begins);
     if ($pad != 0 && $pad != 7) {
-        echo "\n\t\t" . '<td class="pad" colspan="' . $pad . '">&nbsp;</td>';
+        echo "\n\t\t".'<td class="pad" colspan="'.$pad.'">&nbsp;</td>';
     }
 
     echo "\n\t</tr>\n\t</tbody>\n\t</table>";
@@ -293,5 +293,5 @@ 
 {
     $base = 7;
 
-    return ($num - $base * floor($num / $base));
+    return ($num-$base*floor($num/$base));
 }