mambax7 / planet

view.archive.php

Indentation +148 added lines, -148 removed lines

@@ -32,9 +32,9 @@ 
 include __DIR__ . '/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['year']  = @$args_num[0];
-    $args['month'] = @$args_num[1];
-    $args['day']   = @$args_num[2];
+	$args['year']  = @$args_num[0];
+	$args['month'] = @$args_num[1];
+	$args['day']   = @$args_num[2];
 }
 
 $day     = Request::getInt('day', @$args['day'], 'GET'); //(int)(empty($_GET['day']) ? @$args['day'] : $_GET['day']);
@@ -55,31 +55,31 @@ 
 
 $year = empty($year) ? date('Y') : $year;
 if ($month < 1) {
-    $month        = $day = 0;
-    $page['time'] = sprintf(planet_constant('MD_TIME_Y'), $year);
+	$month        = $day = 0;
+	$page['time'] = sprintf(planet_constant('MD_TIME_Y'), $year);
 } elseif ($day < 1) {
-    $day          = 0;
-    $page['time'] = sprintf(planet_constant('MD_TIME_YM'), $year, $month);
+	$day          = 0;
+	$page['time'] = sprintf(planet_constant('MD_TIME_YM'), $year, $month);
 } else {
-    $page['time'] = sprintf(planet_constant('MD_TIME_YMD'), $year, $month, $day);
+	$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;
+	$timeoffset = ($xoopsUser->getVar('timezone_offset') - $xoopsConfig['server_TZ']) * 3600;
 } else {
-    $timeoffset = ($xoopsConfig['default_TZ'] - $xoopsConfig['server_TZ']) * 3600;
+	$timeoffset = ($xoopsConfig['default_TZ'] - $xoopsConfig['server_TZ']) * 3600;
 }
 
 $criteria = new \CriteriaCompo();
 if ($blog_id) {
-    $criteria->add(new \Criteria('blog_id', $blog_id));
+	$criteria->add(new \Criteria('blog_id', $blog_id));
 }
 $criteria->add(new \Criteria("YEAR(FROM_UNIXTIME(art_time_publish - $timeoffset))", $year));
 if ($month) {
-    $criteria->add(new \Criteria("MONTH(FROM_UNIXTIME(art_time_publish - $timeoffset))", $month));
-    if ($day) {
-        $criteria->add(new \Criteria("DAY(FROM_UNIXTIME(art_time_publish - $timeoffset))", $day));
-    }
+	$criteria->add(new \Criteria("MONTH(FROM_UNIXTIME(art_time_publish - $timeoffset))", $month));
+	if ($day) {
+		$criteria->add(new \Criteria("DAY(FROM_UNIXTIME(art_time_publish - $timeoffset))", $day));
+	}
 }
 $criteria->setStart($start);
 $criteria->setLimit($helper->getConfig('articles_perpage'));
@@ -90,115 +90,115 @@ 
 $articles = [];
 $blogs_id = [];
 foreach ($articles_obj as $id => $article) {
-    $articles[]                            = [
-        'id'      => $id,
-        'blog'    => ['id' => $article->getVar('blog_id'), 'title' => ''],
-        'title'   => $article->getVar('art_title'),
-        'time'    => $article->getTime(),
-        'content' => $article->getVar('art_content')
-    ];
-    $articles[]                            = $_article;
-    $blogs_id[$article->getVar('blog_id')] = 1;
-    unset($_article);
+	$articles[]                            = [
+		'id'      => $id,
+		'blog'    => ['id' => $article->getVar('blog_id'), 'title' => ''],
+		'title'   => $article->getVar('art_title'),
+		'time'    => $article->getTime(),
+		'content' => $article->getVar('art_content')
+	];
+	$articles[]                            = $_article;
+	$blogs_id[$article->getVar('blog_id')] = 1;
+	unset($_article);
 }
 $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']];
+	$articles[$key]['blog']['title'] = $blogs[$articles[$key]['blog']['id']];
 }
 if ($blog_id > 0) {
-    $page['blog'] = $blogs[$blog_id];
+	$page['blog'] = $blogs[$blog_id];
 }
 
 if ($articles_count > $helper->getConfig('articles_perpage')) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
-    $nav     = new \XoopsPageNav($articles_count, $helper->getConfig('articles_perpage'), $start, 'start', 'month=' . $month . '&amp;day=' . $day . '&amp;year=' . $year . '&amp;blog=' . $blog_id);
-    $pagenav = $nav->renderNav(4);
+	include XOOPS_ROOT_PATH . '/class/pagenav.php';
+	$nav     = new \XoopsPageNav($articles_count, $helper->getConfig('articles_perpage'), $start, 'start', 'month=' . $month . '&amp;day=' . $day . '&amp;year=' . $year . '&amp;blog=' . $blog_id);
+	$pagenav = $nav->renderNav(4);
 } else {
-    $pagenav = '';
+	$pagenav = '';
 }
 
 $timenav  = null;
 $calendar = null;
 $months   = null;
 if (empty($start)) {
-    if ($blog_id) {
-        $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
+	if ($blog_id) {
+		$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') . "
             WHERE YEAR(FROM_UNIXTIME(art_time - $timeoffset)) = $year
             " . $blog_criteria . '
             GROUP BY mon
             ';
-        $result = $xoopsDB->query($sql);
-        $months = [];
-        while (false !== ($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
-            ];
-        }
-        $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)
-        ];
-        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)
-            ];
-        }
-    } // Get daily list
-    elseif (empty($day)) {
-        $sql    = "SELECT DAY(FROM_UNIXTIME(art_time - $timeoffset)) AS day, COUNT(DISTINCT a.art_id) AS count
+		$result = $xoopsDB->query($sql);
+		$months = [];
+		while (false !== ($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
+			];
+		}
+		$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)
+		];
+		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)
+			];
+		}
+	} // 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') . "
             WHERE YEAR(FROM_UNIXTIME(art_time - $timeoffset)) = $year
             AND MONTH(FROM_UNIXTIME(art_time - $timeoffset)) = $month
             " . $blog_criteria . '
             GROUP BY day
             ';
-        $result = $xoopsDB->query($sql);
-        $days   = [];
-        while (false !== ($myrow = $xoopsDB->fetchArray($result))) {
-            $days[$myrow['day']]['count'] = $myrow['count'];
-        }
-        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
-            ];
-        }
-        $calendar   = planet_getCalendar($year, $month, $days);
-        $month_next = $month + 1;
-        $month_prev = $month - 1;
-        $_year      = $year;
-        if (12 == $month) {
-            $month_next = 1;
-            $_year      = $year + 1;
-        }
-        if (1 == $month) {
-            $month_pre = 12;
-            $_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)
-        ];
-        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)
-            ];
-        }
-    }
+		$result = $xoopsDB->query($sql);
+		$days   = [];
+		while (false !== ($myrow = $xoopsDB->fetchArray($result))) {
+			$days[$myrow['day']]['count'] = $myrow['count'];
+		}
+		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
+			];
+		}
+		$calendar   = planet_getCalendar($year, $month, $days);
+		$month_next = $month + 1;
+		$month_prev = $month - 1;
+		$_year      = $year;
+		if (12 == $month) {
+			$month_next = 1;
+			$_year      = $year + 1;
+		}
+		if (1 == $month) {
+			$month_pre = 12;
+			$_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)
+		];
+		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)
+			];
+		}
+	}
 }
 
 $xoopsTpl->assign('dirname', $GLOBALS['moddirname']);
@@ -225,66 +225,66 @@ 
  */
 function planet_getCalendar($year = null, $month = null, $days = null)
 {
-    $year      = empty($year) ? date('Y') : $year;
-    $month     = empty($month) ? date('n') : $month;
-    $unixmonth = mktime(0, 0, 0, $month, 1, $year);
+	$year      = empty($year) ? date('Y') : $year;
+	$month     = empty($month) ? date('n') : $month;
+	$unixmonth = mktime(0, 0, 0, $month, 1, $year);
 
-    ob_start();
-    echo '<table id="calendar">';
-    echo '<caption>';
-    printf(planet_constant('MD_TIME_YM'), $year, planet_constant('MD_MONTH_' . $month));
-    echo '</caption>';
+	ob_start();
+	echo '<table id="calendar">';
+	echo '<caption>';
+	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>';
+	echo '<tr>';
 
-    // See how much we should pad in the beginning
-    $week_begins = 1;
-    $pad         = planet_calendar_week_mod(date('w', $unixmonth) - $week_begins);
-    if (0 != $pad) {
-        echo "\n\t\t" . '<td colspan="' . $pad . '">&nbsp;</td>';
-    }
+	// See how much we should pad in the beginning
+	$week_begins = 1;
+	$pad         = planet_calendar_week_mod(date('w', $unixmonth) - $week_begins);
+	if (0 != $pad) {
+		echo "\n\t\t" . '<td colspan="' . $pad . '">&nbsp;</td>';
+	}
 
-    $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";
-        }
-        $newrow = false;
+	$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";
+		}
+		$newrow = false;
 
-        echo '<td>';
+		echo '<td>';
 
-        if (!empty($days[$day]['url'])) {
-            echo '<a href="' . $days[$day]['url'] . '"';
-            if (!empty($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 $day;
-        }
-        echo '</td>';
+		if (!empty($days[$day]['url'])) {
+			echo '<a href="' . $days[$day]['url'] . '"';
+			if (!empty($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 $day;
+		}
+		echo '</td>';
 
-        if (6 == planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year)) - $week_begins)) {
-            $newrow = true;
-        }
-    }
+		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);
-    if (0 != $pad && 7 != $pad) {
-        echo "\n\t\t" . '<td class="pad" colspan="' . $pad . '">&nbsp;</td>';
-    }
+	$pad = 7 - planet_calendar_week_mod(date('w', mktime(0, 0, 0, $month, $day, $year)) - $week_begins);
+	if (0 != $pad && 7 != $pad) {
+		echo "\n\t\t" . '<td class="pad" colspan="' . $pad . '">&nbsp;</td>';
+	}
 
-    echo "\n\t</tr>\n\t</tbody>\n\t</table>";
-    $calendar = ob_get_contents();
-    ob_end_clean();
+	echo "\n\t</tr>\n\t</tbody>\n\t</table>";
+	$calendar = ob_get_contents();
+	ob_end_clean();
 
-    return $calendar;
+	return $calendar;
 }
 
 // Used in get_calendar
@@ -294,7 +294,7 @@ 
  */
 function planet_calendar_week_mod($num)
 {
-    $base = 7;
+	$base = 7;
 
-    return ($num - $base * floor($num / $base));
+	return ($num - $base * floor($num / $base));
 }

Spacing +59 added lines, -59 removed lines

@@ -29,7 +29,7 @@ 
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
     $args['year']  = @$args_num[0];
@@ -48,26 +48,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();
@@ -90,7 +90,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'),
@@ -101,20 +101,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 > $helper->getConfig('articles_perpage')) {
-    include XOOPS_ROOT_PATH . '/class/pagenav.php';
-    $nav     = new \XoopsPageNav($articles_count, $helper->getConfig('articles_perpage'), $start, 'start', 'month=' . $month . '&amp;day=' . $day . '&amp;year=' . $year . '&amp;blog=' . $blog_id);
+if ($articles_count>$helper->getConfig('articles_perpage')) {
+    include XOOPS_ROOT_PATH.'/class/pagenav.php';
+    $nav     = new \XoopsPageNav($articles_count, $helper->getConfig('articles_perpage'), $start, 'start', 'month='.$month.'&amp;day='.$day.'&amp;year='.$year.'&amp;blog='.$blog_id);
     $pagenav = $nav->renderNav(4);
-} else {
+}else {
     $pagenav = '';
 }
 
@@ -123,43 +123,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 (false !== ($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);
@@ -167,35 +167,35 @@ 
         while (false !== ($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 (12 == $month) {
             $month_next = 1;
-            $_year      = $year + 1;
+            $_year      = $year+1;
         }
         if (1 == $month) {
             $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)
             ];
         }
     }
@@ -215,7 +215,7 @@ 
 $xoopsTpl->assign('timenav', $timenav);
 $xoopsTpl->assign('pagenav', $pagenav);
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 
 /**
  * @param null $year
@@ -232,24 +232,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";
         }
@@ -258,26 +258,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 (0 != $pad && 7 != $pad) {
-        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>";
@@ -296,5 +296,5 @@ 
 {
     $base = 7;
 
-    return ($num - $base * floor($num / $base));
+    return ($num-$base*floor($num/$base));
 }

action.article.php

Indentation +47 added lines, -47 removed lines

@@ -30,10 +30,10 @@ 
 
 $art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET');//(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
 if (empty($art_id)) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 if (!$xoopsUser->isAdmin()) {
-    redirect_header('javascript:history.go(-1);', 2, _NOPERM);
+	redirect_header('javascript:history.go(-1);', 2, _NOPERM);
 }
 include XOOPS_ROOT_PATH . '/header.php';
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
@@ -44,58 +44,58 @@ 
 $op = Request::getCmd('op', 'check', 'POST');//isset($_POST['op']) ? $_POST['op'] : '';
 
 if ('del' === $op || !empty(Request::getString('del', '', 'POST'))) {
-    $articleHandler->delete($article_obj);
-    $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
-    $message  = planet_constant('MD_SAVED');
-    redirect_header($redirect, 2, $message);
+	$articleHandler->delete($article_obj);
+	$redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+	$message  = planet_constant('MD_SAVED');
+	redirect_header($redirect, 2, $message);
 } elseif ('save' === $op) {
-    if (empty($_POST['art_content'])) {
-        redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_TEXTEMPTY'));
-    }
+	if (empty($_POST['art_content'])) {
+		redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_TEXTEMPTY'));
+	}
 
-    foreach ([
-                 'art_title',
-                 'art_link',
-                 'art_author',
-                 'art_content'
-             ] as $tag) {
-        if (@Request::getString('tag', '', 'POST') != $article_obj->getVar($tag)) {
-            $article_obj->setVar($tag, @Request::getString('tag', '', 'POST'));
-        }
-    }
+	foreach ([
+				 'art_title',
+				 'art_link',
+				 'art_author',
+				 'art_content'
+			 ] as $tag) {
+		if (@Request::getString('tag', '', 'POST') != $article_obj->getVar($tag)) {
+			$article_obj->setVar($tag, @Request::getString('tag', '', 'POST'));
+		}
+	}
 
-    $art_id_new = $articleHandler->insert($article_obj);
-    if (!$article_obj->getVar('art_id')) {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
-        $message  = planet_constant('MD_INSERTERROR');
-    } else {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
-        $message  = planet_constant('MD_SAVED');
-    }
-    redirect_header($redirect, 2, $message);
+	$art_id_new = $articleHandler->insert($article_obj);
+	if (!$article_obj->getVar('art_id')) {
+		$redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+		$message  = planet_constant('MD_INSERTERROR');
+	} else {
+		$redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+		$message  = planet_constant('MD_SAVED');
+	}
+	redirect_header($redirect, 2, $message);
 } else {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+	require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
 
-    $form = new \XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true);
+	$form = new \XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true);
 
-    $form->addElement(new \XoopsFormText(planet_constant('MD_TITLE'), 'art_title', 50, 255, $article_obj->getVar('art_title', 'E')), true);
-    $form->addElement(new \XoopsFormText(planet_constant('MD_LINK'), 'art_link', 50, 255, $article_obj->getVar('art_link', 'E')), true);
-    $form->addElement(new \XoopsFormText(planet_constant('MD_AUTHOR'), 'art_author', 80, 255, $article_obj->getVar('art_author', 'E')));
-    $form->addElement(new \XoopsFormTextArea(planet_constant('MD_CONTENT'), 'art_content', $article_obj->getVar('art_content', 'E')), true);
+	$form->addElement(new \XoopsFormText(planet_constant('MD_TITLE'), 'art_title', 50, 255, $article_obj->getVar('art_title', 'E')), true);
+	$form->addElement(new \XoopsFormText(planet_constant('MD_LINK'), 'art_link', 50, 255, $article_obj->getVar('art_link', 'E')), true);
+	$form->addElement(new \XoopsFormText(planet_constant('MD_AUTHOR'), 'art_author', 80, 255, $article_obj->getVar('art_author', 'E')));
+	$form->addElement(new \XoopsFormTextArea(planet_constant('MD_CONTENT'), 'art_content', $article_obj->getVar('art_content', 'E')), true);
 
-    $form->addElement(new \XoopsFormHidden('article', $art_id));
-    $form->addElement(new \XoopsFormHidden('op', 'save'));
+	$form->addElement(new \XoopsFormHidden('article', $art_id));
+	$form->addElement(new \XoopsFormHidden('op', 'save'));
 
-    $button_tray = new \XoopsFormElementTray('', '');
-    $butt_save   = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-    $button_tray->addElement($butt_save);
-    $butt_del = new \XoopsFormButton('', 'del', _DELETE, 'submit');
-    $butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
-    $button_tray->addElement($butt_del);
-    $butt_cancel = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
-    $butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $art_id . "\"'");
-    $button_tray->addElement($butt_cancel);
-    $form->addElement($button_tray);
-    $form->display();
+	$button_tray = new \XoopsFormElementTray('', '');
+	$butt_save   = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+	$button_tray->addElement($butt_save);
+	$butt_del = new \XoopsFormButton('', 'del', _DELETE, 'submit');
+	$butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
+	$button_tray->addElement($butt_del);
+	$butt_cancel = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
+	$butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $art_id . "\"'");
+	$button_tray->addElement($butt_cancel);
+	$form->addElement($button_tray);
+	$form->display();
 }
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +13 added lines, -13 removed lines

@@ -26,26 +26,26 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
-$art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET');//(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
+$art_id = Request::getInt('article', Request::getInt('article', 0, 'POST'), 'GET'); //(int)(isset($_GET['article']) ? $_GET['article'] : (isset($_POST['article']) ? $_POST['article'] : 0));
 if (empty($art_id)) {
     redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 if (!$xoopsUser->isAdmin()) {
     redirect_header('javascript:history.go(-1);', 2, _NOPERM);
 }
-include XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+include XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $article_obj    = $articleHandler->get($art_id);
 
-$op = Request::getCmd('op', 'check', 'POST');//isset($_POST['op']) ? $_POST['op'] : '';
+$op = Request::getCmd('op', 'check', 'POST'); //isset($_POST['op']) ? $_POST['op'] : '';
 
 if ('del' === $op || !empty(Request::getString('del', '', 'POST'))) {
     $articleHandler->delete($article_obj);
-    $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+    $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
     $message  = planet_constant('MD_SAVED');
     redirect_header($redirect, 2, $message);
 } elseif ('save' === $op) {
@@ -66,15 +66,15 @@ 
 
     $art_id_new = $articleHandler->insert($article_obj);
     if (!$article_obj->getVar('art_id')) {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php';
+        $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php';
         $message  = planet_constant('MD_INSERTERROR');
-    } else {
-        $redirect = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+    }else {
+        $redirect = XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_obj->getVar('art_id');
         $message  = planet_constant('MD_SAVED');
     }
     redirect_header($redirect, 2, $message);
-} else {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+}else {
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     $form = new \XoopsThemeForm(_EDIT, 'formarticle', xoops_getenv('PHP_SELF'), 'post', true);
 
@@ -93,9 +93,9 @@ 
     $butt_del->setExtra("onClick='document.forms.formarticle.op.value=del'");
     $button_tray->addElement($butt_del);
     $butt_cancel = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
-    $butt_cancel->setExtra("onclick='window.document.location=\"" . XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $art_id . "\"'");
+    $butt_cancel->setExtra("onclick='window.document.location=\"".XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$art_id."\"'");
     $button_tray->addElement($butt_cancel);
     $form->addElement($button_tray);
     $form->display();
 }
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

tests/testdata/index.php

Indentation +9 added lines, -9 removed lines

@@ -21,21 +21,21 @@
 $op = \Xmf\Request::getCmd('op', '');
 
 switch ($op) {
-    case 'load':
-        loadSampleData();
-        break;
+	case 'load':
+		loadSampleData();
+		break;
 }
 
 // XMF TableLoad for SAMPLE data
 
 function loadSampleData()
 {
-    //    $moduleDirName = basename(dirname(__DIR__));
-    xoops_loadLanguage('comment');
-    $items = \Xmf\Yaml::readWrapped('quotes_data.yml');
+	//    $moduleDirName = basename(dirname(__DIR__));
+	xoops_loadLanguage('comment');
+	$items = \Xmf\Yaml::readWrapped('quotes_data.yml');
 
-    \Xmf\Database\TableLoad::truncateTable('randomquote_quotes');
-    \Xmf\Database\TableLoad::loadTableFromArray('randomquote_quotes', $items);
+	\Xmf\Database\TableLoad::truncateTable('randomquote_quotes');
+	\Xmf\Database\TableLoad::loadTableFromArray('randomquote_quotes', $items);
 
-    redirect_header('../admin/index.php', 1, _CM_ACTIVE);
+	redirect_header('../admin/index.php', 1, _CM_ACTIVE);
 }

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  * @author          Michael Beck (aka Mamba)
  */
 
-require_once __DIR__ . '/../../../mainfile.php';
+require_once __DIR__.'/../../../mainfile.php';
 
 
 $op = \Xmf\Request::getCmd('op', '');

action.bookmark.php

Indentation +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 $blog_id = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(isset($_GET['blog']) ? $_GET['blog'] : (isset($_POST['blog']) ? $_POST['blog'] : 0));
 
 if (!is_object($xoopsUser) || empty($blog_id)) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 
 $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
@@ -39,14 +39,14 @@ 
 $criteria        = new \CriteriaCompo(new \Criteria('blog_id', $blog_id));
 $criteria->add(new \Criteria('bm_uid', $uid));
 if ($count = $bookmarkHandler->getCount($criteria)) {
-    $message = planet_constant('MD_ALREADYBOOKMARKED');
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid, 2, $message);
+	$message = planet_constant('MD_ALREADYBOOKMARKED');
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid, 2, $message);
 }
 $bookmark_obj = $bookmarkHandler->create();
 $bookmark_obj->setVar('blog_id', $blog_id);
 $bookmark_obj->setVar('bm_uid', $uid);
 if (!$bookmark_id = $bookmarkHandler->insert($bookmark_obj, true)) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, planet_constant('MD_NOTSAVED'));
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, planet_constant('MD_NOTSAVED'));
 }
 $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $blog_obj    = $blogHandler->get($blog_id);

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 // ------------------------------------------------------------------------ //
 use Xmf\Request;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $blog_id = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(isset($_GET['blog']) ? $_GET['blog'] : (isset($_POST['blog']) ? $_POST['blog'] : 0));
 
@@ -40,19 +40,19 @@ 
 $criteria->add(new \Criteria('bm_uid', $uid));
 if ($count = $bookmarkHandler->getCount($criteria)) {
     $message = planet_constant('MD_ALREADYBOOKMARKED');
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'u' . $uid, 2, $message);
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'u'.$uid, 2, $message);
 }
 $bookmark_obj = $bookmarkHandler->create();
 $bookmark_obj->setVar('blog_id', $blog_id);
 $bookmark_obj->setVar('bm_uid', $uid);
 if (!$bookmark_id = $bookmarkHandler->insert($bookmark_obj, true)) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, planet_constant('MD_NOTSAVED'));
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id, 2, planet_constant('MD_NOTSAVED'));
 }
 $blogHandler = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $blog_obj    = $blogHandler->get($blog_id);
-$marks       = $blog_obj->getVar('blog_marks') + 1;
-$blog_obj->setVar('blog_marks', $blog_obj->getVar('blog_marks') + 1);
+$marks       = $blog_obj->getVar('blog_marks')+1;
+$blog_obj->setVar('blog_marks', $blog_obj->getVar('blog_marks')+1);
 $blogHandler->insert($blog_obj, true);
 $message = planet_constant('MD_ACTIONDONE');
-redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
-include __DIR__ . '/footer.php';
+redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id, 2, $message);
+include __DIR__.'/footer.php';

trackback.php

Indentation +142 added lines, -142 removed lines

@@ -41,159 +41,159 @@
 $charset    = trim(Request::getString('charset', '', 'POST'));//trim($_POST['charset']);
 
 if (empty($helper->getConfig('trackback_option'))) {
-    PlanetUtility::planetRespondToTrackback(1, 'Trackback is closed');
+	PlanetUtility::planetRespondToTrackback(1, 'Trackback is closed');
 }
 if (!strlen($title . $url . $blog_name)) {
-    PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+	PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
 }
 
 if (!empty($article_id) && !empty($url)) {
-    $trackbackHandler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
-    $criteria         = new \CriteriaCompo(new \Criteria('art_id', $article_id));
-    $criteria->add(new \Criteria('tb_url', $url));
-    if ($trackbackHandler->getCount($criteria) > 0) {
-        PlanetUtility::planetRespondToTrackback(1, 'We already have a ping from that URI for this article.');
-    }
+	$trackbackHandler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
+	$criteria         = new \CriteriaCompo(new \Criteria('art_id', $article_id));
+	$criteria->add(new \Criteria('tb_url', $url));
+	if ($trackbackHandler->getCount($criteria) > 0) {
+		PlanetUtility::planetRespondToTrackback(1, 'We already have a ping from that URI for this article.');
+	}
 
-    $charset   = empty($charset) ? 'utf-8' : $charset;
-    $title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
-    $excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
-    $blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
-    $tb_status = (int)$helper->getConfig('trackback_option');
+	$charset   = empty($charset) ? 'utf-8' : $charset;
+	$title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
+	$excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
+	$blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
+	$tb_status = (int)$helper->getConfig('trackback_option');
 
-    $com_pid    = 0;
-    $com_itemid = $article_id;
-    $com_rootid = 0;
-    $com_title  = $title;
-    $com_text   = $excerpt;
-    $com_text   .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
-    if (!empty($url)) {
-        $com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
-    } else {
-        $com_text .= $blog_name;
-    }
-    $com_modid = $xoopsModule->getVar('mid');
+	$com_pid    = 0;
+	$com_itemid = $article_id;
+	$com_rootid = 0;
+	$com_title  = $title;
+	$com_text   = $excerpt;
+	$com_text   .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
+	if (!empty($url)) {
+		$com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
+	} else {
+		$com_text .= $blog_name;
+	}
+	$com_modid = $xoopsModule->getVar('mid');
 
-    $commentHandler = xoops_getHandler('comment');
-    $comment        = $commentHandler->create();
-    $comment->setVar('com_created', time());
-    $comment->setVar('com_pid', $com_pid);
-    $comment->setVar('com_itemid', $com_itemid);
-    $comment->setVar('com_rootid', $com_rootid);
-    $comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
-    switch ($tb_status) {
-        case 2:
-            $comment->setVar('com_status', 2);
-            $call_approvefunc = true;
-            $call_updatefunc  = true;
-            $notify_event     = 'comment';
-            break;
-        case 1:
-        default:
-            $comment->setVar('com_status', 1);
-            $notify_event = 'comment_submit';
-            break;
-    }
-    $comment->setVar('com_uid', 0);
-    $com_title = xoops_trim($com_title);
-    $com_title = empty($com_title) ? _NOTITLE : $com_title;
-    $comment->setVar('com_title', $com_title);
-    $comment->setVar('com_text', $com_text);
-    $comment->setVar('dohtml', 0);
-    $comment->setVar('dosmiley', 0);
-    $comment->setVar('doxcode', 1);
-    $comment->setVar('doimage', 0);
-    $comment->setVar('dobr', 1);
-    $comment->setVar('com_icon', '');
-    $comment->setVar('com_modified', time());
-    $comment->setVar('com_modid', $com_modid);
-    if (false != $commentHandler->insert($comment)) {
-        $newcid = $comment->getVar('com_id');
+	$commentHandler = xoops_getHandler('comment');
+	$comment        = $commentHandler->create();
+	$comment->setVar('com_created', time());
+	$comment->setVar('com_pid', $com_pid);
+	$comment->setVar('com_itemid', $com_itemid);
+	$comment->setVar('com_rootid', $com_rootid);
+	$comment->setVar('com_ip', xoops_getenv('REMOTE_ADDR'));
+	switch ($tb_status) {
+		case 2:
+			$comment->setVar('com_status', 2);
+			$call_approvefunc = true;
+			$call_updatefunc  = true;
+			$notify_event     = 'comment';
+			break;
+		case 1:
+		default:
+			$comment->setVar('com_status', 1);
+			$notify_event = 'comment_submit';
+			break;
+	}
+	$comment->setVar('com_uid', 0);
+	$com_title = xoops_trim($com_title);
+	$com_title = empty($com_title) ? _NOTITLE : $com_title;
+	$comment->setVar('com_title', $com_title);
+	$comment->setVar('com_text', $com_text);
+	$comment->setVar('dohtml', 0);
+	$comment->setVar('dosmiley', 0);
+	$comment->setVar('doxcode', 1);
+	$comment->setVar('doimage', 0);
+	$comment->setVar('dobr', 1);
+	$comment->setVar('com_icon', '');
+	$comment->setVar('com_modified', time());
+	$comment->setVar('com_modid', $com_modid);
+	if (false != $commentHandler->insert($comment)) {
+		$newcid = $comment->getVar('com_id');
 
-        // set own id as root id
-        $com_rootid = $newcid;
-        if (!$commentHandler->updateByField($comment, 'com_rootid', $com_rootid)) {
-            $commentHandler->delete($comment);
-            PlanetUtility::planetRespondToTrackback(1, xoops_error());
-        }
+		// set own id as root id
+		$com_rootid = $newcid;
+		if (!$commentHandler->updateByField($comment, 'com_rootid', $com_rootid)) {
+			$commentHandler->delete($comment);
+			PlanetUtility::planetRespondToTrackback(1, xoops_error());
+		}
 
-        // call custom approve function if any
-        if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
-            && '' != trim($comment_config['callback']['approve'])) {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['approve'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ('' != $callbackfile
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['approve'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $comment_config['callback']['approve']($comment);
-            }
-        }
+		// call custom approve function if any
+		if (false != $call_approvefunc && isset($comment_config['callback']['approve'])
+			&& '' != trim($comment_config['callback']['approve'])) {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['approve'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ('' != $callbackfile
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
+						require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['approve'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$comment_config['callback']['approve']($comment);
+			}
+		}
 
-        // call custom update function if any
-        if (false != $call_updatefunc && isset($comment_config['callback']['update'])
-            && '' != trim($comment_config['callback']['update'])) {
-            $skip = false;
-            if (!function_exists($comment_config['callback']['update'])) {
-                if (isset($comment_config['callbackFile'])) {
-                    $callbackfile = trim($comment_config['callbackFile']);
-                    if ('' != $callbackfile
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
-                    }
-                    if (!function_exists($comment_config['callback']['update'])) {
-                        $skip = true;
-                    }
-                } else {
-                    $skip = true;
-                }
-            }
-            if (!$skip) {
-                $criteria = new \CriteriaCompo(new \Criteria('com_modid', $com_modid));
-                $criteria->add(new \Criteria('com_itemid', $com_itemid));
-                $criteria->add(new \Criteria('com_status', XOOPS_COMMENT_ACTIVE));
-                $comment_count = $commentHandler->getCount($criteria);
-                $func          = $comment_config['callback']['update'];
-                call_user_func_array($func, [$com_itemid, $comment_count, $comment->getVar('com_id')]);
-            }
-        }
+		// call custom update function if any
+		if (false != $call_updatefunc && isset($comment_config['callback']['update'])
+			&& '' != trim($comment_config['callback']['update'])) {
+			$skip = false;
+			if (!function_exists($comment_config['callback']['update'])) {
+				if (isset($comment_config['callbackFile'])) {
+					$callbackfile = trim($comment_config['callbackFile']);
+					if ('' != $callbackfile
+						&& file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
+						require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+					}
+					if (!function_exists($comment_config['callback']['update'])) {
+						$skip = true;
+					}
+				} else {
+					$skip = true;
+				}
+			}
+			if (!$skip) {
+				$criteria = new \CriteriaCompo(new \Criteria('com_modid', $com_modid));
+				$criteria->add(new \Criteria('com_itemid', $com_itemid));
+				$criteria->add(new \Criteria('com_status', XOOPS_COMMENT_ACTIVE));
+				$comment_count = $commentHandler->getCount($criteria);
+				$func          = $comment_config['callback']['update'];
+				call_user_func_array($func, [$com_itemid, $comment_count, $comment->getVar('com_id')]);
+			}
+		}
 
-        // RMV-NOTIFY
-        // trigger notification event if necessary
-        if ($notify_event) {
-            $not_modid = $com_modid;
-            //            require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-            $not_catinfo  = notificationCommentCategoryInfo($not_modid);
-            $not_category = $not_catinfo['name'];
-            $not_itemid   = $com_itemid;
-            $not_event    = $notify_event;
-            // Build an ABSOLUTE URL to view the comment.  Make sure we
-            // point to a viewable page (i.e. not the system administration
-            // module).
-            $comment_tags = [];
-            $not_module   = $xoopsModule;
-            if (!isset($comment_url)) {
-                $com_config  = $not_module->getInfo('comments');
-                $comment_url = $com_config['pageName'] . '?';
-                $comment_url .= $com_config['itemName'];
-            }
-            $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
-            $notificationHandler           = xoops_getHandler('notification');
-            $notificationHandler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
-        }
+		// RMV-NOTIFY
+		// trigger notification event if necessary
+		if ($notify_event) {
+			$not_modid = $com_modid;
+			//            require_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
+			$not_catinfo  = notificationCommentCategoryInfo($not_modid);
+			$not_category = $not_catinfo['name'];
+			$not_itemid   = $com_itemid;
+			$not_event    = $notify_event;
+			// Build an ABSOLUTE URL to view the comment.  Make sure we
+			// point to a viewable page (i.e. not the system administration
+			// module).
+			$comment_tags = [];
+			$not_module   = $xoopsModule;
+			if (!isset($comment_url)) {
+				$com_config  = $not_module->getInfo('comments');
+				$comment_url = $com_config['pageName'] . '?';
+				$comment_url .= $com_config['itemName'];
+			}
+			$comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
+			$notificationHandler           = xoops_getHandler('notification');
+			$notificationHandler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
+		}
 
-        PlanetUtility::planetRespondToTrackback(0);
-    } else {
-        PlanetUtility::planetRespondToTrackback(1, xoops_error($comment->getHtmlErrors()));
-    }
+		PlanetUtility::planetRespondToTrackback(0);
+	} else {
+		PlanetUtility::planetRespondToTrackback(1, xoops_error($comment->getHtmlErrors()));
+	}
 }

Spacing +22 added lines, -22 removed lines

@@ -29,21 +29,21 @@ 
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 // trackback is done by a POST
 $art_id     = explode('/', Request::getString('REQUEST_URI', '', 'SERVER'));
-$article_id = (int)$art_id[count($art_id) - 1];
-$url        = Request::getString('url', '', 'POST');//$_POST['url'];
-$title      = Request::getString('title', '', 'POST');//$_POST['title'];
-$excerpt    = Request::getString('excerpt', '', 'POST');//$_POST['excerpt'];
-$blog_name  = Request::getString('blog_name', '', 'POST');//$_POST['blog_name'];
-$charset    = trim(Request::getString('charset', '', 'POST'));//trim($_POST['charset']);
+$article_id = (int) $art_id[count($art_id)-1];
+$url        = Request::getString('url', '', 'POST'); //$_POST['url'];
+$title      = Request::getString('title', '', 'POST'); //$_POST['title'];
+$excerpt    = Request::getString('excerpt', '', 'POST'); //$_POST['excerpt'];
+$blog_name  = Request::getString('blog_name', '', 'POST'); //$_POST['blog_name'];
+$charset    = trim(Request::getString('charset', '', 'POST')); //trim($_POST['charset']);
 
 if (empty($helper->getConfig('trackback_option'))) {
     PlanetUtility::planetRespondToTrackback(1, 'Trackback is closed');
 }
-if (!strlen($title . $url . $blog_name)) {
+if (!strlen($title.$url.$blog_name)) {
     PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
 }
 
@@ -51,7 +51,7 @@ 
     $trackbackHandler = xoops_getModuleHandler('trackback', $GLOBALS['moddirname']);
     $criteria         = new \CriteriaCompo(new \Criteria('art_id', $article_id));
     $criteria->add(new \Criteria('tb_url', $url));
-    if ($trackbackHandler->getCount($criteria) > 0) {
+    if ($trackbackHandler->getCount($criteria)>0) {
         PlanetUtility::planetRespondToTrackback(1, 'We already have a ping from that URI for this article.');
     }
 
@@ -59,17 +59,17 @@ 
     $title     = XoopsLocal::convert_encoding($title, _CHARSET, $charset);
     $excerpt   = XoopsLocal::convert_encoding($excerpt, _CHARSET, $charset);
     $blog_name = XoopsLocal::convert_encoding($blog_name, _CHARSET, $charset);
-    $tb_status = (int)$helper->getConfig('trackback_option');
+    $tb_status = (int) $helper->getConfig('trackback_option');
 
     $com_pid    = 0;
     $com_itemid = $article_id;
     $com_rootid = 0;
     $com_title  = $title;
     $com_text   = $excerpt;
-    $com_text   .= "\n\n[TRACKBACK]" . _POSTEDBY . ': ';
+    $com_text .= "\n\n[TRACKBACK]"._POSTEDBY.': ';
     if (!empty($url)) {
-        $com_text .= '[url=' . $url . ']' . $blog_name . '[/url]';
-    } else {
+        $com_text .= '[url='.$url.']'.$blog_name.'[/url]';
+    }else {
         $com_text .= $blog_name;
     }
     $com_modid = $xoopsModule->getVar('mid');
@@ -125,13 +125,13 @@ 
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
                     if ('' != $callbackfile
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+                        && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+                        require_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
                     }
                     if (!function_exists($comment_config['callback']['approve'])) {
                         $skip = true;
                     }
-                } else {
+                }else {
                     $skip = true;
                 }
             }
@@ -148,13 +148,13 @@ 
                 if (isset($comment_config['callbackFile'])) {
                     $callbackfile = trim($comment_config['callbackFile']);
                     if ('' != $callbackfile
-                        && file_exists(XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile)) {
-                        require_once XOOPS_ROOT_PATH . '/modules/' . $moddir . '/' . $callbackfile;
+                        && file_exists(XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile)) {
+                        require_once XOOPS_ROOT_PATH.'/modules/'.$moddir.'/'.$callbackfile;
                     }
                     if (!function_exists($comment_config['callback']['update'])) {
                         $skip = true;
                     }
-                } else {
+                }else {
                     $skip = true;
                 }
             }
@@ -184,16 +184,16 @@ 
             $not_module   = $xoopsModule;
             if (!isset($comment_url)) {
                 $com_config  = $not_module->getInfo('comments');
-                $comment_url = $com_config['pageName'] . '?';
+                $comment_url = $com_config['pageName'].'?';
                 $comment_url .= $com_config['itemName'];
             }
-            $comment_tags['X_COMMENT_URL'] = XOOPS_URL . '/modules/' . $not_module->getVar('dirname') . '/' . $comment_url . '=' . $com_itemid . '&com_id=' . $newcid . '&com_rootid=' . $com_rootid . '&com_mode=' . $com_mode . '&com_order=' . $com_order . '#comment' . $newcid;
+            $comment_tags['X_COMMENT_URL'] = XOOPS_URL.'/modules/'.$not_module->getVar('dirname').'/'.$comment_url.'='.$com_itemid.'&com_id='.$newcid.'&com_rootid='.$com_rootid.'&com_mode='.$com_mode.'&com_order='.$com_order.'#comment'.$newcid;
             $notificationHandler           = xoops_getHandler('notification');
             $notificationHandler->triggerEvent($not_category, $not_itemid, $not_event, $comment_tags, false, $not_modid);
         }
 
         PlanetUtility::planetRespondToTrackback(0);
-    } else {
+    }else {
         PlanetUtility::planetRespondToTrackback(1, xoops_error($comment->getHtmlErrors()));
     }
 }

action.rate.php

Indentation +47 added lines, -47 removed lines

@@ -37,61 +37,61 @@
 $blog_id    = Request::getInt('blog', Request::getInt('blog', 0, 'POST'), 'GET'); //(int)(!empty($_POST['blog']) ? $_POST['blog'] : (!empty($_GET['blog']) ? $_GET['blog'] : 0));
 
 if (empty($article_id) && empty($blog_id)) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID'));
 }
 
 $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
 $blogHandler    = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
-    $message = planet_constant('MD_NOACCESS');
+	$message = planet_constant('MD_NOACCESS');
 } else {
-    $uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
-    $ip  = PlanetUtility::planetGetIP();
-    if ($article_id > 0) {
-        $criteria = new \CriteriaCompo(new \Criteria('art_id', $article_id));
-    } else {
-        $criteria = new \CriteriaCompo(new \Criteria('blog_id', $blog_id));
-    }
-    if ($uid > 0) {
-        $criteria->add(new \Criteria('rate_uid', $uid));
-    } else {
-        $criteria->add(new \Criteria('rate_ip', $ip));
-        $criteria->add(new \Criteria('rate_time', time() - 24 * 3600, '>'));
-    }
-    $rateHandler = xoops_getModuleHandler('rate', $GLOBALS['moddirname']);
-    if ($count = $rateHandler->getCount($criteria)) {
-        $message = planet_constant('MD_ALREADYRATED');
-    } else {
-        $rate_obj = $rateHandler->create();
-        if ($article_id > 0) {
-            $rate_obj->setVar('art_id', $article_id);
-        } else {
-            $rate_obj->setVar('blog_id', $blog_id);
-        }
-        $rate_obj->setVar('rate_uid', $uid);
-        $rate_obj->setVar('rate_ip', $ip);
-        $rate_obj->setVar('rate_rating', $rate);
-        $rate_obj->setVar('rate_time', time());
-        if (!$rate_id = $rateHandler->insert($rate_obj, true)) {
-            redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_NOTSAVED'));
-        }
-        if ($article_id > 0) {
-            $article_obj = $articleHandler->get($article_id);
-            $article_obj->setVar('art_rating', $article_obj->getVar('art_rating') + $rate);
-            $article_obj->setVar('art_rates', $article_obj->getVar('art_rates') + 1);
-            $articleHandler->insert($article_obj, true);
-        } else {
-            $blog_obj = $blogHandler->get($blog_id);
-            $blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating') + $rate);
-            $blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates') + 1);
-            $blogHandler->insert($blog_obj, true);
-        }
-        $message = planet_constant('MD_ACTIONDONE');
-    }
+	$uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
+	$ip  = PlanetUtility::planetGetIP();
+	if ($article_id > 0) {
+		$criteria = new \CriteriaCompo(new \Criteria('art_id', $article_id));
+	} else {
+		$criteria = new \CriteriaCompo(new \Criteria('blog_id', $blog_id));
+	}
+	if ($uid > 0) {
+		$criteria->add(new \Criteria('rate_uid', $uid));
+	} else {
+		$criteria->add(new \Criteria('rate_ip', $ip));
+		$criteria->add(new \Criteria('rate_time', time() - 24 * 3600, '>'));
+	}
+	$rateHandler = xoops_getModuleHandler('rate', $GLOBALS['moddirname']);
+	if ($count = $rateHandler->getCount($criteria)) {
+		$message = planet_constant('MD_ALREADYRATED');
+	} else {
+		$rate_obj = $rateHandler->create();
+		if ($article_id > 0) {
+			$rate_obj->setVar('art_id', $article_id);
+		} else {
+			$rate_obj->setVar('blog_id', $blog_id);
+		}
+		$rate_obj->setVar('rate_uid', $uid);
+		$rate_obj->setVar('rate_ip', $ip);
+		$rate_obj->setVar('rate_rating', $rate);
+		$rate_obj->setVar('rate_time', time());
+		if (!$rate_id = $rateHandler->insert($rate_obj, true)) {
+			redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_NOTSAVED'));
+		}
+		if ($article_id > 0) {
+			$article_obj = $articleHandler->get($article_id);
+			$article_obj->setVar('art_rating', $article_obj->getVar('art_rating') + $rate);
+			$article_obj->setVar('art_rates', $article_obj->getVar('art_rates') + 1);
+			$articleHandler->insert($article_obj, true);
+		} else {
+			$blog_obj = $blogHandler->get($blog_id);
+			$blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating') + $rate);
+			$blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates') + 1);
+			$blogHandler->insert($blog_obj, true);
+		}
+		$message = planet_constant('MD_ACTIONDONE');
+	}
 }
 if ($article_id > 0) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_id, 2, $message);
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_id, 2, $message);
 } else {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+	redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
 }
 include __DIR__ . '/footer.php';

Spacing +21 added lines, -21 removed lines

@@ -27,7 +27,7 @@ 
 use Xmf\Request;
 use XoopsModules\Planet;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
@@ -44,28 +44,28 @@ 
 $blogHandler    = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 if (empty($helper->getConfig('anonymous_rate')) && !is_object($xoopsUser)) {
     $message = planet_constant('MD_NOACCESS');
-} else {
+}else {
     $uid = is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0;
     $ip  = PlanetUtility::planetGetIP();
-    if ($article_id > 0) {
+    if ($article_id>0) {
         $criteria = new \CriteriaCompo(new \Criteria('art_id', $article_id));
-    } else {
+    }else {
         $criteria = new \CriteriaCompo(new \Criteria('blog_id', $blog_id));
     }
-    if ($uid > 0) {
+    if ($uid>0) {
         $criteria->add(new \Criteria('rate_uid', $uid));
-    } else {
+    }else {
         $criteria->add(new \Criteria('rate_ip', $ip));
-        $criteria->add(new \Criteria('rate_time', time() - 24 * 3600, '>'));
+        $criteria->add(new \Criteria('rate_time', time()-24*3600, '>'));
     }
     $rateHandler = xoops_getModuleHandler('rate', $GLOBALS['moddirname']);
     if ($count = $rateHandler->getCount($criteria)) {
         $message = planet_constant('MD_ALREADYRATED');
-    } else {
+    }else {
         $rate_obj = $rateHandler->create();
-        if ($article_id > 0) {
+        if ($article_id>0) {
             $rate_obj->setVar('art_id', $article_id);
-        } else {
+        }else {
             $rate_obj->setVar('blog_id', $blog_id);
         }
         $rate_obj->setVar('rate_uid', $uid);
@@ -75,23 +75,23 @@ 
         if (!$rate_id = $rateHandler->insert($rate_obj, true)) {
             redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_NOTSAVED'));
         }
-        if ($article_id > 0) {
+        if ($article_id>0) {
             $article_obj = $articleHandler->get($article_id);
-            $article_obj->setVar('art_rating', $article_obj->getVar('art_rating') + $rate);
-            $article_obj->setVar('art_rates', $article_obj->getVar('art_rates') + 1);
+            $article_obj->setVar('art_rating', $article_obj->getVar('art_rating')+$rate);
+            $article_obj->setVar('art_rates', $article_obj->getVar('art_rates')+1);
             $articleHandler->insert($article_obj, true);
-        } else {
+        }else {
             $blog_obj = $blogHandler->get($blog_id);
-            $blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating') + $rate);
-            $blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates') + 1);
+            $blog_obj->setVar('blog_rating', $blog_obj->getVar('blog_rating')+$rate);
+            $blog_obj->setVar('blog_rates', $blog_obj->getVar('blog_rates')+1);
             $blogHandler->insert($blog_obj, true);
         }
         $message = planet_constant('MD_ACTIONDONE');
     }
 }
-if ($article_id > 0) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_id, 2, $message);
-} else {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+if ($article_id>0) {
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/view.article.php'.URL_DELIMITER.''.$article_id, 2, $message);
+}else {
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['moddirname'].'/index.php'.URL_DELIMITER.'b'.$blog_id, 2, $message);
 }
-include __DIR__ . '/footer.php';
+include __DIR__.'/footer.php';

comment_new.php

Indentation +4 added lines, -4 removed lines

@@ -27,8 +27,8 @@
 include __DIR__ . '/header.php';
 $com_itemid = \Xmf\Request::getInt('com_itemid', 0, 'GET');
 if ($com_itemid > 0) {
-    $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
-    $article_obj    = $articleHandler->get($com_itemid);
-    $com_replytitle = $article_obj->getVar('art_title');
-    require_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+	$articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
+	$article_obj    = $articleHandler->get($com_itemid);
+	$com_replytitle = $article_obj->getVar('art_title');
+	require_once XOOPS_ROOT_PATH . '/include/comment_new.php';
 }

Spacing +3 added lines, -3 removed lines

@@ -24,11 +24,11 @@
 // URL: https://xoops.org                         //
 // Project: Article Project                                                 //
 // ------------------------------------------------------------------------ //
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $com_itemid = \Xmf\Request::getInt('com_itemid', 0, 'GET');
-if ($com_itemid > 0) {
+if ($com_itemid>0) {
     $articleHandler = xoops_getModuleHandler('article', $GLOBALS['moddirname']);
     $article_obj    = $articleHandler->get($com_itemid);
     $com_replytitle = $article_obj->getVar('art_title');
-    require_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+    require_once XOOPS_ROOT_PATH.'/include/comment_new.php';
 }

action.blog.php

Indentation +107 added lines, -107 removed lines

@@ -37,15 +37,15 @@ 
 $blog_id = is_array($blog_id) ? array_map('intval', $blog_id) : (int)$blog_id;
 
 if (empty($helper->getConfig('newblog_submit')) && (!is_object($xoopsUser) || !$xoopsUser->isAdmin())) {
-    redirect_header('index.php', 2, _NOPERM);
+	redirect_header('index.php', 2, _NOPERM);
 }
 
 if ('save' === $op && !empty(Request::getString('fetch', '', 'POST'))) {//!empty($_POST['fetch'])) {
-    $op = 'edit';
+	$op = 'edit';
 }
 
 if ('save' === $op && !$GLOBALS['xoopsSecurity']->check()) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
+	redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
 }
 include XOOPS_ROOT_PATH . '/header.php';
 include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
@@ -54,110 +54,110 @@ 
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
 
 switch ($op) {
-    /* save a single blog */
-    case 'save':
-
-        if ($blog_id) {
-            $blog_obj = $blogHandler->get($blog_id);
-            if ($xoopsUser->isAdmin()) {
-                $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST'));// @$_POST['blog_status']);
-            }
-        } else {
-            if ($blog_exists = $blogHandler->getCount(new \Criteria('blog_feed', $myts->addSlashes(trim(Request::getText('blog_feed', '', 'POST')))))  //$_POST['blog_feed']))))
-            ) {
-                redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
-            }
-
-            $blog_obj = $blogHandler->create();
-            $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
-
-            switch ($helper->getConfig('newblog_submit')) {
-                case 2:
-                    if (!is_object($xoopsUser)) {
-                        $status = 0;
-                    } else {
-                        $status = 1;
-                    }
-                    break;
-                case 0:
-                case 3:
-                    $status = 1;
-                    break;
-                case 1:
-                default:
-                    if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
-                        $status = 0;
-                    } else {
-                        $status = 1;
-                    }
-                    break;
-            }
-
-            $blog_obj->setVar('blog_status', $status);
-        }
-
-        $blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST'));//$_POST['blog_title']);
-        $blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST'));//$_POST['blog_desc']);
-        $blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST'));//$_POST['blog_image']);
-        $blog_obj->setVar('blog_feed', Request::getText('blog_feed', '', 'POST'));//$_POST['blog_feed']);
-        $blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST'));//$_POST['blog_link']);
-        $blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST'));//$_POST['blog_language']);
-        $blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST'));//$_POST['blog_charset']);
-        $blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST'));//$_POST['blog_trackback']);
-        if ($blog_obj->isNew()) {
-            $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
-        }
-
-        if (!$blogHandler->insert($blog_obj)) {
-        } elseif (0 !== count(Request::getArray('categories', [], 'POST'))) {
-            $blog_id = $blog_obj->getVar('blog_id');
-            if (in_array(0, $_POST['categories'])) {
-                $_POST['categories'] = [];
-            }
-            $blogHandler->setCategories($blog_id, Request::getString('andor', '', 'POST'));//$_POST['categories']);
-        }
-        $message = planet_constant('MD_DBUPDATED');
-        redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
-
-    /* edit a single blog */
-    // no break
-    case 'edit':
-    default:
-        if (!empty(Request::getString('fetch', '', 'POST'))) {
-            $blog_obj = $blogHandler->fetch(Request::getText('blog_feed', '', 'POST'));
-            $blog_obj->setVar('blog_id', $blog_id);
-        } else {
-            $blog_obj = $blogHandler->get($blog_id);
-        }
-        $categories = Request::getArray('categories', [], 'POST');//isset($_POST['categories']) ? $_POST['categories'] : array();
-        if (in_array('-1', $categories)) {
-            $categories = [];
-        }
-        if (empty($categories) && $blog_id > 0) {
-            $crit       = new \Criteria('bc.blog_id', $blog_id);
-            $categories = array_keys($categoryHandler->getByBlog($crit));
-        }
-        if (empty($categories)) {
-            $categories = [0 => _NONE];
-        }
-
-        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('MD_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 '</div>';
-                unset($blogs_obj, $criteria);
-            }
-        }
-        include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
-        echo '</fieldset>';
-        break;
+	/* save a single blog */
+	case 'save':
+
+		if ($blog_id) {
+			$blog_obj = $blogHandler->get($blog_id);
+			if ($xoopsUser->isAdmin()) {
+				$blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST'));// @$_POST['blog_status']);
+			}
+		} else {
+			if ($blog_exists = $blogHandler->getCount(new \Criteria('blog_feed', $myts->addSlashes(trim(Request::getText('blog_feed', '', 'POST')))))  //$_POST['blog_feed']))))
+			) {
+				redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
+			}
+
+			$blog_obj = $blogHandler->create();
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
+
+			switch ($helper->getConfig('newblog_submit')) {
+				case 2:
+					if (!is_object($xoopsUser)) {
+						$status = 0;
+					} else {
+						$status = 1;
+					}
+					break;
+				case 0:
+				case 3:
+					$status = 1;
+					break;
+				case 1:
+				default:
+					if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
+						$status = 0;
+					} else {
+						$status = 1;
+					}
+					break;
+			}
+
+			$blog_obj->setVar('blog_status', $status);
+		}
+
+		$blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST'));//$_POST['blog_title']);
+		$blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST'));//$_POST['blog_desc']);
+		$blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST'));//$_POST['blog_image']);
+		$blog_obj->setVar('blog_feed', Request::getText('blog_feed', '', 'POST'));//$_POST['blog_feed']);
+		$blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST'));//$_POST['blog_link']);
+		$blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST'));//$_POST['blog_language']);
+		$blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST'));//$_POST['blog_charset']);
+		$blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST'));//$_POST['blog_trackback']);
+		if ($blog_obj->isNew()) {
+			$blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
+		}
+
+		if (!$blogHandler->insert($blog_obj)) {
+		} elseif (0 !== count(Request::getArray('categories', [], 'POST'))) {
+			$blog_id = $blog_obj->getVar('blog_id');
+			if (in_array(0, $_POST['categories'])) {
+				$_POST['categories'] = [];
+			}
+			$blogHandler->setCategories($blog_id, Request::getString('andor', '', 'POST'));//$_POST['categories']);
+		}
+		$message = planet_constant('MD_DBUPDATED');
+		redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+
+	/* edit a single blog */
+	// no break
+	case 'edit':
+	default:
+		if (!empty(Request::getString('fetch', '', 'POST'))) {
+			$blog_obj = $blogHandler->fetch(Request::getText('blog_feed', '', 'POST'));
+			$blog_obj->setVar('blog_id', $blog_id);
+		} else {
+			$blog_obj = $blogHandler->get($blog_id);
+		}
+		$categories = Request::getArray('categories', [], 'POST');//isset($_POST['categories']) ? $_POST['categories'] : array();
+		if (in_array('-1', $categories)) {
+			$categories = [];
+		}
+		if (empty($categories) && $blog_id > 0) {
+			$crit       = new \Criteria('bc.blog_id', $blog_id);
+			$categories = array_keys($categoryHandler->getByBlog($crit));
+		}
+		if (empty($categories)) {
+			$categories = [0 => _NONE];
+		}
+
+		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('MD_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 '</div>';
+				unset($blogs_obj, $criteria);
+			}
+		}
+		include XOOPS_ROOT_PATH . '/modules/' . $GLOBALS['moddirname'] . '/include/form.blog.php';
+		echo '</fieldset>';
+		break;
 }
 
 include XOOPS_ROOT_PATH . '/footer.php';

Spacing +30 added lines, -30 removed lines

@@ -27,14 +27,14 @@ 
 use Xmf\Request;
 use XoopsModules\Planet;
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 /** @var Planet\Helper $helper */
 $helper = Planet\Helper::getInstance();
 
-$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;
+$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;
 
 if (empty($helper->getConfig('newblog_submit')) && (!is_object($xoopsUser) || !$xoopsUser->isAdmin())) {
     redirect_header('index.php', 2, _NOPERM);
@@ -45,10 +45,10 @@ 
 }
 
 if ('save' === $op && !$GLOBALS['xoopsSecurity']->check()) {
-    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID') . ': security check failed');
+    redirect_header('javascript:history.go(-1);', 1, planet_constant('MD_INVALID').': security check failed');
 }
-include XOOPS_ROOT_PATH . '/header.php';
-include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php';
+include XOOPS_ROOT_PATH.'/header.php';
+include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/include/vars.php';
 
 $blogHandler     = xoops_getModuleHandler('blog', $GLOBALS['moddirname']);
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -60,9 +60,9 @@ 
         if ($blog_id) {
             $blog_obj = $blogHandler->get($blog_id);
             if ($xoopsUser->isAdmin()) {
-                $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST'));// @$_POST['blog_status']);
+                $blog_obj->setVar('blog_status', Request::getInt('blog_status', 0, 'POST')); // @$_POST['blog_status']);
             }
-        } else {
+        }else {
             if ($blog_exists = $blogHandler->getCount(new \Criteria('blog_feed', $myts->addSlashes(trim(Request::getText('blog_feed', '', 'POST')))))  //$_POST['blog_feed']))))
             ) {
                 redirect_header('index.php', 2, planet_constant('MD_BLOGEXISTS'));
@@ -75,7 +75,7 @@ 
                 case 2:
                     if (!is_object($xoopsUser)) {
                         $status = 0;
-                    } else {
+                    }else {
                         $status = 1;
                     }
                     break;
@@ -87,7 +87,7 @@ 
                 default:
                     if (!is_object($xoopsUser) || !$xoopsUser->isAdmin()) {
                         $status = 0;
-                    } else {
+                    }else {
                         $status = 1;
                     }
                     break;
@@ -96,14 +96,14 @@ 
             $blog_obj->setVar('blog_status', $status);
         }
 
-        $blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST'));//$_POST['blog_title']);
-        $blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST'));//$_POST['blog_desc']);
-        $blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST'));//$_POST['blog_image']);
-        $blog_obj->setVar('blog_feed', Request::getText('blog_feed', '', 'POST'));//$_POST['blog_feed']);
-        $blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST'));//$_POST['blog_link']);
-        $blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST'));//$_POST['blog_language']);
-        $blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST'));//$_POST['blog_charset']);
-        $blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST'));//$_POST['blog_trackback']);
+        $blog_obj->setVar('blog_title', Request::getString('blog_title', '', 'POST')); //$_POST['blog_title']);
+        $blog_obj->setVar('blog_desc', Request::getString('blog_desc', '', 'POST')); //$_POST['blog_desc']);
+        $blog_obj->setVar('blog_image', Request::getString('blog_image', '', 'POST')); //$_POST['blog_image']);
+        $blog_obj->setVar('blog_feed', Request::getText('blog_feed', '', 'POST')); //$_POST['blog_feed']);
+        $blog_obj->setVar('blog_link', Request::getString('blog_link', '', 'POST')); //$_POST['blog_link']);
+        $blog_obj->setVar('blog_language', Request::getString('blog_language', '', 'POST')); //$_POST['blog_language']);
+        $blog_obj->setVar('blog_charset', Request::getString('blog_charset', '', 'POST')); //$_POST['blog_charset']);
+        $blog_obj->setVar('blog_trackback', Request::getString('blog_trackback', '', 'POST')); //$_POST['blog_trackback']);
         if ($blog_obj->isNew()) {
             $blog_obj->setVar('blog_submitter', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : PlanetUtility::planetGetIP(true));
         }
@@ -114,10 +114,10 @@ 
             if (in_array(0, $_POST['categories'])) {
                 $_POST['categories'] = [];
             }
-            $blogHandler->setCategories($blog_id, Request::getString('andor', '', 'POST'));//$_POST['categories']);
+            $blogHandler->setCategories($blog_id, Request::getString('andor', '', 'POST')); //$_POST['categories']);
         }
         $message = planet_constant('MD_DBUPDATED');
-        redirect_header('index.php' . URL_DELIMITER . 'b' . $blog_id, 2, $message);
+        redirect_header('index.php'.URL_DELIMITER.'b'.$blog_id, 2, $message);
 
     /* edit a single blog */
     // no break
@@ -126,14 +126,14 @@ 
         if (!empty(Request::getString('fetch', '', 'POST'))) {
             $blog_obj = $blogHandler->fetch(Request::getText('blog_feed', '', 'POST'));
             $blog_obj->setVar('blog_id', $blog_id);
-        } else {
+        }else {
             $blog_obj = $blogHandler->get($blog_id);
         }
-        $categories = Request::getArray('categories', [], 'POST');//isset($_POST['categories']) ? $_POST['categories'] : array();
+        $categories = Request::getArray('categories', [], 'POST'); //isset($_POST['categories']) ? $_POST['categories'] : array();
         if (in_array('-1', $categories)) {
             $categories = [];
         }
-        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));
         }
@@ -141,23 +141,23 @@ 
             $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('MD_BLOGEXISTS');
+            if (count($blogs_obj)>0) {
+                echo '<div class="errorMsg">'.planet_constant('MD_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;
 }
 
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

xml.php

Indentation +125 added lines, -125 removed lines

@@ -33,8 +33,8 @@ 
 include __DIR__ . '/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
-    $args['article'] = @$args_num[0];
-    $args['type']    = @$args_str[0];
+	$args['article'] = @$args_num[0];
+	$args['type']    = @$args_str[0];
 }
 
 /* Specified Article */
@@ -51,14 +51,14 @@ 
 
 $valid_format = ['RSS0.91', 'RSS1.0', 'RSS2.0', 'PIE0.1', 'MBOX', 'OPML', 'ATOM', 'ATOM0.3', 'HTML', 'JS'];
 if ('RDF' === $type) {
-    $type = 'RSS1.0';
+	$type = 'RSS1.0';
 }
 if ('RSS' === $type) {
-    $type = 'RSS0.91';
+	$type = 'RSS0.91';
 }
 if (empty($type) || !in_array($type, $valid_format)) {
-    PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-    exit();
+	PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+	exit();
 }
 
 $categoryHandler = xoops_getModuleHandler('category', $GLOBALS['moddirname']);
@@ -67,30 +67,30 @@ 
 $bookmarkHandler = xoops_getModuleHandler('bookmark', $GLOBALS['moddirname']);
 
 if (!empty($article_id)) {
-    $article_obj = $articleHandler->get($article_id);
-    if (!$article_obj->getVar('art_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_EXPIRED'));
-        exit();
-    }
-    $source = 'article';
+	$article_obj = $articleHandler->get($article_id);
+	if (!$article_obj->getVar('art_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_EXPIRED'));
+		exit();
+	}
+	$source = 'article';
 } elseif (!empty($blog_id)) {
-    $blog_obj = $blogHandler->get($blog_id);
-    if (!$blog_obj->getVar('blog_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-        exit();
-    }
-    $source = 'blog';
+	$blog_obj = $blogHandler->get($blog_id);
+	if (!$blog_obj->getVar('blog_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+		exit();
+	}
+	$source = 'blog';
 } elseif (!empty($category_id)) {
-    $source       = 'category';
-    $category_obj = $categoryHandler->get($category_id);
-    if (!$category_obj->getVar('cat_id')) {
-        PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
-        exit();
-    }
+	$source       = 'category';
+	$category_obj = $categoryHandler->get($category_id);
+	if (!$category_obj->getVar('cat_id')) {
+		PlanetUtility::planetRespondToTrackback(1, planet_constant('MD_INVALID'));
+		exit();
+	}
 } elseif (!empty($uid)) {
-    $source = 'bookmark';
+	$source = 'bookmark';
 } else {
-    $source = '';
+	$source = '';
 }
 
 $xml_charset = 'UTF-8';
@@ -100,102 +100,102 @@ 
 $tpl->xoops_setCacheTime(3600);
 $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($helper->getConfig('articles_perpage'));
-    $articles_obj = [];
-    switch ($source) {
-        case 'article':
-            $pagetitle = planet_constant('MD_ARTICLE');
-            $rssdesc   = planet_constant('MD_XMLDESC_ARTICLE');
-
-            $articles_obj[$article_id] = $article_obj;
-
-            $xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
-            break;
-
-        case 'category':
-            $pagetitle = planet_constant('MD_CATEGORY');
-            $rssdesc   = sprintf(planet_constant('MD_XMLDESC_CATEGORY'), $category_obj->getVar('cat_title'));
-
-            $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;
-            break;
-
-        case 'blog':
-            $pagetitle = planet_constant('MD_BLOG');
-            $rssdesc   = sprintf(planet_constant('MD_XMLDESC_BLOG'), $blog_obj->getVar('blog_title'));
-
-            $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;
-            break;
-
-        case 'bookmark':
-            $author_name = XoopsUser::getUnameFromId($uid);
-            $pagetitle   = planet_constant('MD_BOOKMARKS');
-            $rssdesc     = sprintf(planet_constant('MD_XMLDESC_BOOKMARK'), $author_name);
-
-            $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;
-
-            break;
-
-        default:
-            $pagetitle = planet_constant('MD_INDEX');
-            $rssdesc   = planet_constant('MD_XMLDESC_INDEX');
-
-            $articles_obj = $articleHandler->getAll($criteria);
-
-            $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');
-        $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'),
-            'description'               => $content,
-            'descriptionHtmlSyndicated' => true,
-            'date'                      => $articles_obj[$id]->getTime('rss'),
-            'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
-            'author'                    => $articles_obj[$id]->getVar('art_author')
-        ];
-    }
-    unset($articles_obj, $criteria);
-
-    $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('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('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'));
-    $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'] . '/',
-        'description' => $rssdesc
-    ];
-    $xml->setImage($image);
-
-    /*
+	$criteria = new \CriteriaCompo();
+	$criteria->setLimit($helper->getConfig('articles_perpage'));
+	$articles_obj = [];
+	switch ($source) {
+		case 'article':
+			$pagetitle = planet_constant('MD_ARTICLE');
+			$rssdesc   = planet_constant('MD_XMLDESC_ARTICLE');
+
+			$articles_obj[$article_id] = $article_obj;
+
+			$xml_link = XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/view.article.php' . URL_DELIMITER . '' . $article_obj->getVar('art_id');
+			break;
+
+		case 'category':
+			$pagetitle = planet_constant('MD_CATEGORY');
+			$rssdesc   = sprintf(planet_constant('MD_XMLDESC_CATEGORY'), $category_obj->getVar('cat_title'));
+
+			$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;
+			break;
+
+		case 'blog':
+			$pagetitle = planet_constant('MD_BLOG');
+			$rssdesc   = sprintf(planet_constant('MD_XMLDESC_BLOG'), $blog_obj->getVar('blog_title'));
+
+			$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;
+			break;
+
+		case 'bookmark':
+			$author_name = XoopsUser::getUnameFromId($uid);
+			$pagetitle   = planet_constant('MD_BOOKMARKS');
+			$rssdesc     = sprintf(planet_constant('MD_XMLDESC_BOOKMARK'), $author_name);
+
+			$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;
+
+			break;
+
+		default:
+			$pagetitle = planet_constant('MD_INDEX');
+			$rssdesc   = planet_constant('MD_XMLDESC_INDEX');
+
+			$articles_obj = $articleHandler->getAll($criteria);
+
+			$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');
+		$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'),
+			'description'               => $content,
+			'descriptionHtmlSyndicated' => true,
+			'date'                      => $articles_obj[$id]->getTime('rss'),
+			'source'                    => XOOPS_URL . '/modules/' . $GLOBALS['moddirname'] . '/',
+			'author'                    => $articles_obj[$id]->getVar('art_author')
+		];
+	}
+	unset($articles_obj, $criteria);
+
+	$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('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('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'));
+	$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'] . '/',
+		'description' => $rssdesc
+	];
+	$xml->setImage($image);
+
+	/*
     $item = array(
         "title" => $datatitle,
         "link" => $dataurl,
@@ -206,11 +206,11 @@ 
         "author" => $dataauthor
         );
     */
-    $xml->addItems($items);
+	$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);
+	$tpl->assign_by_ref('dummy_content', $dummy_content);
 }
 //$content = ob_get_contents();
 ob_end_clean();

Spacing +21 added lines, -21 removed lines

@@ -30,7 +30,7 @@ 
 $helper = Planet\Helper::getInstance();
 
 ob_start();
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 if (PlanetUtility::planetParseArguments($args_num, $args, $args_str)) {
     $args['article'] = @$args_num[0];
@@ -89,16 +89,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->caching=(2);
+$tpl->caching = (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($helper->getConfig('articles_perpage'));
@@ -110,7 +110,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':
@@ -120,7 +120,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':
@@ -130,7 +130,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':
@@ -141,7 +141,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;
 
@@ -151,20 +151,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')
         ];
     }
@@ -173,24 +173,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);
@@ -208,11 +208,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);