mambax7 / newbb5

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/blocks.php

Indentation +2 added lines, -2 removed lines

@@ -2,9 +2,9 @@
 //
 // Blocks
 if (defined('NEWBB_BLOCKS_DEFINED')) {
-    return;
+	return;
 } else {
-    define('NEWBB_BLOCKS_DEFINED', true);
+	define('NEWBB_BLOCKS_DEFINED', true);
 }
 define('_MB_NEWBB_FORUM', 'Forum');
 define('_MB_NEWBB_TOPIC', 'Topic');

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 +31 added lines, -31 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'],
@@ -231,9 +231,9 @@ 
         //        /** @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['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'));
@@ -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');

post.php

Indentation +455 added lines, -455 removed lines

@@ -22,22 +22,22 @@ 
 require_once __DIR__ . '/header.php';
 
 foreach ([
-             'forum',
-             'topic_id',
-             'post_id',
-             'order',
-             'pid',
-             'start',
-             'isreply',
-             'isedit'
-         ] as $getint) {
-    ${$getint} = Request::getInt($getint, 0, 'POST');
+			 'forum',
+			 'topic_id',
+			 'post_id',
+			 'order',
+			 'pid',
+			 'start',
+			 'isreply',
+			 'isedit'
+		 ] as $getint) {
+	${$getint} = Request::getInt($getint, 0, 'POST');
 }
 $token_valid = false;
 $op       = Request::getCmd('op', '', 'POST');
 $viewmode = ('flat' !== Request::getString('viewmode', '', 'POST')) ? 'thread' : 'flat';
 if (empty($forum)) {
-    redirect_header('index.php', 2, _MD_NEWBB_ERRORFORUM);
+	redirect_header('index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
@@ -48,356 +48,356 @@ 
 //$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
 
 if (!empty($isedit) && $post_id > 0) {
-    /** @var Post $postObject */
-    $postObject = $postHandler->get($post_id);
-    $topic_id   = $postObject->getVar('topic_id');
+	/** @var Post $postObject */
+	$postObject = $postHandler->get($post_id);
+	$topic_id   = $postObject->getVar('topic_id');
 } else {
-    $postObject = $postHandler->create();
+	$postObject = $postHandler->create();
 }
 $topicObject = $topicHandler->get($topic_id);
 $forum_id    = $topic_id ? $topicObject->getVar('forum_id') : $forum;
 $forumObject = $forumHandler->get($forum_id);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header('index.php', 2, _NOPERM);
+	redirect_header('index.php', 2, _NOPERM);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject);
 }
 
 $error_message = [];
 
 if (Request::getString('contents_submit', '', 'POST')) {
-    $token_valid = $GLOBALS['xoopsSecurity']->check();
-
-    $captcha_invalid = false;
-    if (!is_object($GLOBALS['xoopsUser']) && Request::hasVar('uname', 'POST') && Request::hasVar('pass', 'POST')) {
-        $uname = Request::getString('uname', '', 'POST');
-        $pass  = Request::getString('pass', '', 'POST');
-        /** @var \XoopsMemberHandler $memberHandler */
-        $memberHandler = xoops_getHandler('member');
-        $user          = $memberHandler->loginUser($uname, $pass);
-        if (is_object($user) && 0 < $user->getVar('level')) {
-            if (Request::getString('login', '', 'POST')) {
-                $user->setVar('last_login', time());
-                if (!$memberHandler->insertUser($user)) {
-                }
-                $_SESSION                    = [];
-                $_SESSION['xoopsUserId']     = $user->getVar('uid');
-                $_SESSION['xoopsUserGroups'] = $user->getGroups();
-                if ($GLOBALS['xoopsConfig']['use_mysession'] && '' !== $GLOBALS['xoopsConfig']['session_name']) {
-                    setcookie($GLOBALS['xoopsConfig']['session_name'], session_id(), time() + (60 * $GLOBALS['xoopsConfig']['session_expire']), '/', '', 0);
-                }
-                $user_theme = $user->getVar('theme');
-                if (in_array($user_theme, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
-                    $_SESSION['xoopsUserTheme'] = $user_theme;
-                }
-            }
-            $GLOBALS['xoopsUser'] = $user;
-            $xoopsUserIsAdmin     = $GLOBALS['xoopsUser']->isAdmin($xoopsModule->getVar('mid'));
-        }
-    }
-    if (!is_object($GLOBALS['xoopsUser'])) {
-        xoops_load('captcha');
-        $xoopsCaptcha = \XoopsCaptcha::getInstance();
-        if (!$xoopsCaptcha->verify()) {
-            $captcha_invalid = true;
-            $error_message[] = $xoopsCaptcha->getMessage();
-        }
-    }
-
-    $isAdmin = newbbIsAdmin($forumObject);
-
-    $time_valid = true;
-    if (!$isAdmin && !empty($GLOBALS['xoopsModuleConfig']['post_timelimit'])) {
-        $last_post = newbbGetSession('LP');
-        if (time() - $last_post < $GLOBALS['xoopsModuleConfig']['post_timelimit']) {
-            $time_valid = false;
-        }
-    }
-
-    if ($captcha_invalid || !$token_valid || !$time_valid) {
-        $_POST['contents_preview'] = 1;
-        $_POST['contents_submit']  = null;
-        $_POST['contents_upload']  = null;
-        if (!$token_valid) {
-            $error_message[] = _MD_NEWBB_INVALID_SUBMIT;
-        }
-        if (!$time_valid) {
-            $error_message[] = sprintf(_MD_NEWBB_POSTING_LIMITED, $GLOBALS['xoopsModuleConfig']['post_timelimit']);
-        }
-    }
+	$token_valid = $GLOBALS['xoopsSecurity']->check();
+
+	$captcha_invalid = false;
+	if (!is_object($GLOBALS['xoopsUser']) && Request::hasVar('uname', 'POST') && Request::hasVar('pass', 'POST')) {
+		$uname = Request::getString('uname', '', 'POST');
+		$pass  = Request::getString('pass', '', 'POST');
+		/** @var \XoopsMemberHandler $memberHandler */
+		$memberHandler = xoops_getHandler('member');
+		$user          = $memberHandler->loginUser($uname, $pass);
+		if (is_object($user) && 0 < $user->getVar('level')) {
+			if (Request::getString('login', '', 'POST')) {
+				$user->setVar('last_login', time());
+				if (!$memberHandler->insertUser($user)) {
+				}
+				$_SESSION                    = [];
+				$_SESSION['xoopsUserId']     = $user->getVar('uid');
+				$_SESSION['xoopsUserGroups'] = $user->getGroups();
+				if ($GLOBALS['xoopsConfig']['use_mysession'] && '' !== $GLOBALS['xoopsConfig']['session_name']) {
+					setcookie($GLOBALS['xoopsConfig']['session_name'], session_id(), time() + (60 * $GLOBALS['xoopsConfig']['session_expire']), '/', '', 0);
+				}
+				$user_theme = $user->getVar('theme');
+				if (in_array($user_theme, $GLOBALS['xoopsConfig']['theme_set_allowed'])) {
+					$_SESSION['xoopsUserTheme'] = $user_theme;
+				}
+			}
+			$GLOBALS['xoopsUser'] = $user;
+			$xoopsUserIsAdmin     = $GLOBALS['xoopsUser']->isAdmin($xoopsModule->getVar('mid'));
+		}
+	}
+	if (!is_object($GLOBALS['xoopsUser'])) {
+		xoops_load('captcha');
+		$xoopsCaptcha = \XoopsCaptcha::getInstance();
+		if (!$xoopsCaptcha->verify()) {
+			$captcha_invalid = true;
+			$error_message[] = $xoopsCaptcha->getMessage();
+		}
+	}
+
+	$isAdmin = newbbIsAdmin($forumObject);
+
+	$time_valid = true;
+	if (!$isAdmin && !empty($GLOBALS['xoopsModuleConfig']['post_timelimit'])) {
+		$last_post = newbbGetSession('LP');
+		if (time() - $last_post < $GLOBALS['xoopsModuleConfig']['post_timelimit']) {
+			$time_valid = false;
+		}
+	}
+
+	if ($captcha_invalid || !$token_valid || !$time_valid) {
+		$_POST['contents_preview'] = 1;
+		$_POST['contents_submit']  = null;
+		$_POST['contents_upload']  = null;
+		if (!$token_valid) {
+			$error_message[] = _MD_NEWBB_INVALID_SUBMIT;
+		}
+		if (!$time_valid) {
+			$error_message[] = sprintf(_MD_NEWBB_POSTING_LIMITED, $GLOBALS['xoopsModuleConfig']['post_timelimit']);
+		}
+	}
 }
 
 if (Request::getString('contents_submit', '', 'POST')) {
-    $message = Request::getText('message', '', 'POST');
-    if (empty($message)) {
-        // irmtfan - issue with javascript:history.go(-1) - add error message
-        redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 1, _MD_NEWBB_ERROR_BACK);
-    }
-    if (!empty($isedit) && $post_id > 0) {
-        $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
-
-        $topic_status = $topicObject->getVar('topic_status');
-        if ($topicHandler->getPermission($forumObject, $topic_status, 'edit')
-            && ($isAdmin
-                || ($postObject->checkTimelimit('edit_timelimit')
-                    && $postObject->checkIdentity()))) {
-        } else {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum={$forum_id}&amp;topic_id={$topic_id}&amp;post_id={$post_id}&amp;order={$order}&amp;viewmode={$viewmode}", 2, _MD_NEWBB_NORIGHTTOEDIT);
-        }
-
-        $delete_attach = Request::getArray('delete_attach', [], 'POST');
-        if (is_array($delete_attach) && count($delete_attach) > 0) {
-            $postObject->deleteAttachment($delete_attach);
-        }
-    } else {
-        if ($topic_id) {
-            $topic_status = $topicObject->getVar('topic_status');
-            if (!$topicHandler->getPermission($forumObject, $topic_status, 'reply')) {
-                redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum={$forum_id}&amp;topic_id={$topic_id}&amp;post_id={$post_id}&amp;order={$order}&amp;viewmode={$viewmode}", 2, _MD_NEWBB_NORIGHTTOREPLY);
-            }
-        } else {
-            $topic_status = 0;
-            if (!$topicHandler->getPermission($forumObject, $topic_status, 'post')) {
-                redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum={$forum_id}", 2, _MD_NEWBB_NORIGHTTOPOST);
-            }
-        }
-
-        $isreply = 0;
-        $isnew   = 1;
-        if (!is_object($GLOBALS['xoopsUser'])
-            || (Request::getString('noname', '', 'POST')
-                && !empty($GLOBALS['xoopsModuleConfig']['allow_user_anonymous']))) {
-            $uid = 0;
-        } else {
-            $uid = $GLOBALS['xoopsUser']->getVar('uid');
-        }
-        if (!empty($pid)) {
-            $postObject->setVar('pid', $pid);
-        }
-        if (!empty($topic_id)) {
-            $postObject->setVar('topic_id', $topic_id);
-            $isreply = 1;
-        }
-        $postObject->setVar('poster_ip', Xmf\IPAddress::fromRequest()->asReadable());
-        $postObject->setVar('uid', $uid);
-        $postObject->setVar('post_time', time());
-    }
-
-    $approved = $topicHandler->getPermission($forumObject, $topic_status, 'noapprove');
-    $postObject->setVar('approved', $approved);
-
-    $postObject->setVar('forum_id', $forumObject->getVar('forum_id'));
-
-    $subject       = xoops_trim(Request::getString('subject', '', 'POST'));
-    $subject       = ('' === $subject) ? _NOTITLE : $subject;
-    $poster_name   = xoops_trim(Request::getString('poster_name', '', 'POST'));
-    $dohtml        = Request::getInt('dohtml', 0, 'POST')
-                     && $topicHandler->getPermission($forumObject, $topic_status, 'html');
-    $dosmiley      = Request::getInt('dosmiley', 0, 'POST');
-    $doxcode       = Request::getInt('doxcode', 0, 'POST') ? 1 : 0;
-    $dobr          = Request::getInt('dobr', 0, 'POST') ? 1 : 0;
-    $icon          = (Request::getString('icon', '', 'POST')
-                      && is_file($GLOBALS['xoops']->path('images/subject/' . Request::getString('icon', '', 'POST'))) ? Request::getString('icon', '', 'POST') : '');
-    $attachsig     = Request::getBool('attachsig', false, 'POST')
-                     && $topicHandler->getPermission($forumObject, $topic_status, 'signature');
-    $view_require  = Request::getString('view_require', '', 'POST');
-    $post_karma    = ('require_karma' === $view_require) ? Request::getInt('post_karma', 0, 'POST') : 0;
-    $require_reply = ('require_reply' === $view_require);
-    $postObject->setVar('subject', $subject);
-    $editwhy = xoops_trim(Request::getString('editwhy', '', 'POST')); // !empty($_POST['editwhy'])) ? xoops_trim($_POST['editwhy']) : "";
-
-    if ($dohtml && !newbbIsAdmin($forumObject)) {
-        //$message=newbb_textFilter($message);
-    }
-    $postObject->setVar('post_text', $message);
-    $postObject->setVar('post_karma', $post_karma);
-    $postObject->setVar('require_reply', $require_reply);
-    $postObject->setVar('poster_name', $poster_name);
-    $postObject->setVar('dohtml', $dohtml);
-    $postObject->setVar('dosmiley', $dosmiley);
-    $postObject->setVar('doxcode', $doxcode);
-    $postObject->setVar('dobr', $dobr);
-    $postObject->setVar('icon', $icon);
-    $postObject->setVar('attachsig', $attachsig);
-    $postObject->setAttachment();
-    if (!empty($post_id)) {
-        $postObject->setPostEdit($poster_name, $editwhy);
-    } // is reply
-
-    //    $attachments_tmp = array();
-    //    if (!empty($_POST["attachments_tmp"])) {
-    if (Request::getString('attachments_tmp', '', 'POST')) {
-        $attachments_tmp = unserialize(base64_decode(Request::getString('attachments_tmp', '', 'POST')));
-        if (Request::getArray('delete_tmp', null, 'POST') && count(Request::getArray('delete_tmp', null, 'POST')) > 1) {
-            foreach (Request::getArray('delete_tmp', null, 'POST') as $key) {
-                unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachments_tmp[$key][0]));
-                unset($attachments_tmp[$key]);
-            }
-        }
-    }
-    if (isset($attachments_tmp) && count($attachments_tmp)) {
-        foreach ($attachments_tmp as $key => $attach) {
-            if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachments_tmp[$key][0]))) {
-                $postObject->setAttachment($attach[0], $attach[1], $attach[2]);
-            }
-        }
-    }
-    $error_upload = '';
-
-    if (isset($_FILES['userfile']['name']) && '' !== $_FILES['userfile']['name']
-        && $topicHandler->getPermission($forumObject, $topic_status, 'attach')) {
+	$message = Request::getText('message', '', 'POST');
+	if (empty($message)) {
+		// irmtfan - issue with javascript:history.go(-1) - add error message
+		redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 1, _MD_NEWBB_ERROR_BACK);
+	}
+	if (!empty($isedit) && $post_id > 0) {
+		$uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+
+		$topic_status = $topicObject->getVar('topic_status');
+		if ($topicHandler->getPermission($forumObject, $topic_status, 'edit')
+			&& ($isAdmin
+				|| ($postObject->checkTimelimit('edit_timelimit')
+					&& $postObject->checkIdentity()))) {
+		} else {
+			redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum={$forum_id}&amp;topic_id={$topic_id}&amp;post_id={$post_id}&amp;order={$order}&amp;viewmode={$viewmode}", 2, _MD_NEWBB_NORIGHTTOEDIT);
+		}
+
+		$delete_attach = Request::getArray('delete_attach', [], 'POST');
+		if (is_array($delete_attach) && count($delete_attach) > 0) {
+			$postObject->deleteAttachment($delete_attach);
+		}
+	} else {
+		if ($topic_id) {
+			$topic_status = $topicObject->getVar('topic_status');
+			if (!$topicHandler->getPermission($forumObject, $topic_status, 'reply')) {
+				redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum={$forum_id}&amp;topic_id={$topic_id}&amp;post_id={$post_id}&amp;order={$order}&amp;viewmode={$viewmode}", 2, _MD_NEWBB_NORIGHTTOREPLY);
+			}
+		} else {
+			$topic_status = 0;
+			if (!$topicHandler->getPermission($forumObject, $topic_status, 'post')) {
+				redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum={$forum_id}", 2, _MD_NEWBB_NORIGHTTOPOST);
+			}
+		}
+
+		$isreply = 0;
+		$isnew   = 1;
+		if (!is_object($GLOBALS['xoopsUser'])
+			|| (Request::getString('noname', '', 'POST')
+				&& !empty($GLOBALS['xoopsModuleConfig']['allow_user_anonymous']))) {
+			$uid = 0;
+		} else {
+			$uid = $GLOBALS['xoopsUser']->getVar('uid');
+		}
+		if (!empty($pid)) {
+			$postObject->setVar('pid', $pid);
+		}
+		if (!empty($topic_id)) {
+			$postObject->setVar('topic_id', $topic_id);
+			$isreply = 1;
+		}
+		$postObject->setVar('poster_ip', Xmf\IPAddress::fromRequest()->asReadable());
+		$postObject->setVar('uid', $uid);
+		$postObject->setVar('post_time', time());
+	}
+
+	$approved = $topicHandler->getPermission($forumObject, $topic_status, 'noapprove');
+	$postObject->setVar('approved', $approved);
+
+	$postObject->setVar('forum_id', $forumObject->getVar('forum_id'));
+
+	$subject       = xoops_trim(Request::getString('subject', '', 'POST'));
+	$subject       = ('' === $subject) ? _NOTITLE : $subject;
+	$poster_name   = xoops_trim(Request::getString('poster_name', '', 'POST'));
+	$dohtml        = Request::getInt('dohtml', 0, 'POST')
+					 && $topicHandler->getPermission($forumObject, $topic_status, 'html');
+	$dosmiley      = Request::getInt('dosmiley', 0, 'POST');
+	$doxcode       = Request::getInt('doxcode', 0, 'POST') ? 1 : 0;
+	$dobr          = Request::getInt('dobr', 0, 'POST') ? 1 : 0;
+	$icon          = (Request::getString('icon', '', 'POST')
+					  && is_file($GLOBALS['xoops']->path('images/subject/' . Request::getString('icon', '', 'POST'))) ? Request::getString('icon', '', 'POST') : '');
+	$attachsig     = Request::getBool('attachsig', false, 'POST')
+					 && $topicHandler->getPermission($forumObject, $topic_status, 'signature');
+	$view_require  = Request::getString('view_require', '', 'POST');
+	$post_karma    = ('require_karma' === $view_require) ? Request::getInt('post_karma', 0, 'POST') : 0;
+	$require_reply = ('require_reply' === $view_require);
+	$postObject->setVar('subject', $subject);
+	$editwhy = xoops_trim(Request::getString('editwhy', '', 'POST')); // !empty($_POST['editwhy'])) ? xoops_trim($_POST['editwhy']) : "";
+
+	if ($dohtml && !newbbIsAdmin($forumObject)) {
+		//$message=newbb_textFilter($message);
+	}
+	$postObject->setVar('post_text', $message);
+	$postObject->setVar('post_karma', $post_karma);
+	$postObject->setVar('require_reply', $require_reply);
+	$postObject->setVar('poster_name', $poster_name);
+	$postObject->setVar('dohtml', $dohtml);
+	$postObject->setVar('dosmiley', $dosmiley);
+	$postObject->setVar('doxcode', $doxcode);
+	$postObject->setVar('dobr', $dobr);
+	$postObject->setVar('icon', $icon);
+	$postObject->setVar('attachsig', $attachsig);
+	$postObject->setAttachment();
+	if (!empty($post_id)) {
+		$postObject->setPostEdit($poster_name, $editwhy);
+	} // is reply
+
+	//    $attachments_tmp = array();
+	//    if (!empty($_POST["attachments_tmp"])) {
+	if (Request::getString('attachments_tmp', '', 'POST')) {
+		$attachments_tmp = unserialize(base64_decode(Request::getString('attachments_tmp', '', 'POST')));
+		if (Request::getArray('delete_tmp', null, 'POST') && count(Request::getArray('delete_tmp', null, 'POST')) > 1) {
+			foreach (Request::getArray('delete_tmp', null, 'POST') as $key) {
+				unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachments_tmp[$key][0]));
+				unset($attachments_tmp[$key]);
+			}
+		}
+	}
+	if (isset($attachments_tmp) && count($attachments_tmp)) {
+		foreach ($attachments_tmp as $key => $attach) {
+			if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachments_tmp[$key][0]))) {
+				$postObject->setAttachment($attach[0], $attach[1], $attach[2]);
+			}
+		}
+	}
+	$error_upload = '';
+
+	if (isset($_FILES['userfile']['name']) && '' !== $_FILES['userfile']['name']
+		&& $topicHandler->getPermission($forumObject, $topic_status, 'attach')) {
 //        require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php');
-        $maxfilesize = $forumObject->getVar('attach_maxkb') * 1024;
-        $uploaddir   = XOOPS_CACHE_PATH;
-
-        $uploader = new Newbb\Uploader($uploaddir, $forumObject->getVar('attach_ext'), (int)$maxfilesize, (int)$GLOBALS['xoopsModuleConfig']['max_img_width'], (int)$GLOBALS['xoopsModuleConfig']['max_img_height']);
-
-        if ($_FILES['userfile']['error'] > 0) {
-            switch ($_FILES['userfile']['error']) {
-                case 1:
-                    $error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
-                    break;
-                case 2:
-                    $error_message[] = sprintf(_MD_NEWBB_MAXKB, $forumObject->getVar('attach_maxkb'));
-                    break;
-                default:
-                    $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
-                    break;
-            }
-        } else {
-            $uploader->setCheckMediaTypeByExt();
-            $temp = Request::getArray('xoops_upload_file', [], 'POST');
-            if ($uploader->fetchMedia($temp[0])) {
-                $prefix = is_object($GLOBALS['xoopsUser']) ? (string)$GLOBALS['xoopsUser']->uid() . '_' : 'newbb_';
-                $uploader->setPrefix($prefix);
-                if (!$uploader->upload()) {
-                    $error_message[] = $error_upload = $uploader->getErrors();
-                } else {
-                    if (is_file($uploader->getSavedDestination())) {
-                        if (rename(XOOPS_CACHE_PATH . '/' . $uploader->getSavedFileName(), $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $uploader->getSavedFileName()))) {
-                            $postObject->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
-                        }
-                    }
-                }
-            } else {
-                $error_message[] = $error_upload = $uploader->getErrors();
-            }
-        }
-    }
-
-    $postid = $postHandler->insert($postObject);
-
-    if (!$postid) {
-        require_once $GLOBALS['xoops']->path('header.php');
-        xoops_error($postObject->getErrors());
-        require_once $GLOBALS['xoops']->path('footer.php');
-    }
-    newbbSetSession('LP', time()); // Recording last post time
-    $topicObject = $topicHandler->get($postObject->getVar('topic_id'));
-    $uid         = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
-    if (newbbIsAdmin($forumObject)
-        || ($topicHandler->getPermission($forumObject, $topic_status, 'type')
-            && (0 == $topic_id
-                || $uid == $topicObject->getVar('topic_poster')))) {
-        $topicObject->setVar('type_id', Request::getInt('type_id', 0, 'POST'));
-    }
-
-    if (!empty($GLOBALS['xoopsModuleConfig']['do_tag']) && $postObject->isTopic()) {
-        $topicObject->setVar('topic_tags', Request::getInt('topic_tags', 0, 'POST'));
-    }
-    $topicHandler->insert($topicObject);
-
-    // Set read mark
-    if (!empty($isnew)) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.read.php');
-        newbbSetRead('topic', $topicObject->getVar('topic_id'), $postid);
-        if (!$postObject->getVar('pid')) {
-            newbbSetRead('forum', $forumObject->getVar('forum_id'), $postid);
-        }
-    }
-
-    //$postObject->loadFilters(empty($isnew) ? 'update' : 'insert');
-
-    // Define tags for notification message
-    if (!empty($isnew) && $approved && !empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
-        $tags                = [];
-        $tags['THREAD_NAME'] = Request::getString('subject', '', 'POST');
-        $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?post_id=' . $postid;
-        $tags['POST_URL']    = $tags['THREAD_URL']; // . '#forumpost' . $postid;
-        require_once __DIR__ . '/include/notification.inc.php';
-        $forum_info         = newbb_notify_iteminfo('forum', $forumObject->getVar('forum_id'));
-        $tags['FORUM_NAME'] = $forum_info['name'];
-        $tags['FORUM_URL']  = $forum_info['url'];
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler = xoops_getHandler('notification');
-        if (empty($isreply)) {
-            // Notify of new thread
-            $notificationHandler->triggerEvent('forum', $forumObject->getVar('forum_id'), 'new_thread', $tags);
-        } else {
-            // Notify of new post
-            $notificationHandler->triggerEvent('thread', $topic_id, 'new_post', $tags);
-            $_tags['name'] = $tags['THREAD_NAME'];
-            $_tags['url']  = $tags['POST_URL'];
-            $_tags['uid']  = $uid;
-            $notificationHandler->triggerEvent('thread', $topic_id, 'post', $_tags);
-        }
-        $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
-        $notificationHandler->triggerEvent('forum', $forumObject->getVar('forum_id'), 'new_post', $tags);
-        $tags['POST_CONTENT'] = Request::getString('message', '', 'POST');
-        $tags['POST_NAME']    = Request::getString('subject', '', 'POST');
-        $notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
-        $notificationHandler->triggerEvent('forum', $forumObject->getVar('forum_id'), 'new_fullpost', $tags);
-    }
-
-    // If user checked notification box, subscribe them to the
-    // appropriate event; if unchecked, then unsubscribe
-    if (!empty($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
-        $notificationHandler = xoops_getHandler('notification');
-        if (!Request::getInt('notify', 0, 'POST')) {
-            $notificationHandler->unsubscribe('thread', $postObject->getVar('topic_id'), 'new_post');
-        } elseif (Request::getInt('notify', 0, 'POST') > 0) {
-            $notificationHandler->subscribe('thread', $postObject->getVar('topic_id'), 'new_post');
-        }
-        // elseif ($_POST['notify']<0) keep it as it is
-    }
-
-    if ($approved) {
-        if (!empty($GLOBALS['xoopsModuleConfig']['cache_enabled'])) {
-            newbbSetSession('t' . $postObject->getVar('topic_id'), null);
-        }
-        // Update user
-        if ($uid > 0) {
-            $sql = 'SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '    WHERE approved=1 AND topic_poster =' . $uid;
-            $ret = $GLOBALS['xoopsDB']->query($sql);
-            list($topics) = $GLOBALS['xoopsDB']->fetchRow($ret);
-
-            $sql = '    SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '    WHERE approved=1 AND topic_digest > 0 AND topic_poster =' . $uid;
-            $ret = $GLOBALS['xoopsDB']->query($sql);
-            list($digests) = $GLOBALS['xoopsDB']->fetchRow($ret);
-
-            $sql = '    SELECT count(*), MAX(post_time)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '    WHERE approved=1 AND uid =' . $uid;
-            $ret = $GLOBALS['xoopsDB']->query($sql);
-            list($posts, $lastpost) = $GLOBALS['xoopsDB']->fetchRow($ret);
-
-            $GLOBALS['xoopsDB']->queryF('    REPLACE INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_user_stats') . "     SET uid = '{$uid}', user_topics = '{$topics}', user_posts = '{$posts}', user_digests = '{$digests}', user_lastpost = '{$lastpost}'");
-        }
-
-        $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $postid;
-        $message  = _MD_NEWBB_THANKSSUBMIT . '<br>' . $error_upload;
-    } else {
-        $redirect = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $postObject->getVar('forum_id');
-        $message  = _MD_NEWBB_THANKSSUBMIT . '<br>' . _MD_NEWBB_WAITFORAPPROVAL . '<br>' . $error_upload;
-    }
-
-    if ('add' === $op) {
-        redirect_header(XOOPS_URL . '/modules/newbb/polls.php?op=add&amp;forum=' . $postObject->getVar('forum_id') . '&amp;topic_id=' . $postObject->getVar('topic_id'), 1, _MD_NEWBB_ADDPOLL);
-    } else {
-        redirect_header($redirect, 2, $message);
-    }
+		$maxfilesize = $forumObject->getVar('attach_maxkb') * 1024;
+		$uploaddir   = XOOPS_CACHE_PATH;
+
+		$uploader = new Newbb\Uploader($uploaddir, $forumObject->getVar('attach_ext'), (int)$maxfilesize, (int)$GLOBALS['xoopsModuleConfig']['max_img_width'], (int)$GLOBALS['xoopsModuleConfig']['max_img_height']);
+
+		if ($_FILES['userfile']['error'] > 0) {
+			switch ($_FILES['userfile']['error']) {
+				case 1:
+					$error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
+					break;
+				case 2:
+					$error_message[] = sprintf(_MD_NEWBB_MAXKB, $forumObject->getVar('attach_maxkb'));
+					break;
+				default:
+					$error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
+					break;
+			}
+		} else {
+			$uploader->setCheckMediaTypeByExt();
+			$temp = Request::getArray('xoops_upload_file', [], 'POST');
+			if ($uploader->fetchMedia($temp[0])) {
+				$prefix = is_object($GLOBALS['xoopsUser']) ? (string)$GLOBALS['xoopsUser']->uid() . '_' : 'newbb_';
+				$uploader->setPrefix($prefix);
+				if (!$uploader->upload()) {
+					$error_message[] = $error_upload = $uploader->getErrors();
+				} else {
+					if (is_file($uploader->getSavedDestination())) {
+						if (rename(XOOPS_CACHE_PATH . '/' . $uploader->getSavedFileName(), $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $uploader->getSavedFileName()))) {
+							$postObject->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
+						}
+					}
+				}
+			} else {
+				$error_message[] = $error_upload = $uploader->getErrors();
+			}
+		}
+	}
+
+	$postid = $postHandler->insert($postObject);
+
+	if (!$postid) {
+		require_once $GLOBALS['xoops']->path('header.php');
+		xoops_error($postObject->getErrors());
+		require_once $GLOBALS['xoops']->path('footer.php');
+	}
+	newbbSetSession('LP', time()); // Recording last post time
+	$topicObject = $topicHandler->get($postObject->getVar('topic_id'));
+	$uid         = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+	if (newbbIsAdmin($forumObject)
+		|| ($topicHandler->getPermission($forumObject, $topic_status, 'type')
+			&& (0 == $topic_id
+				|| $uid == $topicObject->getVar('topic_poster')))) {
+		$topicObject->setVar('type_id', Request::getInt('type_id', 0, 'POST'));
+	}
+
+	if (!empty($GLOBALS['xoopsModuleConfig']['do_tag']) && $postObject->isTopic()) {
+		$topicObject->setVar('topic_tags', Request::getInt('topic_tags', 0, 'POST'));
+	}
+	$topicHandler->insert($topicObject);
+
+	// Set read mark
+	if (!empty($isnew)) {
+		require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.read.php');
+		newbbSetRead('topic', $topicObject->getVar('topic_id'), $postid);
+		if (!$postObject->getVar('pid')) {
+			newbbSetRead('forum', $forumObject->getVar('forum_id'), $postid);
+		}
+	}
+
+	//$postObject->loadFilters(empty($isnew) ? 'update' : 'insert');
+
+	// Define tags for notification message
+	if (!empty($isnew) && $approved && !empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
+		$tags                = [];
+		$tags['THREAD_NAME'] = Request::getString('subject', '', 'POST');
+		$tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?post_id=' . $postid;
+		$tags['POST_URL']    = $tags['THREAD_URL']; // . '#forumpost' . $postid;
+		require_once __DIR__ . '/include/notification.inc.php';
+		$forum_info         = newbb_notify_iteminfo('forum', $forumObject->getVar('forum_id'));
+		$tags['FORUM_NAME'] = $forum_info['name'];
+		$tags['FORUM_URL']  = $forum_info['url'];
+		/** @var \XoopsNotificationHandler $notificationHandler */
+		$notificationHandler = xoops_getHandler('notification');
+		if (empty($isreply)) {
+			// Notify of new thread
+			$notificationHandler->triggerEvent('forum', $forumObject->getVar('forum_id'), 'new_thread', $tags);
+		} else {
+			// Notify of new post
+			$notificationHandler->triggerEvent('thread', $topic_id, 'new_post', $tags);
+			$_tags['name'] = $tags['THREAD_NAME'];
+			$_tags['url']  = $tags['POST_URL'];
+			$_tags['uid']  = $uid;
+			$notificationHandler->triggerEvent('thread', $topic_id, 'post', $_tags);
+		}
+		$notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
+		$notificationHandler->triggerEvent('forum', $forumObject->getVar('forum_id'), 'new_post', $tags);
+		$tags['POST_CONTENT'] = Request::getString('message', '', 'POST');
+		$tags['POST_NAME']    = Request::getString('subject', '', 'POST');
+		$notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
+		$notificationHandler->triggerEvent('forum', $forumObject->getVar('forum_id'), 'new_fullpost', $tags);
+	}
+
+	// If user checked notification box, subscribe them to the
+	// appropriate event; if unchecked, then unsubscribe
+	if (!empty($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
+		$notificationHandler = xoops_getHandler('notification');
+		if (!Request::getInt('notify', 0, 'POST')) {
+			$notificationHandler->unsubscribe('thread', $postObject->getVar('topic_id'), 'new_post');
+		} elseif (Request::getInt('notify', 0, 'POST') > 0) {
+			$notificationHandler->subscribe('thread', $postObject->getVar('topic_id'), 'new_post');
+		}
+		// elseif ($_POST['notify']<0) keep it as it is
+	}
+
+	if ($approved) {
+		if (!empty($GLOBALS['xoopsModuleConfig']['cache_enabled'])) {
+			newbbSetSession('t' . $postObject->getVar('topic_id'), null);
+		}
+		// Update user
+		if ($uid > 0) {
+			$sql = 'SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '    WHERE approved=1 AND topic_poster =' . $uid;
+			$ret = $GLOBALS['xoopsDB']->query($sql);
+			list($topics) = $GLOBALS['xoopsDB']->fetchRow($ret);
+
+			$sql = '    SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '    WHERE approved=1 AND topic_digest > 0 AND topic_poster =' . $uid;
+			$ret = $GLOBALS['xoopsDB']->query($sql);
+			list($digests) = $GLOBALS['xoopsDB']->fetchRow($ret);
+
+			$sql = '    SELECT count(*), MAX(post_time)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '    WHERE approved=1 AND uid =' . $uid;
+			$ret = $GLOBALS['xoopsDB']->query($sql);
+			list($posts, $lastpost) = $GLOBALS['xoopsDB']->fetchRow($ret);
+
+			$GLOBALS['xoopsDB']->queryF('    REPLACE INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_user_stats') . "     SET uid = '{$uid}', user_topics = '{$topics}', user_posts = '{$posts}', user_digests = '{$digests}', user_lastpost = '{$lastpost}'");
+		}
+
+		$redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $postid;
+		$message  = _MD_NEWBB_THANKSSUBMIT . '<br>' . $error_upload;
+	} else {
+		$redirect = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $postObject->getVar('forum_id');
+		$message  = _MD_NEWBB_THANKSSUBMIT . '<br>' . _MD_NEWBB_WAITFORAPPROVAL . '<br>' . $error_upload;
+	}
+
+	if ('add' === $op) {
+		redirect_header(XOOPS_URL . '/modules/newbb/polls.php?op=add&amp;forum=' . $postObject->getVar('forum_id') . '&amp;topic_id=' . $postObject->getVar('topic_id'), 1, _MD_NEWBB_ADDPOLL);
+	} else {
+		redirect_header($redirect, 2, $message);
+	}
 }
 
 $xoopsOption['template_main']                                        = 'newbb_edit_post.tpl';
@@ -409,125 +409,125 @@ 
 //$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 
 if (Request::getString('contents_upload', null, 'POST')) {
-    $attachments_tmp = [];
-    if (Request::getArray('attachments_tmp', null, 'POST')) {
-        $attachments_tmp = unserialize(base64_decode(Request::getArray('attachments_tmp', [], 'POST')));
-        if (Request::getArray('delete_tmp', null, 'POST') && count(Request::getArray('delete_tmp', null, 'POST'))) {
-            foreach (Request::getArray('delete_tmp', '', 'POST') as $key) {
-                unlink($uploaddir = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachments_tmp[$key][0]));
-                unset($attachments_tmp[$key]);
-            }
-        }
-    }
-
-    $error_upload = '';
-    if (isset($_FILES['userfile']['name']) && '' !== $_FILES['userfile']['name']) {
+	$attachments_tmp = [];
+	if (Request::getArray('attachments_tmp', null, 'POST')) {
+		$attachments_tmp = unserialize(base64_decode(Request::getArray('attachments_tmp', [], 'POST')));
+		if (Request::getArray('delete_tmp', null, 'POST') && count(Request::getArray('delete_tmp', null, 'POST'))) {
+			foreach (Request::getArray('delete_tmp', '', 'POST') as $key) {
+				unlink($uploaddir = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachments_tmp[$key][0]));
+				unset($attachments_tmp[$key]);
+			}
+		}
+	}
+
+	$error_upload = '';
+	if (isset($_FILES['userfile']['name']) && '' !== $_FILES['userfile']['name']) {
 //        require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php');
-        $maxfilesize = $forumObject->getVar('attach_maxkb') * 1024;
-        $uploaddir   = XOOPS_CACHE_PATH;
-
-        $uploader = new Newbb\Uploader($uploaddir, $forumObject->getVar('attach_ext'), (int)$maxfilesize, (int)$GLOBALS['xoopsModuleConfig']['max_img_width'], (int)$GLOBALS['xoopsModuleConfig']['max_img_height']);
-        if ($_FILES['userfile']['error'] > 0) {
-            switch ($_FILES['userfile']['error']) {
-                case 1:
-                    $error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
-                    break;
-                case 2:
-                    $error_message[] = sprintf(_MD_NEWBB_MAXKB, $forumObject->getVar('attach_maxkb'));
-                    break;
-                default:
-                    $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
-                    break;
-            }
-        } else {
-            $uploader->setCheckMediaTypeByExt();
-            $temp = Request::getArray('xoops_upload_file', [], 'POST');
-            if ($uploader->fetchMedia($temp[0])) {
-                $prefix = is_object($GLOBALS['xoopsUser']) ? (string)$GLOBALS['xoopsUser']->uid() . '_' : 'newbb_';
-                $uploader->setPrefix($prefix);
-                if (!$uploader->upload()) {
-                    $error_message[] = $error_upload = $uploader->getErrors();
-                } else {
-                    if (is_file($uploader->getSavedDestination())) {
-                        $attachments_tmp[(string)time()] = [
-                            $uploader->getSavedFileName(),
-                            $uploader->getMediaName(),
-                            $uploader->getMediaType()
-                        ];
-                    }
-                }
-            } else {
-                $error_message[] = $error_upload = $uploader->getErrors();
-            }
-        }
-    }
+		$maxfilesize = $forumObject->getVar('attach_maxkb') * 1024;
+		$uploaddir   = XOOPS_CACHE_PATH;
+
+		$uploader = new Newbb\Uploader($uploaddir, $forumObject->getVar('attach_ext'), (int)$maxfilesize, (int)$GLOBALS['xoopsModuleConfig']['max_img_width'], (int)$GLOBALS['xoopsModuleConfig']['max_img_height']);
+		if ($_FILES['userfile']['error'] > 0) {
+			switch ($_FILES['userfile']['error']) {
+				case 1:
+					$error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
+					break;
+				case 2:
+					$error_message[] = sprintf(_MD_NEWBB_MAXKB, $forumObject->getVar('attach_maxkb'));
+					break;
+				default:
+					$error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
+					break;
+			}
+		} else {
+			$uploader->setCheckMediaTypeByExt();
+			$temp = Request::getArray('xoops_upload_file', [], 'POST');
+			if ($uploader->fetchMedia($temp[0])) {
+				$prefix = is_object($GLOBALS['xoopsUser']) ? (string)$GLOBALS['xoopsUser']->uid() . '_' : 'newbb_';
+				$uploader->setPrefix($prefix);
+				if (!$uploader->upload()) {
+					$error_message[] = $error_upload = $uploader->getErrors();
+				} else {
+					if (is_file($uploader->getSavedDestination())) {
+						$attachments_tmp[(string)time()] = [
+							$uploader->getSavedFileName(),
+							$uploader->getMediaName(),
+							$uploader->getMediaType()
+						];
+					}
+				}
+			} else {
+				$error_message[] = $error_upload = $uploader->getErrors();
+			}
+		}
+	}
 }
 
 if (Request::getString('contents_preview', Request::getString('contents_preview', '', 'POST'), 'GET')) {
-    if (Request::getString('attachments_tmp', '', 'POST')) {
-        $attachments_tmp = unserialize(base64_decode(Request::getString('attachments_tmp', '', 'POST')));
-    }
-
-    $p_subject = $myts->htmlSpecialChars(Request::getString('subject', '', 'POST'));
-    $dosmiley  = Request::getInt('dosmiley', 0, 'POST');
-    $dohtml    = Request::getInt('dohtml', 0, 'POST');
-    $doxcode   = Request::getInt('doxcode', 0, 'POST');
-    $dobr      = Request::getInt('dobr', 0, 'POST');
-    $p_message = Request::getString('message', '', 'POST');
-    $p_message = $myts->previewTarea($p_message, $dohtml, $dosmiley, $doxcode, 1, $dobr);
-    $p_date    = formatTimestamp(time());
-    if ($postObject->isNew()) {
-        if (is_object($GLOBALS['xoopsUser'])) {
-            $p_name = $GLOBALS['xoopsUser']->getVar('uname');
-            if (!empty($GLOBALS['xoopsModuleConfig']['show_realname']) && $GLOBALS['xoopsUser']->getVar('name')) {
-                $p_name = $GLOBALS['xoopsUser']->getVar('name');
-            }
-        }
-    } elseif ($postObject->getVar('uid')) {
-        $p_name = newbbGetUnameFromId($postObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
-    }
-    if (empty($p_name)) {
-        $p_name = Request::getString('poster_name', '', 'POST') ? htmlspecialchars(Request::getString('poster_name', '', 'POST'), ENT_QUOTES | ENT_HTML5) : htmlspecialchars($GLOBALS['xoopsConfig']['anonymous'], ENT_QUOTES | ENT_HTML5);
-    }
-
-    $post_preview = [
-        'subject' => $p_subject,
-        'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
-        'content' => $p_message
-    ];
-    $xoopsTpl->assign_by_ref('post_preview', $post_preview);
+	if (Request::getString('attachments_tmp', '', 'POST')) {
+		$attachments_tmp = unserialize(base64_decode(Request::getString('attachments_tmp', '', 'POST')));
+	}
+
+	$p_subject = $myts->htmlSpecialChars(Request::getString('subject', '', 'POST'));
+	$dosmiley  = Request::getInt('dosmiley', 0, 'POST');
+	$dohtml    = Request::getInt('dohtml', 0, 'POST');
+	$doxcode   = Request::getInt('doxcode', 0, 'POST');
+	$dobr      = Request::getInt('dobr', 0, 'POST');
+	$p_message = Request::getString('message', '', 'POST');
+	$p_message = $myts->previewTarea($p_message, $dohtml, $dosmiley, $doxcode, 1, $dobr);
+	$p_date    = formatTimestamp(time());
+	if ($postObject->isNew()) {
+		if (is_object($GLOBALS['xoopsUser'])) {
+			$p_name = $GLOBALS['xoopsUser']->getVar('uname');
+			if (!empty($GLOBALS['xoopsModuleConfig']['show_realname']) && $GLOBALS['xoopsUser']->getVar('name')) {
+				$p_name = $GLOBALS['xoopsUser']->getVar('name');
+			}
+		}
+	} elseif ($postObject->getVar('uid')) {
+		$p_name = newbbGetUnameFromId($postObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
+	}
+	if (empty($p_name)) {
+		$p_name = Request::getString('poster_name', '', 'POST') ? htmlspecialchars(Request::getString('poster_name', '', 'POST'), ENT_QUOTES | ENT_HTML5) : htmlspecialchars($GLOBALS['xoopsConfig']['anonymous'], ENT_QUOTES | ENT_HTML5);
+	}
+
+	$post_preview = [
+		'subject' => $p_subject,
+		'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
+		'content' => $p_message
+	];
+	$xoopsTpl->assign_by_ref('post_preview', $post_preview);
 }
 
 if (Request::getString('contents_upload', null, 'POST') || Request::getString('contents_preview', null, 'POST')
-    || Request::getString('contents_preview', null, 'GET')
-    || Request::getString('editor', '', 'POST')) {
-    $editor        = Request::getString('editor', '', 'POST');
-    $dosmiley      = Request::getInt('dosmiley', 0, 'POST');
-    $dohtml        = Request::getInt('dohtml', 0, 'POST');
-    $doxcode       = Request::getInt('doxcode', 0, 'POST');
-    $dobr          = Request::getInt('dobr', 0, 'POST');
-    $subject       = Request::getString('subject', '', 'POST');
-    $message       = Request::getString('message', '', 'POST');
-    $poster_name   = Request::getString('poster_name', '', 'POST');
-    $hidden        = Request::getString('hidden', '', 'POST');
-    $notify        = Request::getInt('notify', 0, 'POST');
-    $attachsig     = Request::getInt('attachsig', 0, 'POST');//!empty($_POST['attachsig']) ? 1 : 0;
-    $isreply       = Request::getInt('isreply', 0, 'POST'); //!empty($_POST['isreply']) ? 1 : 0;
-    $isedit        = Request::getInt('isedit', 0, 'POST'); //!empty($_POST['isedit']) ? 1 : 0;
-    $icon          = (Request::getString('icon', '', 'POST')
-                      && is_file($GLOBALS['xoops']->path('images/subject/' . Request::getString('icon', '', 'POST'))) ? Request::getString('icon', '', 'POST') : '');
-    $view_require  = Request::getString('view_require', '', 'POST');
-    $post_karma    = (('require_karma' === $view_require)
-                      && !Request::getInt('post_karma', 0, 'POST')) ? Request::getInt('post_karma', 0, 'POST') : 0;
-    $require_reply = ('require_reply' === $view_require) ? 1 : 0;
-
-    if (!Request::getString('contents_upload', '', 'POST')) {
-        $contents_preview = 1;
-    }
-    $attachments = $postObject->getAttachment();
-    $xoopsTpl->assign('error_message', implode('<br>', $error_message));
-
-    require_once __DIR__   . '/include/form.post.php';
+	|| Request::getString('contents_preview', null, 'GET')
+	|| Request::getString('editor', '', 'POST')) {
+	$editor        = Request::getString('editor', '', 'POST');
+	$dosmiley      = Request::getInt('dosmiley', 0, 'POST');
+	$dohtml        = Request::getInt('dohtml', 0, 'POST');
+	$doxcode       = Request::getInt('doxcode', 0, 'POST');
+	$dobr          = Request::getInt('dobr', 0, 'POST');
+	$subject       = Request::getString('subject', '', 'POST');
+	$message       = Request::getString('message', '', 'POST');
+	$poster_name   = Request::getString('poster_name', '', 'POST');
+	$hidden        = Request::getString('hidden', '', 'POST');
+	$notify        = Request::getInt('notify', 0, 'POST');
+	$attachsig     = Request::getInt('attachsig', 0, 'POST');//!empty($_POST['attachsig']) ? 1 : 0;
+	$isreply       = Request::getInt('isreply', 0, 'POST'); //!empty($_POST['isreply']) ? 1 : 0;
+	$isedit        = Request::getInt('isedit', 0, 'POST'); //!empty($_POST['isedit']) ? 1 : 0;
+	$icon          = (Request::getString('icon', '', 'POST')
+					  && is_file($GLOBALS['xoops']->path('images/subject/' . Request::getString('icon', '', 'POST'))) ? Request::getString('icon', '', 'POST') : '');
+	$view_require  = Request::getString('view_require', '', 'POST');
+	$post_karma    = (('require_karma' === $view_require)
+					  && !Request::getInt('post_karma', 0, 'POST')) ? Request::getInt('post_karma', 0, 'POST') : 0;
+	$require_reply = ('require_reply' === $view_require) ? 1 : 0;
+
+	if (!Request::getString('contents_upload', '', 'POST')) {
+		$contents_preview = 1;
+	}
+	$attachments = $postObject->getAttachment();
+	$xoopsTpl->assign('error_message', implode('<br>', $error_message));
+
+	require_once __DIR__   . '/include/form.post.php';
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

Spacing +31 added lines, -31 removed lines

@@ -19,7 +19,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 foreach ([
              'forum',
@@ -146,7 +146,7 @@ 
                 || ($postObject->checkTimelimit('edit_timelimit')
                     && $postObject->checkIdentity()))) {
         } else {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum={$forum_id}&topic_id={$topic_id}&post_id={$post_id}&order={$order}&viewmode={$viewmode}", 2, _MD_NEWBB_NORIGHTTOEDIT);
+            redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum={$forum_id}&topic_id={$topic_id}&post_id={$post_id}&order={$order}&viewmode={$viewmode}", 2, _MD_NEWBB_NORIGHTTOEDIT);
         }
 
         $delete_attach = Request::getArray('delete_attach', [], 'POST');
@@ -157,12 +157,12 @@ 
         if ($topic_id) {
             $topic_status = $topicObject->getVar('topic_status');
             if (!$topicHandler->getPermission($forumObject, $topic_status, 'reply')) {
-                redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum={$forum_id}&topic_id={$topic_id}&post_id={$post_id}&order={$order}&viewmode={$viewmode}", 2, _MD_NEWBB_NORIGHTTOREPLY);
+                redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum={$forum_id}&topic_id={$topic_id}&post_id={$post_id}&order={$order}&viewmode={$viewmode}", 2, _MD_NEWBB_NORIGHTTOREPLY);
             }
         } else {
             $topic_status = 0;
             if (!$topicHandler->getPermission($forumObject, $topic_status, 'post')) {
-                redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum={$forum_id}", 2, _MD_NEWBB_NORIGHTTOPOST);
+                redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum={$forum_id}", 2, _MD_NEWBB_NORIGHTTOPOST);
             }
         }
 
@@ -201,7 +201,7 @@ 
     $doxcode       = Request::getInt('doxcode', 0, 'POST') ? 1 : 0;
     $dobr          = Request::getInt('dobr', 0, 'POST') ? 1 : 0;
     $icon          = (Request::getString('icon', '', 'POST')
-                      && is_file($GLOBALS['xoops']->path('images/subject/' . Request::getString('icon', '', 'POST'))) ? Request::getString('icon', '', 'POST') : '');
+                      && is_file($GLOBALS['xoops']->path('images/subject/'.Request::getString('icon', '', 'POST'))) ? Request::getString('icon', '', 'POST') : '');
     $attachsig     = Request::getBool('attachsig', false, 'POST')
                      && $topicHandler->getPermission($forumObject, $topic_status, 'signature');
     $view_require  = Request::getString('view_require', '', 'POST');
@@ -234,14 +234,14 @@ 
         $attachments_tmp = unserialize(base64_decode(Request::getString('attachments_tmp', '', 'POST')));
         if (Request::getArray('delete_tmp', null, 'POST') && count(Request::getArray('delete_tmp', null, 'POST')) > 1) {
             foreach (Request::getArray('delete_tmp', null, 'POST') as $key) {
-                unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachments_tmp[$key][0]));
+                unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attachments_tmp[$key][0]));
                 unset($attachments_tmp[$key]);
             }
         }
     }
     if (isset($attachments_tmp) && count($attachments_tmp)) {
         foreach ($attachments_tmp as $key => $attach) {
-            if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachments_tmp[$key][0]))) {
+            if (rename(XOOPS_CACHE_PATH.'/'.$attachments_tmp[$key][0], $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attachments_tmp[$key][0]))) {
                 $postObject->setAttachment($attach[0], $attach[1], $attach[2]);
             }
         }
@@ -254,7 +254,7 @@ 
         $maxfilesize = $forumObject->getVar('attach_maxkb') * 1024;
         $uploaddir   = XOOPS_CACHE_PATH;
 
-        $uploader = new Newbb\Uploader($uploaddir, $forumObject->getVar('attach_ext'), (int)$maxfilesize, (int)$GLOBALS['xoopsModuleConfig']['max_img_width'], (int)$GLOBALS['xoopsModuleConfig']['max_img_height']);
+        $uploader = new Newbb\Uploader($uploaddir, $forumObject->getVar('attach_ext'), (int) $maxfilesize, (int) $GLOBALS['xoopsModuleConfig']['max_img_width'], (int) $GLOBALS['xoopsModuleConfig']['max_img_height']);
 
         if ($_FILES['userfile']['error'] > 0) {
             switch ($_FILES['userfile']['error']) {
@@ -272,13 +272,13 @@ 
             $uploader->setCheckMediaTypeByExt();
             $temp = Request::getArray('xoops_upload_file', [], 'POST');
             if ($uploader->fetchMedia($temp[0])) {
-                $prefix = is_object($GLOBALS['xoopsUser']) ? (string)$GLOBALS['xoopsUser']->uid() . '_' : 'newbb_';
+                $prefix = is_object($GLOBALS['xoopsUser']) ? (string) $GLOBALS['xoopsUser']->uid().'_' : 'newbb_';
                 $uploader->setPrefix($prefix);
                 if (!$uploader->upload()) {
                     $error_message[] = $error_upload = $uploader->getErrors();
                 } else {
                     if (is_file($uploader->getSavedDestination())) {
-                        if (rename(XOOPS_CACHE_PATH . '/' . $uploader->getSavedFileName(), $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $uploader->getSavedFileName()))) {
+                        if (rename(XOOPS_CACHE_PATH.'/'.$uploader->getSavedFileName(), $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$uploader->getSavedFileName()))) {
                             $postObject->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
                         }
                     }
@@ -326,9 +326,9 @@ 
     if (!empty($isnew) && $approved && !empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
         $tags                = [];
         $tags['THREAD_NAME'] = Request::getString('subject', '', 'POST');
-        $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewtopic.php?post_id=' . $postid;
+        $tags['THREAD_URL']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewtopic.php?post_id='.$postid;
         $tags['POST_URL']    = $tags['THREAD_URL']; // . '#forumpost' . $postid;
-        require_once __DIR__ . '/include/notification.inc.php';
+        require_once __DIR__.'/include/notification.inc.php';
         $forum_info         = newbb_notify_iteminfo('forum', $forumObject->getVar('forum_id'));
         $tags['FORUM_NAME'] = $forum_info['name'];
         $tags['FORUM_URL']  = $forum_info['url'];
@@ -367,34 +367,34 @@ 
 
     if ($approved) {
         if (!empty($GLOBALS['xoopsModuleConfig']['cache_enabled'])) {
-            newbbSetSession('t' . $postObject->getVar('topic_id'), null);
+            newbbSetSession('t'.$postObject->getVar('topic_id'), null);
         }
         // Update user
         if ($uid > 0) {
-            $sql = 'SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '    WHERE approved=1 AND topic_poster =' . $uid;
+            $sql = 'SELECT count(*)'.'    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').'    WHERE approved=1 AND topic_poster ='.$uid;
             $ret = $GLOBALS['xoopsDB']->query($sql);
             list($topics) = $GLOBALS['xoopsDB']->fetchRow($ret);
 
-            $sql = '    SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '    WHERE approved=1 AND topic_digest > 0 AND topic_poster =' . $uid;
+            $sql = '    SELECT count(*)'.'    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').'    WHERE approved=1 AND topic_digest > 0 AND topic_poster ='.$uid;
             $ret = $GLOBALS['xoopsDB']->query($sql);
             list($digests) = $GLOBALS['xoopsDB']->fetchRow($ret);
 
-            $sql = '    SELECT count(*), MAX(post_time)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '    WHERE approved=1 AND uid =' . $uid;
+            $sql = '    SELECT count(*), MAX(post_time)'.'    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts').'    WHERE approved=1 AND uid ='.$uid;
             $ret = $GLOBALS['xoopsDB']->query($sql);
             list($posts, $lastpost) = $GLOBALS['xoopsDB']->fetchRow($ret);
 
-            $GLOBALS['xoopsDB']->queryF('    REPLACE INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_user_stats') . "     SET uid = '{$uid}', user_topics = '{$topics}', user_posts = '{$posts}', user_digests = '{$digests}', user_lastpost = '{$lastpost}'");
+            $GLOBALS['xoopsDB']->queryF('    REPLACE INTO '.$GLOBALS['xoopsDB']->prefix('newbb_user_stats')."     SET uid = '{$uid}', user_topics = '{$topics}', user_posts = '{$posts}', user_digests = '{$digests}', user_lastpost = '{$lastpost}'");
         }
 
-        $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $postid;
-        $message  = _MD_NEWBB_THANKSSUBMIT . '<br>' . $error_upload;
+        $redirect = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$postid;
+        $message  = _MD_NEWBB_THANKSSUBMIT.'<br>'.$error_upload;
     } else {
-        $redirect = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $postObject->getVar('forum_id');
-        $message  = _MD_NEWBB_THANKSSUBMIT . '<br>' . _MD_NEWBB_WAITFORAPPROVAL . '<br>' . $error_upload;
+        $redirect = XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$postObject->getVar('forum_id');
+        $message  = _MD_NEWBB_THANKSSUBMIT.'<br>'._MD_NEWBB_WAITFORAPPROVAL.'<br>'.$error_upload;
     }
 
     if ('add' === $op) {
-        redirect_header(XOOPS_URL . '/modules/newbb/polls.php?op=add&amp;forum=' . $postObject->getVar('forum_id') . '&amp;topic_id=' . $postObject->getVar('topic_id'), 1, _MD_NEWBB_ADDPOLL);
+        redirect_header(XOOPS_URL.'/modules/newbb/polls.php?op=add&amp;forum='.$postObject->getVar('forum_id').'&amp;topic_id='.$postObject->getVar('topic_id'), 1, _MD_NEWBB_ADDPOLL);
     } else {
         redirect_header($redirect, 2, $message);
     }
@@ -414,7 +414,7 @@ 
         $attachments_tmp = unserialize(base64_decode(Request::getArray('attachments_tmp', [], 'POST')));
         if (Request::getArray('delete_tmp', null, 'POST') && count(Request::getArray('delete_tmp', null, 'POST'))) {
             foreach (Request::getArray('delete_tmp', '', 'POST') as $key) {
-                unlink($uploaddir = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachments_tmp[$key][0]));
+                unlink($uploaddir = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attachments_tmp[$key][0]));
                 unset($attachments_tmp[$key]);
             }
         }
@@ -426,7 +426,7 @@ 
         $maxfilesize = $forumObject->getVar('attach_maxkb') * 1024;
         $uploaddir   = XOOPS_CACHE_PATH;
 
-        $uploader = new Newbb\Uploader($uploaddir, $forumObject->getVar('attach_ext'), (int)$maxfilesize, (int)$GLOBALS['xoopsModuleConfig']['max_img_width'], (int)$GLOBALS['xoopsModuleConfig']['max_img_height']);
+        $uploader = new Newbb\Uploader($uploaddir, $forumObject->getVar('attach_ext'), (int) $maxfilesize, (int) $GLOBALS['xoopsModuleConfig']['max_img_width'], (int) $GLOBALS['xoopsModuleConfig']['max_img_height']);
         if ($_FILES['userfile']['error'] > 0) {
             switch ($_FILES['userfile']['error']) {
                 case 1:
@@ -443,13 +443,13 @@ 
             $uploader->setCheckMediaTypeByExt();
             $temp = Request::getArray('xoops_upload_file', [], 'POST');
             if ($uploader->fetchMedia($temp[0])) {
-                $prefix = is_object($GLOBALS['xoopsUser']) ? (string)$GLOBALS['xoopsUser']->uid() . '_' : 'newbb_';
+                $prefix = is_object($GLOBALS['xoopsUser']) ? (string) $GLOBALS['xoopsUser']->uid().'_' : 'newbb_';
                 $uploader->setPrefix($prefix);
                 if (!$uploader->upload()) {
                     $error_message[] = $error_upload = $uploader->getErrors();
                 } else {
                     if (is_file($uploader->getSavedDestination())) {
-                        $attachments_tmp[(string)time()] = [
+                        $attachments_tmp[(string) time()] = [
                             $uploader->getSavedFileName(),
                             $uploader->getMediaName(),
                             $uploader->getMediaType()
@@ -492,7 +492,7 @@ 
 
     $post_preview = [
         '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('post_preview', $post_preview);
@@ -511,11 +511,11 @@ 
     $poster_name   = Request::getString('poster_name', '', 'POST');
     $hidden        = Request::getString('hidden', '', 'POST');
     $notify        = Request::getInt('notify', 0, 'POST');
-    $attachsig     = Request::getInt('attachsig', 0, 'POST');//!empty($_POST['attachsig']) ? 1 : 0;
+    $attachsig     = Request::getInt('attachsig', 0, 'POST'); //!empty($_POST['attachsig']) ? 1 : 0;
     $isreply       = Request::getInt('isreply', 0, 'POST'); //!empty($_POST['isreply']) ? 1 : 0;
     $isedit        = Request::getInt('isedit', 0, 'POST'); //!empty($_POST['isedit']) ? 1 : 0;
     $icon          = (Request::getString('icon', '', 'POST')
-                      && is_file($GLOBALS['xoops']->path('images/subject/' . Request::getString('icon', '', 'POST'))) ? Request::getString('icon', '', 'POST') : '');
+                      && is_file($GLOBALS['xoops']->path('images/subject/'.Request::getString('icon', '', 'POST'))) ? Request::getString('icon', '', 'POST') : '');
     $view_require  = Request::getString('view_require', '', 'POST');
     $post_karma    = (('require_karma' === $view_require)
                       && !Request::getInt('post_karma', 0, 'POST')) ? Request::getInt('post_karma', 0, 'POST') : 0;
@@ -527,8 +527,8 @@ 
     $attachments = $postObject->getAttachment();
     $xoopsTpl->assign('error_message', implode('<br>', $error_message));
 
-    require_once __DIR__   . '/include/form.post.php';
+    require_once __DIR__.'/include/form.post.php';
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

newtopic.php

Indentation +17 added lines, -17 removed lines

@@ -14,14 +14,14 @@ 
 require_once __DIR__ . '/header.php';
 
 if (!$forum = Request::getString('forum', '', 'GET')) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _NOPERM);
+	redirect_header(XOOPS_URL . '/index.php', 2, _NOPERM);
 }
 
 ///** @var Newbb\TopicHandler $topicHandler */
@@ -29,25 +29,25 @@ 
 $topicObject = $topicHandler->create();
 $topicObject->setVar('forum_id', $forum);
 if (!$topicHandler->getPermission($forumObject, 0, 'post')) {
-    /*
+	/*
      * Build the page query
      */
-    $query_vars  = ['forum', '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(XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOPOST);
+	$query_vars  = ['forum', '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(XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOPOST);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject);
 }
 
 $xoopsOption['template_main']                                        = 'newbb_edit_post.tpl';
@@ -55,7 +55,7 @@ 
 require_once $GLOBALS['xoops']->path('header.php');
 
 if (1 == $GLOBALS['xoopsModuleConfig']['disc_show'] || 3 == $GLOBALS['xoopsModuleConfig']['disc_show']) {
-    $xoopsTpl->assign('disclaimer', $GLOBALS['xoopsModuleConfig']['disclaimer']);
+	$xoopsTpl->assign('disclaimer', $GLOBALS['xoopsModuleConfig']['disclaimer']);
 }
 
 $subject       = '';

Spacing +7 added lines, -7 removed lines

@@ -11,17 +11,17 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (!$forum = Request::getString('forum', '', 'GET')) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _NOPERM);
+    redirect_header(XOOPS_URL.'/index.php', 2, _NOPERM);
 }
 
 ///** @var Newbb\TopicHandler $topicHandler */
@@ -36,12 +36,12 @@ 
     $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);
     unset($query_array);
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOPOST);
+    redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?{$page_query}", 2, _MD_NEWBB_NORIGHTTOPOST);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
@@ -70,7 +70,7 @@ 
 $attachsig     = (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->getVar('attachsig')) ? 1 : 0;
 $post_id       = 0;
 $topic_id      = 0;
-require_once __DIR__   . '/include/form.post.php';
+require_once __DIR__.'/include/form.post.php';
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

topicmanager.php

Indentation +295 added lines, -295 removed lines

@@ -35,25 +35,25 @@ 
 require_once __DIR__ . '/header.php';
 
 if (Request::getString('submit', '', 'POST')) {
-    foreach (['forum', 'newforum', 'newtopic'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
-    }
-    foreach (['topic_id'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
-    }
-    if (!is_array($topic_id)) {
-        $topic_id = [$topic_id];
-    }
+	foreach (['forum', 'newforum', 'newtopic'] as $getint) {
+		${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
+	}
+	foreach (['topic_id'] as $getint) {
+		${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
+	}
+	if (!is_array($topic_id)) {
+		$topic_id = [$topic_id];
+	}
 } else {
-    foreach (['forum', 'topic_id'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'GET');// (int)(@$_GET[$getint]);
-    }
+	foreach (['forum', 'topic_id'] as $getint) {
+		${$getint} = Request::getInt($getint, 0, 'GET');// (int)(@$_GET[$getint]);
+	}
 }
 
 if (empty($topic_id)) {
-    $redirect = empty($forum_id) ? 'index.php' : 'viewforum.php?forum={$forum}';
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
-    redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+	$redirect = empty($forum_id) ? 'index.php' : 'viewforum.php?forum={$forum}';
+	$redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+	redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 ///** @var Newbb\TopicHandler $topicHandler */
@@ -62,43 +62,43 @@ 
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 
 if (!$forum) {
-    /** @var Newbb\Topic $topicObject */
-    $topicObject = $topicHandler->get((int)$topic_id);
-    if (is_object($topicObject)) {
-        $forum = $topicObject->getVar('forum_id');
-    } else {
-        $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $topic_id;
-        redirect_header($redirect, 2, _MD_NEWBB_FORUMNOEXIST);
-    }
-    unset($topicObject);
+	/** @var Newbb\Topic $topicObject */
+	$topicObject = $topicHandler->get((int)$topic_id);
+	if (is_object($topicObject)) {
+		$forum = $topicObject->getVar('forum_id');
+	} else {
+		$redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $topic_id;
+		redirect_header($redirect, 2, _MD_NEWBB_FORUMNOEXIST);
+	}
+	unset($topicObject);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forum);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forum);
 }
 // irmtfan add restore to viewtopic
 $action_array = [
-    'merge',
-    'delete',
-    'restore',
-    'move',
-    'lock',
-    'unlock',
-    'sticky',
-    'unsticky',
-    'digest',
-    'undigest'
+	'merge',
+	'delete',
+	'restore',
+	'move',
+	'lock',
+	'unlock',
+	'sticky',
+	'unsticky',
+	'digest',
+	'undigest'
 ];
 foreach ($action_array as $_action) {
-    $action[$_action] = [
-        'name'   => $_action,
-        'desc'   => constant(strtoupper("_MD_NEWBB_DESC_{$_action}")),
-        'submit' => constant(strtoupper("_MD_NEWBB_{$_action}")),
-        'sql'    => "topic_{$_action}=1",
-        'msg'    => constant(strtoupper("_MD_NEWBB_TOPIC{$_action}"))
-    ];
+	$action[$_action] = [
+		'name'   => $_action,
+		'desc'   => constant(strtoupper("_MD_NEWBB_DESC_{$_action}")),
+		'submit' => constant(strtoupper("_MD_NEWBB_{$_action}")),
+		'sql'    => "topic_{$_action}=1",
+		'msg'    => constant(strtoupper("_MD_NEWBB_TOPIC{$_action}"))
+	];
 }
 $action['lock']['sql']     = 'topic_status = 1';
 $action['unlock']['sql']   = 'topic_status = 0';
@@ -112,269 +112,269 @@ 
 require_once $GLOBALS['xoops']->path('header.php');
 
 if (Request::getString('submit', '', 'POST')) {
-    $mode = Request::getString('mode', '', 'POST');// $_POST['mode'];
+	$mode = Request::getString('mode', '', 'POST');// $_POST['mode'];
 
-    if ('delete' === $mode) {
-        foreach ($topic_id as $tid) {
-            $topicObject = $topicHandler->get($tid);
-            $topicHandler->delete($topicObject, false);
-            // irmtfan - sync topic after delete
-            $topicHandler->synchronization($topicObject);
-            $forumHandler->synchronization($forum);
-            //$topicObject->loadFilters("delete");
-            //sync($topic_id, "topic");
-            //xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id);
-        }
-        // irmtfan full URL
-        echo $action[$mode]['msg'] . "<p><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum=$forum'>" . _MD_NEWBB_RETURNTOTHEFORUM . "</a></p><p><a href='index.php'>" . _MD_NEWBB_RETURNFORUMINDEX . '</a></p>';
-    } elseif ('restore' === $mode) {
-        //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
-        foreach (array_keys($topicsObject) as $id) {
-            $topicObject = $topicsObject[$id];
-            $topicHandler->approve($topicObject);
-            $topicHandler->synchronization($topicObject);
-            $forums[$topicObject->getVar('forum_id')] = 1;
-        }
-        //irmtfan remove - no need to approve posts manually - see class/post.php approve function
-        $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);
-        // irmtfan add restore to viewtopic
-        $restoretopic_id = $topicObject->getVar('topic_id');
-        // irmtfan / missing in URL
-        echo $action[$mode]['msg']
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$restoretopic_id'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNTOTHEFORUM
-             . '</a></p>'
-             . "<p><a href='index.php'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
-    } elseif ('merge' === $mode) {
-        //        /** @var PostHandler $postHandler */
-        //        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-        //        /** @var Newbb\RateHandler $rateHandler */
-        //        $rateHandler = Newbb\Helper::getInstance()->getHandler('Rate');
+	if ('delete' === $mode) {
+		foreach ($topic_id as $tid) {
+			$topicObject = $topicHandler->get($tid);
+			$topicHandler->delete($topicObject, false);
+			// irmtfan - sync topic after delete
+			$topicHandler->synchronization($topicObject);
+			$forumHandler->synchronization($forum);
+			//$topicObject->loadFilters("delete");
+			//sync($topic_id, "topic");
+			//xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id);
+		}
+		// irmtfan full URL
+		echo $action[$mode]['msg'] . "<p><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum=$forum'>" . _MD_NEWBB_RETURNTOTHEFORUM . "</a></p><p><a href='index.php'>" . _MD_NEWBB_RETURNFORUMINDEX . '</a></p>';
+	} elseif ('restore' === $mode) {
+		//$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		$forums       = [];
+		$topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+		foreach (array_keys($topicsObject) as $id) {
+			$topicObject = $topicsObject[$id];
+			$topicHandler->approve($topicObject);
+			$topicHandler->synchronization($topicObject);
+			$forums[$topicObject->getVar('forum_id')] = 1;
+		}
+		//irmtfan remove - no need to approve posts manually - see class/post.php approve function
+		$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);
+		// irmtfan add restore to viewtopic
+		$restoretopic_id = $topicObject->getVar('topic_id');
+		// irmtfan / missing in URL
+		echo $action[$mode]['msg']
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewtopic.php?topic_id=$restoretopic_id'>"
+			 . _MD_NEWBB_VIEWTHETOPIC
+			 . '</a></p>'
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewforum.php?forum=$forum'>"
+			 . _MD_NEWBB_RETURNTOTHEFORUM
+			 . '</a></p>'
+			 . "<p><a href='index.php'>"
+			 . _MD_NEWBB_RETURNFORUMINDEX
+			 . '</a></p>';
+	} elseif ('merge' === $mode) {
+		//        /** @var PostHandler $postHandler */
+		//        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+		//        /** @var Newbb\RateHandler $rateHandler */
+		//        $rateHandler = Newbb\Helper::getInstance()->getHandler('Rate');
 
-        foreach ($topic_id as $tid) {
-            $topicObject    = $topicHandler->get($tid);
-            $newtopicObject = $topicHandler->get($newtopic);
+		foreach ($topic_id as $tid) {
+			$topicObject    = $topicHandler->get($tid);
+			$newtopicObject = $topicHandler->get($newtopic);
 
-            /* return false if destination topic is not existing */
-            // irmtfan bug fix: the old topic will be deleted if user input a not exist new topic
-            if (!is_object($newtopicObject)) {
-                $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $tid;
-                redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
-            }
-            $criteria_topic = new \Criteria('topic_id', $tid);
-            $criteria       = new \CriteriaCompo($criteria_topic);
-            $criteria->add(new \Criteria('pid', 0));
-            // irmtfan OR change to this for less query?:
-            // $postHandler->updateAll("pid", $newtopicObject->getVar("topic_last_post_id"), $criteria, true);
-            $postHandler->updateAll('pid', $topicHandler->getTopPostId($newtopic), $criteria, true);
-            $postHandler->updateAll('topic_id', $newtopic, $criteria_topic, true);
-            // irmtfan update vote data instead of deleting them
-            $rateHandler->updateAll('topic_id', $newtopic, $criteria_topic, true);
+			/* return false if destination topic is not existing */
+			// irmtfan bug fix: the old topic will be deleted if user input a not exist new topic
+			if (!is_object($newtopicObject)) {
+				$redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $tid;
+				redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+			}
+			$criteria_topic = new \Criteria('topic_id', $tid);
+			$criteria       = new \CriteriaCompo($criteria_topic);
+			$criteria->add(new \Criteria('pid', 0));
+			// irmtfan OR change to this for less query?:
+			// $postHandler->updateAll("pid", $newtopicObject->getVar("topic_last_post_id"), $criteria, true);
+			$postHandler->updateAll('pid', $topicHandler->getTopPostId($newtopic), $criteria, true);
+			$postHandler->updateAll('topic_id', $newtopic, $criteria_topic, true);
+			// irmtfan update vote data instead of deleting them
+			$rateHandler->updateAll('topic_id', $newtopic, $criteria_topic, true);
 
-            $topic_views = $topicObject->getVar('topic_views') + $newtopicObject->getVar('topic_views');
-            // irmtfan better method to update topic_views in new topic
-            //$criteria_newtopic = new \Criteria('topic_id', $newtopic);
-            //$topicHandler->updateAll('topic_views', $topic_views, $criteria_newtopic, true);
-            $newtopicObject->setVar('topic_views', $topic_views);
-            // START irmtfan poll_module and rewrite the method
-            // irmtfan only move poll in old topic to new topic if new topic has not a poll
-            $poll_id = $topicObject->getVar('poll_id');
-            if ($poll_id > 0 && (0 == $newtopicObject->getVar('poll_id'))) {
-                $newtopicObject->setVar('topic_haspoll', 1);
-                $newtopicObject->setVar('poll_id', $poll_id);
-                $poll_id = 0;// set to not delete the poll
-                $topicObject->setVar('topic_haspoll', 0); // set to not delete the poll
-                $topicObject->setVar('poll_id', 0);// set to not delete the poll
-            }
-            //update and sync newtopic after merge
-            //$topicHandler->insert($newtopicObject, true);
-            $topicHandler->synchronization($newtopicObject); // very important: only use object
-            //sync newforum after merge
-            $newforum = $newtopicObject->getVar('forum_id');
-            $forumHandler->synchronization($newforum);
-            //hardcode remove force to delete old topic from database
-            //$topicHandler->delete($topicObject,true); // cannot use this
-            $topicHandler->deleteAll($criteria_topic, true); // $force = true
-            //delete poll if old topic had a poll
-            $topicObject->deletePoll($poll_id);
-            //sync forum after delete old topic
-            $forumHandler->synchronization($forum);
-            // END irmtfan poll_module and rewrite the method
-        }
-        echo $action[$mode]['msg']
-             . // irmtfan full URL
-             "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$newtopic'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNTOTHEFORUM
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/index.php'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
-    } elseif ('move' === $mode) {
-        if ($newforum > 0) {
-            $topic_id    = $topic_id[0];
-            $topicObject = $topicHandler->get($topic_id);
-            $topicObject->loadFilters('update');
-            $topicObject->setVar('forum_id', $newforum, true);
-            $topicHandler->insert($topicObject, true);
-            $topicObject->loadFilters('update');
+			$topic_views = $topicObject->getVar('topic_views') + $newtopicObject->getVar('topic_views');
+			// irmtfan better method to update topic_views in new topic
+			//$criteria_newtopic = new \Criteria('topic_id', $newtopic);
+			//$topicHandler->updateAll('topic_views', $topic_views, $criteria_newtopic, true);
+			$newtopicObject->setVar('topic_views', $topic_views);
+			// START irmtfan poll_module and rewrite the method
+			// irmtfan only move poll in old topic to new topic if new topic has not a poll
+			$poll_id = $topicObject->getVar('poll_id');
+			if ($poll_id > 0 && (0 == $newtopicObject->getVar('poll_id'))) {
+				$newtopicObject->setVar('topic_haspoll', 1);
+				$newtopicObject->setVar('poll_id', $poll_id);
+				$poll_id = 0;// set to not delete the poll
+				$topicObject->setVar('topic_haspoll', 0); // set to not delete the poll
+				$topicObject->setVar('poll_id', 0);// set to not delete the poll
+			}
+			//update and sync newtopic after merge
+			//$topicHandler->insert($newtopicObject, true);
+			$topicHandler->synchronization($newtopicObject); // very important: only use object
+			//sync newforum after merge
+			$newforum = $newtopicObject->getVar('forum_id');
+			$forumHandler->synchronization($newforum);
+			//hardcode remove force to delete old topic from database
+			//$topicHandler->delete($topicObject,true); // cannot use this
+			$topicHandler->deleteAll($criteria_topic, true); // $force = true
+			//delete poll if old topic had a poll
+			$topicObject->deletePoll($poll_id);
+			//sync forum after delete old topic
+			$forumHandler->synchronization($forum);
+			// END irmtfan poll_module and rewrite the method
+		}
+		echo $action[$mode]['msg']
+			 . // irmtfan full URL
+			 "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewtopic.php?topic_id=$newtopic'>"
+			 . _MD_NEWBB_VIEWTHETOPIC
+			 . '</a></p>'
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewforum.php?forum=$forum'>"
+			 . _MD_NEWBB_RETURNTOTHEFORUM
+			 . '</a></p>'
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/index.php'>"
+			 . _MD_NEWBB_RETURNFORUMINDEX
+			 . '</a></p>';
+	} elseif ('move' === $mode) {
+		if ($newforum > 0) {
+			$topic_id    = $topic_id[0];
+			$topicObject = $topicHandler->get($topic_id);
+			$topicObject->loadFilters('update');
+			$topicObject->setVar('forum_id', $newforum, true);
+			$topicHandler->insert($topicObject, true);
+			$topicObject->loadFilters('update');
 
-            $sql = sprintf('UPDATE "%s" SET forum_id = "%u" WHERE topic_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_posts'), $newforum, $topic_id);
-            if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
-                return false;
-            }
-            $forumHandler->synchronization($forum);
-            $forumHandler->synchronization($newforum);
-            // irmtfan full URL
-            echo $action[$mode]['msg']
-                 . "<p><a href='"
-                 . XOOPS_URL
-                 . '/modules/'
-                 . $xoopsModule->getVar('dirname')
-                 . "/viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"
-                 . _MD_NEWBB_GOTONEWFORUM
-                 . "</a></p><p><a href='"
-                 . XOOPS_URL
-                 . "/modules/newbb/index.php'>"
-                 . _MD_NEWBB_RETURNFORUMINDEX
-                 . '</a></p>';
-        } else {
-            // irmtfan - issue with javascript:history.go(-1)
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERRORFORUM);
-        }
-    } else {
-        $topic_id  = $topic_id[0];
-        $forum     = $topicHandler->get($topic_id, 'forum_id');
-        $forum_new = !empty($newtopic) ? $topicHandler->get($newtopic, 'forum_id') : 0;
+			$sql = sprintf('UPDATE "%s" SET forum_id = "%u" WHERE topic_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_posts'), $newforum, $topic_id);
+			if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
+				return false;
+			}
+			$forumHandler->synchronization($forum);
+			$forumHandler->synchronization($newforum);
+			// irmtfan full URL
+			echo $action[$mode]['msg']
+				 . "<p><a href='"
+				 . XOOPS_URL
+				 . '/modules/'
+				 . $xoopsModule->getVar('dirname')
+				 . "/viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"
+				 . _MD_NEWBB_GOTONEWFORUM
+				 . "</a></p><p><a href='"
+				 . XOOPS_URL
+				 . "/modules/newbb/index.php'>"
+				 . _MD_NEWBB_RETURNFORUMINDEX
+				 . '</a></p>';
+		} else {
+			// irmtfan - issue with javascript:history.go(-1)
+			redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERRORFORUM);
+		}
+	} else {
+		$topic_id  = $topic_id[0];
+		$forum     = $topicHandler->get($topic_id, 'forum_id');
+		$forum_new = !empty($newtopic) ? $topicHandler->get($newtopic, 'forum_id') : 0;
 
-        if (!$forumHandler->getPermission($forum, 'moderate')
-            || (!empty($forum_new)
-                && !$forumHandler->getPermission($forum_new, 'reply'))        // The forum for the topic to be merged to
-            || (!empty($newforum) && !$forumHandler->getPermission($newforum, 'post')) // The forum to be moved to
-        ) {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _NOPERM);
-        }
+		if (!$forumHandler->getPermission($forum, 'moderate')
+			|| (!empty($forum_new)
+				&& !$forumHandler->getPermission($forum_new, 'reply'))        // The forum for the topic to be merged to
+			|| (!empty($newforum) && !$forumHandler->getPermission($newforum, 'post')) // The forum to be moved to
+		) {
+			redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _NOPERM);
+		}
 
-        if (!empty($action[$mode]['sql'])) {
-            $sql = sprintf('UPDATE `%s` SET ' . $action[$mode]['sql'] . ' WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $topic_id);
-            if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
-                redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_NEWBB_ERROR_BACK . '<br>sql: ' . $sql);
-            }
-        } else {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _MD_NEWBB_ERROR_BACK);
-        }
-        if ('digest' === $mode && $GLOBALS['xoopsDB']->getAffectedRows()) {
-            $topicObject = $topicHandler->get($topic_id);
-            //            /** @var Newbb\StatsHandler $statsHandler */
-            //            $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
-            $statsHandler->update($topicObject->getVar('forum_id'), 'digest');
-            //            /** @var Newbb\UserstatsHandler $userstatsHandler */
-            //            $userstatsHandler = Newbb\Helper::getInstance()->getHandler('Userstats');
-            if ($user_stat = $userstatsHandler->get($topicObject->getVar('topic_poster'))) {
-                $z = $user_stat->getVar('user_digests') + 1;
-                $user_stat->setVar('user_digests', (int)$z);
-                $userstatsHandler->insert($user_stat);
-            }
-        }
-        // irmtfan full URL
-        echo $action[$mode]['msg']
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . "</a></p><p><a href='"
-             . XOOPS_URL
-             . "/modules/newbb/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
-    }
+		if (!empty($action[$mode]['sql'])) {
+			$sql = sprintf('UPDATE `%s` SET ' . $action[$mode]['sql'] . ' WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $topic_id);
+			if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
+				redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_NEWBB_ERROR_BACK . '<br>sql: ' . $sql);
+			}
+		} else {
+			redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _MD_NEWBB_ERROR_BACK);
+		}
+		if ('digest' === $mode && $GLOBALS['xoopsDB']->getAffectedRows()) {
+			$topicObject = $topicHandler->get($topic_id);
+			//            /** @var Newbb\StatsHandler $statsHandler */
+			//            $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+			$statsHandler->update($topicObject->getVar('forum_id'), 'digest');
+			//            /** @var Newbb\UserstatsHandler $userstatsHandler */
+			//            $userstatsHandler = Newbb\Helper::getInstance()->getHandler('Userstats');
+			if ($user_stat = $userstatsHandler->get($topicObject->getVar('topic_poster'))) {
+				$z = $user_stat->getVar('user_digests') + 1;
+				$user_stat->setVar('user_digests', (int)$z);
+				$userstatsHandler->insert($user_stat);
+			}
+		}
+		// irmtfan full URL
+		echo $action[$mode]['msg']
+			 . "<p><a href='"
+			 . XOOPS_URL
+			 . '/modules/'
+			 . $xoopsModule->getVar('dirname')
+			 . "/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"
+			 . _MD_NEWBB_VIEWTHETOPIC
+			 . "</a></p><p><a href='"
+			 . XOOPS_URL
+			 . "/modules/newbb/viewforum.php?forum=$forum'>"
+			 . _MD_NEWBB_RETURNFORUMINDEX
+			 . '</a></p>';
+	}
 } else {  // No submit
-    $mode = Request::getString('mode', '', 'GET'); //$_GET['mode'];
-    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 class='bg3' align='left'>";
-    echo "<td colspan='2' align='center'>" . $action[$mode]['desc'] . '</td></tr>';
+	$mode = Request::getString('mode', '', 'GET'); //$_GET['mode'];
+	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 class='bg3' align='left'>";
+	echo "<td colspan='2' align='center'>" . $action[$mode]['desc'] . '</td></tr>';
 
-    if ('move' === $mode) {
-        echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
-        $box = '<select name="newforum" size="1">';
+	if ('move' === $mode) {
+		echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
+		$box = '<select name="newforum" size="1">';
 
-        //        /** @var Newbb\CategoryHandler $categoryHandler */
-        //        $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
-        $categories = $categoryHandler->getByPermission('access');
-        $forums     = $forumHandler->getForumsByCategory(array_keys($categories), 'post', false);
+		//        /** @var Newbb\CategoryHandler $categoryHandler */
+		//        $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
+		$categories = $categoryHandler->getByPermission('access');
+		$forums     = $forumHandler->getForumsByCategory(array_keys($categories), 'post', false);
 
-        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>';
-        }
-        unset($forums, $categories);
+		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>';
+		}
+		unset($forums, $categories);
 
-        echo $box;
-        echo '</select></td></tr>';
-    }
-    if ('merge' === $mode) {
-        echo '<tr><td class="bg3">' . _MD_NEWBB_MERGETOPICTO . '</td><td class="bg1">';
-        echo _MD_NEWBB_TOPIC . "&nbsp;ID-$topic_id -> ID: <input name='newtopic' value='' />";
-        echo '</td></tr>';
-    }
-    echo '<tr class="bg3"><td colspan="2" align="center">';
-    echo "<input type='hidden' name='mode' value='" . $action[$mode]['name'] . "' />";
-    echo "<input type='hidden' name='topic_id' value='" . $topic_id . "' />";
-    echo "<input type='hidden' name='forum' value='" . $forum . "' />";
-    echo "<input type='submit' name='submit' value='" . $action[$mode]['submit'] . "' />";
-    echo '</td></tr></form></table></td></tr></table>';
+		echo $box;
+		echo '</select></td></tr>';
+	}
+	if ('merge' === $mode) {
+		echo '<tr><td class="bg3">' . _MD_NEWBB_MERGETOPICTO . '</td><td class="bg1">';
+		echo _MD_NEWBB_TOPIC . "&nbsp;ID-$topic_id -> ID: <input name='newtopic' value='' />";
+		echo '</td></tr>';
+	}
+	echo '<tr class="bg3"><td colspan="2" align="center">';
+	echo "<input type='hidden' name='mode' value='" . $action[$mode]['name'] . "' />";
+	echo "<input type='hidden' name='topic_id' value='" . $topic_id . "' />";
+	echo "<input type='hidden' name='forum' value='" . $forum . "' />";
+	echo "<input type='submit' name='submit' value='" . $action[$mode]['submit'] . "' />";
+	echo '</td></tr></form></table></td></tr></table>';
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

Spacing +34 added lines, -34 removed lines

@@ -32,27 +32,27 @@ 
 //  URL: https://xoops.org                                                    //
 //  Project: Article Project                                                 //
 //  ------------------------------------------------------------------------ //
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (Request::getString('submit', '', 'POST')) {
     foreach (['forum', 'newforum', 'newtopic'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
+        ${$getint} = Request::getInt($getint, 0, 'POST'); // (int)(@$_POST[$getint]);
     }
     foreach (['topic_id'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'POST');// (int)(@$_POST[$getint]);
+        ${$getint} = Request::getInt($getint, 0, 'POST'); // (int)(@$_POST[$getint]);
     }
     if (!is_array($topic_id)) {
         $topic_id = [$topic_id];
     }
 } else {
     foreach (['forum', 'topic_id'] as $getint) {
-        ${$getint} = Request::getInt($getint, 0, 'GET');// (int)(@$_GET[$getint]);
+        ${$getint} = Request::getInt($getint, 0, 'GET'); // (int)(@$_GET[$getint]);
     }
 }
 
 if (empty($topic_id)) {
     $redirect = empty($forum_id) ? 'index.php' : 'viewforum.php?forum={$forum}';
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+    $redirect = XOOPS_URL.'/modules/newbb/'.$redirect;
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
@@ -63,11 +63,11 @@ 
 
 if (!$forum) {
     /** @var Newbb\Topic $topicObject */
-    $topicObject = $topicHandler->get((int)$topic_id);
+    $topicObject = $topicHandler->get((int) $topic_id);
     if (is_object($topicObject)) {
         $forum = $topicObject->getVar('forum_id');
     } else {
-        $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $topic_id;
+        $redirect = XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.$topic_id;
         redirect_header($redirect, 2, _MD_NEWBB_FORUMNOEXIST);
     }
     unset($topicObject);
@@ -104,7 +104,7 @@ 
 $action['unlock']['sql']   = 'topic_status = 0';
 $action['unsticky']['sql'] = 'topic_sticky = 0';
 $action['undigest']['sql'] = 'topic_digest = 0';
-$action['digest']['sql']   = 'topic_digest = 1, digest_time = ' . time();
+$action['digest']['sql']   = 'topic_digest = 1, digest_time = '.time();
 
 // Disable cache
 $GLOBALS['xoopsConfig']['module_cache'][$xoopsModule->getVar('mid')] = 0;
@@ -112,7 +112,7 @@ 
 require_once $GLOBALS['xoops']->path('header.php');
 
 if (Request::getString('submit', '', 'POST')) {
-    $mode = Request::getString('mode', '', 'POST');// $_POST['mode'];
+    $mode = Request::getString('mode', '', 'POST'); // $_POST['mode'];
 
     if ('delete' === $mode) {
         foreach ($topic_id as $tid) {
@@ -126,11 +126,11 @@ 
             //xoops_notification_deletebyitem ($xoopsModule->getVar('mid'), 'thread', $topic_id);
         }
         // irmtfan full URL
-        echo $action[$mode]['msg'] . "<p><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/viewforum.php?forum=$forum'>" . _MD_NEWBB_RETURNTOTHEFORUM . "</a></p><p><a href='index.php'>" . _MD_NEWBB_RETURNFORUMINDEX . '</a></p>';
+        echo $action[$mode]['msg']."<p><a href='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/viewforum.php?forum=$forum'>"._MD_NEWBB_RETURNTOTHEFORUM."</a></p><p><a href='index.php'>"._MD_NEWBB_RETURNFORUMINDEX.'</a></p>';
     } elseif ('restore' === $mode) {
         //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
         $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) {
             $topicObject = $topicsObject[$id];
             $topicHandler->approve($topicObject);
@@ -138,7 +138,7 @@ 
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
         //irmtfan remove - no need to approve posts manually - see class/post.php approve function
-        $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]);
@@ -178,7 +178,7 @@ 
             /* return false if destination topic is not existing */
             // irmtfan bug fix: the old topic will be deleted if user input a not exist new topic
             if (!is_object($newtopicObject)) {
-                $redirect = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $tid;
+                $redirect = XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.$tid;
                 redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
             }
             $criteria_topic = new \Criteria('topic_id', $tid);
@@ -202,9 +202,9 @@ 
             if ($poll_id > 0 && (0 == $newtopicObject->getVar('poll_id'))) {
                 $newtopicObject->setVar('topic_haspoll', 1);
                 $newtopicObject->setVar('poll_id', $poll_id);
-                $poll_id = 0;// set to not delete the poll
+                $poll_id = 0; // set to not delete the poll
                 $topicObject->setVar('topic_haspoll', 0); // set to not delete the poll
-                $topicObject->setVar('poll_id', 0);// set to not delete the poll
+                $topicObject->setVar('poll_id', 0); // set to not delete the poll
             }
             //update and sync newtopic after merge
             //$topicHandler->insert($newtopicObject, true);
@@ -286,16 +286,16 @@ 
                 && !$forumHandler->getPermission($forum_new, 'reply'))        // The forum for the topic to be merged to
             || (!empty($newforum) && !$forumHandler->getPermission($newforum, 'post')) // The forum to be moved to
         ) {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _NOPERM);
+            redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _NOPERM);
         }
 
         if (!empty($action[$mode]['sql'])) {
-            $sql = sprintf('UPDATE `%s` SET ' . $action[$mode]['sql'] . ' WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $topic_id);
+            $sql = sprintf('UPDATE `%s` SET '.$action[$mode]['sql'].' WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $topic_id);
             if (!$r = $GLOBALS['xoopsDB']->query($sql)) {
-                redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_NEWBB_ERROR_BACK . '<br>sql: ' . $sql);
+                redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode", 2, _MD_NEWBB_ERROR_BACK.'<br>sql: '.$sql);
             }
         } else {
-            redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _MD_NEWBB_ERROR_BACK);
+            redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&amp;topic_id=$topic_id", 2, _MD_NEWBB_ERROR_BACK);
         }
         if ('digest' === $mode && $GLOBALS['xoopsDB']->getAffectedRows()) {
             $topicObject = $topicHandler->get($topic_id);
@@ -306,7 +306,7 @@ 
             //            $userstatsHandler = Newbb\Helper::getInstance()->getHandler('Userstats');
             if ($user_stat = $userstatsHandler->get($topicObject->getVar('topic_poster'))) {
                 $z = $user_stat->getVar('user_digests') + 1;
-                $user_stat->setVar('user_digests', (int)$z);
+                $user_stat->setVar('user_digests', (int) $z);
                 $userstatsHandler->insert($user_stat);
             }
         }
@@ -326,15 +326,15 @@ 
     }
 } else {  // No submit
     $mode = Request::getString('mode', '', 'GET'); //$_GET['mode'];
-    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 class='bg3' align='left'>";
-    echo "<td colspan='2' align='center'>" . $action[$mode]['desc'] . '</td></tr>';
+    echo "<td colspan='2' align='center'>".$action[$mode]['desc'].'</td></tr>';
 
     if ('move' === $mode) {
-        echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
+        echo '<tr><td class="bg3">'._MD_NEWBB_MOVETOPICTO.'</td><td class="bg1">';
         $box = '<select name="newforum" size="1">';
 
         //        /** @var Newbb\CategoryHandler $categoryHandler */
@@ -345,19 +345,19 @@ 
         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>';
+                $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>';
         }
         unset($forums, $categories);
 
@@ -365,17 +365,17 @@ 
         echo '</select></td></tr>';
     }
     if ('merge' === $mode) {
-        echo '<tr><td class="bg3">' . _MD_NEWBB_MERGETOPICTO . '</td><td class="bg1">';
-        echo _MD_NEWBB_TOPIC . "&nbsp;ID-$topic_id -> ID: <input name='newtopic' value='' />";
+        echo '<tr><td class="bg3">'._MD_NEWBB_MERGETOPICTO.'</td><td class="bg1">';
+        echo _MD_NEWBB_TOPIC."&nbsp;ID-$topic_id -> ID: <input name='newtopic' value='' />";
         echo '</td></tr>';
     }
     echo '<tr class="bg3"><td colspan="2" align="center">';
-    echo "<input type='hidden' name='mode' value='" . $action[$mode]['name'] . "' />";
-    echo "<input type='hidden' name='topic_id' value='" . $topic_id . "' />";
-    echo "<input type='hidden' name='forum' value='" . $forum . "' />";
-    echo "<input type='submit' name='submit' value='" . $action[$mode]['submit'] . "' />";
+    echo "<input type='hidden' name='mode' value='".$action[$mode]['name']."' />";
+    echo "<input type='hidden' name='topic_id' value='".$topic_id."' />";
+    echo "<input type='hidden' name='forum' value='".$forum."' />";
+    echo "<input type='submit' name='submit' value='".$action[$mode]['submit']."' />";
     echo '</td></tr></form></table></td></tr></table>';
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

notification_update.php

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
 // URL: http://www.myweb.ne.jp/, https://xoops.org/, http://jp.xoops.org/ //
 // Project: XOOPS Project                                                    //
 // ------------------------------------------------------------------------- //
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
 require_once $GLOBALS['xoops']->path('include/notification_update.php');