mambax7 / newbb5

include/functions.config.php

Indentation +32 added lines, -32 removed lines

@@ -17,37 +17,37 @@
 define('NEWBB_FUNCTIONS_CONFIG_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_CONFIG')) {
-    define('NEWBB_FUNCTIONS_CONFIG', 1);
-
-    /**
-     * @return array
-     * @internal param string $category
-     * @internal param string $dirname
-     */
-    function newbbLoadConfig()
-    {
+	define('NEWBB_FUNCTIONS_CONFIG', 1);
+
+	/**
+	 * @return array
+	 * @internal param string $category
+	 * @internal param string $dirname
+	 */
+	function newbbLoadConfig()
+	{
 //        require_once dirname(__DIR__) . '/class/Helper.php';
-        //$helper = NewBB::getInstance();
-        /** @var Newbb\Helper $helper */
-        $helper = Newbb\Helper::getInstance();
-        static $configs = null;
-
-        if (null !== $configs) {
-            return $configs;
-        }
-
-        $configs = is_object($helper) ? $helper->getConfig() : [];
-        $plugins = require_once __DIR__   . '/plugin.php';
-        if (is_array($configs) && is_array($plugins)) {
-            $configs = array_merge($configs, $plugins);
-        }
-        if (!isset($GLOBALS['xoopsModuleConfig'])) {
-            $GLOBALS['xoopsModuleConfig'] = [];
-        }
-        if (is_array($configs)) {
-            $GLOBALS['xoopsModuleConfig'] = array_merge($GLOBALS['xoopsModuleConfig'], $configs);
-        }
-
-        return $configs;
-    }
+		//$helper = NewBB::getInstance();
+		/** @var Newbb\Helper $helper */
+		$helper = Newbb\Helper::getInstance();
+		static $configs = null;
+
+		if (null !== $configs) {
+			return $configs;
+		}
+
+		$configs = is_object($helper) ? $helper->getConfig() : [];
+		$plugins = require_once __DIR__   . '/plugin.php';
+		if (is_array($configs) && is_array($plugins)) {
+			$configs = array_merge($configs, $plugins);
+		}
+		if (!isset($GLOBALS['xoopsModuleConfig'])) {
+			$GLOBALS['xoopsModuleConfig'] = [];
+		}
+		if (is_array($configs)) {
+			$GLOBALS['xoopsModuleConfig'] = array_merge($GLOBALS['xoopsModuleConfig'], $configs);
+		}
+
+		return $configs;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 use XoopsModules\Newbb;
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_CONFIG_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_CONFIG')) {
@@ -37,7 +37,7 @@ 
         }
 
         $configs = is_object($helper) ? $helper->getConfig() : [];
-        $plugins = require_once __DIR__   . '/plugin.php';
+        $plugins = require_once __DIR__.'/plugin.php';
         if (is_array($configs) && is_array($plugins)) {
             $configs = array_merge($configs, $plugins);
         }

action.post.php

Indentation +183 added lines, -183 removed lines

@@ -23,8 +23,8 @@ 
 $mode = Request::getInt('mode', 1, 'GET');
 
 if (0 === count($post_id) || 0 === count($op)) {
-    // irmtfan - issue with javascript:history.go(-1)
-    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_NO_SELECTION);
+	// irmtfan - issue with javascript:history.go(-1)
+	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_NO_SELECTION);
 }
 ///** @var PostHandler $postHandler */
 //$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
@@ -33,199 +33,199 @@ 
 ///** @var NewbbForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 if (empty($topic_id)) {
-    $forumObject = null;
+	$forumObject = null;
 } else {
-    $topicObject = $topicHandler->get($topic_id);
-    $forum_id    = $topicObject->getVar('forum_id');
-    $forumObject = $forumHandler->get($forum_id);
+	$topicObject = $topicHandler->get($topic_id);
+	$forum_id    = $topicObject->getVar('forum_id');
+	$forumObject = $forumHandler->get($forum_id);
 }
 $isAdmin = newbbIsAdmin($forumObject);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 switch ($op) {
-    case 'restore':
-        $post_id = array_values($post_id);
-        sort($post_id);
-        $topics = [];
-        $forums = [];
-        foreach ($post_id as $post) {
-            $postObject = $postHandler->get($post);
-            if ($postObject->getVar('topic_id') < 1) {
-                continue;
-            }
-
-            $postHandler->approve($postObject, true);
-            $topics[$postObject->getVar('topic_id')] = 1;
-            $forums[$postObject->getVar('forum_id')] = 1;
-            unset($postObject);
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-        break;
-    case 'approve':
-        $post_id = array_values($post_id);
-        sort($post_id);
-        $topics      = [];
-        $forums      = [];
-        $criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
-        $postsObject = $postHandler->getObjects($criteria, true);
-        foreach ($post_id as $post) {
-            /** @var Newbb\Post $postObject */
-            $postObject = $postsObject[$post];
-            if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
-                continue;
-            }
-            $postHandler->approve($postObject);
-            $topics[$postObject->getVar('topic_id')] = $post;
-            $forums[$postObject->getVar('forum_id')] = 1;
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-
-        if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
-            break;
-        }
-
-        $criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
-        $topic_list     = $topicHandler->getList($criteria_topic, true);
-
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forum_list     = $forumHandler->getList($criteria_forum);
-
-        require_once __DIR__ . '/include/notification.inc.php';
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler = xoops_getHandler('notification');
-        foreach ($post_id as $post) {
-            $tags = [];
-            /** @var Newbb\Post[] $postsObject [$post] */
-            $tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&amp;forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
-            $tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
-            $notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
-            $tags['POST_CONTENT'] = $postsObject[$post]->getVar('post_text');
-            $tags['POST_NAME']    = $postsObject[$post]->getVar('subject');
-            $notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
-            $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_fullpost', $tags);
-        }
-        break;
-    case 'delete':
-        $post_id = array_values($post_id);
-        rsort($post_id);
-        $topics = [];
-        $forums = [];
-        foreach ($post_id as $post) {
-            $postObject = $postHandler->get($post);
-            if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
-                continue;
-            }
-            $topics[$postObject->getVar('topic_id')] = 1;
-            $forums[$postObject->getVar('forum_id')] = 1;
-            $postHandler->delete($postObject, true);
-            unset($postObject);
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-        break;
-    case 'split':
-        /** @var Newbb\Post $postObject */
-        $postObject = $postHandler->get($post_id);
-        if (0 === count($post_id) || $postObject->isTopic()) {
-            break;
-        }
-        $topic_id = $postObject->getVar('topic_id');
-
-        $newtopic = $topicHandler->create();
-        $newtopic->setVar('topic_title', $postObject->getVar('subject'), true);
-        $newtopic->setVar('topic_poster', $postObject->getVar('uid'), true);
-        $newtopic->setVar('forum_id', $postObject->getVar('forum_id'), true);
-        $newtopic->setVar('topic_time', $postObject->getVar('post_time'), true);
-        $newtopic->setVar('poster_name', $postObject->getVar('poster_name'), true);
-        $newtopic->setVar('approved', 1, true);
-        $topicHandler->insert($newtopic, true);
-        $new_topic_id = $newtopic->getVar('topic_id');
-
-        $pid = $postObject->getVar('pid');
-
-        $postObject->setVar('topic_id', $new_topic_id, true);
-        $postObject->setVar('pid', 0, true);
-        $postHandler->insert($postObject);
-
-        /* split a single post */
-        if (1 === $mode) {
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-            $criteria->add(new \Criteria('pid', $post_id));
-            $postHandler->updateAll('pid', $pid, $criteria, true);
-        /* split a post and its children posts */
-        } elseif (2 === $mode) {
-            require_once $GLOBALS['xoops']->path('class/xoopstree.php');
-            $mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
-            $posts  = $mytree->getAllChildId($post_id);
-            if (count($posts) > 0) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
-                $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
-            }
-            /* split a post and all posts coming after */
-        } elseif (3 === $mode) {
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-            $criteria->add(new \Criteria('post_id', $post_id, '>'));
-            $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
-
-            unset($criteria);
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $new_topic_id));
-            $criteria->add(new \Criteria('post_id', $post_id, '>'));
-            $postHandler->identifierName = 'pid';
-            $posts                       = $postHandler->getList($criteria);
-
-            unset($criteria);
-            $post_update = [];
-            foreach ($posts as $postid => $pid) {
-                //                if (!in_array($pid, array_keys($posts))) {
-                if (!array_key_exists($pid, $posts)) {
-                    $post_update[] = $pid;
-                }
-                if (!array_key_exists($pid, $posts)) {
-                    $post_update2[] = $pid;
-                }
-            }
-            if (count($post_update)) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
-                $postHandler->updateAll('pid', $post_id, $criteria, true);
-            }
-        }
-
-        $forum_id = $postObject->getVar('forum_id');
-        $topicHandler->synchronization($topic_id);
-        $topicHandler->synchronization($new_topic_id);
-        $sql    = sprintf('UPDATE "%s" SET forum_topics = forum_topics+1 WHERE forum_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_forums'), $forum_id);
-        $result = $GLOBALS['xoopsDB']->queryF($sql);
-
-        break;
+	case 'restore':
+		$post_id = array_values($post_id);
+		sort($post_id);
+		$topics = [];
+		$forums = [];
+		foreach ($post_id as $post) {
+			$postObject = $postHandler->get($post);
+			if ($postObject->getVar('topic_id') < 1) {
+				continue;
+			}
+
+			$postHandler->approve($postObject, true);
+			$topics[$postObject->getVar('topic_id')] = 1;
+			$forums[$postObject->getVar('forum_id')] = 1;
+			unset($postObject);
+		}
+		foreach (array_keys($topics) as $topic) {
+			$topicHandler->synchronization($topic);
+		}
+		foreach (array_keys($forums) as $forum) {
+			$forumHandler->synchronization($forum);
+		}
+		break;
+	case 'approve':
+		$post_id = array_values($post_id);
+		sort($post_id);
+		$topics      = [];
+		$forums      = [];
+		$criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
+		$postsObject = $postHandler->getObjects($criteria, true);
+		foreach ($post_id as $post) {
+			/** @var Newbb\Post $postObject */
+			$postObject = $postsObject[$post];
+			if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
+				continue;
+			}
+			$postHandler->approve($postObject);
+			$topics[$postObject->getVar('topic_id')] = $post;
+			$forums[$postObject->getVar('forum_id')] = 1;
+		}
+		foreach (array_keys($topics) as $topic) {
+			$topicHandler->synchronization($topic);
+		}
+		foreach (array_keys($forums) as $forum) {
+			$forumHandler->synchronization($forum);
+		}
+
+		if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
+			break;
+		}
+
+		$criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
+		$topic_list     = $topicHandler->getList($criteria_topic, true);
+
+		$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+		$forum_list     = $forumHandler->getList($criteria_forum);
+
+		require_once __DIR__ . '/include/notification.inc.php';
+		/** @var \XoopsNotificationHandler $notificationHandler */
+		$notificationHandler = xoops_getHandler('notification');
+		foreach ($post_id as $post) {
+			$tags = [];
+			/** @var Newbb\Post[] $postsObject [$post] */
+			$tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
+			$tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&amp;forum=' . $postsObject[$post]->getVar('forum_id');
+			$tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
+			$tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
+			$tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
+			$notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
+			$notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
+			$notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
+			$tags['POST_CONTENT'] = $postsObject[$post]->getVar('post_text');
+			$tags['POST_NAME']    = $postsObject[$post]->getVar('subject');
+			$notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
+			$notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_fullpost', $tags);
+		}
+		break;
+	case 'delete':
+		$post_id = array_values($post_id);
+		rsort($post_id);
+		$topics = [];
+		$forums = [];
+		foreach ($post_id as $post) {
+			$postObject = $postHandler->get($post);
+			if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
+				continue;
+			}
+			$topics[$postObject->getVar('topic_id')] = 1;
+			$forums[$postObject->getVar('forum_id')] = 1;
+			$postHandler->delete($postObject, true);
+			unset($postObject);
+		}
+		foreach (array_keys($topics) as $topic) {
+			$topicHandler->synchronization($topic);
+		}
+		foreach (array_keys($forums) as $forum) {
+			$forumHandler->synchronization($forum);
+		}
+		break;
+	case 'split':
+		/** @var Newbb\Post $postObject */
+		$postObject = $postHandler->get($post_id);
+		if (0 === count($post_id) || $postObject->isTopic()) {
+			break;
+		}
+		$topic_id = $postObject->getVar('topic_id');
+
+		$newtopic = $topicHandler->create();
+		$newtopic->setVar('topic_title', $postObject->getVar('subject'), true);
+		$newtopic->setVar('topic_poster', $postObject->getVar('uid'), true);
+		$newtopic->setVar('forum_id', $postObject->getVar('forum_id'), true);
+		$newtopic->setVar('topic_time', $postObject->getVar('post_time'), true);
+		$newtopic->setVar('poster_name', $postObject->getVar('poster_name'), true);
+		$newtopic->setVar('approved', 1, true);
+		$topicHandler->insert($newtopic, true);
+		$new_topic_id = $newtopic->getVar('topic_id');
+
+		$pid = $postObject->getVar('pid');
+
+		$postObject->setVar('topic_id', $new_topic_id, true);
+		$postObject->setVar('pid', 0, true);
+		$postHandler->insert($postObject);
+
+		/* split a single post */
+		if (1 === $mode) {
+			$criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+			$criteria->add(new \Criteria('pid', $post_id));
+			$postHandler->updateAll('pid', $pid, $criteria, true);
+		/* split a post and its children posts */
+		} elseif (2 === $mode) {
+			require_once $GLOBALS['xoops']->path('class/xoopstree.php');
+			$mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
+			$posts  = $mytree->getAllChildId($post_id);
+			if (count($posts) > 0) {
+				$criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
+				$postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
+			}
+			/* split a post and all posts coming after */
+		} elseif (3 === $mode) {
+			$criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+			$criteria->add(new \Criteria('post_id', $post_id, '>'));
+			$postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
+
+			unset($criteria);
+			$criteria = new \CriteriaCompo(new \Criteria('topic_id', $new_topic_id));
+			$criteria->add(new \Criteria('post_id', $post_id, '>'));
+			$postHandler->identifierName = 'pid';
+			$posts                       = $postHandler->getList($criteria);
+
+			unset($criteria);
+			$post_update = [];
+			foreach ($posts as $postid => $pid) {
+				//                if (!in_array($pid, array_keys($posts))) {
+				if (!array_key_exists($pid, $posts)) {
+					$post_update[] = $pid;
+				}
+				if (!array_key_exists($pid, $posts)) {
+					$post_update2[] = $pid;
+				}
+			}
+			if (count($post_update)) {
+				$criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
+				$postHandler->updateAll('pid', $post_id, $criteria, true);
+			}
+		}
+
+		$forum_id = $postObject->getVar('forum_id');
+		$topicHandler->synchronization($topic_id);
+		$topicHandler->synchronization($new_topic_id);
+		$sql    = sprintf('UPDATE "%s" SET forum_topics = forum_topics+1 WHERE forum_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_forums'), $forum_id);
+		$result = $GLOBALS['xoopsDB']->queryF($sql);
+
+		break;
 }
 if (!empty($topic_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
 } elseif (!empty($forum_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

Switch Indentation +173 added lines, -173 removed lines

@@ -46,179 +46,179 @@
 }
 
 switch ($op) {
-    case 'restore':
-        $post_id = array_values($post_id);
-        sort($post_id);
-        $topics = [];
-        $forums = [];
-        foreach ($post_id as $post) {
-            $postObject = $postHandler->get($post);
-            if ($postObject->getVar('topic_id') < 1) {
-                continue;
-            }
-
-            $postHandler->approve($postObject, true);
-            $topics[$postObject->getVar('topic_id')] = 1;
-            $forums[$postObject->getVar('forum_id')] = 1;
-            unset($postObject);
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-        break;
-    case 'approve':
-        $post_id = array_values($post_id);
-        sort($post_id);
-        $topics      = [];
-        $forums      = [];
-        $criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
-        $postsObject = $postHandler->getObjects($criteria, true);
-        foreach ($post_id as $post) {
-            /** @var Newbb\Post $postObject */
-            $postObject = $postsObject[$post];
-            if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
-                continue;
-            }
-            $postHandler->approve($postObject);
-            $topics[$postObject->getVar('topic_id')] = $post;
-            $forums[$postObject->getVar('forum_id')] = 1;
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-
-        if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
-            break;
-        }
-
-        $criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
-        $topic_list     = $topicHandler->getList($criteria_topic, true);
-
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forum_list     = $forumHandler->getList($criteria_forum);
-
-        require_once __DIR__ . '/include/notification.inc.php';
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler = xoops_getHandler('notification');
-        foreach ($post_id as $post) {
-            $tags = [];
-            /** @var Newbb\Post[] $postsObject [$post] */
-            $tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&amp;forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
-            $tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
-            $notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
-            $tags['POST_CONTENT'] = $postsObject[$post]->getVar('post_text');
-            $tags['POST_NAME']    = $postsObject[$post]->getVar('subject');
-            $notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
-            $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_fullpost', $tags);
-        }
-        break;
-    case 'delete':
-        $post_id = array_values($post_id);
-        rsort($post_id);
-        $topics = [];
-        $forums = [];
-        foreach ($post_id as $post) {
-            $postObject = $postHandler->get($post);
-            if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
-                continue;
-            }
-            $topics[$postObject->getVar('topic_id')] = 1;
-            $forums[$postObject->getVar('forum_id')] = 1;
-            $postHandler->delete($postObject, true);
-            unset($postObject);
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-        break;
-    case 'split':
-        /** @var Newbb\Post $postObject */
-        $postObject = $postHandler->get($post_id);
-        if (0 === count($post_id) || $postObject->isTopic()) {
-            break;
-        }
-        $topic_id = $postObject->getVar('topic_id');
-
-        $newtopic = $topicHandler->create();
-        $newtopic->setVar('topic_title', $postObject->getVar('subject'), true);
-        $newtopic->setVar('topic_poster', $postObject->getVar('uid'), true);
-        $newtopic->setVar('forum_id', $postObject->getVar('forum_id'), true);
-        $newtopic->setVar('topic_time', $postObject->getVar('post_time'), true);
-        $newtopic->setVar('poster_name', $postObject->getVar('poster_name'), true);
-        $newtopic->setVar('approved', 1, true);
-        $topicHandler->insert($newtopic, true);
-        $new_topic_id = $newtopic->getVar('topic_id');
-
-        $pid = $postObject->getVar('pid');
-
-        $postObject->setVar('topic_id', $new_topic_id, true);
-        $postObject->setVar('pid', 0, true);
-        $postHandler->insert($postObject);
-
-        /* split a single post */
-        if (1 === $mode) {
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-            $criteria->add(new \Criteria('pid', $post_id));
-            $postHandler->updateAll('pid', $pid, $criteria, true);
-        /* split a post and its children posts */
-        } elseif (2 === $mode) {
-            require_once $GLOBALS['xoops']->path('class/xoopstree.php');
-            $mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
-            $posts  = $mytree->getAllChildId($post_id);
-            if (count($posts) > 0) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
-                $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
-            }
-            /* split a post and all posts coming after */
-        } elseif (3 === $mode) {
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-            $criteria->add(new \Criteria('post_id', $post_id, '>'));
-            $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
-
-            unset($criteria);
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $new_topic_id));
-            $criteria->add(new \Criteria('post_id', $post_id, '>'));
-            $postHandler->identifierName = 'pid';
-            $posts                       = $postHandler->getList($criteria);
-
-            unset($criteria);
-            $post_update = [];
-            foreach ($posts as $postid => $pid) {
-                //                if (!in_array($pid, array_keys($posts))) {
-                if (!array_key_exists($pid, $posts)) {
-                    $post_update[] = $pid;
-                }
-                if (!array_key_exists($pid, $posts)) {
-                    $post_update2[] = $pid;
-                }
-            }
-            if (count($post_update)) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
-                $postHandler->updateAll('pid', $post_id, $criteria, true);
-            }
-        }
-
-        $forum_id = $postObject->getVar('forum_id');
-        $topicHandler->synchronization($topic_id);
-        $topicHandler->synchronization($new_topic_id);
-        $sql    = sprintf('UPDATE "%s" SET forum_topics = forum_topics+1 WHERE forum_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_forums'), $forum_id);
-        $result = $GLOBALS['xoopsDB']->queryF($sql);
-
-        break;
+    	case 'restore':
+        	$post_id = array_values($post_id);
+        	sort($post_id);
+        	$topics = [];
+        	$forums = [];
+        	foreach ($post_id as $post) {
+            	$postObject = $postHandler->get($post);
+            	if ($postObject->getVar('topic_id') < 1) {
+                	continue;
+            	}
+
+            	$postHandler->approve($postObject, true);
+            	$topics[$postObject->getVar('topic_id')] = 1;
+            	$forums[$postObject->getVar('forum_id')] = 1;
+            	unset($postObject);
+        	}
+        	foreach (array_keys($topics) as $topic) {
+            	$topicHandler->synchronization($topic);
+        	}
+        	foreach (array_keys($forums) as $forum) {
+            	$forumHandler->synchronization($forum);
+        	}
+        	break;
+    	case 'approve':
+        	$post_id = array_values($post_id);
+        	sort($post_id);
+        	$topics      = [];
+        	$forums      = [];
+        	$criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
+        	$postsObject = $postHandler->getObjects($criteria, true);
+        	foreach ($post_id as $post) {
+            	/** @var Newbb\Post $postObject */
+            	$postObject = $postsObject[$post];
+            	if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
+                	continue;
+            	}
+            	$postHandler->approve($postObject);
+            	$topics[$postObject->getVar('topic_id')] = $post;
+            	$forums[$postObject->getVar('forum_id')] = 1;
+        	}
+        	foreach (array_keys($topics) as $topic) {
+            	$topicHandler->synchronization($topic);
+        	}
+        	foreach (array_keys($forums) as $forum) {
+            	$forumHandler->synchronization($forum);
+        	}
+
+        	if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
+            	break;
+        	}
+
+        	$criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
+        	$topic_list     = $topicHandler->getList($criteria_topic, true);
+
+        	$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        	$forum_list     = $forumHandler->getList($criteria_forum);
+
+        	require_once __DIR__ . '/include/notification.inc.php';
+        	/** @var \XoopsNotificationHandler $notificationHandler */
+        	$notificationHandler = xoops_getHandler('notification');
+        	foreach ($post_id as $post) {
+            	$tags = [];
+            	/** @var Newbb\Post[] $postsObject [$post] */
+            	$tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
+            	$tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&amp;forum=' . $postsObject[$post]->getVar('forum_id');
+            	$tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
+            	$tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
+            	$tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
+            	$notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
+            	$notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
+            	$notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
+            	$tags['POST_CONTENT'] = $postsObject[$post]->getVar('post_text');
+            	$tags['POST_NAME']    = $postsObject[$post]->getVar('subject');
+            	$notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
+            	$notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_fullpost', $tags);
+        	}
+        	break;
+    	case 'delete':
+        	$post_id = array_values($post_id);
+        	rsort($post_id);
+        	$topics = [];
+        	$forums = [];
+        	foreach ($post_id as $post) {
+            	$postObject = $postHandler->get($post);
+            	if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
+                	continue;
+            	}
+            	$topics[$postObject->getVar('topic_id')] = 1;
+            	$forums[$postObject->getVar('forum_id')] = 1;
+            	$postHandler->delete($postObject, true);
+            	unset($postObject);
+        	}
+        	foreach (array_keys($topics) as $topic) {
+            	$topicHandler->synchronization($topic);
+        	}
+        	foreach (array_keys($forums) as $forum) {
+            	$forumHandler->synchronization($forum);
+        	}
+        	break;
+    	case 'split':
+        	/** @var Newbb\Post $postObject */
+        	$postObject = $postHandler->get($post_id);
+        	if (0 === count($post_id) || $postObject->isTopic()) {
+            	break;
+        	}
+        	$topic_id = $postObject->getVar('topic_id');
+
+        	$newtopic = $topicHandler->create();
+        	$newtopic->setVar('topic_title', $postObject->getVar('subject'), true);
+        	$newtopic->setVar('topic_poster', $postObject->getVar('uid'), true);
+        	$newtopic->setVar('forum_id', $postObject->getVar('forum_id'), true);
+        	$newtopic->setVar('topic_time', $postObject->getVar('post_time'), true);
+        	$newtopic->setVar('poster_name', $postObject->getVar('poster_name'), true);
+        	$newtopic->setVar('approved', 1, true);
+        	$topicHandler->insert($newtopic, true);
+        	$new_topic_id = $newtopic->getVar('topic_id');
+
+        	$pid = $postObject->getVar('pid');
+
+        	$postObject->setVar('topic_id', $new_topic_id, true);
+        	$postObject->setVar('pid', 0, true);
+        	$postHandler->insert($postObject);
+
+        	/* split a single post */
+        	if (1 === $mode) {
+            	$criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+            	$criteria->add(new \Criteria('pid', $post_id));
+            	$postHandler->updateAll('pid', $pid, $criteria, true);
+        	/* split a post and its children posts */
+        	} elseif (2 === $mode) {
+            	require_once $GLOBALS['xoops']->path('class/xoopstree.php');
+            	$mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
+            	$posts  = $mytree->getAllChildId($post_id);
+            	if (count($posts) > 0) {
+                	$criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
+                	$postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
+            	}
+            	/* split a post and all posts coming after */
+        	} elseif (3 === $mode) {
+            	$criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+            	$criteria->add(new \Criteria('post_id', $post_id, '>'));
+            	$postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
+
+            	unset($criteria);
+            	$criteria = new \CriteriaCompo(new \Criteria('topic_id', $new_topic_id));
+            	$criteria->add(new \Criteria('post_id', $post_id, '>'));
+            	$postHandler->identifierName = 'pid';
+            	$posts                       = $postHandler->getList($criteria);
+
+            	unset($criteria);
+            	$post_update = [];
+            	foreach ($posts as $postid => $pid) {
+                	//                if (!in_array($pid, array_keys($posts))) {
+                	if (!array_key_exists($pid, $posts)) {
+                    	$post_update[] = $pid;
+                	}
+                	if (!array_key_exists($pid, $posts)) {
+                    	$post_update2[] = $pid;
+                	}
+            	}
+            	if (count($post_update)) {
+                	$criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
+                	$postHandler->updateAll('pid', $post_id, $criteria, true);
+            	}
+        	}
+
+        	$forum_id = $postObject->getVar('forum_id');
+        	$topicHandler->synchronization($topic_id);
+        	$topicHandler->synchronization($new_topic_id);
+        	$sql    = sprintf('UPDATE "%s" SET forum_topics = forum_topics+1 WHERE forum_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_forums'), $forum_id);
+        	$result = $GLOBALS['xoopsDB']->queryF($sql);
+
+        	break;
 }
 if (!empty($topic_id)) {
     redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $topic_id = Request::getInt('topic_id', 0, 'POST');
 $post_id  = Request::getArray('post_id', Request::getArray('post_id', [], 'POST'), 'GET');
@@ -42,7 +42,7 @@ 
 $isAdmin = newbbIsAdmin($forumObject);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 switch ($op) {
@@ -74,7 +74,7 @@ 
         sort($post_id);
         $topics      = [];
         $forums      = [];
-        $criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
+        $criteria    = new \Criteria('post_id', '('.implode(',', $post_id).')', 'IN');
         $postsObject = $postHandler->getObjects($criteria, true);
         foreach ($post_id as $post) {
             /** @var Newbb\Post $postObject */
@@ -97,23 +97,23 @@ 
             break;
         }
 
-        $criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
+        $criteria_topic = new \Criteria('topic_id', '('.implode(',', array_keys($topics)).')', 'IN');
         $topic_list     = $topicHandler->getList($criteria_topic, true);
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forum_list     = $forumHandler->getList($criteria_forum);
 
-        require_once __DIR__ . '/include/notification.inc.php';
+        require_once __DIR__.'/include/notification.inc.php';
         /** @var \XoopsNotificationHandler $notificationHandler */
         $notificationHandler = xoops_getHandler('notification');
         foreach ($post_id as $post) {
             $tags = [];
             /** @var Newbb\Post[] $postsObject [$post] */
             $tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&forum=' . $postsObject[$post]->getVar('forum_id');
+            $tags['THREAD_URL']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$postsObject[$post]->getVar('topic_id').'&forum='.$postsObject[$post]->getVar('forum_id');
             $tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
-            $tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
+            $tags['FORUM_URL']   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?forum='.$postsObject[$post]->getVar('forum_id');
+            $tags['POST_URL']    = $tags['THREAD_URL'].'#forumpost'.$post;
             $notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
@@ -180,7 +180,7 @@ 
             $mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
             $posts  = $mytree->getAllChildId($post_id);
             if (count($posts) > 0) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
+                $criteria = new \Criteria('post_id', '('.implode(',', $posts).')', 'IN');
                 $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
             }
             /* split a post and all posts coming after */
@@ -207,7 +207,7 @@ 
                 }
             }
             if (count($post_update)) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
+                $criteria = new \Criteria('post_id', '('.implode(',', $post_update).')', 'IN');
                 $postHandler->updateAll('pid', $post_id, $criteria, true);
             }
         }
@@ -221,12 +221,12 @@ 
         break;
 }
 if (!empty($topic_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
 } elseif (!empty($forum_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

search.php

Indentation +184 added lines, -184 removed lines

@@ -40,7 +40,7 @@ 
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (1 !== $xoopsConfigSearch['enable_search']) {
-    redirect_header(XOOPS_URL . '/modules/newbb/index.php', 2, _MD_NEWBB_SEARCHDISABLED);
+	redirect_header(XOOPS_URL . '/modules/newbb/index.php', 2, _MD_NEWBB_SEARCHDISABLED);
 }
 
 $GLOBALS['xoopsConfig']['module_cache'][$xoopsModule->getVar('mid')] = 0;
@@ -75,195 +75,195 @@ 
 $search_username = trim($uname);
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init(0);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init(0);
 }
 
 $xoopsTpl->assign('forumindex', sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)));
 //$xoopsTpl->assign("img_folder", newbbDisplayImage($forumImage['topic']));
 
 if (!empty($uname) || Request::getString('submit', '') || !empty($term)) {
-    // irmtfan filter positive numbers
-    $selectlength = !empty($selectlength) ? abs($selectlength) : 200;
-    // irmtfan add select parameters for next search
-    $next_search['selectlength'] = $selectlength;
+	// irmtfan filter positive numbers
+	$selectlength = !empty($selectlength) ? abs($selectlength) : 200;
+	// irmtfan add select parameters for next search
+	$next_search['selectlength'] = $selectlength;
 
-    $start = Request::getInt('start', 0);
-    $forum = Request::getInt('forum', null);
-    if (empty($forum) || 'all' === $forum || (is_array($forum) && in_array('all', $forum, true))) {
-        $forum = [];
-    } elseif (!is_array($forum)) {
-        $forum = array_map('intval', explode('|', $forum));
-    }
-    $next_search['forum'] = implode('|', $forum);
-    // START irmtfan topic search
-    $topic                = Request::getString('topic', null);
-    $next_search['topic'] = $topic;
-    // END irmtfan topic search
-    // START irmtfan add show search
-    $show_search                = Request::getString('show_search', 'post_text');
-    $next_search['show_search'] = $show_search;
-    // START irmtfan add show search
+	$start = Request::getInt('start', 0);
+	$forum = Request::getInt('forum', null);
+	if (empty($forum) || 'all' === $forum || (is_array($forum) && in_array('all', $forum, true))) {
+		$forum = [];
+	} elseif (!is_array($forum)) {
+		$forum = array_map('intval', explode('|', $forum));
+	}
+	$next_search['forum'] = implode('|', $forum);
+	// START irmtfan topic search
+	$topic                = Request::getString('topic', null);
+	$next_search['topic'] = $topic;
+	// END irmtfan topic search
+	// START irmtfan add show search
+	$show_search                = Request::getString('show_search', 'post_text');
+	$next_search['show_search'] = $show_search;
+	// START irmtfan add show search
 
-    $addterms             = Request::getString('andor', 'AND');
-    $next_search['andor'] = $addterms;
-    $andor                = strtoupper($addterms);
-    if (!in_array($addterms, ['OR', 'AND'], true)) {
-        $andor = 'AND';
-    }
+	$addterms             = Request::getString('andor', 'AND');
+	$next_search['andor'] = $addterms;
+	$andor                = strtoupper($addterms);
+	if (!in_array($addterms, ['OR', 'AND'], true)) {
+		$andor = 'AND';
+	}
 
-    $uname_required       = false;
-    $next_search['uname'] = $search_username;
-    if (!empty($search_username)) {
-        $uname_required  = true;
-        $search_username = $GLOBALS['xoopsDB']->escape($search_username);
-        if (!$result = $GLOBALS['xoopsDB']->query('SELECT uid FROM ' . $GLOBALS['xoopsDB']->prefix('users') . " WHERE uname LIKE '%$search_username%'")) {
-            redirect_header(XOOPS_URL . '/search.php', 1, _MD_NEWBB_ERROROCCURED);
-        }
-        $uid = [];
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-            $uid[] = $row['uid'];
-        }
-    } else {
-        $uid = 0;
-    }
+	$uname_required       = false;
+	$next_search['uname'] = $search_username;
+	if (!empty($search_username)) {
+		$uname_required  = true;
+		$search_username = $GLOBALS['xoopsDB']->escape($search_username);
+		if (!$result = $GLOBALS['xoopsDB']->query('SELECT uid FROM ' . $GLOBALS['xoopsDB']->prefix('users') . " WHERE uname LIKE '%$search_username%'")) {
+			redirect_header(XOOPS_URL . '/search.php', 1, _MD_NEWBB_ERROROCCURED);
+		}
+		$uid = [];
+		while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+			$uid[] = $row['uid'];
+		}
+	} else {
+		$uid = 0;
+	}
 
-    $next_search['term'] = htmlspecialchars($term, ENT_QUOTES);
-    $query               = trim($term);
+	$next_search['term'] = htmlspecialchars($term, ENT_QUOTES);
+	$query               = trim($term);
 
-    if ('EXACT' !== $andor) {
-        $ignored_queries = []; // holds keywords that are shorter than allowed minimum length
-        $temp_queries    = str_getcsv($query, ' ', '"');
-        foreach ($temp_queries as $q) {
-            $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
-                $queries[] = $q;
-            } else {
-                $ignored_queries[] = $q;
-            }
-        }
-        if (!$uname_required && 0 === count($queries)) {
-            redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-    } else {
-        //$query = trim($query);
-        if (!$uname_required && (strlen($query) < $xoopsConfigSearch['keyword_min'])) {
-            redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-        $queries = [$query];
-    }
+	if ('EXACT' !== $andor) {
+		$ignored_queries = []; // holds keywords that are shorter than allowed minimum length
+		$temp_queries    = str_getcsv($query, ' ', '"');
+		foreach ($temp_queries as $q) {
+			$q = trim($q);
+			if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
+				$queries[] = $q;
+			} else {
+				$ignored_queries[] = $q;
+			}
+		}
+		if (!$uname_required && 0 === count($queries)) {
+			redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+	} else {
+		//$query = trim($query);
+		if (!$uname_required && (strlen($query) < $xoopsConfigSearch['keyword_min'])) {
+			redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+		$queries = [$query];
+	}
 
-    // entries must be lowercase
-    $allowed = ['p.post_time', 'p.subject']; // irmtfan just post time and subject
+	// entries must be lowercase
+	$allowed = ['p.post_time', 'p.subject']; // irmtfan just post time and subject
 
-    $sortby                = Request::getString('sortby', 'p.post_time');
-    $next_search['sortby'] = $sortby;
-    //$sortby = (in_array(strtolower($sortby), $allowed)) ? $sortby :  't.topic_last_post_id';
-    $sortby                  = in_array(strtolower($sortby), $allowed) ? $sortby : 'p.post_time';
-    $searchin                = Request::getString('searchin', 'both');
-    $next_search['searchin'] = $searchin;
-    // START irmtfan use criteria - add since and topic search
-    if (!empty($since)) {
-        $criteriaExtra->add(new \Criteria('p.post_time', time() - newbbGetSinceTime($since), '>='), 'OR');
-    }
-    if (is_numeric($topic) && !empty($topic)) {
-        $criteriaExtra->add(new \Criteria('p.topic_id', $topic), 'OR');
-    }
-    // END irmtfan use criteria -  add since and topic search
+	$sortby                = Request::getString('sortby', 'p.post_time');
+	$next_search['sortby'] = $sortby;
+	//$sortby = (in_array(strtolower($sortby), $allowed)) ? $sortby :  't.topic_last_post_id';
+	$sortby                  = in_array(strtolower($sortby), $allowed) ? $sortby : 'p.post_time';
+	$searchin                = Request::getString('searchin', 'both');
+	$next_search['searchin'] = $searchin;
+	// START irmtfan use criteria - add since and topic search
+	if (!empty($since)) {
+		$criteriaExtra->add(new \Criteria('p.post_time', time() - newbbGetSinceTime($since), '>='), 'OR');
+	}
+	if (is_numeric($topic) && !empty($topic)) {
+		$criteriaExtra->add(new \Criteria('p.topic_id', $topic), 'OR');
+	}
+	// END irmtfan use criteria -  add since and topic search
 
-    if ($uname_required && (!$uid || count($uid) < 1)) {
-        $results = [];
-    } // irmtfan bug fix array()
-    else {
-        $results = newbb_search($queries, $andor, $limit, $start, $uid, $forum, $sortby, $searchin, $criteriaExtra);
-    } // irmtfan $criteriaExtra
+	if ($uname_required && (!$uid || count($uid) < 1)) {
+		$results = [];
+	} // irmtfan bug fix array()
+	else {
+		$results = newbb_search($queries, $andor, $limit, $start, $uid, $forum, $sortby, $searchin, $criteriaExtra);
+	} // irmtfan $criteriaExtra
 
-    $search_info_keywords = Highlighter::apply($myts->htmlSpecialChars($term, ENT_QUOTES), implode(' ', $queries), '<mark>', '</mark>');
-    $num_results          = count($results);
-    if ($num_results < 1) {
-        $xoopsTpl->assign('lang_nomatch', _SR_NOMATCH);
-    } else {
-        $skipresults = 0;
-        foreach ($results as $row) {
-            $post_text_select    = '';
-            $post_subject_select = Highlighter::apply($queries, $row['title'], '<mark>', '</mark>');
-            if ('post_text' === $show_search) {
-                $post_text_select = Metagen::getSearchSummary($row['post_text'], $queries, $selectlength);
-                $post_text_select = Highlighter::apply($queries, $post_text_select, '<mark>', '</mark>');
-            }
-            // if no text remained after select text continue
-            if (empty($post_text_select) && empty($post_subject_select)) {
-                ++$skipresults;
-                continue;
-            }
-            $xoopsTpl->append('results', [
-                'forum_name' => $row['forum_name'],
-                'forum_link' => $row['forum_link'],
-                'link'       => $row['link'],
-                'title'      => $post_subject_select,
-                'poster'     => $row['poster'],
-                'post_time'  => formatTimestamp($row['time'], 'm'),
-                'post_text'  => $post_text_select
-            ]);
-        }
-        unset($results);
+	$search_info_keywords = Highlighter::apply($myts->htmlSpecialChars($term, ENT_QUOTES), implode(' ', $queries), '<mark>', '</mark>');
+	$num_results          = count($results);
+	if ($num_results < 1) {
+		$xoopsTpl->assign('lang_nomatch', _SR_NOMATCH);
+	} else {
+		$skipresults = 0;
+		foreach ($results as $row) {
+			$post_text_select    = '';
+			$post_subject_select = Highlighter::apply($queries, $row['title'], '<mark>', '</mark>');
+			if ('post_text' === $show_search) {
+				$post_text_select = Metagen::getSearchSummary($row['post_text'], $queries, $selectlength);
+				$post_text_select = Highlighter::apply($queries, $post_text_select, '<mark>', '</mark>');
+			}
+			// if no text remained after select text continue
+			if (empty($post_text_select) && empty($post_subject_select)) {
+				++$skipresults;
+				continue;
+			}
+			$xoopsTpl->append('results', [
+				'forum_name' => $row['forum_name'],
+				'forum_link' => $row['forum_link'],
+				'link'       => $row['link'],
+				'title'      => $post_subject_select,
+				'poster'     => $row['poster'],
+				'post_time'  => formatTimestamp($row['time'], 'm'),
+				'post_text'  => $post_text_select
+			]);
+		}
+		unset($results);
 
-        if (count($next_search) > 0) {
-            $items = [];
-            foreach ($next_search as $para => $val) {
-                $items[] = "{$para}=" . urlencode($val);
-            }
-            if (count($items) > 0) {
-                $paras = implode('&', $items);
-            }
-            unset($next_search, $items);
-        }
-        $search_url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/search.php?' . $paras;
-        // irmtfan remove to have just one query and appropriate next and prev links
-        //$next_results = newbb_search($queries, $andor, 1, $start + $limit, $uid, $forum, $sortby, $searchin, $subquery);
-        //$next_count = count($next_results);
-        //$has_next = false;
-        //if (is_array($next_results) && $next_count >0) {
-        //$has_next = true;
-        //}
-        // irmtfan if $results < $limit => it is impossible to have next
-        if ($num_results == $limit) {
-            $next            = $start + $limit;
-            $queries         = implode(',', $queries);
-            $search_url_next = htmlspecialchars($search_url . "&direction=next&start={$next}", ENT_QUOTES | ENT_HTML5);
-            $search_next     = '<a href="' . $search_url_next . '">' . _SR_NEXT . '</a>';
-            $xoopsTpl->assign('search_next', $search_next);
-            $xoopsTpl->assign('search_next_url', $search_url_next);
-        }
-        if ($start > 0) {
-            $prev            = $start - $limit;
-            $search_url_prev = htmlspecialchars($search_url . "&direction=previous&start={$prev}", ENT_QUOTES | ENT_HTML5);
-            $search_prev     = '<a href="' . $search_url_prev . '">' . _SR_PREVIOUS . '</a>';
-            $xoopsTpl->assign('search_prev', $search_prev);
-            $xoopsTpl->assign('search_prev_url', $search_url_prev);
-        }
-        // irmtfan if all results skipped then redirect to the next/previous page
-        if ($num_results == $skipresults) {
-            $direction           = Request::getString('direction', 'next');
-            $search_url_redirect = ('next' === strtolower($direction)) ? $search_url_next : $search_url_prev;
-            redirect_header($search_url_redirect, 1, constant(strtoupper("_SR_{$direction}")));
-        }
-    }
-    $search_info = _SR_KEYWORDS . ': ' . $search_info_keywords;
-    if ($uname_required) {
-        if ($search_info) {
-            $search_info .= '<br>';
-        }
-        $search_info .= _MD_NEWBB_USERNAME . ': ' . $myts->htmlSpecialChars($search_username);
-    }
-    // add num_results
-    $search_info .= '<br>' . sprintf(_SR_SHOWING, $start + 1, $start + $num_results);
-    // if any result skip show the counter
-    if (!empty($skipresults)) {
-        $search_info .= ' - ' . sprintf(_SR_FOUND, $num_results - $skipresults);
-    }
-    $xoopsTpl->assign('search_info', $search_info);
+		if (count($next_search) > 0) {
+			$items = [];
+			foreach ($next_search as $para => $val) {
+				$items[] = "{$para}=" . urlencode($val);
+			}
+			if (count($items) > 0) {
+				$paras = implode('&', $items);
+			}
+			unset($next_search, $items);
+		}
+		$search_url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/search.php?' . $paras;
+		// irmtfan remove to have just one query and appropriate next and prev links
+		//$next_results = newbb_search($queries, $andor, 1, $start + $limit, $uid, $forum, $sortby, $searchin, $subquery);
+		//$next_count = count($next_results);
+		//$has_next = false;
+		//if (is_array($next_results) && $next_count >0) {
+		//$has_next = true;
+		//}
+		// irmtfan if $results < $limit => it is impossible to have next
+		if ($num_results == $limit) {
+			$next            = $start + $limit;
+			$queries         = implode(',', $queries);
+			$search_url_next = htmlspecialchars($search_url . "&direction=next&start={$next}", ENT_QUOTES | ENT_HTML5);
+			$search_next     = '<a href="' . $search_url_next . '">' . _SR_NEXT . '</a>';
+			$xoopsTpl->assign('search_next', $search_next);
+			$xoopsTpl->assign('search_next_url', $search_url_next);
+		}
+		if ($start > 0) {
+			$prev            = $start - $limit;
+			$search_url_prev = htmlspecialchars($search_url . "&direction=previous&start={$prev}", ENT_QUOTES | ENT_HTML5);
+			$search_prev     = '<a href="' . $search_url_prev . '">' . _SR_PREVIOUS . '</a>';
+			$xoopsTpl->assign('search_prev', $search_prev);
+			$xoopsTpl->assign('search_prev_url', $search_url_prev);
+		}
+		// irmtfan if all results skipped then redirect to the next/previous page
+		if ($num_results == $skipresults) {
+			$direction           = Request::getString('direction', 'next');
+			$search_url_redirect = ('next' === strtolower($direction)) ? $search_url_next : $search_url_prev;
+			redirect_header($search_url_redirect, 1, constant(strtoupper("_SR_{$direction}")));
+		}
+	}
+	$search_info = _SR_KEYWORDS . ': ' . $search_info_keywords;
+	if ($uname_required) {
+		if ($search_info) {
+			$search_info .= '<br>';
+		}
+		$search_info .= _MD_NEWBB_USERNAME . ': ' . $myts->htmlSpecialChars($search_username);
+	}
+	// add num_results
+	$search_info .= '<br>' . sprintf(_SR_SHOWING, $start + 1, $start + $num_results);
+	// if any result skip show the counter
+	if (!empty($skipresults)) {
+		$search_info .= ' - ' . sprintf(_SR_FOUND, $num_results - $skipresults);
+	}
+	$xoopsTpl->assign('search_info', $search_info);
 }
 // assign template vars for search
 /* term */
@@ -273,12 +273,12 @@ 
 $andor_select = '<select name="andor" id="andor" class="form-control">';
 $andor_select .= '<option value="OR"';
 if ('OR' === $andor) {
-    $andor_select .= ' selected="selected"';
+	$andor_select .= ' selected="selected"';
 }
 $andor_select .= '>' . _SR_ANY . '</option>';
 $andor_select .= '<option value="AND"';
 if ('AND' === $andor || empty($andor)) {
-    $andor_select .= ' selected="selected"';
+	$andor_select .= ' selected="selected"';
 }
 $andor_select .= '>' . _SR_ALL . '</option>';
 $andor_select .= '</select>';
@@ -295,17 +295,17 @@ 
 $searchin_select = '';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="title"';
 if ('title' === $searchin) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . _MD_NEWBB_SUBJECT . ' </label>';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="text"';
 if ('text' === $searchin) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . _MD_NEWBB_BODY . ' </label>';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="both"';
 if ('both' === $searchin || empty($searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . _MD_NEWBB_SUBJECT . ' & ' . _MD_NEWBB_BODY . ' </label>';
 $xoopsTpl->assign('searchin_radio', $searchin_select);
@@ -314,12 +314,12 @@ 
 $show_search_select = '';
 $show_search_select .= '<label class="radio-inline"><input type="radio" name="show_search" value="post"';
 if ('post' === $show_search) {
-    $show_search_select .= ' checked';
+	$show_search_select .= ' checked';
 }
 $show_search_select .= ' />' . _MD_NEWBB_POSTS . ' </label>';
 $show_search_select .= '<label class="radio-inline"><input type="radio" name="show_search" value="post_text"';
 if ('post_text' === $show_search || empty($show_search)) {
-    $show_search_select .= ' checked';
+	$show_search_select .= ' checked';
 }
 $show_search_select .= ' />' . _MD_NEWBB_SEARCHPOSTTEXT . ' </label>';
 $xoopsTpl->assign('show_search_radio', $show_search_select);
@@ -331,12 +331,12 @@ 
 $sortby_select = '<select name="sortby" id="sortby" class="form-control">';
 $sortby_select .= '<option value=\'p.post_time\'';
 if ('p.post_time' === $sortby || empty($sortby)) {
-    $sortby_select .= ' selected=\'selected\'';
+	$sortby_select .= ' selected=\'selected\'';
 }
 $sortby_select .= '>' . _MD_NEWBB_DATE . '</option>';
 $sortby_select .= '<option value=\'p.subject\'';
 if ('p.subject' === $sortby) {
-    $sortby_select .= ' selected="selected"';
+	$sortby_select .= ' selected="selected"';
 }
 $sortby_select .= '>' . _MD_NEWBB_TOPIC . '</option>';
 $sortby_select .= '</select>';
@@ -351,7 +351,7 @@ 
 $xoopsTpl->assign_by_ref('since_selection_box', $select_since);
 
 if ($xoopsConfigSearch['keyword_min'] > 0) {
-    $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
+	$xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

Spacing +30 added lines, -30 removed lines

@@ -34,22 +34,22 @@ 
 //  Project: Article Project                                                 //
 //  ------------------------------------------------------------------------ //
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 xoops_loadLanguage('search');
 /** @var \XoopsConfigHandler $configHandler */
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (1 !== $xoopsConfigSearch['enable_search']) {
-    redirect_header(XOOPS_URL . '/modules/newbb/index.php', 2, _MD_NEWBB_SEARCHDISABLED);
+    redirect_header(XOOPS_URL.'/modules/newbb/index.php', 2, _MD_NEWBB_SEARCHDISABLED);
 }
 
 $GLOBALS['xoopsConfig']['module_cache'][$xoopsModule->getVar('mid')] = 0;
 $xoopsOption['template_main']                                        = 'newbb_search.tpl';
 require_once $GLOBALS['xoops']->path('header.php');
 
-require_once __DIR__ . '/include/functions.render.php';
-require_once __DIR__ . '/include/functions.forum.php';
-require_once __DIR__ . '/include/functions.time.php';
+require_once __DIR__.'/include/functions.render.php';
+require_once __DIR__.'/include/functions.forum.php';
+require_once __DIR__.'/include/functions.time.php';
 
 require_once $GLOBALS['xoops']->path('modules/newbb/include/search.inc.php');
 $limit = $GLOBALS['xoopsModuleConfig']['topics_per_page'];
@@ -118,8 +118,8 @@ 
     if (!empty($search_username)) {
         $uname_required  = true;
         $search_username = $GLOBALS['xoopsDB']->escape($search_username);
-        if (!$result = $GLOBALS['xoopsDB']->query('SELECT uid FROM ' . $GLOBALS['xoopsDB']->prefix('users') . " WHERE uname LIKE '%$search_username%'")) {
-            redirect_header(XOOPS_URL . '/search.php', 1, _MD_NEWBB_ERROROCCURED);
+        if (!$result = $GLOBALS['xoopsDB']->query('SELECT uid FROM '.$GLOBALS['xoopsDB']->prefix('users')." WHERE uname LIKE '%$search_username%'")) {
+            redirect_header(XOOPS_URL.'/search.php', 1, _MD_NEWBB_ERROROCCURED);
         }
         $uid = [];
         while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -144,12 +144,12 @@ 
             }
         }
         if (!$uname_required && 0 === count($queries)) {
-            redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+            redirect_header(XOOPS_URL.'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
     } else {
         //$query = trim($query);
         if (!$uname_required && (strlen($query) < $xoopsConfigSearch['keyword_min'])) {
-            redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+            redirect_header(XOOPS_URL.'/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
         }
         $queries = [$query];
     }
@@ -212,14 +212,14 @@ 
         if (count($next_search) > 0) {
             $items = [];
             foreach ($next_search as $para => $val) {
-                $items[] = "{$para}=" . urlencode($val);
+                $items[] = "{$para}=".urlencode($val);
             }
             if (count($items) > 0) {
                 $paras = implode('&', $items);
             }
             unset($next_search, $items);
         }
-        $search_url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/search.php?' . $paras;
+        $search_url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/search.php?'.$paras;
         // irmtfan remove to have just one query and appropriate next and prev links
         //$next_results = newbb_search($queries, $andor, 1, $start + $limit, $uid, $forum, $sortby, $searchin, $subquery);
         //$next_count = count($next_results);
@@ -231,15 +231,15 @@ 
         if ($num_results == $limit) {
             $next            = $start + $limit;
             $queries         = implode(',', $queries);
-            $search_url_next = htmlspecialchars($search_url . "&direction=next&start={$next}", ENT_QUOTES | ENT_HTML5);
-            $search_next     = '<a href="' . $search_url_next . '">' . _SR_NEXT . '</a>';
+            $search_url_next = htmlspecialchars($search_url."&direction=next&start={$next}", ENT_QUOTES | ENT_HTML5);
+            $search_next     = '<a href="'.$search_url_next.'">'._SR_NEXT.'</a>';
             $xoopsTpl->assign('search_next', $search_next);
             $xoopsTpl->assign('search_next_url', $search_url_next);
         }
         if ($start > 0) {
             $prev            = $start - $limit;
-            $search_url_prev = htmlspecialchars($search_url . "&direction=previous&start={$prev}", ENT_QUOTES | ENT_HTML5);
-            $search_prev     = '<a href="' . $search_url_prev . '">' . _SR_PREVIOUS . '</a>';
+            $search_url_prev = htmlspecialchars($search_url."&direction=previous&start={$prev}", ENT_QUOTES | ENT_HTML5);
+            $search_prev     = '<a href="'.$search_url_prev.'">'._SR_PREVIOUS.'</a>';
             $xoopsTpl->assign('search_prev', $search_prev);
             $xoopsTpl->assign('search_prev_url', $search_url_prev);
         }
@@ -250,18 +250,18 @@ 
             redirect_header($search_url_redirect, 1, constant(strtoupper("_SR_{$direction}")));
         }
     }
-    $search_info = _SR_KEYWORDS . ': ' . $search_info_keywords;
+    $search_info = _SR_KEYWORDS.': '.$search_info_keywords;
     if ($uname_required) {
         if ($search_info) {
             $search_info .= '<br>';
         }
-        $search_info .= _MD_NEWBB_USERNAME . ': ' . $myts->htmlSpecialChars($search_username);
+        $search_info .= _MD_NEWBB_USERNAME.': '.$myts->htmlSpecialChars($search_username);
     }
     // add num_results
-    $search_info .= '<br>' . sprintf(_SR_SHOWING, $start + 1, $start + $num_results);
+    $search_info .= '<br>'.sprintf(_SR_SHOWING, $start + 1, $start + $num_results);
     // if any result skip show the counter
     if (!empty($skipresults)) {
-        $search_info .= ' - ' . sprintf(_SR_FOUND, $num_results - $skipresults);
+        $search_info .= ' - '.sprintf(_SR_FOUND, $num_results - $skipresults);
     }
     $xoopsTpl->assign('search_info', $search_info);
 }
@@ -275,18 +275,18 @@ 
 if ('OR' === $andor) {
     $andor_select .= ' selected="selected"';
 }
-$andor_select .= '>' . _SR_ANY . '</option>';
+$andor_select .= '>'._SR_ANY.'</option>';
 $andor_select .= '<option value="AND"';
 if ('AND' === $andor || empty($andor)) {
     $andor_select .= ' selected="selected"';
 }
-$andor_select .= '>' . _SR_ALL . '</option>';
+$andor_select .= '>'._SR_ALL.'</option>';
 $andor_select .= '</select>';
 $xoopsTpl->assign('andor_selection_box', $andor_select);
 
 /* forum */
 $select_forum = '<select class="form-control" name="forum[]" id="forum" size="5" multiple="multiple">';
-$select_forum .= '<option value="all">' . _MD_NEWBB_SEARCHALLFORUMS . '</option>';
+$select_forum .= '<option value="all">'._MD_NEWBB_SEARCHALLFORUMS.'</option>';
 $select_forum .= newbbForumSelectBox($forum);
 $select_forum .= '</select>';
 $xoopsTpl->assign_by_ref('forum_selection_box', $select_forum);
@@ -297,17 +297,17 @@ 
 if ('title' === $searchin) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= ' />' . _MD_NEWBB_SUBJECT . ' </label>';
+$searchin_select .= ' />'._MD_NEWBB_SUBJECT.' </label>';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="text"';
 if ('text' === $searchin) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= ' />' . _MD_NEWBB_BODY . ' </label>';
+$searchin_select .= ' />'._MD_NEWBB_BODY.' </label>';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="both"';
 if ('both' === $searchin || empty($searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= ' />' . _MD_NEWBB_SUBJECT . ' & ' . _MD_NEWBB_BODY . ' </label>';
+$searchin_select .= ' />'._MD_NEWBB_SUBJECT.' & '._MD_NEWBB_BODY.' </label>';
 $xoopsTpl->assign('searchin_radio', $searchin_select);
 
 /* show_search */
@@ -316,12 +316,12 @@ 
 if ('post' === $show_search) {
     $show_search_select .= ' checked';
 }
-$show_search_select .= ' />' . _MD_NEWBB_POSTS . ' </label>';
+$show_search_select .= ' />'._MD_NEWBB_POSTS.' </label>';
 $show_search_select .= '<label class="radio-inline"><input type="radio" name="show_search" value="post_text"';
 if ('post_text' === $show_search || empty($show_search)) {
     $show_search_select .= ' checked';
 }
-$show_search_select .= ' />' . _MD_NEWBB_SEARCHPOSTTEXT . ' </label>';
+$show_search_select .= ' />'._MD_NEWBB_SEARCHPOSTTEXT.' </label>';
 $xoopsTpl->assign('show_search_radio', $show_search_select);
 
 /* author */
@@ -333,12 +333,12 @@ 
 if ('p.post_time' === $sortby || empty($sortby)) {
     $sortby_select .= ' selected=\'selected\'';
 }
-$sortby_select .= '>' . _MD_NEWBB_DATE . '</option>';
+$sortby_select .= '>'._MD_NEWBB_DATE.'</option>';
 $sortby_select .= '<option value=\'p.subject\'';
 if ('p.subject' === $sortby) {
     $sortby_select .= ' selected="selected"';
 }
-$sortby_select .= '>' . _MD_NEWBB_TOPIC . '</option>';
+$sortby_select .= '>'._MD_NEWBB_TOPIC.'</option>';
 $sortby_select .= '</select>';
 $xoopsTpl->assign('sortby_selection_box', $sortby_select);
 
@@ -354,5 +354,5 @@ 
     $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

reply.php

Indentation +64 added lines, -64 removed lines

@@ -41,8 +41,8 @@ 
 $start    = Request::getInt('start', 0, 'GET');
 
 if (!$topic_id && !$post_id) {
-    $redirect = empty($forum) ? 'index.php' : "viewforum.php?forum={$forum}";
-    redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+	$redirect = empty($forum) ? 'index.php' : "viewforum.php?forum={$forum}";
+	redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 ///** @var NewbbForumHandler $forumHandler */
@@ -53,7 +53,7 @@ 
 //$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
 
 if (!$pid = $post_id) {
-    $pid = $topicHandler->getTopPostId($topic_id);
+	$pid = $topicHandler->getTopPostId($topic_id);
 }
 $postParentObject = $postHandler->get($pid);
 $topic_id         = $postParentObject->getVar('topic_id');
@@ -65,32 +65,32 @@ 
 
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $topicObject  = $topicHandler->get($topic_id);
 $topic_status = $topicObject->getVar('topic_status');
 if (!$topicHandler->getPermission($forumObject, $topic_status, 'reply')) {
-    /*
+	/*
      * Build the page query
      */
-    $query_vars  = ['topic_id', 'post_id', 'status', 'order', 'mode', 'viewmode'];
-    $query_array = [];
-    foreach ($query_vars as $var) {
-        if (Request::getString($var, '', 'GET')) {
-            $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
-        }
-    }
-    $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
-    unset($query_array);
-
-    redirect_header("viewtopic.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOREPLY);
+	$query_vars  = ['topic_id', 'post_id', 'status', 'order', 'mode', 'viewmode'];
+	$query_array = [];
+	foreach ($query_vars as $var) {
+		if (Request::getString($var, '', 'GET')) {
+			$query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+		}
+	}
+	$page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
+	unset($query_array);
+
+	redirect_header("viewtopic.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOREPLY);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject);
+	//    /** @var OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject);
 }
 
 $xoopsOption['template_main']                                        = 'newbb_edit_post.tpl';
@@ -113,47 +113,47 @@ 
 */
 
 if ((2 == $GLOBALS['xoopsModuleConfig']['disc_show']) || (3 == $GLOBALS['xoopsModuleConfig']['disc_show'])) {
-    $xoopsTpl->assign('disclaimer', $GLOBALS['xoopsModuleConfig']['disclaimer']);
+	$xoopsTpl->assign('disclaimer', $GLOBALS['xoopsModuleConfig']['disclaimer']);
 }
 
 $xoopsTpl->assign('parentforum', $forumHandler->getParents($forumObject));
 
 $xoopsTpl->assign([
-                      'forum_id'   => $forumObject->getVar('forum_id'),
-                      'forum_name' => $forumObject->getVar('forum_name')
-                  ]);
+					  'forum_id'   => $forumObject->getVar('forum_id'),
+					  'forum_name' => $forumObject->getVar('forum_name')
+				  ]);
 
 if ($postParentObject->getVar('uid')) {
-    $r_name = newbbGetUnameFromId($postParentObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
+	$r_name = newbbGetUnameFromId($postParentObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
 } else {
-    $poster_name = $postParentObject->getVar('poster_name');
-    $r_name      = empty($poster_name) ? $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']) : $poster_name;
+	$poster_name = $postParentObject->getVar('poster_name');
+	$r_name      = empty($poster_name) ? $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']) : $poster_name;
 }
 
 $r_subject = $postParentObject->getVar('subject', 'E');
 
 $subject = $r_subject;
 if (!preg_match('/^(Re|' . _MD_NEWBB_RE . '):/i', $r_subject)) {
-    $subject = _MD_NEWBB_RE . ': ' . $r_subject;
+	$subject = _MD_NEWBB_RE . ': ' . $r_subject;
 }
 
 $q_message = $postParentObject->getVar('post_text', 'e');
 if ((!$GLOBALS['xoopsModuleConfig']['enable_karma'] || !$postParentObject->getVar('post_karma'))
-    && (!$GLOBALS['xoopsModuleConfig']['allow_require_reply'] || !$postParentObject->getVar('require_reply'))) {
-    if (1 === Request::getInt('quotedac', 0, 'GET')) {
-        $message = "[quote]\n";
-        $message .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
-        $message .= "\n" . $q_message . '[/quote]';
-        $hidden  = '';
-    } else {
-        $hidden  = "[quote]\n";
-        $hidden  .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
-        $hidden  .= "\n" . $q_message . '[/quote]';
-        $message = '';
-    }
+	&& (!$GLOBALS['xoopsModuleConfig']['allow_require_reply'] || !$postParentObject->getVar('require_reply'))) {
+	if (1 === Request::getInt('quotedac', 0, 'GET')) {
+		$message = "[quote]\n";
+		$message .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
+		$message .= "\n" . $q_message . '[/quote]';
+		$hidden  = '';
+	} else {
+		$hidden  = "[quote]\n";
+		$hidden  .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
+		$hidden  .= "\n" . $q_message . '[/quote]';
+		$message = '';
+	}
 } else {
-    $hidden  = '';
-    $message = '';
+	$hidden  = '';
+	$message = '';
 }
 
 $isreply       = 1;
@@ -178,29 +178,29 @@ 
 $posts_contextObject = $postHandler->getByLimit(5, 0, null, null, true, $topic_id, 1);
 /** @var Newbb\Post $post_contextObject */
 foreach ($posts_contextObject as $post_contextObject) {
-    // Sorry, in order to save queries, we have to hide the non-open post_text even if you have replied or have adequate karma, even an admin.
-    if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
-        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')) . '</div>';
-    } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post_contextObject->getVar('require_reply')) {
-        $p_message = _MD_NEWBB_REPLY_REQUIREMENT;
-    } else {
-        $p_message = $post_contextObject->getVar('post_text');
-    }
-
-    if ($post_contextObject->getVar('uid')) {
-        $p_name = newbbGetUnameFromId($post_contextObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
-    } else {
-        $poster_name = $post_contextObject->getVar('poster_name');
-        $p_name      = empty($poster_name) ? htmlspecialchars($GLOBALS['xoopsConfig']['anonymous'], ENT_QUOTES | ENT_HTML5) : $poster_name;
-    }
-    $p_date    = formatTimestamp($post_contextObject->getVar('post_time'));
-    $p_subject = $post_contextObject->getVar('subject');
-
-    $posts_context[] = [
-        'subject' => $p_subject,
-        'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
-        'content' => $p_message
-    ];
+	// Sorry, in order to save queries, we have to hide the non-open post_text even if you have replied or have adequate karma, even an admin.
+	if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
+		$p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')) . '</div>';
+	} elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post_contextObject->getVar('require_reply')) {
+		$p_message = _MD_NEWBB_REPLY_REQUIREMENT;
+	} else {
+		$p_message = $post_contextObject->getVar('post_text');
+	}
+
+	if ($post_contextObject->getVar('uid')) {
+		$p_name = newbbGetUnameFromId($post_contextObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
+	} else {
+		$poster_name = $post_contextObject->getVar('poster_name');
+		$p_name      = empty($poster_name) ? htmlspecialchars($GLOBALS['xoopsConfig']['anonymous'], ENT_QUOTES | ENT_HTML5) : $poster_name;
+	}
+	$p_date    = formatTimestamp($post_contextObject->getVar('post_time'));
+	$p_subject = $post_contextObject->getVar('subject');
+
+	$posts_context[] = [
+		'subject' => $p_subject,
+		'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
+		'content' => $p_message
+	];
 }
 $xoopsTpl->assign_by_ref('posts_context', $posts_context);
 // irmtfan move to footer.php

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $forum    = Request::getInt('forum', 0, 'GET');
 $topic_id = Request::getInt('topic_id', 0, 'GET');
@@ -65,7 +65,7 @@ 
 
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $topicObject  = $topicHandler->get($topic_id);
@@ -78,7 +78,7 @@ 
     $query_array = [];
     foreach ($query_vars as $var) {
         if (Request::getString($var, '', 'GET')) {
-            $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+            $query_array[$var] = "{$var}=".Request::getString($var, '', 'GET');
         }
     }
     $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
@@ -133,8 +133,8 @@ 
 $r_subject = $postParentObject->getVar('subject', 'E');
 
 $subject = $r_subject;
-if (!preg_match('/^(Re|' . _MD_NEWBB_RE . '):/i', $r_subject)) {
-    $subject = _MD_NEWBB_RE . ': ' . $r_subject;
+if (!preg_match('/^(Re|'._MD_NEWBB_RE.'):/i', $r_subject)) {
+    $subject = _MD_NEWBB_RE.': '.$r_subject;
 }
 
 $q_message = $postParentObject->getVar('post_text', 'e');
@@ -143,12 +143,12 @@ 
     if (1 === Request::getInt('quotedac', 0, 'GET')) {
         $message = "[quote]\n";
         $message .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
-        $message .= "\n" . $q_message . '[/quote]';
+        $message .= "\n".$q_message.'[/quote]';
         $hidden  = '';
     } else {
         $hidden  = "[quote]\n";
         $hidden  .= sprintf(_MD_NEWBB_USERWROTE, $r_name);
-        $hidden  .= "\n" . $q_message . '[/quote]';
+        $hidden  .= "\n".$q_message.'[/quote]';
         $message = '';
     }
 } else {
@@ -167,7 +167,7 @@ 
 $post_karma    = 0;
 $require_reply = 0;
 
-require_once __DIR__   . '/include/form.post.php';
+require_once __DIR__.'/include/form.post.php';
 
 ///** @var Newbb\KarmaHandler $karmaHandler */
 //$karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
@@ -180,7 +180,7 @@ 
 foreach ($posts_contextObject as $post_contextObject) {
     // Sorry, in order to save queries, we have to hide the non-open post_text even if you have replied or have adequate karma, even an admin.
     if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
-        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')) . '</div>';
+        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')).'</div>';
     } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post_contextObject->getVar('require_reply')) {
         $p_message = _MD_NEWBB_REPLY_REQUIREMENT;
     } else {
@@ -198,11 +198,11 @@ 
 
     $posts_context[] = [
         'subject' => $p_subject,
-        'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
+        'meta'    => _MD_NEWBB_BY.' '.$p_name.' '._MD_NEWBB_ON.' '.$p_date,
         'content' => $p_message
     ];
 }
 $xoopsTpl->assign_by_ref('posts_context', $posts_context);
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

viewtopic.php

Indentation +515 added lines, -515 removed lines

@@ -44,54 +44,54 @@ 
 $query_vars  = ['post_id', 'topic_id', 'status', 'order', 'start', 'move', 'mode'];
 $query_array = [];
 foreach ($query_vars as $var) {
-    if (Request::getString($var, '', 'GET')) {
-        $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
-    }
+	if (Request::getString($var, '', 'GET')) {
+		$query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+	}
 }
 $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
 unset($query_array);
 
 $forum_id = Request::getInt('forum', 0, 'GET');
 $read     = (Request::getString('read', '', 'GET')
-             && 'new' === Request::getString('read', '', 'GET')) ? Request::getString('read', '', 'GET') : '';
+			 && 'new' === Request::getString('read', '', 'GET')) ? Request::getString('read', '', 'GET') : '';
 $topic_id = Request::getInt('topic_id', 0, 'GET'); // isset($_GET['topic_id']) ? (int)($_GET['topic_id']) : 0;
 $post_id  = Request::getInt('post_id', 0, 'GET'); // !empty($_GET['post_id']) ? (int)($_GET['post_id']) : 0;
 $move     = strtolower(Request::getString('move', '', 'GET')); // isset($_GET['move']) ? strtolower($_GET['move']) : '';
 $start    = Request::getInt('start', 0, 'GET'); // !empty($_GET['start']) ? (int)($_GET['start']) : 0;
 $status   = (Request::getString('status', '', 'GET')
-             && in_array(Request::getString('status', '', 'GET'), ['active', 'pending', 'deleted'], true)) ? Request::getString('status', '', 'GET') : '';
+			 && in_array(Request::getString('status', '', 'GET'), ['active', 'pending', 'deleted'], true)) ? Request::getString('status', '', 'GET') : '';
 $mode     = Request::getInt('mode', (!empty($status) ? 2 : 0), 'GET'); // !empty($_GET['mode']) ? (int)($_GET['mode']) : (!empty($status) ? 2 : 0);
 $order    = (Request::getString('order', '', 'GET')
-             && in_array(Request::getString('order', '', 'GET'), ['ASC', 'DESC'], true)) ? Request::getString('order', '', 'GET') : '';
+			 && in_array(Request::getString('order', '', 'GET'), ['ASC', 'DESC'], true)) ? Request::getString('order', '', 'GET') : '';
 
 if ('' === $order) {
-    if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isActive()) {
-        $order = (1 == $GLOBALS['xoopsUser']->getVar('uorder')) ? 'DESC' : 'ASC';
-    } else {
-        $order = (1 == $GLOBALS['xoopsConfig']['com_order']) ? 'DESC' : 'ASC';
-    }
+	if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isActive()) {
+		$order = (1 == $GLOBALS['xoopsUser']->getVar('uorder')) ? 'DESC' : 'ASC';
+	} else {
+		$order = (1 == $GLOBALS['xoopsConfig']['com_order']) ? 'DESC' : 'ASC';
+	}
 }
 
 if (!$topic_id && !$post_id) {
-    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
-    redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+	$redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
+	redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 ///** @var Newbb\TopicHandler $topicHandler */
 //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
 if (!empty($post_id)) {
-    $topicObject = $topicHandler->getByPost($post_id);
-    $topic_id    = $topicObject->getVar('topic_id');
+	$topicObject = $topicHandler->getByPost($post_id);
+	$topic_id    = $topicObject->getVar('topic_id');
 } elseif (!empty($move)) {
-    $topicObject = $topicHandler->getByMove($topic_id, ('prev' === $move) ? -1 : 1, $forum_id);
-    $topic_id    = $topicObject->getVar('topic_id');
+	$topicObject = $topicHandler->getByMove($topic_id, ('prev' === $move) ? -1 : 1, $forum_id);
+	$topic_id    = $topicObject->getVar('topic_id');
 } else {
-    $topicObject = $topicHandler->get($topic_id);
+	$topicObject = $topicHandler->get($topic_id);
 }
 
 if (!is_object($topicObject) || !$topic_id = $topicObject->getVar('topic_id')) {
-    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
-    redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+	$redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
+	redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 $forum_id = $topicObject->getVar('forum_id');
 ///** @var Newbb\ForumHandler $forumHandler */
@@ -101,8 +101,8 @@ 
 $isAdmin = newbbIsAdmin($forumObject);
 
 if ((!$isAdmin && $topicObject->getVar('approved') < 0) || (!$forumHandler->getPermission($forumObject))
-    || (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view'))) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
+	|| (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view'))) {
+	redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
 }
 
 // START irmtfan - find if topic is read or unread - for all users (member and anon)
@@ -118,32 +118,32 @@ 
 */
 $topic_last_post_time_or_id_read = newbbGetRead('topic', $topic_id);
 if (!empty($topic_last_post_time_or_id_read)) {
-    if (1 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
-        //        $postHandler     = Newbb\Helper::getInstance()->getHandler('Post');
-        $postObject      = $postHandler->get($topicObject->getVar('topic_last_post_id'));
-        $topic_is_unread = ($topic_last_post_time_or_id_read < $postObject->getVar('post_time'));
-    }
-    if (2 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
-        $topic_is_unread = ($topic_last_post_time_or_id_read < $topicObject->getVar('topic_last_post_id'));
-        // hack jump to last post read if post_id is empty - is there any better way?
-        if (empty($post_id) && $topic_is_unread
-            && !empty($GLOBALS['xoopsModuleConfig']['jump_to_topic_last_post_read_enabled'])) {
-            header('Location: ' . Request::getString('REQUEST_URI', '', 'SERVER') . '&post_id=' . $topic_last_post_time_or_id_read);
-        }
-    }
+	if (1 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
+		//        $postHandler     = Newbb\Helper::getInstance()->getHandler('Post');
+		$postObject      = $postHandler->get($topicObject->getVar('topic_last_post_id'));
+		$topic_is_unread = ($topic_last_post_time_or_id_read < $postObject->getVar('post_time'));
+	}
+	if (2 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
+		$topic_is_unread = ($topic_last_post_time_or_id_read < $topicObject->getVar('topic_last_post_id'));
+		// hack jump to last post read if post_id is empty - is there any better way?
+		if (empty($post_id) && $topic_is_unread
+			&& !empty($GLOBALS['xoopsModuleConfig']['jump_to_topic_last_post_read_enabled'])) {
+			header('Location: ' . Request::getString('REQUEST_URI', '', 'SERVER') . '&post_id=' . $topic_last_post_time_or_id_read);
+		}
+	}
 }
 // END irmtfan - find if topic is read or unread - for all users (member and anon)
 
 /* Only admin has access to admin mode */
 if (!$isAdmin) {
-    $status = '';
-    $mode   = 0;
+	$status = '';
+	$mode   = 0;
 }
 
 if (!empty($GLOBALS['xoopsModuleConfig']['enable_karma'])) {
-    //    /** @var Newbb\KarmaHandler $karmaHandler */
-    //    $karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
-    $user_karma = $karmaHandler->getUserKarma();
+	//    /** @var Newbb\KarmaHandler $karmaHandler */
+	//    $karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
+	$user_karma = $karmaHandler->getUserKarma();
 }
 
 //$viewmode = "flat";
@@ -154,7 +154,7 @@ 
 
 //irmtfan - increment topic_views only if the topic is unread
 if ($topic_is_unread) {
-    $topicObject->incrementCounter();
+	$topicObject->incrementCounter();
 }
 newbbSetRead('topic', $topic_id, $topicObject->getVar('topic_last_post_id'));
 
@@ -166,16 +166,16 @@ 
 //$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 // irmtfan new method
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
-    $xoopsTpl->assign('xoops_module_header', '
+	$xoopsTpl->assign('xoops_module_header', '
     <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forumObject->getVar('forum_id') . '" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    /** @var Newbb\OnlineHandler $onlineHandler */
-    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject, $topicObject);
-    $xoopsTpl->assign('online', $onlineHandler->showOnline());
+	/** @var Newbb\OnlineHandler $onlineHandler */
+	$onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject, $topicObject);
+	$xoopsTpl->assign('online', $onlineHandler->showOnline());
 }
 $xoopsTpl->assign('parentforum', $forumHandler->getParents($forumObject));
 // irmtfan - remove icon_path and use newbbDisplayImage
@@ -189,32 +189,32 @@ 
 $iconHandler = newbbGetIconHandler(); // can be use in the follwing codes in this file
 
 if ($infobox['show'] > 0) {
-    // irmtfan - remove icon_path and use newbbDisplayImage
-    $infobox['icon'] = [
-        'expand'   => $iconHandler->getImageSource('less'),
-        'collapse' => $iconHandler->getImageSource('more')
-    ];
-    if (1 == $infobox['show']) {
-        $infobox['style'] = 'none';        //irmtfan move semicolon
-        $infobox['alt']   = _MD_NEWBB_SEEUSERDATA;
-        $infobox['src']   = 'more';
-    } else {
-        $infobox['style'] = 'block';        //irmtfan move semicolon
-        $infobox['alt']   = _MD_NEWBB_HIDEUSERDATA;
-        $infobox['src']   = 'less';
-    }
-    $infobox['displayImage'] = newbbDisplayImage($infobox['src'], $infobox['alt']);
+	// irmtfan - remove icon_path and use newbbDisplayImage
+	$infobox['icon'] = [
+		'expand'   => $iconHandler->getImageSource('less'),
+		'collapse' => $iconHandler->getImageSource('more')
+	];
+	if (1 == $infobox['show']) {
+		$infobox['style'] = 'none';        //irmtfan move semicolon
+		$infobox['alt']   = _MD_NEWBB_SEEUSERDATA;
+		$infobox['src']   = 'more';
+	} else {
+		$infobox['style'] = 'block';        //irmtfan move semicolon
+		$infobox['alt']   = _MD_NEWBB_HIDEUSERDATA;
+		$infobox['src']   = 'less';
+	}
+	$infobox['displayImage'] = newbbDisplayImage($infobox['src'], $infobox['alt']);
 }
 $xoopsTpl->assign('infobox', $infobox);
 // END irmtfan improve infobox
 
 $xoopsTpl->assign([
-                      'topic_title'    => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?topic_id=' . $topic_id . '">' . $topicObject->getFullTitle() . '</a>',
-                      'forum_name'     => $forumObject->getVar('forum_name'),
-                      'lang_nexttopic' => _MD_NEWBB_NEXTTOPIC,
-                      'lang_prevtopic' => _MD_NEWBB_PREVTOPIC,
-                      'topic_status'   => $topicObject->getVar('topic_status')
-                  ]);
+					  'topic_title'    => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?topic_id=' . $topic_id . '">' . $topicObject->getFullTitle() . '</a>',
+					  'forum_name'     => $forumObject->getVar('forum_name'),
+					  'lang_nexttopic' => _MD_NEWBB_NEXTTOPIC,
+					  'lang_prevtopic' => _MD_NEWBB_PREVTOPIC,
+					  'topic_status'   => $topicObject->getVar('topic_status')
+				  ]);
 
 //$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
 $categoryObject = $categoryHandler->get($forumObject->getVar('cat_id'), ['cat_title']);
@@ -231,149 +231,149 @@ 
 $t_reply = newbbDisplayImage('t_reply', _MD_NEWBB_REPLY);
 // irmtfan show topic status if show reg is 0 and revise forum_post_or_register
 if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'post')) {
-    $xoopsTpl->assign('forum_post', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/newtopic.php?forum=' . $forum_id . '"> ' . $t_new . '</a>');
+	$xoopsTpl->assign('forum_post', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/newtopic.php?forum=' . $forum_id . '"> ' . $t_new . '</a>');
 } else {
-    if ($topicObject->getVar('topic_status')) {
-        $xoopsTpl->assign('topic_lock', _MD_NEWBB_TOPICLOCKED);
-    }
-    if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
-        $xoopsTpl->assign('forum_register', '<a href="' . XOOPS_URL . '/user.php?xoops_redirect=' . htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5) . '">' . _MD_NEWBB_REGTOPOST . '</a>');
-    }
+	if ($topicObject->getVar('topic_status')) {
+		$xoopsTpl->assign('topic_lock', _MD_NEWBB_TOPICLOCKED);
+	}
+	if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
+		$xoopsTpl->assign('forum_register', '<a href="' . XOOPS_URL . '/user.php?xoops_redirect=' . htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5) . '">' . _MD_NEWBB_REGTOPOST . '</a>');
+	}
 }
 // irmtfan for backward compatibility assign forum_post_or_register smarty again.
 $xoopsTpl->assign('forum_post_or_register', @$xoopsTpl->get_template_vars('forum_post') . @$xoopsTpl->get_template_vars('forum_register') . @$xoopsTpl->get_template_vars('topic_lock'));
 
 if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'reply')) {
-    $xoopsTpl->assign('forum_reply', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/reply.php?topic_id=' . $topic_id . '"> ' . $t_reply . '</a>');
+	$xoopsTpl->assign('forum_reply', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/reply.php?topic_id=' . $topic_id . '"> ' . $t_reply . '</a>');
 }
 
 $poster_array  = [];
 $require_reply = false;
 /** @var Post $eachpost */
 foreach ($postsArray as $eachpost) {
-    if ($eachpost->getVar('uid') > 0) {
-        $poster_array[$eachpost->getVar('uid')] = 1;
-    }
-    if ($eachpost->getVar('require_reply') > 0) {
-        $require_reply = true;
-    }
+	if ($eachpost->getVar('uid') > 0) {
+		$poster_array[$eachpost->getVar('uid')] = 1;
+	}
+	if ($eachpost->getVar('require_reply') > 0) {
+		$require_reply = true;
+	}
 }
 
 $userid_array = [];
 $online       = [];
 if (is_array($poster_array) && count($poster_array) > 0) {
-    /** @var \XoopsMemberHandler $memberHandler */
-    $memberHandler = xoops_getHandler('member');
-    $userid_array  = array_keys($poster_array);
-    $user_criteria = '(' . implode(',', $userid_array) . ')';
-    $users         = $memberHandler->getUsers(new \Criteria('uid', $user_criteria, 'IN'), true);
+	/** @var \XoopsMemberHandler $memberHandler */
+	$memberHandler = xoops_getHandler('member');
+	$userid_array  = array_keys($poster_array);
+	$user_criteria = '(' . implode(',', $userid_array) . ')';
+	$users         = $memberHandler->getUsers(new \Criteria('uid', $user_criteria, 'IN'), true);
 } else {
-    $users = [];
+	$users = [];
 }
 
 $viewtopic_users = [];
 if (is_array($userid_array) && count($userid_array) > 0) {
 //    require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/user.php');
-    $userHandler         = new Newbb\UserHandler($GLOBALS['xoopsModuleConfig']['groupbar_enabled'], $GLOBALS['xoopsModuleConfig']['wol_enabled']);
-    $userHandler->users  = $users;
-    $userHandler->online = $online;
-    $viewtopic_users     = $userHandler->getUsers();
+	$userHandler         = new Newbb\UserHandler($GLOBALS['xoopsModuleConfig']['groupbar_enabled'], $GLOBALS['xoopsModuleConfig']['wol_enabled']);
+	$userHandler->users  = $users;
+	$userHandler->online = $online;
+	$viewtopic_users     = $userHandler->getUsers();
 }
 unset($users);
 
 if ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $require_reply) {
-    if (!empty($GLOBALS['xoopsModuleConfig']['cache_enabled'])) {
-        $viewtopic_posters = newbbGetSession('t' . $topic_id, true);
-        if (!is_array($viewtopic_posters) || 0 === count($viewtopic_posters)) {
-            $viewtopic_posters = $topicHandler->getAllPosters($topicObject);
-            newbbSetSession('t' . $topic_id, $viewtopic_posters);
-        }
-    } else {
-        $viewtopic_posters = $topicHandler->getAllPosters($topicObject);
-    }
+	if (!empty($GLOBALS['xoopsModuleConfig']['cache_enabled'])) {
+		$viewtopic_posters = newbbGetSession('t' . $topic_id, true);
+		if (!is_array($viewtopic_posters) || 0 === count($viewtopic_posters)) {
+			$viewtopic_posters = $topicHandler->getAllPosters($topicObject);
+			newbbSetSession('t' . $topic_id, $viewtopic_posters);
+		}
+	} else {
+		$viewtopic_posters = $topicHandler->getAllPosters($topicObject);
+	}
 } else {
-    $viewtopic_posters = [];
+	$viewtopic_posters = [];
 }
 
 if ($GLOBALS['xoopsModuleConfig']['show_advertising']) {
-    $post_werbung = [
-        'post_id'         => 0,
-        'post_parent_id'  => 0,
-        'post_date'       => 0,
-        'post_image'      => '',
-        'post_title'      => '',
-        'post_text'       => '<div style="text-align: center;vertical-align: middle;"><br>' . xoops_getbanner() . '</div>',
-        'post_attachment' => '',
-        'post_edit'       => 0,
-        'post_no'         => 0,
-        'post_signature'  => _MD_NEWBB_ADVERTISING_BLOCK,
-        'poster_ip'       => '',
-        'thread_action'   => '',
-        'thread_buttons'  => '',
-        'mod_buttons'     => '',
-        'poster'          => [
-            'uid'        => -1,
-            'link'       => _MD_NEWBB_ADVERTISING_USER,
-            'avatar'     => 'avatars/blank.gif',
-            'regdate'    => 0,
-            'last_login' => 0,
-            'rank'       => ['title' => '']
-        ],
-        // irmtfan add last_login
-        'post_permalink'  => ''
-    ];
+	$post_werbung = [
+		'post_id'         => 0,
+		'post_parent_id'  => 0,
+		'post_date'       => 0,
+		'post_image'      => '',
+		'post_title'      => '',
+		'post_text'       => '<div style="text-align: center;vertical-align: middle;"><br>' . xoops_getbanner() . '</div>',
+		'post_attachment' => '',
+		'post_edit'       => 0,
+		'post_no'         => 0,
+		'post_signature'  => _MD_NEWBB_ADVERTISING_BLOCK,
+		'poster_ip'       => '',
+		'thread_action'   => '',
+		'thread_buttons'  => '',
+		'mod_buttons'     => '',
+		'poster'          => [
+			'uid'        => -1,
+			'link'       => _MD_NEWBB_ADVERTISING_USER,
+			'avatar'     => 'avatars/blank.gif',
+			'regdate'    => 0,
+			'last_login' => 0,
+			'rank'       => ['title' => '']
+		],
+		// irmtfan add last_login
+		'post_permalink'  => ''
+	];
 }
 
 $i = 0;
 /** @var Post $eachpost */
 foreach ($postsArray as $eachpost) {
-    if ($GLOBALS['xoopsModuleConfig']['show_advertising']) {
-        if (2 === $i) {
-            $xoopsTpl->append('topic_posts', $post_werbung);
-        }
-        ++$i;
-    }
-    $xoopsTpl->append('topic_posts', $eachpost->showPost($isAdmin));
+	if ($GLOBALS['xoopsModuleConfig']['show_advertising']) {
+		if (2 === $i) {
+			$xoopsTpl->append('topic_posts', $post_werbung);
+		}
+		++$i;
+	}
+	$xoopsTpl->append('topic_posts', $eachpost->showPost($isAdmin));
 }
 
 if ($total_posts > $GLOBALS['xoopsModuleConfig']['posts_per_page']) {
-    require_once $GLOBALS['xoops']->path('class/pagenav.php');
-
-    $nav = new \XoopsPageNav($total_posts, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, 'start', 'topic_id=' . $topic_id . '&amp;order=' . $order . '&amp;status=' . $status . '&amp;mode=' . $mode);
-    //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite']) && $GLOBALS['xoopsModuleConfig']['do_rewrite'] === 1) $nav->url = XOOPS_URL . $nav->url;
-    if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
-        $navi = $nav->renderSelect();
-    } elseif ('image' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
-        $navi = $nav->renderImageNav(4);
-    } else {
-        $navi = $nav->renderNav(4);
-    }
-    $xoopsTpl->assign('forum_page_nav', $navi);
+	require_once $GLOBALS['xoops']->path('class/pagenav.php');
+
+	$nav = new \XoopsPageNav($total_posts, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, 'start', 'topic_id=' . $topic_id . '&amp;order=' . $order . '&amp;status=' . $status . '&amp;mode=' . $mode);
+	//if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite']) && $GLOBALS['xoopsModuleConfig']['do_rewrite'] === 1) $nav->url = XOOPS_URL . $nav->url;
+	if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
+		$navi = $nav->renderSelect();
+	} elseif ('image' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
+		$navi = $nav->renderImageNav(4);
+	} else {
+		$navi = $nav->renderNav(4);
+	}
+	$xoopsTpl->assign('forum_page_nav', $navi);
 } else {
-    $xoopsTpl->assign('forum_page_nav', '');
+	$xoopsTpl->assign('forum_page_nav', '');
 }
 
 if (empty($post_id)) {
-    $first   = array_keys($postsArray);
-    $post_id = !empty($first[0]) ? $first[0] : 0;
+	$first   = array_keys($postsArray);
+	$post_id = !empty($first[0]) ? $first[0] : 0;
 }
 
 if (!empty($postsArray[$post_id])) {
-    $xoops_pagetitle = $postsArray[$post_id]->getVar('subject') . ' [' . $forumObject->getVar('forum_name') . ']';
-    $xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
-    $xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
-    $kw                             = array_unique(explode(' ', strip_tags($postsArray[$post_id]->getVar('post_text')), 150));
-    asort($kw);
-    $kwort = '';
-    $z     = 0;
-    foreach ($kw as $k) {
-        if ($z < 30 && strlen(trim($k)) > 5) {
-            $kwort .= trim($k) . ' ';
-            ++$z;
-        }
-    }
-    $xoTheme->addMeta('meta', 'keywords', $kwort);
-    $xoTheme->addMeta('meta', 'description', substr(strip_tags($postsArray[$post_id]->getVar('post_text')), 0, 120));
+	$xoops_pagetitle = $postsArray[$post_id]->getVar('subject') . ' [' . $forumObject->getVar('forum_name') . ']';
+	$xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
+	$xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
+	$kw                             = array_unique(explode(' ', strip_tags($postsArray[$post_id]->getVar('post_text')), 150));
+	asort($kw);
+	$kwort = '';
+	$z     = 0;
+	foreach ($kw as $k) {
+		if ($z < 30 && strlen(trim($k)) > 5) {
+			$kwort .= trim($k) . ' ';
+			++$z;
+		}
+	}
+	$xoTheme->addMeta('meta', 'keywords', $kwort);
+	$xoTheme->addMeta('meta', 'description', substr(strip_tags($postsArray[$post_id]->getVar('post_text')), 0, 120));
 }
 unset($postsArray);
 
@@ -395,67 +395,67 @@ 
 // START irmtfan add restore to viewtopic
 // if the topic is active
 if ($topicObject->getVar('approved') > 0) {
-    $admin_actions['merge']  = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=merge&amp;topic_id=' . $topic_id,
-        'name'  => _MD_NEWBB_MERGETOPIC,
-        'image' => $ad_merge
-    ];
-    $admin_actions['move']   = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=move&amp;topic_id=' . $topic_id,
-        'name'  => _MD_NEWBB_MOVETOPIC,
-        'image' => $ad_move
-    ];
-    $admin_actions['delete'] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=delete&amp;topic_id=' . $topic_id,
-        'name'  => _MD_NEWBB_DELETETOPIC,
-        'image' => $ad_delete
-    ];
-    if (!$topicObject->getVar('topic_status')) {
-        $admin_actions['lock'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=lock&amp;topic_id=' . $topic_id,
-            'image' => $ad_lock,
-            'name'  => _MD_NEWBB_LOCKTOPIC
-        ];
-    } else {
-        $admin_actions['unlock'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unlock&amp;topic_id=' . $topic_id,
-            'image' => $ad_unlock,
-            'name'  => _MD_NEWBB_UNLOCKTOPIC
-        ];
-    }
-    if (!$topicObject->getVar('topic_sticky')) {
-        $admin_actions['sticky'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=sticky&amp;topic_id=' . $topic_id,
-            'image' => $ad_sticky,
-            'name'  => _MD_NEWBB_STICKYTOPIC
-        ];
-    } else {
-        $admin_actions['unsticky'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unsticky&amp;topic_id=' . $topic_id,
-            'image' => $ad_unsticky,
-            'name'  => _MD_NEWBB_UNSTICKYTOPIC
-        ];
-    }
-    if (!$topicObject->getVar('topic_digest')) {
-        $admin_actions['digest'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=digest&amp;topic_id=' . $topic_id,
-            'image' => $ad_digest,
-            'name'  => _MD_NEWBB_DIGESTTOPIC
-        ];
-    } else {
-        $admin_actions['undigest'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=undigest&amp;topic_id=' . $topic_id,
-            'image' => $ad_undigest,
-            'name'  => _MD_NEWBB_UNDIGESTTOPIC
-        ];
-    }
-    // if the topic is pending/deleted then restore/approve
+	$admin_actions['merge']  = [
+		'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=merge&amp;topic_id=' . $topic_id,
+		'name'  => _MD_NEWBB_MERGETOPIC,
+		'image' => $ad_merge
+	];
+	$admin_actions['move']   = [
+		'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=move&amp;topic_id=' . $topic_id,
+		'name'  => _MD_NEWBB_MOVETOPIC,
+		'image' => $ad_move
+	];
+	$admin_actions['delete'] = [
+		'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=delete&amp;topic_id=' . $topic_id,
+		'name'  => _MD_NEWBB_DELETETOPIC,
+		'image' => $ad_delete
+	];
+	if (!$topicObject->getVar('topic_status')) {
+		$admin_actions['lock'] = [
+			'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=lock&amp;topic_id=' . $topic_id,
+			'image' => $ad_lock,
+			'name'  => _MD_NEWBB_LOCKTOPIC
+		];
+	} else {
+		$admin_actions['unlock'] = [
+			'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unlock&amp;topic_id=' . $topic_id,
+			'image' => $ad_unlock,
+			'name'  => _MD_NEWBB_UNLOCKTOPIC
+		];
+	}
+	if (!$topicObject->getVar('topic_sticky')) {
+		$admin_actions['sticky'] = [
+			'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=sticky&amp;topic_id=' . $topic_id,
+			'image' => $ad_sticky,
+			'name'  => _MD_NEWBB_STICKYTOPIC
+		];
+	} else {
+		$admin_actions['unsticky'] = [
+			'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unsticky&amp;topic_id=' . $topic_id,
+			'image' => $ad_unsticky,
+			'name'  => _MD_NEWBB_UNSTICKYTOPIC
+		];
+	}
+	if (!$topicObject->getVar('topic_digest')) {
+		$admin_actions['digest'] = [
+			'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=digest&amp;topic_id=' . $topic_id,
+			'image' => $ad_digest,
+			'name'  => _MD_NEWBB_DIGESTTOPIC
+		];
+	} else {
+		$admin_actions['undigest'] = [
+			'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=undigest&amp;topic_id=' . $topic_id,
+			'image' => $ad_undigest,
+			'name'  => _MD_NEWBB_UNDIGESTTOPIC
+		];
+	}
+	// if the topic is pending/deleted then restore/approve
 } else {
-    $admin_actions['restore'] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=restore&amp;topic_id=' . $topic_id,
-        'name'  => _MD_NEWBB_RESTORETOPIC,
-        'image' => $ad_restore
-    ];
+	$admin_actions['restore'] = [
+		'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=restore&amp;topic_id=' . $topic_id,
+		'name'  => _MD_NEWBB_RESTORETOPIC,
+		'image' => $ad_restore
+	];
 }
 // END irmtfan add restore to viewtopic
 
@@ -463,10 +463,10 @@ 
 $xoopsTpl->assign('viewer_level', (int)($isAdmin ? 2 : is_object($GLOBALS['xoopsUser'])));
 
 if ($GLOBALS['xoopsModuleConfig']['show_permissiontable']) {
-    //    /** var Newbb\PermissionHandler $permHandler */
-    //    $permHandler      = Newbb\Helper::getInstance()->getHandler('Permission');
-    $permission_table = $permHandler->getPermissionTable($forumObject, $topicObject->getVar('topic_status'), $isAdmin);
-    $xoopsTpl->assign_by_ref('permission_table', $permission_table);
+	//    /** var Newbb\PermissionHandler $permHandler */
+	//    $permHandler      = Newbb\Helper::getInstance()->getHandler('Permission');
+	$permission_table = $permHandler->getPermissionTable($forumObject, $topicObject->getVar('topic_status'), $isAdmin);
+	$xoopsTpl->assign_by_ref('permission_table', $permission_table);
 }
 
 ///////////////////////////////
@@ -489,167 +489,167 @@ 
 //irmtfan remove
 $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
 if (is_object($pollModuleHandler) && $pollModuleHandler->getVar('isactive')) {
-    $poll_id = $topicObject->getVar('poll_id');
-    // can vote in poll
-    $pollVote = ($topicObject->getVar('topic_haspoll') && $poll_id > 0
-                 && $topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'vote'));
-    // can add poll
-    $pollAdd = $topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'addpoll');
-    if ($pollVote || $pollAdd) {
-        $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
+	$poll_id = $topicObject->getVar('poll_id');
+	// can vote in poll
+	$pollVote = ($topicObject->getVar('topic_haspoll') && $poll_id > 0
+				 && $topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'vote'));
+	// can add poll
+	$pollAdd = $topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'addpoll');
+	if ($pollVote || $pollAdd) {
+		$pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
 //            xoops_load('renderer', $GLOBALS['xoopsModuleConfig']['poll_module']);
-            xoops_loadLanguage('main', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $classPoll = $topicObject->loadOldPoll();
-        }
-    }
-    // START can vote in poll
-    if ($pollVote) {
-        $xoopsTpl->assign('topic_poll', 1);
-        $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $xpollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
-            /** @var \XoopsPoll $pollObject */
-            $pollObject = $xpollHandler->get($poll_id);
-            if (is_object($pollObject)) {
-
-                /* check to see if user has rights to view the results */
-                $vis_return = $pollObject->isResultVisible();
-                $isVisible  = $vis_return;
-                $visibleMsg = $isVisible ? '' : $vis_return;
-
-                /* setup the module config handler */
-                /** @var \XoopsConfigHandler $configHandler */
-                $configHandler = xoops_getHandler('config');
-                $xp_config     = $configHandler->getConfigsByCat(0, $pollModuleHandler->getVar('mid'));
-
-                $GLOBALS['xoopsTpl']->assign([
-                                                 'is_visible'      => $isVisible,
-                                                 'visible_message' => $visibleMsg,
-                                                 'disp_votes'      => $xp_config['disp_vote_nums'],
-                                                 'lang_vote'       => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'),
-                                                 'lang_results'    => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'),
-                                                 'back_link'       => ''
-                                             ]);
-                $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Renderer';
-                /** @var Xoopspoll\Renderer $renderer */
-                $renderer = new $classRenderer($pollObject);
-                // check to see if user has voted, show form if not, otherwise get results for form
-
-                /** @var Xoopspoll\LogHandler $logHandler */
-                $logHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-                if ($pollObject->isAllowedToVote()
-                    && (!$logHandler->hasVoted($poll_id, xoops_getenv('REMOTE_ADDR'), $uid))) {
-                    $myTpl = new \XoopsTpl();
-                    $renderer->assignForm($myTpl);
-                    $myTpl->assign('action', $GLOBALS['xoops']->url("modules/newbb/votepolls.php?topic_id={$topic_id}&amp;poll_id={$poll_id}"));
-                    $topic_pollform = $myTpl->fetch($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/templates/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '_view.tpl'));
-                    $GLOBALS['xoopsTpl']->assign('topic_pollform', $topic_pollform);
-                } else {
-                    $GLOBALS['xoopsTpl']->assign('can_vote', false);
-                    $xoopsTpl->assign('topic_pollresult', 1);
-                    $GLOBALS['xoopsTpl']->assign('topic_resultform', $renderer->renderResults());
-                }
-            }
-            // old xoopspoll or umfrage or any clone from them
-        } else {
-            $pollObject    = new $classPoll($poll_id);
-            $classRenderer = $classPoll . 'Renderer';
-            $renderer      = new $classRenderer($pollObject);
-            $xoopsTpl->assign('lang_alreadyvoted2', _PL_ALREADYVOTED2);
-            $xoopsTpl->assign('has_ended', $pollObject->getVar('end_time') < time() ? 1 : 0);
-            // umfrage has polltype
-            $polltype = $pollObject->getVar('polltype');
-            if (!empty($polltype)) {
-                $xoopsTpl->assign('polltype', $polltype);
-                switch ($polltype) {
-                    case 1:
-                        $xoopsTpl->assign('polltypecomment', '');
-                        break;
-                    case 2:
-                        $xoopsTpl->assign('polltypecomment', _PL_FULLBLIND);
-                        break;
-                    case 3:
-                        $xoopsTpl->assign('polltypecomment', _PL_HALFBLIND);
-                        break;
-
-                }
-            }
-            $classLog = $classPoll . 'Log';
-            $hasvoted = 0;
-            if ($GLOBALS['xoopsUser']) {
-                if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $uid)) {
-                    $hasvoted = 1;
-                }
-            } else {
-                $hasvoted = 1;
-            }
-            $xoopsTpl->assign('hasVoted', $hasvoted);
-            $xoopsTpl->assign('lang_vote', _PL_VOTE);
-            $xoopsTpl->assign('lang_results', $pollObject->getVar('end_time') < time() ? _PL_RESULTS : _PL_STANDINGS);
-            // irmtfan - if the poll is expired show the result
-            if ($hasvoted || $pollObject->hasExpired()) {
-                $renderer->assignResults($xoopsTpl);
-                $xoopsTpl->assign('topic_pollresult', 1);
-                setcookie('newbb_polls[' . $poll_id . ']', 1);
-            } else {
-                $renderer->assignForm($xoopsTpl);
-                $xoopsTpl->assign('lang_vote', _PL_VOTE);
-                $xoopsTpl->assign('lang_results', _PL_RESULTS);
-                setcookie('newbb_polls[' . $poll_id . ']', 1);
-            }
-        }
-    }
-    // END can vote in poll
-    // START can add poll
-    if ($pollAdd) {
-        if (!$topicObject->getVar('topic_haspoll')) {
-            if (is_object($GLOBALS['xoopsUser'])
-                && $GLOBALS['xoopsUser']->getVar('uid') == $topicObject->getVar('topic_poster')) {
-                $t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
-                $xoopsTpl->assign('forum_addpoll', '<a href=\'' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=add&amp;topic_id=' . $topic_id . '\'>' . $t_poll . '</a>');
-            }
-        } elseif ($isAdmin
-                  || (is_object($pollObject) && is_object($GLOBALS['xoopsUser'])
-                      && $GLOBALS['xoopsUser']->getVar('uid') == $pollObject->getVar('user_id'))) {
-            $poll_edit    = '';
-            $poll_delete  = '';
-            $poll_restart = '';
-            $poll_log     = '';
-
-            $adminpoll_actions                = [];
-            $adminpoll_actions['editpoll']    = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=edit&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
-                'image' => $poll_edit,
-                'name'  => _MD_NEWBB_EDITPOLL
-            ];
-            $adminpoll_actions['deletepoll']  = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=delete&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
-                'image' => $poll_delete,
-                'name'  => _MD_NEWBB_DELETEPOLL
-            ];
-            $adminpoll_actions['restartpoll'] = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=restart&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
-                'image' => $poll_restart,
-                'name'  => _MD_NEWBB_RESTARTPOLL
-            ];
-            $adminpoll_actions['logpoll']     = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=log&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
-                'image' => $poll_log,
-                'name'  => _MD_NEWBB_POLL_VIEWLOG
-            ];
-
-            $xoopsTpl->assign_by_ref('adminpoll_actions', $adminpoll_actions);
-        }
-    }
-    // END can add poll
+			xoops_loadLanguage('main', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		// old xoopspoll or umfrage or any clone from them
+		} else {
+			$classPoll = $topicObject->loadOldPoll();
+		}
+	}
+	// START can vote in poll
+	if ($pollVote) {
+		$xoopsTpl->assign('topic_poll', 1);
+		$uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			$xpollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
+			/** @var \XoopsPoll $pollObject */
+			$pollObject = $xpollHandler->get($poll_id);
+			if (is_object($pollObject)) {
+
+				/* check to see if user has rights to view the results */
+				$vis_return = $pollObject->isResultVisible();
+				$isVisible  = $vis_return;
+				$visibleMsg = $isVisible ? '' : $vis_return;
+
+				/* setup the module config handler */
+				/** @var \XoopsConfigHandler $configHandler */
+				$configHandler = xoops_getHandler('config');
+				$xp_config     = $configHandler->getConfigsByCat(0, $pollModuleHandler->getVar('mid'));
+
+				$GLOBALS['xoopsTpl']->assign([
+												 'is_visible'      => $isVisible,
+												 'visible_message' => $visibleMsg,
+												 'disp_votes'      => $xp_config['disp_vote_nums'],
+												 'lang_vote'       => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'),
+												 'lang_results'    => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'),
+												 'back_link'       => ''
+											 ]);
+				$classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Renderer';
+				/** @var Xoopspoll\Renderer $renderer */
+				$renderer = new $classRenderer($pollObject);
+				// check to see if user has voted, show form if not, otherwise get results for form
+
+				/** @var Xoopspoll\LogHandler $logHandler */
+				$logHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+				if ($pollObject->isAllowedToVote()
+					&& (!$logHandler->hasVoted($poll_id, xoops_getenv('REMOTE_ADDR'), $uid))) {
+					$myTpl = new \XoopsTpl();
+					$renderer->assignForm($myTpl);
+					$myTpl->assign('action', $GLOBALS['xoops']->url("modules/newbb/votepolls.php?topic_id={$topic_id}&amp;poll_id={$poll_id}"));
+					$topic_pollform = $myTpl->fetch($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/templates/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '_view.tpl'));
+					$GLOBALS['xoopsTpl']->assign('topic_pollform', $topic_pollform);
+				} else {
+					$GLOBALS['xoopsTpl']->assign('can_vote', false);
+					$xoopsTpl->assign('topic_pollresult', 1);
+					$GLOBALS['xoopsTpl']->assign('topic_resultform', $renderer->renderResults());
+				}
+			}
+			// old xoopspoll or umfrage or any clone from them
+		} else {
+			$pollObject    = new $classPoll($poll_id);
+			$classRenderer = $classPoll . 'Renderer';
+			$renderer      = new $classRenderer($pollObject);
+			$xoopsTpl->assign('lang_alreadyvoted2', _PL_ALREADYVOTED2);
+			$xoopsTpl->assign('has_ended', $pollObject->getVar('end_time') < time() ? 1 : 0);
+			// umfrage has polltype
+			$polltype = $pollObject->getVar('polltype');
+			if (!empty($polltype)) {
+				$xoopsTpl->assign('polltype', $polltype);
+				switch ($polltype) {
+					case 1:
+						$xoopsTpl->assign('polltypecomment', '');
+						break;
+					case 2:
+						$xoopsTpl->assign('polltypecomment', _PL_FULLBLIND);
+						break;
+					case 3:
+						$xoopsTpl->assign('polltypecomment', _PL_HALFBLIND);
+						break;
+
+				}
+			}
+			$classLog = $classPoll . 'Log';
+			$hasvoted = 0;
+			if ($GLOBALS['xoopsUser']) {
+				if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $uid)) {
+					$hasvoted = 1;
+				}
+			} else {
+				$hasvoted = 1;
+			}
+			$xoopsTpl->assign('hasVoted', $hasvoted);
+			$xoopsTpl->assign('lang_vote', _PL_VOTE);
+			$xoopsTpl->assign('lang_results', $pollObject->getVar('end_time') < time() ? _PL_RESULTS : _PL_STANDINGS);
+			// irmtfan - if the poll is expired show the result
+			if ($hasvoted || $pollObject->hasExpired()) {
+				$renderer->assignResults($xoopsTpl);
+				$xoopsTpl->assign('topic_pollresult', 1);
+				setcookie('newbb_polls[' . $poll_id . ']', 1);
+			} else {
+				$renderer->assignForm($xoopsTpl);
+				$xoopsTpl->assign('lang_vote', _PL_VOTE);
+				$xoopsTpl->assign('lang_results', _PL_RESULTS);
+				setcookie('newbb_polls[' . $poll_id . ']', 1);
+			}
+		}
+	}
+	// END can vote in poll
+	// START can add poll
+	if ($pollAdd) {
+		if (!$topicObject->getVar('topic_haspoll')) {
+			if (is_object($GLOBALS['xoopsUser'])
+				&& $GLOBALS['xoopsUser']->getVar('uid') == $topicObject->getVar('topic_poster')) {
+				$t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
+				$xoopsTpl->assign('forum_addpoll', '<a href=\'' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=add&amp;topic_id=' . $topic_id . '\'>' . $t_poll . '</a>');
+			}
+		} elseif ($isAdmin
+				  || (is_object($pollObject) && is_object($GLOBALS['xoopsUser'])
+					  && $GLOBALS['xoopsUser']->getVar('uid') == $pollObject->getVar('user_id'))) {
+			$poll_edit    = '';
+			$poll_delete  = '';
+			$poll_restart = '';
+			$poll_log     = '';
+
+			$adminpoll_actions                = [];
+			$adminpoll_actions['editpoll']    = [
+				'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=edit&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
+				'image' => $poll_edit,
+				'name'  => _MD_NEWBB_EDITPOLL
+			];
+			$adminpoll_actions['deletepoll']  = [
+				'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=delete&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
+				'image' => $poll_delete,
+				'name'  => _MD_NEWBB_DELETEPOLL
+			];
+			$adminpoll_actions['restartpoll'] = [
+				'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=restart&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
+				'image' => $poll_restart,
+				'name'  => _MD_NEWBB_RESTARTPOLL
+			];
+			$adminpoll_actions['logpoll']     = [
+				'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=log&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
+				'image' => $poll_log,
+				'name'  => _MD_NEWBB_POLL_VIEWLOG
+			];
+
+			$xoopsTpl->assign_by_ref('adminpoll_actions', $adminpoll_actions);
+		}
+	}
+	// END can add poll
 }
 if (isset($pollObject)) {
-    unset($pollObject);
+	unset($pollObject);
 }
 // END irmtfan poll_module
 
@@ -664,68 +664,68 @@ 
 $xoopsTpl->assign('post_content', newbbDisplayImage('post'));
 
 if (!empty($GLOBALS['xoopsModuleConfig']['rating_enabled'])) {
-    $xoopsTpl->assign('votes', $topicObject->getVar('votes'));
-    $rating = number_format($topicObject->getVar('rating') / 2, 0);
-    if ($rating < 1) {
-        $rating_img = newbbDisplayImage('blank');
-    } else {
-        // irmtfan - add alt key for rating
-        $rating_img = newbbDisplayImage('rate' . $rating, constant('_MD_NEWBB_RATE' . $rating));
-    }
-    $xoopsTpl->assign('rating_img', $rating_img);
-    $xoopsTpl->assign('rate1', newbbDisplayImage('rate1', _MD_NEWBB_RATE1));
-    $xoopsTpl->assign('rate2', newbbDisplayImage('rate2', _MD_NEWBB_RATE2));
-    $xoopsTpl->assign('rate3', newbbDisplayImage('rate3', _MD_NEWBB_RATE3));
-    $xoopsTpl->assign('rate4', newbbDisplayImage('rate4', _MD_NEWBB_RATE4));
-    $xoopsTpl->assign('rate5', newbbDisplayImage('rate5', _MD_NEWBB_RATE5));
+	$xoopsTpl->assign('votes', $topicObject->getVar('votes'));
+	$rating = number_format($topicObject->getVar('rating') / 2, 0);
+	if ($rating < 1) {
+		$rating_img = newbbDisplayImage('blank');
+	} else {
+		// irmtfan - add alt key for rating
+		$rating_img = newbbDisplayImage('rate' . $rating, constant('_MD_NEWBB_RATE' . $rating));
+	}
+	$xoopsTpl->assign('rating_img', $rating_img);
+	$xoopsTpl->assign('rate1', newbbDisplayImage('rate1', _MD_NEWBB_RATE1));
+	$xoopsTpl->assign('rate2', newbbDisplayImage('rate2', _MD_NEWBB_RATE2));
+	$xoopsTpl->assign('rate3', newbbDisplayImage('rate3', _MD_NEWBB_RATE3));
+	$xoopsTpl->assign('rate4', newbbDisplayImage('rate4', _MD_NEWBB_RATE4));
+	$xoopsTpl->assign('rate5', newbbDisplayImage('rate5', _MD_NEWBB_RATE5));
 }
 
 // create jump box
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
-    $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
+	require_once __DIR__ . '/include/functions.forum.php';
+	$xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
 }
 
 $xoopsTpl->assign([
-                      'lang_forum_index' => sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
-                      'lang_from'        => _MD_NEWBB_FROM,
-                      'lang_joined'      => _MD_NEWBB_JOINED,
-                      'lang_posts'       => _MD_NEWBB_POSTS,
-                      'lang_poster'      => _MD_NEWBB_POSTER,
-                      'lang_thread'      => _MD_NEWBB_THREAD,
-                      'lang_edit'        => _EDIT,
-                      'lang_delete'      => _DELETE,
-                      'lang_reply'       => _REPLY,
-                      'lang_postedon'    => _MD_NEWBB_POSTEDON,
-                      'lang_groups'      => _MD_NEWBB_GROUPS
-                  ]);
+					  'lang_forum_index' => sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
+					  'lang_from'        => _MD_NEWBB_FROM,
+					  'lang_joined'      => _MD_NEWBB_JOINED,
+					  'lang_posts'       => _MD_NEWBB_POSTS,
+					  'lang_poster'      => _MD_NEWBB_POSTER,
+					  'lang_thread'      => _MD_NEWBB_THREAD,
+					  'lang_edit'        => _EDIT,
+					  'lang_delete'      => _DELETE,
+					  'lang_reply'       => _REPLY,
+					  'lang_postedon'    => _MD_NEWBB_POSTEDON,
+					  'lang_groups'      => _MD_NEWBB_GROUPS
+				  ]);
 
 $viewmode_options = [];
 if ('DESC' === $order) {
-    $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=ASC&amp;status=$status&amp;topic_id=' . $topic_id,
-        'title' => _OLDESTFIRST
-    ];
+	$viewmode_options[] = [
+		'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=ASC&amp;status=$status&amp;topic_id=' . $topic_id,
+		'title' => _OLDESTFIRST
+	];
 } else {
-    $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=DESC&amp;status=$status&amp;topic_id=' . $topic_id,
-        'title' => _NEWESTFIRST
-    ];
+	$viewmode_options[] = [
+		'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=DESC&amp;status=$status&amp;topic_id=' . $topic_id,
+		'title' => _NEWESTFIRST
+	];
 }
 
 switch ($status) {
-    case 'active':
-        $current_status = '[' . _MD_NEWBB_TYPE_ADMIN . ']';
-        break;
-    case 'pending':
-        $current_status = '[' . _MD_NEWBB_TYPE_PENDING . ']';
-        break;
-    case 'deleted':
-        $current_status = '[' . _MD_NEWBB_TYPE_DELETED . ']';
-        break;
-    default:
-        $current_status = '';
-        break;
+	case 'active':
+		$current_status = '[' . _MD_NEWBB_TYPE_ADMIN . ']';
+		break;
+	case 'pending':
+		$current_status = '[' . _MD_NEWBB_TYPE_PENDING . ']';
+		break;
+	case 'deleted':
+		$current_status = '[' . _MD_NEWBB_TYPE_DELETED . ']';
+		break;
+	default:
+		$current_status = '';
+		break;
 }
 $xoopsTpl->assign('topicstatus', $current_status);
 
@@ -741,91 +741,91 @@ 
 //check banning
 //$moderateHandler = Newbb\Helper::getInstance()->getHandler('Moderate');
 if (!empty($GLOBALS['xoopsModuleConfig']['quickreply_enabled'])
-    && $topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'reply')
-    && $moderateHandler->verifyUser(-1, '', $forumObject->getVar('forum_id'))) {
-    // END irmtfan add verifyUser to quick reply
-    $forum_form = new \XoopsThemeForm(_MD_NEWBB_POSTREPLY, 'quick_reply', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/post.php', 'post', true);
-    if (!is_object($GLOBALS['xoopsUser'])) {
-        //$configHandler = xoops_getHandler('config');
-        $user_tray = new \XoopsFormElementTray(_MD_NEWBB_ACCOUNT);
-        $user_tray->addElement(new \XoopsFormText(_MD_NEWBB_NAME, 'uname', 26, 255));
-        $user_tray->addElement(new \XoopsFormPassword(_MD_NEWBB_PASSWORD, 'pass', 10, 32));
-        $login_checkbox = new \XoopsFormCheckBox('', 'login', 1);
-        $login_checkbox->addOption(1, _MD_NEWBB_LOGIN);
-        $user_tray->addElement($login_checkbox);
-        $forum_form->addElement($user_tray);
-        $captcha = new \XoopsFormCaptcha('', "topic_{$topic_id}_{$start}");
-        $captcha->setConfig('mode', 'text');
-        $forum_form->addElement($captcha);
-    }
-
-    //$quickform = ( !empty($GLOBALS['xoopsModuleConfig']["editor_default"]) ) ? $GLOBALS['xoopsModuleConfig']["editor_default"] : "textarea";
-    $quickform               = !empty($GLOBALS['xoopsModuleConfig']['editor_quick_default']) ? $GLOBALS['xoopsModuleConfig']['editor_quick_default'] : 'textarea';
-    $editor_configs          = [];
-    $editor_configs ['name'] = 'message';
-    //$editor_configs [ "value" ]     = $message ;
-    $editor_configs ['rows']   = empty($GLOBALS['xoopsModuleConfig'] ['editor_rows']) ? 10 : $GLOBALS['xoopsModuleConfig'] ['editor_rows'];
-    $editor_configs ['cols']   = empty($GLOBALS['xoopsModuleConfig'] ['editor_cols']) ? 30 : $GLOBALS['xoopsModuleConfig'] ['editor_cols'];
-    $editor_configs ['width']  = empty($GLOBALS['xoopsModuleConfig'] ['editor_width']) ? '100%' : $GLOBALS['xoopsModuleConfig'] ['editor_width'];
-    $editor_configs ['height'] = empty($GLOBALS['xoopsModuleConfig'] ['editor_height']) ? '400px' : $GLOBALS['xoopsModuleConfig'] ['editor_height'];
-    $_editor                   = new \XoopsFormEditor(_MD_NEWBB_MESSAGEC, $quickform, $editor_configs, true);
-    $forum_form->addElement($_editor, true);
-
-    $forum_form->addElement(new \XoopsFormHidden('dohtml', 0));
-    $forum_form->addElement(new \XoopsFormHidden('dosmiley', 1));
-    $forum_form->addElement(new \XoopsFormHidden('doxcode', 1));
-    $forum_form->addElement(new \XoopsFormHidden('dobr', 1));
-    $forum_form->addElement(new \XoopsFormHidden('attachsig', 1));
-
-    $forum_form->addElement(new \XoopsFormHidden('isreply', 1));
-
-    $forum_form->addElement(new \XoopsFormHidden('subject', _MD_NEWBB_RE . ': ' . $topicObject->getVar('topic_title', 'e')));
-    $forum_form->addElement(new \XoopsFormHidden('pid', empty($post_id) ? $topicHandler->getTopPostId($topic_id) : $post_id));
-    $forum_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-    $forum_form->addElement(new \XoopsFormHidden('forum', $forum_id));
-    //$forum_form->addElement(new \XoopsFormHidden('viewmode', $viewmode));
-    $forum_form->addElement(new \XoopsFormHidden('order', $order));
-    $forum_form->addElement(new \XoopsFormHidden('start', $start));
-
-    $forum_form->addElement(new \XoopsFormHidden('notify', -1));
-    $forum_form->addElement(new \XoopsFormHidden('contents_submit', 1));
-
-    $submit_button = new \XoopsFormButton('', 'quick_submit', _SUBMIT, 'submit');
-    $submit_button->setExtra('onclick="if (document.forms.quick_reply.message.value === \'RE\' || document.forms.quick_reply.message.value === \'\') { alert(\'' . _MD_NEWBB_QUICKREPLY_EMPTY . '\'); return false;} else { return true;}"');
-    $forum_form->addElement($submit_button);
-
-    $toggles = newbbGetCookie('G', true);
-    // START irmtfan improve quickreply smarty variable - add alt key to quick reply button - change $display to $style for more comprehension - add toggle $quickreply['expand']
-    $quickreply           = [];
-    $qr_collapse          = 't_qr';
-    $qr_expand            = 't_qr_expand'; // change this
-    $quickreply['icon']   = [
-        'expand'   => $iconHandler->getImageSource($qr_expand),
-        'collapse' => $iconHandler->getImageSource($qr_collapse)
-    ];
-    $quickreply['show']   = 1; // = !empty($GLOBALS['xoopsModuleConfig']['quickreply_enabled']
-    $quickreply['expand'] = (count($toggles) > 0) ? (in_array('qr', $toggles, true) ? false : true) : true;
-    if ($quickreply['expand']) {
-        $quickreply['style']     = 'block';        //irmtfan move semicolon
-        $quickreply_icon_display = $qr_expand;
-        $quickreply_alt          = _MD_NEWBB_HIDE . ' ' . _MD_NEWBB_QUICKREPLY;
-    } else {
-        $quickreply['style']     = 'none';        //irmtfan move semicolon
-        $quickreply_icon_display = $qr_collapse;
-        $quickreply_alt          = _MD_NEWBB_SEE . ' ' . _MD_NEWBB_QUICKREPLY;
-    }
-    $quickreply['displayImage'] = newbbDisplayImage($quickreply_icon_display, $quickreply_alt);
-    $quickreply['form']         = $forum_form->render();
-    $xoopsTpl->assign('quickreply', $quickreply);
-    // END irmtfan improve quickreply smarty variable
-    unset($forum_form);
+	&& $topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'reply')
+	&& $moderateHandler->verifyUser(-1, '', $forumObject->getVar('forum_id'))) {
+	// END irmtfan add verifyUser to quick reply
+	$forum_form = new \XoopsThemeForm(_MD_NEWBB_POSTREPLY, 'quick_reply', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/post.php', 'post', true);
+	if (!is_object($GLOBALS['xoopsUser'])) {
+		//$configHandler = xoops_getHandler('config');
+		$user_tray = new \XoopsFormElementTray(_MD_NEWBB_ACCOUNT);
+		$user_tray->addElement(new \XoopsFormText(_MD_NEWBB_NAME, 'uname', 26, 255));
+		$user_tray->addElement(new \XoopsFormPassword(_MD_NEWBB_PASSWORD, 'pass', 10, 32));
+		$login_checkbox = new \XoopsFormCheckBox('', 'login', 1);
+		$login_checkbox->addOption(1, _MD_NEWBB_LOGIN);
+		$user_tray->addElement($login_checkbox);
+		$forum_form->addElement($user_tray);
+		$captcha = new \XoopsFormCaptcha('', "topic_{$topic_id}_{$start}");
+		$captcha->setConfig('mode', 'text');
+		$forum_form->addElement($captcha);
+	}
+
+	//$quickform = ( !empty($GLOBALS['xoopsModuleConfig']["editor_default"]) ) ? $GLOBALS['xoopsModuleConfig']["editor_default"] : "textarea";
+	$quickform               = !empty($GLOBALS['xoopsModuleConfig']['editor_quick_default']) ? $GLOBALS['xoopsModuleConfig']['editor_quick_default'] : 'textarea';
+	$editor_configs          = [];
+	$editor_configs ['name'] = 'message';
+	//$editor_configs [ "value" ]     = $message ;
+	$editor_configs ['rows']   = empty($GLOBALS['xoopsModuleConfig'] ['editor_rows']) ? 10 : $GLOBALS['xoopsModuleConfig'] ['editor_rows'];
+	$editor_configs ['cols']   = empty($GLOBALS['xoopsModuleConfig'] ['editor_cols']) ? 30 : $GLOBALS['xoopsModuleConfig'] ['editor_cols'];
+	$editor_configs ['width']  = empty($GLOBALS['xoopsModuleConfig'] ['editor_width']) ? '100%' : $GLOBALS['xoopsModuleConfig'] ['editor_width'];
+	$editor_configs ['height'] = empty($GLOBALS['xoopsModuleConfig'] ['editor_height']) ? '400px' : $GLOBALS['xoopsModuleConfig'] ['editor_height'];
+	$_editor                   = new \XoopsFormEditor(_MD_NEWBB_MESSAGEC, $quickform, $editor_configs, true);
+	$forum_form->addElement($_editor, true);
+
+	$forum_form->addElement(new \XoopsFormHidden('dohtml', 0));
+	$forum_form->addElement(new \XoopsFormHidden('dosmiley', 1));
+	$forum_form->addElement(new \XoopsFormHidden('doxcode', 1));
+	$forum_form->addElement(new \XoopsFormHidden('dobr', 1));
+	$forum_form->addElement(new \XoopsFormHidden('attachsig', 1));
+
+	$forum_form->addElement(new \XoopsFormHidden('isreply', 1));
+
+	$forum_form->addElement(new \XoopsFormHidden('subject', _MD_NEWBB_RE . ': ' . $topicObject->getVar('topic_title', 'e')));
+	$forum_form->addElement(new \XoopsFormHidden('pid', empty($post_id) ? $topicHandler->getTopPostId($topic_id) : $post_id));
+	$forum_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+	$forum_form->addElement(new \XoopsFormHidden('forum', $forum_id));
+	//$forum_form->addElement(new \XoopsFormHidden('viewmode', $viewmode));
+	$forum_form->addElement(new \XoopsFormHidden('order', $order));
+	$forum_form->addElement(new \XoopsFormHidden('start', $start));
+
+	$forum_form->addElement(new \XoopsFormHidden('notify', -1));
+	$forum_form->addElement(new \XoopsFormHidden('contents_submit', 1));
+
+	$submit_button = new \XoopsFormButton('', 'quick_submit', _SUBMIT, 'submit');
+	$submit_button->setExtra('onclick="if (document.forms.quick_reply.message.value === \'RE\' || document.forms.quick_reply.message.value === \'\') { alert(\'' . _MD_NEWBB_QUICKREPLY_EMPTY . '\'); return false;} else { return true;}"');
+	$forum_form->addElement($submit_button);
+
+	$toggles = newbbGetCookie('G', true);
+	// START irmtfan improve quickreply smarty variable - add alt key to quick reply button - change $display to $style for more comprehension - add toggle $quickreply['expand']
+	$quickreply           = [];
+	$qr_collapse          = 't_qr';
+	$qr_expand            = 't_qr_expand'; // change this
+	$quickreply['icon']   = [
+		'expand'   => $iconHandler->getImageSource($qr_expand),
+		'collapse' => $iconHandler->getImageSource($qr_collapse)
+	];
+	$quickreply['show']   = 1; // = !empty($GLOBALS['xoopsModuleConfig']['quickreply_enabled']
+	$quickreply['expand'] = (count($toggles) > 0) ? (in_array('qr', $toggles, true) ? false : true) : true;
+	if ($quickreply['expand']) {
+		$quickreply['style']     = 'block';        //irmtfan move semicolon
+		$quickreply_icon_display = $qr_expand;
+		$quickreply_alt          = _MD_NEWBB_HIDE . ' ' . _MD_NEWBB_QUICKREPLY;
+	} else {
+		$quickreply['style']     = 'none';        //irmtfan move semicolon
+		$quickreply_icon_display = $qr_collapse;
+		$quickreply_alt          = _MD_NEWBB_SEE . ' ' . _MD_NEWBB_QUICKREPLY;
+	}
+	$quickreply['displayImage'] = newbbDisplayImage($quickreply_icon_display, $quickreply_alt);
+	$quickreply['form']         = $forum_form->render();
+	$xoopsTpl->assign('quickreply', $quickreply);
+	// END irmtfan improve quickreply smarty variable
+	unset($forum_form);
 } else {
-    $xoopsTpl->assign('quickreply', ['show' => 0]);
+	$xoopsTpl->assign('quickreply', ['show' => 0]);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['do_tag']
-    && @require_once $GLOBALS['xoops']->path('modules/tag/include/tagbar.php')) {
-    $xoopsTpl->assign('tagbar', tagBar($topicObject->getVar('topic_tags', 'n')));
+	&& @require_once $GLOBALS['xoops']->path('modules/tag/include/tagbar.php')) {
+	$xoopsTpl->assign('tagbar', tagBar($topicObject->getVar('topic_tags', 'n')));
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

Switch Indentation +12 added lines, -12 removed lines

@@ -714,18 +714,18 @@
 }
 
 switch ($status) {
-    case 'active':
-        $current_status = '[' . _MD_NEWBB_TYPE_ADMIN . ']';
-        break;
-    case 'pending':
-        $current_status = '[' . _MD_NEWBB_TYPE_PENDING . ']';
-        break;
-    case 'deleted':
-        $current_status = '[' . _MD_NEWBB_TYPE_DELETED . ']';
-        break;
-    default:
-        $current_status = '';
-        break;
+    	case 'active':
+        	$current_status = '[' . _MD_NEWBB_TYPE_ADMIN . ']';
+        	break;
+    	case 'pending':
+        	$current_status = '[' . _MD_NEWBB_TYPE_PENDING . ']';
+        	break;
+    	case 'deleted':
+        	$current_status = '[' . _MD_NEWBB_TYPE_DELETED . ']';
+        	break;
+    	default:
+        	$current_status = '';
+        	break;
 }
 $xoopsTpl->assign('topicstatus', $current_status);
 

Spacing +65 added lines, -65 removed lines

@@ -34,10 +34,10 @@ 
 use XoopsModules\Newbb;
 use XoopsModules\Xoopspoll;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $xoopsLogger->startTime('newBB_viewtopic');
-require_once __DIR__ . '/include/functions.read.php';
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.read.php';
+require_once __DIR__.'/include/functions.render.php';
 xoops_loadLanguage('user');
 
 /*Build the page query*/
@@ -45,7 +45,7 @@ 
 $query_array = [];
 foreach ($query_vars as $var) {
     if (Request::getString($var, '', 'GET')) {
-        $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+        $query_array[$var] = "{$var}=".Request::getString($var, '', 'GET');
     }
 }
 $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
@@ -73,7 +73,7 @@ 
 }
 
 if (!$topic_id && !$post_id) {
-    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
+    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/'.$xoopsModule->getVar('dirname').'/index.php' : XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/viewforum.php?forum={$forum_id}";
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
@@ -90,7 +90,7 @@ 
 }
 
 if (!is_object($topicObject) || !$topic_id = $topicObject->getVar('topic_id')) {
-    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php' : XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum={$forum_id}";
+    $redirect = empty($forum_id) ? XOOPS_URL . '/modules/'.$xoopsModule->getVar('dirname').'/index.php' : XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/viewforum.php?forum={$forum_id}";
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 $forum_id = $topicObject->getVar('forum_id');
@@ -102,7 +102,7 @@ 
 
 if ((!$isAdmin && $topicObject->getVar('approved') < 0) || (!$forumHandler->getPermission($forumObject))
     || (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view'))) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?forum='.$forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
 }
 
 // START irmtfan - find if topic is read or unread - for all users (member and anon)
@@ -128,7 +128,7 @@ 
         // hack jump to last post read if post_id is empty - is there any better way?
         if (empty($post_id) && $topic_is_unread
             && !empty($GLOBALS['xoopsModuleConfig']['jump_to_topic_last_post_read_enabled'])) {
-            header('Location: ' . Request::getString('REQUEST_URI', '', 'SERVER') . '&post_id=' . $topic_last_post_time_or_id_read);
+            header('Location: '.Request::getString('REQUEST_URI', '', 'SERVER').'&post_id='.$topic_last_post_time_or_id_read);
         }
     }
 }
@@ -167,7 +167,7 @@ 
 // irmtfan new method
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forumObject->getVar('forum_id') . '" />
+    <link rel="alternate" type="application/rss+xml" title="' . $xoopsModule->getVar('name').'-'.$forumObject->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forumObject->getVar('forum_id').'" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 
@@ -195,11 +195,11 @@ 
         'collapse' => $iconHandler->getImageSource('more')
     ];
     if (1 == $infobox['show']) {
-        $infobox['style'] = 'none';        //irmtfan move semicolon
+        $infobox['style'] = 'none'; //irmtfan move semicolon
         $infobox['alt']   = _MD_NEWBB_SEEUSERDATA;
         $infobox['src']   = 'more';
     } else {
-        $infobox['style'] = 'block';        //irmtfan move semicolon
+        $infobox['style'] = 'block'; //irmtfan move semicolon
         $infobox['alt']   = _MD_NEWBB_HIDEUSERDATA;
         $infobox['src']   = 'less';
     }
@@ -209,7 +209,7 @@ 
 // END irmtfan improve infobox
 
 $xoopsTpl->assign([
-                      'topic_title'    => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?topic_id=' . $topic_id . '">' . $topicObject->getFullTitle() . '</a>',
+                      'topic_title'    => '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?topic_id='.$topic_id.'">'.$topicObject->getFullTitle().'</a>',
                       'forum_name'     => $forumObject->getVar('forum_name'),
                       'lang_nexttopic' => _MD_NEWBB_NEXTTOPIC,
                       'lang_prevtopic' => _MD_NEWBB_PREVTOPIC,
@@ -231,20 +231,20 @@ 
 $t_reply = newbbDisplayImage('t_reply', _MD_NEWBB_REPLY);
 // irmtfan show topic status if show reg is 0 and revise forum_post_or_register
 if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'post')) {
-    $xoopsTpl->assign('forum_post', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/newtopic.php?forum=' . $forum_id . '"> ' . $t_new . '</a>');
+    $xoopsTpl->assign('forum_post', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/newtopic.php?forum='.$forum_id.'"> '.$t_new.'</a>');
 } else {
     if ($topicObject->getVar('topic_status')) {
         $xoopsTpl->assign('topic_lock', _MD_NEWBB_TOPICLOCKED);
     }
     if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
-        $xoopsTpl->assign('forum_register', '<a href="' . XOOPS_URL . '/user.php?xoops_redirect=' . htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5) . '">' . _MD_NEWBB_REGTOPOST . '</a>');
+        $xoopsTpl->assign('forum_register', '<a href="'.XOOPS_URL.'/user.php?xoops_redirect='.htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5).'">'._MD_NEWBB_REGTOPOST.'</a>');
     }
 }
 // irmtfan for backward compatibility assign forum_post_or_register smarty again.
-$xoopsTpl->assign('forum_post_or_register', @$xoopsTpl->get_template_vars('forum_post') . @$xoopsTpl->get_template_vars('forum_register') . @$xoopsTpl->get_template_vars('topic_lock'));
+$xoopsTpl->assign('forum_post_or_register', @$xoopsTpl->get_template_vars('forum_post').@$xoopsTpl->get_template_vars('forum_register').@$xoopsTpl->get_template_vars('topic_lock'));
 
 if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'reply')) {
-    $xoopsTpl->assign('forum_reply', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/reply.php?topic_id=' . $topic_id . '"> ' . $t_reply . '</a>');
+    $xoopsTpl->assign('forum_reply', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/reply.php?topic_id='.$topic_id.'"> '.$t_reply.'</a>');
 }
 
 $poster_array  = [];
@@ -265,7 +265,7 @@ 
     /** @var \XoopsMemberHandler $memberHandler */
     $memberHandler = xoops_getHandler('member');
     $userid_array  = array_keys($poster_array);
-    $user_criteria = '(' . implode(',', $userid_array) . ')';
+    $user_criteria = '('.implode(',', $userid_array).')';
     $users         = $memberHandler->getUsers(new \Criteria('uid', $user_criteria, 'IN'), true);
 } else {
     $users = [];
@@ -283,10 +283,10 @@ 
 
 if ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $require_reply) {
     if (!empty($GLOBALS['xoopsModuleConfig']['cache_enabled'])) {
-        $viewtopic_posters = newbbGetSession('t' . $topic_id, true);
+        $viewtopic_posters = newbbGetSession('t'.$topic_id, true);
         if (!is_array($viewtopic_posters) || 0 === count($viewtopic_posters)) {
             $viewtopic_posters = $topicHandler->getAllPosters($topicObject);
-            newbbSetSession('t' . $topic_id, $viewtopic_posters);
+            newbbSetSession('t'.$topic_id, $viewtopic_posters);
         }
     } else {
         $viewtopic_posters = $topicHandler->getAllPosters($topicObject);
@@ -302,7 +302,7 @@ 
         'post_date'       => 0,
         'post_image'      => '',
         'post_title'      => '',
-        'post_text'       => '<div style="text-align: center;vertical-align: middle;"><br>' . xoops_getbanner() . '</div>',
+        'post_text'       => '<div style="text-align: center;vertical-align: middle;"><br>'.xoops_getbanner().'</div>',
         'post_attachment' => '',
         'post_edit'       => 0,
         'post_no'         => 0,
@@ -339,7 +339,7 @@ 
 if ($total_posts > $GLOBALS['xoopsModuleConfig']['posts_per_page']) {
     require_once $GLOBALS['xoops']->path('class/pagenav.php');
 
-    $nav = new \XoopsPageNav($total_posts, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, 'start', 'topic_id=' . $topic_id . '&amp;order=' . $order . '&amp;status=' . $status . '&amp;mode=' . $mode);
+    $nav = new \XoopsPageNav($total_posts, $GLOBALS['xoopsModuleConfig']['posts_per_page'], $start, 'start', 'topic_id='.$topic_id.'&amp;order='.$order.'&amp;status='.$status.'&amp;mode='.$mode);
     //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite']) && $GLOBALS['xoopsModuleConfig']['do_rewrite'] === 1) $nav->url = XOOPS_URL . $nav->url;
     if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
         $navi = $nav->renderSelect();
@@ -359,7 +359,7 @@ 
 }
 
 if (!empty($postsArray[$post_id])) {
-    $xoops_pagetitle = $postsArray[$post_id]->getVar('subject') . ' [' . $forumObject->getVar('forum_name') . ']';
+    $xoops_pagetitle = $postsArray[$post_id]->getVar('subject').' ['.$forumObject->getVar('forum_name').']';
     $xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
     $xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
     $kw                             = array_unique(explode(' ', strip_tags($postsArray[$post_id]->getVar('post_text')), 150));
@@ -368,7 +368,7 @@ 
     $z     = 0;
     foreach ($kw as $k) {
         if ($z < 30 && strlen(trim($k)) > 5) {
-            $kwort .= trim($k) . ' ';
+            $kwort .= trim($k).' ';
             ++$z;
         }
     }
@@ -395,56 +395,56 @@ 
 // START irmtfan add restore to viewtopic
 // if the topic is active
 if ($topicObject->getVar('approved') > 0) {
-    $admin_actions['merge']  = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=merge&amp;topic_id=' . $topic_id,
+    $admin_actions['merge'] = [
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=merge&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_MERGETOPIC,
         'image' => $ad_merge
     ];
-    $admin_actions['move']   = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=move&amp;topic_id=' . $topic_id,
+    $admin_actions['move'] = [
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=move&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_MOVETOPIC,
         'image' => $ad_move
     ];
     $admin_actions['delete'] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=delete&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=delete&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_DELETETOPIC,
         'image' => $ad_delete
     ];
     if (!$topicObject->getVar('topic_status')) {
         $admin_actions['lock'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=lock&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=lock&amp;topic_id='.$topic_id,
             'image' => $ad_lock,
             'name'  => _MD_NEWBB_LOCKTOPIC
         ];
     } else {
         $admin_actions['unlock'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unlock&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=unlock&amp;topic_id='.$topic_id,
             'image' => $ad_unlock,
             'name'  => _MD_NEWBB_UNLOCKTOPIC
         ];
     }
     if (!$topicObject->getVar('topic_sticky')) {
         $admin_actions['sticky'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=sticky&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=sticky&amp;topic_id='.$topic_id,
             'image' => $ad_sticky,
             'name'  => _MD_NEWBB_STICKYTOPIC
         ];
     } else {
         $admin_actions['unsticky'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=unsticky&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=unsticky&amp;topic_id='.$topic_id,
             'image' => $ad_unsticky,
             'name'  => _MD_NEWBB_UNSTICKYTOPIC
         ];
     }
     if (!$topicObject->getVar('topic_digest')) {
         $admin_actions['digest'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=digest&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=digest&amp;topic_id='.$topic_id,
             'image' => $ad_digest,
             'name'  => _MD_NEWBB_DIGESTTOPIC
         ];
     } else {
         $admin_actions['undigest'] = [
-            'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=undigest&amp;topic_id=' . $topic_id,
+            'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=undigest&amp;topic_id='.$topic_id,
             'image' => $ad_undigest,
             'name'  => _MD_NEWBB_UNDIGESTTOPIC
         ];
@@ -452,7 +452,7 @@ 
     // if the topic is pending/deleted then restore/approve
 } else {
     $admin_actions['restore'] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/topicmanager.php?mode=restore&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/topicmanager.php?mode=restore&amp;topic_id='.$topic_id,
         'name'  => _MD_NEWBB_RESTORETOPIC,
         'image' => $ad_restore
     ];
@@ -531,11 +531,11 @@ 
                                                  'is_visible'      => $isVisible,
                                                  'visible_message' => $visibleMsg,
                                                  'disp_votes'      => $xp_config['disp_vote_nums'],
-                                                 'lang_vote'       => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE'),
-                                                 'lang_results'    => constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_RESULTS'),
+                                                 'lang_vote'       => constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_VOTE'),
+                                                 'lang_results'    => constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_RESULTS'),
                                                  'back_link'       => ''
                                              ]);
-                $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']) . 'Renderer';
+                $classRenderer = ucfirst($GLOBALS['xoopsModuleConfig']['poll_module']).'Renderer';
                 /** @var Xoopspoll\Renderer $renderer */
                 $renderer = new $classRenderer($pollObject);
                 // check to see if user has voted, show form if not, otherwise get results for form
@@ -547,7 +547,7 @@ 
                     $myTpl = new \XoopsTpl();
                     $renderer->assignForm($myTpl);
                     $myTpl->assign('action', $GLOBALS['xoops']->url("modules/newbb/votepolls.php?topic_id={$topic_id}&amp;poll_id={$poll_id}"));
-                    $topic_pollform = $myTpl->fetch($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/templates/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '_view.tpl'));
+                    $topic_pollform = $myTpl->fetch($GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/templates/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'_view.tpl'));
                     $GLOBALS['xoopsTpl']->assign('topic_pollform', $topic_pollform);
                 } else {
                     $GLOBALS['xoopsTpl']->assign('can_vote', false);
@@ -558,7 +558,7 @@ 
             // old xoopspoll or umfrage or any clone from them
         } else {
             $pollObject    = new $classPoll($poll_id);
-            $classRenderer = $classPoll . 'Renderer';
+            $classRenderer = $classPoll.'Renderer';
             $renderer      = new $classRenderer($pollObject);
             $xoopsTpl->assign('lang_alreadyvoted2', _PL_ALREADYVOTED2);
             $xoopsTpl->assign('has_ended', $pollObject->getVar('end_time') < time() ? 1 : 0);
@@ -579,7 +579,7 @@ 
 
                 }
             }
-            $classLog = $classPoll . 'Log';
+            $classLog = $classPoll.'Log';
             $hasvoted = 0;
             if ($GLOBALS['xoopsUser']) {
                 if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $uid)) {
@@ -595,12 +595,12 @@ 
             if ($hasvoted || $pollObject->hasExpired()) {
                 $renderer->assignResults($xoopsTpl);
                 $xoopsTpl->assign('topic_pollresult', 1);
-                setcookie('newbb_polls[' . $poll_id . ']', 1);
+                setcookie('newbb_polls['.$poll_id.']', 1);
             } else {
                 $renderer->assignForm($xoopsTpl);
                 $xoopsTpl->assign('lang_vote', _PL_VOTE);
                 $xoopsTpl->assign('lang_results', _PL_RESULTS);
-                setcookie('newbb_polls[' . $poll_id . ']', 1);
+                setcookie('newbb_polls['.$poll_id.']', 1);
             }
         }
     }
@@ -611,7 +611,7 @@ 
             if (is_object($GLOBALS['xoopsUser'])
                 && $GLOBALS['xoopsUser']->getVar('uid') == $topicObject->getVar('topic_poster')) {
                 $t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
-                $xoopsTpl->assign('forum_addpoll', '<a href=\'' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=add&amp;topic_id=' . $topic_id . '\'>' . $t_poll . '</a>');
+                $xoopsTpl->assign('forum_addpoll', '<a href=\''.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=add&amp;topic_id='.$topic_id.'\'>'.$t_poll.'</a>');
             }
         } elseif ($isAdmin
                   || (is_object($pollObject) && is_object($GLOBALS['xoopsUser'])
@@ -623,22 +623,22 @@ 
 
             $adminpoll_actions                = [];
             $adminpoll_actions['editpoll']    = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=edit&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=edit&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id,
                 'image' => $poll_edit,
                 'name'  => _MD_NEWBB_EDITPOLL
             ];
-            $adminpoll_actions['deletepoll']  = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=delete&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id,
+            $adminpoll_actions['deletepoll'] = [
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=delete&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id,
                 'image' => $poll_delete,
                 'name'  => _MD_NEWBB_DELETEPOLL
             ];
             $adminpoll_actions['restartpoll'] = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=restart&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=restart&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id.'&amp;forum='.$forum_id,
                 'image' => $poll_restart,
                 'name'  => _MD_NEWBB_RESTARTPOLL
             ];
-            $adminpoll_actions['logpoll']     = [
-                'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/polls.php?op=log&amp;poll_id=' . $topicObject->getVar('poll_id') . '&amp;topic_id=' . $topic_id . '&amp;forum=' . $forum_id,
+            $adminpoll_actions['logpoll'] = [
+                'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/polls.php?op=log&amp;poll_id='.$topicObject->getVar('poll_id').'&amp;topic_id='.$topic_id.'&amp;forum='.$forum_id,
                 'image' => $poll_log,
                 'name'  => _MD_NEWBB_POLL_VIEWLOG
             ];
@@ -670,7 +670,7 @@ 
         $rating_img = newbbDisplayImage('blank');
     } else {
         // irmtfan - add alt key for rating
-        $rating_img = newbbDisplayImage('rate' . $rating, constant('_MD_NEWBB_RATE' . $rating));
+        $rating_img = newbbDisplayImage('rate'.$rating, constant('_MD_NEWBB_RATE'.$rating));
     }
     $xoopsTpl->assign('rating_img', $rating_img);
     $xoopsTpl->assign('rate1', newbbDisplayImage('rate1', _MD_NEWBB_RATE1));
@@ -682,7 +682,7 @@ 
 
 // create jump box
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
+    require_once __DIR__.'/include/functions.forum.php';
     $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
 }
 
@@ -703,25 +703,25 @@ 
 $viewmode_options = [];
 if ('DESC' === $order) {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=ASC&amp;status=$status&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?order=ASC&amp;status=$status&amp;topic_id='.$topic_id,
         'title' => _OLDESTFIRST
     ];
 } else {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?order=DESC&amp;status=$status&amp;topic_id=' . $topic_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?order=DESC&amp;status=$status&amp;topic_id='.$topic_id,
         'title' => _NEWESTFIRST
     ];
 }
 
 switch ($status) {
     case 'active':
-        $current_status = '[' . _MD_NEWBB_TYPE_ADMIN . ']';
+        $current_status = '['._MD_NEWBB_TYPE_ADMIN.']';
         break;
     case 'pending':
-        $current_status = '[' . _MD_NEWBB_TYPE_PENDING . ']';
+        $current_status = '['._MD_NEWBB_TYPE_PENDING.']';
         break;
     case 'deleted':
-        $current_status = '[' . _MD_NEWBB_TYPE_DELETED . ']';
+        $current_status = '['._MD_NEWBB_TYPE_DELETED.']';
         break;
     default:
         $current_status = '';
@@ -744,7 +744,7 @@ 
     && $topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'reply')
     && $moderateHandler->verifyUser(-1, '', $forumObject->getVar('forum_id'))) {
     // END irmtfan add verifyUser to quick reply
-    $forum_form = new \XoopsThemeForm(_MD_NEWBB_POSTREPLY, 'quick_reply', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/post.php', 'post', true);
+    $forum_form = new \XoopsThemeForm(_MD_NEWBB_POSTREPLY, 'quick_reply', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/post.php', 'post', true);
     if (!is_object($GLOBALS['xoopsUser'])) {
         //$configHandler = xoops_getHandler('config');
         $user_tray = new \XoopsFormElementTray(_MD_NEWBB_ACCOUNT);
@@ -779,7 +779,7 @@ 
 
     $forum_form->addElement(new \XoopsFormHidden('isreply', 1));
 
-    $forum_form->addElement(new \XoopsFormHidden('subject', _MD_NEWBB_RE . ': ' . $topicObject->getVar('topic_title', 'e')));
+    $forum_form->addElement(new \XoopsFormHidden('subject', _MD_NEWBB_RE.': '.$topicObject->getVar('topic_title', 'e')));
     $forum_form->addElement(new \XoopsFormHidden('pid', empty($post_id) ? $topicHandler->getTopPostId($topic_id) : $post_id));
     $forum_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
     $forum_form->addElement(new \XoopsFormHidden('forum', $forum_id));
@@ -791,7 +791,7 @@ 
     $forum_form->addElement(new \XoopsFormHidden('contents_submit', 1));
 
     $submit_button = new \XoopsFormButton('', 'quick_submit', _SUBMIT, 'submit');
-    $submit_button->setExtra('onclick="if (document.forms.quick_reply.message.value === \'RE\' || document.forms.quick_reply.message.value === \'\') { alert(\'' . _MD_NEWBB_QUICKREPLY_EMPTY . '\'); return false;} else { return true;}"');
+    $submit_button->setExtra('onclick="if (document.forms.quick_reply.message.value === \'RE\' || document.forms.quick_reply.message.value === \'\') { alert(\''._MD_NEWBB_QUICKREPLY_EMPTY.'\'); return false;} else { return true;}"');
     $forum_form->addElement($submit_button);
 
     $toggles = newbbGetCookie('G', true);
@@ -806,13 +806,13 @@ 
     $quickreply['show']   = 1; // = !empty($GLOBALS['xoopsModuleConfig']['quickreply_enabled']
     $quickreply['expand'] = (count($toggles) > 0) ? (in_array('qr', $toggles, true) ? false : true) : true;
     if ($quickreply['expand']) {
-        $quickreply['style']     = 'block';        //irmtfan move semicolon
+        $quickreply['style']     = 'block'; //irmtfan move semicolon
         $quickreply_icon_display = $qr_expand;
-        $quickreply_alt          = _MD_NEWBB_HIDE . ' ' . _MD_NEWBB_QUICKREPLY;
+        $quickreply_alt          = _MD_NEWBB_HIDE.' '._MD_NEWBB_QUICKREPLY;
     } else {
-        $quickreply['style']     = 'none';        //irmtfan move semicolon
+        $quickreply['style']     = 'none'; //irmtfan move semicolon
         $quickreply_icon_display = $qr_collapse;
-        $quickreply_alt          = _MD_NEWBB_SEE . ' ' . _MD_NEWBB_QUICKREPLY;
+        $quickreply_alt          = _MD_NEWBB_SEE.' '._MD_NEWBB_QUICKREPLY;
     }
     $quickreply['displayImage'] = newbbDisplayImage($quickreply_icon_display, $quickreply_alt);
     $quickreply['form']         = $forum_form->render();
@@ -828,6 +828,6 @@ 
     $xoopsTpl->assign('tagbar', tagBar($topicObject->getVar('topic_tags', 'n')));
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');
 $xoopsLogger->stopTime('newBB_viewtopic');

action.topic.php

Indentation +142 added lines, -142 removed lines

@@ -21,8 +21,8 @@ 
 $op = in_array($op, ['approve', 'delete', 'restore', 'move'], true) ? $op : '';
 
 if (0 === count($topic_id) || 0 === count($op)) {
-    // irmtfan - issue with javascript:history.go(-1)
-    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_NO_SELECTION);
+	// irmtfan - issue with javascript:history.go(-1)
+	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_NO_SELECTION);
 }
 
 $topic_id = array_values($topic_id);
@@ -34,161 +34,161 @@ 
 $isAdmin = newbbIsAdmin($forum_id);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 switch ($op) {
-    case 'restore':
-        $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
-        foreach (array_keys($topicsObject) as $id) {
-            /** @var Newbb\Topic $topicObject */
-            $topicObject = $topicsObject[$id];
-            $topicHandler->approve($topicObject);
-            $topicHandler->synchronization($topicObject);
-            $forums[$topicObject->getVar('forum_id')] = 1;
-        }
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forumsObject   = $forumHandler->getAll($criteria_forum);
-        foreach (array_keys($forumsObject) as $id) {
-            $forumHandler->synchronization($forumsObject[$id]);
-        }
-        unset($topicsObject, $forumsObject);
-        break;
-    case 'approve':
-        $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
-        foreach (array_keys($topicsObject) as $id) {
-            /** @var Newbb\Topic $topicObject */
-            $topicObject = $topicsObject[$id];
-            $topicHandler->approve($topicObject);
-            $topicHandler->synchronization($topicObject);
-            $forums[$topicObject->getVar('forum_id')] = 1;
-        }
+	case 'restore':
+		$forums       = [];
+		$topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+		foreach (array_keys($topicsObject) as $id) {
+			/** @var Newbb\Topic $topicObject */
+			$topicObject = $topicsObject[$id];
+			$topicHandler->approve($topicObject);
+			$topicHandler->synchronization($topicObject);
+			$forums[$topicObject->getVar('forum_id')] = 1;
+		}
+		$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+		$forumsObject   = $forumHandler->getAll($criteria_forum);
+		foreach (array_keys($forumsObject) as $id) {
+			$forumHandler->synchronization($forumsObject[$id]);
+		}
+		unset($topicsObject, $forumsObject);
+		break;
+	case 'approve':
+		$forums       = [];
+		$topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+		foreach (array_keys($topicsObject) as $id) {
+			/** @var Newbb\Topic $topicObject */
+			$topicObject = $topicsObject[$id];
+			$topicHandler->approve($topicObject);
+			$topicHandler->synchronization($topicObject);
+			$forums[$topicObject->getVar('forum_id')] = 1;
+		}
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forumsObject   = $forumHandler->getAll($criteria_forum);
-        foreach (array_keys($forumsObject) as $id) {
-            $forumHandler->synchronization($forumsObject[$id]);
-        }
+		$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+		$forumsObject   = $forumHandler->getAll($criteria_forum);
+		foreach (array_keys($forumsObject) as $id) {
+			$forumHandler->synchronization($forumsObject[$id]);
+		}
 
-        if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
-            break;
-        }
+		if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
+			break;
+		}
 
-        require_once __DIR__ . '/include/notification.inc.php';
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler = xoops_getHandler('notification');
-        foreach (array_keys($topicsObject) as $id) {
-            $topicObject         = $topicsObject[$id];
-            $tags                = [];
-            $tags['THREAD_NAME'] = $topicObject->getVar('topic_title');
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewtopic.php?topic_id=' . $id . '&forum=' . $topicObject->getVar('forum_id');
-            /** @var Newbb\Forum[] $forumsObject */
-            $tags['FORUM_NAME'] = $forumsObject[$topicObject->getVar('forum_id')]->getVar('forum_name');
-            $tags['FORUM_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewforum.php?forum=' . $topicObject->getVar('forum_id');
-            $notificationHandler->triggerEvent('global', 0, 'new_thread', $tags);
-            $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_thread', $tags);
-            $postObject       = $topicHandler->getTopPost($id);
-            $tags['POST_URL'] = $tags['THREAD_URL'] . '#forumpost' . $postObject->getVar('post_id');
-            $notificationHandler->triggerEvent('thread', $id, 'new_post', $tags);
-            $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
-            $tags['POST_CONTENT'] = $postObject->getVar('post_text');
-            $tags['POST_NAME']    = $postObject->getVar('subject');
-            $notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
-            $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_fullpost', $tags);
-            unset($postObject);
-        }
-        unset($topicsObject, $forumsObject);
-        break;
-    case 'delete':
-        $forums = [];
-        /** @var Newbb\TopicHandler|\XoopsPersistableObjectHandler $topicHandler */
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
-        foreach (array_keys($topicsObject) as $id) {
-            /** @var Newbb\Topic $topicObject */
-            $topicObject = $topicsObject[$id];
-            // irmtfan should be set to false to not delete topic from database
-            $topicHandler->delete($topicObject, false);
-            $topicHandler->synchronization($topicObject);
-            $forums[$topicObject->getVar('forum_id')] = 1;
-        }
+		require_once __DIR__ . '/include/notification.inc.php';
+		/** @var \XoopsNotificationHandler $notificationHandler */
+		$notificationHandler = xoops_getHandler('notification');
+		foreach (array_keys($topicsObject) as $id) {
+			$topicObject         = $topicsObject[$id];
+			$tags                = [];
+			$tags['THREAD_NAME'] = $topicObject->getVar('topic_title');
+			$tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewtopic.php?topic_id=' . $id . '&forum=' . $topicObject->getVar('forum_id');
+			/** @var Newbb\Forum[] $forumsObject */
+			$tags['FORUM_NAME'] = $forumsObject[$topicObject->getVar('forum_id')]->getVar('forum_name');
+			$tags['FORUM_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewforum.php?forum=' . $topicObject->getVar('forum_id');
+			$notificationHandler->triggerEvent('global', 0, 'new_thread', $tags);
+			$notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_thread', $tags);
+			$postObject       = $topicHandler->getTopPost($id);
+			$tags['POST_URL'] = $tags['THREAD_URL'] . '#forumpost' . $postObject->getVar('post_id');
+			$notificationHandler->triggerEvent('thread', $id, 'new_post', $tags);
+			$notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_post', $tags);
+			$notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
+			$tags['POST_CONTENT'] = $postObject->getVar('post_text');
+			$tags['POST_NAME']    = $postObject->getVar('subject');
+			$notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
+			$notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_fullpost', $tags);
+			unset($postObject);
+		}
+		unset($topicsObject, $forumsObject);
+		break;
+	case 'delete':
+		$forums = [];
+		/** @var Newbb\TopicHandler|\XoopsPersistableObjectHandler $topicHandler */
+		$topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+		foreach (array_keys($topicsObject) as $id) {
+			/** @var Newbb\Topic $topicObject */
+			$topicObject = $topicsObject[$id];
+			// irmtfan should be set to false to not delete topic from database
+			$topicHandler->delete($topicObject, false);
+			$topicHandler->synchronization($topicObject);
+			$forums[$topicObject->getVar('forum_id')] = 1;
+		}
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forumsObject   = $forumHandler->getAll($criteria_forum);
-        foreach (array_keys($forumsObject) as $id) {
-            $forumHandler->synchronization($forumsObject[$id]);
-        }
-        unset($topicsObject, $forumsObject);
-        break;
-    case 'move':
-        if (Request::getInt('newforum', 0, 'POST')
-            && Request::getInt('newforum', 0, 'POST') !== $forum_id
-            && $forumHandler->getPermission(Request::getInt('newforum', 0, 'POST'), 'post')) {
-            $criteria = new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN');
-            //            /** @var Newbb\PostHandler $postHandler */
-            //            $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-            $postHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
-            $topicHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
-            $forumHandler->synchronization(Request::getInt('newforum', 0, 'POST'));
-            $forumHandler->synchronization($forum_id);
-        } else {
-            require_once $GLOBALS['xoops']->path('header.php');
-            //            /** @var Newbb\CategoryHandler $categoryHandler */
-            //            $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
-            $categories = $categoryHandler->getByPermission('access');
-            $forums     = $forumHandler->getForumsByCategory(array_keys($categories), 'post', false);
+		$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+		$forumsObject   = $forumHandler->getAll($criteria_forum);
+		foreach (array_keys($forumsObject) as $id) {
+			$forumHandler->synchronization($forumsObject[$id]);
+		}
+		unset($topicsObject, $forumsObject);
+		break;
+	case 'move':
+		if (Request::getInt('newforum', 0, 'POST')
+			&& Request::getInt('newforum', 0, 'POST') !== $forum_id
+			&& $forumHandler->getPermission(Request::getInt('newforum', 0, 'POST'), 'post')) {
+			$criteria = new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN');
+			//            /** @var Newbb\PostHandler $postHandler */
+			//            $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+			$postHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
+			$topicHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
+			$forumHandler->synchronization(Request::getInt('newforum', 0, 'POST'));
+			$forumHandler->synchronization($forum_id);
+		} else {
+			require_once $GLOBALS['xoops']->path('header.php');
+			//            /** @var Newbb\CategoryHandler $categoryHandler */
+			//            $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
+			$categories = $categoryHandler->getByPermission('access');
+			$forums     = $forumHandler->getForumsByCategory(array_keys($categories), 'post', false);
 
-            $box = '<select name="newforum" size="1">';
-            if (count($categories) > 0 && count($forums) > 0) {
-                foreach (array_keys($forums) as $key) {
+			$box = '<select name="newforum" size="1">';
+			if (count($categories) > 0 && count($forums) > 0) {
+				foreach (array_keys($forums) as $key) {
 
-                    /** @var Newbb\Category[] $categories */
-                    $box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
-                    foreach ($forums[$key] as $forumid => $_forum) {
-                        $box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
-                        if (!isset($_forum['sub'])) {
-                            continue;
-                        }
-                        foreach (array_keys($_forum['sub']) as $fid) {
-                            $box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
-                        }
-                    }
-                }
-            } else {
-                $box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
-            }
-            $box .= '</select>';
-            unset($forums, $categories);
+					/** @var Newbb\Category[] $categories */
+					$box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
+					foreach ($forums[$key] as $forumid => $_forum) {
+						$box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
+						if (!isset($_forum['sub'])) {
+							continue;
+						}
+						foreach (array_keys($_forum['sub']) as $fid) {
+							$box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
+						}
+					}
+				}
+			} else {
+				$box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
+			}
+			$box .= '</select>';
+			unset($forums, $categories);
 
-            echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
-            echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
-            echo "<tr><td class='bg2'>";
-            echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
-            echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
-            echo $box;
-            echo '</td></tr>';
-            echo '<tr class="bg3"><td colspan="2" align="center">';
-            echo "<input type='hidden' name='op' value='move' />";
-            echo "<input type='hidden' name='forum_id' value='{$forum_id}' />";
-            foreach ($topic_id as $id) {
-                echo "<input type='hidden' name='topic_id[]' value='" . $id . "' />";
-            }
-            echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
-            echo '</td></tr></table></td></tr></table>';
-            echo '</form>';
-            require_once $GLOBALS['xoops']->path('footer.php');
-            exit();
-        }
-        break;
+			echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
+			echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
+			echo "<tr><td class='bg2'>";
+			echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
+			echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
+			echo $box;
+			echo '</td></tr>';
+			echo '<tr class="bg3"><td colspan="2" align="center">';
+			echo "<input type='hidden' name='op' value='move' />";
+			echo "<input type='hidden' name='forum_id' value='{$forum_id}' />";
+			foreach ($topic_id as $id) {
+				echo "<input type='hidden' name='topic_id[]' value='" . $id . "' />";
+			}
+			echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
+			echo '</td></tr></table></td></tr></table>';
+			echo '</form>';
+			require_once $GLOBALS['xoops']->path('footer.php');
+			exit();
+		}
+		break;
 }
 ///** @var Newbb\StatsHandler $statsHandler */
 //$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
 $statsHandler->reset();
 if (empty($forum_id)) {
-    redirect_header(XOOPS_URL . '/modules/newbb/list.topic.php', 2, _MD_NEWBB_DBUPDATED);
+	redirect_header(XOOPS_URL . '/modules/newbb/list.topic.php', 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

Switch Indentation +137 added lines, -137 removed lines

@@ -37,150 +37,150 @@
     redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 switch ($op) {
-    case 'restore':
-        $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
-        foreach (array_keys($topicsObject) as $id) {
-            /** @var Newbb\Topic $topicObject */
-            $topicObject = $topicsObject[$id];
-            $topicHandler->approve($topicObject);
-            $topicHandler->synchronization($topicObject);
-            $forums[$topicObject->getVar('forum_id')] = 1;
-        }
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forumsObject   = $forumHandler->getAll($criteria_forum);
-        foreach (array_keys($forumsObject) as $id) {
-            $forumHandler->synchronization($forumsObject[$id]);
-        }
-        unset($topicsObject, $forumsObject);
-        break;
-    case 'approve':
-        $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
-        foreach (array_keys($topicsObject) as $id) {
-            /** @var Newbb\Topic $topicObject */
-            $topicObject = $topicsObject[$id];
-            $topicHandler->approve($topicObject);
-            $topicHandler->synchronization($topicObject);
-            $forums[$topicObject->getVar('forum_id')] = 1;
-        }
+    	case 'restore':
+        	$forums       = [];
+        	$topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        	foreach (array_keys($topicsObject) as $id) {
+            	/** @var Newbb\Topic $topicObject */
+            	$topicObject = $topicsObject[$id];
+            	$topicHandler->approve($topicObject);
+            	$topicHandler->synchronization($topicObject);
+            	$forums[$topicObject->getVar('forum_id')] = 1;
+        	}
+        	$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        	$forumsObject   = $forumHandler->getAll($criteria_forum);
+        	foreach (array_keys($forumsObject) as $id) {
+            	$forumHandler->synchronization($forumsObject[$id]);
+        	}
+        	unset($topicsObject, $forumsObject);
+        	break;
+    	case 'approve':
+        	$forums       = [];
+        	$topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        	foreach (array_keys($topicsObject) as $id) {
+            	/** @var Newbb\Topic $topicObject */
+            	$topicObject = $topicsObject[$id];
+            	$topicHandler->approve($topicObject);
+            	$topicHandler->synchronization($topicObject);
+            	$forums[$topicObject->getVar('forum_id')] = 1;
+        	}
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forumsObject   = $forumHandler->getAll($criteria_forum);
-        foreach (array_keys($forumsObject) as $id) {
-            $forumHandler->synchronization($forumsObject[$id]);
-        }
+        	$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        	$forumsObject   = $forumHandler->getAll($criteria_forum);
+        	foreach (array_keys($forumsObject) as $id) {
+            	$forumHandler->synchronization($forumsObject[$id]);
+        	}
 
-        if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
-            break;
-        }
+        	if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
+            	break;
+        	}
 
-        require_once __DIR__ . '/include/notification.inc.php';
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler = xoops_getHandler('notification');
-        foreach (array_keys($topicsObject) as $id) {
-            $topicObject         = $topicsObject[$id];
-            $tags                = [];
-            $tags['THREAD_NAME'] = $topicObject->getVar('topic_title');
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewtopic.php?topic_id=' . $id . '&forum=' . $topicObject->getVar('forum_id');
-            /** @var Newbb\Forum[] $forumsObject */
-            $tags['FORUM_NAME'] = $forumsObject[$topicObject->getVar('forum_id')]->getVar('forum_name');
-            $tags['FORUM_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewforum.php?forum=' . $topicObject->getVar('forum_id');
-            $notificationHandler->triggerEvent('global', 0, 'new_thread', $tags);
-            $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_thread', $tags);
-            $postObject       = $topicHandler->getTopPost($id);
-            $tags['POST_URL'] = $tags['THREAD_URL'] . '#forumpost' . $postObject->getVar('post_id');
-            $notificationHandler->triggerEvent('thread', $id, 'new_post', $tags);
-            $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
-            $tags['POST_CONTENT'] = $postObject->getVar('post_text');
-            $tags['POST_NAME']    = $postObject->getVar('subject');
-            $notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
-            $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_fullpost', $tags);
-            unset($postObject);
-        }
-        unset($topicsObject, $forumsObject);
-        break;
-    case 'delete':
-        $forums = [];
-        /** @var Newbb\TopicHandler|\XoopsPersistableObjectHandler $topicHandler */
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
-        foreach (array_keys($topicsObject) as $id) {
-            /** @var Newbb\Topic $topicObject */
-            $topicObject = $topicsObject[$id];
-            // irmtfan should be set to false to not delete topic from database
-            $topicHandler->delete($topicObject, false);
-            $topicHandler->synchronization($topicObject);
-            $forums[$topicObject->getVar('forum_id')] = 1;
-        }
+        	require_once __DIR__ . '/include/notification.inc.php';
+        	/** @var \XoopsNotificationHandler $notificationHandler */
+        	$notificationHandler = xoops_getHandler('notification');
+        	foreach (array_keys($topicsObject) as $id) {
+            	$topicObject         = $topicsObject[$id];
+            	$tags                = [];
+            	$tags['THREAD_NAME'] = $topicObject->getVar('topic_title');
+            	$tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewtopic.php?topic_id=' . $id . '&forum=' . $topicObject->getVar('forum_id');
+            	/** @var Newbb\Forum[] $forumsObject */
+            	$tags['FORUM_NAME'] = $forumsObject[$topicObject->getVar('forum_id')]->getVar('forum_name');
+            	$tags['FORUM_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewforum.php?forum=' . $topicObject->getVar('forum_id');
+            	$notificationHandler->triggerEvent('global', 0, 'new_thread', $tags);
+            	$notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_thread', $tags);
+            	$postObject       = $topicHandler->getTopPost($id);
+            	$tags['POST_URL'] = $tags['THREAD_URL'] . '#forumpost' . $postObject->getVar('post_id');
+            	$notificationHandler->triggerEvent('thread', $id, 'new_post', $tags);
+            	$notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_post', $tags);
+            	$notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
+            	$tags['POST_CONTENT'] = $postObject->getVar('post_text');
+            	$tags['POST_NAME']    = $postObject->getVar('subject');
+            	$notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
+            	$notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_fullpost', $tags);
+            	unset($postObject);
+        	}
+        	unset($topicsObject, $forumsObject);
+        	break;
+    	case 'delete':
+        	$forums = [];
+        	/** @var Newbb\TopicHandler|\XoopsPersistableObjectHandler $topicHandler */
+        	$topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        	foreach (array_keys($topicsObject) as $id) {
+            	/** @var Newbb\Topic $topicObject */
+            	$topicObject = $topicsObject[$id];
+            	// irmtfan should be set to false to not delete topic from database
+            	$topicHandler->delete($topicObject, false);
+            	$topicHandler->synchronization($topicObject);
+            	$forums[$topicObject->getVar('forum_id')] = 1;
+        	}
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forumsObject   = $forumHandler->getAll($criteria_forum);
-        foreach (array_keys($forumsObject) as $id) {
-            $forumHandler->synchronization($forumsObject[$id]);
-        }
-        unset($topicsObject, $forumsObject);
-        break;
-    case 'move':
-        if (Request::getInt('newforum', 0, 'POST')
-            && Request::getInt('newforum', 0, 'POST') !== $forum_id
-            && $forumHandler->getPermission(Request::getInt('newforum', 0, 'POST'), 'post')) {
-            $criteria = new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN');
-            //            /** @var Newbb\PostHandler $postHandler */
-            //            $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-            $postHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
-            $topicHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
-            $forumHandler->synchronization(Request::getInt('newforum', 0, 'POST'));
-            $forumHandler->synchronization($forum_id);
-        } else {
-            require_once $GLOBALS['xoops']->path('header.php');
-            //            /** @var Newbb\CategoryHandler $categoryHandler */
-            //            $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
-            $categories = $categoryHandler->getByPermission('access');
-            $forums     = $forumHandler->getForumsByCategory(array_keys($categories), 'post', false);
+        	$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        	$forumsObject   = $forumHandler->getAll($criteria_forum);
+        	foreach (array_keys($forumsObject) as $id) {
+            	$forumHandler->synchronization($forumsObject[$id]);
+        	}
+        	unset($topicsObject, $forumsObject);
+        	break;
+    	case 'move':
+        	if (Request::getInt('newforum', 0, 'POST')
+            	&& Request::getInt('newforum', 0, 'POST') !== $forum_id
+            	&& $forumHandler->getPermission(Request::getInt('newforum', 0, 'POST'), 'post')) {
+            	$criteria = new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN');
+            	//            /** @var Newbb\PostHandler $postHandler */
+            	//            $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+            	$postHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
+            	$topicHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
+            	$forumHandler->synchronization(Request::getInt('newforum', 0, 'POST'));
+            	$forumHandler->synchronization($forum_id);
+        	} else {
+            	require_once $GLOBALS['xoops']->path('header.php');
+            	//            /** @var Newbb\CategoryHandler $categoryHandler */
+            	//            $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
+            	$categories = $categoryHandler->getByPermission('access');
+            	$forums     = $forumHandler->getForumsByCategory(array_keys($categories), 'post', false);
 
-            $box = '<select name="newforum" size="1">';
-            if (count($categories) > 0 && count($forums) > 0) {
-                foreach (array_keys($forums) as $key) {
+            	$box = '<select name="newforum" size="1">';
+            	if (count($categories) > 0 && count($forums) > 0) {
+                	foreach (array_keys($forums) as $key) {
 
-                    /** @var Newbb\Category[] $categories */
-                    $box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
-                    foreach ($forums[$key] as $forumid => $_forum) {
-                        $box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
-                        if (!isset($_forum['sub'])) {
-                            continue;
-                        }
-                        foreach (array_keys($_forum['sub']) as $fid) {
-                            $box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
-                        }
-                    }
-                }
-            } else {
-                $box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
-            }
-            $box .= '</select>';
-            unset($forums, $categories);
+                    	/** @var Newbb\Category[] $categories */
+                    	$box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
+                    	foreach ($forums[$key] as $forumid => $_forum) {
+                        	$box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
+                        	if (!isset($_forum['sub'])) {
+                            	continue;
+                        	}
+                        	foreach (array_keys($_forum['sub']) as $fid) {
+                            	$box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
+                        	}
+                    	}
+                	}
+            	} else {
+                	$box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
+            	}
+            	$box .= '</select>';
+            	unset($forums, $categories);
 
-            echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
-            echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
-            echo "<tr><td class='bg2'>";
-            echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
-            echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
-            echo $box;
-            echo '</td></tr>';
-            echo '<tr class="bg3"><td colspan="2" align="center">';
-            echo "<input type='hidden' name='op' value='move' />";
-            echo "<input type='hidden' name='forum_id' value='{$forum_id}' />";
-            foreach ($topic_id as $id) {
-                echo "<input type='hidden' name='topic_id[]' value='" . $id . "' />";
-            }
-            echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
-            echo '</td></tr></table></td></tr></table>';
-            echo '</form>';
-            require_once $GLOBALS['xoops']->path('footer.php');
-            exit();
-        }
-        break;
+            	echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
+            	echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
+            	echo "<tr><td class='bg2'>";
+            	echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
+            	echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
+            	echo $box;
+            	echo '</td></tr>';
+            	echo '<tr class="bg3"><td colspan="2" align="center">';
+            	echo "<input type='hidden' name='op' value='move' />";
+            	echo "<input type='hidden' name='forum_id' value='{$forum_id}' />";
+            	foreach ($topic_id as $id) {
+                	echo "<input type='hidden' name='topic_id[]' value='" . $id . "' />";
+            	}
+            	echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
+            	echo '</td></tr></table></td></tr></table>';
+            	echo '</form>';
+            	require_once $GLOBALS['xoops']->path('footer.php');
+            	exit();
+        	}
+        	break;
 }
 ///** @var Newbb\StatsHandler $statsHandler */
 //$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');

Spacing +24 added lines, -24 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $forum_id = Request::getInt('forum_id', 0, 'POST');
 $topic_id = Request::getArray('topic_id', null, 'POST');
@@ -34,12 +34,12 @@ 
 $isAdmin = newbbIsAdmin($forum_id);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 switch ($op) {
     case 'restore':
         $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             /** @var Newbb\Topic $topicObject */
             $topicObject = $topicsObject[$id];
@@ -47,7 +47,7 @@ 
             $topicHandler->synchronization($topicObject);
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -56,7 +56,7 @@ 
         break;
     case 'approve':
         $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             /** @var Newbb\Topic $topicObject */
             $topicObject = $topicsObject[$id];
@@ -65,7 +65,7 @@ 
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -75,21 +75,21 @@ 
             break;
         }
 
-        require_once __DIR__ . '/include/notification.inc.php';
+        require_once __DIR__.'/include/notification.inc.php';
         /** @var \XoopsNotificationHandler $notificationHandler */
         $notificationHandler = xoops_getHandler('notification');
         foreach (array_keys($topicsObject) as $id) {
             $topicObject         = $topicsObject[$id];
             $tags                = [];
             $tags['THREAD_NAME'] = $topicObject->getVar('topic_title');
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewtopic.php?topic_id=' . $id . '&forum=' . $topicObject->getVar('forum_id');
+            $tags['THREAD_URL']  = XOOPS_URL.'/modules/'.$moduleDirName.'/viewtopic.php?topic_id='.$id.'&forum='.$topicObject->getVar('forum_id');
             /** @var Newbb\Forum[] $forumsObject */
             $tags['FORUM_NAME'] = $forumsObject[$topicObject->getVar('forum_id')]->getVar('forum_name');
-            $tags['FORUM_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewforum.php?forum=' . $topicObject->getVar('forum_id');
+            $tags['FORUM_URL']  = XOOPS_URL.'/modules/'.$moduleDirName.'/viewforum.php?forum='.$topicObject->getVar('forum_id');
             $notificationHandler->triggerEvent('global', 0, 'new_thread', $tags);
             $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_thread', $tags);
             $postObject       = $topicHandler->getTopPost($id);
-            $tags['POST_URL'] = $tags['THREAD_URL'] . '#forumpost' . $postObject->getVar('post_id');
+            $tags['POST_URL'] = $tags['THREAD_URL'].'#forumpost'.$postObject->getVar('post_id');
             $notificationHandler->triggerEvent('thread', $id, 'new_post', $tags);
             $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
@@ -104,7 +104,7 @@ 
     case 'delete':
         $forums = [];
         /** @var Newbb\TopicHandler|\XoopsPersistableObjectHandler $topicHandler */
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             /** @var Newbb\Topic $topicObject */
             $topicObject = $topicsObject[$id];
@@ -114,7 +114,7 @@ 
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -125,7 +125,7 @@ 
         if (Request::getInt('newforum', 0, 'POST')
             && Request::getInt('newforum', 0, 'POST') !== $forum_id
             && $forumHandler->getPermission(Request::getInt('newforum', 0, 'POST'), 'post')) {
-            $criteria = new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN');
+            $criteria = new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN');
             //            /** @var Newbb\PostHandler $postHandler */
             //            $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
             $postHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
@@ -144,37 +144,37 @@ 
                 foreach (array_keys($forums) as $key) {
 
                     /** @var Newbb\Category[] $categories */
-                    $box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
+                    $box .= "<option value='-1'>[".$categories[$key]->getVar('cat_title').']</option>';
                     foreach ($forums[$key] as $forumid => $_forum) {
-                        $box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
+                        $box .= "<option value='".$forumid."'>-- ".$_forum['title'].'</option>';
                         if (!isset($_forum['sub'])) {
                             continue;
                         }
                         foreach (array_keys($_forum['sub']) as $fid) {
-                            $box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
+                            $box .= "<option value='".$fid."'>---- ".$_forum['sub'][$fid]['title'].'</option>';
                         }
                     }
                 }
             } else {
-                $box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
+                $box .= "<option value='-1'>"._MD_NEWBB_NOFORUMINDB.'</option>';
             }
             $box .= '</select>';
             unset($forums, $categories);
 
-            echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
+            echo "<form action='".Request::getString('PHP_SELF', '', 'SERVER')."' method='post'>";
             echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
             echo "<tr><td class='bg2'>";
             echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
-            echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
+            echo '<tr><td class="bg3">'._MD_NEWBB_MOVETOPICTO.'</td><td class="bg1">';
             echo $box;
             echo '</td></tr>';
             echo '<tr class="bg3"><td colspan="2" align="center">';
             echo "<input type='hidden' name='op' value='move' />";
             echo "<input type='hidden' name='forum_id' value='{$forum_id}' />";
             foreach ($topic_id as $id) {
-                echo "<input type='hidden' name='topic_id[]' value='" . $id . "' />";
+                echo "<input type='hidden' name='topic_id[]' value='".$id."' />";
             }
-            echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
+            echo "<input type='submit' name='submit' value='"._SUBMIT."' />";
             echo '</td></tr></table></td></tr></table>';
             echo '</form>';
             require_once $GLOBALS['xoops']->path('footer.php');
@@ -186,10 +186,10 @@ 
 //$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
 $statsHandler->reset();
 if (empty($forum_id)) {
-    redirect_header(XOOPS_URL . '/modules/newbb/list.topic.php', 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL.'/modules/newbb/list.topic.php', 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

language/english/modinfo.php

Indentation +5 added lines, -5 removed lines

@@ -2,7 +2,7 @@ 
 //
 // Thanks Tom (http://www.wf-projects.com), for correcting the Engligh language package
 if (defined('NEWBB_MODINFO_DEFINED')) {
-    return;
+	return;
 }
 define('NEWBB_MODINO_DEFINED', true);
 // Module Info
@@ -42,8 +42,8 @@ 
 //define('_MI_NEWBB_THEMESET_DESC', "Module-wide, select '' . _NONE . '' will use site-wide theme");
 define('_MI_NEWBB_DIR_ATTACHMENT', 'Attachments physical path.');
 define(
-    '_MI_NEWBB_DIR_ATTACHMENT_DESC',
-       "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'"
+	'_MI_NEWBB_DIR_ATTACHMENT_DESC',
+	   "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'"
 );
 define('_MI_NEWBB_PATH_MAGICK', 'Path for ImageMagick');
 define('_MI_NEWBB_PATH_MAGICK_DESC', "Usually it is '/usr/bin/X11'. Leave it BLANK if you do not have ImageMagicK installed or for autodetecting.");
@@ -81,8 +81,8 @@ 
 define('_MI_NEWBB_GRAPHIC', 'graphic');
 define('_MI_NEWBB_USERLEVEL', 'HP/MP/EXP Level Mode');
 define(
-    '_MI_NEWBB_USERLEVEL_DESC',
-       '<strong>HP</strong>  is determined by your average posts per day.<br><strong>MP</strong>  is determined by your join date related to your post count.<br><strong>EXP</strong> goes up each time you post, and when you get to 100%, you gain a level and the EXP drops to 0 again.'
+	'_MI_NEWBB_USERLEVEL_DESC',
+	   '<strong>HP</strong>  is determined by your average posts per day.<br><strong>MP</strong>  is determined by your join date related to your post count.<br><strong>EXP</strong> goes up each time you post, and when you get to 100%, you gain a level and the EXP drops to 0 again.'
 );
 define('_MI_NEWBB_RSS_ENABLE', 'Enable RSS Feed');
 define('_MI_NEWBB_RSS_ENABLE_DESC', 'Enable RSS Feed, edit options below for maximum Items and Description length');

Spacing +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
 define('_MI_NEWBB_INSTALL_FORUM_DESC', 'Forum for test.');
 define('_MI_NEWBB_INSTALL_POST_SUBJECT', 'Congratulations! The forum is working.');
 define('_MI_NEWBB_INSTALL_POST_TEXT', '
-    Welcome to ' . htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES) . ' forum.
+    Welcome to ' . htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES).' forum.
     Feel free to register and login to start your topics.
 
     If you have any question concerning NewBB usage, please visit your local support site or [url=https://xoops.org/modules/newbb/]XOOPS Support Site[/url].
@@ -325,7 +325,7 @@ 
 //Help
 define('_MI_NEWBB_HELP', 'Help');
 define('_MI_NEWBB_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('_MI_NEWBB_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
+define('_MI_NEWBB_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
 define('_MI_NEWBB_BACK_2_ADMIN', 'Back to Administration of ');
 define('_MI_NEWBB_OVERVIEW', 'Overview');
 

xoops_version.php

Indentation +691 added lines, -691 removed lines

@@ -14,105 +14,105 @@ 
 $moduleDirName = basename(__DIR__);
 
 $modversion    = [
-    'version'             => 5.00,
-    'module_status'       => 'Beta 1',
-    'release_date'        => '2018/03/25',
-    'name'                => _MI_NEWBB_NAME,
-    'description'         => _MI_NEWBB_DESC,
-    'help'                => 'page=help',
-    'credits'             => 'NewBB 2 developed by Marko Schmuck (predator) / D.J. (phppp) / Alfred(dhcst)',
-    'author'              => 'Marko Schmuck (predator) / D.J. (phppp) / Alfred(dhcst) / (irmtfan) / (Geekwright) / (Mamba) / (Aerograf)',
-    'license'             => 'GNU GPL 2.0',
-    'license_url'         => 'www.gnu.org/licenses/gpl-2.0.html/',
-    'image'               => 'assets/images/logoModule.png',
-    'dirname'             => basename(__DIR__),
-    'author_realname'     => 'NewBB Dev Team',
-    'author_email'        => '',
-    'module_website_url'  => 'www.xoops.org/',
-    'module_website_name' => 'XOOPS',
-    'min_php'             => '5.5',
-    'min_xoops'           => '2.5.9',
-    'min_admin'           => '1.2',
-    'min_db'              => ['mysql' => '5.5'],
-    'modicons16'          => 'assets/images/icons/16',
-    'modicons32'          => 'assets/images/icons/32',
-    'demo_site_url'       => 'https://xoops.org/newbb/',
-    'demo_site_name'      => 'XOOPS Project',
-    'support_site_url'    => 'https://xoops.org/newbb/',
-    'support_site_name'   => 'XOOPS Project',
-    'submit_feature'      => 'https://xoops.org/modules/newbb/viewforum.php?forum=30',
-    'submit_bug'          => 'https://xoops.org/modules/newbb/viewforum.php?forum=28',
-    // ------------------- Mysql -----------------------------
-    'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
-    // ------------------- Tables ----------------------------
-    'tables'              => [
-        $moduleDirName . '_' . 'archive',
-        $moduleDirName . '_' . 'categories',
-        $moduleDirName . '_' . 'votedata',
-        $moduleDirName . '_' . 'forums',
-        $moduleDirName . '_' . 'posts',
-        $moduleDirName . '_' . 'posts_text',
-        $moduleDirName . '_' . 'topics',
-        $moduleDirName . '_' . 'online',
-        $moduleDirName . '_' . 'digest',
-        $moduleDirName . '_' . 'report',
-        $moduleDirName . '_' . 'attachments',
-        $moduleDirName . '_' . 'moderates',
-        $moduleDirName . '_' . 'reads_forum',
-        $moduleDirName . '_' . 'reads_topic',
-        $moduleDirName . '_' . 'type',
-        $moduleDirName . '_' . 'type_forum',
-        $moduleDirName . '_' . 'stats',
-        $moduleDirName . '_' . 'user_stats'
-    ],
-    // ------------------- Admin Menu -------------------
-    'system_menu'         => 1,
-    'hasAdmin'            => 1,
-    'adminindex'          => 'admin/index.php',
-    'adminmenu'           => 'admin/menu.php',
-    // ------------------- Main Menu -------------------
-    'hasMain'             => 1,
-    // ------------------- Search ---------------------------
-    'hasSearch'           => 1,
-    'search'              => [
-        'file' => 'include/search.inc.php',
-        'func' => 'newbb_search',
-    ],
-    // ------------------- Install/Update -------------------
-    'onInstall'           => 'include/module.php',
-    'onUpdate'            => 'include/module.php',
-    //  'onUninstall'         => 'include/onuninstall.php',
+	'version'             => 5.00,
+	'module_status'       => 'Beta 1',
+	'release_date'        => '2018/03/25',
+	'name'                => _MI_NEWBB_NAME,
+	'description'         => _MI_NEWBB_DESC,
+	'help'                => 'page=help',
+	'credits'             => 'NewBB 2 developed by Marko Schmuck (predator) / D.J. (phppp) / Alfred(dhcst)',
+	'author'              => 'Marko Schmuck (predator) / D.J. (phppp) / Alfred(dhcst) / (irmtfan) / (Geekwright) / (Mamba) / (Aerograf)',
+	'license'             => 'GNU GPL 2.0',
+	'license_url'         => 'www.gnu.org/licenses/gpl-2.0.html/',
+	'image'               => 'assets/images/logoModule.png',
+	'dirname'             => basename(__DIR__),
+	'author_realname'     => 'NewBB Dev Team',
+	'author_email'        => '',
+	'module_website_url'  => 'www.xoops.org/',
+	'module_website_name' => 'XOOPS',
+	'min_php'             => '5.5',
+	'min_xoops'           => '2.5.9',
+	'min_admin'           => '1.2',
+	'min_db'              => ['mysql' => '5.5'],
+	'modicons16'          => 'assets/images/icons/16',
+	'modicons32'          => 'assets/images/icons/32',
+	'demo_site_url'       => 'https://xoops.org/newbb/',
+	'demo_site_name'      => 'XOOPS Project',
+	'support_site_url'    => 'https://xoops.org/newbb/',
+	'support_site_name'   => 'XOOPS Project',
+	'submit_feature'      => 'https://xoops.org/modules/newbb/viewforum.php?forum=30',
+	'submit_bug'          => 'https://xoops.org/modules/newbb/viewforum.php?forum=28',
+	// ------------------- Mysql -----------------------------
+	'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
+	// ------------------- Tables ----------------------------
+	'tables'              => [
+		$moduleDirName . '_' . 'archive',
+		$moduleDirName . '_' . 'categories',
+		$moduleDirName . '_' . 'votedata',
+		$moduleDirName . '_' . 'forums',
+		$moduleDirName . '_' . 'posts',
+		$moduleDirName . '_' . 'posts_text',
+		$moduleDirName . '_' . 'topics',
+		$moduleDirName . '_' . 'online',
+		$moduleDirName . '_' . 'digest',
+		$moduleDirName . '_' . 'report',
+		$moduleDirName . '_' . 'attachments',
+		$moduleDirName . '_' . 'moderates',
+		$moduleDirName . '_' . 'reads_forum',
+		$moduleDirName . '_' . 'reads_topic',
+		$moduleDirName . '_' . 'type',
+		$moduleDirName . '_' . 'type_forum',
+		$moduleDirName . '_' . 'stats',
+		$moduleDirName . '_' . 'user_stats'
+	],
+	// ------------------- Admin Menu -------------------
+	'system_menu'         => 1,
+	'hasAdmin'            => 1,
+	'adminindex'          => 'admin/index.php',
+	'adminmenu'           => 'admin/menu.php',
+	// ------------------- Main Menu -------------------
+	'hasMain'             => 1,
+	// ------------------- Search ---------------------------
+	'hasSearch'           => 1,
+	'search'              => [
+		'file' => 'include/search.inc.php',
+		'func' => 'newbb_search',
+	],
+	// ------------------- Install/Update -------------------
+	'onInstall'           => 'include/module.php',
+	'onUpdate'            => 'include/module.php',
+	//  'onUninstall'         => 'include/onuninstall.php',
 ];
 // ------------------- Help files ------------------- //
 $modversion['helpsection'] = [
-    ['name' => _MI_NEWBB_OVERVIEW, 'link' => 'page=help'],
-    ['name' => _MI_NEWBB_HELP_DISCLAIMER, 'link' => 'page=disclaimer'],
-    ['name' => _MI_NEWBB_LICENSE, 'link' => 'page=license'],
-    ['name' => _MI_NEWBB_SUPPORT, 'link' => 'page=support'],
-    //    array('name' => _MI_NEWBB_HOWTO, 'link' => 'page=__howto'),
-    //    array('name' => _MI_NEWBB_REQUIREMENTS, 'link' => 'page=__requirements'),
-    //    array('name' => _MI_NEWBB_CREDITS, 'link' => 'page=__credits'),
+	['name' => _MI_NEWBB_OVERVIEW, 'link' => 'page=help'],
+	['name' => _MI_NEWBB_HELP_DISCLAIMER, 'link' => 'page=disclaimer'],
+	['name' => _MI_NEWBB_LICENSE, 'link' => 'page=license'],
+	['name' => _MI_NEWBB_SUPPORT, 'link' => 'page=support'],
+	//    array('name' => _MI_NEWBB_HOWTO, 'link' => 'page=__howto'),
+	//    array('name' => _MI_NEWBB_REQUIREMENTS, 'link' => 'page=__requirements'),
+	//    array('name' => _MI_NEWBB_CREDITS, 'link' => 'page=__credits'),
 ];
 // Templates
 $modversion['templates'] = [
-    ['file' => 'newbb_index_menu.tpl', 'description' => ''],
-    ['file' => 'newbb_index.tpl', 'description' => ''],
-    ['file' => 'newbb_viewforum_subforum.tpl', 'description' => ''],
-    ['file' => 'newbb_viewforum_menu.tpl', 'description' => ''],
-    ['file' => 'newbb_viewforum.tpl', 'description' => ''],
-    ['file' => 'newbb_viewtopic.tpl', 'description' => ''],
-    ['file' => 'newbb_thread.tpl', 'description' => ''],
-    ['file' => 'newbb_edit_post.tpl', 'description' => ''],
-    ['file' => 'newbb_poll_results.tpl', 'description' => ''],
-    ['file' => 'newbb_poll_view.tpl', 'description' => ''],
-    ['file' => 'newbb_searchresults.tpl', 'description' => ''],
-    ['file' => 'newbb_search.tpl', 'description' => ''],
-    ['file' => 'newbb_viewall.tpl', 'description' => ''],
-    ['file' => 'newbb_viewpost.tpl', 'description' => ''],
-    ['file' => 'newbb_online.tpl', 'description' => ''],
-    ['file' => 'newbb_rss.tpl', 'description' => ''],
-    ['file' => 'newbb_notification_select.tpl', 'description' => ''],
-    ['file' => 'newbb_moderate.tpl', 'description' => ''],
+	['file' => 'newbb_index_menu.tpl', 'description' => ''],
+	['file' => 'newbb_index.tpl', 'description' => ''],
+	['file' => 'newbb_viewforum_subforum.tpl', 'description' => ''],
+	['file' => 'newbb_viewforum_menu.tpl', 'description' => ''],
+	['file' => 'newbb_viewforum.tpl', 'description' => ''],
+	['file' => 'newbb_viewtopic.tpl', 'description' => ''],
+	['file' => 'newbb_thread.tpl', 'description' => ''],
+	['file' => 'newbb_edit_post.tpl', 'description' => ''],
+	['file' => 'newbb_poll_results.tpl', 'description' => ''],
+	['file' => 'newbb_poll_view.tpl', 'description' => ''],
+	['file' => 'newbb_searchresults.tpl', 'description' => ''],
+	['file' => 'newbb_search.tpl', 'description' => ''],
+	['file' => 'newbb_viewall.tpl', 'description' => ''],
+	['file' => 'newbb_viewpost.tpl', 'description' => ''],
+	['file' => 'newbb_online.tpl', 'description' => ''],
+	['file' => 'newbb_rss.tpl', 'description' => ''],
+	['file' => 'newbb_notification_select.tpl', 'description' => ''],
+	['file' => 'newbb_moderate.tpl', 'description' => ''],
 ];
 // Blocks
 // options[0] - Citeria valid: time(by default)
@@ -122,14 +122,14 @@ 
 // options[4] - Display Navigator: 1 (by default), 0 (No)
 // options[5] - SelectedForumIDs: null for all
 $modversion['blocks'][1] = [
-    'file'        => 'newbb_block.php',
-    'name'        => _MI_NEWBB_BLOCK_TOPIC_POST,
-    'description' => 'It Will drop (use advance topic renderer block)',
-    // irmtfan
-    'show_func'   => 'b_newbb_show',
-    'options'     => 'time|5|360|0|1|0',
-    'edit_func'   => 'b_newbb_edit',
-    'template'    => 'newbb_block.tpl'
+	'file'        => 'newbb_block.php',
+	'name'        => _MI_NEWBB_BLOCK_TOPIC_POST,
+	'description' => 'It Will drop (use advance topic renderer block)',
+	// irmtfan
+	'show_func'   => 'b_newbb_show',
+	'options'     => 'time|5|360|0|1|0',
+	'edit_func'   => 'b_newbb_edit',
+	'template'    => 'newbb_block.tpl'
 ];
 // options[0] - Citeria valid: time(by default), views, replies, digest, sticky
 // options[1] - NumberToDisplay: any positive integer
@@ -139,14 +139,14 @@ 
 // options[5] - Title Length : 0 - no limit
 // options[6] - SelectedForumIDs: null for all
 $modversion['blocks'][] = [
-    'file'        => 'newbb_block.php',
-    'name'        => _MI_NEWBB_BLOCK_TOPIC,
-    'description' => 'It Will drop (use advance topic renderer block)',
-    // irmtfan
-    'show_func'   => 'b_newbb_topic_show',
-    'options'     => 'time|5|0|0|1|0|0',
-    'edit_func'   => 'b_newbb_topic_edit',
-    'template'    => 'newbb_block_topic.tpl'
+	'file'        => 'newbb_block.php',
+	'name'        => _MI_NEWBB_BLOCK_TOPIC,
+	'description' => 'It Will drop (use advance topic renderer block)',
+	// irmtfan
+	'show_func'   => 'b_newbb_topic_show',
+	'options'     => 'time|5|0|0|1|0|0',
+	'edit_func'   => 'b_newbb_topic_edit',
+	'template'    => 'newbb_block_topic.tpl'
 ];
 // options[0] - Citeria valid: title(by default), text
 // options[1] - NumberToDisplay: any positive integer
@@ -156,13 +156,13 @@ 
 // options[5] - Title/Text Length : 0 - no limit
 // options[6] - SelectedForumIDs: null for all
 $modversion['blocks'][] = [
-    'file'        => 'newbb_block.php',
-    'name'        => _MI_NEWBB_BLOCK_POST,
-    'description' => 'Shows recent posts in the forums',
-    'show_func'   => 'b_newbb_post_show',
-    'options'     => 'title|10|0|0|1|0|0',
-    'edit_func'   => 'b_newbb_post_edit',
-    'template'    => 'newbb_block_post.tpl'
+	'file'        => 'newbb_block.php',
+	'name'        => _MI_NEWBB_BLOCK_POST,
+	'description' => 'Shows recent posts in the forums',
+	'show_func'   => 'b_newbb_post_show',
+	'options'     => 'title|10|0|0|1|0|0',
+	'edit_func'   => 'b_newbb_post_edit',
+	'template'    => 'newbb_block_post.tpl'
 ];
 // options[0] - Citeria valid: post(by default), topic, digest, sticky
 // options[1] - NumberToDisplay: any positive integer
@@ -171,13 +171,13 @@ 
 // options[4] - Display Navigator: 1 (by default), 0 (No)
 // options[5] - SelectedForumIDs: null for all
 $modversion['blocks'][] = [
-    'file'        => 'newbb_block.php',
-    'name'        => _MI_NEWBB_BLOCK_AUTHOR,
-    'description' => 'Shows authors stats',
-    'show_func'   => 'b_newbb_author_show',
-    'options'     => 'topic|5|0|0|1|0',
-    'edit_func'   => 'b_newbb_author_edit',
-    'template'    => 'newbb_block_author.tpl'
+	'file'        => 'newbb_block.php',
+	'name'        => _MI_NEWBB_BLOCK_AUTHOR,
+	'description' => 'Shows authors stats',
+	'show_func'   => 'b_newbb_author_show',
+	'options'     => 'topic|5|0|0|1|0',
+	'edit_func'   => 'b_newbb_author_edit',
+	'template'    => 'newbb_block_author.tpl'
 ];
 /*
  * $options:
@@ -187,13 +187,13 @@ 
  *                    $options[3] - min font size (px or %)
  */
 $modversion['blocks'][] = [
-    'file'        => 'newbb_block_tag.php',
-    'name'        => _MI_NEWBB_BLOCK_TAG_CLOUD,
-    'description' => 'Show tag cloud',
-    'show_func'   => 'newbb_tag_block_cloud_show',
-    'edit_func'   => 'newbb_tag_block_cloud_edit',
-    'options'     => '100|0|150|80',
-    'template'    => 'newbb_tag_block_cloud.tpl'
+	'file'        => 'newbb_block_tag.php',
+	'name'        => _MI_NEWBB_BLOCK_TAG_CLOUD,
+	'description' => 'Show tag cloud',
+	'show_func'   => 'newbb_tag_block_cloud_show',
+	'edit_func'   => 'newbb_tag_block_cloud_edit',
+	'options'     => '100|0|150|80',
+	'template'    => 'newbb_tag_block_cloud.tpl'
 ];
 /*
  * $options:
@@ -202,13 +202,13 @@ 
  *                    $options[2] - sort: a - alphabet; c - count; t - time
  */
 $modversion['blocks'][] = [
-    'file'        => 'newbb_block_tag.php',
-    'name'        => _MI_NEWBB_BLOCK_TAG_TOP,
-    'description' => 'Show top tags',
-    'show_func'   => 'newbb_tag_block_top_show',
-    'edit_func'   => 'newbb_tag_block_top_edit',
-    'options'     => '50|0|c',
-    'template'    => 'newbb_tag_block_top.tpl'
+	'file'        => 'newbb_block_tag.php',
+	'name'        => _MI_NEWBB_BLOCK_TAG_TOP,
+	'description' => 'Show top tags',
+	'show_func'   => 'newbb_tag_block_top_show',
+	'edit_func'   => 'newbb_tag_block_top_edit',
+	'options'     => '50|0|c',
+	'template'    => 'newbb_tag_block_top.tpl'
 ];
 // options[0] - Status in WHERE claus: all(by default), sticky, digest,lock, poll, voted, viewed, replied, read, (UN_) , active, pending, deleted (admin) (It is  multi-select)
 // options[1] - Uid in WHERE claus: uid of the topic poster : -1 - all users (by default)
@@ -224,498 +224,498 @@ 
 // options[11] - Post text Length: 0 - dont show post text - 200 by default
 // options[12] - SelectedForumIDs: multi-select ngative values for categories and positive values for forums: null for all(by default)
 $modversion['blocks'][] = [
-    'file'        => 'list_topic.php',
-    'name'        => _MI_NEWBB_BLOCK_LIST_TOPIC,
-    'description' => 'Shows a list of topics (advance renderer)',
-    'show_func'   => 'newbb_list_topic_show',
-    'options'     => 'all|-1|-1|0|lastpost|0|5|360|topic,forum,replies,lastpost,lastposttime,lastposter,lastpostmsgicon,publish|1|0|200|0',
-    'edit_func'   => 'newbb_list_topic_edit',
-    'template'    => 'newbb_block_list_topic.tpl'
+	'file'        => 'list_topic.php',
+	'name'        => _MI_NEWBB_BLOCK_LIST_TOPIC,
+	'description' => 'Shows a list of topics (advance renderer)',
+	'show_func'   => 'newbb_list_topic_show',
+	'options'     => 'all|-1|-1|0|lastpost|0|5|360|topic,forum,replies,lastpost,lastposttime,lastposter,lastpostmsgicon,publish|1|0|200|0',
+	'edit_func'   => 'newbb_list_topic_edit',
+	'template'    => 'newbb_block_list_topic.tpl'
 ];
 // Smarty
 $modversion['use_smarty'] = 1;
 // Configs
 $modversion['config']   = [];
 $modversion['config'][] = [
-    'name'        => 'do_rewrite',
-    'title'       => '_MI_NEWBB_DO_REWRITE',
-    'description' => '_MI_NEWBB_DO_REWRITE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'subforum_display',
-    'title'       => '_MI_NEWBB_SUBFORUM_DISPLAY',
-    'description' => '_MI_NEWBB_SUBFORUM_DISPLAY_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'text',
-    'options'     => [
-        _MI_NEWBB_SUBFORUM_EXPAND   => 'expand',
-        _MI_NEWBB_SUBFORUM_COLLAPSE => 'collapse',
-        _MI_NEWBB_SUBFORUM_HIDDEN   => 'hidden'
-    ],
-    'default'     => 'collapse'
-];
-$modversion['config'][] = [
-    'name'        => 'post_excerpt',
-    'title'       => '_MI_NEWBB_POST_EXCERPT',
-    'description' => '_MI_NEWBB_POST_EXCERPT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 100
-];
-$modversion['config'][] = [
-    'name'        => 'topics_per_page',
-    'title'       => '_MI_NEWBB_TOPICSPERPAGE',
-    'description' => '_MI_NEWBB_TOPICSPERPAGE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 20
-];
-$modversion['config'][] = [
-    'name'        => 'posts_per_page',
-    'title'       => '_MI_NEWBB_POSTSPERPAGE',
-    'description' => '_MI_NEWBB_POSTSPERPAGE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 10
-];
-$modversion['config'][] = [
-    'name'        => 'pagenav_display',
-    'title'       => '_MI_NEWBB_PAGENAV_DISPLAY',
-    'description' => '_MI_NEWBB_PAGENAV_DISPLAY_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'text',
-    'options'     => [
-        _MI_NEWBB_PAGENAV_NUMBER => 'number',
-        _MI_NEWBB_PAGENAV_IMAGE  => 'image',
-        _MI_NEWBB_PAGENAV_SELECT => 'select'
-    ],
-    'default'     => 'number'
-];
-$modversion['config'][] = [
-    'name'        => 'cache_enabled',
-    'title'       => '_MI_NEWBB_CACHE_ENABLE',
-    'description' => '_MI_NEWBB_CACHE_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'statistik_enabled',
-    'title'       => '_MI_NEWBB_STATISTIK_ENABLE',
-    'description' => '_MI_NEWBB_STATISTIK_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'dir_attachments',
-    'title'       => '_MI_NEWBB_DIR_ATTACHMENT',
-    'description' => '_MI_NEWBB_DIR_ATTACHMENT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => 'uploads/newbb'
-];
-$modversion['config'][] = [
-    'name'        => 'media_allowed',
-    'title'       => '_MI_NEWBB_MEDIA_ENABLE',
-    'description' => '_MI_NEWBB_MEDIA_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'path_magick',
-    'title'       => '_MI_NEWBB_PATH_MAGICK',
-    'description' => '_MI_NEWBB_PATH_MAGICK_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => '/usr/bin/X11'
-];
-$modversion['config'][] = [
-    'name'        => 'path_netpbm',
-    'title'       => '_MI_NEWBB_PATH_NETPBM',
-    'description' => '_MI_NEWBB_PATH_NETPBM_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => '/usr/bin'
-];
-$modversion['config'][] = [
-    'name'        => 'image_lib',
-    'title'       => '_MI_NEWBB_IMAGELIB',
-    'description' => '_MI_NEWBB_IMAGELIB_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'int',
-    'default'     => 0,
-    'options'     => [
-        _MI_NEWBB_AUTO   => 0,
-        _MI_NEWBB_MAGICK => 1,
-        _MI_NEWBB_NETPBM => 2,
-        _MI_NEWBB_GD1    => 3,
-        _MI_NEWBB_GD2    => 4
-    ]
-];
-$modversion['config'][] = [
-    'name'        => 'show_userattach',
-    'title'       => '_MI_NEWBB_USERATTACH_ENABLE',
-    'description' => '_MI_NEWBB_USERATTACH_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'max_img_width',
-    'title'       => '_MI_NEWBB_MAX_IMG_WIDTH',
-    'description' => '_MI_NEWBB_MAX_IMG_WIDTH_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 800
-];
-$modversion['config'][] = [
-    'name'        => 'max_img_height',
-    'title'       => '_MI_NEWBB_MAX_IMG_HEIGHT',
-    'description' => '_MI_NEWBB_MAX_IMG_HEIGHT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 640
-];
-$modversion['config'][] = [
-    'name'        => 'max_image_width',
-    'title'       => '_MI_NEWBB_MAX_IMAGE_WIDTH',
-    'description' => '_MI_NEWBB_MAX_IMAGE_WIDTH_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 150
-];
-$modversion['config'][] = [
-    'name'        => 'max_image_height',
-    'title'       => '_MI_NEWBB_MAX_IMAGE_HEIGHT',
-    'description' => '_MI_NEWBB_MAX_IMAGE_HEIGHT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 150
-];
-$modversion['config'][] = [
-    'name'        => 'wol_enabled',
-    'title'       => '_MI_NEWBB_WOL_ENABLE',
-    'description' => '_MI_NEWBB_WOL_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'user_level',
-    'title'       => '_MI_NEWBB_USERLEVEL',
-    'description' => '_MI_NEWBB_USERLEVEL_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'int',
-    'default'     => 2,
-    'options'     => [
-        _MI_NEWBB_NULL    => 0,
-        _MI_NEWBB_TEXT    => 1,
-        _MI_NEWBB_GRAPHIC => 2
-    ]
-];
-$modversion['config'][] = [
-    'name'        => 'show_realname',
-    'title'       => '_MI_NEWBB_SHOW_REALNAME',
-    'description' => '_MI_NEWBB_SHOW_REALNAME_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'groupbar_enabled',
-    'title'       => '_MI_NEWBB_GROUPBAR_ENABLE',
-    'description' => '_MI_NEWBB_GROUPBAR_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'rating_enabled',
-    'title'       => '_MI_NEWBB_RATING_ENABLE',
-    'description' => '_MI_NEWBB_RATING_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'reportmod_enabled',
-    'title'       => '_MI_NEWBB_REPORTMOD_ENABLE',
-    'description' => '_MI_NEWBB_REPORTMOD_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'quickreply_enabled',
-    'title'       => '_MI_NEWBB_QUICKREPLY_ENABLE',
-    'description' => '_MI_NEWBB_QUICKREPLY_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'rss_enable',
-    'title'       => '_MI_NEWBB_RSS_ENABLE',
-    'description' => '_MI_NEWBB_RSS_ENABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'rss_maxitems',
-    'title'       => '_MI_NEWBB_RSS_MAX_ITEMS',
-    'description' => '',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 10
-];
-$modversion['config'][] = [
-    'name'        => 'rss_maxdescription',
-    'title'       => '_MI_NEWBB_RSS_MAX_DESCRIPTION',
-    'description' => '',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'rss_cachetime',
-    'title'       => '_MI_NEWBB_RSS_CACHETIME',
-    'description' => '_MI_NEWBB_RSS_CACHETIME_DESCRIPTION',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 30
+	'name'        => 'do_rewrite',
+	'title'       => '_MI_NEWBB_DO_REWRITE',
+	'description' => '_MI_NEWBB_DO_REWRITE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'subforum_display',
+	'title'       => '_MI_NEWBB_SUBFORUM_DISPLAY',
+	'description' => '_MI_NEWBB_SUBFORUM_DISPLAY_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'text',
+	'options'     => [
+		_MI_NEWBB_SUBFORUM_EXPAND   => 'expand',
+		_MI_NEWBB_SUBFORUM_COLLAPSE => 'collapse',
+		_MI_NEWBB_SUBFORUM_HIDDEN   => 'hidden'
+	],
+	'default'     => 'collapse'
+];
+$modversion['config'][] = [
+	'name'        => 'post_excerpt',
+	'title'       => '_MI_NEWBB_POST_EXCERPT',
+	'description' => '_MI_NEWBB_POST_EXCERPT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 100
+];
+$modversion['config'][] = [
+	'name'        => 'topics_per_page',
+	'title'       => '_MI_NEWBB_TOPICSPERPAGE',
+	'description' => '_MI_NEWBB_TOPICSPERPAGE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 20
+];
+$modversion['config'][] = [
+	'name'        => 'posts_per_page',
+	'title'       => '_MI_NEWBB_POSTSPERPAGE',
+	'description' => '_MI_NEWBB_POSTSPERPAGE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 10
+];
+$modversion['config'][] = [
+	'name'        => 'pagenav_display',
+	'title'       => '_MI_NEWBB_PAGENAV_DISPLAY',
+	'description' => '_MI_NEWBB_PAGENAV_DISPLAY_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'text',
+	'options'     => [
+		_MI_NEWBB_PAGENAV_NUMBER => 'number',
+		_MI_NEWBB_PAGENAV_IMAGE  => 'image',
+		_MI_NEWBB_PAGENAV_SELECT => 'select'
+	],
+	'default'     => 'number'
+];
+$modversion['config'][] = [
+	'name'        => 'cache_enabled',
+	'title'       => '_MI_NEWBB_CACHE_ENABLE',
+	'description' => '_MI_NEWBB_CACHE_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'statistik_enabled',
+	'title'       => '_MI_NEWBB_STATISTIK_ENABLE',
+	'description' => '_MI_NEWBB_STATISTIK_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'dir_attachments',
+	'title'       => '_MI_NEWBB_DIR_ATTACHMENT',
+	'description' => '_MI_NEWBB_DIR_ATTACHMENT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => 'uploads/newbb'
+];
+$modversion['config'][] = [
+	'name'        => 'media_allowed',
+	'title'       => '_MI_NEWBB_MEDIA_ENABLE',
+	'description' => '_MI_NEWBB_MEDIA_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'path_magick',
+	'title'       => '_MI_NEWBB_PATH_MAGICK',
+	'description' => '_MI_NEWBB_PATH_MAGICK_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => '/usr/bin/X11'
+];
+$modversion['config'][] = [
+	'name'        => 'path_netpbm',
+	'title'       => '_MI_NEWBB_PATH_NETPBM',
+	'description' => '_MI_NEWBB_PATH_NETPBM_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => '/usr/bin'
+];
+$modversion['config'][] = [
+	'name'        => 'image_lib',
+	'title'       => '_MI_NEWBB_IMAGELIB',
+	'description' => '_MI_NEWBB_IMAGELIB_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'int',
+	'default'     => 0,
+	'options'     => [
+		_MI_NEWBB_AUTO   => 0,
+		_MI_NEWBB_MAGICK => 1,
+		_MI_NEWBB_NETPBM => 2,
+		_MI_NEWBB_GD1    => 3,
+		_MI_NEWBB_GD2    => 4
+	]
+];
+$modversion['config'][] = [
+	'name'        => 'show_userattach',
+	'title'       => '_MI_NEWBB_USERATTACH_ENABLE',
+	'description' => '_MI_NEWBB_USERATTACH_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'max_img_width',
+	'title'       => '_MI_NEWBB_MAX_IMG_WIDTH',
+	'description' => '_MI_NEWBB_MAX_IMG_WIDTH_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 800
+];
+$modversion['config'][] = [
+	'name'        => 'max_img_height',
+	'title'       => '_MI_NEWBB_MAX_IMG_HEIGHT',
+	'description' => '_MI_NEWBB_MAX_IMG_HEIGHT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 640
+];
+$modversion['config'][] = [
+	'name'        => 'max_image_width',
+	'title'       => '_MI_NEWBB_MAX_IMAGE_WIDTH',
+	'description' => '_MI_NEWBB_MAX_IMAGE_WIDTH_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 150
+];
+$modversion['config'][] = [
+	'name'        => 'max_image_height',
+	'title'       => '_MI_NEWBB_MAX_IMAGE_HEIGHT',
+	'description' => '_MI_NEWBB_MAX_IMAGE_HEIGHT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 150
+];
+$modversion['config'][] = [
+	'name'        => 'wol_enabled',
+	'title'       => '_MI_NEWBB_WOL_ENABLE',
+	'description' => '_MI_NEWBB_WOL_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'user_level',
+	'title'       => '_MI_NEWBB_USERLEVEL',
+	'description' => '_MI_NEWBB_USERLEVEL_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'int',
+	'default'     => 2,
+	'options'     => [
+		_MI_NEWBB_NULL    => 0,
+		_MI_NEWBB_TEXT    => 1,
+		_MI_NEWBB_GRAPHIC => 2
+	]
+];
+$modversion['config'][] = [
+	'name'        => 'show_realname',
+	'title'       => '_MI_NEWBB_SHOW_REALNAME',
+	'description' => '_MI_NEWBB_SHOW_REALNAME_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'groupbar_enabled',
+	'title'       => '_MI_NEWBB_GROUPBAR_ENABLE',
+	'description' => '_MI_NEWBB_GROUPBAR_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'rating_enabled',
+	'title'       => '_MI_NEWBB_RATING_ENABLE',
+	'description' => '_MI_NEWBB_RATING_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'reportmod_enabled',
+	'title'       => '_MI_NEWBB_REPORTMOD_ENABLE',
+	'description' => '_MI_NEWBB_REPORTMOD_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'quickreply_enabled',
+	'title'       => '_MI_NEWBB_QUICKREPLY_ENABLE',
+	'description' => '_MI_NEWBB_QUICKREPLY_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'rss_enable',
+	'title'       => '_MI_NEWBB_RSS_ENABLE',
+	'description' => '_MI_NEWBB_RSS_ENABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'rss_maxitems',
+	'title'       => '_MI_NEWBB_RSS_MAX_ITEMS',
+	'description' => '',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 10
+];
+$modversion['config'][] = [
+	'name'        => 'rss_maxdescription',
+	'title'       => '_MI_NEWBB_RSS_MAX_DESCRIPTION',
+	'description' => '',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'rss_cachetime',
+	'title'       => '_MI_NEWBB_RSS_CACHETIME',
+	'description' => '_MI_NEWBB_RSS_CACHETIME_DESCRIPTION',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 30
 ];
 // 4.05
 $modversion['config'][] = [
-    'name'        => 'show_infobox',
-    'title'       => '_MI_NEWBB_SHOW_INFOBOX',
-    'description' => '_MI_NEWBB_SHOW_INFOBOX_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'int',
-    'default'     => 1,
-    'options'     => [
-        _MI_NEWBB_INFOBOX_NONE   => 0,
-        _MI_NEWBB_INFOBOX_HIDDEN => 1,
-        _MI_NEWBB_INFOBOX_SHOW   => 2
-    ]
-];
-$modversion['config'][] = [
-    'name'        => 'show_sociallinks',
-    'title'       => '_MI_NEWBB_SHOW_SOCIALLINKS',
-    'description' => '_MI_NEWBB_SHOW_SOCIALLINKS_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'show_advertising',
-    'title'       => '_MI_NEWBB_ADVERTISING',
-    'description' => '_MI_NEWBB_ADVERTISING_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'show_jump',
-    'title'       => '_MI_NEWBB_SHOW_JUMPBOX',
-    'description' => '_MI_NEWBB_SHOW_JUMPBOX_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'show_permissiontable',
-    'title'       => '_MI_NEWBB_SHOW_PERMISSIONTABLE',
-    'description' => '_MI_NEWBB_SHOW_PERMISSIONTABLE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'email_digest',
-    'title'       => '_MI_NEWBB_EMAIL_DIGEST',
-    'description' => '_MI_NEWBB_EMAIL_DIGEST_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'int',
-    'default'     => 0,
-    'options'     => [
-        _MI_NEWBB_EMAIL_NONE   => 0,
-        _MI_NEWBB_EMAIL_DAILY  => 1,
-        _MI_NEWBB_EMAIL_WEEKLY => 2
-    ]
-];
-$modversion['config'][] = [
-    'name'        => 'show_ip',
-    'title'       => '_MI_NEWBB_SHOW_IP',
-    'description' => '_MI_NEWBB_SHOW_IP_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'enable_karma',
-    'title'       => '_MI_NEWBB_ENABLE_KARMA',
-    'description' => '_MI_NEWBB_ENABLE_KARMA_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'karma_options',
-    'title'       => '_MI_NEWBB_KARMA_OPTIONS',
-    'description' => '_MI_NEWBB_KARMA_OPTIONS_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => '0, 10, 50, 100, 500, 1000, 5000, 10000'
+	'name'        => 'show_infobox',
+	'title'       => '_MI_NEWBB_SHOW_INFOBOX',
+	'description' => '_MI_NEWBB_SHOW_INFOBOX_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'int',
+	'default'     => 1,
+	'options'     => [
+		_MI_NEWBB_INFOBOX_NONE   => 0,
+		_MI_NEWBB_INFOBOX_HIDDEN => 1,
+		_MI_NEWBB_INFOBOX_SHOW   => 2
+	]
+];
+$modversion['config'][] = [
+	'name'        => 'show_sociallinks',
+	'title'       => '_MI_NEWBB_SHOW_SOCIALLINKS',
+	'description' => '_MI_NEWBB_SHOW_SOCIALLINKS_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'show_advertising',
+	'title'       => '_MI_NEWBB_ADVERTISING',
+	'description' => '_MI_NEWBB_ADVERTISING_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'show_jump',
+	'title'       => '_MI_NEWBB_SHOW_JUMPBOX',
+	'description' => '_MI_NEWBB_SHOW_JUMPBOX_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'show_permissiontable',
+	'title'       => '_MI_NEWBB_SHOW_PERMISSIONTABLE',
+	'description' => '_MI_NEWBB_SHOW_PERMISSIONTABLE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'email_digest',
+	'title'       => '_MI_NEWBB_EMAIL_DIGEST',
+	'description' => '_MI_NEWBB_EMAIL_DIGEST_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'int',
+	'default'     => 0,
+	'options'     => [
+		_MI_NEWBB_EMAIL_NONE   => 0,
+		_MI_NEWBB_EMAIL_DAILY  => 1,
+		_MI_NEWBB_EMAIL_WEEKLY => 2
+	]
+];
+$modversion['config'][] = [
+	'name'        => 'show_ip',
+	'title'       => '_MI_NEWBB_SHOW_IP',
+	'description' => '_MI_NEWBB_SHOW_IP_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'enable_karma',
+	'title'       => '_MI_NEWBB_ENABLE_KARMA',
+	'description' => '_MI_NEWBB_ENABLE_KARMA_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'karma_options',
+	'title'       => '_MI_NEWBB_KARMA_OPTIONS',
+	'description' => '_MI_NEWBB_KARMA_OPTIONS_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => '0, 10, 50, 100, 500, 1000, 5000, 10000'
 ];
 // irmtfan - add 365 = one year
 $modversion['config'][] = [
-    'name'        => 'since_options',
-    'title'       => '_MI_NEWBB_SINCE_OPTIONS',
-    'description' => '_MI_NEWBB_SINCE_OPTIONS_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => '-1, -2, -6, -12, 0, 1, 2, 5, 10, 20, 30, 60, 100, 365'
-];
-$modversion['config'][] = [
-    'name'        => 'since_default',
-    'title'       => '_MI_NEWBB_SINCE_DEFAULT',
-    'description' => '_MI_NEWBB_SINCE_DEFAULT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'allow_user_anonymous',
-    'title'       => '_MI_NEWBB_USER_ANONYMOUS',
-    'description' => '_MI_NEWBB_USER_ANONYMOUS_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'anonymous_prefix',
-    'title'       => '_MI_NEWBB_ANONYMOUS_PRE',
-    'description' => '_MI_NEWBB_ANONYMOUS_PRE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => $GLOBALS['xoopsConfig']['anonymous'] . '-'
-];
-$modversion['config'][] = [
-    'name'        => 'allow_require_reply',
-    'title'       => '_MI_NEWBB_REQUIRE_REPLY',
-    'description' => '_MI_NEWBB_REQUIRE_REPLY_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'edit_timelimit',
-    'title'       => '_MI_NEWBB_EDIT_TIMELIMIT',
-    'description' => '_MI_NEWBB_EDIT_TIMELIMIT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 60
-];
-$modversion['config'][] = [
-    'name'        => 'recordedit_timelimit',
-    'title'       => '_MI_RECORDEDIT_TIMELIMIT',
-    'description' => '_MI_RECORDEDIT_TIMELIMIT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 15
-];
-$modversion['config'][] = [
-    'name'        => 'delete_timelimit',
-    'title'       => '_MI_NEWBB_DELETE_TIMELIMIT',
-    'description' => '_MI_NEWBB_DELETE_TIMELIMIT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 60
-];
-$modversion['config'][] = [
-    'name'        => 'post_timelimit',
-    'title'       => '_MI_NEWBB_POST_TIMELIMIT',
-    'description' => '_MI_NEWBB_POST_TIMELIMIT_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 30
-];
-$modversion['config'][] = [
-    'name'        => 'enable_permcheck',
-    'title'       => '_MI_NEWBB_PERMCHECK_ONDISPLAY',
-    'description' => '_MI_NEWBB_PERMCHECK_ONDISPLAY_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1
-];
-$modversion['config'][] = [
-    'name'        => 'enable_usermoderate',
-    'title'       => '_MI_NEWBB_USERMODERATE',
-    'description' => '_MI_NEWBB_USERMODERATE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0
-];
-$modversion['config'][] = [
-    'name'        => 'disc_show',
-    'title'       => '_MI_NEWBB_SHOW_DIS',
-    'description' => '',
-    'formtype'    => 'select',
-    'valuetype'   => 'int',
-    'default'     => 0,
-    'options'     => [
-        _MI_NEWBB_NONE    => 0,
-        _MI_NEWBB_POST    => 1,
-        _MI_NEWBB_REPLY   => 2,
-        _MI_NEWBB_OP_BOTH => 3
-    ]
-];
-$modversion['config'][] = [
-    'name'        => 'disclaimer',
-    'title'       => '_MI_NEWBB_DISCLAIMER',
-    'description' => '_MI_NEWBB_DISCLAIMER_DESC',
-    'formtype'    => 'textarea',
-    'valuetype'   => 'text',
-    'default'     => _MI_NEWBB_DISCLAIMER_TEXT
-];
-$modversion['config'][] = [
-    'name'        => 'welcome_forum',
-    'title'       => '_MI_NEWBB_WELCOMEFORUM',
-    'description' => '_MI_NEWBB_WELCOMEFORUM_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 0,
-    //    'options'     => $forum_options
-];
-$modversion['config'][] = [
-    'name'        => 'welcome_forum_message',
-    'title'       => '_MI_NEWBB_WELCOMEFORUM_MESSAGE',
-    'description' => '_MI_NEWBB_WELCOMEFORUM_MESSAGE_DESC',
-    'formtype'    => 'textarea',
-    'valuetype'   => 'text',
-    'default'     => _MI_NEWBB_WELCOMEFORUM_DESC_MESSAGE
-];
-$modversion['config'][] = [
-    'name'        => 'poll_module',
-    'title'       => '_MI_NEWBB_POLL_MODULE',
-    'description' => '_MI_NEWBB_POLL_MODULE_DESC',
-    'valuetype'   => 'text',
-    'formtype'    => 'textbox',
-    'default'     => 'xoopspoll',
-];
-$modversion['config'][] = [
-    'name'        => 'forum_desc_length',
-    'title'       => '_MI_NEWBB_FORUM_DESC_LENGTH',
-    'description' => '_MI_NEWBB_FORUM_DESC_LENGTH_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => 440
+	'name'        => 'since_options',
+	'title'       => '_MI_NEWBB_SINCE_OPTIONS',
+	'description' => '_MI_NEWBB_SINCE_OPTIONS_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => '-1, -2, -6, -12, 0, 1, 2, 5, 10, 20, 30, 60, 100, 365'
+];
+$modversion['config'][] = [
+	'name'        => 'since_default',
+	'title'       => '_MI_NEWBB_SINCE_DEFAULT',
+	'description' => '_MI_NEWBB_SINCE_DEFAULT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'allow_user_anonymous',
+	'title'       => '_MI_NEWBB_USER_ANONYMOUS',
+	'description' => '_MI_NEWBB_USER_ANONYMOUS_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'anonymous_prefix',
+	'title'       => '_MI_NEWBB_ANONYMOUS_PRE',
+	'description' => '_MI_NEWBB_ANONYMOUS_PRE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => $GLOBALS['xoopsConfig']['anonymous'] . '-'
+];
+$modversion['config'][] = [
+	'name'        => 'allow_require_reply',
+	'title'       => '_MI_NEWBB_REQUIRE_REPLY',
+	'description' => '_MI_NEWBB_REQUIRE_REPLY_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'edit_timelimit',
+	'title'       => '_MI_NEWBB_EDIT_TIMELIMIT',
+	'description' => '_MI_NEWBB_EDIT_TIMELIMIT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 60
+];
+$modversion['config'][] = [
+	'name'        => 'recordedit_timelimit',
+	'title'       => '_MI_RECORDEDIT_TIMELIMIT',
+	'description' => '_MI_RECORDEDIT_TIMELIMIT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 15
+];
+$modversion['config'][] = [
+	'name'        => 'delete_timelimit',
+	'title'       => '_MI_NEWBB_DELETE_TIMELIMIT',
+	'description' => '_MI_NEWBB_DELETE_TIMELIMIT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 60
+];
+$modversion['config'][] = [
+	'name'        => 'post_timelimit',
+	'title'       => '_MI_NEWBB_POST_TIMELIMIT',
+	'description' => '_MI_NEWBB_POST_TIMELIMIT_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 30
+];
+$modversion['config'][] = [
+	'name'        => 'enable_permcheck',
+	'title'       => '_MI_NEWBB_PERMCHECK_ONDISPLAY',
+	'description' => '_MI_NEWBB_PERMCHECK_ONDISPLAY_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1
+];
+$modversion['config'][] = [
+	'name'        => 'enable_usermoderate',
+	'title'       => '_MI_NEWBB_USERMODERATE',
+	'description' => '_MI_NEWBB_USERMODERATE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0
+];
+$modversion['config'][] = [
+	'name'        => 'disc_show',
+	'title'       => '_MI_NEWBB_SHOW_DIS',
+	'description' => '',
+	'formtype'    => 'select',
+	'valuetype'   => 'int',
+	'default'     => 0,
+	'options'     => [
+		_MI_NEWBB_NONE    => 0,
+		_MI_NEWBB_POST    => 1,
+		_MI_NEWBB_REPLY   => 2,
+		_MI_NEWBB_OP_BOTH => 3
+	]
+];
+$modversion['config'][] = [
+	'name'        => 'disclaimer',
+	'title'       => '_MI_NEWBB_DISCLAIMER',
+	'description' => '_MI_NEWBB_DISCLAIMER_DESC',
+	'formtype'    => 'textarea',
+	'valuetype'   => 'text',
+	'default'     => _MI_NEWBB_DISCLAIMER_TEXT
+];
+$modversion['config'][] = [
+	'name'        => 'welcome_forum',
+	'title'       => '_MI_NEWBB_WELCOMEFORUM',
+	'description' => '_MI_NEWBB_WELCOMEFORUM_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 0,
+	//    'options'     => $forum_options
+];
+$modversion['config'][] = [
+	'name'        => 'welcome_forum_message',
+	'title'       => '_MI_NEWBB_WELCOMEFORUM_MESSAGE',
+	'description' => '_MI_NEWBB_WELCOMEFORUM_MESSAGE_DESC',
+	'formtype'    => 'textarea',
+	'valuetype'   => 'text',
+	'default'     => _MI_NEWBB_WELCOMEFORUM_DESC_MESSAGE
+];
+$modversion['config'][] = [
+	'name'        => 'poll_module',
+	'title'       => '_MI_NEWBB_POLL_MODULE',
+	'description' => '_MI_NEWBB_POLL_MODULE_DESC',
+	'valuetype'   => 'text',
+	'formtype'    => 'textbox',
+	'default'     => 'xoopspoll',
+];
+$modversion['config'][] = [
+	'name'        => 'forum_desc_length',
+	'title'       => '_MI_NEWBB_FORUM_DESC_LENGTH',
+	'description' => '_MI_NEWBB_FORUM_DESC_LENGTH_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => 440
 ];
 
 // Notification
@@ -724,98 +724,98 @@ 
 $modversion['notification']['lookup_file'] = 'include/notification.inc.php';
 $modversion['notification']['lookup_func'] = 'newbb_notify_iteminfo';
 $modversion['notification']['category'][]  = [
-    'name'           => 'thread',
-    'title'          => _MI_NEWBB_THREAD_NOTIFY,
-    'description'    => _MI_NEWBB_THREAD_NOTIFYDSC,
-    'subscribe_from' => 'viewtopic.php',
-    'item_name'      => 'topic_id',
-    'allow_bookmark' => 1,
+	'name'           => 'thread',
+	'title'          => _MI_NEWBB_THREAD_NOTIFY,
+	'description'    => _MI_NEWBB_THREAD_NOTIFYDSC,
+	'subscribe_from' => 'viewtopic.php',
+	'item_name'      => 'topic_id',
+	'allow_bookmark' => 1,
 ];
 $modversion['notification']['category'][]  = [
-    'name'           => 'forum',
-    'title'          => _MI_NEWBB_FORUM_NOTIFY,
-    'description'    => _MI_NEWBB_FORUM_NOTIFYDSC,
-    'subscribe_from' => 'viewforum.php',
-    'item_name'      => 'forum',
-    'allow_bookmark' => 1,
+	'name'           => 'forum',
+	'title'          => _MI_NEWBB_FORUM_NOTIFY,
+	'description'    => _MI_NEWBB_FORUM_NOTIFYDSC,
+	'subscribe_from' => 'viewforum.php',
+	'item_name'      => 'forum',
+	'allow_bookmark' => 1,
 ];
 $modversion['notification']['category'][]  = [
-    'name'           => 'global',
-    'title'          => _MI_NEWBB_GLOBAL_NOTIFY,
-    'description'    => _MI_NEWBB_GLOBAL_NOTIFYDSC,
-    'subscribe_from' => 'index.php',
+	'name'           => 'global',
+	'title'          => _MI_NEWBB_GLOBAL_NOTIFY,
+	'description'    => _MI_NEWBB_GLOBAL_NOTIFYDSC,
+	'subscribe_from' => 'index.php',
 ];
 $modversion['notification']['event'][]     = [
-    'name'          => 'new_post',
-    'category'      => 'thread',
-    'title'         => _MI_NEWBB_THREAD_NEWPOST_NOTIFY,
-    'caption'       => _MI_NEWBB_THREAD_NEWPOST_NOTIFYCAP,
-    'description'   => _MI_NEWBB_THREAD_NEWPOST_NOTIFYDSC,
-    'mail_template' => 'thread_newpost_notify',
-    'mail_subject'  => _MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ,
+	'name'          => 'new_post',
+	'category'      => 'thread',
+	'title'         => _MI_NEWBB_THREAD_NEWPOST_NOTIFY,
+	'caption'       => _MI_NEWBB_THREAD_NEWPOST_NOTIFYCAP,
+	'description'   => _MI_NEWBB_THREAD_NEWPOST_NOTIFYDSC,
+	'mail_template' => 'thread_newpost_notify',
+	'mail_subject'  => _MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ,
 ];
 $modversion['notification']['event'][]     = [
-    'name'          => 'new_thread',
-    'category'      => 'forum',
-    'title'         => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFY,
-    'caption'       => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFYCAP,
-    'description'   => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFYDSC,
-    'mail_template' => 'forum_newthread_notify',
-    'mail_subject'  => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ,
+	'name'          => 'new_thread',
+	'category'      => 'forum',
+	'title'         => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFY,
+	'caption'       => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFYCAP,
+	'description'   => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFYDSC,
+	'mail_template' => 'forum_newthread_notify',
+	'mail_subject'  => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ,
 ];
 $modversion['notification']['event'][]     = [
-    'name'          => 'new_forum',
-    'category'      => 'global',
-    'title'         => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFY,
-    'caption'       => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYCAP,
-    'description'   => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYDSC,
-    'mail_template' => 'global_newforum_notify',
-    'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYSBJ,
+	'name'          => 'new_forum',
+	'category'      => 'global',
+	'title'         => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFY,
+	'caption'       => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYCAP,
+	'description'   => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYDSC,
+	'mail_template' => 'global_newforum_notify',
+	'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYSBJ,
 ];
 $modversion['notification']['event'][]     = [
-    'name'          => 'new_post',
-    'category'      => 'global',
-    'title'         => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFY,
-    'caption'       => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFYCAP,
-    'description'   => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFYDSC,
-    'mail_template' => 'global_newpost_notify',
-    'mail_subject'  => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFYSBJ,
+	'name'          => 'new_post',
+	'category'      => 'global',
+	'title'         => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFY,
+	'caption'       => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFYCAP,
+	'description'   => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFYDSC,
+	'mail_template' => 'global_newpost_notify',
+	'mail_subject'  => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFYSBJ,
 ];
 $modversion['notification']['event'][]     = [
-    'name'          => 'new_post',
-    'category'      => 'forum',
-    'title'         => _MI_NEWBB_FORUM_NEWPOST_NOTIFY,
-    'caption'       => _MI_NEWBB_FORUM_NEWPOST_NOTIFYCAP,
-    'description'   => _MI_NEWBB_FORUM_NEWPOST_NOTIFYDSC,
-    'mail_template' => 'forum_newpost_notify',
-    'mail_subject'  => _MI_NEWBB_FORUM_NEWPOST_NOTIFYSBJ,
+	'name'          => 'new_post',
+	'category'      => 'forum',
+	'title'         => _MI_NEWBB_FORUM_NEWPOST_NOTIFY,
+	'caption'       => _MI_NEWBB_FORUM_NEWPOST_NOTIFYCAP,
+	'description'   => _MI_NEWBB_FORUM_NEWPOST_NOTIFYDSC,
+	'mail_template' => 'forum_newpost_notify',
+	'mail_subject'  => _MI_NEWBB_FORUM_NEWPOST_NOTIFYSBJ,
 ];
 $modversion['notification']['event'][]     = [
-    'name'          => 'new_fullpost',
-    'category'      => 'global',
-    'admin_only'    => 1,
-    'title'         => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFY,
-    'caption'       => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP,
-    'description'   => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYDSC,
-    'mail_template' => 'global_newfullpost_notify',
-    'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ,
+	'name'          => 'new_fullpost',
+	'category'      => 'global',
+	'admin_only'    => 1,
+	'title'         => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFY,
+	'caption'       => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP,
+	'description'   => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYDSC,
+	'mail_template' => 'global_newfullpost_notify',
+	'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ,
 ];
 $modversion['notification']['event'][]     = [
-    'name'          => 'digest',
-    'category'      => 'global',
-    'title'         => _MI_NEWBB_GLOBAL_DIGEST_NOTIFY,
-    'caption'       => _MI_NEWBB_GLOBAL_DIGEST_NOTIFYCAP,
-    'description'   => _MI_NEWBB_GLOBAL_DIGEST_NOTIFYDSC,
-    'mail_template' => 'global_digest_notify',
-    'mail_subject'  => _MI_NEWBB_GLOBAL_DIGEST_NOTIFYSBJ,
+	'name'          => 'digest',
+	'category'      => 'global',
+	'title'         => _MI_NEWBB_GLOBAL_DIGEST_NOTIFY,
+	'caption'       => _MI_NEWBB_GLOBAL_DIGEST_NOTIFYCAP,
+	'description'   => _MI_NEWBB_GLOBAL_DIGEST_NOTIFYDSC,
+	'mail_template' => 'global_digest_notify',
+	'mail_subject'  => _MI_NEWBB_GLOBAL_DIGEST_NOTIFYSBJ,
 ];
 $modversion['notification']['event'][]     = [
-    'name'          => 'new_fullpost',
-    'category'      => 'forum',
-    'admin_only'    => 1,
-    'title'         => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFY,
-    'caption'       => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP,
-    'description'   => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYDSC,
-    'mail_template' => 'global_newfullpost_notify',
-    'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ,
+	'name'          => 'new_fullpost',
+	'category'      => 'forum',
+	'admin_only'    => 1,
+	'title'         => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFY,
+	'caption'       => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYCAP,
+	'description'   => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYDSC,
+	'mail_template' => 'global_newfullpost_notify',
+	'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ,
 ];

Spacing +30 added lines, -30 removed lines

@@ -9,7 +9,7 @@ 
  * @package        module::newbb
  */
 
-require_once __DIR__   . '/preloads/autoloader.php';
+require_once __DIR__.'/preloads/autoloader.php';
 
 $moduleDirName = basename(__DIR__);
 
@@ -46,24 +46,24 @@ 
     'sqlfile'             => ['mysql' => 'sql/mysql.sql'],
     // ------------------- Tables ----------------------------
     'tables'              => [
-        $moduleDirName . '_' . 'archive',
-        $moduleDirName . '_' . 'categories',
-        $moduleDirName . '_' . 'votedata',
-        $moduleDirName . '_' . 'forums',
-        $moduleDirName . '_' . 'posts',
-        $moduleDirName . '_' . 'posts_text',
-        $moduleDirName . '_' . 'topics',
-        $moduleDirName . '_' . 'online',
-        $moduleDirName . '_' . 'digest',
-        $moduleDirName . '_' . 'report',
-        $moduleDirName . '_' . 'attachments',
-        $moduleDirName . '_' . 'moderates',
-        $moduleDirName . '_' . 'reads_forum',
-        $moduleDirName . '_' . 'reads_topic',
-        $moduleDirName . '_' . 'type',
-        $moduleDirName . '_' . 'type_forum',
-        $moduleDirName . '_' . 'stats',
-        $moduleDirName . '_' . 'user_stats'
+        $moduleDirName.'_'.'archive',
+        $moduleDirName.'_'.'categories',
+        $moduleDirName.'_'.'votedata',
+        $moduleDirName.'_'.'forums',
+        $moduleDirName.'_'.'posts',
+        $moduleDirName.'_'.'posts_text',
+        $moduleDirName.'_'.'topics',
+        $moduleDirName.'_'.'online',
+        $moduleDirName.'_'.'digest',
+        $moduleDirName.'_'.'report',
+        $moduleDirName.'_'.'attachments',
+        $moduleDirName.'_'.'moderates',
+        $moduleDirName.'_'.'reads_forum',
+        $moduleDirName.'_'.'reads_topic',
+        $moduleDirName.'_'.'type',
+        $moduleDirName.'_'.'type_forum',
+        $moduleDirName.'_'.'stats',
+        $moduleDirName.'_'.'user_stats'
     ],
     // ------------------- Admin Menu -------------------
     'system_menu'         => 1,
@@ -604,7 +604,7 @@ 
     'description' => '_MI_NEWBB_ANONYMOUS_PRE_DESC',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => $GLOBALS['xoopsConfig']['anonymous'] . '-'
+    'default'     => $GLOBALS['xoopsConfig']['anonymous'].'-'
 ];
 $modversion['config'][] = [
     'name'        => 'allow_require_reply',
@@ -731,7 +731,7 @@ 
     'item_name'      => 'topic_id',
     'allow_bookmark' => 1,
 ];
-$modversion['notification']['category'][]  = [
+$modversion['notification']['category'][] = [
     'name'           => 'forum',
     'title'          => _MI_NEWBB_FORUM_NOTIFY,
     'description'    => _MI_NEWBB_FORUM_NOTIFYDSC,
@@ -739,13 +739,13 @@ 
     'item_name'      => 'forum',
     'allow_bookmark' => 1,
 ];
-$modversion['notification']['category'][]  = [
+$modversion['notification']['category'][] = [
     'name'           => 'global',
     'title'          => _MI_NEWBB_GLOBAL_NOTIFY,
     'description'    => _MI_NEWBB_GLOBAL_NOTIFYDSC,
     'subscribe_from' => 'index.php',
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_post',
     'category'      => 'thread',
     'title'         => _MI_NEWBB_THREAD_NEWPOST_NOTIFY,
@@ -754,7 +754,7 @@ 
     'mail_template' => 'thread_newpost_notify',
     'mail_subject'  => _MI_NEWBB_THREAD_NEWPOST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_thread',
     'category'      => 'forum',
     'title'         => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFY,
@@ -763,7 +763,7 @@ 
     'mail_template' => 'forum_newthread_notify',
     'mail_subject'  => _MI_NEWBB_FORUM_NEWTHREAD_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_forum',
     'category'      => 'global',
     'title'         => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFY,
@@ -772,7 +772,7 @@ 
     'mail_template' => 'global_newforum_notify',
     'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFORUM_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_post',
     'category'      => 'global',
     'title'         => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFY,
@@ -781,7 +781,7 @@ 
     'mail_template' => 'global_newpost_notify',
     'mail_subject'  => _MI_NEWBB_GLOBAL_NEWPOST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_post',
     'category'      => 'forum',
     'title'         => _MI_NEWBB_FORUM_NEWPOST_NOTIFY,
@@ -790,7 +790,7 @@ 
     'mail_template' => 'forum_newpost_notify',
     'mail_subject'  => _MI_NEWBB_FORUM_NEWPOST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_fullpost',
     'category'      => 'global',
     'admin_only'    => 1,
@@ -800,7 +800,7 @@ 
     'mail_template' => 'global_newfullpost_notify',
     'mail_subject'  => _MI_NEWBB_GLOBAL_NEWFULLPOST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'digest',
     'category'      => 'global',
     'title'         => _MI_NEWBB_GLOBAL_DIGEST_NOTIFY,
@@ -809,7 +809,7 @@ 
     'mail_template' => 'global_digest_notify',
     'mail_subject'  => _MI_NEWBB_GLOBAL_DIGEST_NOTIFYSBJ,
 ];
-$modversion['notification']['event'][]     = [
+$modversion['notification']['event'][] = [
     'name'          => 'new_fullpost',
     'category'      => 'forum',
     'admin_only'    => 1,

index.php

Indentation +130 added lines, -130 removed lines

@@ -16,17 +16,17 @@ 
 
 /* deal with marks */
 if (Request::getInt('mark_read', 0)) {
-    if (1 === Request::getInt('mark_read', 0)) { // marked as read
-        $markvalue  = 1;
-        $markresult = _MD_NEWBB_MARK_READ;
-    } else { // marked as unread
-        $markvalue  = 0;
-        $markresult = _MD_NEWBB_MARK_UNREAD;
-    }
-    require_once __DIR__ . '/include/functions.read.php';
-    newbbSetReadForum($markvalue);
-    $url = XOOPS_URL . '/modules/newbb/index.php';
-    redirect_header($url, 2, _MD_NEWBB_ALL_FORUM_MARKED . ' ' . $markresult);
+	if (1 === Request::getInt('mark_read', 0)) { // marked as read
+		$markvalue  = 1;
+		$markresult = _MD_NEWBB_MARK_READ;
+	} else { // marked as unread
+		$markvalue  = 0;
+		$markresult = _MD_NEWBB_MARK_UNREAD;
+	}
+	require_once __DIR__ . '/include/functions.read.php';
+	newbbSetReadForum($markvalue);
+	$url = XOOPS_URL . '/modules/newbb/index.php';
+	redirect_header($url, 2, _MD_NEWBB_ALL_FORUM_MARKED . ' ' . $markresult);
 }
 
 $viewcat = Request::getInt('cat', 0, 'GET');//TODO mb check if this is GET or POST?
@@ -35,20 +35,20 @@ 
 
 $categories = [];
 if (!$viewcat) {
-    $categories        = $categoryHandler->getByPermission('access', null, false);
-    $forum_index_title = '';
-    $xoops_pagetitle   = $xoopsModule->getVar('name');
+	$categories        = $categoryHandler->getByPermission('access', null, false);
+	$forum_index_title = '';
+	$xoops_pagetitle   = $xoopsModule->getVar('name');
 } else {
-    $categoryObject = $categoryHandler->get($viewcat);
-    if ($categoryHandler->getPermission($categoryObject)) {
-        $categories[$viewcat] = $categoryObject->getValues();
-    }
-    $forum_index_title = sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES));
-    $xoops_pagetitle   = $categoryObject->getVar('cat_title') . ' [' . $xoopsModule->getVar('name') . ']';
+	$categoryObject = $categoryHandler->get($viewcat);
+	if ($categoryHandler->getPermission($categoryObject)) {
+		$categories[$viewcat] = $categoryObject->getValues();
+	}
+	$forum_index_title = sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES));
+	$xoops_pagetitle   = $categoryObject->getVar('cat_title') . ' [' . $xoopsModule->getVar('name') . ']';
 }
 
 if (0 === count($categories)) {
-    redirect_header(XOOPS_URL, 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL, 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $xoopsOption['template_main']   = 'newbb_index.tpl';
@@ -61,7 +61,7 @@ 
 /* rss feed */
 // irmtfan new method
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
-    $xoopsTpl->assign('xoops_module_header', '
+	$xoopsTpl->assign('xoops_module_header', '
     <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/rss.php" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
@@ -71,10 +71,10 @@ 
 $xoopsTpl->assign('forum_index_title', $forum_index_title);
 //if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
 if (!empty($GLOBALS['xoopsModuleConfig']['wol_enabled'])) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init();
-    $xoopsTpl->assign('online', $onlineHandler->showOnline());
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init();
+	$xoopsTpl->assign('online', $onlineHandler->showOnline());
 }
 /** @var Newbb\ForumHandler $forumHandler */
 $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
@@ -88,19 +88,19 @@ 
 $forums_top = [];
 
 if (!empty($forums_allowed)) {
-    $crit_top = new \CriteriaCompo(new \Criteria('parent_forum', 0));
-    $crit_top->add(new \Criteria('cat_id', '(' . implode(', ', array_keys($categories)) . ')', 'IN'));
-    $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
-    $forums_top = $forumHandler->getIds($crit_top);
+	$crit_top = new \CriteriaCompo(new \Criteria('parent_forum', 0));
+	$crit_top->add(new \Criteria('cat_id', '(' . implode(', ', array_keys($categories)) . ')', 'IN'));
+	$crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+	$forums_top = $forumHandler->getIds($crit_top);
 }
 
 /* fetch subforums if required to display */
 if ('hidden' === $GLOBALS['xoopsModuleConfig']['subforum_display'] || 0 === count($forums_top)) {
-    $forums_sub = [];
+	$forums_sub = [];
 } else {
-    $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '(' . implode(', ', $forums_top) . ')', 'IN'));
-    $crit_sub->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
-    $forums_sub = $forumHandler->getIds($crit_sub);
+	$crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '(' . implode(', ', $forums_top) . ')', 'IN'));
+	$crit_sub->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+	$forums_sub = $forumHandler->getIds($crit_sub);
 }
 
 /* Fetch forum data */
@@ -111,32 +111,32 @@ 
 $newposts         = 0;
 $deleteposts      = 0;
 if (0 !== count($forums_available)) {
-    $crit_forum = new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN');
-    $crit_forum->setSort('cat_id ASC, parent_forum ASC, forum_order');
-    $crit_forum->setOrder('ASC');
-    $forums       = $forumHandler->getAll($crit_forum, null, false);
-    $newtopics    = $forumHandler->getTopicCount($forums, 0, 'pending');
-    $deletetopics = $forumHandler->getTopicCount($forums, 0, 'deleted');
-    $forums_array = $forumHandler->display($forums, $GLOBALS['xoopsModuleConfig']['length_title_index'], $GLOBALS['xoopsModuleConfig']['count_subforum']);
-    $crit         = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
-    $crit->add(new \Criteria('approved', '-1'));
-    $deleteposts = $postHandler->getCount($crit);
-    $crit        = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
-    $crit->add(new \Criteria('approved', '0'));
-    $newposts = $postHandler->getCount($crit);
+	$crit_forum = new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN');
+	$crit_forum->setSort('cat_id ASC, parent_forum ASC, forum_order');
+	$crit_forum->setOrder('ASC');
+	$forums       = $forumHandler->getAll($crit_forum, null, false);
+	$newtopics    = $forumHandler->getTopicCount($forums, 0, 'pending');
+	$deletetopics = $forumHandler->getTopicCount($forums, 0, 'deleted');
+	$forums_array = $forumHandler->display($forums, $GLOBALS['xoopsModuleConfig']['length_title_index'], $GLOBALS['xoopsModuleConfig']['count_subforum']);
+	$crit         = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
+	$crit->add(new \Criteria('approved', '-1'));
+	$deleteposts = $postHandler->getCount($crit);
+	$crit        = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
+	$crit->add(new \Criteria('approved', '0'));
+	$newposts = $postHandler->getCount($crit);
 }
 
 if ($newtopics > 0) {
-    $xoopsTpl->assign('wait_new_topic', $newtopics);
+	$xoopsTpl->assign('wait_new_topic', $newtopics);
 }
 if ($deletetopics > 0) {
-    $xoopsTpl->assign('delete_topic', $deletetopics);
+	$xoopsTpl->assign('delete_topic', $deletetopics);
 }
 if ($newposts > 0) {
-    $xoopsTpl->assign('wait_new_post', $newposts);
+	$xoopsTpl->assign('wait_new_post', $newposts);
 }
 if ($deleteposts > 0) {
-    $xoopsTpl->assign('delete_post', $deleteposts);
+	$xoopsTpl->assign('delete_post', $deleteposts);
 }
 
 ///** @var Newbb\ReportHandler $reportHandler */
@@ -144,74 +144,74 @@ 
 $reported = $reportHandler->getCount(new \Criteria('report_result', 0));
 $xoopsTpl->assign('reported_count', $reported);
 if ($reported > 0) {
-    $xoopsTpl->assign('report_post', sprintf(_MD_NEWBB_SEEWAITREPORT, $reported));
+	$xoopsTpl->assign('report_post', sprintf(_MD_NEWBB_SEEWAITREPORT, $reported));
 }
 
 if (count($forums_array) > 0) {
-    foreach ($forums_array[0] as $parent => $forum) {
-        if (isset($forums_array[$forum['forum_id']])) {
-            $forum['subforum'] = $forums_array[$forum['forum_id']];
-        }
-        $forumsByCat[$forum['forum_cid']][] = $forum;
-    }
+	foreach ($forums_array[0] as $parent => $forum) {
+		if (isset($forums_array[$forum['forum_id']])) {
+			$forum['subforum'] = $forums_array[$forum['forum_id']];
+		}
+		$forumsByCat[$forum['forum_cid']][] = $forum;
+	}
 }
 
 $category_array = [];
 $toggles        = newbbGetCookie('G', true);
 $iconHandler    = newbbGetIconHandler();
 $category_icon  = [
-    'expand'   => $iconHandler->getImageSource('minus'),
-    'collapse' => $iconHandler->getImageSource('plus')
+	'expand'   => $iconHandler->getImageSource('minus'),
+	'collapse' => $iconHandler->getImageSource('plus')
 ];
 
 foreach (array_keys($categories) as $id) {
-    $forums = [];
-    $onecat = $categories[$id];
+	$forums = [];
+	$onecat = $categories[$id];
 
-    $cat_element_id = 'cat_' . $onecat['cat_id'];
-    $expand         = (count($toggles) > 0) ? (in_array($cat_element_id, $toggles) ? false : true) : true;
-    // START irmtfan to improve newbbDisplayImage
-    if ($expand) {
-        $cat_display      = 'block';        //irmtfan move semicolon
-        $cat_icon_display = 'minus';
-        $cat_alt          = _MD_NEWBB_HIDE;
-    } else {
-        $cat_display      = 'none';        //irmtfan move semicolon
-        $cat_icon_display = 'plus';
-        $cat_alt          = _MD_NEWBB_SEE;
-    }
-    $cat_displayImage = newbbDisplayImage($cat_icon_display, $cat_alt);
+	$cat_element_id = 'cat_' . $onecat['cat_id'];
+	$expand         = (count($toggles) > 0) ? (in_array($cat_element_id, $toggles) ? false : true) : true;
+	// START irmtfan to improve newbbDisplayImage
+	if ($expand) {
+		$cat_display      = 'block';        //irmtfan move semicolon
+		$cat_icon_display = 'minus';
+		$cat_alt          = _MD_NEWBB_HIDE;
+	} else {
+		$cat_display      = 'none';        //irmtfan move semicolon
+		$cat_icon_display = 'plus';
+		$cat_alt          = _MD_NEWBB_SEE;
+	}
+	$cat_displayImage = newbbDisplayImage($cat_icon_display, $cat_alt);
 
-    if (isset($forumsByCat[$onecat['cat_id']])) {
-        $forums = $forumsByCat[$onecat['cat_id']];
-    }
+	if (isset($forumsByCat[$onecat['cat_id']])) {
+		$forums = $forumsByCat[$onecat['cat_id']];
+	}
 
-    $cat_sponsor = [];
-    @list($url, $title) = array_map('trim', explode(' ', $onecat['cat_url'], 2));
-    if ('' === $title) {
-        $title = $url;
-    }
-    $title = $myts->htmlSpecialChars($title);
-    if ('' !== $url) {
-        $cat_sponsor = ['title' => $title, 'link' => formatURL($url)];
-    }
-    //$cat_image = $onecat['cat_image'];
-    $cat_image = '';
-    $cat_image = $onecat['cat_image'];
-    if ('' !== $cat_image && 'blank.gif' !== $cat_image && $cat_image) {
-        $cat_image = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/assets/images/category/' . $cat_image;
-    }
-    $category_array[] = [
-        'cat_id'           => $onecat['cat_id'],
-        'cat_title'        => $myts->displayTarea($onecat['cat_title'], 1),
-        'cat_image'        => $cat_image,
-        'cat_sponsor'      => $cat_sponsor,
-        'cat_description'  => $myts->displayTarea($onecat['cat_description'], 1),
-        'cat_element_id'   => $cat_element_id,
-        'cat_display'      => $cat_display,
-        'cat_displayImage' => $cat_displayImage,
-        'forums'           => $forums
-    ];
+	$cat_sponsor = [];
+	@list($url, $title) = array_map('trim', explode(' ', $onecat['cat_url'], 2));
+	if ('' === $title) {
+		$title = $url;
+	}
+	$title = $myts->htmlSpecialChars($title);
+	if ('' !== $url) {
+		$cat_sponsor = ['title' => $title, 'link' => formatURL($url)];
+	}
+	//$cat_image = $onecat['cat_image'];
+	$cat_image = '';
+	$cat_image = $onecat['cat_image'];
+	if ('' !== $cat_image && 'blank.gif' !== $cat_image && $cat_image) {
+		$cat_image = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/assets/images/category/' . $cat_image;
+	}
+	$category_array[] = [
+		'cat_id'           => $onecat['cat_id'],
+		'cat_title'        => $myts->displayTarea($onecat['cat_title'], 1),
+		'cat_image'        => $cat_image,
+		'cat_sponsor'      => $cat_sponsor,
+		'cat_description'  => $myts->displayTarea($onecat['cat_description'], 1),
+		'cat_element_id'   => $cat_element_id,
+		'cat_display'      => $cat_display,
+		'cat_displayImage' => $cat_displayImage,
+		'forums'           => $forums
+	];
 }
 
 unset($categories, $forums_array, $forumsByCat);
@@ -220,28 +220,28 @@ 
 $xoopsTpl->assign('notifyicon', $category_icon);
 
 $xoopsTpl->assign([
-                      'index_title' => sprintf(_MD_NEWBB_WELCOME, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
-                      'index_desc'  => _MD_NEWBB_TOSTART
-                  ]);
+					  'index_title' => sprintf(_MD_NEWBB_WELCOME, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
+					  'index_desc'  => _MD_NEWBB_TOSTART
+				  ]);
 
 /* display user stats */
 if (!empty($GLOBALS['xoopsModuleConfig']['statistik_enabled'])) {
-    $userstats = [];
-    if (is_object($GLOBALS['xoopsUser'])) {
-        //        /** @var Newbb\UserstatsHandler $userstatsHandler */
-        //        $userstatsHandler         = Newbb\Helper::getInstance()->getHandler('Userstats');
-        $userstats_row            = $userstatsHandler->getStats($GLOBALS['xoopsUser']->getVar('uid'));
-        $userstats['topics']      = sprintf(_MD_NEWBB_USER_TOPICS, (int)(@$userstats_row['user_topics']));
-        $userstats['posts']       = sprintf(_MD_NEWBB_USER_POSTS, (int)(@$userstats_row['user_posts']));
-        $userstats['digests']     = sprintf(_MD_NEWBB_USER_DIGESTS, (int)(@$userstats_row['user_digests']));
-        $userstats['currenttime'] = sprintf(_MD_NEWBB_TIMENOW, formatTimestamp(time(), 's')); // irmtfan should be removed because it is for anon users too
-        $userstats['lastvisit']   = sprintf(_MD_NEWBB_USER_LASTVISIT, formatTimestamp($last_visit, 's')); // irmtfan should be removed because it is for anon users too
-        $userstats['lastpost']    = empty($userstats_row['user_lastpost']) ? _MD_NEWBB_USER_NOLASTPOST : sprintf(_MD_NEWBB_USER_LASTPOST, formatTimestamp($userstats_row['user_lastpost'], 's'));
-    }
-    $xoopsTpl->assign_by_ref('userstats', $userstats);
-    // irmtfan add lastvisit smarty variable for all users
-    $xoopsTpl->assign('lastvisit', sprintf(_MD_NEWBB_USER_LASTVISIT, formatTimestamp($last_visit, 'l')));
-    $xoopsTpl->assign('currenttime', sprintf(_MD_NEWBB_TIMENOW, formatTimestamp(time(), 'm')));
+	$userstats = [];
+	if (is_object($GLOBALS['xoopsUser'])) {
+		//        /** @var Newbb\UserstatsHandler $userstatsHandler */
+		//        $userstatsHandler         = Newbb\Helper::getInstance()->getHandler('Userstats');
+		$userstats_row            = $userstatsHandler->getStats($GLOBALS['xoopsUser']->getVar('uid'));
+		$userstats['topics']      = sprintf(_MD_NEWBB_USER_TOPICS, (int)(@$userstats_row['user_topics']));
+		$userstats['posts']       = sprintf(_MD_NEWBB_USER_POSTS, (int)(@$userstats_row['user_posts']));
+		$userstats['digests']     = sprintf(_MD_NEWBB_USER_DIGESTS, (int)(@$userstats_row['user_digests']));
+		$userstats['currenttime'] = sprintf(_MD_NEWBB_TIMENOW, formatTimestamp(time(), 's')); // irmtfan should be removed because it is for anon users too
+		$userstats['lastvisit']   = sprintf(_MD_NEWBB_USER_LASTVISIT, formatTimestamp($last_visit, 's')); // irmtfan should be removed because it is for anon users too
+		$userstats['lastpost']    = empty($userstats_row['user_lastpost']) ? _MD_NEWBB_USER_NOLASTPOST : sprintf(_MD_NEWBB_USER_LASTPOST, formatTimestamp($userstats_row['user_lastpost'], 's'));
+	}
+	$xoopsTpl->assign_by_ref('userstats', $userstats);
+	// irmtfan add lastvisit smarty variable for all users
+	$xoopsTpl->assign('lastvisit', sprintf(_MD_NEWBB_USER_LASTVISIT, formatTimestamp($last_visit, 'l')));
+	$xoopsTpl->assign('currenttime', sprintf(_MD_NEWBB_TIMENOW, formatTimestamp(time(), 'm')));
 }
 
 /* display forum stats */
@@ -272,18 +272,18 @@ 
 
 /* To be removed */
 if ($isAdmin) {
-    $xoopsTpl->assign('forum_index_cpanel', ['link' => 'admin/index.php', 'name' => _MD_NEWBB_ADMINCP]);
+	$xoopsTpl->assign('forum_index_cpanel', ['link' => 'admin/index.php', 'name' => _MD_NEWBB_ADMINCP]);
 }
 
 if (1 == $GLOBALS['xoopsModuleConfig']['rss_enable']) {
-    $xoopsTpl->assign('rss_enable', 1);
-    $xoopsTpl->assign('rss_button', newbbDisplayImage('rss', 'RSS feed'));
+	$xoopsTpl->assign('rss_enable', 1);
+	$xoopsTpl->assign('rss_button', newbbDisplayImage('rss', 'RSS feed'));
 }
 $xoopsTpl->assign([
-                      'img_forum_new' => newbbDisplayImage('forum_new', _MD_NEWBB_NEWPOSTS),
-                      'img_forum'     => newbbDisplayImage('forum', _MD_NEWBB_NONEWPOSTS),
-                      'img_subforum'  => newbbDisplayImage('subforum')
-                  ]);
+					  'img_forum_new' => newbbDisplayImage('forum_new', _MD_NEWBB_NEWPOSTS),
+					  'img_forum'     => newbbDisplayImage('forum', _MD_NEWBB_NONEWPOSTS),
+					  'img_subforum'  => newbbDisplayImage('subforum')
+				  ]);
 
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

Spacing +28 added lines, -28 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /* deal with marks */
 if (Request::getInt('mark_read', 0)) {
@@ -23,13 +23,13 @@ 
         $markvalue  = 0;
         $markresult = _MD_NEWBB_MARK_UNREAD;
     }
-    require_once __DIR__ . '/include/functions.read.php';
+    require_once __DIR__.'/include/functions.read.php';
     newbbSetReadForum($markvalue);
-    $url = XOOPS_URL . '/modules/newbb/index.php';
-    redirect_header($url, 2, _MD_NEWBB_ALL_FORUM_MARKED . ' ' . $markresult);
+    $url = XOOPS_URL.'/modules/newbb/index.php';
+    redirect_header($url, 2, _MD_NEWBB_ALL_FORUM_MARKED.' '.$markresult);
 }
 
-$viewcat = Request::getInt('cat', 0, 'GET');//TODO mb check if this is GET or POST?
+$viewcat = Request::getInt('cat', 0, 'GET'); //TODO mb check if this is GET or POST?
 ///** @var Newbb\CategoryHandler $categoryHandler */
 //$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
 
@@ -44,7 +44,7 @@ 
         $categories[$viewcat] = $categoryObject->getValues();
     }
     $forum_index_title = sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES));
-    $xoops_pagetitle   = $categoryObject->getVar('cat_title') . ' [' . $xoopsModule->getVar('name') . ']';
+    $xoops_pagetitle   = $categoryObject->getVar('cat_title').' ['.$xoopsModule->getVar('name').']';
 }
 
 if (0 === count($categories)) {
@@ -57,12 +57,12 @@ 
 //$xoopsOption['xoops_module_header'] = $xoops_module_header;
 // irmtfan include header.php after defining $xoopsOption['template_main']
 require_once $GLOBALS['xoops']->path('header.php');
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.render.php';
 /* rss feed */
 // irmtfan new method
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/rss.php" />
+    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 $xoopsTpl->assign('xoops_pagetitle', $xoops_pagetitle);
@@ -89,8 +89,8 @@ 
 
 if (!empty($forums_allowed)) {
     $crit_top = new \CriteriaCompo(new \Criteria('parent_forum', 0));
-    $crit_top->add(new \Criteria('cat_id', '(' . implode(', ', array_keys($categories)) . ')', 'IN'));
-    $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+    $crit_top->add(new \Criteria('cat_id', '('.implode(', ', array_keys($categories)).')', 'IN'));
+    $crit_top->add(new \Criteria('forum_id', '('.implode(', ', $forums_allowed).')', 'IN'));
     $forums_top = $forumHandler->getIds($crit_top);
 }
 
@@ -98,8 +98,8 @@ 
 if ('hidden' === $GLOBALS['xoopsModuleConfig']['subforum_display'] || 0 === count($forums_top)) {
     $forums_sub = [];
 } else {
-    $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '(' . implode(', ', $forums_top) . ')', 'IN'));
-    $crit_sub->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+    $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '('.implode(', ', $forums_top).')', 'IN'));
+    $crit_sub->add(new \Criteria('forum_id', '('.implode(', ', $forums_allowed).')', 'IN'));
     $forums_sub = $forumHandler->getIds($crit_sub);
 }
 
@@ -111,17 +111,17 @@ 
 $newposts         = 0;
 $deleteposts      = 0;
 if (0 !== count($forums_available)) {
-    $crit_forum = new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN');
+    $crit_forum = new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN');
     $crit_forum->setSort('cat_id ASC, parent_forum ASC, forum_order');
     $crit_forum->setOrder('ASC');
     $forums       = $forumHandler->getAll($crit_forum, null, false);
     $newtopics    = $forumHandler->getTopicCount($forums, 0, 'pending');
     $deletetopics = $forumHandler->getTopicCount($forums, 0, 'deleted');
     $forums_array = $forumHandler->display($forums, $GLOBALS['xoopsModuleConfig']['length_title_index'], $GLOBALS['xoopsModuleConfig']['count_subforum']);
-    $crit         = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
+    $crit         = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN'));
     $crit->add(new \Criteria('approved', '-1'));
     $deleteposts = $postHandler->getCount($crit);
-    $crit        = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN'));
+    $crit        = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN'));
     $crit->add(new \Criteria('approved', '0'));
     $newposts = $postHandler->getCount($crit);
 }
@@ -168,15 +168,15 @@ 
     $forums = [];
     $onecat = $categories[$id];
 
-    $cat_element_id = 'cat_' . $onecat['cat_id'];
+    $cat_element_id = 'cat_'.$onecat['cat_id'];
     $expand         = (count($toggles) > 0) ? (in_array($cat_element_id, $toggles) ? false : true) : true;
     // START irmtfan to improve newbbDisplayImage
     if ($expand) {
-        $cat_display      = 'block';        //irmtfan move semicolon
+        $cat_display      = 'block'; //irmtfan move semicolon
         $cat_icon_display = 'minus';
         $cat_alt          = _MD_NEWBB_HIDE;
     } else {
-        $cat_display      = 'none';        //irmtfan move semicolon
+        $cat_display      = 'none'; //irmtfan move semicolon
         $cat_icon_display = 'plus';
         $cat_alt          = _MD_NEWBB_SEE;
     }
@@ -199,7 +199,7 @@ 
     $cat_image = '';
     $cat_image = $onecat['cat_image'];
     if ('' !== $cat_image && 'blank.gif' !== $cat_image && $cat_image) {
-        $cat_image = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/assets/images/category/' . $cat_image;
+        $cat_image = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/assets/images/category/'.$cat_image;
     }
     $category_array[] = [
         'cat_id'           => $onecat['cat_id'],
@@ -250,15 +250,15 @@ 
 $stats = $statsHandler->getStats(array_merge([0], $forums_available));
 $xoopsTpl->assign_by_ref('stats', $stats);
 $xoopsTpl->assign('subforum_display', $GLOBALS['xoopsModuleConfig']['subforum_display']);
-$xoopsTpl->assign('mark_read', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/index.php?mark_read=1');
-$xoopsTpl->assign('mark_unread', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/index.php?mark_read=2');
+$xoopsTpl->assign('mark_read', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/index.php?mark_read=1');
+$xoopsTpl->assign('mark_unread', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/index.php?mark_read=2');
 
-$xoopsTpl->assign('all_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=all');
-$xoopsTpl->assign('post_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewpost.php?status=all');
-$xoopsTpl->assign('newpost_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewpost.php?status=new');
-$xoopsTpl->assign('digest_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=digest');
-$xoopsTpl->assign('unreplied_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=unreplied');
-$xoopsTpl->assign('unread_link', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/list.topic.php?status=unread');
+$xoopsTpl->assign('all_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=all');
+$xoopsTpl->assign('post_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewpost.php?status=all');
+$xoopsTpl->assign('newpost_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewpost.php?status=new');
+$xoopsTpl->assign('digest_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=digest');
+$xoopsTpl->assign('unreplied_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=unreplied');
+$xoopsTpl->assign('unread_link', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/list.topic.php?status=unread');
 $xoopsTpl->assign('menumode', $menumode);
 $xoopsTpl->assign('menumode_other', $menumode_other);
 
@@ -286,5 +286,5 @@ 
                   ]);
 
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');