mambax7 / newbb5

include/functions.stats.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_STATS_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_STATS')) {
@@ -102,7 +102,7 @@ 
      */
     function getTotalViews()
     {
-        $sql = 'SELECT sum(topic_views) FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' ';
+        $sql = 'SELECT sum(topic_views) FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' ';
         if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
             return null;
         }

Indentation +78 added lines, -78 removed lines

@@ -17,97 +17,97 @@
 define('NEWBB_FUNCTIONS_STATS_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_STATS')) {
-    define('NEWBB_FUNCTIONS_STATS', 1);
+	define('NEWBB_FUNCTIONS_STATS', 1);
 
-    /**
-     * @return mixed
-     */
-    function newbbGetStats()
-    {
-        /** @var Newbb\StatsHandler $statsHandler */
-        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
-        $stats        = $statsHandler->getStats();
+	/**
+	 * @return mixed
+	 */
+	function newbbGetStats()
+	{
+		/** @var Newbb\StatsHandler $statsHandler */
+		$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+		$stats        = $statsHandler->getStats();
 
-        return $stats;
-    }
+		return $stats;
+	}
 
-    /**
-     * @param        $id
-     * @param        $type
-     * @param  int   $increment
-     * @return mixed
-     */
-    function newbbUpdateStats($id, $type, $increment = 1)
-    {
-        /** @var Newbb\StatsHandler $statsHandler */
-        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+	/**
+	 * @param        $id
+	 * @param        $type
+	 * @param  int   $increment
+	 * @return mixed
+	 */
+	function newbbUpdateStats($id, $type, $increment = 1)
+	{
+		/** @var Newbb\StatsHandler $statsHandler */
+		$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
 
-        return $statsHandler->update($id, $type, $increment);
-    }
+		return $statsHandler->update($id, $type, $increment);
+	}
 
-    /*
+	/*
     * Gets the total number of topics in a form
     */
-    /**
-     * @param  string $forum_id
-     * @return mixed
-     */
-    function getTotalTopics($forum_id = '')
-    {
-        /** @var Newbb\TopicHandler $topicHandler */
-        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        $criteria     = new \CriteriaCompo(new \Criteria('approved', 0, '>'));
-        if ($forum_id) {
-            $criteria->add(new \Criteria('forum_id', (int)$forum_id));
-        }
+	/**
+	 * @param  string $forum_id
+	 * @return mixed
+	 */
+	function getTotalTopics($forum_id = '')
+	{
+		/** @var Newbb\TopicHandler $topicHandler */
+		$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		$criteria     = new \CriteriaCompo(new \Criteria('approved', 0, '>'));
+		if ($forum_id) {
+			$criteria->add(new \Criteria('forum_id', (int)$forum_id));
+		}
 
-        return $topicHandler->getCount($criteria);
-    }
+		return $topicHandler->getCount($criteria);
+	}
 
-    /*
+	/*
     * Returns the total number of posts in the whole system, a forum, or a topic
     * Also can return the number of users on the system.
     */
-    /**
-     * @param  int    $id
-     * @param  string $type
-     * @return mixed
-     */
-    function getTotalPosts($id = 0, $type = 'all')
-    {
-        /** @var Newbb\PostHandler $postHandler */
-        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-        $criteria    = new \CriteriaCompo(new \Criteria('approved', 0, '>'));
-        switch ($type) {
-            case 'forum':
-                if ($id > 0) {
-                    $criteria->add(new \Criteria('forum_id', (int)$id));
-                }
-                break;
-            case 'topic':
-                if ($id > 0) {
-                    $criteria->add(new \Criteria('topic_id', (int)$id));
-                }
-                break;
-            case 'all':
-            default:
-                break;
-        }
+	/**
+	 * @param  int    $id
+	 * @param  string $type
+	 * @return mixed
+	 */
+	function getTotalPosts($id = 0, $type = 'all')
+	{
+		/** @var Newbb\PostHandler $postHandler */
+		$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+		$criteria    = new \CriteriaCompo(new \Criteria('approved', 0, '>'));
+		switch ($type) {
+			case 'forum':
+				if ($id > 0) {
+					$criteria->add(new \Criteria('forum_id', (int)$id));
+				}
+				break;
+			case 'topic':
+				if ($id > 0) {
+					$criteria->add(new \Criteria('topic_id', (int)$id));
+				}
+				break;
+			case 'all':
+			default:
+				break;
+		}
 
-        return $postHandler->getCount($criteria);
-    }
+		return $postHandler->getCount($criteria);
+	}
 
-    /**
-     * @return null
-     */
-    function getTotalViews()
-    {
-        $sql = 'SELECT sum(topic_views) FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' ';
-        if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-            return null;
-        }
-        list($total) = $GLOBALS['xoopsDB']->fetchRow($result);
+	/**
+	 * @return null
+	 */
+	function getTotalViews()
+	{
+		$sql = 'SELECT sum(topic_views) FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' ';
+		if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+			return null;
+		}
+		list($total) = $GLOBALS['xoopsDB']->fetchRow($result);
 
-        return $total;
-    }
+		return $total;
+	}
 }

include/functions.language.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_LANGUAGE_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_LANGUAGE')) {

Indentation +16 added lines, -16 removed lines

@@ -15,22 +15,22 @@
 define('NEWBB_FUNCTIONS_LANGUAGE_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_LANGUAGE')) {
-    define('NEWBB_FUNCTIONS_LANGUAGE', 1);
+	define('NEWBB_FUNCTIONS_LANGUAGE', 1);
 
-    /**
-     * @param         $page
-     * @param  string $dirname
-     * @return bool
-     */
-    function newbbLoadLanguage($page, $dirname = 'newbb')
-    {
-        $page = str_replace('..', '', $page);
-        if (!@require_once $GLOBALS['xoops']->path("modules/{$dirname}/{$GLOBALS['xoopsConfig']['language']}/{$language}.php")) {
-            if (!@require_once $GLOBALS['xoops']->path("modules/{$dirname}/language/{$language}.php")) {
-                return false;
-            }
-        }
+	/**
+	 * @param         $page
+	 * @param  string $dirname
+	 * @return bool
+	 */
+	function newbbLoadLanguage($page, $dirname = 'newbb')
+	{
+		$page = str_replace('..', '', $page);
+		if (!@require_once $GLOBALS['xoops']->path("modules/{$dirname}/{$GLOBALS['xoopsConfig']['language']}/{$language}.php")) {
+			if (!@require_once $GLOBALS['xoops']->path("modules/{$dirname}/language/{$language}.php")) {
+				return false;
+			}
+		}
 
-        return true;
-    }
+		return true;
+	}
 }

include/functions.time.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_TIME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_TIME')) {
@@ -76,7 +76,7 @@ 
         // irmtfan no option when no selected value
         $forum_selection_since .= '<option value="">--------</option>';
         foreach ($select_array as $since) {
-            $forum_selection_since .= '<option value="' . $since . '"' . (($selected == $since) ? ' selected="selected"' : '') . '>';
+            $forum_selection_since .= '<option value="'.$since.'"'.(($selected == $since) ? ' selected="selected"' : '').'>';
             // START irmtfan functional since 0 and 365
             switch ($since) {
                 case 0:

Indentation +95 added lines, -95 removed lines

@@ -15,106 +15,106 @@
 define('NEWBB_FUNCTIONS_TIME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_TIME')) {
-    define('NEWBB_FUNCTIONS_TIME', 1);
+	define('NEWBB_FUNCTIONS_TIME', 1);
 
-    /**
-     * Function to convert UNIX time to formatted time string
-     * @param         $time
-     * @param  string $format
-     * @param  string $timeoffset
-     * @return string
-     */
-    function newbbFormatTimestamp($time, $format = 'c', $timeoffset = '')
-    {
-        xoops_loadLanguage('locale');
-        $newbbConfig = newbbLoadConfig();
+	/**
+	 * Function to convert UNIX time to formatted time string
+	 * @param         $time
+	 * @param  string $format
+	 * @param  string $timeoffset
+	 * @return string
+	 */
+	function newbbFormatTimestamp($time, $format = 'c', $timeoffset = '')
+	{
+		xoops_loadLanguage('locale');
+		$newbbConfig = newbbLoadConfig();
 
-        $format = strtolower($format);
-        if ('reg' === $format || '' === $format) {
-            $format = 'c';
-        }
-        if (('custom' === $format || 'c' === $format) && !empty($newbbConfig['formatTimestamp_custom'])) {
-            $format = $newbbConfig['formatTimestamp_custom'];
-        }
+		$format = strtolower($format);
+		if ('reg' === $format || '' === $format) {
+			$format = 'c';
+		}
+		if (('custom' === $format || 'c' === $format) && !empty($newbbConfig['formatTimestamp_custom'])) {
+			$format = $newbbConfig['formatTimestamp_custom'];
+		}
 
-        return XoopsLocal::formatTimestamp($time, $format, $timeoffset);
-    }
+		return XoopsLocal::formatTimestamp($time, $format, $timeoffset);
+	}
 
-    /**
-     * @param  int $selected
-     * @return string
-     */
-    function newbbSinceSelectBox($selected = 100)
-    {
-        $newbbConfig = newbbLoadConfig();
-        // irmtfan - new method to get user inputs
-        preg_match_all('/-?\d+/', $newbbConfig['since_options'], $match);
-        $select_array = array_unique($match[0]);
-        //$select_array = explode(',', $newbbConfig['since_options']);
-        //$select_array = array_map('trim', $select_array);
-        // irmtfan - if the array is empty do not show selection box
-        if (!(bool)$select_array) {
-            $since = $newbbConfig['since_default'];
-            switch ($since) {
-                case 0:
-                    $forum_since = _MD_NEWBB_BEGINNING;
-                    break;
-                case 365:
-                    $forum_since = _MD_NEWBB_THELASTYEAR;
-                    break;
-                default:
-                    if ($since > 0) {
-                        $forum_since = sprintf(_MD_NEWBB_FROMLASTDAYS, $since);
-                    } else {
-                        $forum_since = sprintf(_MD_NEWBB_FROMLASTHOURS, abs($since));
-                    }
-            }
+	/**
+	 * @param  int $selected
+	 * @return string
+	 */
+	function newbbSinceSelectBox($selected = 100)
+	{
+		$newbbConfig = newbbLoadConfig();
+		// irmtfan - new method to get user inputs
+		preg_match_all('/-?\d+/', $newbbConfig['since_options'], $match);
+		$select_array = array_unique($match[0]);
+		//$select_array = explode(',', $newbbConfig['since_options']);
+		//$select_array = array_map('trim', $select_array);
+		// irmtfan - if the array is empty do not show selection box
+		if (!(bool)$select_array) {
+			$since = $newbbConfig['since_default'];
+			switch ($since) {
+				case 0:
+					$forum_since = _MD_NEWBB_BEGINNING;
+					break;
+				case 365:
+					$forum_since = _MD_NEWBB_THELASTYEAR;
+					break;
+				default:
+					if ($since > 0) {
+						$forum_since = sprintf(_MD_NEWBB_FROMLASTDAYS, $since);
+					} else {
+						$forum_since = sprintf(_MD_NEWBB_FROMLASTHOURS, abs($since));
+					}
+			}
 
-            return $forum_since;
-        }
-        $forum_selection_since = '<select class="form-control" name="since" id="since">';
-        // irmtfan no option when no selected value
-        $forum_selection_since .= '<option value="">--------</option>';
-        foreach ($select_array as $since) {
-            $forum_selection_since .= '<option value="' . $since . '"' . (($selected == $since) ? ' selected="selected"' : '') . '>';
-            // START irmtfan functional since 0 and 365
-            switch ($since) {
-                case 0:
-                    $forum_selection_since .= _MD_NEWBB_BEGINNING;
-                    break;
-                case 365:
-                    $forum_selection_since .= _MD_NEWBB_THELASTYEAR;
-                    break;
-                default:
-                    if ($since > 0) {
-                        $forum_selection_since .= sprintf(_MD_NEWBB_FROMLASTDAYS, $since);
-                    } else {
-                        $forum_selection_since .= sprintf(_MD_NEWBB_FROMLASTHOURS, abs($since));
-                    }
-            }
-            // END irmtfan functional since 0 and 365
-            $forum_selection_since .= '</option>';
-        }
-        // irmtfan remove hardcodes
-        //$forum_selection_since .= '<option value="365"'.(($selected === 365) ? ' selected="selected"' : '').'>'._MD_NEWBB_THELASTYEAR.'</option>';
-        //$forum_selection_since .= '<option value="0"'.(($selected === 0) ? ' selected="selected"' : '').'>'._MD_NEWBB_BEGINNING.'</option>';
-        $forum_selection_since .= '</select>';
+			return $forum_since;
+		}
+		$forum_selection_since = '<select class="form-control" name="since" id="since">';
+		// irmtfan no option when no selected value
+		$forum_selection_since .= '<option value="">--------</option>';
+		foreach ($select_array as $since) {
+			$forum_selection_since .= '<option value="' . $since . '"' . (($selected == $since) ? ' selected="selected"' : '') . '>';
+			// START irmtfan functional since 0 and 365
+			switch ($since) {
+				case 0:
+					$forum_selection_since .= _MD_NEWBB_BEGINNING;
+					break;
+				case 365:
+					$forum_selection_since .= _MD_NEWBB_THELASTYEAR;
+					break;
+				default:
+					if ($since > 0) {
+						$forum_selection_since .= sprintf(_MD_NEWBB_FROMLASTDAYS, $since);
+					} else {
+						$forum_selection_since .= sprintf(_MD_NEWBB_FROMLASTHOURS, abs($since));
+					}
+			}
+			// END irmtfan functional since 0 and 365
+			$forum_selection_since .= '</option>';
+		}
+		// irmtfan remove hardcodes
+		//$forum_selection_since .= '<option value="365"'.(($selected === 365) ? ' selected="selected"' : '').'>'._MD_NEWBB_THELASTYEAR.'</option>';
+		//$forum_selection_since .= '<option value="0"'.(($selected === 0) ? ' selected="selected"' : '').'>'._MD_NEWBB_BEGINNING.'</option>';
+		$forum_selection_since .= '</select>';
 
-        return $forum_selection_since;
-    }
+		return $forum_selection_since;
+	}
 
-    /**
-     * @param  int $since
-     * @return int
-     */
-    function newbbGetSinceTime($since = 100)
-    {
-        // irmtfan bad coding
-        //if ($since==1000) return 0;
-        if ($since > 0) {
-            return (int)$since * 24 * 3600;
-        } else {
-            return (int)abs($since) * 3600;
-        }
-    }
+	/**
+	 * @param  int $since
+	 * @return int
+	 */
+	function newbbGetSinceTime($since = 100)
+	{
+		// irmtfan bad coding
+		//if ($since==1000) return 0;
+		if ($since > 0) {
+			return (int)$since * 24 * 3600;
+		} else {
+			return (int)abs($since) * 3600;
+		}
+	}
 }

include/functions.ini.php

Spacing +2 added lines, -2 removed lines

@@ -38,5 +38,5 @@
 /**
  * @return array
  */
-require_once __DIR__ . '/functions.config.php';
-require_once __DIR__ . '/functions.session.php';
+require_once __DIR__.'/functions.config.php';
+require_once __DIR__.'/functions.session.php';

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 if (defined('NEWBB_FUNCTIONS_INI')) {
-    return;
+	return;
 }
 define('NEWBB_FUNCTIONS_INI', 1);
 

rss.php

Spacing +20 added lines, -20 removed lines

@@ -31,12 +31,12 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('class/template.php');
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.rpc.php');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-    require_once __DIR__ . '/seo_url.php';
+    require_once __DIR__.'/seo_url.php';
 }
 /* for seo */
 
@@ -59,7 +59,7 @@ 
     $validForums = array_intersect($forums, $validForums);
 } elseif ($category > 0) {
     $crit_top = new \CriteriaCompo(new \Criteria('cat_id', $category));
-    $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'));
+    $crit_top->add(new \Criteria('forum_id', '('.implode(', ', $validForums).')', 'IN'));
     $forums_top  = $forumHandler->getIds($crit_top);
     $validForums = array_intersect($forums_top, $validForums);
 }
@@ -71,7 +71,7 @@ 
 $forumSet = implode(',', $validForums);
 
 $charset = 'UTF-8';
-header('Content-Type:text/xml; charset=' . $charset);
+header('Content-Type:text/xml; charset='.$charset);
 
 $tpl                 = new \XoopsTpl();
 $tpl->caching        = 2;
@@ -84,25 +84,25 @@ 
 $xoopsCachedTemplateId = "newbbb_rss_$forumSet";
 $compile_id            = null;
 if (!$tpl->is_cached('db:newbb_rss.tpl', $xoopsCachedTemplateId, $compile_id)) {
-    require_once __DIR__ . '/include/functions.time.php';
+    require_once __DIR__.'/include/functions.time.php';
 
     //    /** @var Newbb\XmlrssHandler $xmlrssHandler */
     //    $xmlrssHandler = Newbb\Helper::getInstance()->getHandler('Xmlrss');
     $rss = $xmlrssHandler->create();
 
-    $rss->setVarRss('channel_title', $GLOBALS['xoopsConfig']['sitename'] . ' :: ' . _MD_NEWBB_FORUM);
-    $rss->channel_link = XOOPS_URL . '/';
-    $rss->setVarRss('channel_desc', $GLOBALS['xoopsConfig']['slogan'] . ' :: ' . $xoopsModule->getInfo('description'));
+    $rss->setVarRss('channel_title', $GLOBALS['xoopsConfig']['sitename'].' :: '._MD_NEWBB_FORUM);
+    $rss->channel_link = XOOPS_URL.'/';
+    $rss->setVarRss('channel_desc', $GLOBALS['xoopsConfig']['slogan'].' :: '.$xoopsModule->getInfo('description'));
     $rss->setVarRss('channel_lastbuild', formatTimestamp(time(), 'rss'));
     $rss->channel_webmaster = $GLOBALS['xoopsConfig']['adminmail'];
     $rss->channel_editor    = $GLOBALS['xoopsConfig']['adminmail'];
     $rss->setVarRss('channel_category', $xoopsModule->getVar('name'));
-    $rss->channel_generator = 'NewBB ' . $xoopsModule->getInfo('version');
+    $rss->channel_generator = 'NewBB '.$xoopsModule->getInfo('version');
     $rss->channel_language  = _LANGCODE;
     $rss->xml_encoding      = $charset;
-    $rss->image_url         = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image');
+    $rss->image_url         = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->getInfo('image');
 
-    $dimension = @getimagesize($GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image')));
+    $dimension = @getimagesize($GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->getInfo('image')));
     if (empty($dimension[0])) {
         $width = 88;
     } else {
@@ -119,7 +119,7 @@ 
     $rss->max_items            = $GLOBALS['xoopsModuleConfig']['rss_maxitems'];
     $rss->max_item_description = $GLOBALS['xoopsModuleConfig']['rss_maxdescription'];
 
-    $forumCriteria = ' AND t.forum_id IN (' . implode(',', $validForums) . ')';
+    $forumCriteria = ' AND t.forum_id IN ('.implode(',', $validForums).')';
     unset($validForums);
     $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
 
@@ -169,7 +169,7 @@ 
     if (count($types) > 0) {
         //        /** @var Newbb\TypeHandler $typeHandler */
         //        $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+        $type_list = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', array_keys($types)).')', 'IN'));
     }
 
     foreach ($rows as $topic) {
@@ -184,16 +184,16 @@ 
         } else {
             $topic['uname'] = $topic['poster_name'] ? $myts->htmlSpecialChars($topic['poster_name']) : $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
         }
-        $description            = $topic['forum_name'] . '::';
-        $topic['topic_subject'] = empty($type_list[$topic['type_id']]) ? '' : '[' . $type_list[$topic['type_id']] . '] ';
-        $description            .= $topic['topic_subject'] . $topic['topic_title'] . "<br>\n";
+        $description            = $topic['forum_name'].'::';
+        $topic['topic_subject'] = empty($type_list[$topic['type_id']]) ? '' : '['.$type_list[$topic['type_id']].'] ';
+        $description            .= $topic['topic_subject'].$topic['topic_title']."<br>\n";
         $description            .= $myts->displayTarea($topic['post_text'], $topic['dohtml'], $topic['dosmiley'], $topic['doxcode'], $topic['dobr']);
-        $label                  = _MD_NEWBB_BY . ' ' . $topic['uname'];
+        $label                  = _MD_NEWBB_BY.' '.$topic['uname'];
         $time                   = formatTimestamp($topic['post_time'], 'rss');
-        $link                   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
+        $link                   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?post_id='.$topic['post_id'].'';
         if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $link   = XOOPS_URL . '/' . REAL_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
-            $oldurl = '<a href=\'' . $link . '\'>';
+            $link   = XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'';
+            $oldurl = '<a href=\''.$link.'\'>';
             $newurl = seo_urls($oldurl);
             $newurl = str_replace('<a href=\'', '', $newurl);
             $newurl = str_replace('\'>', '', $newurl);

Indentation +134 added lines, -134 removed lines

@@ -36,7 +36,7 @@ 
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.rpc.php');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-    require_once __DIR__ . '/seo_url.php';
+	require_once __DIR__ . '/seo_url.php';
 }
 /* for seo */
 
@@ -47,7 +47,7 @@ 
 $category = Request::getInt('c', 0, 'GET');
 $forumSet = Request::getString('f', '', 'GET');
 if ('' !== $forumSet) {
-    $forums = array_map('intval', array_map('trim', explode('|', $forumSet)));
+	$forums = array_map('intval', array_map('trim', explode('|', $forumSet)));
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
@@ -56,15 +56,15 @@ 
 $validForums = $forumHandler->getIdsByPermission(); // get all accessible forums
 
 if (is_array($forums) && count($forums) > 0) {
-    $validForums = array_intersect($forums, $validForums);
+	$validForums = array_intersect($forums, $validForums);
 } elseif ($category > 0) {
-    $crit_top = new \CriteriaCompo(new \Criteria('cat_id', $category));
-    $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'));
-    $forums_top  = $forumHandler->getIds($crit_top);
-    $validForums = array_intersect($forums_top, $validForums);
+	$crit_top = new \CriteriaCompo(new \Criteria('cat_id', $category));
+	$crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'));
+	$forums_top  = $forumHandler->getIds($crit_top);
+	$validForums = array_intersect($forums_top, $validForums);
 }
 if (0 === count($validForums)) {
-    newbbTrackbackResponse(1, _NOPERM);
+	newbbTrackbackResponse(1, _NOPERM);
 }
 
 asort($validForums);
@@ -77,137 +77,137 @@ 
 $tpl->caching        = 2;
 $tpl->cache_lifetime = $GLOBALS['xoopsModuleConfig']['rss_cachetime'] * 60;
 if (!empty($GLOBALS['xoopsConfig']['rewrite'])) {
-    $tpl->load_filter('output', 'xoRewriteModule');
+	$tpl->load_filter('output', 'xoRewriteModule');
 }
 
 //mod_loadFunctions('cache');
 $xoopsCachedTemplateId = "newbbb_rss_$forumSet";
 $compile_id            = null;
 if (!$tpl->is_cached('db:newbb_rss.tpl', $xoopsCachedTemplateId, $compile_id)) {
-    require_once __DIR__ . '/include/functions.time.php';
-
-    //    /** @var Newbb\XmlrssHandler $xmlrssHandler */
-    //    $xmlrssHandler = Newbb\Helper::getInstance()->getHandler('Xmlrss');
-    $rss = $xmlrssHandler->create();
-
-    $rss->setVarRss('channel_title', $GLOBALS['xoopsConfig']['sitename'] . ' :: ' . _MD_NEWBB_FORUM);
-    $rss->channel_link = XOOPS_URL . '/';
-    $rss->setVarRss('channel_desc', $GLOBALS['xoopsConfig']['slogan'] . ' :: ' . $xoopsModule->getInfo('description'));
-    $rss->setVarRss('channel_lastbuild', formatTimestamp(time(), 'rss'));
-    $rss->channel_webmaster = $GLOBALS['xoopsConfig']['adminmail'];
-    $rss->channel_editor    = $GLOBALS['xoopsConfig']['adminmail'];
-    $rss->setVarRss('channel_category', $xoopsModule->getVar('name'));
-    $rss->channel_generator = 'NewBB ' . $xoopsModule->getInfo('version');
-    $rss->channel_language  = _LANGCODE;
-    $rss->xml_encoding      = $charset;
-    $rss->image_url         = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image');
-
-    $dimension = @getimagesize($GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image')));
-    if (empty($dimension[0])) {
-        $width = 88;
-    } else {
-        $width = ($dimension[0] > 144) ? 144 : $dimension[0];
-    }
-    if (empty($dimension[1])) {
-        $height = 31;
-    } else {
-        $height = ($dimension[1] > 400) ? 400 : $dimension[1];
-    }
-    $rss->image_width  = $width;
-    $rss->image_height = $height;
-
-    $rss->max_items            = $GLOBALS['xoopsModuleConfig']['rss_maxitems'];
-    $rss->max_item_description = $GLOBALS['xoopsModuleConfig']['rss_maxdescription'];
-
-    $forumCriteria = ' AND t.forum_id IN (' . implode(',', $validForums) . ')';
-    unset($validForums);
-    $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
-
-    $query = 'SELECT'
-             . '    f.forum_id, f.forum_name,'
-             . '    t.topic_id, t.topic_title, t.type_id,'
-             . '    p.post_id, p.post_time, p.subject, p.uid, p.poster_name, p.post_karma, p.require_reply, '
-             . '    pt.dohtml, pt.dosmiley, pt.doxcode, pt.dobr,'
-             . '    pt.post_text'
-             . '    FROM '
-             . $GLOBALS['xoopsDB']->prefix('newbb_posts')
-             . ' AS p'
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_topics')
-             . ' AS t ON t.topic_last_post_id=p.post_id'
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_posts_text')
-             . ' AS pt ON pt.post_id=p.post_id'
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_forums')
-             . ' AS f ON f.forum_id=p.forum_id'
-             . '    WHERE 1=1 '
-             . $forumCriteria
-             . $approveCriteria
-             . ' ORDER BY p.post_id DESC';
-    $limit = (int)($GLOBALS['xoopsModuleConfig']['rss_maxitems'] * 1.5);
-    if (!$result = $GLOBALS['xoopsDB']->query($query, $limit)) {
-        newbbTrackbackResponse(1, _MD_NEWBB_ERROR);
-        //xoops_error($GLOBALS['xoopsDB']->error());
-        //return $xmlrssHandler->get($rss);
-    }
-    $rows  = [];
-    $types = [];
-    while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $users[$row['uid']] = 1;
-        if ($row['type_id'] > 0) {
-            $types[$row['type_id']] = 1;
-        }
-        $rows[] = $row;
-    }
-
-    if (count($rows) < 1) {
-        newbbTrackbackResponse(1, _MD_NEWBB_NORSS_DATA);
-        //return $xmlrssHandler->get($rss);
-    }
-    $users = newbbGetUnameFromIds(array_keys($users), $GLOBALS['xoopsModuleConfig']['show_realname']);
-    if (count($types) > 0) {
-        //        /** @var Newbb\TypeHandler $typeHandler */
-        //        $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
-    }
-
-    foreach ($rows as $topic) {
-        if ($topic['post_karma'] > 0 && $GLOBALS['xoopsModuleConfig']['enable_karma']) {
-            continue;
-        }
-        if ($topic['require_reply'] && $GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
-            continue;
-        }
-        if (!empty($users[$topic['uid']])) {
-            $topic['uname'] = $users[$topic['uid']];
-        } else {
-            $topic['uname'] = $topic['poster_name'] ? $myts->htmlSpecialChars($topic['poster_name']) : $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
-        }
-        $description            = $topic['forum_name'] . '::';
-        $topic['topic_subject'] = empty($type_list[$topic['type_id']]) ? '' : '[' . $type_list[$topic['type_id']] . '] ';
-        $description            .= $topic['topic_subject'] . $topic['topic_title'] . "<br>\n";
-        $description            .= $myts->displayTarea($topic['post_text'], $topic['dohtml'], $topic['dosmiley'], $topic['doxcode'], $topic['dobr']);
-        $label                  = _MD_NEWBB_BY . ' ' . $topic['uname'];
-        $time                   = formatTimestamp($topic['post_time'], 'rss');
-        $link                   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
-        if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $link   = XOOPS_URL . '/' . REAL_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
-            $oldurl = '<a href=\'' . $link . '\'>';
-            $newurl = seo_urls($oldurl);
-            $newurl = str_replace('<a href=\'', '', $newurl);
-            $newurl = str_replace('\'>', '', $newurl);
-            $link   = $newurl;
-        }
-        $title = $topic['subject'];
-        if (!$rss->addItem($title, $link, $description, $label, $time)) {
-            break;
-        }
-    }
-
-    $rss_feed = $xmlrssHandler->get($rss);
-
-    $tpl->assign('rss', $rss_feed);
-    unset($rss);
+	require_once __DIR__ . '/include/functions.time.php';
+
+	//    /** @var Newbb\XmlrssHandler $xmlrssHandler */
+	//    $xmlrssHandler = Newbb\Helper::getInstance()->getHandler('Xmlrss');
+	$rss = $xmlrssHandler->create();
+
+	$rss->setVarRss('channel_title', $GLOBALS['xoopsConfig']['sitename'] . ' :: ' . _MD_NEWBB_FORUM);
+	$rss->channel_link = XOOPS_URL . '/';
+	$rss->setVarRss('channel_desc', $GLOBALS['xoopsConfig']['slogan'] . ' :: ' . $xoopsModule->getInfo('description'));
+	$rss->setVarRss('channel_lastbuild', formatTimestamp(time(), 'rss'));
+	$rss->channel_webmaster = $GLOBALS['xoopsConfig']['adminmail'];
+	$rss->channel_editor    = $GLOBALS['xoopsConfig']['adminmail'];
+	$rss->setVarRss('channel_category', $xoopsModule->getVar('name'));
+	$rss->channel_generator = 'NewBB ' . $xoopsModule->getInfo('version');
+	$rss->channel_language  = _LANGCODE;
+	$rss->xml_encoding      = $charset;
+	$rss->image_url         = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image');
+
+	$dimension = @getimagesize($GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image')));
+	if (empty($dimension[0])) {
+		$width = 88;
+	} else {
+		$width = ($dimension[0] > 144) ? 144 : $dimension[0];
+	}
+	if (empty($dimension[1])) {
+		$height = 31;
+	} else {
+		$height = ($dimension[1] > 400) ? 400 : $dimension[1];
+	}
+	$rss->image_width  = $width;
+	$rss->image_height = $height;
+
+	$rss->max_items            = $GLOBALS['xoopsModuleConfig']['rss_maxitems'];
+	$rss->max_item_description = $GLOBALS['xoopsModuleConfig']['rss_maxdescription'];
+
+	$forumCriteria = ' AND t.forum_id IN (' . implode(',', $validForums) . ')';
+	unset($validForums);
+	$approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
+
+	$query = 'SELECT'
+			 . '    f.forum_id, f.forum_name,'
+			 . '    t.topic_id, t.topic_title, t.type_id,'
+			 . '    p.post_id, p.post_time, p.subject, p.uid, p.poster_name, p.post_karma, p.require_reply, '
+			 . '    pt.dohtml, pt.dosmiley, pt.doxcode, pt.dobr,'
+			 . '    pt.post_text'
+			 . '    FROM '
+			 . $GLOBALS['xoopsDB']->prefix('newbb_posts')
+			 . ' AS p'
+			 . '    LEFT JOIN '
+			 . $GLOBALS['xoopsDB']->prefix('newbb_topics')
+			 . ' AS t ON t.topic_last_post_id=p.post_id'
+			 . '    LEFT JOIN '
+			 . $GLOBALS['xoopsDB']->prefix('newbb_posts_text')
+			 . ' AS pt ON pt.post_id=p.post_id'
+			 . '    LEFT JOIN '
+			 . $GLOBALS['xoopsDB']->prefix('newbb_forums')
+			 . ' AS f ON f.forum_id=p.forum_id'
+			 . '    WHERE 1=1 '
+			 . $forumCriteria
+			 . $approveCriteria
+			 . ' ORDER BY p.post_id DESC';
+	$limit = (int)($GLOBALS['xoopsModuleConfig']['rss_maxitems'] * 1.5);
+	if (!$result = $GLOBALS['xoopsDB']->query($query, $limit)) {
+		newbbTrackbackResponse(1, _MD_NEWBB_ERROR);
+		//xoops_error($GLOBALS['xoopsDB']->error());
+		//return $xmlrssHandler->get($rss);
+	}
+	$rows  = [];
+	$types = [];
+	while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+		$users[$row['uid']] = 1;
+		if ($row['type_id'] > 0) {
+			$types[$row['type_id']] = 1;
+		}
+		$rows[] = $row;
+	}
+
+	if (count($rows) < 1) {
+		newbbTrackbackResponse(1, _MD_NEWBB_NORSS_DATA);
+		//return $xmlrssHandler->get($rss);
+	}
+	$users = newbbGetUnameFromIds(array_keys($users), $GLOBALS['xoopsModuleConfig']['show_realname']);
+	if (count($types) > 0) {
+		//        /** @var Newbb\TypeHandler $typeHandler */
+		//        $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
+		$type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+	}
+
+	foreach ($rows as $topic) {
+		if ($topic['post_karma'] > 0 && $GLOBALS['xoopsModuleConfig']['enable_karma']) {
+			continue;
+		}
+		if ($topic['require_reply'] && $GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
+			continue;
+		}
+		if (!empty($users[$topic['uid']])) {
+			$topic['uname'] = $users[$topic['uid']];
+		} else {
+			$topic['uname'] = $topic['poster_name'] ? $myts->htmlSpecialChars($topic['poster_name']) : $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
+		}
+		$description            = $topic['forum_name'] . '::';
+		$topic['topic_subject'] = empty($type_list[$topic['type_id']]) ? '' : '[' . $type_list[$topic['type_id']] . '] ';
+		$description            .= $topic['topic_subject'] . $topic['topic_title'] . "<br>\n";
+		$description            .= $myts->displayTarea($topic['post_text'], $topic['dohtml'], $topic['dosmiley'], $topic['doxcode'], $topic['dobr']);
+		$label                  = _MD_NEWBB_BY . ' ' . $topic['uname'];
+		$time                   = formatTimestamp($topic['post_time'], 'rss');
+		$link                   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
+		if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
+			$link   = XOOPS_URL . '/' . REAL_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
+			$oldurl = '<a href=\'' . $link . '\'>';
+			$newurl = seo_urls($oldurl);
+			$newurl = str_replace('<a href=\'', '', $newurl);
+			$newurl = str_replace('\'>', '', $newurl);
+			$link   = $newurl;
+		}
+		$title = $topic['subject'];
+		if (!$rss->addItem($title, $link, $description, $label, $time)) {
+			break;
+		}
+	}
+
+	$rss_feed = $xmlrssHandler->get($rss);
+
+	$tpl->assign('rss', $rss_feed);
+	unset($rss);
 }
 $tpl->display('db:newbb_rss.tpl', $xoopsCachedTemplateId, $compile_id);

class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -34,19 +34,19 @@ 
         //        $sql   .= " WHERE metakey='version' LIMIT 1";
         //        $query = $GLOBALS['xoopsDB']->query($sql);
         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO')."</legend>\n";
         $html .= "<div style='padding: 8px;'>\n";
         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
         //        $html .= "<br>\n";
         //        $html .= "<br>\n";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+        $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI')."</div>\n";
         $html .= "<ul>\n";
         //
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+        $gdlib = function_exists('gd_info') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;
         if (function_exists('gd_info')) {
             if (true === ($gdlib = gd_info())) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+                $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
             }
         }
         //
@@ -56,18 +56,18 @@ 
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
         //
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+        $downloads = ini_get('file_uploads') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;
         //
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: blue;">'.ini_get('upload_max_filesize')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: blue;">'.ini_get('post_max_size')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: blue;">'.ini_get('memory_limit')."</span></b>\n";
         $html .= "</ul>\n";
         $html .= "<ul>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n";
         $html .= "</ul>\n";
         $html .= "<br>\n";
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+        $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n";
         $html .= '</div>';
         $html .= '</fieldset><br>';
 

Indentation +55 added lines, -55 removed lines

@@ -17,60 +17,60 @@
  */
 trait ServerStats
 {
-    /**
-     * serverStats()
-     *
-     * @return string
-     */
-    public static function getServerStats()
-    {
-        //mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
-        $moduleDirName      = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper = strtoupper($moduleDirName);
-        xoops_loadLanguage('common', $moduleDirName);
-        $html = '';
-        //        $sql   = 'SELECT metavalue';
-        //        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
-        //        $sql   .= " WHERE metakey='version' LIMIT 1";
-        //        $query = $GLOBALS['xoopsDB']->query($sql);
-        //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
-        $html .= "<div style='padding: 8px;'>\n";
-        //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
-        //        $html .= "<br>\n";
-        //        $html .= "<br>\n";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
-        $html .= "<ul>\n";
-        //
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
-        if (function_exists('gd_info')) {
-            if (true === ($gdlib = gd_info())) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
-            }
-        }
-        //
-        //    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
-        //
-        //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
-        //
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
-        //
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
-        $html .= "</ul>\n";
-        $html .= "<ul>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
-        $html .= "</ul>\n";
-        $html .= "<br>\n";
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
-        $html .= '</div>';
-        $html .= '</fieldset><br>';
+	/**
+	 * serverStats()
+	 *
+	 * @return string
+	 */
+	public static function getServerStats()
+	{
+		//mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
+		$moduleDirName      = basename(dirname(dirname(__DIR__)));
+		$moduleDirNameUpper = strtoupper($moduleDirName);
+		xoops_loadLanguage('common', $moduleDirName);
+		$html = '';
+		//        $sql   = 'SELECT metavalue';
+		//        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
+		//        $sql   .= " WHERE metakey='version' LIMIT 1";
+		//        $query = $GLOBALS['xoopsDB']->query($sql);
+		//        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
+		$html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+		$html .= "<div style='padding: 8px;'>\n";
+		//        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
+		//        $html .= "<br>\n";
+		//        $html .= "<br>\n";
+		$html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+		$html .= "<ul>\n";
+		//
+		$gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
+		$html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+		if (function_exists('gd_info')) {
+			if (true === ($gdlib = gd_info())) {
+				$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+			}
+		}
+		//
+		//    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
+		//
+		//    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
+		//
+		$downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
+		$html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+		//
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
+		$html .= "</ul>\n";
+		$html .= "<ul>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+		$html .= "</ul>\n";
+		$html .= "<br>\n";
+		$html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+		$html .= '</div>';
+		$html .= '</fieldset><br>';
 
-        return $html;
-    }
+		return $html;
+	}
 }

class/StatsHandler.php

Spacing +16 added lines, -16 removed lines

@@ -12,7 +12,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 
 define('NEWBB_STATS_TYPE_TOPIC', 1);
 define('NEWBB_STATS_TYPE_POST', 2);
@@ -78,7 +78,7 @@ 
             return false;
         }
 
-        $sql    = "    UPDATE {$this->table}"
+        $sql = "    UPDATE {$this->table}"
                   . '    SET stats_value = CASE '
                   . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
                   . "                    ELSE '{$increment}' "
@@ -90,7 +90,7 @@ 
         $result = $this->db->queryF($sql);
         $rows   = $this->db->getAffectedRows();
         if (0 == $rows) {
-            $sql    = "    INSERT INTO {$this->table}"
+            $sql = "    INSERT INTO {$this->table}"
                       . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
                       . '    VALUES '
                       . "        ('0', '{$increment}', '{$type}', '"
@@ -147,7 +147,7 @@ 
         foreach ($periods as $period) {
             $_periods[] = array_search($period, $this->param['period']);
         }
-        $sql    = '    SELECT stats_id, stats_value, stats_type, stats_period '
+        $sql = '    SELECT stats_id, stats_value, stats_type, stats_period '
                   . "    FROM {$this->table} "
                   . '    WHERE '
                   . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
@@ -156,9 +156,9 @@ 
                                         . implode(', ', array_map('intval', $ids))
                                         . ')')
                   . '        '
-                  . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
+                  . (empty($_types) ? '' : 'AND stats_type IN ('.implode(', ', $_types).')')
                   . '        '
-                  . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
+                  . (empty($_periods) ? '' : 'AND stats_period IN ('.implode(', ', $_periods).')');
         $result = $this->db->query($sql);
 
         while (false !== ($row = $this->db->fetchArray($result))) {
@@ -170,36 +170,36 @@ 
 
     public function reset()
     {
-        $this->db->queryF('TRUNCATE TABLE ' . $this->table);
+        $this->db->queryF('TRUNCATE TABLE '.$this->table);
         $now        = time();
         $time_start = [
             'day'   => '%Y%j',
             'week'  => '%Y%u',
             'month' => '%Y%m'
         ];
-        $counts     = [];
+        $counts = [];
 
-        $sql = '    SELECT forum_id' . '    FROM ' . $this->db->prefix('newbb_forums');
+        $sql = '    SELECT forum_id'.'    FROM '.$this->db->prefix('newbb_forums');
         $ret = $this->db->query($sql);
         while (false !== (list($forum_id) = $this->db->fetchRow($ret))) {
-            $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*), SUM(topic_views)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($topics, $views) = $this->db->fetchRow($result);
             $this->update($forum_id, 'topic', $topics);
             $this->update($forum_id, 'view', $views);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($digests) = $this->db->fetchRow($result);
             $this->update($forum_id, 'digest', $digests);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+            $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_posts')."    WHERE approved=1 AND forum_id = {$forum_id}";
             $result = $this->db->query($sql);
             list($posts) = $this->db->fetchRow($result);
             $this->update($forum_id, 'post', $posts);
 
             foreach ($time_start as $period => $format) {
-                $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*), SUM(topic_views)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($topics, $views) = $this->db->fetchRow($result);
                 $views = empty($views) ? 0 : $views; // null check
@@ -222,7 +222,7 @@ 
                 @$counts['topic'][$period] += $topics;
                 @$counts['view'][$period] += $views;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_topics')."    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($digests) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
@@ -235,7 +235,7 @@ 
                                   . "', NOW(), '{$format}')");
                 @$counts['digest'][$period] += $digests;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+                $sql    = '    SELECT COUNT(*)'.'    FROM '.$this->db->prefix('newbb_posts')."    WHERE approved=1 AND forum_id = {$forum_id}"."        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
                 $result = $this->db->query($sql);
                 list($posts) = $this->db->fetchRow($result);
                 $this->db->queryF("    INSERT INTO {$this->table}"
@@ -250,7 +250,7 @@ 
             }
         }
 
-        $this->db->queryF("    DELETE FROM {$this->table}" . "    WHERE stats_id = '0' AND stats_period <> " . array_search('total', $this->param['period'], true));
+        $this->db->queryF("    DELETE FROM {$this->table}"."    WHERE stats_id = '0' AND stats_period <> ".array_search('total', $this->param['period'], true));
         foreach ($time_start as $period => $format) {
             foreach (array_keys($counts) as $type) {
                 $this->db->queryF("    INSERT INTO {$this->table}"

Indentation +216 added lines, -216 removed lines

@@ -30,238 +30,238 @@
  */
 class StatsHandler
 {
-    public $db;
-    public $table;
-    public $param = [
-        'type'   => ['topic', 'post', 'digest', 'view'],
-        'period' => ['total', 'day', 'week', 'month']
-    ];
+	public $db;
+	public $table;
+	public $param = [
+		'type'   => ['topic', 'post', 'digest', 'view'],
+		'period' => ['total', 'day', 'week', 'month']
+	];
 
-    /**
-     * @param null|\XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        //$this->db = $db;
-        //if (!$db || !($db instanceof XoopsDatabase)) {
-        $this->db = $GLOBALS['xoopsDB'];
-        //}
-        $this->table = $this->db->prefix('newbb_stats');
-    }
+	/**
+	 * @param null|\XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		//$this->db = $db;
+		//if (!$db || !($db instanceof XoopsDatabase)) {
+		$this->db = $GLOBALS['xoopsDB'];
+		//}
+		$this->table = $this->db->prefix('newbb_stats');
+	}
 
-    /**
-     * @param  null|\XoopsDatabase $db
-     * @return StatsHandler
-     */
-    public static function getInstance(\XoopsDatabase $db = null)
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($db);
-        }
+	/**
+	 * @param  null|\XoopsDatabase $db
+	 * @return StatsHandler
+	 */
+	public static function getInstance(\XoopsDatabase $db = null)
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($db);
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * @param       $id
-     * @param       $type
-     * @param  int  $increment
-     * @return bool
-     */
-    public function update($id, $type, $increment = 1)
-    {
-        $id        = (int)$id;
-        $increment = (int)$increment;
+	/**
+	 * @param       $id
+	 * @param       $type
+	 * @param  int  $increment
+	 * @return bool
+	 */
+	public function update($id, $type, $increment = 1)
+	{
+		$id        = (int)$id;
+		$increment = (int)$increment;
 
-        if (empty($increment) || false === ($type = array_search($type, $this->param['type']))) {
-            return false;
-        }
+		if (empty($increment) || false === ($type = array_search($type, $this->param['type']))) {
+			return false;
+		}
 
-        $sql    = "    UPDATE {$this->table}"
-                  . '    SET stats_value = CASE '
-                  . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
-                  . "                    ELSE '{$increment}' "
-                  . '                END, '
-                  . '        time_update = NOW()'
-                  . '    WHERE '
-                  . "        (stats_id = '0' OR stats_id = '{$id}') "
-                  . "        AND stats_type='{$type}' ";
-        $result = $this->db->queryF($sql);
-        $rows   = $this->db->getAffectedRows();
-        if (0 == $rows) {
-            $sql    = "    INSERT INTO {$this->table}"
-                      . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                      . '    VALUES '
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('total', $this->param['period'], true)
-                      . "', NOW(), ''), "
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('day', $this->param['period'], true)
-                      . "', NOW(), '%Y%j'), "
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('week', $this->param['period'], true)
-                      . "', NOW(), '%Y%u'), "
-                      . "        ('0', '{$increment}', '{$type}', '"
-                      . array_search('month', $this->param['period'], true)
-                      . "', NOW(), '%Y%m')";
-            $result = $this->db->queryF($sql);
-        }
-        if ($rows < 2 * count($this->param['period']) && !empty($id)) {
-            $sql    = "    INSERT INTO {$this->table}"
-                      . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                      . '    VALUES '
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('total', $this->param['period'], true)
-                      . "', NOW(), ''), "
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('day', $this->param['period'], true)
-                      . "', NOW(), '%Y%j'), "
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('week', $this->param['period'], true)
-                      . "', NOW(), '%Y%u'), "
-                      . "        ('{$id}', '{$increment}', '{$type}', '"
-                      . array_search('month', $this->param['period'], true)
-                      . "', NOW(), '%Y%m')";
-            $result = $this->db->queryF($sql);
-        }
-    }
+		$sql    = "    UPDATE {$this->table}"
+				  . '    SET stats_value = CASE '
+				  . "                    WHEN time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format)  THEN stats_value + '{$increment}' "
+				  . "                    ELSE '{$increment}' "
+				  . '                END, '
+				  . '        time_update = NOW()'
+				  . '    WHERE '
+				  . "        (stats_id = '0' OR stats_id = '{$id}') "
+				  . "        AND stats_type='{$type}' ";
+		$result = $this->db->queryF($sql);
+		$rows   = $this->db->getAffectedRows();
+		if (0 == $rows) {
+			$sql    = "    INSERT INTO {$this->table}"
+					  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+					  . '    VALUES '
+					  . "        ('0', '{$increment}', '{$type}', '"
+					  . array_search('total', $this->param['period'], true)
+					  . "', NOW(), ''), "
+					  . "        ('0', '{$increment}', '{$type}', '"
+					  . array_search('day', $this->param['period'], true)
+					  . "', NOW(), '%Y%j'), "
+					  . "        ('0', '{$increment}', '{$type}', '"
+					  . array_search('week', $this->param['period'], true)
+					  . "', NOW(), '%Y%u'), "
+					  . "        ('0', '{$increment}', '{$type}', '"
+					  . array_search('month', $this->param['period'], true)
+					  . "', NOW(), '%Y%m')";
+			$result = $this->db->queryF($sql);
+		}
+		if ($rows < 2 * count($this->param['period']) && !empty($id)) {
+			$sql    = "    INSERT INTO {$this->table}"
+					  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+					  . '    VALUES '
+					  . "        ('{$id}', '{$increment}', '{$type}', '"
+					  . array_search('total', $this->param['period'], true)
+					  . "', NOW(), ''), "
+					  . "        ('{$id}', '{$increment}', '{$type}', '"
+					  . array_search('day', $this->param['period'], true)
+					  . "', NOW(), '%Y%j'), "
+					  . "        ('{$id}', '{$increment}', '{$type}', '"
+					  . array_search('week', $this->param['period'], true)
+					  . "', NOW(), '%Y%u'), "
+					  . "        ('{$id}', '{$increment}', '{$type}', '"
+					  . array_search('month', $this->param['period'], true)
+					  . "', NOW(), '%Y%m')";
+			$result = $this->db->queryF($sql);
+		}
+	}
 
-    /**
-     * Get stats of "Today"
-     *
-     * @param  array $ids     ID of forum: > 0, forum; 0 - global; empty - all
-     * @param  array $types   type of stats items: 1 - topic; 2 - post; 3 - digest; 4 - click; empty - all
-     * @param  array $periods time period: 1 - all time; 2 - today; 3 - this week; 4 - this month; empty - all
-     * @return array
-     */
-    public function getStats(array $ids, array $types = [], array $periods = [])
-    {
-        $ret = [];
+	/**
+	 * Get stats of "Today"
+	 *
+	 * @param  array $ids     ID of forum: > 0, forum; 0 - global; empty - all
+	 * @param  array $types   type of stats items: 1 - topic; 2 - post; 3 - digest; 4 - click; empty - all
+	 * @param  array $periods time period: 1 - all time; 2 - today; 3 - this week; 4 - this month; empty - all
+	 * @return array
+	 */
+	public function getStats(array $ids, array $types = [], array $periods = [])
+	{
+		$ret = [];
 
-        $_types = [];
-        foreach ($types as $type) {
-            $_types[] = array_search($type, $this->param['type']);
-        }
-        $_periods = [];
-        foreach ($periods as $period) {
-            $_periods[] = array_search($period, $this->param['period']);
-        }
-        $sql    = '    SELECT stats_id, stats_value, stats_type, stats_period '
-                  . "    FROM {$this->table} "
-                  . '    WHERE '
-                  . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
-                  . '        '
-                  . (empty($ids) ? '' : 'AND stats_id IN ('
-                                        . implode(', ', array_map('intval', $ids))
-                                        . ')')
-                  . '        '
-                  . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
-                  . '        '
-                  . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
-        $result = $this->db->query($sql);
+		$_types = [];
+		foreach ($types as $type) {
+			$_types[] = array_search($type, $this->param['type']);
+		}
+		$_periods = [];
+		foreach ($periods as $period) {
+			$_periods[] = array_search($period, $this->param['period']);
+		}
+		$sql    = '    SELECT stats_id, stats_value, stats_type, stats_period '
+				  . "    FROM {$this->table} "
+				  . '    WHERE '
+				  . "        ( time_format = '' OR DATE_FORMAT(time_update, time_format) = DATE_FORMAT(NOW(), time_format) ) "
+				  . '        '
+				  . (empty($ids) ? '' : 'AND stats_id IN ('
+										. implode(', ', array_map('intval', $ids))
+										. ')')
+				  . '        '
+				  . (empty($_types) ? '' : 'AND stats_type IN (' . implode(', ', $_types) . ')')
+				  . '        '
+				  . (empty($_periods) ? '' : 'AND stats_period IN (' . implode(', ', $_periods) . ')');
+		$result = $this->db->query($sql);
 
-        while (false !== ($row = $this->db->fetchArray($result))) {
-            $ret[(string)$row['stats_id']][$this->param['type'][$row['stats_type']]][$this->param['period'][$row['stats_period']]] = $row['stats_value'];
-        }
+		while (false !== ($row = $this->db->fetchArray($result))) {
+			$ret[(string)$row['stats_id']][$this->param['type'][$row['stats_type']]][$this->param['period'][$row['stats_period']]] = $row['stats_value'];
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    public function reset()
-    {
-        $this->db->queryF('TRUNCATE TABLE ' . $this->table);
-        $now        = time();
-        $time_start = [
-            'day'   => '%Y%j',
-            'week'  => '%Y%u',
-            'month' => '%Y%m'
-        ];
-        $counts     = [];
+	public function reset()
+	{
+		$this->db->queryF('TRUNCATE TABLE ' . $this->table);
+		$now        = time();
+		$time_start = [
+			'day'   => '%Y%j',
+			'week'  => '%Y%u',
+			'month' => '%Y%m'
+		];
+		$counts     = [];
 
-        $sql = '    SELECT forum_id' . '    FROM ' . $this->db->prefix('newbb_forums');
-        $ret = $this->db->query($sql);
-        while (false !== (list($forum_id) = $this->db->fetchRow($ret))) {
-            $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}";
-            $result = $this->db->query($sql);
-            list($topics, $views) = $this->db->fetchRow($result);
-            $this->update($forum_id, 'topic', $topics);
-            $this->update($forum_id, 'view', $views);
+		$sql = '    SELECT forum_id' . '    FROM ' . $this->db->prefix('newbb_forums');
+		$ret = $this->db->query($sql);
+		while (false !== (list($forum_id) = $this->db->fetchRow($ret))) {
+			$sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+			$result = $this->db->query($sql);
+			list($topics, $views) = $this->db->fetchRow($result);
+			$this->update($forum_id, 'topic', $topics);
+			$this->update($forum_id, 'view', $views);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
-            $result = $this->db->query($sql);
-            list($digests) = $this->db->fetchRow($result);
-            $this->update($forum_id, 'digest', $digests);
+			$sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}";
+			$result = $this->db->query($sql);
+			list($digests) = $this->db->fetchRow($result);
+			$this->update($forum_id, 'digest', $digests);
 
-            $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}";
-            $result = $this->db->query($sql);
-            list($posts) = $this->db->fetchRow($result);
-            $this->update($forum_id, 'post', $posts);
+			$sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}";
+			$result = $this->db->query($sql);
+			list($posts) = $this->db->fetchRow($result);
+			$this->update($forum_id, 'post', $posts);
 
-            foreach ($time_start as $period => $format) {
-                $sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
-                $result = $this->db->query($sql);
-                list($topics, $views) = $this->db->fetchRow($result);
-                $views = empty($views) ? 0 : $views; // null check
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$topics}', '"
-                                  . array_search('topic', $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'])
-                                  . "', NOW(), '{$format}')");
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$views}', '"
-                                  . array_search('view', $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'])
-                                  . "', NOW(), '{$format}')");
-                @$counts['topic'][$period] += $topics;
-                @$counts['view'][$period] += $views;
+			foreach ($time_start as $period => $format) {
+				$sql    = '    SELECT COUNT(*), SUM(topic_views)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(topic_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+				$result = $this->db->query($sql);
+				list($topics, $views) = $this->db->fetchRow($result);
+				$views = empty($views) ? 0 : $views; // null check
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('{$forum_id}', '{$topics}', '"
+								  . array_search('topic', $this->param['type'], true)
+								  . "', '"
+								  . array_search($period, $this->param['period'])
+								  . "', NOW(), '{$format}')");
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('{$forum_id}', '{$views}', '"
+								  . array_search('view', $this->param['type'], true)
+								  . "', '"
+								  . array_search($period, $this->param['period'])
+								  . "', NOW(), '{$format}')");
+				@$counts['topic'][$period] += $topics;
+				@$counts['view'][$period] += $views;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
-                $result = $this->db->query($sql);
-                list($digests) = $this->db->fetchRow($result);
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$digests}', '"
-                                  . array_search('digest', $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'])
-                                  . "', NOW(), '{$format}')");
-                @$counts['digest'][$period] += $digests;
+				$sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_topics') . "    WHERE approved=1 AND topic_digest >0 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(digest_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+				$result = $this->db->query($sql);
+				list($digests) = $this->db->fetchRow($result);
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('{$forum_id}', '{$digests}', '"
+								  . array_search('digest', $this->param['type'], true)
+								  . "', '"
+								  . array_search($period, $this->param['period'])
+								  . "', NOW(), '{$format}')");
+				@$counts['digest'][$period] += $digests;
 
-                $sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
-                $result = $this->db->query($sql);
-                list($posts) = $this->db->fetchRow($result);
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('{$forum_id}', '{$posts}', '"
-                                  . array_search('post', $this->param['type'])
-                                  . "', '"
-                                  . array_search($period, $this->param['period'], true)
-                                  . "', NOW(), '{$format}')");
-                @$counts['post'][$period] += $posts;
-            }
-        }
+				$sql    = '    SELECT COUNT(*)' . '    FROM ' . $this->db->prefix('newbb_posts') . "    WHERE approved=1 AND forum_id = {$forum_id}" . "        AND FROM_UNIXTIME(post_time, '{$format}') >= FROM_UNIXTIME({$now}, '{$format}')";
+				$result = $this->db->query($sql);
+				list($posts) = $this->db->fetchRow($result);
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('{$forum_id}', '{$posts}', '"
+								  . array_search('post', $this->param['type'])
+								  . "', '"
+								  . array_search($period, $this->param['period'], true)
+								  . "', NOW(), '{$format}')");
+				@$counts['post'][$period] += $posts;
+			}
+		}
 
-        $this->db->queryF("    DELETE FROM {$this->table}" . "    WHERE stats_id = '0' AND stats_period <> " . array_search('total', $this->param['period'], true));
-        foreach ($time_start as $period => $format) {
-            foreach (array_keys($counts) as $type) {
-                $this->db->queryF("    INSERT INTO {$this->table}"
-                                  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
-                                  . '    VALUES '
-                                  . "        ('0', '{$counts[$type][$period]}', '"
-                                  . array_search($type, $this->param['type'], true)
-                                  . "', '"
-                                  . array_search($period, $this->param['period'], true)
-                                  . "', NOW(), '{$format}')");
-            }
-        }
-    }
+		$this->db->queryF("    DELETE FROM {$this->table}" . "    WHERE stats_id = '0' AND stats_period <> " . array_search('total', $this->param['period'], true));
+		foreach ($time_start as $period => $format) {
+			foreach (array_keys($counts) as $type) {
+				$this->db->queryF("    INSERT INTO {$this->table}"
+								  . '        (`stats_id`, `stats_value`, `stats_type`, `stats_period`, `time_update`, `time_format`) '
+								  . '    VALUES '
+								  . "        ('0', '{$counts[$type][$period]}', '"
+								  . array_search($type, $this->param['type'], true)
+								  . "', '"
+								  . array_search($period, $this->param['period'], true)
+								  . "', NOW(), '{$format}')");
+			}
+		}
+	}
 }

update_type.php

Spacing +13 added lines, -13 removed lines

@@ -8,7 +8,7 @@ 
  * @since          4.00
  * @package        module::newbb
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (!is_object($GLOBALS['xoopsUser']) || !$GLOBALS['xoopsUser']->isAdmin()) {
     exit(_NOPERM);
@@ -22,11 +22,11 @@ 
     exit('No need for update');
 }
 
-$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+$GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+$GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
 
 if (!$GLOBALS['xoopsDB']->queryF('
-        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . " (
+        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp')." (
           `type_id`             SMALLINT(4)         UNSIGNED NOT NULL AUTO_INCREMENT,
           `type_name`             VARCHAR(64)         NOT NULL DEFAULT '',
           `type_color`             VARCHAR(10)         NOT NULL DEFAULT '',
@@ -39,7 +39,7 @@ 
 }
 
 if (!$GLOBALS['xoopsDB']->queryF('
-        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . " (
+        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp')." (
           `tf_id`                 MEDIUMINT(4)         UNSIGNED NOT NULL AUTO_INCREMENT,
           `type_id`             SMALLINT(4)         UNSIGNED NOT NULL DEFAULT '0',
           `forum_id`             SMALLINT(4)         UNSIGNED NOT NULL DEFAULT '0',
@@ -50,7 +50,7 @@ 
           KEY `type_order`        (`type_order`)
         ) ENGINE=MyISAM;
     ")) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
     exit('Can not create tmp table for `bb_type_forum_tmp`');
 }
 
@@ -61,10 +61,10 @@ 
 foreach ($subjectpres as $subjectpre) {
     if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) {
         if (!$GLOBALS['xoopsDB']->queryF('
-                INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . '
+                INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp').'
                     (`type_name`, `type_color`)
                 VALUES
-                    (' . $GLOBALS['xoopsDB']->quoteString($matches[2]) . ', ' . $GLOBALS['xoopsDB']->quoteString($matches[1]) . ')
+                    (' . $GLOBALS['xoopsDB']->quoteString($matches[2]).', '.$GLOBALS['xoopsDB']->quoteString($matches[1]).')
             ')) {
             xoops_error("Can not add type of `{$matches[2]}`");
             continue;
@@ -73,8 +73,8 @@ 
     }
 }
 if (0 === count($types)) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
     exit('No type item created');
 }
 
@@ -87,14 +87,14 @@ 
             $type_query[] = "({$key}, {$forum_id}, {$order})";
         }
 
-        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
+        $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp').' (type_id, forum_id, type_order) '.' VALUES '.implode(', ', $type_query);
         if (false === ($result = $GLOBALS['xoopsDB']->queryF($sql))) {
             xoops_error($GLOBALS['xoopsDB']->error());
         }
     }
 } else {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
     exit('No type item to update');
 }
 

Indentation +29 added lines, -29 removed lines

@@ -11,15 +11,15 @@ 
 require_once __DIR__ . '/header.php';
 
 if (!is_object($GLOBALS['xoopsUser']) || !$GLOBALS['xoopsUser']->isAdmin()) {
-    exit(_NOPERM);
+	exit(_NOPERM);
 }
 
 if ($xoopsModule->getVar('version') >= 401) {
-    exit('Version not valid');
+	exit('Version not valid');
 }
 
 if (empty($GLOBALS['xoopsModuleConfig']['subject_prefix'])) {
-    exit('No need for update');
+	exit('No need for update');
 }
 
 $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
@@ -35,7 +35,7 @@ 
           PRIMARY KEY              (`type_id`)
         ) ENGINE=MyISAM;
     ")) {
-    exit('Can not create tmp table for `bb_type_tmp`');
+	exit('Can not create tmp table for `bb_type_tmp`');
 }
 
 if (!$GLOBALS['xoopsDB']->queryF('
@@ -50,8 +50,8 @@ 
           KEY `type_order`        (`type_order`)
         ) ENGINE=MyISAM;
     ")) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    exit('Can not create tmp table for `bb_type_forum_tmp`');
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+	exit('Can not create tmp table for `bb_type_forum_tmp`');
 }
 
 //$typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
@@ -59,43 +59,43 @@ 
 $types       = [];
 $order       = 1;
 foreach ($subjectpres as $subjectpre) {
-    if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) {
-        if (!$GLOBALS['xoopsDB']->queryF('
+	if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) {
+		if (!$GLOBALS['xoopsDB']->queryF('
                 INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . '
                     (`type_name`, `type_color`)
                 VALUES
                     (' . $GLOBALS['xoopsDB']->quoteString($matches[2]) . ', ' . $GLOBALS['xoopsDB']->quoteString($matches[1]) . ')
             ')) {
-            xoops_error("Can not add type of `{$matches[2]}`");
-            continue;
-        }
-        $types[$GLOBALS['xoopsDB']->getInsertId()] = $order++;
-    }
+			xoops_error("Can not add type of `{$matches[2]}`");
+			continue;
+		}
+		$types[$GLOBALS['xoopsDB']->getInsertId()] = $order++;
+	}
 }
 if (0 === count($types)) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
-    exit('No type item created');
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+	exit('No type item created');
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 if ($forums_type = $forumHandler->getIds(new \Criteria('allow_subject_prefix', 1))) {
-    foreach ($forums_type as $forum_id) {
-        $type_query = [];
-        foreach ($types as $key => $order) {
-            $type_query[] = "({$key}, {$forum_id}, {$order})";
-        }
+	foreach ($forums_type as $forum_id) {
+		$type_query = [];
+		foreach ($types as $key => $order) {
+			$type_query[] = "({$key}, {$forum_id}, {$order})";
+		}
 
-        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
-        if (false === ($result = $GLOBALS['xoopsDB']->queryF($sql))) {
-            xoops_error($GLOBALS['xoopsDB']->error());
-        }
-    }
+		$sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
+		if (false === ($result = $GLOBALS['xoopsDB']->queryF($sql))) {
+			xoops_error($GLOBALS['xoopsDB']->error());
+		}
+	}
 } else {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
-    exit('No type item to update');
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+	exit('No type item to update');
 }
 
 die('update succeeded');

print.php

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
  *
  */
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 error_reporting(0);
 $xoopsLogger->activated = false;
@@ -65,9 +65,9 @@ 
         $topic_id         = $post->getVar('topic_id');
         $post_data        = $postHandler->getPostForPrint($post);
         $isPost           = 1;
-        $post_data['url'] = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+        $post_data['url'] = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$post_id;
         if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $post_data['url'] = seo_urls('<a href="' . $post_data['url'] . '"></a>');
+            $post_data['url'] = seo_urls('<a href="'.$post_data['url'].'"></a>');
             $post_data['url'] = str_replace('<a href="', '', $post_data['url']);
             $post_data['url'] = str_replace('"></a>', '', $post_data['url']);
         }
@@ -113,7 +113,7 @@ 
     echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
-            <img src='" . XOOPS_URL . "/modules/newbb/assets/images/xoopsbb_slogo.png' border='0' alt='' />
+            <img src='" . XOOPS_URL."/modules/newbb/assets/images/xoopsbb_slogo.png' border='0' alt='' />
             <br><br> ";
 
     $postsArray = $topicHandler->getAllPosts($topicObject);
@@ -122,25 +122,25 @@ 
             continue;
         }
         $post_data = $postHandler->getPostForPrint($post);
-        echo "<h2 style='margin: 0;'>" . $post_data['subject'] . "</h2>
-              <div align='center'>" . _POSTEDBY . '&nbsp;' . $post_data['author'] . '&nbsp;' . _ON . '&nbsp;' . formatTimestamp($post_data['date']) . "</div>
+        echo "<h2 style='margin: 0;'>".$post_data['subject']."</h2>
+              <div align='center'>" . _POSTEDBY.'&nbsp;'.$post_data['author'].'&nbsp;'._ON.'&nbsp;'.formatTimestamp($post_data['date'])."</div>
               <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
-               <div>" . $post_data['text'] . "</div>
+               <div>" . $post_data['text']."</div>
               <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div><br>";
     }
-    echo '<p>' . _MD_NEWBB_COMEFROM . '&nbsp;' . XOOPS_URL . '/newbb/viewtopic.php?forum=' . $forum_id . '&amp;topic_id=' . $topic_id . '</p>';
+    echo '<p>'._MD_NEWBB_COMEFROM.'&nbsp;'.XOOPS_URL.'/newbb/viewtopic.php?forum='.$forum_id.'&amp;topic_id='.$topic_id.'</p>';
     echo '</div></div>';
     echo '</body></html>';
 } else {
     echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
-            <h2 style='margin: 0;'>" . $post_data['subject'] . "</h2></div>
-            <div align='center'>" . _POSTEDBY . '&nbsp;' . $post_data['author'] . '&nbsp;' . _ON . '&nbsp;' . formatTimestamp($post_data['date']) . "</div>
+            <h2 style='margin: 0;'>" . $post_data['subject']."</h2></div>
+            <div align='center'>" . _POSTEDBY.'&nbsp;'.$post_data['author'].'&nbsp;'._ON.'&nbsp;'.formatTimestamp($post_data['date'])."</div>
             <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
-            <div>" . $post_data['text'] . "</div>
+            <div>" . $post_data['text']."</div>
             <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div>
-            <p>" . _MD_NEWBB_COMEFROM . '&nbsp;' . $post_data['url'] . '</p>
+            <p>" . _MD_NEWBB_COMEFROM.'&nbsp;'.$post_data['url'].'</p>
             </div>
             <br><br></body></html>';
 }

Indentation +65 added lines, -65 removed lines

@@ -46,93 +46,93 @@
 $xoopsLogger->activated = false;
 
 if (!Request::getString('post_data', '', 'POST')) {
-    $forum    = Request::getInt('forum', 0, 'GET');
-    $topic_id = Request::getInt('topic_id', 0, 'GET');
-    $post_id  = Request::getInt('post_id', 0, 'GET');
+	$forum    = Request::getInt('forum', 0, 'GET');
+	$topic_id = Request::getInt('topic_id', 0, 'GET');
+	$post_id  = Request::getInt('post_id', 0, 'GET');
 
-    if (0 === $post_id && 0 === $topic_id) {
-        exit(_MD_NEWBB_ERRORTOPIC);
-    }
+	if (0 === $post_id && 0 === $topic_id) {
+		exit(_MD_NEWBB_ERRORTOPIC);
+	}
 
-    if (0 !== $post_id) {
-        //        /** @var Newbb\PostHandler $postHandler */
-        //        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-        /** @var Newbb\Post $post */
-        $post = $postHandler->get($post_id);
-        if (!$approved = $post->getVar('approved')) {
-            exit(_MD_NEWBB_NORIGHTTOVIEW);
-        }
-        $topic_id         = $post->getVar('topic_id');
-        $post_data        = $postHandler->getPostForPrint($post);
-        $isPost           = 1;
-        $post_data['url'] = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
-        if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $post_data['url'] = seo_urls('<a href="' . $post_data['url'] . '"></a>');
-            $post_data['url'] = str_replace('<a href="', '', $post_data['url']);
-            $post_data['url'] = str_replace('"></a>', '', $post_data['url']);
-        }
-    }
+	if (0 !== $post_id) {
+		//        /** @var Newbb\PostHandler $postHandler */
+		//        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+		/** @var Newbb\Post $post */
+		$post = $postHandler->get($post_id);
+		if (!$approved = $post->getVar('approved')) {
+			exit(_MD_NEWBB_NORIGHTTOVIEW);
+		}
+		$topic_id         = $post->getVar('topic_id');
+		$post_data        = $postHandler->getPostForPrint($post);
+		$isPost           = 1;
+		$post_data['url'] = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+		if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
+			$post_data['url'] = seo_urls('<a href="' . $post_data['url'] . '"></a>');
+			$post_data['url'] = str_replace('<a href="', '', $post_data['url']);
+			$post_data['url'] = str_replace('"></a>', '', $post_data['url']);
+		}
+	}
 
-    //    /** @var Newbb\TopicHandler $topicHandler */
-    //    $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-    $topicObject = $topicHandler->get($topic_id);
-    $topic_id    = $topicObject->getVar('topic_id');
-    $forum       = $topicObject->getVar('forum_id');
-    if (!$approved = $topicObject->getVar('approved')) {
-        exit(_MD_NEWBB_NORIGHTTOVIEW);
-    }
+	//    /** @var Newbb\TopicHandler $topicHandler */
+	//    $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+	$topicObject = $topicHandler->get($topic_id);
+	$topic_id    = $topicObject->getVar('topic_id');
+	$forum       = $topicObject->getVar('forum_id');
+	if (!$approved = $topicObject->getVar('approved')) {
+		exit(_MD_NEWBB_NORIGHTTOVIEW);
+	}
 
-    $isAdmin = newbbIsAdmin($forumObject);
-    if (!$isAdmin && $topicObject->getVar('approved') < 0) {
-        exit(_MD_NEWBB_NORIGHTTOVIEW);
-    }
+	$isAdmin = newbbIsAdmin($forumObject);
+	if (!$isAdmin && $topicObject->getVar('approved') < 0) {
+		exit(_MD_NEWBB_NORIGHTTOVIEW);
+	}
 
-    //    /** @var Newbb\ForumHandler $forumHandler */
-    //    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-    $forum       = $topicObject->getVar('forum_id');
-    $forumObject = $forumHandler->get($forum);
-    if (!$forumHandler->getPermission($forumObject)) {
-        exit(_MD_NEWBB_NORIGHTTOVIEW);
-    }
+	//    /** @var Newbb\ForumHandler $forumHandler */
+	//    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+	$forum       = $topicObject->getVar('forum_id');
+	$forumObject = $forumHandler->get($forum);
+	if (!$forumHandler->getPermission($forumObject)) {
+		exit(_MD_NEWBB_NORIGHTTOVIEW);
+	}
 
-    if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
-        exit(_MD_NEWBB_NORIGHTTOVIEW);
-    }
-    // irmtfan add print permission
-    if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'print')) {
-        exit(_MD_NEWBB_NORIGHTTOPRINT);
-    }
+	if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
+		exit(_MD_NEWBB_NORIGHTTOVIEW);
+	}
+	// irmtfan add print permission
+	if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'print')) {
+		exit(_MD_NEWBB_NORIGHTTOPRINT);
+	}
 } else {
-    $post_data = unserialize(base64_decode(Request::getString('post_data', '', 'POST')));
-    $isPost    = 1;
+	$post_data = unserialize(base64_decode(Request::getString('post_data', '', 'POST')));
+	$isPost    = 1;
 }
 
 xoops_header(false);
 
 if (empty($isPost)) {
-    echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
+	echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
             <img src='" . XOOPS_URL . "/modules/newbb/assets/images/xoopsbb_slogo.png' border='0' alt='' />
             <br><br> ";
 
-    $postsArray = $topicHandler->getAllPosts($topicObject);
-    foreach ($postsArray as $post) {
-        if (!$post->getVar('approved')) {
-            continue;
-        }
-        $post_data = $postHandler->getPostForPrint($post);
-        echo "<h2 style='margin: 0;'>" . $post_data['subject'] . "</h2>
+	$postsArray = $topicHandler->getAllPosts($topicObject);
+	foreach ($postsArray as $post) {
+		if (!$post->getVar('approved')) {
+			continue;
+		}
+		$post_data = $postHandler->getPostForPrint($post);
+		echo "<h2 style='margin: 0;'>" . $post_data['subject'] . "</h2>
               <div align='center'>" . _POSTEDBY . '&nbsp;' . $post_data['author'] . '&nbsp;' . _ON . '&nbsp;' . formatTimestamp($post_data['date']) . "</div>
               <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
                <div>" . $post_data['text'] . "</div>
               <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div><br>";
-    }
-    echo '<p>' . _MD_NEWBB_COMEFROM . '&nbsp;' . XOOPS_URL . '/newbb/viewtopic.php?forum=' . $forum_id . '&amp;topic_id=' . $topic_id . '</p>';
-    echo '</div></div>';
-    echo '</body></html>';
+	}
+	echo '<p>' . _MD_NEWBB_COMEFROM . '&nbsp;' . XOOPS_URL . '/newbb/viewtopic.php?forum=' . $forum_id . '&amp;topic_id=' . $topic_id . '</p>';
+	echo '</div></div>';
+	echo '</body></html>';
 } else {
-    echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
+	echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
             <h2 style='margin: 0;'>" . $post_data['subject'] . "</h2></div>