mambax7 / newbb5

blocks/newbb_block.php

Indentation +856 added lines, -856 removed lines

@@ -26,7 +26,7 @@ 
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.ini.php');
 
 if (defined('NEWBB_BLOCK_DEFINED')) {
-    return;
+	return;
 }
 define('NEWBB_BLOCK_DEFINED', true);
 
@@ -36,7 +36,7 @@ 
  */
 function b_newbb_array_filter($var)
 {
-    return $var > 0;
+	return $var > 0;
 }
 
 // options[0] - Citeria valid: time(by default)
@@ -53,166 +53,166 @@ 
  */
 function b_newbb_show($options)
 {
-    global $accessForums;
-    global $xoopsLogger;
-
-    require_once  dirname(__DIR__) . '/include/functions.config.php';
-    require_once  dirname(__DIR__) . '/include/functions.time.php';
-
-    $myts          = \MyTextSanitizer::getInstance();
-    $block         = [];
-    $i             = 0;
-    $order         = '';
-    $extraCriteria = '';
-    if (!empty($options[2])) {
-        //require_once  dirname(__DIR__) . '/include/functions.time.php';
-        $extraCriteria .= ' AND p.post_time>' . (time() - newbbGetSinceTime($options[2]));
-    }
-    switch ($options[0]) {
-        case 'time':
-        default:
-            $order = 't.topic_last_post_id';
-            break;
-    }
-
-    if (!isset($accessForums)) {
-        /** var Newbb\PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        if (!$accessForums = $permHandler->getForums()) {
-            return $block;
-        }
-    }
-    if (!empty($options[6])) {
-        $myallowedForums = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
-        $allowedForums   = array_intersect($myallowedForums, $accessForums);
-    } else {
-        $allowedForums = $accessForums;
-    }
-    if (empty($allowedForums)) {
-        return $block;
-    }
-
-    $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $allowedForums) . ')';
-    $approveCriteria = ' AND t.approved = 1';
-
-    $newbbConfig = newbbLoadConfig();
-    if (!empty($newbbConfig['do_rewrite'])) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/seo_url.php');
-    } else {
-        if (!defined('SEO_MODULE_NAME')) {
-            define('SEO_MODULE_NAME', 'modules/newbb');
-        }
-    }
-
-    $query = 'SELECT'
-             . '    t.topic_id, t.topic_replies, t.forum_id, t.topic_title, t.topic_views, t.type_id,'
-             . '    f.forum_name,t.topic_status,'
-             . '    p.post_id, p.post_time, p.icon, p.uid, p.poster_name'
-             . '    FROM '
-             . $GLOBALS['xoopsDB']->prefix('newbb_topics')
-             . ' AS t '
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_posts')
-             . ' AS p ON t.topic_last_post_id=p.post_id'
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_forums')
-             . ' AS f ON f.forum_id=t.forum_id'
-             . '    WHERE 1=1 '
-             . $forumCriteria
-             . $approveCriteria
-             . $extraCriteria
-             . ' ORDER BY '
-             . $order
-             . ' DESC';
-
-    $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
-
-    if (!$result) {
-        //xoops_error($GLOBALS['xoopsDB']->error());
-        return false;
-    }
-    $block['disp_mode'] = $options[3]; // 0 - full view; 1 - compact view; 2 - lite view;
-    $rows               = [];
-    $author             = [];
-    $types              = [];
-
-    while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $rows[]              = $row;
-        $author[$row['uid']] = 1;
-        if ($row['type_id'] > 0) {
-            $types[$row['type_id']] = 1;
-        }
-    }
-
-    if (count($rows) < 1) {
-        return $block;
-    }
-
-    require_once  dirname(__DIR__) . '/include/functions.user.php';
-    $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
-
-    if (count($types) > 0) {
-        /** @var Newbb\TypeHandler $typeHandler */
-        $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
-    }
-
-    foreach ($rows as $arr) {
-        // irmtfan add lastposticon - load main lang
-        xoops_loadLanguage('main', 'newbb');
-        $topic                  = [];
-        $topic_page_jump        = newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST);
-        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . ']';
-
-        $topic['post_id']      = $arr['post_id'];
-        $topic['topic_status'] = $arr['topic_status'];
-        $topic['forum_id']     = $arr['forum_id'];
-        $topic['forum_name']   = $myts->htmlSpecialChars($arr['forum_name']);
-        $topic['id']           = $arr['topic_id'];
-
-        $title = $myts->htmlSpecialChars($arr['topic_title']);
-        if (!empty($options[5])) {
-            $title = xoops_substr($title, 0, $options[5]);
-        }
-        $topic['title']   = $topic['topic_subject'] . ' ' . $title;
-        $topic['replies'] = $arr['topic_replies'];
-        $topic['views']   = $arr['topic_views'];
-        $topic['time']    = newbbFormatTimestamp($arr['post_time']);
-        if (!empty($author_name[$arr['uid']])) {
-            $topic_poster = $author_name[$arr['uid']];
-        } else {
-            $topic_poster = $myts->htmlSpecialChars($arr['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous']);
-        }
-        $topic['topic_poster']    = $topic_poster;
-        $topic['topic_page_jump'] = $topic_page_jump;
-        // START irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
-        $seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
-        if (!empty($newbbConfig['do_rewrite'])) {
-            $topic['seo_url']       = seo_urls($seo_url);
-            $topic['seo_topic_url'] = seo_urls($seo_topic_url);
-            $topic['seo_forum_url'] = seo_urls($seo_forum_url);
-        } else {
-            $topic['seo_url']       = $seo_url;
-            $topic['seo_topic_url'] = $seo_topic_url;
-            $topic['seo_forum_url'] = $seo_forum_url;
-        }
-        // END irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $block['topics'][] = $topic;
-        unset($topic);
-    }
-    // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
-    $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
-    $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
-    $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    // END irmtfan remove hardcoded html in URLs
-    $block['indexNav'] = (int)$options[4];
-
-    return $block;
+	global $accessForums;
+	global $xoopsLogger;
+
+	require_once  dirname(__DIR__) . '/include/functions.config.php';
+	require_once  dirname(__DIR__) . '/include/functions.time.php';
+
+	$myts          = \MyTextSanitizer::getInstance();
+	$block         = [];
+	$i             = 0;
+	$order         = '';
+	$extraCriteria = '';
+	if (!empty($options[2])) {
+		//require_once  dirname(__DIR__) . '/include/functions.time.php';
+		$extraCriteria .= ' AND p.post_time>' . (time() - newbbGetSinceTime($options[2]));
+	}
+	switch ($options[0]) {
+		case 'time':
+		default:
+			$order = 't.topic_last_post_id';
+			break;
+	}
+
+	if (!isset($accessForums)) {
+		/** var Newbb\PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		if (!$accessForums = $permHandler->getForums()) {
+			return $block;
+		}
+	}
+	if (!empty($options[6])) {
+		$myallowedForums = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
+		$allowedForums   = array_intersect($myallowedForums, $accessForums);
+	} else {
+		$allowedForums = $accessForums;
+	}
+	if (empty($allowedForums)) {
+		return $block;
+	}
+
+	$forumCriteria   = ' AND t.forum_id IN (' . implode(',', $allowedForums) . ')';
+	$approveCriteria = ' AND t.approved = 1';
+
+	$newbbConfig = newbbLoadConfig();
+	if (!empty($newbbConfig['do_rewrite'])) {
+		require_once $GLOBALS['xoops']->path('modules/newbb/seo_url.php');
+	} else {
+		if (!defined('SEO_MODULE_NAME')) {
+			define('SEO_MODULE_NAME', 'modules/newbb');
+		}
+	}
+
+	$query = 'SELECT'
+			 . '    t.topic_id, t.topic_replies, t.forum_id, t.topic_title, t.topic_views, t.type_id,'
+			 . '    f.forum_name,t.topic_status,'
+			 . '    p.post_id, p.post_time, p.icon, p.uid, p.poster_name'
+			 . '    FROM '
+			 . $GLOBALS['xoopsDB']->prefix('newbb_topics')
+			 . ' AS t '
+			 . '    LEFT JOIN '
+			 . $GLOBALS['xoopsDB']->prefix('newbb_posts')
+			 . ' AS p ON t.topic_last_post_id=p.post_id'
+			 . '    LEFT JOIN '
+			 . $GLOBALS['xoopsDB']->prefix('newbb_forums')
+			 . ' AS f ON f.forum_id=t.forum_id'
+			 . '    WHERE 1=1 '
+			 . $forumCriteria
+			 . $approveCriteria
+			 . $extraCriteria
+			 . ' ORDER BY '
+			 . $order
+			 . ' DESC';
+
+	$result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
+
+	if (!$result) {
+		//xoops_error($GLOBALS['xoopsDB']->error());
+		return false;
+	}
+	$block['disp_mode'] = $options[3]; // 0 - full view; 1 - compact view; 2 - lite view;
+	$rows               = [];
+	$author             = [];
+	$types              = [];
+
+	while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+		$rows[]              = $row;
+		$author[$row['uid']] = 1;
+		if ($row['type_id'] > 0) {
+			$types[$row['type_id']] = 1;
+		}
+	}
+
+	if (count($rows) < 1) {
+		return $block;
+	}
+
+	require_once  dirname(__DIR__) . '/include/functions.user.php';
+	$author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
+
+	if (count($types) > 0) {
+		/** @var Newbb\TypeHandler $typeHandler */
+		$typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
+		$type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+	}
+
+	foreach ($rows as $arr) {
+		// irmtfan add lastposticon - load main lang
+		xoops_loadLanguage('main', 'newbb');
+		$topic                  = [];
+		$topic_page_jump        = newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST);
+		$topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . ']';
+
+		$topic['post_id']      = $arr['post_id'];
+		$topic['topic_status'] = $arr['topic_status'];
+		$topic['forum_id']     = $arr['forum_id'];
+		$topic['forum_name']   = $myts->htmlSpecialChars($arr['forum_name']);
+		$topic['id']           = $arr['topic_id'];
+
+		$title = $myts->htmlSpecialChars($arr['topic_title']);
+		if (!empty($options[5])) {
+			$title = xoops_substr($title, 0, $options[5]);
+		}
+		$topic['title']   = $topic['topic_subject'] . ' ' . $title;
+		$topic['replies'] = $arr['topic_replies'];
+		$topic['views']   = $arr['topic_views'];
+		$topic['time']    = newbbFormatTimestamp($arr['post_time']);
+		if (!empty($author_name[$arr['uid']])) {
+			$topic_poster = $author_name[$arr['uid']];
+		} else {
+			$topic_poster = $myts->htmlSpecialChars($arr['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous']);
+		}
+		$topic['topic_poster']    = $topic_poster;
+		$topic['topic_page_jump'] = $topic_page_jump;
+		// START irmtfan remove hardcoded html in URLs - add $seo_topic_url
+		$seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
+		$seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
+		$seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+		if (!empty($newbbConfig['do_rewrite'])) {
+			$topic['seo_url']       = seo_urls($seo_url);
+			$topic['seo_topic_url'] = seo_urls($seo_topic_url);
+			$topic['seo_forum_url'] = seo_urls($seo_forum_url);
+		} else {
+			$topic['seo_url']       = $seo_url;
+			$topic['seo_topic_url'] = $seo_topic_url;
+			$topic['seo_forum_url'] = $seo_forum_url;
+		}
+		// END irmtfan remove hardcoded html in URLs - add $seo_topic_url
+		$block['topics'][] = $topic;
+		unset($topic);
+	}
+	// START irmtfan remove hardcoded html in URLs
+	$seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+	$block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
+	$seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+	$block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
+	$seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+	$block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
+	// END irmtfan remove hardcoded html in URLs
+	$block['indexNav'] = (int)$options[4];
+
+	return $block;
 }
 
 // options[0] - Citeria valid: time(by default), views, replies, digest, sticky
@@ -229,168 +229,168 @@ 
  */
 function b_newbb_topic_show($options)
 {
-    global $accessForums;
-    require_once  dirname(__DIR__) . '/include/functions.time.php';
-    $myts          = \MyTextSanitizer::getInstance();
-    $block         = [];
-    $i             = 0;
-    $order         = '';
-    $extraCriteria = '';
-    $time_criteria = null;
-    if (!empty($options[2])) {
-        $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND t.topic_time>' . $time_criteria;
-    }
-    switch ($options[0]) {
-        case 'views':
-            $order = 't.topic_views';
-            break;
-        case 'replies':
-            $order = 't.topic_replies';
-            break;
-        case 'digest':
-            $order         = 't.digest_time';
-            $extraCriteria = ' AND t.topic_digest=1';
-            if (null !== $time_criteria) {
-                $extraCriteria .= ' AND t.digest_time>' . $time_criteria;
-            }
-            break;
-        case 'sticky':
-            $order         = 't.topic_id';
-            $extraCriteria .= ' AND t.topic_sticky=1';
-            break;
-        case 'time':
-        default:
-            $order = 't.topic_id';
-            break;
-    }
-
-    $newbbConfig = newbbLoadConfig();
-    if (!empty($newbbConfig['do_rewrite'])) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/seo_url.php');
-    } else {
-        if (!defined('SEO_MODULE_NAME')) {
-            define('SEO_MODULE_NAME', 'modules/newbb');
-        }
-    }
-
-    if (!isset($accessForums)) {
-        /** var Newbb\PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        if (!$accessForums = $permHandler->getForums()) {
-            return $block;
-        }
-    }
-
-    if (!empty($options[6])) {
-        $myallowedForums = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
-        $allowedForums   = array_intersect($myallowedForums, $accessForums);
-    } else {
-        $allowedForums = $accessForums;
-    }
-    if (empty($allowedForums)) {
-        return false;
-    }
-
-    $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $allowedForums) . ')';
-    $approveCriteria = ' AND t.approved = 1';
-
-    $query = 'SELECT'
-             . '    t.topic_id, t.topic_replies, t.forum_id, t.topic_title, t.topic_views, t.type_id, t.topic_time, t.topic_poster, t.poster_name,'
-             . '    f.forum_name'
-             . '    FROM '
-             . $GLOBALS['xoopsDB']->prefix('newbb_topics')
-             . ' AS t '
-             . '    LEFT JOIN '
-             . $GLOBALS['xoopsDB']->prefix('newbb_forums')
-             . ' AS f ON f.forum_id=t.forum_id'
-             . '    WHERE 1=1 '
-             . $forumCriteria
-             . $approveCriteria
-             . $extraCriteria
-             . ' ORDER BY '
-             . $order
-             . ' DESC';
-
-    $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
-
-    if (!$result) {
-        //xoops_error($GLOBALS['xoopsDB']->error());
-        return $block;
-    }
-    $block['disp_mode'] = $options[3]; // 0 - full view; 1 - compact view; 2 - lite view;
-    $rows               = [];
-    $author             = [];
-    $types              = [];
-    while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $rows[]                       = $row;
-        $author[$row['topic_poster']] = 1;
-        if ($row['type_id'] > 0) {
-            $types[$row['type_id']] = 1;
-        }
-    }
-    if (count($rows) < 1) {
-        return $block;
-    }
-    require_once  dirname(__DIR__) . '/include/functions.user.php';
-    $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
-    if (count($types) > 0) {
-        /** @var Newbb\TypeHandler $typeHandler */
-        $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
-    }
-
-    foreach ($rows as $arr) {
-        // irmtfan remove $topic_page_jump because there is no last post
-        //$topic_page_jump = '';
-        $topic                  = [];
-        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . '] ';
-        $topic['forum_id']      = $arr['forum_id'];
-        $topic['forum_name']    = $myts->htmlSpecialChars($arr['forum_name']);
-        $topic['id']            = $arr['topic_id'];
-
-        $title = $myts->htmlSpecialChars($arr['topic_title']);
-        if (!empty($options[5])) {
-            $title = xoops_substr($title, 0, $options[5]);
-        }
-        $topic['title']   = $topic['topic_subject'] . $title;
-        $topic['replies'] = $arr['topic_replies'];
-        $topic['views']   = $arr['topic_views'];
-        $topic['time']    = newbbFormatTimestamp($arr['topic_time']);
-        if (!empty($author_name[$arr['topic_poster']])) {
-            $topic_poster = $author_name[$arr['topic_poster']];
-        } else {
-            $topic_poster = $myts->htmlSpecialChars($arr['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous']);
-        }
-        $topic['topic_poster'] = $topic_poster;
-        // irmtfan remove $topic_page_jump because there is no last post
-        //$topic['topic_page_jump'] = $topic_page_jump;
-        // START irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
-
-        if (!empty($newbbConfig['do_rewrite'])) {
-            $topic['seo_topic_url'] = seo_urls($seo_topic_url);
-            $topic['seo_forum_url'] = seo_urls($seo_forum_url);
-        } else {
-            $topic['seo_topic_url'] = $seo_topic_url;
-            $topic['seo_forum_url'] = $seo_forum_url;
-        }
-        // END irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $block['topics'][] = $topic;
-        unset($topic);
-    }
-    // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
-    $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
-    $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
-    $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    // END irmtfan remove hardcoded html in URLs
-    $block['indexNav'] = (int)$options[4];
-
-    return $block;
+	global $accessForums;
+	require_once  dirname(__DIR__) . '/include/functions.time.php';
+	$myts          = \MyTextSanitizer::getInstance();
+	$block         = [];
+	$i             = 0;
+	$order         = '';
+	$extraCriteria = '';
+	$time_criteria = null;
+	if (!empty($options[2])) {
+		$time_criteria = time() - newbbGetSinceTime($options[2]);
+		$extraCriteria = ' AND t.topic_time>' . $time_criteria;
+	}
+	switch ($options[0]) {
+		case 'views':
+			$order = 't.topic_views';
+			break;
+		case 'replies':
+			$order = 't.topic_replies';
+			break;
+		case 'digest':
+			$order         = 't.digest_time';
+			$extraCriteria = ' AND t.topic_digest=1';
+			if (null !== $time_criteria) {
+				$extraCriteria .= ' AND t.digest_time>' . $time_criteria;
+			}
+			break;
+		case 'sticky':
+			$order         = 't.topic_id';
+			$extraCriteria .= ' AND t.topic_sticky=1';
+			break;
+		case 'time':
+		default:
+			$order = 't.topic_id';
+			break;
+	}
+
+	$newbbConfig = newbbLoadConfig();
+	if (!empty($newbbConfig['do_rewrite'])) {
+		require_once $GLOBALS['xoops']->path('modules/newbb/seo_url.php');
+	} else {
+		if (!defined('SEO_MODULE_NAME')) {
+			define('SEO_MODULE_NAME', 'modules/newbb');
+		}
+	}
+
+	if (!isset($accessForums)) {
+		/** var Newbb\PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		if (!$accessForums = $permHandler->getForums()) {
+			return $block;
+		}
+	}
+
+	if (!empty($options[6])) {
+		$myallowedForums = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
+		$allowedForums   = array_intersect($myallowedForums, $accessForums);
+	} else {
+		$allowedForums = $accessForums;
+	}
+	if (empty($allowedForums)) {
+		return false;
+	}
+
+	$forumCriteria   = ' AND t.forum_id IN (' . implode(',', $allowedForums) . ')';
+	$approveCriteria = ' AND t.approved = 1';
+
+	$query = 'SELECT'
+			 . '    t.topic_id, t.topic_replies, t.forum_id, t.topic_title, t.topic_views, t.type_id, t.topic_time, t.topic_poster, t.poster_name,'
+			 . '    f.forum_name'
+			 . '    FROM '
+			 . $GLOBALS['xoopsDB']->prefix('newbb_topics')
+			 . ' AS t '
+			 . '    LEFT JOIN '
+			 . $GLOBALS['xoopsDB']->prefix('newbb_forums')
+			 . ' AS f ON f.forum_id=t.forum_id'
+			 . '    WHERE 1=1 '
+			 . $forumCriteria
+			 . $approveCriteria
+			 . $extraCriteria
+			 . ' ORDER BY '
+			 . $order
+			 . ' DESC';
+
+	$result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
+
+	if (!$result) {
+		//xoops_error($GLOBALS['xoopsDB']->error());
+		return $block;
+	}
+	$block['disp_mode'] = $options[3]; // 0 - full view; 1 - compact view; 2 - lite view;
+	$rows               = [];
+	$author             = [];
+	$types              = [];
+	while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+		$rows[]                       = $row;
+		$author[$row['topic_poster']] = 1;
+		if ($row['type_id'] > 0) {
+			$types[$row['type_id']] = 1;
+		}
+	}
+	if (count($rows) < 1) {
+		return $block;
+	}
+	require_once  dirname(__DIR__) . '/include/functions.user.php';
+	$author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
+	if (count($types) > 0) {
+		/** @var Newbb\TypeHandler $typeHandler */
+		$typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
+		$type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+	}
+
+	foreach ($rows as $arr) {
+		// irmtfan remove $topic_page_jump because there is no last post
+		//$topic_page_jump = '';
+		$topic                  = [];
+		$topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . '] ';
+		$topic['forum_id']      = $arr['forum_id'];
+		$topic['forum_name']    = $myts->htmlSpecialChars($arr['forum_name']);
+		$topic['id']            = $arr['topic_id'];
+
+		$title = $myts->htmlSpecialChars($arr['topic_title']);
+		if (!empty($options[5])) {
+			$title = xoops_substr($title, 0, $options[5]);
+		}
+		$topic['title']   = $topic['topic_subject'] . $title;
+		$topic['replies'] = $arr['topic_replies'];
+		$topic['views']   = $arr['topic_views'];
+		$topic['time']    = newbbFormatTimestamp($arr['topic_time']);
+		if (!empty($author_name[$arr['topic_poster']])) {
+			$topic_poster = $author_name[$arr['topic_poster']];
+		} else {
+			$topic_poster = $myts->htmlSpecialChars($arr['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous']);
+		}
+		$topic['topic_poster'] = $topic_poster;
+		// irmtfan remove $topic_page_jump because there is no last post
+		//$topic['topic_page_jump'] = $topic_page_jump;
+		// START irmtfan remove hardcoded html in URLs - add $seo_topic_url
+		$seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
+		$seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+
+		if (!empty($newbbConfig['do_rewrite'])) {
+			$topic['seo_topic_url'] = seo_urls($seo_topic_url);
+			$topic['seo_forum_url'] = seo_urls($seo_forum_url);
+		} else {
+			$topic['seo_topic_url'] = $seo_topic_url;
+			$topic['seo_forum_url'] = $seo_forum_url;
+		}
+		// END irmtfan remove hardcoded html in URLs - add $seo_topic_url
+		$block['topics'][] = $topic;
+		unset($topic);
+	}
+	// START irmtfan remove hardcoded html in URLs
+	$seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+	$block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
+	$seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+	$block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
+	$seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+	$block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
+	// END irmtfan remove hardcoded html in URLs
+	$block['indexNav'] = (int)$options[4];
+
+	return $block;
 }
 
 // options[0] - Citeria valid: title(by default), text
@@ -407,155 +407,155 @@ 
  */
 function b_newbb_post_show($options)
 {
-    global $accessForums;
-    global $newbbConfig;
-
-    require_once  dirname(__DIR__) . '/include/functions.time.php';
-    $myts          = \MyTextSanitizer::getInstance();
-    $block         = [];
-    $i             = 0;
-    $order         = '';
-    $extraCriteria = '';
-    $time_criteria = null;
-    if (!empty($options[2])) {
-        $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND p.post_time>' . $time_criteria;
-    }
-
-    switch ($options[0]) {
-        case 'text':
-            if (!empty($newbbConfig['enable_karma'])) {
-                $extraCriteria .= ' AND p.post_karma = 0';
-            }
-            if (!empty($newbbConfig['allow_require_reply'])) {
-                $extraCriteria .= ' AND p.require_reply = 0';
-            }
-        // no break
-        default:
-            $order = 'p.post_id';
-            break;
-    }
-
-    if (!isset($accessForums)) {
-        /** var Newbb\PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        if (!$accessForums = $permHandler->getForums()) {
-            return $block;
-        }
-    }
-
-    $newbbConfig = newbbLoadConfig();
-    if (!empty($newbbConfig['do_rewrite'])) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/seo_url.php');
-    } else {
-        if (!defined('SEO_MODULE_NAME')) {
-            define('SEO_MODULE_NAME', 'modules/newbb');
-        }
-    }
-
-    if (!empty($options[6])) {
-        $myallowedForums = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
-        $allowedForums   = array_intersect($myallowedForums, $accessForums);
-    } else {
-        $allowedForums = $accessForums;
-    }
-    if (empty($allowedForums)) {
-        return $block;
-    }
-
-    $forumCriteria   = ' AND p.forum_id IN (' . implode(',', $allowedForums) . ')';
-    $approveCriteria = ' AND p.approved = 1';
-
-    $query = 'SELECT';
-    $query .= '    p.post_id, p.subject, p.post_time, p.icon, p.uid, p.poster_name,';
-    if ('text' === $options[0]) {
-        $query .= '    pt.dohtml, pt.dosmiley, pt.doxcode, pt.dobr, pt.post_text,';
-    }
-    $query .= '    f.forum_id, f.forum_name' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' AS p ' . '    LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' AS f ON f.forum_id=p.forum_id';
-    if ('text' === $options[0]) {
-        $query .= '    LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . ' AS pt ON pt.post_id=p.post_id';
-    }
-    $query .= '    WHERE 1=1 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' ORDER BY ' . $order . ' DESC';
-
-    $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
-    if (!$result) {
-        //xoops_error($GLOBALS['xoopsDB']->error());
-        return $block;
-    }
-    $block['disp_mode'] = ('text' === $options[0]) ? 3 : $options[3]; // 0 - full view; 1 - compact view; 2 - lite view;
-    $rows               = [];
-    $author             = [];
-    while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $rows[]              = $row;
-        $author[$row['uid']] = 1;
-    }
-    if (count($rows) < 1) {
-        return $block;
-    }
-    require_once  dirname(__DIR__) . '/include/functions.user.php';
-    $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
-
-    foreach ($rows as $arr) {
-        //if ($arr['icon'] && is_file($GLOBALS['xoops']->path('images/subject/' . $arr['icon']))) {
-        if (!empty($arr['icon'])) {
-            $last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($arr['icon'], ENT_QUOTES | ENT_HTML5) . '" alt="" />';
-        } else {
-            $last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/icon1.gif" alt="" />';
-        }
-        //$topic['jump_post'] = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $arr['post_id'] ."#forumpost" . $arr['post_id'] . "'>" . $last_post_icon . '</a>';
-        $topic               = [];
-        $topic['forum_id']   = $arr['forum_id'];
-        $topic['forum_name'] = $myts->htmlSpecialChars($arr['forum_name']);
-        //$topic['id'] = $arr['topic_id'];
-
-        $title = $myts->htmlSpecialChars($arr['subject']);
-        if ('text' !== $options[0] && !empty($options[5])) {
-            $title = xoops_substr($title, 0, $options[5]);
-        }
-        $topic['title']   = $title;
-        $topic['post_id'] = $arr['post_id'];
-        $topic['time']    = newbbFormatTimestamp($arr['post_time']);
-        if (!empty($author_name[$arr['uid']])) {
-            $topic_poster = $author_name[$arr['uid']];
-        } else {
-            $topic_poster = $myts->htmlSpecialChars($arr['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous']);
-        }
-        $topic['topic_poster'] = $topic_poster;
-
-        if ('text' === $options[0]) {
-            $post_text = $myts->displayTarea($arr['post_text'], $arr['dohtml'], $arr['dosmiley'], $arr['doxcode'], 1, $arr['dobr']);
-            if (!empty($options[5])) {
-                $post_text = xoops_substr(strip_tags($post_text), 0, $options[5]);
-            }
-            $topic['post_text'] = $post_text;
-        }
-        // START irmtfan remove hardcoded html in URLs
-        $seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
-        // END irmtfan remove hardcoded html in URLs
-        if (!empty($newbbConfig['do_rewrite'])) {
-            $topic['seo_url']       = seo_urls($seo_url);
-            $topic['seo_forum_url'] = seo_urls($seo_forum_url);
-        } else {
-            $topic['seo_url']       = $seo_url;
-            $topic['seo_forum_url'] = $seo_forum_url;
-        }
-
-        $block['topics'][] = $topic;
-        unset($topic);
-    }
-    // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
-    $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
-    $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
-    $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    // END irmtfan remove hardcoded html in URLs
-
-    $block['indexNav'] = (int)$options[4];
-
-    return $block;
+	global $accessForums;
+	global $newbbConfig;
+
+	require_once  dirname(__DIR__) . '/include/functions.time.php';
+	$myts          = \MyTextSanitizer::getInstance();
+	$block         = [];
+	$i             = 0;
+	$order         = '';
+	$extraCriteria = '';
+	$time_criteria = null;
+	if (!empty($options[2])) {
+		$time_criteria = time() - newbbGetSinceTime($options[2]);
+		$extraCriteria = ' AND p.post_time>' . $time_criteria;
+	}
+
+	switch ($options[0]) {
+		case 'text':
+			if (!empty($newbbConfig['enable_karma'])) {
+				$extraCriteria .= ' AND p.post_karma = 0';
+			}
+			if (!empty($newbbConfig['allow_require_reply'])) {
+				$extraCriteria .= ' AND p.require_reply = 0';
+			}
+		// no break
+		default:
+			$order = 'p.post_id';
+			break;
+	}
+
+	if (!isset($accessForums)) {
+		/** var Newbb\PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		if (!$accessForums = $permHandler->getForums()) {
+			return $block;
+		}
+	}
+
+	$newbbConfig = newbbLoadConfig();
+	if (!empty($newbbConfig['do_rewrite'])) {
+		require_once $GLOBALS['xoops']->path('modules/newbb/seo_url.php');
+	} else {
+		if (!defined('SEO_MODULE_NAME')) {
+			define('SEO_MODULE_NAME', 'modules/newbb');
+		}
+	}
+
+	if (!empty($options[6])) {
+		$myallowedForums = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
+		$allowedForums   = array_intersect($myallowedForums, $accessForums);
+	} else {
+		$allowedForums = $accessForums;
+	}
+	if (empty($allowedForums)) {
+		return $block;
+	}
+
+	$forumCriteria   = ' AND p.forum_id IN (' . implode(',', $allowedForums) . ')';
+	$approveCriteria = ' AND p.approved = 1';
+
+	$query = 'SELECT';
+	$query .= '    p.post_id, p.subject, p.post_time, p.icon, p.uid, p.poster_name,';
+	if ('text' === $options[0]) {
+		$query .= '    pt.dohtml, pt.dosmiley, pt.doxcode, pt.dobr, pt.post_text,';
+	}
+	$query .= '    f.forum_id, f.forum_name' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' AS p ' . '    LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' AS f ON f.forum_id=p.forum_id';
+	if ('text' === $options[0]) {
+		$query .= '    LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . ' AS pt ON pt.post_id=p.post_id';
+	}
+	$query .= '    WHERE 1=1 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' ORDER BY ' . $order . ' DESC';
+
+	$result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
+	if (!$result) {
+		//xoops_error($GLOBALS['xoopsDB']->error());
+		return $block;
+	}
+	$block['disp_mode'] = ('text' === $options[0]) ? 3 : $options[3]; // 0 - full view; 1 - compact view; 2 - lite view;
+	$rows               = [];
+	$author             = [];
+	while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+		$rows[]              = $row;
+		$author[$row['uid']] = 1;
+	}
+	if (count($rows) < 1) {
+		return $block;
+	}
+	require_once  dirname(__DIR__) . '/include/functions.user.php';
+	$author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
+
+	foreach ($rows as $arr) {
+		//if ($arr['icon'] && is_file($GLOBALS['xoops']->path('images/subject/' . $arr['icon']))) {
+		if (!empty($arr['icon'])) {
+			$last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($arr['icon'], ENT_QUOTES | ENT_HTML5) . '" alt="" />';
+		} else {
+			$last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/icon1.gif" alt="" />';
+		}
+		//$topic['jump_post'] = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $arr['post_id'] ."#forumpost" . $arr['post_id'] . "'>" . $last_post_icon . '</a>';
+		$topic               = [];
+		$topic['forum_id']   = $arr['forum_id'];
+		$topic['forum_name'] = $myts->htmlSpecialChars($arr['forum_name']);
+		//$topic['id'] = $arr['topic_id'];
+
+		$title = $myts->htmlSpecialChars($arr['subject']);
+		if ('text' !== $options[0] && !empty($options[5])) {
+			$title = xoops_substr($title, 0, $options[5]);
+		}
+		$topic['title']   = $title;
+		$topic['post_id'] = $arr['post_id'];
+		$topic['time']    = newbbFormatTimestamp($arr['post_time']);
+		if (!empty($author_name[$arr['uid']])) {
+			$topic_poster = $author_name[$arr['uid']];
+		} else {
+			$topic_poster = $myts->htmlSpecialChars($arr['poster_name'] ?: $GLOBALS['xoopsConfig']['anonymous']);
+		}
+		$topic['topic_poster'] = $topic_poster;
+
+		if ('text' === $options[0]) {
+			$post_text = $myts->displayTarea($arr['post_text'], $arr['dohtml'], $arr['dosmiley'], $arr['doxcode'], 1, $arr['dobr']);
+			if (!empty($options[5])) {
+				$post_text = xoops_substr(strip_tags($post_text), 0, $options[5]);
+			}
+			$topic['post_text'] = $post_text;
+		}
+		// START irmtfan remove hardcoded html in URLs
+		$seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
+		$seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+		// END irmtfan remove hardcoded html in URLs
+		if (!empty($newbbConfig['do_rewrite'])) {
+			$topic['seo_url']       = seo_urls($seo_url);
+			$topic['seo_forum_url'] = seo_urls($seo_forum_url);
+		} else {
+			$topic['seo_url']       = $seo_url;
+			$topic['seo_forum_url'] = $seo_forum_url;
+		}
+
+		$block['topics'][] = $topic;
+		unset($topic);
+	}
+	// START irmtfan remove hardcoded html in URLs
+	$seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+	$block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
+	$seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+	$block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
+	$seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+	$block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
+	// END irmtfan remove hardcoded html in URLs
+
+	$block['indexNav'] = (int)$options[4];
+
+	return $block;
 }
 
 // options[0] - Citeria valid: post(by default), topic, digest, sticky
@@ -572,95 +572,95 @@ 
  */
 function b_newbb_author_show($options)
 {
-    global $accessForums;
-    global $newbbConfig;
-    $myts  = \MyTextSanitizer::getInstance();
-    $block = [];
-    //    $i              = 0;
-    $type          = 'topic';
-    $order         = 'count';
-    $extraCriteria = '';
-    $time_criteria = null;
-    if (!empty($options[2])) {
-        require_once  dirname(__DIR__) . '/include/functions.time.php';
-        $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND topic_time > ' . $time_criteria;
-    }
-    switch ($options[0]) {
-        case 'topic':
-            break;
-        case 'digest':
-            $extraCriteria = ' AND topic_digest = 1';
-            if (null !== $time_criteria) {
-                $extraCriteria .= ' AND digest_time > ' . $time_criteria;
-            }
-            break;
-        case 'sticky':
-            $extraCriteria .= ' AND topic_sticky = 1';
-            break;
-        case 'post':
-        default:
-            $type = 'post';
-            if (null !== $time_criteria) {
-                $extraCriteria = ' AND post_time > ' . $time_criteria;
-            }
-            break;
-    }
-
-    if (!isset($accessForums)) {
-        /** var Newbb\PermissionHandler $permHandler */
-        $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        if (!$accessForums = $permHandler->getForums()) {
-            return $block;
-        }
-    }
-
-    if (!empty($options[5])) {
-        $myallowedForums = array_filter(array_slice($options, 5), 'b_newbb_array_filter'); // get allowed forums
-        $allowedForums   = array_intersect($myallowedForums, $accessForums);
-    } else {
-        $allowedForums = $accessForums;
-    }
-    if (empty($allowedForums)) {
-        return false;
-    }
-
-    if ('topic' === $type) {
-        $forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
-        $approveCriteria = ' AND approved = 1';
-        $query           = 'SELECT DISTINCT topic_poster AS author, COUNT(*) AS count
+	global $accessForums;
+	global $newbbConfig;
+	$myts  = \MyTextSanitizer::getInstance();
+	$block = [];
+	//    $i              = 0;
+	$type          = 'topic';
+	$order         = 'count';
+	$extraCriteria = '';
+	$time_criteria = null;
+	if (!empty($options[2])) {
+		require_once  dirname(__DIR__) . '/include/functions.time.php';
+		$time_criteria = time() - newbbGetSinceTime($options[2]);
+		$extraCriteria = ' AND topic_time > ' . $time_criteria;
+	}
+	switch ($options[0]) {
+		case 'topic':
+			break;
+		case 'digest':
+			$extraCriteria = ' AND topic_digest = 1';
+			if (null !== $time_criteria) {
+				$extraCriteria .= ' AND digest_time > ' . $time_criteria;
+			}
+			break;
+		case 'sticky':
+			$extraCriteria .= ' AND topic_sticky = 1';
+			break;
+		case 'post':
+		default:
+			$type = 'post';
+			if (null !== $time_criteria) {
+				$extraCriteria = ' AND post_time > ' . $time_criteria;
+			}
+			break;
+	}
+
+	if (!isset($accessForums)) {
+		/** var Newbb\PermissionHandler $permHandler */
+		$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		if (!$accessForums = $permHandler->getForums()) {
+			return $block;
+		}
+	}
+
+	if (!empty($options[5])) {
+		$myallowedForums = array_filter(array_slice($options, 5), 'b_newbb_array_filter'); // get allowed forums
+		$allowedForums   = array_intersect($myallowedForums, $accessForums);
+	} else {
+		$allowedForums = $accessForums;
+	}
+	if (empty($allowedForums)) {
+		return false;
+	}
+
+	if ('topic' === $type) {
+		$forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
+		$approveCriteria = ' AND approved = 1';
+		$query           = 'SELECT DISTINCT topic_poster AS author, COUNT(*) AS count
                     FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '
                     WHERE topic_poster>0 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' GROUP BY topic_poster ORDER BY ' . $order . ' DESC';
-    } else {
-        $forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
-        $approveCriteria = ' AND approved = 1';
-        $query           = 'SELECT DISTINCT uid AS author, COUNT(*) AS count
+	} else {
+		$forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
+		$approveCriteria = ' AND approved = 1';
+		$query           = 'SELECT DISTINCT uid AS author, COUNT(*) AS count
                     FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '
                     WHERE uid > 0 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' GROUP BY uid ORDER BY ' . $order . ' DESC';
-    }
-
-    $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
-    if (!$result) {
-        //xoops_error($GLOBALS['xoopsDB']->error());
-        return $block;
-    }
-    $author = [];
-    while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $author[$row['author']]['count'] = $row['count'];
-    }
-    if (count($author) < 1) {
-        return $block;
-    }
-    require_once  dirname(__DIR__) . '/include/functions.user.php';
-    $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname']);
-    foreach (array_keys($author) as $uid) {
-        $author[$uid]['name'] = $myts->htmlSpecialChars($author_name[$uid]);
-    }
-    $block['authors']   =& $author;
-    $block['disp_mode'] = $options[3]; // 0 - full view; 1 - lite view;
-    $block['indexNav']  = (int)$options[4];
-
-    return $block;
+	}
+
+	$result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
+	if (!$result) {
+		//xoops_error($GLOBALS['xoopsDB']->error());
+		return $block;
+	}
+	$author = [];
+	while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+		$author[$row['author']]['count'] = $row['count'];
+	}
+	if (count($author) < 1) {
+		return $block;
+	}
+	require_once  dirname(__DIR__) . '/include/functions.user.php';
+	$author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname']);
+	foreach (array_keys($author) as $uid) {
+		$author[$uid]['name'] = $myts->htmlSpecialChars($author_name[$uid]);
+	}
+	$block['authors']   =& $author;
+	$block['disp_mode'] = $options[3]; // 0 - full view; 1 - lite view;
+	$block['indexNav']  = (int)$options[4];
+
+	return $block;
 }
 
 /**
@@ -669,58 +669,58 @@ 
  */
 function b_newbb_edit($options)
 {
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
-
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
-    $form .= "<option value='time'";
-    if ('time' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TIME . '</option>';
-    $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
-    if (0 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
-    if (1 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
-    if (2 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
-
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
-    if (1 == $options[4]) {
-        $form .= ' checked';
-    }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
-    if (0 == $options[4]) {
-        $form .= ' checked';
-    }
-    $form .= ' />' . _NO;
-
-    $form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
-
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
-
-    $optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
-    $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
-    $form         .= '<br>&nbsp;&nbsp;<select name="options[]" multiple="multiple">';
-    $form         .= '<option value="0" ';
-    if ($isAll) {
-        $form .= ' selected';
-    }
-    $form .= '>' . _ALL . '</option>';
-    $form .= newbbForumSelectBox($optionsForum);
-    $form .= '</select><br>';
-
-    return $form;
+	require_once  dirname(__DIR__) . '/include/functions.forum.php';
+
+	$form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+	$form .= "<option value='time'";
+	if ('time' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_TIME . '</option>';
+	$form .= '</select>';
+	$form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
+	$form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
+	$form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
+	$form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+	if (0 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
+	if (1 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
+	if (2 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+
+	$form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+	if (1 == $options[4]) {
+		$form .= ' checked';
+	}
+	$form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+	if (0 == $options[4]) {
+		$form .= ' checked';
+	}
+	$form .= ' />' . _NO;
+
+	$form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
+
+	$form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+
+	$optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
+	$isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
+	$form         .= '<br>&nbsp;&nbsp;<select name="options[]" multiple="multiple">';
+	$form         .= '<option value="0" ';
+	if ($isAll) {
+		$form .= ' selected';
+	}
+	$form .= '>' . _ALL . '</option>';
+	$form .= newbbForumSelectBox($optionsForum);
+	$form .= '</select><br>';
+
+	return $form;
 }
 
 /**
@@ -729,78 +729,78 @@ 
  */
 function b_newbb_topic_edit($options)
 {
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
-    $form .= "<option value='time'";
-    if ('time' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TIME . '</option>';
-    $form .= "<option value='views'";
-    if ('views' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_VIEWS . '</option>';
-    $form .= "<option value='replies'";
-    if ('replies' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_REPLIES . '</option>';
-    $form .= "<option value='digest'";
-    if ('digest' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_DIGEST . '</option>';
-    $form .= "<option value='sticky'";
-    if ('sticky' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_STICKY . '</option>';
-    $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
-    if (0 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
-    if (1 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
-    if (2 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
-
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
-    if (1 == $options[4]) {
-        $form .= ' checked';
-    }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
-    if (0 == $options[4]) {
-        $form .= ' checked';
-    }
-    $form .= ' />' . _NO;
-
-    $form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
-
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
-
-    $optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
-
-    $isAll = (0 === count($optionsForum) || empty($optionsForum[0]));
-    $form  .= '<br>&nbsp;&nbsp;<select name="options[]" multiple="multiple">';
-    $form  .= '<option value="0" ';
-    if ($isAll) {
-        $form .= ' selected="selected"';
-    }
-    $form .= '>' . _ALL . '</option>';
-    $form .= newbbForumSelectBox($optionsForum);
-    $form .= '</select><br>';
-
-    return $form;
+	require_once  dirname(__DIR__) . '/include/functions.forum.php';
+	$form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+	$form .= "<option value='time'";
+	if ('time' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_TIME . '</option>';
+	$form .= "<option value='views'";
+	if ('views' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_VIEWS . '</option>';
+	$form .= "<option value='replies'";
+	if ('replies' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_REPLIES . '</option>';
+	$form .= "<option value='digest'";
+	if ('digest' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_DIGEST . '</option>';
+	$form .= "<option value='sticky'";
+	if ('sticky' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_STICKY . '</option>';
+	$form .= '</select>';
+	$form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
+	$form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
+	$form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
+	$form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+	if (0 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
+	if (1 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
+	if (2 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+
+	$form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+	if (1 == $options[4]) {
+		$form .= ' checked';
+	}
+	$form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+	if (0 == $options[4]) {
+		$form .= ' checked';
+	}
+	$form .= ' />' . _NO;
+
+	$form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
+
+	$form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+
+	$optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
+
+	$isAll = (0 === count($optionsForum) || empty($optionsForum[0]));
+	$form  .= '<br>&nbsp;&nbsp;<select name="options[]" multiple="multiple">';
+	$form  .= '<option value="0" ';
+	if ($isAll) {
+		$form .= ' selected="selected"';
+	}
+	$form .= '>' . _ALL . '</option>';
+	$form .= newbbForumSelectBox($optionsForum);
+	$form .= '</select><br>';
+
+	return $form;
 }
 
 /**
@@ -809,62 +809,62 @@ 
  */
 function b_newbb_post_edit($options)
 {
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
-    $form .= "<option value='title'";
-    if ('title' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TITLE . '</option>';
-    $form .= "<option value='text'";
-    if ('text' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TEXT . '</option>';
-    $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
-    if (0 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
-    if (1 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
-    if (2 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
-
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
-    if (1 == $options[4]) {
-        $form .= ' checked';
-    }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
-    if (0 == $options[4]) {
-        $form .= ' checked';
-    }
-    $form .= ' />' . _NO;
-
-    $form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
-
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
-
-    $optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
-    $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
-    $form         .= '<br>&nbsp;&nbsp;<select name="options[]" multiple="multiple">';
-    $form         .= '<option value="0" ';
-    if ($isAll) {
-        $form .= ' selected="selected"';
-    }
-    $form .= '>' . _ALL . '</option>';
-    $form .= newbbForumSelectBox($optionsForum);
-    $form .= '</select><br>';
-
-    return $form;
+	require_once  dirname(__DIR__) . '/include/functions.forum.php';
+	$form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+	$form .= "<option value='title'";
+	if ('title' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_TITLE . '</option>';
+	$form .= "<option value='text'";
+	if ('text' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_TEXT . '</option>';
+	$form .= '</select>';
+	$form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
+	$form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
+	$form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
+	$form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+	if (0 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
+	if (1 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
+	if (2 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+
+	$form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+	if (1 == $options[4]) {
+		$form .= ' checked';
+	}
+	$form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+	if (0 == $options[4]) {
+		$form .= ' checked';
+	}
+	$form .= ' />' . _NO;
+
+	$form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
+
+	$form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+
+	$optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
+	$isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
+	$form         .= '<br>&nbsp;&nbsp;<select name="options[]" multiple="multiple">';
+	$form         .= '<option value="0" ';
+	if ($isAll) {
+		$form .= ' selected="selected"';
+	}
+	$form .= '>' . _ALL . '</option>';
+	$form .= newbbForumSelectBox($optionsForum);
+	$form .= '</select><br>';
+
+	return $form;
 }
 
 /**
@@ -873,66 +873,66 @@ 
  */
 function b_newbb_author_edit($options)
 {
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
-    $form .= "<option value='post'";
-    if ('post' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_POST . '</option>';
-    $form .= "<option value='topic'";
-    if ('topic' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TOPIC . '</option>';
-    $form .= "<option value='digest'";
-    if ('digest' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_DIGESTS . '</option>';
-    $form .= "<option value='sticky'";
-    if ('sticky' === $options[0]) {
-        $form .= " selected='selected' ";
-    }
-    $form .= '>' . _MB_NEWBB_CRITERIA_STICKYS . '</option>';
-    $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
-    if (0 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='1'";
-    if (1 == $options[3]) {
-        $form .= ' checked';
-    }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
-
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
-    if (1 == $options[4]) {
-        $form .= ' checked';
-    }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
-    if (0 == $options[4]) {
-        $form .= ' checked';
-    }
-    $form .= ' />' . _NO;
-
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
-
-    $optionsForum = array_filter(array_slice($options, 5), 'b_newbb_array_filter'); // get allowed forums
-    $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
-    $form         .= '<br>&nbsp;&nbsp;<select name="options[]" multiple="multiple">';
-    $form         .= '<option value="0" ';
-    if ($isAll) {
-        $form .= ' selected="selected"';
-    }
-    $form .= '>' . _ALL . '</option>';
-    $form .= newbbForumSelectBox($optionsForum);
-    $form .= '</select><br>';
-
-    return $form;
+	require_once  dirname(__DIR__) . '/include/functions.forum.php';
+	$form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+	$form .= "<option value='post'";
+	if ('post' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_POST . '</option>';
+	$form .= "<option value='topic'";
+	if ('topic' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_TOPIC . '</option>';
+	$form .= "<option value='digest'";
+	if ('digest' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_DIGESTS . '</option>';
+	$form .= "<option value='sticky'";
+	if ('sticky' === $options[0]) {
+		$form .= " selected='selected' ";
+	}
+	$form .= '>' . _MB_NEWBB_CRITERIA_STICKYS . '</option>';
+	$form .= '</select>';
+	$form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
+	$form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
+	$form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
+	$form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+	if (0 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='1'";
+	if (1 == $options[3]) {
+		$form .= ' checked';
+	}
+	$form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+
+	$form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+	if (1 == $options[4]) {
+		$form .= ' checked';
+	}
+	$form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+	if (0 == $options[4]) {
+		$form .= ' checked';
+	}
+	$form .= ' />' . _NO;
+
+	$form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+
+	$optionsForum = array_filter(array_slice($options, 5), 'b_newbb_array_filter'); // get allowed forums
+	$isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
+	$form         .= '<br>&nbsp;&nbsp;<select name="options[]" multiple="multiple">';
+	$form         .= '<option value="0" ';
+	if ($isAll) {
+		$form .= ' selected="selected"';
+	}
+	$form .= '>' . _ALL . '</option>';
+	$form .= newbbForumSelectBox($optionsForum);
+	$form .= '</select><br>';
+
+	return $form;
 }
 
 /**
@@ -941,22 +941,22 @@ 
  */
 function b_newbb_custom($options)
 {
-    // if no newbb module block set, we have to include the language file
-    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php'))) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php');
-    } else {
-        require_once $GLOBALS['xoops']->path('modules/newbb/language/english/blocks.php');
-    }
-
-    $options = explode('|', $options);
-    $block   = b_newbb_show($options);
-    if (count($block['topics']) < 1) {
-        return false;
-    }
-
-    $tpl = new \XoopsTpl();
-    $tpl->assign('block', $block);
-    $tpl->display('db:newbb_block.tpl');
+	// if no newbb module block set, we have to include the language file
+	if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php'))) {
+		require_once $GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php');
+	} else {
+		require_once $GLOBALS['xoops']->path('modules/newbb/language/english/blocks.php');
+	}
+
+	$options = explode('|', $options);
+	$block   = b_newbb_show($options);
+	if (count($block['topics']) < 1) {
+		return false;
+	}
+
+	$tpl = new \XoopsTpl();
+	$tpl->assign('block', $block);
+	$tpl->display('db:newbb_block.tpl');
 }
 
 /**
@@ -965,20 +965,20 @@ 
  */
 function b_newbb_custom_topic($options)
 {
-    /** @var \XoopsModules\Newbb\Helper $helper */
-    $helper = \XoopsModules\Newbb\Helper::getInstance();
-    // if no newbb module block set, we have to include the language file
-    $helper->loadLanguage('blocks');
-
-    $options = explode('|', $options);
-    $block   = b_newbb_topic_show($options);
-    if (count($block['topics']) < 1) {
-        return false;
-    }
-
-    $tpl = new \XoopsTpl();
-    $tpl->assign('block', $block);
-    $tpl->display('db:newbb_block_topic.tpl');
+	/** @var \XoopsModules\Newbb\Helper $helper */
+	$helper = \XoopsModules\Newbb\Helper::getInstance();
+	// if no newbb module block set, we have to include the language file
+	$helper->loadLanguage('blocks');
+
+	$options = explode('|', $options);
+	$block   = b_newbb_topic_show($options);
+	if (count($block['topics']) < 1) {
+		return false;
+	}
+
+	$tpl = new \XoopsTpl();
+	$tpl->assign('block', $block);
+	$tpl->display('db:newbb_block_topic.tpl');
 }
 
 /**
@@ -987,20 +987,20 @@ 
  */
 function b_newbb_custom_post($options)
 {
-    /** @var \XoopsModules\Newbb\Helper $helper */
-    $helper = \XoopsModules\Newbb\Helper::getInstance();
-    // if no newbb module block set, we have to include the language file
-    $helper->loadLanguage('blocks');
-
-    $options = explode('|', $options);
-    $block   = b_newbb_post_show($options);
-    if (count($block['topics']) < 1) {
-        return false;
-    }
-
-    $tpl = new \XoopsTpl();
-    $tpl->assign('block', $block);
-    $tpl->display('db:newbb_block_post.tpl');
+	/** @var \XoopsModules\Newbb\Helper $helper */
+	$helper = \XoopsModules\Newbb\Helper::getInstance();
+	// if no newbb module block set, we have to include the language file
+	$helper->loadLanguage('blocks');
+
+	$options = explode('|', $options);
+	$block   = b_newbb_post_show($options);
+	if (count($block['topics']) < 1) {
+		return false;
+	}
+
+	$tpl = new \XoopsTpl();
+	$tpl->assign('block', $block);
+	$tpl->display('db:newbb_block_post.tpl');
 }
 
 /**
@@ -1009,20 +1009,20 @@ 
  */
 function b_newbb_custom_author($options)
 {
-    /** @var \XoopsModules\Newbb\Helper $helper */
-    $helper = \XoopsModules\Newbb\Helper::getInstance();
-    // if no newbb module block set, we have to include the language file
-    $helper->loadLanguage('blocks');
-
-    $options = explode('|', $options);
-    $block   = b_newbb_author_show($options);
-    if (count($block['authors']) < 1) {
-        return false;
-    }
-
-    $tpl = new \XoopsTpl();
-    $tpl->assign('block', $block);
-    $tpl->display('db:newbb_block_author.tpl');
+	/** @var \XoopsModules\Newbb\Helper $helper */
+	$helper = \XoopsModules\Newbb\Helper::getInstance();
+	// if no newbb module block set, we have to include the language file
+	$helper->loadLanguage('blocks');
+
+	$options = explode('|', $options);
+	$block   = b_newbb_author_show($options);
+	if (count($block['authors']) < 1) {
+		return false;
+	}
+
+	$tpl = new \XoopsTpl();
+	$tpl->assign('block', $block);
+	$tpl->display('db:newbb_block_author.tpl');
 }
 
 // irmtfan add local stylesheet and js footer.php

Spacing +126 added lines, -126 removed lines

@@ -56,8 +56,8 @@ 
     global $accessForums;
     global $xoopsLogger;
 
-    require_once  dirname(__DIR__) . '/include/functions.config.php';
-    require_once  dirname(__DIR__) . '/include/functions.time.php';
+    require_once  dirname(__DIR__).'/include/functions.config.php';
+    require_once  dirname(__DIR__).'/include/functions.time.php';
 
     $myts          = \MyTextSanitizer::getInstance();
     $block         = [];
@@ -66,7 +66,7 @@ 
     $extraCriteria = '';
     if (!empty($options[2])) {
         //require_once  dirname(__DIR__) . '/include/functions.time.php';
-        $extraCriteria .= ' AND p.post_time>' . (time() - newbbGetSinceTime($options[2]));
+        $extraCriteria .= ' AND p.post_time>'.(time() - newbbGetSinceTime($options[2]));
     }
     switch ($options[0]) {
         case 'time':
@@ -92,7 +92,7 @@ 
         return $block;
     }
 
-    $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $allowedForums) . ')';
+    $forumCriteria   = ' AND t.forum_id IN ('.implode(',', $allowedForums).')';
     $approveCriteria = ' AND t.approved = 1';
 
     $newbbConfig = newbbLoadConfig();
@@ -148,13 +148,13 @@ 
         return $block;
     }
 
-    require_once  dirname(__DIR__) . '/include/functions.user.php';
+    require_once  dirname(__DIR__).'/include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
 
     if (count($types) > 0) {
         /** @var Newbb\TypeHandler $typeHandler */
         $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+        $type_list   = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', array_keys($types)).')', 'IN'));
     }
 
     foreach ($rows as $arr) {
@@ -162,7 +162,7 @@ 
         xoops_loadLanguage('main', 'newbb');
         $topic                  = [];
         $topic_page_jump        = newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST);
-        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . ']';
+        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '['.$type_list[$arr['type_id']].']';
 
         $topic['post_id']      = $arr['post_id'];
         $topic['topic_status'] = $arr['topic_status'];
@@ -174,7 +174,7 @@ 
         if (!empty($options[5])) {
             $title = xoops_substr($title, 0, $options[5]);
         }
-        $topic['title']   = $topic['topic_subject'] . ' ' . $title;
+        $topic['title']   = $topic['topic_subject'].' '.$title;
         $topic['replies'] = $arr['topic_replies'];
         $topic['views']   = $arr['topic_views'];
         $topic['time']    = newbbFormatTimestamp($arr['post_time']);
@@ -186,9 +186,9 @@ 
         $topic['topic_poster']    = $topic_poster;
         $topic['topic_page_jump'] = $topic_page_jump;
         // START irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
-        $seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+        $seo_url       = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'];
+        $seo_topic_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'];
+        $seo_forum_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'];
         if (!empty($newbbConfig['do_rewrite'])) {
             $topic['seo_url']       = seo_urls($seo_url);
             $topic['seo_topic_url'] = seo_urls($seo_topic_url);
@@ -203,11 +203,11 @@ 
         unset($topic);
     }
     // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME;
     $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php';
     $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php';
     $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
     // END irmtfan remove hardcoded html in URLs
     $block['indexNav'] = (int)$options[4];
@@ -230,7 +230,7 @@ 
 function b_newbb_topic_show($options)
 {
     global $accessForums;
-    require_once  dirname(__DIR__) . '/include/functions.time.php';
+    require_once  dirname(__DIR__).'/include/functions.time.php';
     $myts          = \MyTextSanitizer::getInstance();
     $block         = [];
     $i             = 0;
@@ -239,7 +239,7 @@ 
     $time_criteria = null;
     if (!empty($options[2])) {
         $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND t.topic_time>' . $time_criteria;
+        $extraCriteria = ' AND t.topic_time>'.$time_criteria;
     }
     switch ($options[0]) {
         case 'views':
@@ -252,11 +252,11 @@ 
             $order         = 't.digest_time';
             $extraCriteria = ' AND t.topic_digest=1';
             if (null !== $time_criteria) {
-                $extraCriteria .= ' AND t.digest_time>' . $time_criteria;
+                $extraCriteria .= ' AND t.digest_time>'.$time_criteria;
             }
             break;
         case 'sticky':
-            $order         = 't.topic_id';
+            $order = 't.topic_id';
             $extraCriteria .= ' AND t.topic_sticky=1';
             break;
         case 'time':
@@ -292,7 +292,7 @@ 
         return false;
     }
 
-    $forumCriteria   = ' AND t.forum_id IN (' . implode(',', $allowedForums) . ')';
+    $forumCriteria   = ' AND t.forum_id IN ('.implode(',', $allowedForums).')';
     $approveCriteria = ' AND t.approved = 1';
 
     $query = 'SELECT'
@@ -332,19 +332,19 @@ 
     if (count($rows) < 1) {
         return $block;
     }
-    require_once  dirname(__DIR__) . '/include/functions.user.php';
+    require_once  dirname(__DIR__).'/include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
     if (count($types) > 0) {
         /** @var Newbb\TypeHandler $typeHandler */
         $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+        $type_list   = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', array_keys($types)).')', 'IN'));
     }
 
     foreach ($rows as $arr) {
         // irmtfan remove $topic_page_jump because there is no last post
         //$topic_page_jump = '';
         $topic                  = [];
-        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . '] ';
+        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '['.$type_list[$arr['type_id']].'] ';
         $topic['forum_id']      = $arr['forum_id'];
         $topic['forum_name']    = $myts->htmlSpecialChars($arr['forum_name']);
         $topic['id']            = $arr['topic_id'];
@@ -353,7 +353,7 @@ 
         if (!empty($options[5])) {
             $title = xoops_substr($title, 0, $options[5]);
         }
-        $topic['title']   = $topic['topic_subject'] . $title;
+        $topic['title']   = $topic['topic_subject'].$title;
         $topic['replies'] = $arr['topic_replies'];
         $topic['views']   = $arr['topic_views'];
         $topic['time']    = newbbFormatTimestamp($arr['topic_time']);
@@ -366,8 +366,8 @@ 
         // irmtfan remove $topic_page_jump because there is no last post
         //$topic['topic_page_jump'] = $topic_page_jump;
         // START irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+        $seo_topic_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'];
+        $seo_forum_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'];
 
         if (!empty($newbbConfig['do_rewrite'])) {
             $topic['seo_topic_url'] = seo_urls($seo_topic_url);
@@ -381,11 +381,11 @@ 
         unset($topic);
     }
     // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME;
     $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php';
     $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php';
     $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
     // END irmtfan remove hardcoded html in URLs
     $block['indexNav'] = (int)$options[4];
@@ -410,7 +410,7 @@ 
     global $accessForums;
     global $newbbConfig;
 
-    require_once  dirname(__DIR__) . '/include/functions.time.php';
+    require_once  dirname(__DIR__).'/include/functions.time.php';
     $myts          = \MyTextSanitizer::getInstance();
     $block         = [];
     $i             = 0;
@@ -419,7 +419,7 @@ 
     $time_criteria = null;
     if (!empty($options[2])) {
         $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND p.post_time>' . $time_criteria;
+        $extraCriteria = ' AND p.post_time>'.$time_criteria;
     }
 
     switch ($options[0]) {
@@ -463,7 +463,7 @@ 
         return $block;
     }
 
-    $forumCriteria   = ' AND p.forum_id IN (' . implode(',', $allowedForums) . ')';
+    $forumCriteria   = ' AND p.forum_id IN ('.implode(',', $allowedForums).')';
     $approveCriteria = ' AND p.approved = 1';
 
     $query = 'SELECT';
@@ -471,11 +471,11 @@ 
     if ('text' === $options[0]) {
         $query .= '    pt.dohtml, pt.dosmiley, pt.doxcode, pt.dobr, pt.post_text,';
     }
-    $query .= '    f.forum_id, f.forum_name' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' AS p ' . '    LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' AS f ON f.forum_id=p.forum_id';
+    $query .= '    f.forum_id, f.forum_name'.'    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' AS p '.'    LEFT JOIN '.$GLOBALS['xoopsDB']->prefix('newbb_forums').' AS f ON f.forum_id=p.forum_id';
     if ('text' === $options[0]) {
-        $query .= '    LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . ' AS pt ON pt.post_id=p.post_id';
+        $query .= '    LEFT JOIN '.$GLOBALS['xoopsDB']->prefix('newbb_posts_text').' AS pt ON pt.post_id=p.post_id';
     }
-    $query .= '    WHERE 1=1 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' ORDER BY ' . $order . ' DESC';
+    $query .= '    WHERE 1=1 '.$forumCriteria.$approveCriteria.$extraCriteria.' ORDER BY '.$order.' DESC';
 
     $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
     if (!$result) {
@@ -492,15 +492,15 @@ 
     if (count($rows) < 1) {
         return $block;
     }
-    require_once  dirname(__DIR__) . '/include/functions.user.php';
+    require_once  dirname(__DIR__).'/include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
 
     foreach ($rows as $arr) {
         //if ($arr['icon'] && is_file($GLOBALS['xoops']->path('images/subject/' . $arr['icon']))) {
         if (!empty($arr['icon'])) {
-            $last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($arr['icon'], ENT_QUOTES | ENT_HTML5) . '" alt="" />';
+            $last_post_icon = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($arr['icon'], ENT_QUOTES | ENT_HTML5).'" alt="" />';
         } else {
-            $last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/icon1.gif" alt="" />';
+            $last_post_icon = '<img src="'.XOOPS_URL.'/images/subject/icon1.gif" alt="" />';
         }
         //$topic['jump_post'] = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $arr['post_id'] ."#forumpost" . $arr['post_id'] . "'>" . $last_post_icon . '</a>';
         $topic               = [];
@@ -530,8 +530,8 @@ 
             $topic['post_text'] = $post_text;
         }
         // START irmtfan remove hardcoded html in URLs
-        $seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+        $seo_url       = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'];
+        $seo_forum_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'];
         // END irmtfan remove hardcoded html in URLs
         if (!empty($newbbConfig['do_rewrite'])) {
             $topic['seo_url']       = seo_urls($seo_url);
@@ -545,11 +545,11 @@ 
         unset($topic);
     }
     // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME;
     $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php';
     $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php';
     $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
     // END irmtfan remove hardcoded html in URLs
 
@@ -582,9 +582,9 @@ 
     $extraCriteria = '';
     $time_criteria = null;
     if (!empty($options[2])) {
-        require_once  dirname(__DIR__) . '/include/functions.time.php';
+        require_once  dirname(__DIR__).'/include/functions.time.php';
         $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND topic_time > ' . $time_criteria;
+        $extraCriteria = ' AND topic_time > '.$time_criteria;
     }
     switch ($options[0]) {
         case 'topic':
@@ -592,7 +592,7 @@ 
         case 'digest':
             $extraCriteria = ' AND topic_digest = 1';
             if (null !== $time_criteria) {
-                $extraCriteria .= ' AND digest_time > ' . $time_criteria;
+                $extraCriteria .= ' AND digest_time > '.$time_criteria;
             }
             break;
         case 'sticky':
@@ -602,7 +602,7 @@ 
         default:
             $type = 'post';
             if (null !== $time_criteria) {
-                $extraCriteria = ' AND post_time > ' . $time_criteria;
+                $extraCriteria = ' AND post_time > '.$time_criteria;
             }
             break;
     }
@@ -626,17 +626,17 @@ 
     }
 
     if ('topic' === $type) {
-        $forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
+        $forumCriteria   = ' AND forum_id IN ('.implode(',', $allowedForums).')';
         $approveCriteria = ' AND approved = 1';
         $query           = 'SELECT DISTINCT topic_poster AS author, COUNT(*) AS count
-                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '
-                    WHERE topic_poster>0 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' GROUP BY topic_poster ORDER BY ' . $order . ' DESC';
+                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics').'
+                    WHERE topic_poster>0 ' . $forumCriteria.$approveCriteria.$extraCriteria.' GROUP BY topic_poster ORDER BY '.$order.' DESC';
     } else {
-        $forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
+        $forumCriteria   = ' AND forum_id IN ('.implode(',', $allowedForums).')';
         $approveCriteria = ' AND approved = 1';
         $query           = 'SELECT DISTINCT uid AS author, COUNT(*) AS count
-                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '
-                    WHERE uid > 0 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' GROUP BY uid ORDER BY ' . $order . ' DESC';
+                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts').'
+                    WHERE uid > 0 ' . $forumCriteria.$approveCriteria.$extraCriteria.' GROUP BY uid ORDER BY '.$order.' DESC';
     }
 
     $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
@@ -651,12 +651,12 @@ 
     if (count($author) < 1) {
         return $block;
     }
-    require_once  dirname(__DIR__) . '/include/functions.user.php';
+    require_once  dirname(__DIR__).'/include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname']);
     foreach (array_keys($author) as $uid) {
         $author[$uid]['name'] = $myts->htmlSpecialChars($author_name[$uid]);
     }
-    $block['authors']   =& $author;
+    $block['authors']   = & $author;
     $block['disp_mode'] = $options[3]; // 0 - full view; 1 - lite view;
     $block['indexNav']  = (int)$options[4];
 
@@ -669,45 +669,45 @@ 
  */
 function b_newbb_edit($options)
 {
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
+    require_once  dirname(__DIR__).'/include/functions.forum.php';
 
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    $form = _MB_NEWBB_CRITERIA."<select name='options[0]'>";
     $form .= "<option value='time'";
     if ('time' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TIME . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TIME.'</option>';
     $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+    $form .= '<br>'._MB_NEWBB_DISPLAY."<input type='text' name='options[1]' value='".$options[1]."' />";
+    $form .= '<br>'._MB_NEWBB_TIME."<input type='text' name='options[2]' value='".$options[2]."' />";
+    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>'._MB_NEWBB_TIME_DESC.'</small>';
+    $form .= '<br>'._MB_NEWBB_DISPLAYMODE."<input type='radio' name='options[3]' value='0'";
     if (0 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_FULL."<input type='radio' name='options[3]' value='1'";
     if (1 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_COMPACT."<input type='radio' name='options[3]' value='2'";
     if (2 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_LITE;
 
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+    $form .= '<br>'._MB_NEWBB_INDEXNAV.'<input type="radio" name="options[4]" value="1"';
     if (1 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+    $form .= ' />'._YES.'<input type="radio" name="options[4]" value="0"';
     if (0 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _NO;
+    $form .= ' />'._NO;
 
-    $form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
+    $form .= '<br>'._MB_NEWBB_TITLE_LENGTH."<input type='text' name='options[5]' value='".$options[5]."' />";
 
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+    $form .= '<br><br>'._MB_NEWBB_FORUMLIST;
 
     $optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
     $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
@@ -716,7 +716,7 @@ 
     if ($isAll) {
         $form .= ' selected';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -729,64 +729,64 @@ 
  */
 function b_newbb_topic_edit($options)
 {
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    require_once  dirname(__DIR__).'/include/functions.forum.php';
+    $form = _MB_NEWBB_CRITERIA."<select name='options[0]'>";
     $form .= "<option value='time'";
     if ('time' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TIME . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TIME.'</option>';
     $form .= "<option value='views'";
     if ('views' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_VIEWS . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_VIEWS.'</option>';
     $form .= "<option value='replies'";
     if ('replies' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_REPLIES . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_REPLIES.'</option>';
     $form .= "<option value='digest'";
     if ('digest' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_DIGEST . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_DIGEST.'</option>';
     $form .= "<option value='sticky'";
     if ('sticky' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_STICKY . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_STICKY.'</option>';
     $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+    $form .= '<br>'._MB_NEWBB_DISPLAY."<input type='text' name='options[1]' value='".$options[1]."' />";
+    $form .= '<br>'._MB_NEWBB_TIME."<input type='text' name='options[2]' value='".$options[2]."' />";
+    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>'._MB_NEWBB_TIME_DESC.'</small>';
+    $form .= '<br>'._MB_NEWBB_DISPLAYMODE."<input type='radio' name='options[3]' value='0'";
     if (0 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_FULL."<input type='radio' name='options[3]' value='1'";
     if (1 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_COMPACT."<input type='radio' name='options[3]' value='2'";
     if (2 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_LITE;
 
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+    $form .= '<br>'._MB_NEWBB_INDEXNAV.'<input type="radio" name="options[4]" value="1"';
     if (1 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+    $form .= ' />'._YES.'<input type="radio" name="options[4]" value="0"';
     if (0 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _NO;
+    $form .= ' />'._NO;
 
-    $form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
+    $form .= '<br>'._MB_NEWBB_TITLE_LENGTH."<input type='text' name='options[5]' value='".$options[5]."' />";
 
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+    $form .= '<br><br>'._MB_NEWBB_FORUMLIST;
 
     $optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
 
@@ -796,7 +796,7 @@ 
     if ($isAll) {
         $form .= ' selected="selected"';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -809,49 +809,49 @@ 
  */
 function b_newbb_post_edit($options)
 {
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    require_once  dirname(__DIR__).'/include/functions.forum.php';
+    $form = _MB_NEWBB_CRITERIA."<select name='options[0]'>";
     $form .= "<option value='title'";
     if ('title' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TITLE . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TITLE.'</option>';
     $form .= "<option value='text'";
     if ('text' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TEXT . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TEXT.'</option>';
     $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+    $form .= '<br>'._MB_NEWBB_DISPLAY."<input type='text' name='options[1]' value='".$options[1]."' />";
+    $form .= '<br>'._MB_NEWBB_TIME."<input type='text' name='options[2]' value='".$options[2]."' />";
+    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>'._MB_NEWBB_TIME_DESC.'</small>';
+    $form .= '<br>'._MB_NEWBB_DISPLAYMODE."<input type='radio' name='options[3]' value='0'";
     if (0 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_FULL . "<input type='radio' name='options[3]' value='1'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_FULL."<input type='radio' name='options[3]' value='1'";
     if (1 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='2'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_COMPACT."<input type='radio' name='options[3]' value='2'";
     if (2 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_LITE;
 
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+    $form .= '<br>'._MB_NEWBB_INDEXNAV.'<input type="radio" name="options[4]" value="1"';
     if (1 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+    $form .= ' />'._YES.'<input type="radio" name="options[4]" value="0"';
     if (0 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _NO;
+    $form .= ' />'._NO;
 
-    $form .= '<br>' . _MB_NEWBB_TITLE_LENGTH . "<input type='text' name='options[5]' value='" . $options[5] . "' />";
+    $form .= '<br>'._MB_NEWBB_TITLE_LENGTH."<input type='text' name='options[5]' value='".$options[5]."' />";
 
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+    $form .= '<br><br>'._MB_NEWBB_FORUMLIST;
 
     $optionsForum = array_filter(array_slice($options, 6), 'b_newbb_array_filter'); // get allowed forums
     $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
@@ -860,7 +860,7 @@ 
     if ($isAll) {
         $form .= ' selected="selected"';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -873,53 +873,53 @@ 
  */
 function b_newbb_author_edit($options)
 {
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    require_once  dirname(__DIR__).'/include/functions.forum.php';
+    $form = _MB_NEWBB_CRITERIA."<select name='options[0]'>";
     $form .= "<option value='post'";
     if ('post' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_POST . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_POST.'</option>';
     $form .= "<option value='topic'";
     if ('topic' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_TOPIC . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_TOPIC.'</option>';
     $form .= "<option value='digest'";
     if ('digest' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_DIGESTS . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_DIGESTS.'</option>';
     $form .= "<option value='sticky'";
     if ('sticky' === $options[0]) {
         $form .= " selected='selected' ";
     }
-    $form .= '>' . _MB_NEWBB_CRITERIA_STICKYS . '</option>';
+    $form .= '>'._MB_NEWBB_CRITERIA_STICKYS.'</option>';
     $form .= '</select>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAY . "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_NEWBB_TIME . "<input type='text' name='options[2]' value='" . $options[2] . "' />";
-    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>' . _MB_NEWBB_TIME_DESC . '</small>';
-    $form .= '<br>' . _MB_NEWBB_DISPLAYMODE . "<input type='radio' name='options[3]' value='0'";
+    $form .= '<br>'._MB_NEWBB_DISPLAY."<input type='text' name='options[1]' value='".$options[1]."' />";
+    $form .= '<br>'._MB_NEWBB_TIME."<input type='text' name='options[2]' value='".$options[2]."' />";
+    $form .= '<br>&nbsp;&nbsp;&nbsp;&nbsp;<small>'._MB_NEWBB_TIME_DESC.'</small>';
+    $form .= '<br>'._MB_NEWBB_DISPLAYMODE."<input type='radio' name='options[3]' value='0'";
     if (0 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_COMPACT . "<input type='radio' name='options[3]' value='1'";
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_COMPACT."<input type='radio' name='options[3]' value='1'";
     if (1 == $options[3]) {
         $form .= ' checked';
     }
-    $form .= ' />&nbsp;' . _MB_NEWBB_DISPLAYMODE_LITE;
+    $form .= ' />&nbsp;'._MB_NEWBB_DISPLAYMODE_LITE;
 
-    $form .= '<br>' . _MB_NEWBB_INDEXNAV . '<input type="radio" name="options[4]" value="1"';
+    $form .= '<br>'._MB_NEWBB_INDEXNAV.'<input type="radio" name="options[4]" value="1"';
     if (1 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _YES . '<input type="radio" name="options[4]" value="0"';
+    $form .= ' />'._YES.'<input type="radio" name="options[4]" value="0"';
     if (0 == $options[4]) {
         $form .= ' checked';
     }
-    $form .= ' />' . _NO;
+    $form .= ' />'._NO;
 
-    $form .= '<br><br>' . _MB_NEWBB_FORUMLIST;
+    $form .= '<br><br>'._MB_NEWBB_FORUMLIST;
 
     $optionsForum = array_filter(array_slice($options, 5), 'b_newbb_array_filter'); // get allowed forums
     $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
@@ -928,7 +928,7 @@ 
     if ($isAll) {
         $form .= ' selected="selected"';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -942,8 +942,8 @@ 
 function b_newbb_custom($options)
 {
     // if no newbb module block set, we have to include the language file
-    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php'))) {
-        require_once $GLOBALS['xoops']->path('modules/newbb/language/' . $GLOBALS['xoopsConfig']['language'] . '/blocks.php');
+    if (is_readable($GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php'))) {
+        require_once $GLOBALS['xoops']->path('modules/newbb/language/'.$GLOBALS['xoopsConfig']['language'].'/blocks.php');
     } else {
         require_once $GLOBALS['xoops']->path('modules/newbb/language/english/blocks.php');
     }

report.php

Indentation +69 added lines, -69 removed lines

@@ -35,22 +35,22 @@ 
 
 $GPC = '_GET';
 if (Request::getString('submit', '', 'POST')) {
-    $GPC = '_POST';
+	$GPC = '_POST';
 }
 
 foreach (['post_id', 'order', 'forum', 'topic_id'] as $getint) {
-    ${$getint} = (int)(@${$GPC}[$getint]);
+	${$getint} = (int)(@${$GPC}[$getint]);
 }
 $viewmode = (isset(${$GPC}['viewmode']) && 'flat' !== ${$GPC}['viewmode']) ? 'thread' : 'flat';
 
 if (empty($post_id)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORPOST);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORPOST);
 }
 
 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);
 }
 
 $myts = \MyTextSanitizer::getInstance();
@@ -60,68 +60,68 @@ 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
 if (Request::hasVar('submit', 'POST')) {
-    $error_message = '';
-    if (!is_object($GLOBALS['xoopsUser'])) {
-        xoops_load('xoopscaptcha');
-        $xoopsCaptcha = \XoopsCaptcha::getInstance();
-        if (!$xoopsCaptcha->verify()) {
-            $captcha_invalid = true;
-            $error_message   = $xoopsCaptcha->getMessage();
-        }
-    }
-    if ('' !== $error_message) {
-        xoops_error($error_message);
-    } else {
-        //        $reportHandler = Newbb\Helper::getInstance()->getHandler('Report');
-        $report = $reportHandler->create();
-        $report->setVar('report_text', Request::getString('report_text', '', 'POST'));
-        $report->setVar('post_id', Request::getInt('post_id', 0, 'POST'));
-        $report->setVar('report_time', time());
-        $report->setVar('reporter_uid', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0);
-        $report->setVar('reporter_ip', \Xmf\IPAddress::fromRequest()->asReadable());
-        $report->setVar('report_result', 0);
-        $report->setVar('report_memo', '');
-
-        if ($report_id = $reportHandler->insert($report)) {
-            //            $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-            if (empty($forum)) {
-            }
-            $forumObject = $forumHandler->get($forum);
-
-            if (is_object($forumObject)) {
-                $mods   = $forumObject->getVar('forum_moderator');
-                $emails = [];
-                /** @var \XoopsMemberHandler $memberHandler */
-                $memberHandler = xoops_getHandler('member');
-                foreach ($mods as $mod) {
-                    $thisUser = $memberHandler->getUser($mod);
-                    if (is_object($thisUser)) {
-                        $emails[] = $thisUser->getVar('email');
-                        unset($thisUser);
-                    }
-                }
-                $xoopsMailer = xoops_getMailer();
-                $xoopsMailer->reset();
-                $xoopsMailer->setTemplateDir();
-                $xoopsMailer->useMail();
-                $xoopsMailer->setTemplate('forum_report.tpl');
-                $xoopsMailer->setToEmails($emails);
-                $xoopsMailer->assign('MESSAGE', Request::getString('report_text', '', 'POST'));
-                $xoopsMailer->setSubject(_MD_NEWBB_REPORTSUBJECT);
-                $xoopsMailer->send();
-            }
-            $message = _MD_NEWBB_REPORTED;
-        } else {
-            $message = _MD_NEWBB_REPORT_ERROR;
-        }
-        redirect_header("viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&order=$order&viewmode=$viewmode", 2, $message);
-    }
+	$error_message = '';
+	if (!is_object($GLOBALS['xoopsUser'])) {
+		xoops_load('xoopscaptcha');
+		$xoopsCaptcha = \XoopsCaptcha::getInstance();
+		if (!$xoopsCaptcha->verify()) {
+			$captcha_invalid = true;
+			$error_message   = $xoopsCaptcha->getMessage();
+		}
+	}
+	if ('' !== $error_message) {
+		xoops_error($error_message);
+	} else {
+		//        $reportHandler = Newbb\Helper::getInstance()->getHandler('Report');
+		$report = $reportHandler->create();
+		$report->setVar('report_text', Request::getString('report_text', '', 'POST'));
+		$report->setVar('post_id', Request::getInt('post_id', 0, 'POST'));
+		$report->setVar('report_time', time());
+		$report->setVar('reporter_uid', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0);
+		$report->setVar('reporter_ip', \Xmf\IPAddress::fromRequest()->asReadable());
+		$report->setVar('report_result', 0);
+		$report->setVar('report_memo', '');
+
+		if ($report_id = $reportHandler->insert($report)) {
+			//            $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+			if (empty($forum)) {
+			}
+			$forumObject = $forumHandler->get($forum);
+
+			if (is_object($forumObject)) {
+				$mods   = $forumObject->getVar('forum_moderator');
+				$emails = [];
+				/** @var \XoopsMemberHandler $memberHandler */
+				$memberHandler = xoops_getHandler('member');
+				foreach ($mods as $mod) {
+					$thisUser = $memberHandler->getUser($mod);
+					if (is_object($thisUser)) {
+						$emails[] = $thisUser->getVar('email');
+						unset($thisUser);
+					}
+				}
+				$xoopsMailer = xoops_getMailer();
+				$xoopsMailer->reset();
+				$xoopsMailer->setTemplateDir();
+				$xoopsMailer->useMail();
+				$xoopsMailer->setTemplate('forum_report.tpl');
+				$xoopsMailer->setToEmails($emails);
+				$xoopsMailer->assign('MESSAGE', Request::getString('report_text', '', 'POST'));
+				$xoopsMailer->setSubject(_MD_NEWBB_REPORTSUBJECT);
+				$xoopsMailer->send();
+			}
+			$message = _MD_NEWBB_REPORTED;
+		} else {
+			$message = _MD_NEWBB_REPORT_ERROR;
+		}
+		redirect_header("viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&order=$order&viewmode=$viewmode", 2, $message);
+	}
 }
 
 $report_form = new \XoopsThemeForm('', 'reportform', 'report.php');
 $report_form->addElement(new \XoopsFormText(_MD_NEWBB_REPORT_TEXT, 'report_text', 80, 255, Request::getString('report_text', '', 'POST')), true);
 if (!is_object($GLOBALS['xoopsUser'])) {
-    $report_form->addElement(new \XoopsFormCaptcha());
+	$report_form->addElement(new \XoopsFormCaptcha());
 }
 
 //$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
@@ -147,19 +147,19 @@ 
 
 $r_subject = $postObject->getVar('subject', 'E');
 if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $postObject->getVar('post_karma') > 0) {
-    $r_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $postObject->getVar('post_karma')) . '</div>';
+	$r_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $postObject->getVar('post_karma')) . '</div>';
 } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $postObject->getVar('require_reply')) {
-    $r_message = _MD_NEWBB_REPLY_REQUIREMENT;
+	$r_message = _MD_NEWBB_REPLY_REQUIREMENT;
 } else {
-    $r_message = $postObject->getVar('post_text');
+	$r_message = $postObject->getVar('post_text');
 }
 
 $r_date = formatTimestamp($postObject->getVar('post_time'));
 if ($postObject->getVar('uid')) {
-    $r_name = newbbGetUnameFromId($postObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
+	$r_name = newbbGetUnameFromId($postObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
 } else {
-    $poster_name = $postObject->getVar('poster_name');
-    $r_name      = empty($poster_name) ? $GLOBALS['xoopsConfig']['anonymous'] : $myts->htmlSpecialChars($poster_name);
+	$poster_name = $postObject->getVar('poster_name');
+	$r_name      = empty($poster_name) ? $GLOBALS['xoopsConfig']['anonymous'] : $myts->htmlSpecialChars($poster_name);
 }
 $r_content = _MD_NEWBB_SUBJECTC . ' ' . $r_subject . '<br>';
 $r_content .= _MD_NEWBB_BY . ' ' . $r_name . ' ' . _MD_NEWBB_ON . ' ' . $r_date . '<br><br>';

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $GPC = '_GET';
 if (Request::getString('submit', '', 'POST')) {
@@ -44,7 +44,7 @@ 
 $viewmode = (isset(${$GPC}['viewmode']) && 'flat' !== ${$GPC}['viewmode']) ? 'thread' : 'flat';
 
 if (empty($post_id)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORPOST);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_ERRORPOST);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
@@ -139,7 +139,7 @@ 
 $submit_button = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
 $cancel_button = new \XoopsFormButton('', 'cancel', _MD_NEWBB_CANCELPOST, 'button');
 $extra         = "viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&order=$order&viewmode=$viewmode";
-$cancel_button->setExtra("onclick='location=\"" . $extra . "\"'");
+$cancel_button->setExtra("onclick='location=\"".$extra."\"'");
 $button_tray->addElement($submit_button);
 $button_tray->addElement($cancel_button);
 $report_form->addElement($button_tray);
@@ -147,7 +147,7 @@ 
 
 $r_subject = $postObject->getVar('subject', 'E');
 if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $postObject->getVar('post_karma') > 0) {
-    $r_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $postObject->getVar('post_karma')) . '</div>';
+    $r_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $postObject->getVar('post_karma')).'</div>';
 } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $postObject->getVar('require_reply')) {
     $r_message = _MD_NEWBB_REPLY_REQUIREMENT;
 } else {
@@ -161,11 +161,11 @@ 
     $poster_name = $postObject->getVar('poster_name');
     $r_name      = empty($poster_name) ? $GLOBALS['xoopsConfig']['anonymous'] : $myts->htmlSpecialChars($poster_name);
 }
-$r_content = _MD_NEWBB_SUBJECTC . ' ' . $r_subject . '<br>';
-$r_content .= _MD_NEWBB_BY . ' ' . $r_name . ' ' . _MD_NEWBB_ON . ' ' . $r_date . '<br><br>';
+$r_content = _MD_NEWBB_SUBJECTC.' '.$r_subject.'<br>';
+$r_content .= _MD_NEWBB_BY.' '.$r_name.' '._MD_NEWBB_ON.' '.$r_date.'<br><br>';
 $r_content .= $r_message;
 
-echo "<br><table cellpadding='4' cellspacing='1' width='98%' class='outer'><tr><td class='head'>" . $r_subject . '</td></tr>';
-echo '<tr><td><br>' . $r_content . '<br></td></tr></table>';
+echo "<br><table cellpadding='4' cellspacing='1' width='98%' class='outer'><tr><td class='head'>".$r_subject.'</td></tr>';
+echo '<tr><td><br>'.$r_content.'<br></td></tr></table>';
 
 require_once $GLOBALS['xoops']->path('footer.php');

list.topic.php

Indentation +9 added lines, -9 removed lines

@@ -20,7 +20,7 @@ 
 require_once $GLOBALS['xoops']->path('header.php');
 // 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'));
 }
@@ -35,7 +35,7 @@ 
 $topic_renderer->userlevel = $GLOBALS['xoopsUserIsAdmin'] ? 2 : is_object($GLOBALS['xoopsUser']);
 // irmtfan if list topic block is in the page then force to parse
 if (defined('LIST_TOPIC_DEFINED')) {
-    $topic_renderer->force = true; // force against static vars
+	$topic_renderer->force = true; // force against static vars
 }
 
 $topic_renderer->is_multiple = true;
@@ -52,14 +52,14 @@ 
 //$isAdmin = $GLOBALS["xoopsUserIsAdmin"];
 /* Only admin has access to admin mode */
 if ($topic_renderer->userlevel < 2) { // irmtfan use userlevel
-    $mode = 0;
+	$mode = 0;
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init();
-    $onlineHandler->render($xoopsTpl);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init();
+	$onlineHandler->render($xoopsTpl);
 }
 
 $topic_renderer->buildHeaders($xoopsTpl);
@@ -87,8 +87,8 @@ 
 $xoopsTpl->assign('newpost_link', 'viewpost.php?status=new');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
-    $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox());
+	require_once __DIR__ . '/include/functions.forum.php';
+	$xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox());
 }
 $xoopsTpl->assign('menumode', $menumode);
 $xoopsTpl->assign('menumode_other', $menumode_other);

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 //$xoopsOption['xoops_module_header']= $xoops_module_header;
 $GLOBALS['xoopsOption']['template_main'] = 'newbb_viewall.tpl';
@@ -21,13 +21,13 @@ 
 // 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_module_header', $xoops_module_header);
 
-require_once __DIR__ . '/include/functions.time.php';
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.time.php';
+require_once __DIR__.'/include/functions.render.php';
 
 // irmtfan use require_once because it will redeclared in newbb/blocks/list_topic.php
 //require_once __DIR__ . '/./class/TopicRenderer.php';
@@ -87,7 +87,7 @@ 
 $xoopsTpl->assign('newpost_link', 'viewpost.php?status=new');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
+    require_once __DIR__.'/include/functions.forum.php';
     $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox());
 }
 $xoopsTpl->assign('menumode', $menumode);
@@ -95,12 +95,12 @@ 
 
 $xoopsTpl->assign('mode', $mode);
 $xoopsTpl->assign('status', $status);
-$xoopsTpl->assign('viewer_level', $topic_renderer->userlevel);// irmtfan use userlevel
+$xoopsTpl->assign('viewer_level', $topic_renderer->userlevel); // irmtfan use userlevel
 
 $pagetitle = sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES));
 $xoopsTpl->assign('forum_index_title', $pagetitle);
 $xoopsTpl->assign('xoops_pagetitle', $pagetitle);
 
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

viewpost.php

Indentation +257 added lines, -257 removed lines

@@ -41,7 +41,7 @@ 
 $uid = Request::getInt('uid', 0, 'GET');
 
 $status = (Request::getString('status', '', 'GET')
-           && in_array(Request::getString('status', '', 'GET'), ['active', 'pending', 'deleted', 'new', 'all', 'digest'], true)) ? Request::getString('status', '', 'GET') : '';
+		   && in_array(Request::getString('status', '', 'GET'), ['active', 'pending', 'deleted', 'new', 'all', 'digest'], true)) ? Request::getString('status', '', 'GET') : '';
 $mode   = Request::getInt('mode', 0, 'GET');
 $mode   = (!empty($status) && in_array($status, ['active', 'pending', 'deleted'], true)) ? 2 : $mode;
 
@@ -51,23 +51,23 @@ 
 //$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
 
 if (empty($forum_id)) {
-    $forums       = $forumHandler->getByPermission(0, 'view');
-    $accessForums = array_keys($forums);
-    $isAdmin      = $GLOBALS['xoopsUserIsAdmin'];
+	$forums       = $forumHandler->getByPermission(0, 'view');
+	$accessForums = array_keys($forums);
+	$isAdmin      = $GLOBALS['xoopsUserIsAdmin'];
 } else {
-    $forumObject       = $forumHandler->get($forum_id);
-    $forums[$forum_id] = $forumObject;
-    $accessForums      = [$forum_id];
-    $isAdmin           = newbbIsAdmin($forumObject);
+	$forumObject       = $forumHandler->get($forum_id);
+	$forums[$forum_id] = $forumObject;
+	$accessForums      = [$forum_id];
+	$isAdmin           = newbbIsAdmin($forumObject);
 }
 
 /* Only admin has access to admin mode */
 if (!$isAdmin && 2 === $mode) {
-    $status = in_array($status, ['active', 'pending', 'deleted'], true) ? '' : $status;
-    $mode   = 0;
+	$status = in_array($status, ['active', 'pending', 'deleted'], true) ? '' : $status;
+	$mode   = 0;
 }
 if ($mode) {
-    $_GET['viewmode'] = 'flat';
+	$_GET['viewmode'] = 'flat';
 }
 //echo $mode.' - '.$status;
 $post_perpage = $GLOBALS['xoopsModuleConfig']['posts_per_page'];
@@ -78,71 +78,71 @@ 
 $criteria_post->setOrder($order);
 
 if (!empty($uid)) {
-    $criteria_count->add(new \Criteria('uid', $uid));
-    $criteria_post->add(new \Criteria('p.uid', $uid));
+	$criteria_count->add(new \Criteria('uid', $uid));
+	$criteria_post->add(new \Criteria('p.uid', $uid));
 }
 
 $join = null;
 // START irmtfan solve the status issues and specially status = new issue
 switch ($status) {
-    case 'pending':
-        $criteria_count->add(new \Criteria('approved', 0)); // irmtfan add new \Criteria
-        $criteria_post->add(new \Criteria('p.approved', 0)); // irmtfan add new \Criteria
-        break;
-    case 'deleted':
-        $criteria_count->add(new \Criteria('approved', -1)); // irmtfan add new \Criteria
-        $criteria_post->add(new \Criteria('p.approved', -1)); // irmtfan add new \Criteria
-        break;
-    case 'new':
-        //$criteria_status_count = new \CriteriaCompo(new \Criteria("post_time", (int)($last_visit), ">"));// irmtfan commented and removed
-        //$criteria_status_post = new \CriteriaCompo(new \Criteria("p.post_time", (int)($last_visit), ">"));// irmtfan commented and removed
-        $criteria_count->add(new \Criteria('approved', 1)); // irmtfan uncomment
-        $criteria_post->add(new \Criteria('p.approved', 1)); // irmtfan uncomment
-        // following is for 'unread' -- not finished -- irmtfan Now it is finished!
-        if (empty($GLOBALS['xoopsModuleConfig']['read_mode'])) {
-            //$criteria_status_count->add(new \Criteria('approved', 1));// irmtfan commented and removed
-            //$criteria_status_post->add(new \Criteria('p.approved', 1));// irmtfan commented and removed
-        } elseif (2 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
-            // START irmtfan use read_uid to find the unread posts when the user is logged in
-            $read_uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
-            if (!empty($read_uid)) {
-                $join                 = ' LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_reads_topic') . ' AS r ON r.read_item = p.topic_id AND r.uid = ' . $read_uid . ' '; // irmtfan corrected add AS
-                $criteria_status_post = new \CriteriaCompo();// irmtfan new \Criteria
-                $criteria_status_post->add(new \Criteria('p.post_id', 'r.`post_id`', '>')); // irmtfan corrected - should use $value='r.``' to render in XOOPS/class/criteria.php
-                $criteria_status_post->add(new \Criteria('r.read_id', null, 'IS NULL'), 'OR');// irmtfan corrected - should use "IS NULL" to render in XOOPS/class/criteria.php
-                $criteria_post->add($criteria_status_post); // irmtfan add the status criteria to post criteria - move here
-                $criteria_count = $criteria_post;// irmtfan criteria count is equal to criteria post - move here
-            } else {
-            }
-            // END irmtfan use read_uid to find the unread posts when the user is logged in
-            //$criteria_status_post->add(new \Criteria("p.approved", 1)); // irmtfan commented and removed
-            //$criteria_status_count =& $criteria_status_post;
-        } elseif (1 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
-            $criteria_count->add(new \Criteria('post_time', (int)$last_visit, '>')); // irmtfan add new \Criteria
-            $criteria_post->add(new \Criteria('p.post_time', (int)$last_visit, '>')); // irmtfan add new \Criteria
-            // START irmtfan fix read_mode = 1 bugs - for all users (member and anon)
-            $topics         = [];
-            $topic_lastread = newbbGetCookie('LT', true);
-            if (count($topic_lastread) > 0) {
-                foreach ($topic_lastread as $id => $time) {
-                    if ($time > (int)$last_visit) {
-                        $topics[] = $id;
-                    }
-                }
-            }
-            if (count($topics) > 0) {
-                $criteria_count->add(new \Criteria('topic_id', '(' . implode(',', $topics) . ')', 'NOT IN'));
-                $criteria_post->add(new \Criteria('p.topic_id', '(' . implode(',', $topics) . ')', 'NOT IN'));
-            }
-            // END irmtfan fix read_mode = 1 bugs - for all users (member and anon)
-            //$criteria_status_count->add(new \Criteria("approved", 1));// irmtfan commented and removed
-            //$criteria_status_post->add(new \Criteria("p.approved", 1));// irmtfan commented and removed
-        }
-        break;
-    default:
-        $criteria_count->add(new \Criteria('approved', 1)); // irmtfan add new \Criteria
-        $criteria_post->add(new \Criteria('p.approved', 1)); // irmtfan add new \Criteria
-        break;
+	case 'pending':
+		$criteria_count->add(new \Criteria('approved', 0)); // irmtfan add new \Criteria
+		$criteria_post->add(new \Criteria('p.approved', 0)); // irmtfan add new \Criteria
+		break;
+	case 'deleted':
+		$criteria_count->add(new \Criteria('approved', -1)); // irmtfan add new \Criteria
+		$criteria_post->add(new \Criteria('p.approved', -1)); // irmtfan add new \Criteria
+		break;
+	case 'new':
+		//$criteria_status_count = new \CriteriaCompo(new \Criteria("post_time", (int)($last_visit), ">"));// irmtfan commented and removed
+		//$criteria_status_post = new \CriteriaCompo(new \Criteria("p.post_time", (int)($last_visit), ">"));// irmtfan commented and removed
+		$criteria_count->add(new \Criteria('approved', 1)); // irmtfan uncomment
+		$criteria_post->add(new \Criteria('p.approved', 1)); // irmtfan uncomment
+		// following is for 'unread' -- not finished -- irmtfan Now it is finished!
+		if (empty($GLOBALS['xoopsModuleConfig']['read_mode'])) {
+			//$criteria_status_count->add(new \Criteria('approved', 1));// irmtfan commented and removed
+			//$criteria_status_post->add(new \Criteria('p.approved', 1));// irmtfan commented and removed
+		} elseif (2 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
+			// START irmtfan use read_uid to find the unread posts when the user is logged in
+			$read_uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+			if (!empty($read_uid)) {
+				$join                 = ' LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_reads_topic') . ' AS r ON r.read_item = p.topic_id AND r.uid = ' . $read_uid . ' '; // irmtfan corrected add AS
+				$criteria_status_post = new \CriteriaCompo();// irmtfan new \Criteria
+				$criteria_status_post->add(new \Criteria('p.post_id', 'r.`post_id`', '>')); // irmtfan corrected - should use $value='r.``' to render in XOOPS/class/criteria.php
+				$criteria_status_post->add(new \Criteria('r.read_id', null, 'IS NULL'), 'OR');// irmtfan corrected - should use "IS NULL" to render in XOOPS/class/criteria.php
+				$criteria_post->add($criteria_status_post); // irmtfan add the status criteria to post criteria - move here
+				$criteria_count = $criteria_post;// irmtfan criteria count is equal to criteria post - move here
+			} else {
+			}
+			// END irmtfan use read_uid to find the unread posts when the user is logged in
+			//$criteria_status_post->add(new \Criteria("p.approved", 1)); // irmtfan commented and removed
+			//$criteria_status_count =& $criteria_status_post;
+		} elseif (1 == $GLOBALS['xoopsModuleConfig']['read_mode']) {
+			$criteria_count->add(new \Criteria('post_time', (int)$last_visit, '>')); // irmtfan add new \Criteria
+			$criteria_post->add(new \Criteria('p.post_time', (int)$last_visit, '>')); // irmtfan add new \Criteria
+			// START irmtfan fix read_mode = 1 bugs - for all users (member and anon)
+			$topics         = [];
+			$topic_lastread = newbbGetCookie('LT', true);
+			if (count($topic_lastread) > 0) {
+				foreach ($topic_lastread as $id => $time) {
+					if ($time > (int)$last_visit) {
+						$topics[] = $id;
+					}
+				}
+			}
+			if (count($topics) > 0) {
+				$criteria_count->add(new \Criteria('topic_id', '(' . implode(',', $topics) . ')', 'NOT IN'));
+				$criteria_post->add(new \Criteria('p.topic_id', '(' . implode(',', $topics) . ')', 'NOT IN'));
+			}
+			// END irmtfan fix read_mode = 1 bugs - for all users (member and anon)
+			//$criteria_status_count->add(new \Criteria("approved", 1));// irmtfan commented and removed
+			//$criteria_status_post->add(new \Criteria("p.approved", 1));// irmtfan commented and removed
+		}
+		break;
+	default:
+		$criteria_count->add(new \Criteria('approved', 1)); // irmtfan add new \Criteria
+		$criteria_post->add(new \Criteria('p.approved', 1)); // irmtfan add new \Criteria
+		break;
 }
 //$criteria_count->add($criteria_status_count); // irmtfan commented and removed
 //$criteria_post->add($criteria_status_post); // irmtfan commented and removed
@@ -155,7 +155,7 @@ 
 $viewmode_cookie = newbbGetCookie('V');
 
 if ('compact' === Request::getString('viewmode', '', 'GET')) {
-    newbbSetCookie('V', 'compact', $forumCookie['expire']);
+	newbbSetCookie('V', 'compact', $forumCookie['expire']);
 }
 
 $viewmode = Request::getString('viewmode', (!empty($viewmode_cookie) ? $viewmode_cookie : (@$valid_modes[$GLOBALS['xoopsModuleConfig']['view_mode'] - 1])), 'GET');
@@ -166,10 +166,10 @@ 
 
 $poster_array = [];
 if (count($posts) > 0) {
-    foreach (array_keys($posts) as $id) {
-        /** @var Newbb\Post[] $posts */
-        $poster_array[$posts[$id]->getVar('uid')] = 1;
-    }
+	foreach (array_keys($posts) as $id) {
+		/** @var Newbb\Post[] $posts */
+		$poster_array[$posts[$id]->getVar('uid')] = 1;
+	}
 }
 
 $xoops_pagetitle                = $xoopsModule->getVar('name') . ' - ' . _MD_NEWBB_VIEWALLPOSTS;
@@ -184,31 +184,31 @@ 
 //$xoTheme->addScript('/Frameworks/textsanitizer/xoops.js');
 
 if (!empty($forum_id)) {
-    if (!$forumHandler->getPermission($forumObject, 'view')) {
-        redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
-    }
-    if ($forumObject->getVar('parent_forum')) {
-        $parent_forumObject = $forumHandler->get($forumObject->getVar('parent_forum'), ['forum_name']);
-        $parentforum        = [
-            'id'   => $forumObject->getVar('parent_forum'),
-            'name' => $parent_forumObject->getVar('forum_name')
-        ];
-        unset($parent_forumObject);
-        $xoopsTpl->assign_by_ref('parentforum', $parentforum);
-    }
-    $xoopsTpl->assign('forum_name', $forumObject->getVar('forum_name'));
-    $xoopsTpl->assign('forum_moderators', $forumObject->dispForumModerators());
-
-    $xoops_pagetitle = $forumObject->getVar('forum_name') . ' - ' . _MD_NEWBB_VIEWALLPOSTS . ' [' . $xoopsModule->getVar('name') . ']';
-    $xoopsTpl->assign('forum_id', $forumObject->getVar('forum_id'));
-    // irmtfan new method
-    if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
-        $xoopsTpl->assign('xoops_module_header', '
+	if (!$forumHandler->getPermission($forumObject, 'view')) {
+		redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	}
+	if ($forumObject->getVar('parent_forum')) {
+		$parent_forumObject = $forumHandler->get($forumObject->getVar('parent_forum'), ['forum_name']);
+		$parentforum        = [
+			'id'   => $forumObject->getVar('parent_forum'),
+			'name' => $parent_forumObject->getVar('forum_name')
+		];
+		unset($parent_forumObject);
+		$xoopsTpl->assign_by_ref('parentforum', $parentforum);
+	}
+	$xoopsTpl->assign('forum_name', $forumObject->getVar('forum_name'));
+	$xoopsTpl->assign('forum_moderators', $forumObject->dispForumModerators());
+
+	$xoops_pagetitle = $forumObject->getVar('forum_name') . ' - ' . _MD_NEWBB_VIEWALLPOSTS . ' [' . $xoopsModule->getVar('name') . ']';
+	$xoopsTpl->assign('forum_id', $forumObject->getVar('forum_id'));
+	// 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') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forum_id . '" />
             ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
-    }
+	}
 } elseif (!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') . '/rss.php" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
@@ -219,190 +219,190 @@ 
 $xoopsTpl->assign('anonym_avatar', newbbDisplayImage('anonym'));
 $userid_array = [];
 if (count($poster_array) > 0) {
-    /** @var \XoopsMembershipHandler $memberHandler */
-    $memberHandler = xoops_getHandler('member');
-    $userid_array  = array_keys($poster_array);
-    $user_criteria = '(' . implode(',', $userid_array) . ')';
-    $users         = $memberHandler->getUsers(new \Criteria('uid', $user_criteria, 'IN'), true);
+	/** @var \XoopsMembershipHandler $memberHandler */
+	$memberHandler = xoops_getHandler('member');
+	$userid_array  = array_keys($poster_array);
+	$user_criteria = '(' . implode(',', $userid_array) . ')';
+	$users         = $memberHandler->getUsers(new \Criteria('uid', $user_criteria, 'IN'), true);
 } else {
-    $user_criteria = '';
-    $users         = null;
+	$user_criteria = '';
+	$users         = null;
 }
 
 $online = [];
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    if (!empty($user_criteria)) {
-        //        /** @var Newbb\OnlineHandler $onlineHandler */
-        //        $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-        $onlineHandler->init($forum_id);
-    }
+	if (!empty($user_criteria)) {
+		//        /** @var Newbb\OnlineHandler $onlineHandler */
+		//        $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+		$onlineHandler->init($forum_id);
+	}
 }
 
 $viewtopic_users = [];
 
 if (count($userid_array) > 0) {
 //    require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/user.php');
-    $userHandler         = new Newbb\UserHandler($GLOBALS['xoopsModuleConfig']['groupbar_enabled'], $GLOBALS['xoopsModuleConfig']['wol_enabled']);
-    $userHandler->users  = $users;
-    $userHandler->online = $online;
-    $viewtopic_users     = $userHandler->getUsers();
+	$userHandler         = new Newbb\UserHandler($GLOBALS['xoopsModuleConfig']['groupbar_enabled'], $GLOBALS['xoopsModuleConfig']['wol_enabled']);
+	$userHandler->users  = $users;
+	$userHandler->online = $online;
+	$viewtopic_users     = $userHandler->getUsers();
 }
 
 $pn = 0;
 //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
 static $suspension = [];
 foreach (array_keys($posts) as $id) {
-    ++$pn;
-
-    /** @var Newbb\Post $post */
-    $post       = $posts[$id];
-    $post_title = $post->getVar('subject');
-
-    if ($posticon = $post->getVar('icon')) {
-        $post_image = '<a name="' . $post->getVar('post_id') . '"><img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($posticon, ENT_QUOTES | ENT_HTML5) . '" alt="" /></a>';
-    } else {
-        $post_image = '<a name="' . $post->getVar('post_id') . '"><img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" /></a>';
-    }
-    $poster = [
-        'uid'  => 0,
-        'name' => $post->getVar('poster_name') ?: $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']),
-        'link' => $post->getVar('poster_name') ?: $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous'])
-    ];
-    if ($post->getVar('uid') > 0 && isset($viewtopic_users[$post->getVar('uid')])) {
-        $poster = $viewtopic_users[$post->getVar('uid')];
-    }
-    if ($isAdmin || $post->checkIdentity()) {
-        $post_text       = $post->getVar('post_text');
-        $post_attachment = $post->displayAttachment();
-    } elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post->getVar('post_karma') > $user_karma) {
-        $post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $post->getVar('post_karma')) . '</div>';
-        $post_attachment = '';
-    } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post->getVar('require_reply')) {
-        $post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
-        $post_attachment = '';
-    } else {
-        $post_text       = $post->getVar('post_text');
-        $post_attachment = $post->displayAttachment();
-    }
-
-    $thread_buttons = [];
-
-    if ($GLOBALS['xoopsModuleConfig']['enable_permcheck']) {
-        if (!isset($suspension[$post->getVar('forum_id')])) {
-            //            /** @var Newbb\ModerateHandler $moderateHandler */
-            //            $moderateHandler                       = Newbb\Helper::getInstance()->getHandler('Moderate');
-            $suspension[$post->getVar('forum_id')] = !$moderateHandler->verifyUser(-1, '', $post->getVar('forum_id'));
-        }
-
-        if ($isAdmin
-            || (!$suspension[$post->getVar('forum_id')] && $post->checkIdentity()
-                && $post->checkTimelimit('delete_timelimit'))) {
-            $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-            $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/delete.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
-            $thread_buttons['delete']['name']  = _DELETE;
-        }
-        if ($isAdmin
-            || !$suspension[$post->getVar('forum_id')] && $post->checkIdentity()
-               && $post->checkTimelimit('edit_timelimit')) {
-            $thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-            $thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/edit.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
-            $thread_buttons['edit']['name']  = _EDIT;
-        }
-        if (is_object($GLOBALS['xoopsUser']) && !$suspension[$post->getVar('forum_id')]) {
-            $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-            $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
-            $thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
-
-            $thread_buttons['quote']['image'] = newbbDisplayImage('p_quote', _MD_NEWBB_QUOTE);
-            $thread_buttons['quote']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id') . '&amp;quotedac=1';
-            $thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
-        }
-    } else {
-        $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-        $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/delete.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
-        $thread_buttons['delete']['name']  = _DELETE;
-        $thread_buttons['edit']['image']   = newbbDisplayImage('p_edit', _EDIT);
-        $thread_buttons['edit']['link']    = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/edit.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
-        $thread_buttons['edit']['name']    = _EDIT;
-        $thread_buttons['reply']['image']  = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-        $thread_buttons['reply']['link']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
-        $thread_buttons['reply']['name']   = _MD_NEWBB_REPLY;
-    }
-
-    if (!$isAdmin && $GLOBALS['xoopsModuleConfig']['reportmod_enabled']) {
-        $thread_buttons['report']['image'] = newbbDisplayImage('p_report', _MD_NEWBB_REPORT);
-        $thread_buttons['report']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/report.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
-        $thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
-    }
-    $thread_action = [];
-
-    $xoopsTpl->append('posts', [
-        'post_id'         => $post->getVar('post_id'),
-        'topic_id'        => $post->getVar('topic_id'),
-        'forum_id'        => $post->getVar('forum_id'),
-        'post_date'       => newbbFormatTimestamp($post->getVar('post_time')),
-        'post_image'      => $post_image,
-        'post_title'      => $post_title,
-        'post_text'       => $post_text,
-        'post_attachment' => $post_attachment,
-        'post_edit'       => $post->displayPostEdit(),
-        'post_no'         => $start + $pn,
-        'post_signature'  => $post->getVar('attachsig') ? @$poster['signature'] : '',
-        //                                 'poster_ip'       => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? long2ip($post->getVar('poster_ip')) : '',
-        'poster_ip'       => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? $post->getVar('poster_ip') : '',
-        'thread_action'   => $thread_action,
-        'thread_buttons'  => $thread_buttons,
-        'poster'          => $poster
-    ]);
-
-    unset($thread_buttons, $poster);
+	++$pn;
+
+	/** @var Newbb\Post $post */
+	$post       = $posts[$id];
+	$post_title = $post->getVar('subject');
+
+	if ($posticon = $post->getVar('icon')) {
+		$post_image = '<a name="' . $post->getVar('post_id') . '"><img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($posticon, ENT_QUOTES | ENT_HTML5) . '" alt="" /></a>';
+	} else {
+		$post_image = '<a name="' . $post->getVar('post_id') . '"><img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" /></a>';
+	}
+	$poster = [
+		'uid'  => 0,
+		'name' => $post->getVar('poster_name') ?: $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']),
+		'link' => $post->getVar('poster_name') ?: $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous'])
+	];
+	if ($post->getVar('uid') > 0 && isset($viewtopic_users[$post->getVar('uid')])) {
+		$poster = $viewtopic_users[$post->getVar('uid')];
+	}
+	if ($isAdmin || $post->checkIdentity()) {
+		$post_text       = $post->getVar('post_text');
+		$post_attachment = $post->displayAttachment();
+	} elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post->getVar('post_karma') > $user_karma) {
+		$post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $post->getVar('post_karma')) . '</div>';
+		$post_attachment = '';
+	} elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post->getVar('require_reply')) {
+		$post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
+		$post_attachment = '';
+	} else {
+		$post_text       = $post->getVar('post_text');
+		$post_attachment = $post->displayAttachment();
+	}
+
+	$thread_buttons = [];
+
+	if ($GLOBALS['xoopsModuleConfig']['enable_permcheck']) {
+		if (!isset($suspension[$post->getVar('forum_id')])) {
+			//            /** @var Newbb\ModerateHandler $moderateHandler */
+			//            $moderateHandler                       = Newbb\Helper::getInstance()->getHandler('Moderate');
+			$suspension[$post->getVar('forum_id')] = !$moderateHandler->verifyUser(-1, '', $post->getVar('forum_id'));
+		}
+
+		if ($isAdmin
+			|| (!$suspension[$post->getVar('forum_id')] && $post->checkIdentity()
+				&& $post->checkTimelimit('delete_timelimit'))) {
+			$thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
+			$thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/delete.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+			$thread_buttons['delete']['name']  = _DELETE;
+		}
+		if ($isAdmin
+			|| !$suspension[$post->getVar('forum_id')] && $post->checkIdentity()
+			   && $post->checkTimelimit('edit_timelimit')) {
+			$thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
+			$thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/edit.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+			$thread_buttons['edit']['name']  = _EDIT;
+		}
+		if (is_object($GLOBALS['xoopsUser']) && !$suspension[$post->getVar('forum_id')]) {
+			$thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
+			$thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+			$thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
+
+			$thread_buttons['quote']['image'] = newbbDisplayImage('p_quote', _MD_NEWBB_QUOTE);
+			$thread_buttons['quote']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id') . '&amp;quotedac=1';
+			$thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
+		}
+	} else {
+		$thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
+		$thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/delete.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+		$thread_buttons['delete']['name']  = _DELETE;
+		$thread_buttons['edit']['image']   = newbbDisplayImage('p_edit', _EDIT);
+		$thread_buttons['edit']['link']    = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/edit.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+		$thread_buttons['edit']['name']    = _EDIT;
+		$thread_buttons['reply']['image']  = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
+		$thread_buttons['reply']['link']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+		$thread_buttons['reply']['name']   = _MD_NEWBB_REPLY;
+	}
+
+	if (!$isAdmin && $GLOBALS['xoopsModuleConfig']['reportmod_enabled']) {
+		$thread_buttons['report']['image'] = newbbDisplayImage('p_report', _MD_NEWBB_REPORT);
+		$thread_buttons['report']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/report.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+		$thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
+	}
+	$thread_action = [];
+
+	$xoopsTpl->append('posts', [
+		'post_id'         => $post->getVar('post_id'),
+		'topic_id'        => $post->getVar('topic_id'),
+		'forum_id'        => $post->getVar('forum_id'),
+		'post_date'       => newbbFormatTimestamp($post->getVar('post_time')),
+		'post_image'      => $post_image,
+		'post_title'      => $post_title,
+		'post_text'       => $post_text,
+		'post_attachment' => $post_attachment,
+		'post_edit'       => $post->displayPostEdit(),
+		'post_no'         => $start + $pn,
+		'post_signature'  => $post->getVar('attachsig') ? @$poster['signature'] : '',
+		//                                 'poster_ip'       => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? long2ip($post->getVar('poster_ip')) : '',
+		'poster_ip'       => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? $post->getVar('poster_ip') : '',
+		'thread_action'   => $thread_action,
+		'thread_buttons'  => $thread_buttons,
+		'poster'          => $poster
+	]);
+
+	unset($thread_buttons, $poster);
 }
 unset($viewtopic_users, $forums);
 
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
-    $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
+	require_once __DIR__ . '/include/functions.forum.php';
+	$xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
 }
 
 if ($postCount > $post_perpage) {
-    require_once $GLOBALS['xoops']->path('class/pagenav.php');
-    $nav = new \XoopsPageNav($postCount, $post_perpage, $start, 'start', 'forum=' . $forum_id . '&amp;viewmode=' . $viewmode . '&amp;status=' . $status . '&amp;uid=' . $uid . '&amp;order=' . $order . '&amp;mode=' . $mode);
-    //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . $nav->url;
-    if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
-        $navi = $nav->renderSelect();
-    } elseif ('image' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
-        $navi = $nav->renderImageNav(4);
-    } else {
-        $navi = $nav->renderNav(4);
-    }
-
-    $xoopsTpl->assign('pagenav', $navi);
+	require_once $GLOBALS['xoops']->path('class/pagenav.php');
+	$nav = new \XoopsPageNav($postCount, $post_perpage, $start, 'start', 'forum=' . $forum_id . '&amp;viewmode=' . $viewmode . '&amp;status=' . $status . '&amp;uid=' . $uid . '&amp;order=' . $order . '&amp;mode=' . $mode);
+	//if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . $nav->url;
+	if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
+		$navi = $nav->renderSelect();
+	} elseif ('image' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
+		$navi = $nav->renderImageNav(4);
+	} else {
+		$navi = $nav->renderNav(4);
+	}
+
+	$xoopsTpl->assign('pagenav', $navi);
 } else {
-    $xoopsTpl->assign('pagenav', '');
+	$xoopsTpl->assign('pagenav', '');
 }
 
 $xoopsTpl->assign('lang_forum_index', sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)));
 
 switch ($status) {
-    case 'active':
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_ADMIN . ']';
-        break;
-    case 'pending':
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_PENDING . ']';
-        break;
-    case 'deleted':
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_DELETED . ']';
-        break;
-    case 'new':
-        $lang_title = _MD_NEWBB_NEWPOSTS;
-        break;
-    default:
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS;
-        break;
+	case 'active':
+		$lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_ADMIN . ']';
+		break;
+	case 'pending':
+		$lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_PENDING . ']';
+		break;
+	case 'deleted':
+		$lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_DELETED . ']';
+		break;
+	case 'new':
+		$lang_title = _MD_NEWBB_NEWPOSTS;
+		break;
+	default:
+		$lang_title = _MD_NEWBB_VIEWALLPOSTS;
+		break;
 }
 if ($uid > 0) {
-    $lang_title .= ' (' . \XoopsUser::getUnameFromId($uid) . ')';
+	$lang_title .= ' (' . \XoopsUser::getUnameFromId($uid) . ')';
 }
 $xoopsTpl->assign('lang_title', $lang_title);
 // irmtfan up to p_up
@@ -427,15 +427,15 @@ 
 
 $viewmode_options = [];
 if ('DESC' === $order) {
-    $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&amp;order=ASC&amp;forum=' . $forum_id,
-        'title' => _OLDESTFIRST
-    ];
+	$viewmode_options[] = [
+		'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&amp;order=ASC&amp;forum=' . $forum_id,
+		'title' => _OLDESTFIRST
+	];
 } else {
-    $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&amp;order=DESC&amp;forum=' . $forum_id,
-        'title' => _NEWESTFIRST
-    ];
+	$viewmode_options[] = [
+		'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&amp;order=DESC&amp;forum=' . $forum_id,
+		'title' => _NEWESTFIRST
+	];
 }
 
 //$xoopsTpl->assign('viewmode_compact', ($viewmode=="compact")?1:0);

Spacing +46 added lines, -46 removed lines

@@ -32,7 +32,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $start    = Request::getInt('start', 0, 'GET');
 $forum_id = Request::getInt('forum', 0, 'GET');
@@ -72,8 +72,8 @@ 
 //echo $mode.' - '.$status;
 $post_perpage = $GLOBALS['xoopsModuleConfig']['posts_per_page'];
 
-$criteria_count = new \CriteriaCompo(new \Criteria('forum_id', '(' . implode(',', $accessForums) . ')', 'IN'));
-$criteria_post  = new \CriteriaCompo(new \Criteria('p.forum_id', '(' . implode(',', $accessForums) . ')', 'IN'));
+$criteria_count = new \CriteriaCompo(new \Criteria('forum_id', '('.implode(',', $accessForums).')', 'IN'));
+$criteria_post  = new \CriteriaCompo(new \Criteria('p.forum_id', '('.implode(',', $accessForums).')', 'IN'));
 $criteria_post->setSort('p.post_id');
 $criteria_post->setOrder($order);
 
@@ -106,12 +106,12 @@ 
             // START irmtfan use read_uid to find the unread posts when the user is logged in
             $read_uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
             if (!empty($read_uid)) {
-                $join                 = ' LEFT JOIN ' . $GLOBALS['xoopsDB']->prefix('newbb_reads_topic') . ' AS r ON r.read_item = p.topic_id AND r.uid = ' . $read_uid . ' '; // irmtfan corrected add AS
-                $criteria_status_post = new \CriteriaCompo();// irmtfan new \Criteria
+                $join                 = ' LEFT JOIN '.$GLOBALS['xoopsDB']->prefix('newbb_reads_topic').' AS r ON r.read_item = p.topic_id AND r.uid = '.$read_uid.' '; // irmtfan corrected add AS
+                $criteria_status_post = new \CriteriaCompo(); // irmtfan new \Criteria
                 $criteria_status_post->add(new \Criteria('p.post_id', 'r.`post_id`', '>')); // irmtfan corrected - should use $value='r.``' to render in XOOPS/class/criteria.php
-                $criteria_status_post->add(new \Criteria('r.read_id', null, 'IS NULL'), 'OR');// irmtfan corrected - should use "IS NULL" to render in XOOPS/class/criteria.php
+                $criteria_status_post->add(new \Criteria('r.read_id', null, 'IS NULL'), 'OR'); // irmtfan corrected - should use "IS NULL" to render in XOOPS/class/criteria.php
                 $criteria_post->add($criteria_status_post); // irmtfan add the status criteria to post criteria - move here
-                $criteria_count = $criteria_post;// irmtfan criteria count is equal to criteria post - move here
+                $criteria_count = $criteria_post; // irmtfan criteria count is equal to criteria post - move here
             } else {
             }
             // END irmtfan use read_uid to find the unread posts when the user is logged in
@@ -131,8 +131,8 @@ 
                 }
             }
             if (count($topics) > 0) {
-                $criteria_count->add(new \Criteria('topic_id', '(' . implode(',', $topics) . ')', 'NOT IN'));
-                $criteria_post->add(new \Criteria('p.topic_id', '(' . implode(',', $topics) . ')', 'NOT IN'));
+                $criteria_count->add(new \Criteria('topic_id', '('.implode(',', $topics).')', 'NOT IN'));
+                $criteria_post->add(new \Criteria('p.topic_id', '('.implode(',', $topics).')', 'NOT IN'));
             }
             // END irmtfan fix read_mode = 1 bugs - for all users (member and anon)
             //$criteria_status_count->add(new \Criteria("approved", 1));// irmtfan commented and removed
@@ -161,8 +161,8 @@ 
 $viewmode = Request::getString('viewmode', (!empty($viewmode_cookie) ? $viewmode_cookie : (@$valid_modes[$GLOBALS['xoopsModuleConfig']['view_mode'] - 1])), 'GET');
 $viewmode = in_array($viewmode, $valid_modes) ? $viewmode : $valid_modes[0];
 
-$postCount = $postHandler->getPostCount($criteria_count, $join);// irmtfan add join for read_mode = 2
-$posts     = $postHandler->getPostsByLimit($criteria_post, $post_perpage, $start, $join);// irmtfan add join for read_mode = 2
+$postCount = $postHandler->getPostCount($criteria_count, $join); // irmtfan add join for read_mode = 2
+$posts     = $postHandler->getPostsByLimit($criteria_post, $post_perpage, $start, $join); // irmtfan add join for read_mode = 2
 
 $poster_array = [];
 if (count($posts) > 0) {
@@ -172,20 +172,20 @@ 
     }
 }
 
-$xoops_pagetitle                = $xoopsModule->getVar('name') . ' - ' . _MD_NEWBB_VIEWALLPOSTS;
+$xoops_pagetitle                = $xoopsModule->getVar('name').' - '._MD_NEWBB_VIEWALLPOSTS;
 $xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
 $xoopsOption['template_main']   = 'newbb_viewpost.tpl';
 
 require_once $GLOBALS['xoops']->path('header.php');
-require_once __DIR__ . '/include/functions.time.php';
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.time.php';
+require_once __DIR__.'/include/functions.render.php';
 
 //global $xoTheme;
 //$xoTheme->addScript('/Frameworks/textsanitizer/xoops.js');
 
 if (!empty($forum_id)) {
     if (!$forumHandler->getPermission($forumObject, 'view')) {
-        redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+        redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
     }
     if ($forumObject->getVar('parent_forum')) {
         $parent_forumObject = $forumHandler->get($forumObject->getVar('parent_forum'), ['forum_name']);
@@ -199,17 +199,17 @@ 
     $xoopsTpl->assign('forum_name', $forumObject->getVar('forum_name'));
     $xoopsTpl->assign('forum_moderators', $forumObject->dispForumModerators());
 
-    $xoops_pagetitle = $forumObject->getVar('forum_name') . ' - ' . _MD_NEWBB_VIEWALLPOSTS . ' [' . $xoopsModule->getVar('name') . ']';
+    $xoops_pagetitle = $forumObject->getVar('forum_name').' - '._MD_NEWBB_VIEWALLPOSTS.' ['.$xoopsModule->getVar('name').']';
     $xoopsTpl->assign('forum_id', $forumObject->getVar('forum_id'));
     // 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') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forum_id . '" />
+            <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'-'.$forumObject->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forum_id.'" />
             ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
     }
 } elseif (!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') . '/rss.php" />
+        <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 // irmtfan remove and move to footer.php
@@ -222,7 +222,7 @@ 
     /** @var \XoopsMembershipHandler $memberHandler */
     $memberHandler = xoops_getHandler('member');
     $userid_array  = array_keys($poster_array);
-    $user_criteria = '(' . implode(',', $userid_array) . ')';
+    $user_criteria = '('.implode(',', $userid_array).')';
     $users         = $memberHandler->getUsers(new \Criteria('uid', $user_criteria, 'IN'), true);
 } else {
     $user_criteria = '';
@@ -260,9 +260,9 @@ 
     $post_title = $post->getVar('subject');
 
     if ($posticon = $post->getVar('icon')) {
-        $post_image = '<a name="' . $post->getVar('post_id') . '"><img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($posticon, ENT_QUOTES | ENT_HTML5) . '" alt="" /></a>';
+        $post_image = '<a name="'.$post->getVar('post_id').'"><img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($posticon, ENT_QUOTES | ENT_HTML5).'" alt="" /></a>';
     } else {
-        $post_image = '<a name="' . $post->getVar('post_id') . '"><img src="' . XOOPS_URL . '/images/icons/no_posticon.gif" alt="" /></a>';
+        $post_image = '<a name="'.$post->getVar('post_id').'"><img src="'.XOOPS_URL.'/images/icons/no_posticon.gif" alt="" /></a>';
     }
     $poster = [
         'uid'  => 0,
@@ -276,10 +276,10 @@ 
         $post_text       = $post->getVar('post_text');
         $post_attachment = $post->displayAttachment();
     } elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post->getVar('post_karma') > $user_karma) {
-        $post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $post->getVar('post_karma')) . '</div>';
+        $post_text       = "<div class='karma'>".sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $post->getVar('post_karma')).'</div>';
         $post_attachment = '';
     } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post->getVar('require_reply')) {
-        $post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
+        $post_text       = "<div class='karma'>"._MD_NEWBB_REPLY_REQUIREMENT.'</div>';
         $post_attachment = '';
     } else {
         $post_text       = $post->getVar('post_text');
@@ -299,40 +299,40 @@ 
             || (!$suspension[$post->getVar('forum_id')] && $post->checkIdentity()
                 && $post->checkTimelimit('delete_timelimit'))) {
             $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-            $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/delete.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+            $thread_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/delete.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
             $thread_buttons['delete']['name']  = _DELETE;
         }
         if ($isAdmin
             || !$suspension[$post->getVar('forum_id')] && $post->checkIdentity()
                && $post->checkTimelimit('edit_timelimit')) {
             $thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-            $thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/edit.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+            $thread_buttons['edit']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/edit.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
             $thread_buttons['edit']['name']  = _EDIT;
         }
         if (is_object($GLOBALS['xoopsUser']) && !$suspension[$post->getVar('forum_id')]) {
             $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-            $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+            $thread_buttons['reply']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/reply.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
             $thread_buttons['reply']['name']  = _MD_NEWBB_REPLY;
 
             $thread_buttons['quote']['image'] = newbbDisplayImage('p_quote', _MD_NEWBB_QUOTE);
-            $thread_buttons['quote']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id') . '&amp;quotedac=1';
+            $thread_buttons['quote']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/reply.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id').'&amp;quotedac=1';
             $thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
         }
     } else {
         $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-        $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/delete.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+        $thread_buttons['delete']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/delete.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
         $thread_buttons['delete']['name']  = _DELETE;
         $thread_buttons['edit']['image']   = newbbDisplayImage('p_edit', _EDIT);
-        $thread_buttons['edit']['link']    = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/edit.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+        $thread_buttons['edit']['link']    = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/edit.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
         $thread_buttons['edit']['name']    = _EDIT;
         $thread_buttons['reply']['image']  = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-        $thread_buttons['reply']['link']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/reply.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+        $thread_buttons['reply']['link']   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/reply.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
         $thread_buttons['reply']['name']   = _MD_NEWBB_REPLY;
     }
 
     if (!$isAdmin && $GLOBALS['xoopsModuleConfig']['reportmod_enabled']) {
         $thread_buttons['report']['image'] = newbbDisplayImage('p_report', _MD_NEWBB_REPORT);
-        $thread_buttons['report']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/report.php?forum=' . $post->getVar('forum_id') . '&amp;topic_id=' . $post->getVar('topic_id');
+        $thread_buttons['report']['link']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/report.php?forum='.$post->getVar('forum_id').'&amp;topic_id='.$post->getVar('topic_id');
         $thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
     }
     $thread_action = [];
@@ -361,13 +361,13 @@ 
 unset($viewtopic_users, $forums);
 
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
+    require_once __DIR__.'/include/functions.forum.php';
     $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
 }
 
 if ($postCount > $post_perpage) {
     require_once $GLOBALS['xoops']->path('class/pagenav.php');
-    $nav = new \XoopsPageNav($postCount, $post_perpage, $start, 'start', 'forum=' . $forum_id . '&amp;viewmode=' . $viewmode . '&amp;status=' . $status . '&amp;uid=' . $uid . '&amp;order=' . $order . '&amp;mode=' . $mode);
+    $nav = new \XoopsPageNav($postCount, $post_perpage, $start, 'start', 'forum='.$forum_id.'&amp;viewmode='.$viewmode.'&amp;status='.$status.'&amp;uid='.$uid.'&amp;order='.$order.'&amp;mode='.$mode);
     //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . $nav->url;
     if ('select' === $GLOBALS['xoopsModuleConfig']['pagenav_display']) {
         $navi = $nav->renderSelect();
@@ -386,13 +386,13 @@ 
 
 switch ($status) {
     case 'active':
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_ADMIN . ']';
+        $lang_title = _MD_NEWBB_VIEWALLPOSTS.' ['._MD_NEWBB_TYPE_ADMIN.']';
         break;
     case 'pending':
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_PENDING . ']';
+        $lang_title = _MD_NEWBB_VIEWALLPOSTS.' ['._MD_NEWBB_TYPE_PENDING.']';
         break;
     case 'deleted':
-        $lang_title = _MD_NEWBB_VIEWALLPOSTS . ' [' . _MD_NEWBB_TYPE_DELETED . ']';
+        $lang_title = _MD_NEWBB_VIEWALLPOSTS.' ['._MD_NEWBB_TYPE_DELETED.']';
         break;
     case 'new':
         $lang_title = _MD_NEWBB_NEWPOSTS;
@@ -402,7 +402,7 @@ 
         break;
 }
 if ($uid > 0) {
-    $lang_title .= ' (' . \XoopsUser::getUnameFromId($uid) . ')';
+    $lang_title .= ' ('.\XoopsUser::getUnameFromId($uid).')';
 }
 $xoopsTpl->assign('lang_title', $lang_title);
 // irmtfan up to p_up
@@ -411,12 +411,12 @@ 
 $xoopsTpl->assign('anonymous_prefix', $GLOBALS['xoopsModuleConfig']['anonymous_prefix']);
 $xoopsTpl->assign('down', newbbDisplayImage('down', _MD_NEWBB_BOTTOM));
 
-$all_link       = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . "&amp;start=$start";
-$post_link      = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id;
-$newpost_link   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . '&amp;status=new';
-$digest_link    = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . "&amp;start=$start&amp;status=digest";
-$unreplied_link = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . "&amp;start=$start&amp;status=unreplied";
-$unread_link    = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?forum=' . $forum_id . "&amp;start=$start&amp;status=unread";
+$all_link       = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id."&amp;start=$start";
+$post_link      = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id;
+$newpost_link   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id.'&amp;status=new';
+$digest_link    = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id."&amp;start=$start&amp;status=digest";
+$unreplied_link = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id."&amp;start=$start&amp;status=unreplied";
+$unread_link    = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?forum='.$forum_id."&amp;start=$start&amp;status=unread";
 
 $xoopsTpl->assign('all_link', $all_link);
 $xoopsTpl->assign('post_link', $post_link);
@@ -428,12 +428,12 @@ 
 $viewmode_options = [];
 if ('DESC' === $order) {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&amp;order=ASC&amp;forum=' . $forum_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?viewmode=flat&amp;order=ASC&amp;forum='.$forum_id,
         'title' => _OLDESTFIRST
     ];
 } else {
     $viewmode_options[] = [
-        'link'  => XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewpost.php?viewmode=flat&amp;order=DESC&amp;forum=' . $forum_id,
+        'link'  => XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewpost.php?viewmode=flat&amp;order=DESC&amp;forum='.$forum_id,
         'title' => _NEWESTFIRST
     ];
 }
@@ -448,5 +448,5 @@ 
 $xoopsTpl->assign('mode', $mode);
 $xoopsTpl->assign('status', $status);
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

ratethread.php

Indentation +29 added lines, -29 removed lines

@@ -37,48 +37,48 @@ 
 $anonwaitdays = 1;
 $ip           = \Xmf\IPAddress::fromRequest()->asReadable();
 foreach (['topic_id', 'rate', 'forum'] as $var) {
-    //    ${$var} = isset($_POST[$var]) ? (int)($_POST[$var]) : (isset($_GET[$var])?(int)($_GET[$var]):0);
-    ${$var} = Request::getInt($var, Request::getInt($var, 0, 'POST'), 'GET');
+	//    ${$var} = isset($_POST[$var]) ? (int)($_POST[$var]) : (isset($_GET[$var])?(int)($_GET[$var]):0);
+	${$var} = Request::getInt($var, Request::getInt($var, 0, 'POST'), 'GET');
 }
 
 ///** @var Newbb\TopicHandler $topicHandler */
 //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
 $topicObject = $topicHandler->get($topic_id);
 if (!$topicHandler->getPermission($topicObject->getVar('forum_id'), $topicObject->getVar('topic_status'), 'post')
-    && !$topicHandler->getPermission($topicObject->getVar('forum_id'), $topicObject->getVar('topic_status'), 'reply')) {
-    // irmtfan - issue with javascript:history.go(-1)
-    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _NOPERM);
+	&& !$topicHandler->getPermission($topicObject->getVar('forum_id'), $topicObject->getVar('topic_status'), 'reply')) {
+	// irmtfan - issue with javascript:history.go(-1)
+	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _NOPERM);
 }
 
 if (empty($rate)) {
-    redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_NOVOTERATE);
+	redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_NOVOTERATE);
 }
 ///** @var Newbb\RateHandler $rateHandler */
 //$rateHandler = Newbb\Helper::getInstance()->getHandler('Rate');
 if (0 !== $ratinguser) {
-    // Check if Topic POSTER is voting (UNLESS Anonymous users allowed to post)
-    $crit_post = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-    $crit_post->add(new \Criteria('uid', $ratinguser));
-    //    /** @var Newbb\PostHandler $postHandler */
-    //    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-    if ($postHandler->getCount($crit_post)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_CANTVOTEOWN);
-    }
-    // Check if REG user is trying to vote twice.
-    $crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-    $crit_rate->add(new \Criteria('ratinguser', $ratinguser));
-    if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
-    }
+	// Check if Topic POSTER is voting (UNLESS Anonymous users allowed to post)
+	$crit_post = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+	$crit_post->add(new \Criteria('uid', $ratinguser));
+	//    /** @var Newbb\PostHandler $postHandler */
+	//    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+	if ($postHandler->getCount($crit_post)) {
+		redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_CANTVOTEOWN);
+	}
+	// Check if REG user is trying to vote twice.
+	$crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+	$crit_rate->add(new \Criteria('ratinguser', $ratinguser));
+	if ($rateHandler->getCount($crit_rate)) {
+		redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+	}
 } else {
-    // Check if ANONYMOUS user is trying to vote more than once per day.
-    $crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-    $crit_rate->add(new \Criteria('ratinguser', $ratinguser));
-    $crit_rate->add(new \Criteria('ratinghostname', $ip));
-    $crit_rate->add(new \Criteria('ratingtimestamp', time() - (86400 * $anonwaitdays), '>'));
-    if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
-    }
+	// Check if ANONYMOUS user is trying to vote more than once per day.
+	$crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+	$crit_rate->add(new \Criteria('ratinguser', $ratinguser));
+	$crit_rate->add(new \Criteria('ratinghostname', $ip));
+	$crit_rate->add(new \Criteria('ratingtimestamp', time() - (86400 * $anonwaitdays), '>'));
+	if ($rateHandler->getCount($crit_rate)) {
+		redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+	}
 }
 $rateObject = $rateHandler->create();
 $rateObject->setVar('rating', $rate * 2);
@@ -94,7 +94,7 @@ 
 $votesDB     = $GLOBALS['xoopsDB']->getRowsNum($voteresult);
 $totalrating = 0;
 while (false !== (list($rating) = $GLOBALS['xoopsDB']->fetchRow($voteresult))) {
-    $totalrating += $rating;
+	$totalrating += $rating;
 }
 $finalrating = $totalrating / $votesDB;
 $finalrating = number_format($finalrating, 4);

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $ratinguser   = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
 $anonwaitdays = 1;
@@ -51,7 +51,7 @@ 
 }
 
 if (empty($rate)) {
-    redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_NOVOTERATE);
+    redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_NOVOTERATE);
 }
 ///** @var Newbb\RateHandler $rateHandler */
 //$rateHandler = Newbb\Helper::getInstance()->getHandler('Rate');
@@ -62,13 +62,13 @@ 
     //    /** @var Newbb\PostHandler $postHandler */
     //    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
     if ($postHandler->getCount($crit_post)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_CANTVOTEOWN);
+        redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_CANTVOTEOWN);
     }
     // Check if REG user is trying to vote twice.
     $crit_rate = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
     $crit_rate->add(new \Criteria('ratinguser', $ratinguser));
     if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+        redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_VOTEONCE);
     }
 } else {
     // Check if ANONYMOUS user is trying to vote more than once per day.
@@ -77,7 +77,7 @@ 
     $crit_rate->add(new \Criteria('ratinghostname', $ip));
     $crit_rate->add(new \Criteria('ratingtimestamp', time() - (86400 * $anonwaitdays), '>'));
     if ($rateHandler->getCount($crit_rate)) {
-        redirect_header('viewtopic.php?topic_id=' . $topic_id . '&forum=' . $forum . '', 4, _MD_NEWBB_VOTEONCE);
+        redirect_header('viewtopic.php?topic_id='.$topic_id.'&forum='.$forum.'', 4, _MD_NEWBB_VOTEONCE);
     }
 }
 $rateObject = $rateHandler->create();
@@ -89,7 +89,7 @@ 
 
 $ratingid = $rateHandler->insert($rateObject);
 
-$query       = 'SELECT rating FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' WHERE topic_id = ' . $topic_id . ' ';
+$query       = 'SELECT rating FROM '.$GLOBALS['xoopsDB']->prefix('newbb_votedata').' WHERE topic_id = '.$topic_id.' ';
 $voteresult  = $GLOBALS['xoopsDB']->query($query);
 $votesDB     = $GLOBALS['xoopsDB']->getRowsNum($voteresult);
 $totalrating = 0;
@@ -101,7 +101,7 @@ 
 $sql         = sprintf('UPDATE "%s" SET rating = "%u", votes = "%u" WHERE topic_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $finalrating, $votesDB, $topic_id);
 $GLOBALS['xoopsDB']->queryF($sql);
 
-$ratemessage = _MD_NEWBB_VOTEAPPRE . '<br>' . sprintf(_MD_NEWBB_THANKYOU, $GLOBALS['xoopsConfig']['sitename']);
-redirect_header('viewtopic.php?topic_id=' . $topic_id . '&amp;forum=' . $forum . '', 2, $ratemessage);
+$ratemessage = _MD_NEWBB_VOTEAPPRE.'<br>'.sprintf(_MD_NEWBB_THANKYOU, $GLOBALS['xoopsConfig']['sitename']);
+redirect_header('viewtopic.php?topic_id='.$topic_id.'&amp;forum='.$forum.'', 2, $ratemessage);
 // irmtfan enhance include footer.php
 require_once $GLOBALS['xoops']->path('footer.php');

header.php

Indentation +35 added lines, -35 removed lines

@@ -23,42 +23,42 @@ 
 //require_once $GLOBALS['xoops']->path('header.php');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-    require_once __DIR__ . '/seo_url.php';
-    /* for seo */
-    $toseo_url = ['index.php', 'viewforum.php', 'viewtopic.php', 'rss.php'];
+	require_once __DIR__ . '/seo_url.php';
+	/* for seo */
+	$toseo_url = ['index.php', 'viewforum.php', 'viewtopic.php', 'rss.php'];
 
-    if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)
-        && (false === strpos(getenv('REQUEST_URI'), '.html'))) {
-        $redir = false;
-        if (true === strpos(getenv('REQUEST_URI'), 'mark_read=') || true === strpos(getenv('REQUEST_URI'), 'mark=')) {
-            // Mark Forums
-        } else {
-            if (in_array(basename(getenv('SCRIPT_NAME')), $toseo_url)) {
-                //rewrite only for files
+	if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite']) && (!isset($_POST) || count($_POST) <= 0)
+		&& (false === strpos(getenv('REQUEST_URI'), '.html'))) {
+		$redir = false;
+		if (true === strpos(getenv('REQUEST_URI'), 'mark_read=') || true === strpos(getenv('REQUEST_URI'), 'mark=')) {
+			// Mark Forums
+		} else {
+			if (in_array(basename(getenv('SCRIPT_NAME')), $toseo_url)) {
+				//rewrite only for files
 
-                if ('' !== trim(getenv('SCRIPT_NAME'))) {
-                    if (false === strpos(getenv('REQUEST_URI'), '/' . SEO_MODULE_NAME . '/')) {
-                        $redir = true;
-                    } elseif (getenv('QUERY_STRING')) {
-                        $redir = true;
-                    }
-                }
-            }
-        }
+				if ('' !== trim(getenv('SCRIPT_NAME'))) {
+					if (false === strpos(getenv('REQUEST_URI'), '/' . SEO_MODULE_NAME . '/')) {
+						$redir = true;
+					} elseif (getenv('QUERY_STRING')) {
+						$redir = true;
+					}
+				}
+			}
+		}
 
-        if (true === $redir) {
-            $s      = 'http://' . getenv('HTTP_HOST') . getenv('REQUEST_URI');
-            $s      = str_replace('/' . REAL_MODULE_NAME . '/', '/' . SEO_MODULE_NAME . '/', $s);
-            $newurl = seo_urls('<a href="' . $s . '"></a>');
-            $newurl = str_replace('<a href="', '', $newurl);
-            $newurl = str_replace('"></a>', '', $newurl);
-            if (!headers_sent()) {
-                header('HTTP/1.1 301 Moved Permanently');
-                header("Location: $newurl");
-                exit();
-            }
-        }
-    }
+		if (true === $redir) {
+			$s      = 'http://' . getenv('HTTP_HOST') . getenv('REQUEST_URI');
+			$s      = str_replace('/' . REAL_MODULE_NAME . '/', '/' . SEO_MODULE_NAME . '/', $s);
+			$newurl = seo_urls('<a href="' . $s . '"></a>');
+			$newurl = str_replace('<a href="', '', $newurl);
+			$newurl = str_replace('"></a>', '', $newurl);
+			if (!headers_sent()) {
+				header('HTTP/1.1 301 Moved Permanently');
+				header("Location: $newurl");
+				exit();
+			}
+		}
+	}
 }
 
 require_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/vars.php');
@@ -81,8 +81,8 @@ 
 //}
 
 if (is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['welcome_forum'])
-    && !$GLOBALS['xoopsUser']->getVar('posts')) {
-    require_once __DIR__ . '/include/functions.welcome.php';
+	&& !$GLOBALS['xoopsUser']->getVar('posts')) {
+	require_once __DIR__ . '/include/functions.welcome.php';
 }
 // irmtfan for backward compatibility
 $pollmodules = $GLOBALS['xoopsModuleConfig']['poll_module'];

Spacing +12 added lines, -12 removed lines

@@ -11,8 +11,8 @@ 
 
 use Xmf\Request;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/common.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/common.php';
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 /** @var \XoopsLogger $xoopsLogger */
@@ -23,7 +23,7 @@ 
 //require_once $GLOBALS['xoops']->path('header.php');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-    require_once __DIR__ . '/seo_url.php';
+    require_once __DIR__.'/seo_url.php';
     /* for seo */
     $toseo_url = ['index.php', 'viewforum.php', 'viewtopic.php', 'rss.php'];
 
@@ -37,7 +37,7 @@ 
                 //rewrite only for files
 
                 if ('' !== trim(getenv('SCRIPT_NAME'))) {
-                    if (false === strpos(getenv('REQUEST_URI'), '/' . SEO_MODULE_NAME . '/')) {
+                    if (false === strpos(getenv('REQUEST_URI'), '/'.SEO_MODULE_NAME.'/')) {
                         $redir = true;
                     } elseif (getenv('QUERY_STRING')) {
                         $redir = true;
@@ -47,9 +47,9 @@ 
         }
 
         if (true === $redir) {
-            $s      = 'http://' . getenv('HTTP_HOST') . getenv('REQUEST_URI');
-            $s      = str_replace('/' . REAL_MODULE_NAME . '/', '/' . SEO_MODULE_NAME . '/', $s);
-            $newurl = seo_urls('<a href="' . $s . '"></a>');
+            $s      = 'http://'.getenv('HTTP_HOST').getenv('REQUEST_URI');
+            $s      = str_replace('/'.REAL_MODULE_NAME.'/', '/'.SEO_MODULE_NAME.'/', $s);
+            $newurl = seo_urls('<a href="'.$s.'"></a>');
             $newurl = str_replace('<a href="', '', $newurl);
             $newurl = str_replace('"></a>', '', $newurl);
             if (!headers_sent()) {
@@ -61,10 +61,10 @@ 
     }
 }
 
-require_once $GLOBALS['xoops']->path('modules/' . $moduleDirName . '/include/vars.php');
+require_once $GLOBALS['xoops']->path('modules/'.$moduleDirName.'/include/vars.php');
 
-require_once __DIR__ . '/include/functions.user.php';
-require_once __DIR__ . '/include/functions.topic.php';
+require_once __DIR__.'/include/functions.user.php';
+require_once __DIR__.'/include/functions.topic.php';
 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 require_once $GLOBALS['xoops']->path('class/module.textsanitizer.php');
@@ -73,7 +73,7 @@ 
 $menumode       = 0;
 $menumode_other = [];
 $menu_url       = htmlspecialchars(preg_replace('/&menumode=[^&]/', '', Request::getString('REQUEST_URI', '', 'SERVER')), ENT_QUOTES | ENT_HTML5);
-$menu_url       .= (false === strpos($menu_url, '?')) ? '?menumode=' : '&amp;menumode=';
+$menu_url .= (false === strpos($menu_url, '?')) ? '?menumode=' : '&amp;menumode=';
 //foreach ($GLOBALS['xoopsModuleConfig']['valid_menumodes'] as $key => $val) {
 //    if ($key !== $menumode) {
 //        $menumode_other[] = array('title' => $val, 'link' => $menu_url . $key);
@@ -82,7 +82,7 @@ 
 
 if (is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['welcome_forum'])
     && !$GLOBALS['xoopsUser']->getVar('posts')) {
-    require_once __DIR__ . '/include/functions.welcome.php';
+    require_once __DIR__.'/include/functions.welcome.php';
 }
 // irmtfan for backward compatibility
 $pollmodules = $GLOBALS['xoopsModuleConfig']['poll_module'];

dl_attachment.php

Indentation +41 added lines, -41 removed lines

@@ -20,7 +20,7 @@ 
 $postId   = Request::getInt('post_id', 0, 'GET');
 
 if (!$postId || !$attachId) {
-    exit(_MD_NEWBB_NO_SUCH_FILE . ': post_id:' . $postId . '; attachid' . $attachId);
+	exit(_MD_NEWBB_NO_SUCH_FILE . ': post_id:' . $postId . '; attachid' . $attachId);
 }
 
 ///** @var Newbb\PostHandler $postHandler */
@@ -29,36 +29,36 @@ 
 /** @var Newbb\Post $forumpost */
 $forumpost = $postHandler->get($postId);
 if (!$approved = $forumpost->getVar('approved')) {
-    exit(_MD_NEWBB_NORIGHTTOVIEW);
+	exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
 ///** @var TopicHandler $topicHandler */
 //$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
 $topicObject = $topicHandler->getByPost($postId);
 $topic_id    = $topicObject->getVar('topic_id');
 if (!$approved = $topicObject->getVar('approved')) {
-    exit(_MD_NEWBB_NORIGHTTOVIEW);
+	exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
 ///** @var NewbbForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject = $forumHandler->get($topicObject->getVar('forum_id'));
 if (!$forumHandler->getPermission($forumObject)) {
-    exit(_MD_NEWBB_NORIGHTTOACCESS);
+	exit(_MD_NEWBB_NORIGHTTOACCESS);
 }
 if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
-    exit(_MD_NEWBB_NORIGHTTOVIEW);
+	exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
 
 $attachments = $forumpost->getAttachment();
 $attach      = $attachments[$attachId];
 if (!$attach) {
-    exit(_MD_NEWBB_NO_SUCH_FILE);
+	exit(_MD_NEWBB_NO_SUCH_FILE);
 }
 $file_saved = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
 if (!file_exists($file_saved)) {
-    exit(_MD_NEWBB_NO_SUCH_FILE);
+	exit(_MD_NEWBB_NO_SUCH_FILE);
 }
 if ($down = $forumpost->incrementDownload($attachId)) {
-    $forumpost->saveAttachment();
+	$forumpost->saveAttachment();
 }
 unset($forumpost);
 $msg = ob_get_contents();
@@ -66,41 +66,41 @@ 
 
 $xoopsLogger->activated = false;
 if (!empty($GLOBALS['xoopsModuleConfig']['download_direct'])) {
-    header('Cache-Control: no-store, no-cache, must-revalidate');
-    header('Cache-Control: post-check=0, pre-check=0', false);
-    header('Pragma: no-cache');
-    header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('location: ' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
+	header('Cache-Control: no-store, no-cache, must-revalidate');
+	header('Cache-Control: post-check=0, pre-check=0', false);
+	header('Pragma: no-cache');
+	header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+	header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+	header('location: ' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
 } else {
-    $file_display = $attach['nameDisplay'];
-    //$mimetype = $attach['mimetype'];
+	$file_display = $attach['nameDisplay'];
+	//$mimetype = $attach['mimetype'];
 
-    if (ini_get('zlib.output_compression')) {
-        @ini_set('zlib.output_compression', 'Off');
-    }
+	if (ini_get('zlib.output_compression')) {
+		@ini_set('zlib.output_compression', 'Off');
+	}
 
-    if (function_exists('mb_http_output')) {
-        mb_http_output('pass');
-    }
-    header('Expires: 0');
-    //header('Content-Type: '.$mimetype);
-    header('Content-Type: application/octet-stream');
-    if (preg_match("/MSIE (\d\.\d{1,2})/", Request::getString('HTTP_USER_AGENT', '', 'SERVER'))) {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
-        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-        header('Pragma: public');
-    } else {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
-        header('Pragma: no-cache');
-    }
-    header('Content-Type: application/force-download');
-    header('Content-Transfer-Encoding: binary');
+	if (function_exists('mb_http_output')) {
+		mb_http_output('pass');
+	}
+	header('Expires: 0');
+	//header('Content-Type: '.$mimetype);
+	header('Content-Type: application/octet-stream');
+	if (preg_match("/MSIE (\d\.\d{1,2})/", Request::getString('HTTP_USER_AGENT', '', 'SERVER'))) {
+		header('Content-Disposition: attachment; filename="' . $file_display . '"');
+		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+		header('Pragma: public');
+	} else {
+		header('Content-Disposition: attachment; filename="' . $file_display . '"');
+		header('Pragma: no-cache');
+	}
+	header('Content-Type: application/force-download');
+	header('Content-Transfer-Encoding: binary');
 
-    $handle = fopen($file_saved, 'rb');
-    while (!feof($handle)) {
-        $buffer = fread($handle, 4096);
-        echo $buffer;
-    }
-    fclose($handle);
+	$handle = fopen($file_saved, 'rb');
+	while (!feof($handle)) {
+		$buffer = fread($handle, 4096);
+		echo $buffer;
+	}
+	fclose($handle);
 }

Spacing +7 added lines, -7 removed lines

@@ -13,14 +13,14 @@ 
 use XoopsModules\Newbb;
 
 ob_start();
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('header.php');
 
 $attachId = Request::getInt('attachid', 0, 'GET');
 $postId   = Request::getInt('post_id', 0, 'GET');
 
 if (!$postId || !$attachId) {
-    exit(_MD_NEWBB_NO_SUCH_FILE . ': post_id:' . $postId . '; attachid' . $attachId);
+    exit(_MD_NEWBB_NO_SUCH_FILE.': post_id:'.$postId.'; attachid'.$attachId);
 }
 
 ///** @var Newbb\PostHandler $postHandler */
@@ -53,7 +53,7 @@ 
 if (!$attach) {
     exit(_MD_NEWBB_NO_SUCH_FILE);
 }
-$file_saved = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
+$file_saved = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attach['name_saved']);
 if (!file_exists($file_saved)) {
     exit(_MD_NEWBB_NO_SUCH_FILE);
 }
@@ -70,8 +70,8 @@ 
     header('Cache-Control: post-check=0, pre-check=0', false);
     header('Pragma: no-cache');
     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-    header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-    header('location: ' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+    header('location: '.XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attach['name_saved']);
 } else {
     $file_display = $attach['nameDisplay'];
     //$mimetype = $attach['mimetype'];
@@ -87,11 +87,11 @@ 
     //header('Content-Type: '.$mimetype);
     header('Content-Type: application/octet-stream');
     if (preg_match("/MSIE (\d\.\d{1,2})/", Request::getString('HTTP_USER_AGENT', '', 'SERVER'))) {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
+        header('Content-Disposition: attachment; filename="'.$file_display.'"');
         header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
         header('Pragma: public');
     } else {
-        header('Content-Disposition: attachment; filename="' . $file_display . '"');
+        header('Content-Disposition: attachment; filename="'.$file_display.'"');
         header('Pragma: no-cache');
     }
     header('Content-Type: application/force-download');

list.tag.php

Spacing +1 added lines, -1 removed lines

@@ -8,5 +8,5 @@
  * @since          4.00
  * @package        module::newbb
  */
-require_once __DIR__   . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('modules/tag/list.tag.php');

edit.php

Indentation +44 added lines, -44 removed lines

@@ -15,12 +15,12 @@ 
 require_once __DIR__ . '/header.php';
 
 foreach (['forum', 'topic_id', 'post_id', 'order'] as $getint) {
-    ${$getint} = Request::getInt($getint, 0, 'GET');
+	${$getint} = Request::getInt($getint, 0, 'GET');
 }
 
 if (!$topic_id && !$post_id) {
-    $redirect = empty($forum) ? 'index.php' : "viewforum.php?forum={$forum}";
-    redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+	$redirect = empty($forum) ? 'index.php' : "viewforum.php?forum={$forum}";
+	redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
@@ -35,13 +35,13 @@ 
 $topicObject = $topicHandler->get($postObject->getVar('topic_id'));
 $forumObject = $forumHandler->get($postObject->getVar('forum_id'));
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header('index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header('index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 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);
 }
 $isAdmin = newbbIsAdmin($forumObject);
 $uid     = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
@@ -51,30 +51,30 @@ 
 $error_msg    = null;
 
 if (!$topicHandler->getPermission($forumObject, $topic_status, 'edit') || (!$isAdmin && !$postObject->checkIdentity())) {
-    $error_msg = _MD_NEWBB_NORIGHTTOEDIT;
+	$error_msg = _MD_NEWBB_NORIGHTTOEDIT;
 } elseif (!$isAdmin && !$postObject->checkTimelimit('edit_timelimit')) {
-    $error_msg = _MD_NEWBB_TIMEISUP;
+	$error_msg = _MD_NEWBB_TIMEISUP;
 }
 
 if (!empty($error_msg)) {
-    /*
+	/*
      * Build the page query
      */
-    $query_vars  = ['topic_id', 'post_id', 'forum', 'status', 'order', 'mode', 'viewmode'];
-    $query_array = [];
-    foreach ($query_vars as $var) {
-        if (Request::getString($var, '', 'GET')) {
-            $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
-        }
-    }
-    $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
-    unset($query_array);
-    redirect_header("viewtopic.php?{$page_query}", 2, $error_msg);
+	$query_vars  = ['topic_id', 'post_id', 'forum', 'status', 'order', 'mode', 'viewmode'];
+	$query_array = [];
+	foreach ($query_vars as $var) {
+		if (Request::getString($var, '', 'GET')) {
+			$query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+		}
+	}
+	$page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
+	unset($query_array);
+	redirect_header("viewtopic.php?{$page_query}", 2, $error_msg);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject);
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject);
 }
 
 $xoopsOption['template_main']                                        = 'newbb_edit_post.tpl';
@@ -125,28 +125,28 @@ 
 $posts_context       = [];
 $posts_contextObject = $istopic ? [] : [$postHandler->get($postObject->getVar('pid'))];
 foreach ($posts_contextObject as $post_contextObject) {
-    if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
-        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')) . '</div>';
-    } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post_contextObject->getVar('require_reply')) {
-        $p_message = _MD_NEWBB_REPLY_REQUIREMENT;
-    } else {
-        $p_message = $post_contextObject->getVar('post_text');
-    }
-
-    if ($post_contextObject->getVar('uid')) {
-        $p_name = newbbGetUnameFromId($post_contextObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
-    } else {
-        $poster_name = $post_contextObject->getVar('poster_name');
-        $p_name      = empty($poster_name) ? htmlspecialchars($GLOBALS['xoopsConfig']['anonymous'], ENT_QUOTES | ENT_HTML5) : $poster_name;
-    }
-    $p_date    = formatTimestamp($post_contextObject->getVar('post_time'));
-    $p_subject = $post_contextObject->getVar('subject');
-
-    $posts_context[] = [
-        'subject' => $p_subject,
-        'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
-        'content' => $p_message
-    ];
+	if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
+		$p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')) . '</div>';
+	} elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post_contextObject->getVar('require_reply')) {
+		$p_message = _MD_NEWBB_REPLY_REQUIREMENT;
+	} else {
+		$p_message = $post_contextObject->getVar('post_text');
+	}
+
+	if ($post_contextObject->getVar('uid')) {
+		$p_name = newbbGetUnameFromId($post_contextObject->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname']);
+	} else {
+		$poster_name = $post_contextObject->getVar('poster_name');
+		$p_name      = empty($poster_name) ? htmlspecialchars($GLOBALS['xoopsConfig']['anonymous'], ENT_QUOTES | ENT_HTML5) : $poster_name;
+	}
+	$p_date    = formatTimestamp($post_contextObject->getVar('post_time'));
+	$p_subject = $post_contextObject->getVar('subject');
+
+	$posts_context[] = [
+		'subject' => $p_subject,
+		'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
+		'content' => $p_message
+	];
 }
 $xoopsTpl->assign_by_ref('posts_context', $posts_context);
 // irmtfan move to footer.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 foreach (['forum', 'topic_id', 'post_id', 'order'] as $getint) {
     ${$getint} = Request::getInt($getint, 0, 'GET');
@@ -64,7 +64,7 @@ 
     $query_array = [];
     foreach ($query_vars as $var) {
         if (Request::getString($var, '', 'GET')) {
-            $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+            $query_array[$var] = "{$var}=".Request::getString($var, '', 'GET');
         }
     }
     $page_query = htmlspecialchars(implode('&', array_values($query_array)), ENT_QUOTES | ENT_HTML5);
@@ -115,8 +115,8 @@ 
 $post_karma    = $postObject->getVar('post_karma');
 $require_reply = $postObject->getVar('require_reply');
 
-$xoopsTpl->assign('error_message', _MD_NEWBB_EDITEDBY . ' ' . $GLOBALS['xoopsUser']->uname());
-require_once __DIR__   . '/include/form.post.php';
+$xoopsTpl->assign('error_message', _MD_NEWBB_EDITEDBY.' '.$GLOBALS['xoopsUser']->uname());
+require_once __DIR__.'/include/form.post.php';
 
 ///** @var Newbb\KarmaHandler $karmaHandler */
 //$karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
@@ -126,7 +126,7 @@ 
 $posts_contextObject = $istopic ? [] : [$postHandler->get($postObject->getVar('pid'))];
 foreach ($posts_contextObject as $post_contextObject) {
     if ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $post_contextObject->getVar('post_karma') > 0) {
-        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')) . '</div>';
+        $p_message = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, '***', $post_contextObject->getVar('post_karma')).'</div>';
     } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $post_contextObject->getVar('require_reply')) {
         $p_message = _MD_NEWBB_REPLY_REQUIREMENT;
     } else {
@@ -144,11 +144,11 @@ 
 
     $posts_context[] = [
         'subject' => $p_subject,
-        'meta'    => _MD_NEWBB_BY . ' ' . $p_name . ' ' . _MD_NEWBB_ON . ' ' . $p_date,
+        'meta'    => _MD_NEWBB_BY.' '.$p_name.' '._MD_NEWBB_ON.' '.$p_date,
         'content' => $p_message
     ];
 }
 $xoopsTpl->assign_by_ref('posts_context', $posts_context);
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');