mambax7 / newbb5

viewtopic.php

Indentation +515 added lines, -515 removed lines

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

Spacing +65 added lines, -65 removed lines

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

admin/admin_type_manager.php

Indentation +389 added lines, -389 removed lines

@@ -32,19 +32,19 @@ 
  */
 $op       = Request::getCmd('op', '');
 $validOps = [
-    'save_type',
-    'delete',
-    'template',
-    'save_template',
-    'apply',
-    'save_apply',
-    'forum',
-    'edit_forum',
-    'save_forum',
-    'add'
+	'save_type',
+	'delete',
+	'template',
+	'save_template',
+	'apply',
+	'save_apply',
+	'forum',
+	'edit_forum',
+	'save_forum',
+	'add'
 ];
 if (!in_array($op, $validOps, true)) {
-    $op = '';
+	$op = '';
 }
 
 ///** @var Newbb\TypeHandler $typeHandler */
@@ -52,386 +52,386 @@ 
 $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
 
 switch ($op) {
-    case 'save_type':
-        $type_names0 = $_POST['type_name'];
-        $type_names  = Request::getArray('type_name', null, 'POST');
-        $type_del    = [];
-        foreach (array_keys($type_names) as $key) {
-            if (Request::getBool('isnew', '', 'POST')) {
-                $typeObject = $typeHandler->create();
-            } elseif (!$typeObject = $typeHandler->get($key)) {
-                continue;
-            }
-
-            //            if (Request::getArray("type_del[$key]", '', 'POST')) {
-            $temp = Request::getArray('type_del', '', 'POST');
-            if ($temp[$key]) {
-                $type_del[] = $key;
-                continue;
-            } else {
-                foreach (['type_name', 'type_color', 'type_description'] as $var) {
-                    //                    if ($typeObject->getVar($var) != @$_POST[$var][$key]) {
-                    //                        $typeObject->setVar($var, @$_POST[$var][$key]);
-                    //                    }
-                    $temp = Request::getArray($var, '', 'POST');
-                    if ($typeObject->getVar($var) != $temp[$key]) {
-                        $typeObject->setVar($var, $temp[$key]);
-                    }
-
-                    //                    $typeObject->setVar($var, Request::getArray($var, '', 'POST')[$key]);
-                }
-                $typeHandler->insert($typeObject);
-                unset($typeObject);
-            }
-        }
-        if (count($type_del) > 0) {
-            $type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', $type_del) . ')', 'IN'));
-            xoops_confirm(['op' => 'delete', 'type_del' => serialize($type_del)], xoops_getenv('PHP_SELF'), sprintf(_AM_NEWBB_TODEL_TYPE, implode(', ', array_values($type_list))), '', false);
-        } else {
-            redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
-        }
-        break;
-
-    case 'delete':
-        $type_dels = @unserialize(Request::getString('type_del', '', 'POST'));
-        foreach ($type_dels as $key) {
-            if (!$typeObject = $typeHandler->get($key)) {
-                continue;
-            }
-            $typeHandler->delete($typeObject);
-            unset($typeObject);
-        }
-        redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
-        break;
-
-    case 'template':
-        $typesObject = $typeHandler->getAll();
-        if (0 === count($typesObject)) {
-            redirect_header(xoops_getenv('PHP_SELF'), 2, _AM_NEWBB_TYPE_ADD_ERR);
-        }
-
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-        $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
-        echo '</tr>';
-
-        if ($templates = $cacheHelper->read('type_template')) {
-            arsort($templates);
-            foreach ($templates as $order => $key) {
-                if (!isset($typesObject[$key])) {
-                    continue;
-                }
-                $typeObject = $typesObject[$key];
-                echo "<tr class='even' align='left'>";
-                echo "<td><input type='text' name='type_order[{$key}]' value='" . $order . "' size='10' /></td>";
-                echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-                echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-                echo '</tr>';
-                unset($typesObject[$key]);
-            }
-            echo "<tr><td colspan='3' height='5px'></td></tr>";
-        }
-        foreach ($typesObject as $key => $typeObject) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-            echo '</tr>';
-        }
-
-        echo "<tr><td colspan='3' style='text-align:center;'>";
-        echo "<input type='hidden' name='op' value='save_template' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
-        echo '</td></tr></table>';
-        echo '</form>';
-        echo '</td></tr></table>';
-        break;
-
-    case 'save_template':
-        $templates = array_flip(array_filter(Request::getArray('type_order', [], 'POST')));
-        $cacheHelper->write('type_template', $templates);
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _MD_NEWBB_DBUPDATED);
-        break;
-
-    case 'apply':
-        if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
-        }
-
-        //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
-        $criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
-        $criteriaCategory->setSort('cat_order');
-        $categories = $categoryHandler->getList($criteriaCategory);
-        //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forums = $forumHandler->getTree(array_keys($categories), 0, 'all');
-        foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
-            foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
-            }
-        }
-        unset($forums, $categories);
-        $fmform    = new \XoopsThemeForm(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'fmform', xoops_getenv('PHP_SELF'), 'post', true);
-        $fm_select = new \XoopsFormSelect(_AM_NEWBB_PERM_FORUMS, 'forums', null, 10, true);
-        $fm_select->addOptionArray($fm_options);
-        $fmform->addElement($fm_select);
-        $tray = new \XoopsFormElementTray('');
-        $tray->addElement(new \XoopsFormHidden('op', 'save_apply'));
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $fmform->addElement($tray);
-
-        //loadModuleAdminMenu(11, _AM_NEWBB_TYPE_TEMPLATE_APPLY);
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-        $adminObject->displayButton('left');
-
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
-        echo '</tr>';
-
-        $typesObject = $typeHandler->getAll(new \Criteria('type_id', '(' . implode(', ', array_values($templates)) . ')', 'IN'));
-        arsort($templates);
-        foreach ($templates as $order => $key) {
-            if (!isset($typesObject[$key])) {
-                continue;
-            }
-            $typeObject = $typesObject[$key];
-            echo "<tr class='even' align='left'>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $order . '</td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-            echo '</tr>';
-            unset($typesObject[$key]);
-        }
-        echo '</table>';
-        echo '</td></tr></table>';
-        echo '<br>';
-        $fmform->display();
-        break;
-
-    case 'save_apply':
-        if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
-        }
-        foreach (Request::getArray('forums', [], 'POST') as $forum) {
-            if ($forum < 1) {
-                continue;
-            }
-            $typeHandler->updateByForum($forum, array_flip($templates));
-        }
-        redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
-        break;
-
-    case 'forum':
-        //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
-        $criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
-        $criteriaCategory->setSort('cat_order');
-        $categories = $categoryHandler->getList($criteriaCategory);
-        if (empty($categories)) {
-            redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CREATENEWCATEGORY);
-        }
-        //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forums = $forumHandler->getTree(array_keys($categories));
-        if (empty($forums)) {
-            redirect_header('admin_forum_manager.php', 2, _AM_NEWBB_CREATENEWFORUM);
-        }
-
-        foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
-            foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
-            }
-        }
-        unset($forums, $categories);
-        $fmform    = new \XoopsThemeForm(_AM_NEWBB_TYPE_FORUM, 'fmform', xoops_getenv('PHP_SELF'), 'post', true);
-        $fm_select = new \XoopsFormSelect(_AM_NEWBB_PERM_FORUMS, 'forum', null, 5, false);
-        $fm_select->addOptionArray($fm_options);
-        $fmform->addElement($fm_select);
-        $tray = new \XoopsFormElementTray('');
-        $tray->addElement(new \XoopsFormHidden('op', 'edit_forum'));
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $fmform->addElement($tray);
-
-        //loadModuleAdminMenu(11, _AM_NEWBB_TYPE_FORUM);
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-        $adminObject->displayButton('left');
-
-        $fmform->display();
-        break;
-
-    case 'edit_forum':
-        if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
-        }
-
-        //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        if (!$forumObject = $forumHandler->get(Request::getInt('forum', 0, 'POST'))) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
-        }
-
-        $typesObject = $typeHandler->getAll();
-        if (0 === count($typesObject)) {
-            redirect_header(xoops_getenv('PHP_SELF'), 2, _AM_NEWBB_TYPE_ADD_ERR);
-        }
-
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-        $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
-        echo '</tr>';
-
-        $types       = $typeHandler->getByForum(Request::getInt('forum', 0, 'POST'));
-        $types_order = [];
-        foreach ($types as $key => $type) {
-            $types_order[] = $type['type_order'];
-        }
-        array_multisort($types_order, $types);
-        foreach ($types as $key => $type) {
-            if (!isset($typesObject[$type['type_id']])) {
-                continue;
-            }
-            $typeObject = $typesObject[$type['type_id']];
-            echo "<tr class='even' align='left'>";
-            echo "<td><input type='text' name='type_order[" . $type['type_id'] . "]' value='" . $type['type_order'] . "' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-            echo '</tr>';
-            unset($typesObject[$type['type_id']]);
-        }
-        echo "<tr><td colspan='3' height='5px'></td></tr>";
-        foreach ($typesObject as $key => $typeObject) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-            echo '</tr>';
-        }
-
-        echo "<tr><td colspan='3' style='text-align:center;'>";
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_EDITFORUM_DESC . '</legend>';
-        echo "<input type='hidden' name='forum' value='" . Request::getInt('forum', 0, 'POST') . "' />";
-        echo "<input type='hidden' name='op' value='save_forum' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
-        echo '</td></tr></table>';
-        echo '</form>';
-        echo '</td></tr></table>';
-        break;
-
-    case 'save_forum':
-        if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
-        }
-        $typeHandler->updateByForum(Request::getInt('forum', 0, 'POST'), Request::getArray('type_order', null, 'POST'));
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _MD_NEWBB_DBUPDATED);
-        break;
-
-    case 'add':
-    default:
-        $typesObject = $typeHandler->getAll();
-        if (0 === count($typesObject)) {
-            $op    = 'add';
-            $title = _AM_NEWBB_TYPE_ADD;
-        } else {
-            $title = _AM_NEWBB_TYPE_LIST;
-        }
-
-        if ('add' !== $op) {
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-            $adminObject->displayButton('left');
-        }
-        echo _AM_NEWBB_TYPE_HELP;
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        if ('add' !== $op) {
-            echo "<th class='bg3' width='5%'>" . _DELETE . '</th>';
-        }
-        echo "<th align='left' class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='15%'>" . _AM_NEWBB_TYPE_COLOR . '</th>';
-        echo "<th align='left' class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
-        echo '</tr>';
+	case 'save_type':
+		$type_names0 = $_POST['type_name'];
+		$type_names  = Request::getArray('type_name', null, 'POST');
+		$type_del    = [];
+		foreach (array_keys($type_names) as $key) {
+			if (Request::getBool('isnew', '', 'POST')) {
+				$typeObject = $typeHandler->create();
+			} elseif (!$typeObject = $typeHandler->get($key)) {
+				continue;
+			}
+
+			//            if (Request::getArray("type_del[$key]", '', 'POST')) {
+			$temp = Request::getArray('type_del', '', 'POST');
+			if ($temp[$key]) {
+				$type_del[] = $key;
+				continue;
+			} else {
+				foreach (['type_name', 'type_color', 'type_description'] as $var) {
+					//                    if ($typeObject->getVar($var) != @$_POST[$var][$key]) {
+					//                        $typeObject->setVar($var, @$_POST[$var][$key]);
+					//                    }
+					$temp = Request::getArray($var, '', 'POST');
+					if ($typeObject->getVar($var) != $temp[$key]) {
+						$typeObject->setVar($var, $temp[$key]);
+					}
+
+					//                    $typeObject->setVar($var, Request::getArray($var, '', 'POST')[$key]);
+				}
+				$typeHandler->insert($typeObject);
+				unset($typeObject);
+			}
+		}
+		if (count($type_del) > 0) {
+			$type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', $type_del) . ')', 'IN'));
+			xoops_confirm(['op' => 'delete', 'type_del' => serialize($type_del)], xoops_getenv('PHP_SELF'), sprintf(_AM_NEWBB_TODEL_TYPE, implode(', ', array_values($type_list))), '', false);
+		} else {
+			redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
+		}
+		break;
+
+	case 'delete':
+		$type_dels = @unserialize(Request::getString('type_del', '', 'POST'));
+		foreach ($type_dels as $key) {
+			if (!$typeObject = $typeHandler->get($key)) {
+				continue;
+			}
+			$typeHandler->delete($typeObject);
+			unset($typeObject);
+		}
+		redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
+		break;
+
+	case 'template':
+		$typesObject = $typeHandler->getAll();
+		if (0 === count($typesObject)) {
+			redirect_header(xoops_getenv('PHP_SELF'), 2, _AM_NEWBB_TYPE_ADD_ERR);
+		}
+
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+		$adminObject->displayButton('left');
+		echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
+		echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+		echo '</tr>';
+
+		if ($templates = $cacheHelper->read('type_template')) {
+			arsort($templates);
+			foreach ($templates as $order => $key) {
+				if (!isset($typesObject[$key])) {
+					continue;
+				}
+				$typeObject = $typesObject[$key];
+				echo "<tr class='even' align='left'>";
+				echo "<td><input type='text' name='type_order[{$key}]' value='" . $order . "' size='10' /></td>";
+				echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+				echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+				echo '</tr>';
+				unset($typesObject[$key]);
+			}
+			echo "<tr><td colspan='3' height='5px'></td></tr>";
+		}
+		foreach ($typesObject as $key => $typeObject) {
+			echo "<tr class='odd' align='left'>";
+			echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
+			echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+			echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+			echo '</tr>';
+		}
+
+		echo "<tr><td colspan='3' style='text-align:center;'>";
+		echo "<input type='hidden' name='op' value='save_template' />";
+		echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
+		echo "<input type='reset' value='" . _CANCEL . "' />";
+		echo '</td></tr></table>';
+		echo '</form>';
+		echo '</td></tr></table>';
+		break;
+
+	case 'save_template':
+		$templates = array_flip(array_filter(Request::getArray('type_order', [], 'POST')));
+		$cacheHelper->write('type_template', $templates);
+		redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _MD_NEWBB_DBUPDATED);
+		break;
+
+	case 'apply':
+		if (!$templates = $cacheHelper->read('type_template')) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
+		}
+
+		//        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
+		$criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
+		$criteriaCategory->setSort('cat_order');
+		$categories = $categoryHandler->getList($criteriaCategory);
+		//        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forums = $forumHandler->getTree(array_keys($categories), 0, 'all');
+		foreach (array_keys($forums) as $c) {
+			$fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+			foreach (array_keys($forums[$c]) as $f) {
+				$fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+			}
+		}
+		unset($forums, $categories);
+		$fmform    = new \XoopsThemeForm(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'fmform', xoops_getenv('PHP_SELF'), 'post', true);
+		$fm_select = new \XoopsFormSelect(_AM_NEWBB_PERM_FORUMS, 'forums', null, 10, true);
+		$fm_select->addOptionArray($fm_options);
+		$fmform->addElement($fm_select);
+		$tray = new \XoopsFormElementTray('');
+		$tray->addElement(new \XoopsFormHidden('op', 'save_apply'));
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$fmform->addElement($tray);
+
+		//loadModuleAdminMenu(11, _AM_NEWBB_TYPE_TEMPLATE_APPLY);
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+		$adminObject->displayButton('left');
+
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
+		echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+		echo '</tr>';
+
+		$typesObject = $typeHandler->getAll(new \Criteria('type_id', '(' . implode(', ', array_values($templates)) . ')', 'IN'));
+		arsort($templates);
+		foreach ($templates as $order => $key) {
+			if (!isset($typesObject[$key])) {
+				continue;
+			}
+			$typeObject = $typesObject[$key];
+			echo "<tr class='even' align='left'>";
+			echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+			echo '<td>' . $order . '</td>';
+			echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+			echo '</tr>';
+			unset($typesObject[$key]);
+		}
+		echo '</table>';
+		echo '</td></tr></table>';
+		echo '<br>';
+		$fmform->display();
+		break;
+
+	case 'save_apply':
+		if (!$templates = $cacheHelper->read('type_template')) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
+		}
+		foreach (Request::getArray('forums', [], 'POST') as $forum) {
+			if ($forum < 1) {
+				continue;
+			}
+			$typeHandler->updateByForum($forum, array_flip($templates));
+		}
+		redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
+		break;
+
+	case 'forum':
+		//        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
+		$criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
+		$criteriaCategory->setSort('cat_order');
+		$categories = $categoryHandler->getList($criteriaCategory);
+		if (empty($categories)) {
+			redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CREATENEWCATEGORY);
+		}
+		//        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forums = $forumHandler->getTree(array_keys($categories));
+		if (empty($forums)) {
+			redirect_header('admin_forum_manager.php', 2, _AM_NEWBB_CREATENEWFORUM);
+		}
+
+		foreach (array_keys($forums) as $c) {
+			$fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+			foreach (array_keys($forums[$c]) as $f) {
+				$fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+			}
+		}
+		unset($forums, $categories);
+		$fmform    = new \XoopsThemeForm(_AM_NEWBB_TYPE_FORUM, 'fmform', xoops_getenv('PHP_SELF'), 'post', true);
+		$fm_select = new \XoopsFormSelect(_AM_NEWBB_PERM_FORUMS, 'forum', null, 5, false);
+		$fm_select->addOptionArray($fm_options);
+		$fmform->addElement($fm_select);
+		$tray = new \XoopsFormElementTray('');
+		$tray->addElement(new \XoopsFormHidden('op', 'edit_forum'));
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$fmform->addElement($tray);
+
+		//loadModuleAdminMenu(11, _AM_NEWBB_TYPE_FORUM);
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+		$adminObject->displayButton('left');
+
+		$fmform->display();
+		break;
+
+	case 'edit_forum':
+		if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+		}
+
+		//        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		if (!$forumObject = $forumHandler->get(Request::getInt('forum', 0, 'POST'))) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+		}
+
+		$typesObject = $typeHandler->getAll();
+		if (0 === count($typesObject)) {
+			redirect_header(xoops_getenv('PHP_SELF'), 2, _AM_NEWBB_TYPE_ADD_ERR);
+		}
+
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+		$adminObject->displayButton('left');
+		echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
+		echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+		echo '</tr>';
+
+		$types       = $typeHandler->getByForum(Request::getInt('forum', 0, 'POST'));
+		$types_order = [];
+		foreach ($types as $key => $type) {
+			$types_order[] = $type['type_order'];
+		}
+		array_multisort($types_order, $types);
+		foreach ($types as $key => $type) {
+			if (!isset($typesObject[$type['type_id']])) {
+				continue;
+			}
+			$typeObject = $typesObject[$type['type_id']];
+			echo "<tr class='even' align='left'>";
+			echo "<td><input type='text' name='type_order[" . $type['type_id'] . "]' value='" . $type['type_order'] . "' size='10' /></td>";
+			echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+			echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+			echo '</tr>';
+			unset($typesObject[$type['type_id']]);
+		}
+		echo "<tr><td colspan='3' height='5px'></td></tr>";
+		foreach ($typesObject as $key => $typeObject) {
+			echo "<tr class='odd' align='left'>";
+			echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
+			echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+			echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+			echo '</tr>';
+		}
+
+		echo "<tr><td colspan='3' style='text-align:center;'>";
+		echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_EDITFORUM_DESC . '</legend>';
+		echo "<input type='hidden' name='forum' value='" . Request::getInt('forum', 0, 'POST') . "' />";
+		echo "<input type='hidden' name='op' value='save_forum' />";
+		echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
+		echo "<input type='reset' value='" . _CANCEL . "' />";
+		echo '</td></tr></table>';
+		echo '</form>';
+		echo '</td></tr></table>';
+		break;
+
+	case 'save_forum':
+		if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
+		}
+		$typeHandler->updateByForum(Request::getInt('forum', 0, 'POST'), Request::getArray('type_order', null, 'POST'));
+		redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _MD_NEWBB_DBUPDATED);
+		break;
+
+	case 'add':
+	default:
+		$typesObject = $typeHandler->getAll();
+		if (0 === count($typesObject)) {
+			$op    = 'add';
+			$title = _AM_NEWBB_TYPE_ADD;
+		} else {
+			$title = _AM_NEWBB_TYPE_LIST;
+		}
+
+		if ('add' !== $op) {
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+			$adminObject->displayButton('left');
+		}
+		echo _AM_NEWBB_TYPE_HELP;
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo "<form name='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		if ('add' !== $op) {
+			echo "<th class='bg3' width='5%'>" . _DELETE . '</th>';
+		}
+		echo "<th align='left' class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
+		echo "<th class='bg3' width='15%'>" . _AM_NEWBB_TYPE_COLOR . '</th>';
+		echo "<th align='left' class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+		echo '</tr>';
 
 //        $isColorpicker = require_once $GLOBALS['xoops']->path('class/xoopsform/formcolorpicker.php');
-        xoops_load('XoopsFormColorPicker');
-
-        if ('add' !== $op) {
-            foreach ($typesObject as $key => $typeObject) {
-                echo "<tr class='odd' align='left'>";
-                echo "<td><input type='checkbox' name='type_del[{$key}]' /></td>";
-                echo "<td><input type='text' name='type_name[{$key}]' value='" . $typeObject->getVar('type_name') . "' size='10' /></td>";
-                if ($isColorpicker) {
-                    $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$key}]", $typeObject->getVar('type_color'));
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
-                } else {
-                    echo "<td><input type='text' name='type_color[{$key}]' value='" . $typeObject->getVar('type_color') . "' size='10' /></td>";
-                }
-                echo "<td><input type='text' name='type_description[{$key}]' value='" . $typeObject->getVar('type_description') . "' size='30' /></td>";
-                echo '</tr>';
-            }
-            echo "<tr><td colspan='4' style='text-align:center;'>";
-        } else {
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-            $adminObject->displayButton('left');
-            for ($i = 0; $i < 10; ++$i) {
-                echo "<tr class='odd' align='left'>";
-                echo "<td><input type='text' name='type_name[{$i}]' value='' size='10' /></td>";
-                if ($isColorpicker) {
-                    $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$i}]", '');
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
-                } else {
-                    echo "<td><input type='text' name='type_color[{$i}]' value='' size='10' /></td>";
-                }
-                echo "<td><input type='text' name='type_description[{$i}]' value='' size='40' /></td>";
-                echo '</tr>';
-            }
-            echo "<tr><td colspan='3' style='text-align:center;'>";
-            echo "<input type='hidden' name='isnew' value='1' />";
-        }
-        echo "<input type='hidden' name='op' value='save_type' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
-        echo '</td></tr></table>';
-        echo '</form>';
-        echo '</td></tr></table>';
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_TYPE . '&nbsp;</legend>';
-        echo _AM_NEWBB_HELP_TYPE_TAB;
-        echo '</fieldset>';
-        break;
+		xoops_load('XoopsFormColorPicker');
+
+		if ('add' !== $op) {
+			foreach ($typesObject as $key => $typeObject) {
+				echo "<tr class='odd' align='left'>";
+				echo "<td><input type='checkbox' name='type_del[{$key}]' /></td>";
+				echo "<td><input type='text' name='type_name[{$key}]' value='" . $typeObject->getVar('type_name') . "' size='10' /></td>";
+				if ($isColorpicker) {
+					$form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$key}]", $typeObject->getVar('type_color'));
+					echo '<td>' . $form_colorpicker->render() . '</td>';
+				} else {
+					echo "<td><input type='text' name='type_color[{$key}]' value='" . $typeObject->getVar('type_color') . "' size='10' /></td>";
+				}
+				echo "<td><input type='text' name='type_description[{$key}]' value='" . $typeObject->getVar('type_description') . "' size='30' /></td>";
+				echo '</tr>';
+			}
+			echo "<tr><td colspan='4' style='text-align:center;'>";
+		} else {
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+			$adminObject->displayButton('left');
+			for ($i = 0; $i < 10; ++$i) {
+				echo "<tr class='odd' align='left'>";
+				echo "<td><input type='text' name='type_name[{$i}]' value='' size='10' /></td>";
+				if ($isColorpicker) {
+					$form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$i}]", '');
+					echo '<td>' . $form_colorpicker->render() . '</td>';
+				} else {
+					echo "<td><input type='text' name='type_color[{$i}]' value='' size='10' /></td>";
+				}
+				echo "<td><input type='text' name='type_description[{$i}]' value='' size='40' /></td>";
+				echo '</tr>';
+			}
+			echo "<tr><td colspan='3' style='text-align:center;'>";
+			echo "<input type='hidden' name='isnew' value='1' />";
+		}
+		echo "<input type='hidden' name='op' value='save_type' />";
+		echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
+		echo "<input type='reset' value='" . _CANCEL . "' />";
+		echo '</td></tr></table>';
+		echo '</form>';
+		echo '</td></tr></table>';
+		echo '<fieldset>';
+		echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_TYPE . '&nbsp;</legend>';
+		echo _AM_NEWBB_HELP_TYPE_TAB;
+		echo '</fieldset>';
+		break;
 }
 
 require_once __DIR__ . '/admin_footer.php';

Spacing +64 added lines, -64 removed lines

@@ -12,7 +12,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 echo '<br>';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
@@ -85,7 +85,7 @@ 
             }
         }
         if (count($type_del) > 0) {
-            $type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', $type_del) . ')', 'IN'));
+            $type_list = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', $type_del).')', 'IN'));
             xoops_confirm(['op' => 'delete', 'type_del' => serialize($type_del)], xoops_getenv('PHP_SELF'), sprintf(_AM_NEWBB_TODEL_TYPE, implode(', ', array_values($type_list))), '', false);
         } else {
             redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
@@ -115,14 +115,14 @@ 
         $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
         $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
         $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo '<legend style="font-weight: bold; color: #900;">'._AM_NEWBB_TYPE_ORDER_DESC.'</legend>';
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo "<form name='template' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_ORDER.'</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
         if ($templates = $cacheHelper->read('type_template')) {
@@ -133,9 +133,9 @@ 
                 }
                 $typeObject = $typesObject[$key];
                 echo "<tr class='even' align='left'>";
-                echo "<td><input type='text' name='type_order[{$key}]' value='" . $order . "' size='10' /></td>";
-                echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-                echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+                echo "<td><input type='text' name='type_order[{$key}]' value='".$order."' size='10' /></td>";
+                echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+                echo '<td>'.$typeObject->getVar('type_description').'</td>';
                 echo '</tr>';
                 unset($typesObject[$key]);
             }
@@ -144,15 +144,15 @@ 
         foreach ($typesObject as $key => $typeObject) {
             echo "<tr class='odd' align='left'>";
             echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
         }
 
         echo "<tr><td colspan='3' style='text-align:center;'>";
         echo "<input type='hidden' name='op' value='save_template' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
+        echo "<input type='submit' name='submit' value='"._SUBMIT."' /> ";
+        echo "<input type='reset' value='"._CANCEL."' />";
         echo '</td></tr></table>';
         echo '</form>';
         echo '</td></tr></table>';
@@ -161,12 +161,12 @@ 
     case 'save_template':
         $templates = array_flip(array_filter(Request::getArray('type_order', [], 'POST')));
         $cacheHelper->write('type_template', $templates);
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _MD_NEWBB_DBUPDATED);
+        redirect_header(xoops_getenv('PHP_SELF').'?op=template', 2, _MD_NEWBB_DBUPDATED);
         break;
 
     case 'apply':
         if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
         }
 
         //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
@@ -176,9 +176,9 @@ 
         //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
         $forums = $forumHandler->getTree(array_keys($categories), 0, 'all');
         foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+            $fm_options[-1 * $c] = '['.$categories[$c].']';
             foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+                $fm_options[$f] = $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'];
             }
         }
         unset($forums, $categories);
@@ -199,15 +199,15 @@ 
         $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
         $adminObject->displayButton('left');
 
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_ORDER.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
-        $typesObject = $typeHandler->getAll(new \Criteria('type_id', '(' . implode(', ', array_values($templates)) . ')', 'IN'));
+        $typesObject = $typeHandler->getAll(new \Criteria('type_id', '('.implode(', ', array_values($templates)).')', 'IN'));
         arsort($templates);
         foreach ($templates as $order => $key) {
             if (!isset($typesObject[$key])) {
@@ -215,9 +215,9 @@ 
             }
             $typeObject = $typesObject[$key];
             echo "<tr class='even' align='left'>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $order . '</td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$order.'</td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
             unset($typesObject[$key]);
         }
@@ -229,7 +229,7 @@ 
 
     case 'save_apply':
         if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
         }
         foreach (Request::getArray('forums', [], 'POST') as $forum) {
             if ($forum < 1) {
@@ -255,9 +255,9 @@ 
         }
 
         foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+            $fm_options[-1 * $c] = '['.$categories[$c].']';
             foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+                $fm_options[$f] = $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'];
             }
         }
         unset($forums, $categories);
@@ -282,12 +282,12 @@ 
 
     case 'edit_forum':
         if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
         }
 
         //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
         if (!$forumObject = $forumHandler->get(Request::getInt('forum', 0, 'POST'))) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
         }
 
         $typesObject = $typeHandler->getAll();
@@ -299,14 +299,14 @@ 
         $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
         $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
         $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo '<legend style="font-weight: bold; color: #900;">'._AM_NEWBB_TYPE_ORDER_DESC.'</legend>';
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo "<form name='template' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_ORDER.'</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
         $types       = $typeHandler->getByForum(Request::getInt('forum', 0, 'POST'));
@@ -321,9 +321,9 @@ 
             }
             $typeObject = $typesObject[$type['type_id']];
             echo "<tr class='even' align='left'>";
-            echo "<td><input type='text' name='type_order[" . $type['type_id'] . "]' value='" . $type['type_order'] . "' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><input type='text' name='type_order[".$type['type_id']."]' value='".$type['type_order']."' size='10' /></td>";
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
             unset($typesObject[$type['type_id']]);
         }
@@ -331,17 +331,17 @@ 
         foreach ($typesObject as $key => $typeObject) {
             echo "<tr class='odd' align='left'>";
             echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
         }
 
         echo "<tr><td colspan='3' style='text-align:center;'>";
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_EDITFORUM_DESC . '</legend>';
-        echo "<input type='hidden' name='forum' value='" . Request::getInt('forum', 0, 'POST') . "' />";
+        echo '<legend style="font-weight: bold; color: #900;">'._AM_NEWBB_TYPE_EDITFORUM_DESC.'</legend>';
+        echo "<input type='hidden' name='forum' value='".Request::getInt('forum', 0, 'POST')."' />";
         echo "<input type='hidden' name='op' value='save_forum' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
+        echo "<input type='submit' name='submit' value='"._SUBMIT."' /> ";
+        echo "<input type='reset' value='"._CANCEL."' />";
         echo '</td></tr></table>';
         echo '</form>';
         echo '</td></tr></table>';
@@ -349,10 +349,10 @@ 
 
     case 'save_forum':
         if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
         }
         $typeHandler->updateByForum(Request::getInt('forum', 0, 'POST'), Request::getArray('type_order', null, 'POST'));
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _MD_NEWBB_DBUPDATED);
+        redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _MD_NEWBB_DBUPDATED);
         break;
 
     case 'add':
@@ -372,16 +372,16 @@ 
             $adminObject->displayButton('left');
         }
         echo _AM_NEWBB_TYPE_HELP;
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo "<form name='list' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
         if ('add' !== $op) {
-            echo "<th class='bg3' width='5%'>" . _DELETE . '</th>';
+            echo "<th class='bg3' width='5%'>"._DELETE.'</th>';
         }
-        echo "<th align='left' class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='15%'>" . _AM_NEWBB_TYPE_COLOR . '</th>';
-        echo "<th align='left' class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th align='left' class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3' width='15%'>"._AM_NEWBB_TYPE_COLOR.'</th>';
+        echo "<th align='left' class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
 //        $isColorpicker = require_once $GLOBALS['xoops']->path('class/xoopsform/formcolorpicker.php');
@@ -391,14 +391,14 @@ 
             foreach ($typesObject as $key => $typeObject) {
                 echo "<tr class='odd' align='left'>";
                 echo "<td><input type='checkbox' name='type_del[{$key}]' /></td>";
-                echo "<td><input type='text' name='type_name[{$key}]' value='" . $typeObject->getVar('type_name') . "' size='10' /></td>";
+                echo "<td><input type='text' name='type_name[{$key}]' value='".$typeObject->getVar('type_name')."' size='10' /></td>";
                 if ($isColorpicker) {
                     $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$key}]", $typeObject->getVar('type_color'));
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
+                    echo '<td>'.$form_colorpicker->render().'</td>';
                 } else {
-                    echo "<td><input type='text' name='type_color[{$key}]' value='" . $typeObject->getVar('type_color') . "' size='10' /></td>";
+                    echo "<td><input type='text' name='type_color[{$key}]' value='".$typeObject->getVar('type_color')."' size='10' /></td>";
                 }
-                echo "<td><input type='text' name='type_description[{$key}]' value='" . $typeObject->getVar('type_description') . "' size='30' /></td>";
+                echo "<td><input type='text' name='type_description[{$key}]' value='".$typeObject->getVar('type_description')."' size='30' /></td>";
                 echo '</tr>';
             }
             echo "<tr><td colspan='4' style='text-align:center;'>";
@@ -411,7 +411,7 @@ 
                 echo "<td><input type='text' name='type_name[{$i}]' value='' size='10' /></td>";
                 if ($isColorpicker) {
                     $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$i}]", '');
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
+                    echo '<td>'.$form_colorpicker->render().'</td>';
                 } else {
                     echo "<td><input type='text' name='type_color[{$i}]' value='' size='10' /></td>";
                 }
@@ -422,16 +422,16 @@ 
             echo "<input type='hidden' name='isnew' value='1' />";
         }
         echo "<input type='hidden' name='op' value='save_type' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
+        echo "<input type='submit' name='submit' value='"._SUBMIT."' /> ";
+        echo "<input type='reset' value='"._CANCEL."' />";
         echo '</td></tr></table>';
         echo '</form>';
         echo '</td></tr></table>';
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_TYPE . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_TYPE.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_TYPE_TAB;
         echo '</fieldset>';
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/menu.php

Indentation +42 added lines, -42 removed lines

@@ -39,84 +39,84 @@
 $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_INDEX,
-    'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . 'home.png'
+	'title' => _MI_NEWBB_ADMENU_INDEX,
+	'link'  => 'admin/index.php',
+	'icon'  => $pathIcon32 . 'home.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_CATEGORY,
-    'link'  => 'admin/admin_cat_manager.php',
-    'icon'  => $pathIcon32 . 'category.png'
+	'title' => _MI_NEWBB_ADMENU_CATEGORY,
+	'link'  => 'admin/admin_cat_manager.php',
+	'icon'  => $pathIcon32 . 'category.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_FORUM,
-    'link'  => 'admin/admin_forum_manager.php',
-    'icon'  => $pathIcon32 . 'forums.png'
+	'title' => _MI_NEWBB_ADMENU_FORUM,
+	'link'  => 'admin/admin_forum_manager.php',
+	'icon'  => $pathIcon32 . 'forums.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_PERMISSION,
-    'link'  => 'admin/admin_permissions.php',
-    'icon'  => $pathIcon32 . 'permissions.png'
+	'title' => _MI_NEWBB_ADMENU_PERMISSION,
+	'link'  => 'admin/admin_permissions.php',
+	'icon'  => $pathIcon32 . 'permissions.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_ORDER,
-    'link'  => 'admin/admin_forum_reorder.php',
-    'icon'  => $pathIcon32 . 'compfile.png'
+	'title' => _MI_NEWBB_ADMENU_ORDER,
+	'link'  => 'admin/admin_forum_reorder.php',
+	'icon'  => $pathIcon32 . 'compfile.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_PRUNE,
-    'link'  => 'admin/admin_forum_prune.php',
-    'icon'  => $pathIcon32 . 'update.png'
+	'title' => _MI_NEWBB_ADMENU_PRUNE,
+	'link'  => 'admin/admin_forum_prune.php',
+	'icon'  => $pathIcon32 . 'update.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_REPORT,
-    'link'  => 'admin/admin_report.php',
-    'icon'  => $pathIcon32 . 'content.png'
+	'title' => _MI_NEWBB_ADMENU_REPORT,
+	'link'  => 'admin/admin_report.php',
+	'icon'  => $pathIcon32 . 'content.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_DIGEST,
-    'link'  => 'admin/admin_digest.php',
-    'icon'  => $pathIcon32 . 'digest.png'
+	'title' => _MI_NEWBB_ADMENU_DIGEST,
+	'link'  => 'admin/admin_digest.php',
+	'icon'  => $pathIcon32 . 'digest.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_VOTE,
-    'link'  => 'admin/admin_votedata.php',
-    'icon'  => $pathIcon32 . 'button_ok.png'
+	'title' => _MI_NEWBB_ADMENU_VOTE,
+	'link'  => 'admin/admin_votedata.php',
+	'icon'  => $pathIcon32 . 'button_ok.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_TYPE,
-    'link'  => 'admin/admin_type_manager.php',
-    'icon'  => $pathIcon32 . 'type.png'
+	'title' => _MI_NEWBB_ADMENU_TYPE,
+	'link'  => 'admin/admin_type_manager.php',
+	'icon'  => $pathIcon32 . 'type.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_GROUPMOD,
-    'link'  => 'admin/admin_groupmod.php',
-    'icon'  => $pathIcon32 . 'groupmod.png'
+	'title' => _MI_NEWBB_ADMENU_GROUPMOD,
+	'link'  => 'admin/admin_groupmod.php',
+	'icon'  => $pathIcon32 . 'groupmod.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_SYNC,
-    'link'  => 'admin/admin_synchronization.php',
-    'icon'  => $pathIcon32 . 'synchronized.png'
+	'title' => _MI_NEWBB_ADMENU_SYNC,
+	'link'  => 'admin/admin_synchronization.php',
+	'icon'  => $pathIcon32 . 'synchronized.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_MIGRATE,
-    'link'  => 'admin/migrate.php',
-    'icon'  => $pathIcon32 . 'database_go.png'
+	'title' => _MI_NEWBB_ADMENU_MIGRATE,
+	'link'  => 'admin/migrate.php',
+	'icon'  => $pathIcon32 . 'database_go.png'
 ];
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_ABOUT,
-    'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . 'about.png'
+	'title' => _MI_NEWBB_ADMENU_ABOUT,
+	'link'  => 'admin/about.php',
+	'icon'  => $pathIcon32 . 'about.png'
 ];

Spacing +14 added lines, -14 removed lines

@@ -41,82 +41,82 @@
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_INDEX,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . 'home.png'
+    'icon'  => $pathIcon32.'home.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_CATEGORY,
     'link'  => 'admin/admin_cat_manager.php',
-    'icon'  => $pathIcon32 . 'category.png'
+    'icon'  => $pathIcon32.'category.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_FORUM,
     'link'  => 'admin/admin_forum_manager.php',
-    'icon'  => $pathIcon32 . 'forums.png'
+    'icon'  => $pathIcon32.'forums.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_PERMISSION,
     'link'  => 'admin/admin_permissions.php',
-    'icon'  => $pathIcon32 . 'permissions.png'
+    'icon'  => $pathIcon32.'permissions.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_ORDER,
     'link'  => 'admin/admin_forum_reorder.php',
-    'icon'  => $pathIcon32 . 'compfile.png'
+    'icon'  => $pathIcon32.'compfile.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_PRUNE,
     'link'  => 'admin/admin_forum_prune.php',
-    'icon'  => $pathIcon32 . 'update.png'
+    'icon'  => $pathIcon32.'update.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_REPORT,
     'link'  => 'admin/admin_report.php',
-    'icon'  => $pathIcon32 . 'content.png'
+    'icon'  => $pathIcon32.'content.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_DIGEST,
     'link'  => 'admin/admin_digest.php',
-    'icon'  => $pathIcon32 . 'digest.png'
+    'icon'  => $pathIcon32.'digest.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_VOTE,
     'link'  => 'admin/admin_votedata.php',
-    'icon'  => $pathIcon32 . 'button_ok.png'
+    'icon'  => $pathIcon32.'button_ok.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_TYPE,
     'link'  => 'admin/admin_type_manager.php',
-    'icon'  => $pathIcon32 . 'type.png'
+    'icon'  => $pathIcon32.'type.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_GROUPMOD,
     'link'  => 'admin/admin_groupmod.php',
-    'icon'  => $pathIcon32 . 'groupmod.png'
+    'icon'  => $pathIcon32.'groupmod.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_SYNC,
     'link'  => 'admin/admin_synchronization.php',
-    'icon'  => $pathIcon32 . 'synchronized.png'
+    'icon'  => $pathIcon32.'synchronized.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_MIGRATE,
     'link'  => 'admin/migrate.php',
-    'icon'  => $pathIcon32 . 'database_go.png'
+    'icon'  => $pathIcon32.'database_go.png'
 ];
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . 'about.png'
+    'icon'  => $pathIcon32.'about.png'
 ];

admin/index.php

Indentation +61 added lines, -61 removed lines

@@ -49,10 +49,10 @@ 
  */
 function newbb_admin_mkdir($target, $mode = 0777)
 {
-    $target = str_replace('..', '', $target);
+	$target = str_replace('..', '', $target);
 
-    // http://www.php.net/manual/en/function.mkdir.php
-    return is_dir($target) || (newbb_admin_mkdir(dirname($target), $mode) && (!mkdir($target, $mode) && !is_dir($target)));
+	// http://www.php.net/manual/en/function.mkdir.php
+	return is_dir($target) || (newbb_admin_mkdir(dirname($target), $mode) && (!mkdir($target, $mode) && !is_dir($target)));
 }
 
 /**
@@ -62,9 +62,9 @@ 
  */
 function newbb_admin_chmod($target, $mode = 0777)
 {
-    $target = str_replace('..', '', $target);
+	$target = str_replace('..', '', $target);
 
-    return @chmod($target, $mode);
+	return @chmod($target, $mode);
 }
 
 /**
@@ -72,32 +72,32 @@ 
  */
 function newbb_getImageLibs()
 {
-    $imageLibs = [];
-    unset($output, $status);
-    if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-        $path = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
-        @exec($path . 'convert -version', $output, $status);
-        if (empty($status) && !empty($output) && preg_match("/imagemagick[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
-            $imageLibs['imagemagick'] = $matches[0];
-        }
-
-        unset($output, $status);
-    }
-    if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-        $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
-        @exec($path . 'jpegtopnm -version 2>&1', $output, $status);
-        if (empty($status) && !empty($output) && preg_match("/netpbm[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
-            $imageLibs['netpbm'] = $matches[0];
-        }
-        unset($output, $status);
-    }
-
-    if (function_exists('gd_info')) {
-        $tmpInfo         = gd_info();
-        $imageLibs['gd'] = $tmpInfo['GD Version'];
-    }
-
-    return $imageLibs;
+	$imageLibs = [];
+	unset($output, $status);
+	if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
+		$path = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
+		@exec($path . 'convert -version', $output, $status);
+		if (empty($status) && !empty($output) && preg_match("/imagemagick[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
+			$imageLibs['imagemagick'] = $matches[0];
+		}
+
+		unset($output, $status);
+	}
+	if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
+		$path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
+		@exec($path . 'jpegtopnm -version 2>&1', $output, $status);
+		if (empty($status) && !empty($output) && preg_match("/netpbm[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
+			$imageLibs['netpbm'] = $matches[0];
+		}
+		unset($output, $status);
+	}
+
+	if (function_exists('gd_info')) {
+		$tmpInfo         = gd_info();
+		$imageLibs['gd'] = $tmpInfo['GD Version'];
+	}
+
+	return $imageLibs;
 }
 
 xoops_cp_header();
@@ -113,7 +113,7 @@ 
 //XOOPS_POLL
 $xoopspoll = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
 if (is_object($xoopspoll)) {
-    $isOK = $xoopspoll->getVar('isactive');
+	$isOK = $xoopspoll->getVar('isactive');
 }
 // END irmtfan add a poll_module config
 
@@ -121,19 +121,19 @@ 
 $postmaxsize_iniphp = return_bytes(@ini_get('post_max_size'));
 $uploadlimit        = _AM_NEWBB_MEMLIMITTOLARGE;
 if ($postmaxsize_iniphp < $memlimit_iniphp) {
-    $uploadlimit = sprintf(_AM_NEWBB_MEMLIMITOK, return_bytes($postmaxsize_iniphp, true));
+	$uploadlimit = sprintf(_AM_NEWBB_MEMLIMITOK, return_bytes($postmaxsize_iniphp, true));
 }
 
 $adminObject->addInfoBox(_AM_NEWBB_PREFERENCES);
 // START irmtfan better poll module display link and version - check if xoops poll module is available
 if ($isOK) {
-    $pollLink = _AM_NEWBB_AVAILABLE . ': ';
-    $pollLink .= '<a href="' . XOOPS_URL . '/modules/' . $xoopspoll->getVar('dirname') . '/admin/index.php"';
-    $pollLink .= ' alt="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
-    $pollLink .= ' title="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
-    $pollLink .= '>' . '(' . $xoopspoll->getVar('name') . ')</a>';
+	$pollLink = _AM_NEWBB_AVAILABLE . ': ';
+	$pollLink .= '<a href="' . XOOPS_URL . '/modules/' . $xoopspoll->getVar('dirname') . '/admin/index.php"';
+	$pollLink .= ' alt="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
+	$pollLink .= ' title="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
+	$pollLink .= '>' . '(' . $xoopspoll->getVar('name') . ')</a>';
 } else {
-    $pollLink = _AM_NEWBB_NOTAVAILABLE;
+	$pollLink = _AM_NEWBB_NOTAVAILABLE;
 }
 $adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_POLLMODULE . ': %s', $pollLink));
 // END irmtfan better poll module display link and version - check if xoops poll module is available
@@ -153,8 +153,8 @@ 
 $adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PROCESSED . ': %s', $reportHandler->getCount(new \Criteria('report_result', 1))));
 
 foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-    Newbb\Utility::prepareFolder($uploadFolders[$i]);
-    $adminObject->addConfigBoxLine($uploadFolders[$i], 'folder');
+	Newbb\Utility::prepareFolder($uploadFolders[$i]);
+	$adminObject->addConfigBoxLine($uploadFolders[$i], 'folder');
 }
 
 $adminObject->displayNavigation(basename(__FILE__));
@@ -174,24 +174,24 @@ 
  */
 function return_bytes($sizeAsString, $b = false)
 {
-    if (false === $b) {
-        switch (substr($sizeAsString, -1)) {
-            case 'M':
-            case 'm':
-                return (int)$sizeAsString * 1048576;
-            case 'K':
-            case 'k':
-                return (int)$sizeAsString * 1024;
-            case 'G':
-            case 'g':
-                return (int)$sizeAsString * 1073741824;
-            default:
-                return $sizeAsString;
-        }
-    } else {
-        $base   = log($sizeAsString) / log(1024);
-        $suffix = ['', 'KB', 'MB', 'GB', 'TB'];
-
-        return round(1024 ** ($base - floor($base))) . ' ' . $suffix[(int)floor($base)];
-    }
+	if (false === $b) {
+		switch (substr($sizeAsString, -1)) {
+			case 'M':
+			case 'm':
+				return (int)$sizeAsString * 1048576;
+			case 'K':
+			case 'k':
+				return (int)$sizeAsString * 1024;
+			case 'G':
+			case 'g':
+				return (int)$sizeAsString * 1073741824;
+			default:
+				return $sizeAsString;
+		}
+	} else {
+		$base   = log($sizeAsString) / log(1024);
+		$suffix = ['', 'KB', 'MB', 'GB', 'TB'];
+
+		return round(1024 ** ($base - floor($base))) . ' ' . $suffix[(int)floor($base)];
+	}
 }

class/Common/Breadcrumb.php

Indentation +39 added lines, -39 removed lines

@@ -31,49 +31,49 @@
  */
 class Breadcrumb
 {
-    /** @var string */
-    private $dirname;
+	/** @var string */
+	private $dirname;
 
-    /** @var array */
-    private $bread = [];
+	/** @var array */
+	private $bread = [];
 
-    public function __construct()
-    {
-        $this->dirname = basename(dirname(dirname(__DIR__)));
-    }
+	public function __construct()
+	{
+		$this->dirname = basename(dirname(dirname(__DIR__)));
+	}
 
-    /**
-     * Add link to breadcrumb
-     *
-     * @param string $title
-     * @param string $link
-     */
-    public function addLink($title = '', $link = '')
-    {
-        $this->bread[] = [
-            'link'  => $link,
-            'title' => $title
-        ];
-    }
+	/**
+	 * Add link to breadcrumb
+	 *
+	 * @param string $title
+	 * @param string $link
+	 */
+	public function addLink($title = '', $link = '')
+	{
+		$this->bread[] = [
+			'link'  => $link,
+			'title' => $title
+		];
+	}
 
-    /**
-     * Render Pedigree BreadCrumb
-     *
-     * @return string
-     */
-    public function render()
-    {
-        if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
-            require_once $GLOBALS['xoops']->path('class/theme.php');
-            $GLOBALS['xoTheme'] = new \xos_opal_Theme();
-        }
+	/**
+	 * Render Pedigree BreadCrumb
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		if (!isset($GLOBALS['xoTheme']) || !is_object($GLOBALS['xoTheme'])) {
+			require_once $GLOBALS['xoops']->path('class/theme.php');
+			$GLOBALS['xoTheme'] = new \xos_opal_Theme();
+		}
 
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        $breadcrumbTpl = new \XoopsTpl();
-        $breadcrumbTpl->assign('breadcrumb', $this->bread);
-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
-        unset($breadcrumbTpl);
+		require_once $GLOBALS['xoops']->path('class/template.php');
+		$breadcrumbTpl = new \XoopsTpl();
+		$breadcrumbTpl->assign('breadcrumb', $this->bread);
+		$html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
+		unset($breadcrumbTpl);
 
-        return $html;
-    }
+		return $html;
+	}
 }

class/Common/Configurator.php

Indentation +28 added lines, -28 removed lines

@@ -27,35 +27,35 @@
  */
 class Configurator
 {
-    public $name;
-    public $paths           = [];
-    public $uploadFolders   = [];
-    public $copyBlankFiles  = [];
-    public $copyTestFolders = [];
-    public $templateFolders = [];
-    public $oldFiles        = [];
-    public $oldFolders      = [];
-    public $modCopyright;
+	public $name;
+	public $paths           = [];
+	public $uploadFolders   = [];
+	public $copyBlankFiles  = [];
+	public $copyTestFolders = [];
+	public $templateFolders = [];
+	public $oldFiles        = [];
+	public $oldFolders      = [];
+	public $modCopyright;
 
-    /**
-     * Configurator constructor.
-     */
-    public function __construct()
-    {
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $capsDirName   = strtoupper($moduleDirName);
+	/**
+	 * Configurator constructor.
+	 */
+	public function __construct()
+	{
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		$capsDirName   = strtoupper($moduleDirName);
 
-        require_once  dirname(dirname(__DIR__)) . '/include/config.php';
-        $config = getConfig();
+		require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+		$config = getConfig();
 
-        $this->name            = $config->name;
-        $this->paths           = $config->paths;
-        $this->uploadFolders   = $config->uploadFolders;
-        $this->copyBlankFiles  = $config->copyBlankFiles;
-        $this->copyTestFolders = $config->copyTestFolders;
-        $this->templateFolders = $config->templateFolders;
-        $this->oldFiles        = $config->oldFiles;
-        $this->oldFolders      = $config->oldFolders;
-        $this->modCopyright    = $config->modCopyright;
-    }
+		$this->name            = $config->name;
+		$this->paths           = $config->paths;
+		$this->uploadFolders   = $config->uploadFolders;
+		$this->copyBlankFiles  = $config->copyBlankFiles;
+		$this->copyTestFolders = $config->copyTestFolders;
+		$this->templateFolders = $config->templateFolders;
+		$this->oldFiles        = $config->oldFiles;
+		$this->oldFolders      = $config->oldFolders;
+		$this->modCopyright    = $config->modCopyright;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $moduleDirName = basename(dirname(dirname(__DIR__)));
         $capsDirName   = strtoupper($moduleDirName);
 
-        require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+        require_once  dirname(dirname(__DIR__)).'/include/config.php';
         $config = getConfig();
 
         $this->name            = $config->name;

class/Common/VersionChecks.php

Indentation +54 added lines, -54 removed lines

@@ -17,63 +17,63 @@
  */
 trait VersionChecks
 {
-    /**
-     *
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @param null|string  $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
-    {
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        xoops_loadLanguage('admin', $moduleDirName);
+	/**
+	 *
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule $module
+	 *
+	 * @param null|string  $requiredVer
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
+	{
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		$moduleDirNameUpper   = strtoupper($moduleDirName);
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		xoops_loadLanguage('admin', $moduleDirName);
 
-        //check for minimum XOOPS version
-        $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
-        }
-        $success = true;
+		//check for minimum XOOPS version
+		$currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
+		if (null === $requiredVer) {
+			$requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+		}
+		$success = true;
 
-        if (version_compare($currentVer, $requiredVer, '<')) {
-            $success = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
-        }
+		if (version_compare($currentVer, $requiredVer, '<')) {
+			$success = false;
+			$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     *
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(\XoopsModule $module)
-    {
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
-        xoops_loadLanguage('admin', $module->dirname());
-        // check for minimum PHP version
-        $success = true;
-        $verNum  = PHP_VERSION;
-        $reqVer  = $module->getInfo('min_php');
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
-                $success = false;
-            }
-        }
+	/**
+	 *
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(\XoopsModule $module)
+	{
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		$moduleDirNameUpper   = strtoupper($moduleDirName);
+		xoops_loadLanguage('admin', $module->dirname());
+		// check for minimum PHP version
+		$success = true;
+		$verNum  = PHP_VERSION;
+		$reqVer  = $module->getInfo('min_php');
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
     public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
     {
         $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
+        $moduleDirNameUpper = strtoupper($moduleDirName);
         if (null === $module) {
             $module = \XoopsModule::getByDirname($moduleDirName);
         }
@@ -38,13 +38,13 @@ 
         //check for minimum XOOPS version
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $success = true;
 
         if (version_compare($currentVer, $requiredVer, '<')) {
             $success = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -61,7 +61,7 @@ 
     public static function checkVerPhp(\XoopsModule $module)
     {
         $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
+        $moduleDirNameUpper = strtoupper($moduleDirName);
         xoops_loadLanguage('admin', $module->dirname());
         // check for minimum PHP version
         $success = true;
@@ -69,7 +69,7 @@ 
         $reqVer  = $module->getInfo('min_php');
         if (false !== $reqVer && '' !== $reqVer) {
             if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
                 $success = false;
             }
         }

class/Common/Migrate.php

Indentation +86 added lines, -86 removed lines

@@ -22,96 +22,96 @@
  */
 class Migrate extends \Xmf\Database\Migrate
 {
-    private $renameTables;
+	private $renameTables;
 
-    /**
-     * Migrate constructor.
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function __construct()
-    {   require_once  dirname(dirname(__DIR__)) . '/include/config.php';
-        $config = getConfig();
-        $this->renameTables            = $config->renameTables;
+	/**
+	 * Migrate constructor.
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct()
+	{   require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+		$config = getConfig();
+		$this->renameTables            = $config->renameTables;
 
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        parent::__construct($moduleDirName);
-    }
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		parent::__construct($moduleDirName);
+	}
 
-    /**
-     * change table prefix if needed
-     */
-    private function changePrefix()
-    {
-        foreach ($this->renameTables as $oldName => $newName) {
-            if ($this->tableHandler->useTable($oldName)) {
-                $this->tableHandler->renameTable($oldName, $newName);
-            }
-        }
-    }
+	/**
+	 * change table prefix if needed
+	 */
+	private function changePrefix()
+	{
+		foreach ($this->renameTables as $oldName => $newName) {
+			if ($this->tableHandler->useTable($oldName)) {
+				$this->tableHandler->renameTable($oldName, $newName);
+			}
+		}
+	}
 
-    /**
-     * Change integer IPv4 column to varchar IPv6 capable
-     *
-     * @param string $tableName  table to convert
-     * @param string $columnName column with IP address
-     *
-     * @return void
-     */
-    private function convertIPAddresses($tableName, $columnName)
-    {
-        if ($this->tableHandler->useTable($tableName)) {
-            $attributes = $this->tableHandler->getColumnAttributes($tableName, $columnName);
-            if (false !== strpos($attributes, ' int(')) {
-                if (false === strpos($attributes, 'unsigned')) {
-                    $this->tableHandler->alterColumn($tableName, $columnName, " bigint(16) NOT NULL  DEFAULT '0' ");
-                    $this->tableHandler->update($tableName, [$columnName => "4294967296 + $columnName"], "WHERE $columnName < 0", false);
-                }
-                $this->tableHandler->alterColumn($tableName, $columnName, " varchar(45)  NOT NULL  DEFAULT '' ");
-                $this->tableHandler->update($tableName, [$columnName => "INET_NTOA($columnName)"], '', false);
-            }
-        }
-    }
+	/**
+	 * Change integer IPv4 column to varchar IPv6 capable
+	 *
+	 * @param string $tableName  table to convert
+	 * @param string $columnName column with IP address
+	 *
+	 * @return void
+	 */
+	private function convertIPAddresses($tableName, $columnName)
+	{
+		if ($this->tableHandler->useTable($tableName)) {
+			$attributes = $this->tableHandler->getColumnAttributes($tableName, $columnName);
+			if (false !== strpos($attributes, ' int(')) {
+				if (false === strpos($attributes, 'unsigned')) {
+					$this->tableHandler->alterColumn($tableName, $columnName, " bigint(16) NOT NULL  DEFAULT '0' ");
+					$this->tableHandler->update($tableName, [$columnName => "4294967296 + $columnName"], "WHERE $columnName < 0", false);
+				}
+				$this->tableHandler->alterColumn($tableName, $columnName, " varchar(45)  NOT NULL  DEFAULT '' ");
+				$this->tableHandler->update($tableName, [$columnName => "INET_NTOA($columnName)"], '', false);
+			}
+		}
+	}
 
-    /**
-     * Move do* columns from newbb_posts to newbb_posts_text table
-     *
-     * @return void
-     */
-    private function moveDoColumns()
-    {
-        $tableName    = 'newbb_posts_text';
-        $srcTableName = 'newbb_posts';
-        if (false !== $this->tableHandler->useTable($tableName)
-            && false !== $this->tableHandler->useTable($srcTableName)) {
-            $attributes = $this->tableHandler->getColumnAttributes($tableName, 'dohtml');
-            if (false === $attributes) {
-                $this->synchronizeTable($tableName);
-                $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
-                $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
-                $this->tableHandler->addToQueue($sql);
-            }
-        }
-    }
+	/**
+	 * Move do* columns from newbb_posts to newbb_posts_text table
+	 *
+	 * @return void
+	 */
+	private function moveDoColumns()
+	{
+		$tableName    = 'newbb_posts_text';
+		$srcTableName = 'newbb_posts';
+		if (false !== $this->tableHandler->useTable($tableName)
+			&& false !== $this->tableHandler->useTable($srcTableName)) {
+			$attributes = $this->tableHandler->getColumnAttributes($tableName, 'dohtml');
+			if (false === $attributes) {
+				$this->synchronizeTable($tableName);
+				$updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
+				$joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
+				$sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+				$this->tableHandler->addToQueue($sql);
+			}
+		}
+	}
 
-    /**
-     * Perform any upfront actions before synchronizing the schema
-     *
-     * Some typical uses include
-     *   table and column renames
-     *   data conversions
-     *
-     * @return void
-     */
-    protected function preSyncActions()
-    {
-        // change 'bb' table prefix to 'newbb'
-        $this->changePrefix();
-        // columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
-        $this->moveDoColumns();
-        // Convert IP address columns from int to readable varchar(45) for IPv6
-        $this->convertIPAddresses('newbb_posts', 'poster_ip');
-        $this->convertIPAddresses('newbb_report', 'reporter_ip');
-    }
+	/**
+	 * Perform any upfront actions before synchronizing the schema
+	 *
+	 * Some typical uses include
+	 *   table and column renames
+	 *   data conversions
+	 *
+	 * @return void
+	 */
+	protected function preSyncActions()
+	{
+		// change 'bb' table prefix to 'newbb'
+		$this->changePrefix();
+		// columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
+		$this->moveDoColumns();
+		// Convert IP address columns from int to readable varchar(45) for IPv6
+		$this->convertIPAddresses('newbb_posts', 'poster_ip');
+		$this->convertIPAddresses('newbb_report', 'reporter_ip');
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@ 
      * @throws \InvalidArgumentException
      */
     public function __construct()
-    {   require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+    {   require_once  dirname(dirname(__DIR__)).'/include/config.php';
         $config = getConfig();
-        $this->renameTables            = $config->renameTables;
+        $this->renameTables = $config->renameTables;
 
         $moduleDirName = basename(dirname(dirname(__DIR__)));
         parent::__construct($moduleDirName);
@@ -89,7 +89,7 @@ 
                 $this->synchronizeTable($tableName);
                 $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
                 $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n"."SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n".'  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
                 $this->tableHandler->addToQueue($sql);
             }
         }

class/Post.php

Indentation +668 added lines, -668 removed lines

@@ -43,672 +43,672 @@
  */
 class Post extends \XoopsObject
 {
-    //class Post extends \XoopsObject {
-    private $attachmentArray = [];
-
-    /**
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->initVar('post_id', XOBJ_DTYPE_INT);
-        $this->initVar('topic_id', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('forum_id', XOBJ_DTYPE_INT, 0, true);
-        $this->initVar('post_time', XOBJ_DTYPE_INT, 0, true);
-        //        $this->initVar('poster_ip', XOBJ_DTYPE_INT, 0);
-        $this->initVar('poster_ip', XOBJ_DTYPE_TXTBOX, '');
-        $this->initVar('poster_name', XOBJ_DTYPE_TXTBOX, '');
-        $this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true);
-        $this->initVar('pid', XOBJ_DTYPE_INT, 0);
-        $this->initVar('dohtml', XOBJ_DTYPE_INT, 0);
-        $this->initVar('dosmiley', XOBJ_DTYPE_INT, 1);
-        $this->initVar('doxcode', XOBJ_DTYPE_INT, 1);
-        $this->initVar('doimage', XOBJ_DTYPE_INT, 1);
-        $this->initVar('dobr', XOBJ_DTYPE_INT, 1);
-        $this->initVar('uid', XOBJ_DTYPE_INT, 1);
-        $this->initVar('icon', XOBJ_DTYPE_TXTBOX, '');
-        $this->initVar('attachsig', XOBJ_DTYPE_INT, 0);
-        $this->initVar('approved', XOBJ_DTYPE_INT, 1);
-        $this->initVar('post_karma', XOBJ_DTYPE_INT, 0);
-        $this->initVar('require_reply', XOBJ_DTYPE_INT, 0);
-        $this->initVar('attachment', XOBJ_DTYPE_TXTAREA, '');
-        $this->initVar('post_text', XOBJ_DTYPE_TXTAREA, '');
-        $this->initVar('post_edit', XOBJ_DTYPE_TXTAREA, '');
-    }
-
-    // ////////////////////////////////////////////////////////////////////////////////////
-    // attachment functions    TODO: there should be a file/attachment management class
-    /**
-     * @return array|mixed|null
-     */
-    public function getAttachment()
-    {
-        if (count($this->attachmentArray)) {
-            return $this->attachmentArray;
-        }
-        $attachment = $this->getVar('attachment');
-        if (empty($attachment)) {
-            $this->attachmentArray = [];
-        } else {
-            $this->attachmentArray = @unserialize(base64_decode($attachment));
-        }
-
-        return $this->attachmentArray;
-    }
-
-    /**
-     * @param $attachKey
-     * @return bool
-     */
-    public function incrementDownload($attachKey)
-    {
-        if (!$attachKey) {
-            return false;
-        }
-        $this->attachmentArray[(string)$attachKey]['numDownload']++;
-
-        return $this->attachmentArray[(string)$attachKey]['numDownload'];
-    }
-
-    /**
-     * @return bool
-     */
-    public function saveAttachment()
-    {
-        $attachmentSave = '';
-        if (is_array($this->attachmentArray) && count($this->attachmentArray) > 0) {
-            $attachmentSave = base64_encode(serialize($this->attachmentArray));
-        }
-        $this->setVar('attachment', $attachmentSave);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachmentSave) . ' WHERE post_id = ' . $this->getVar('post_id');
-        if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            //xoops_error($GLOBALS['xoopsDB']->error());
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * @param  array|null $attachArray
-     * @return bool
-     */
-    public function deleteAttachment($attachArray = null)
-    {
-        $attachOld = $this->getAttachment();
-        if (!is_array($attachOld) || count($attachOld) < 1) {
-            return true;
-        }
-        $this->attachmentArray = [];
-
-        if (null === $attachArray) {
-            $attachArray = array_keys($attachOld);
-        } // to delete all!
-        if (!is_array($attachArray)) {
-            $attachArray = [$attachArray];
-        }
-
-        foreach ($attachOld as $key => $attach) {
-            if (in_array($key, $attachArray)) {
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']));
-                @unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/thumbs/' . $attach['name_saved'])); // delete thumbnails
-                continue;
-            }
-            $this->attachmentArray[$key] = $attach;
-        }
-        $attachmentSave = '';
-        if (is_array($this->attachmentArray) && count($this->attachmentArray) > 0) {
-            $attachmentSave = base64_encode(serialize($this->attachmentArray));
-        }
-        $this->setVar('attachment', $attachmentSave);
-
-        return true;
-    }
-
-    /**
-     * @param  string $name_saved
-     * @param  string $nameDisplay
-     * @param  string $mimetype
-     * @param  int    $numDownload
-     * @return bool
-     */
-    public function setAttachment($name_saved = '', $nameDisplay = '', $mimetype = '', $numDownload = 0)
-    {
-        static $counter = 0;
-        $this->attachmentArray = $this->getAttachment();
-        if ($name_saved) {
-            $key                         = (string)(time() + $counter++);
-            $this->attachmentArray[$key] = [
-                'name_saved'  => $name_saved,
-                'nameDisplay' => empty($nameDisplay) ? $nameDisplay : $name_saved,
-                'mimetype'    => $mimetype,
-                'numDownload' => empty($numDownload) ? (int)$numDownload : 0
-            ];
-        }
-        $attachmentSave = null;
-        if (is_array($this->attachmentArray)) {
-            $attachmentSave = base64_encode(serialize($this->attachmentArray));
-        }
-        $this->setVar('attachment', $attachmentSave);
-
-        return true;
-    }
-
-    /**
-     * TODO: refactor
-     * @param  bool $asSource
-     * @return string
-     */
-    public function displayAttachment($asSource = false)
-    {
-        global $xoopsModule;
-
-        $post_attachment = '';
-        $attachments     = $this->getAttachment();
-        if (is_array($attachments) && count($attachments) > 0) {
-            $iconHandler = newbbGetIconHandler();
-            $mime_path   = $iconHandler->getPath('mime');
-            require_once dirname(__DIR__) . '/include/functions.image.php';
-            $image_extensions = ['jpg', 'jpeg', 'gif', 'png', 'bmp']; // need improve !!!
-            $post_attachment  .= '<br><strong>' . _MD_NEWBB_ATTACHMENT . '</strong>:';
-            $post_attachment  .= '<br><hr size="1" noshade="noshade" /><br>';
-            foreach ($attachments as $key => $att) {
-                $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
-                $filetype       = $file_extension;
-                if (file_exists($GLOBALS['xoops']->path($mime_path . '/' . $filetype . '.gif'))) {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
-                } else {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
-                }
-                $file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $att['name_saved']));
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
-                if (in_array(strtolower($file_extension), $image_extensions)
-                    && $GLOBALS['xoopsModuleConfig']['media_allowed']) {
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '" /><strong>&nbsp; ' . $att['nameDisplay'] . '</strong> <small>(' . $file_size . ')</small>';
-                    $post_attachment .= '<br>' . newbbAttachmentImage($att['name_saved']);
-                    $isDisplayed     = true;
-                } else {
-                    if (empty($GLOBALS['xoopsModuleConfig']['show_userattach'])) {
-                        $post_attachment .= '<a href="'
-                                            . XOOPS_URL
-                                            . '/modules/'
-                                            . $xoopsModule->getVar('dirname', 'n')
-                                            . '/dl_attachment.php?attachid='
-                                            . $key
-                                            . '&amp;post_id='
-                                            . $this->getVar('post_id')
-                                            . '"> <img src="'
-                                            . $icon_filetype
-                                            . '" alt="'
-                                            . $filetype
-                                            . '" /> '
-                                            . $att['nameDisplay']
-                                            . '</a> '
-                                            . _MD_NEWBB_FILESIZE
-                                            . ': '
-                                            . $file_size
-                                            . '; '
-                                            . _MD_NEWBB_HITS
-                                            . ': '
-                                            . $att['numDownload'];
-                    } elseif ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->uid() > 0
-                              && $GLOBALS['xoopsUser']->isactive()) {
-                        $post_attachment .= '<a href="'
-                                            . XOOPS_URL
-                                            . '/modules/'
-                                            . $xoopsModule->getVar('dirname', 'n')
-                                            . '/dl_attachment.php?attachid='
-                                            . $key
-                                            . '&amp;post_id='
-                                            . $this->getVar('post_id')
-                                            . '"> <img src="'
-                                            . $icon_filetype
-                                            . '" alt="'
-                                            . $filetype
-                                            . '" /> '
-                                            . $att['nameDisplay']
-                                            . '</a> '
-                                            . _MD_NEWBB_FILESIZE
-                                            . ': '
-                                            . $file_size
-                                            . '; '
-                                            . _MD_NEWBB_HITS
-                                            . ': '
-                                            . $att['numDownload'];
-                    } else {
-                        $post_attachment .= _MD_NEWBB_SEENOTGUEST;
-                    }
-                }
-                $post_attachment .= '<br>';
-            }
-        }
-
-        return $post_attachment;
-    }
-    // attachment functions
-    // ////////////////////////////////////////////////////////////////////////////////////
-
-    /**
-     * @param  string $poster_name
-     * @param  string $post_editmsg
-     * @return bool
-     */
-    public function setPostEdit($poster_name = '', $post_editmsg = '')
-    {
-        $edit_user = '';
-        if (empty($GLOBALS['xoopsModuleConfig']['recordedit_timelimit'])
-            || (time() - $this->getVar('post_time')) < $GLOBALS['xoopsModuleConfig']['recordedit_timelimit'] * 60
-            || $this->getVar('approved') < 1) {
-            return true;
-        }
-        if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isActive()) {
-            if ($GLOBALS['xoopsModuleConfig']['show_realname'] && $GLOBALS['xoopsUser']->getVar('name')) {
-                $edit_user = $GLOBALS['xoopsUser']->getVar('name');
-            } else {
-                $edit_user = $GLOBALS['xoopsUser']->getVar('uname');
-            }
-        }
-        $post_edit              = [];
-        $post_edit['edit_user'] = $edit_user; // (?) The proper way is to store uid instead of name.
-        // However, to save queries when displaying, the current way is ok.
-        $post_edit['edit_time'] = time();
-        $post_edit['edit_msg']  = $post_editmsg;
-
-        $post_edits = $this->getVar('post_edit');
-        if (!empty($post_edits)) {
-            $post_edits = unserialize(base64_decode($post_edits));
-        }
-        if (!is_array($post_edits)) {
-            $post_edits = [];
-        }
-        $post_edits[] = $post_edit;
-        $post_edit    = base64_encode(serialize($post_edits));
-        unset($post_edits);
-        $this->setVar('post_edit', $post_edit);
-
-        return true;
-    }
-
-    /**
-     * @return bool|string
-     */
-    public function displayPostEdit()
-    {
-        global $myts;
-
-        if (empty($GLOBALS['xoopsModuleConfig']['recordedit_timelimit'])) {
-            return false;
-        }
-
-        $post_edit  = '';
-        $post_edits = $this->getVar('post_edit');
-        if (!empty($post_edits)) {
-            $post_edits = unserialize(base64_decode($post_edits));
-        }
-        if (!isset($post_edits) || !is_array($post_edits)) {
-            $post_edits = [];
-        }
-        if (is_array($post_edits) && count($post_edits) > 0) {
-            foreach ($post_edits as $postedit) {
-                $edit_time = (int)$postedit['edit_time'];
-                $edit_user = $postedit['edit_user'];
-                $edit_msg  = !empty($postedit['edit_msg']) ? $postedit['edit_msg'] : '';
-                // Start irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
-                if (empty($GLOBALS['xoopsModuleConfig']['do_latestedit'])) {
-                    $post_edit = '';
-                }
-                // End irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
-                // START hacked by irmtfan
-                // display/save all edit records.
-                $post_edit .= _MD_NEWBB_EDITEDBY . ' ' . $edit_user . ' ' . _MD_NEWBB_ON . ' ' . formatTimestamp($edit_time) . '<br>';
-                // if reason is not empty
-                if ('' !== $edit_msg) {
-                    $post_edit .= _MD_NEWBB_EDITEDMSG . ' ' . $edit_msg . '<br>';
-                }
-                // START hacked by irmtfan
-            }
-        }
-
-        return $post_edit;
-    }
-
-    /**
-     * @return array
-     */
-    public function &getPostBody()
-    {
-        global $viewtopic_users;
-        $newbbConfig = newbbLoadConfig();
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-
-        $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
-        /** @var KarmaHandler $karmaHandler */
-        $karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
-        $user_karma   = $karmaHandler->getUserKarma();
-
-        $post               = [];
-        $post['attachment'] = false;
-        $post_text          = newbbDisplayTarea($this->vars['post_text']['value'], $this->getVar('dohtml'), $this->getVar('dosmiley'), $this->getVar('doxcode'), $this->getVar('doimage'), $this->getVar('dobr'));
-        if (newbbIsAdmin($this->getVar('forum_id')) || $this->checkIdentity()) {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
-        } elseif ($newbbConfig['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
-            $post['text'] = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma'));
-        } elseif ($newbbConfig['allow_require_reply'] && $this->getVar('require_reply')
-                  && (!$uid || !isset($viewtopic_users[$uid]))) {
-            $post['text'] = _MD_NEWBB_REPLY_REQUIREMENT;
-        } else {
-            $post['text'] = $post_text . '<br>' . $this->displayAttachment();
-        }
-        /** @var \XoopsMemberHandler $memberHandler */
-        $memberHandler = xoops_getHandler('member');
-        $eachposter    = $memberHandler->getUser($this->getVar('uid'));
-        if (is_object($eachposter) && $eachposter->isActive()) {
-            if ($newbbConfig['show_realname'] && $eachposter->getVar('name')) {
-                $post['author'] = $eachposter->getVar('name');
-            } else {
-                $post['author'] = $eachposter->getVar('uname');
-            }
-            unset($eachposter);
-        } else {
-            $post['author'] = $this->getVar('poster_name') ?: $GLOBALS['xoopsConfig']['anonymous'];
-        }
-
-        $post['subject'] = newbbHtmlspecialchars($this->vars['subject']['value']);
-
-        $post['date'] = $this->getVar('post_time');
-
-        return $post;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isTopic()
-    {
-        return !$this->getVar('pid');
-    }
-
-    /**
-     * @param  string $action_tag
-     * @return bool
-     */
-    public function checkTimelimit($action_tag = 'edit_timelimit')
-    {
-        $newbbConfig = newbbLoadConfig();
-        if (empty($newbbConfig['edit_timelimit'])) {
-            return true;
-        }
-
-        return ($this->getVar('post_time') > time() - $newbbConfig[$action_tag] * 60);
-    }
-
-    /**
-     * @param  int $uid
-     * @return bool
-     */
-    public function checkIdentity($uid = -1)
-    {
-        $uid = ($uid > -1) ? $uid : (is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0);
-        if ($this->getVar('uid') > 0) {
-            $user_ok = ($uid == $this->getVar('uid'));
-        } else {
-            static $user_ip;
-            if (!isset($user_ip)) {
-                $user_ip = \Xmf\IPAddress::fromRequest()->asReadable();
-            }
-            $user_ok = ($user_ip == $this->getVar('poster_ip'));
-        }
-
-        return $user_ok;
-    }
-
-    // TODO: cleaning up and merge with post hanldings in viewpost.php
-
-    /**
-     * @param $isAdmin
-     * @return array
-     */
-    public function showPost($isAdmin)
-    {
-        global $xoopsModule, $myts;
-        global $forumUrl, $forumImage, $forumObject, $online, $viewmode;
-        global $viewtopic_users, $viewtopic_posters, $topicObject, $user_karma;
-        global $order, $start, $total_posts, $topic_status;
-        static $post_NO = 0;
-        static $name_anonymous;
-        /** @var TopicHandler $topicHandler */
-        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        if (null === $name_anonymous) {
-            $name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
-        }
-
-        require_once  dirname(__DIR__) . '/include/functions.time.php';
-        require_once  dirname(__DIR__) . '/include/functions.render.php';
-
-        $post_id  = $this->getVar('post_id');
-        $topic_id = $this->getVar('topic_id');
-        $forum_id = $this->getVar('forum_id');
-
-        $query_vars              = ['status', 'order', 'start', 'mode', 'viewmode'];
-        $query_array             = [];
-        $query_array['topic_id'] = "topic_id={$topic_id}";
-        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);
-
-        $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
-
-        ++$post_NO;
-        if ('desc' === strtolower($order)) {
-            $post_no = $total_posts - ($start + $post_NO) + 1;
-        } else {
-            $post_no = $start + $post_NO;
-        }
-
-        if ($isAdmin || $this->checkIdentity()) {
-            $post_text       = $this->getVar('post_text');
-            $post_attachment = $this->displayAttachment();
-        } elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
-            $post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')) . '</div>';
-            $post_attachment = '';
-        } elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $this->getVar('require_reply')
-                  && (!$uid || !in_array($uid, $viewtopic_posters))) {
-            $post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
-            $post_attachment = '';
-        } else {
-            $post_text       = $this->getVar('post_text');
-            $post_attachment = $this->displayAttachment();
-        }
-
-        // Hightlight search words
-        $post_title = $this->getVar('subject');
-        if ($keywords = Request::getString('keywords', '', 'GET')) {
-            //$keywords   = $myts->htmlSpecialChars(trim(urldecode(Request::getString('keywords', '', 'GET'))));
-            $post_text  = Highlighter::apply($keywords, $post_text, '<mark>', '</mark>');
-            $post_title = Highlighter::apply($keywords, $post_title, '<mark>', '</mark>');
-        }
-
-        if (isset($viewtopic_users[$this->getVar('uid')])) {
-            $poster = $viewtopic_users[$this->getVar('uid')];
-        } else {
-            $name   = ($post_name = $this->getVar('poster_name')) ? $post_name : $name_anonymous;
-            $poster = [
-                'poster_uid' => 0,
-                'name'       => $name,
-                'link'       => $name
-            ];
-        }
-
-        if ($posticon = $this->getVar('icon')) {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/subject/' . $posticon . '" alt="" /></a>';
-        } else {
-            $post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/icons/posticon.gif" alt="" /></a>';
-        }
-
-        $thread_buttons = [];
-        $mod_buttons    = [];
-
-        if ($isAdmin && ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->getVar('uid') !== $this->getVar('uid'))
-            && $this->getVar('uid') > 0) {
-            $mod_buttons['bann']['image']    = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $mod_buttons['bann']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
-            $mod_buttons['bann']['name']     = _MD_NEWBB_SUSPEND_MANAGEMENT;
-            $thread_buttons['bann']['image'] = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
-            $thread_buttons['bann']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
-            $thread_buttons['bann']['name']  = _MD_NEWBB_SUSPEND_MANAGEMENT;
-        }
-
-        if ($GLOBALS['xoopsModuleConfig']['enable_permcheck']) {
-            //            /** @var TopicHandler $topicHandler */
-            //            $topicHandler =  Newbb\Helper::getInstance()->getHandler('Topic');
-            $topic_status = $topicObject->getVar('topic_status');
-            if ($topicHandler->getPermission($forum_id, $topic_status, 'edit')) {
-                $edit_ok = ($isAdmin || ($this->checkIdentity() && $this->checkTimelimit('edit_timelimit')));
-
-                if ($edit_ok) {
-                    $thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-                    $thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
-                    $thread_buttons['edit']['name']  = _EDIT;
-                    $mod_buttons['edit']['image']    = newbbDisplayImage('p_edit', _EDIT);
-                    $mod_buttons['edit']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
-                    $mod_buttons['edit']['name']     = _EDIT;
-                }
-            }
-
-            if ($topicHandler->getPermission($forum_id, $topic_status, 'delete')) {
-                $delete_ok = ($isAdmin || ($this->checkIdentity() && $this->checkTimelimit('delete_timelimit')));
-
-                if ($delete_ok) {
-                    $thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-                    $thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
-                    $thread_buttons['delete']['name']  = _DELETE;
-                    $mod_buttons['delete']['image']    = newbbDisplayImage('p_delete', _DELETE);
-                    $mod_buttons['delete']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
-                    $mod_buttons['delete']['name']     = _DELETE;
-                }
-            }
-            if ($topicHandler->getPermission($forum_id, $topic_status, 'reply')) {
-                $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-                $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
-                $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?{$page_query}&amp;quotedac=1";
-                $thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
-            }
-        } else {
-            $mod_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
-            $mod_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
-            $mod_buttons['edit']['name']  = _EDIT;
-
-            $mod_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
-            $mod_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
-            $mod_buttons['delete']['name']  = _DELETE;
-
-            $thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
-            $thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
-            $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?{$page_query}";
-            $thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
-        }
-
-        $thread_action = [];
-        // irmtfan add pdf permission
-        if (file_exists(XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
-            && $topicHandler->getPermission($forum_id, $topic_status, 'pdf')) {
-            $thread_action['pdf']['image']  = newbbDisplayImage('pdf', _MD_NEWBB_PDF);
-            $thread_action['pdf']['link']   = XOOPS_URL . '/modules/newbb/makepdf.php?type=post&amp;pageid=0';
-            $thread_action['pdf']['name']   = _MD_NEWBB_PDF;
-            $thread_action['pdf']['target'] = '_blank';
-        }
-        // irmtfan add print permission
-        if ($topicHandler->getPermission($forum_id, $topic_status, 'print')) {
-            $thread_action['print']['image']  = newbbDisplayImage('printer', _MD_NEWBB_PRINT);
-            $thread_action['print']['link']   = XOOPS_URL . '/modules/newbb/print.php?form=2&amp;forum=' . $forum_id . '&amp;topic_id=' . $topic_id;
-            $thread_action['print']['name']   = _MD_NEWBB_PRINT;
-            $thread_action['print']['target'] = '_blank';
-        }
-
-        if ($GLOBALS['xoopsModuleConfig']['show_sociallinks']) {
-            $full_title  = $this->getVar('subject');
-            $clean_title = preg_replace('/[^A-Za-z0-9-]+/', '+', $this->getVar('subject'));
-            $full_link   = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
-
-            $thread_action['social_twitter']['image']  = newbbDisplayImage('twitter', _MD_NEWBB_SHARE_TWITTER);
-            $thread_action['social_twitter']['link']   = 'http://twitter.com/share?text=' . $clean_title . '&amp;url=' . $full_link;
-            $thread_action['social_twitter']['name']   = _MD_NEWBB_SHARE_TWITTER;
-            $thread_action['social_twitter']['target'] = '_blank';
-
-            $thread_action['social_facebook']['image']  = newbbDisplayImage('facebook', _MD_NEWBB_SHARE_FACEBOOK);
-            $thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u=' . $full_link;
-            $thread_action['social_facebook']['name']   = _MD_NEWBB_SHARE_FACEBOOK;
-            $thread_action['social_facebook']['target'] = '_blank';
-
-            $thread_action['social_gplus']['image']  = newbbDisplayImage('googleplus', _MD_NEWBB_SHARE_GOOGLEPLUS);
-            $thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url=' . $full_link;
-            $thread_action['social_gplus']['name']   = _MD_NEWBB_SHARE_GOOGLEPLUS;
-            $thread_action['social_gplus']['target'] = '_blank';
-
-            $thread_action['social_linkedin']['image']  = newbbDisplayImage('linkedin', _MD_NEWBB_SHARE_LINKEDIN);
-            $thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title=' . $full_title . '&amp;url=' . $full_link;
-            $thread_action['social_linkedin']['name']   = _MD_NEWBB_SHARE_LINKEDIN;
-            $thread_action['social_linkedin']['target'] = '_blank';
-
-            $thread_action['social_delicious']['image']  = newbbDisplayImage('delicious', _MD_NEWBB_SHARE_DELICIOUS);
-            $thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title=' . $full_title . '&amp;url=' . $full_link;
-            $thread_action['social_delicious']['name']   = _MD_NEWBB_SHARE_DELICIOUS;
-            $thread_action['social_delicious']['target'] = '_blank';
-
-            $thread_action['social_digg']['image']  = newbbDisplayImage('digg', _MD_NEWBB_SHARE_DIGG);
-            $thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title=' . $full_title . '&amp;url=' . $full_link;
-            $thread_action['social_digg']['name']   = _MD_NEWBB_SHARE_DIGG;
-            $thread_action['social_digg']['target'] = '_blank';
-
-            $thread_action['social_reddit']['image']  = newbbDisplayImage('reddit', _MD_NEWBB_SHARE_REDDIT);
-            $thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title=' . $full_title . '&amp;url=' . $full_link;
-            $thread_action['social_reddit']['name']   = _MD_NEWBB_SHARE_REDDIT;
-            $thread_action['social_reddit']['target'] = '_blank';
-
-            $thread_action['social_wong']['image']  = newbbDisplayImage('wong', _MD_NEWBB_SHARE_MRWONG);
-            $thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url=' . $full_link;
-            $thread_action['social_wong']['name']   = _MD_NEWBB_SHARE_MRWONG;
-            $thread_action['social_wong']['target'] = '_blank';
-        }
-
-        $post = [
-            'post_id'         => $post_id,
-            'post_parent_id'  => $this->getVar('pid'),
-            'post_date'       => newbbFormatTimestamp($this->getVar('post_time')),
-            'post_image'      => $post_image,
-            'post_title'      => $post_title,
-            // irmtfan $post_title to add highlight keywords
-            'post_text'       => $post_text,
-            'post_attachment' => $post_attachment,
-            'post_edit'       => $this->displayPostEdit(),
-            'post_no'         => $post_no,
-            'post_signature'  => $this->getVar('attachsig') ? @$poster['signature'] : '',
-            //            'poster_ip'       => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? long2ip($this->getVar('poster_ip')) : '',
-            'poster_ip'       => ($isAdmin
-                                  && $GLOBALS['xoopsModuleConfig']['show_ip']) ? $this->getVar('poster_ip') : '',
-            'thread_action'   => $thread_action,
-            'thread_buttons'  => $thread_buttons,
-            'mod_buttons'     => $mod_buttons,
-            'poster'          => $poster,
-            'post_permalink'  => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '"></a>'
-        ];
-
-        unset($thread_buttons, $mod_buttons, $eachposter);
-
-        return $post;
-    }
+	//class Post extends \XoopsObject {
+	private $attachmentArray = [];
+
+	/**
+	 *
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->initVar('post_id', XOBJ_DTYPE_INT);
+		$this->initVar('topic_id', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('forum_id', XOBJ_DTYPE_INT, 0, true);
+		$this->initVar('post_time', XOBJ_DTYPE_INT, 0, true);
+		//        $this->initVar('poster_ip', XOBJ_DTYPE_INT, 0);
+		$this->initVar('poster_ip', XOBJ_DTYPE_TXTBOX, '');
+		$this->initVar('poster_name', XOBJ_DTYPE_TXTBOX, '');
+		$this->initVar('subject', XOBJ_DTYPE_TXTBOX, '', true);
+		$this->initVar('pid', XOBJ_DTYPE_INT, 0);
+		$this->initVar('dohtml', XOBJ_DTYPE_INT, 0);
+		$this->initVar('dosmiley', XOBJ_DTYPE_INT, 1);
+		$this->initVar('doxcode', XOBJ_DTYPE_INT, 1);
+		$this->initVar('doimage', XOBJ_DTYPE_INT, 1);
+		$this->initVar('dobr', XOBJ_DTYPE_INT, 1);
+		$this->initVar('uid', XOBJ_DTYPE_INT, 1);
+		$this->initVar('icon', XOBJ_DTYPE_TXTBOX, '');
+		$this->initVar('attachsig', XOBJ_DTYPE_INT, 0);
+		$this->initVar('approved', XOBJ_DTYPE_INT, 1);
+		$this->initVar('post_karma', XOBJ_DTYPE_INT, 0);
+		$this->initVar('require_reply', XOBJ_DTYPE_INT, 0);
+		$this->initVar('attachment', XOBJ_DTYPE_TXTAREA, '');
+		$this->initVar('post_text', XOBJ_DTYPE_TXTAREA, '');
+		$this->initVar('post_edit', XOBJ_DTYPE_TXTAREA, '');
+	}
+
+	// ////////////////////////////////////////////////////////////////////////////////////
+	// attachment functions    TODO: there should be a file/attachment management class
+	/**
+	 * @return array|mixed|null
+	 */
+	public function getAttachment()
+	{
+		if (count($this->attachmentArray)) {
+			return $this->attachmentArray;
+		}
+		$attachment = $this->getVar('attachment');
+		if (empty($attachment)) {
+			$this->attachmentArray = [];
+		} else {
+			$this->attachmentArray = @unserialize(base64_decode($attachment));
+		}
+
+		return $this->attachmentArray;
+	}
+
+	/**
+	 * @param $attachKey
+	 * @return bool
+	 */
+	public function incrementDownload($attachKey)
+	{
+		if (!$attachKey) {
+			return false;
+		}
+		$this->attachmentArray[(string)$attachKey]['numDownload']++;
+
+		return $this->attachmentArray[(string)$attachKey]['numDownload'];
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function saveAttachment()
+	{
+		$attachmentSave = '';
+		if (is_array($this->attachmentArray) && count($this->attachmentArray) > 0) {
+			$attachmentSave = base64_encode(serialize($this->attachmentArray));
+		}
+		$this->setVar('attachment', $attachmentSave);
+		$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachmentSave) . ' WHERE post_id = ' . $this->getVar('post_id');
+		if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
+			//xoops_error($GLOBALS['xoopsDB']->error());
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param  array|null $attachArray
+	 * @return bool
+	 */
+	public function deleteAttachment($attachArray = null)
+	{
+		$attachOld = $this->getAttachment();
+		if (!is_array($attachOld) || count($attachOld) < 1) {
+			return true;
+		}
+		$this->attachmentArray = [];
+
+		if (null === $attachArray) {
+			$attachArray = array_keys($attachOld);
+		} // to delete all!
+		if (!is_array($attachArray)) {
+			$attachArray = [$attachArray];
+		}
+
+		foreach ($attachOld as $key => $attach) {
+			if (in_array($key, $attachArray)) {
+				@unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attach['name_saved']));
+				@unlink($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/thumbs/' . $attach['name_saved'])); // delete thumbnails
+				continue;
+			}
+			$this->attachmentArray[$key] = $attach;
+		}
+		$attachmentSave = '';
+		if (is_array($this->attachmentArray) && count($this->attachmentArray) > 0) {
+			$attachmentSave = base64_encode(serialize($this->attachmentArray));
+		}
+		$this->setVar('attachment', $attachmentSave);
+
+		return true;
+	}
+
+	/**
+	 * @param  string $name_saved
+	 * @param  string $nameDisplay
+	 * @param  string $mimetype
+	 * @param  int    $numDownload
+	 * @return bool
+	 */
+	public function setAttachment($name_saved = '', $nameDisplay = '', $mimetype = '', $numDownload = 0)
+	{
+		static $counter = 0;
+		$this->attachmentArray = $this->getAttachment();
+		if ($name_saved) {
+			$key                         = (string)(time() + $counter++);
+			$this->attachmentArray[$key] = [
+				'name_saved'  => $name_saved,
+				'nameDisplay' => empty($nameDisplay) ? $nameDisplay : $name_saved,
+				'mimetype'    => $mimetype,
+				'numDownload' => empty($numDownload) ? (int)$numDownload : 0
+			];
+		}
+		$attachmentSave = null;
+		if (is_array($this->attachmentArray)) {
+			$attachmentSave = base64_encode(serialize($this->attachmentArray));
+		}
+		$this->setVar('attachment', $attachmentSave);
+
+		return true;
+	}
+
+	/**
+	 * TODO: refactor
+	 * @param  bool $asSource
+	 * @return string
+	 */
+	public function displayAttachment($asSource = false)
+	{
+		global $xoopsModule;
+
+		$post_attachment = '';
+		$attachments     = $this->getAttachment();
+		if (is_array($attachments) && count($attachments) > 0) {
+			$iconHandler = newbbGetIconHandler();
+			$mime_path   = $iconHandler->getPath('mime');
+			require_once dirname(__DIR__) . '/include/functions.image.php';
+			$image_extensions = ['jpg', 'jpeg', 'gif', 'png', 'bmp']; // need improve !!!
+			$post_attachment  .= '<br><strong>' . _MD_NEWBB_ATTACHMENT . '</strong>:';
+			$post_attachment  .= '<br><hr size="1" noshade="noshade" /><br>';
+			foreach ($attachments as $key => $att) {
+				$file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
+				$filetype       = $file_extension;
+				if (file_exists($GLOBALS['xoops']->path($mime_path . '/' . $filetype . '.gif'))) {
+					$icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
+				} else {
+					$icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
+				}
+				$file_size = @filesize($GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $att['name_saved']));
+				$file_size = number_format($file_size / 1024, 2) . ' KB';
+				if (in_array(strtolower($file_extension), $image_extensions)
+					&& $GLOBALS['xoopsModuleConfig']['media_allowed']) {
+					$post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '" /><strong>&nbsp; ' . $att['nameDisplay'] . '</strong> <small>(' . $file_size . ')</small>';
+					$post_attachment .= '<br>' . newbbAttachmentImage($att['name_saved']);
+					$isDisplayed     = true;
+				} else {
+					if (empty($GLOBALS['xoopsModuleConfig']['show_userattach'])) {
+						$post_attachment .= '<a href="'
+											. XOOPS_URL
+											. '/modules/'
+											. $xoopsModule->getVar('dirname', 'n')
+											. '/dl_attachment.php?attachid='
+											. $key
+											. '&amp;post_id='
+											. $this->getVar('post_id')
+											. '"> <img src="'
+											. $icon_filetype
+											. '" alt="'
+											. $filetype
+											. '" /> '
+											. $att['nameDisplay']
+											. '</a> '
+											. _MD_NEWBB_FILESIZE
+											. ': '
+											. $file_size
+											. '; '
+											. _MD_NEWBB_HITS
+											. ': '
+											. $att['numDownload'];
+					} elseif ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->uid() > 0
+							  && $GLOBALS['xoopsUser']->isactive()) {
+						$post_attachment .= '<a href="'
+											. XOOPS_URL
+											. '/modules/'
+											. $xoopsModule->getVar('dirname', 'n')
+											. '/dl_attachment.php?attachid='
+											. $key
+											. '&amp;post_id='
+											. $this->getVar('post_id')
+											. '"> <img src="'
+											. $icon_filetype
+											. '" alt="'
+											. $filetype
+											. '" /> '
+											. $att['nameDisplay']
+											. '</a> '
+											. _MD_NEWBB_FILESIZE
+											. ': '
+											. $file_size
+											. '; '
+											. _MD_NEWBB_HITS
+											. ': '
+											. $att['numDownload'];
+					} else {
+						$post_attachment .= _MD_NEWBB_SEENOTGUEST;
+					}
+				}
+				$post_attachment .= '<br>';
+			}
+		}
+
+		return $post_attachment;
+	}
+	// attachment functions
+	// ////////////////////////////////////////////////////////////////////////////////////
+
+	/**
+	 * @param  string $poster_name
+	 * @param  string $post_editmsg
+	 * @return bool
+	 */
+	public function setPostEdit($poster_name = '', $post_editmsg = '')
+	{
+		$edit_user = '';
+		if (empty($GLOBALS['xoopsModuleConfig']['recordedit_timelimit'])
+			|| (time() - $this->getVar('post_time')) < $GLOBALS['xoopsModuleConfig']['recordedit_timelimit'] * 60
+			|| $this->getVar('approved') < 1) {
+			return true;
+		}
+		if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsUser']->isActive()) {
+			if ($GLOBALS['xoopsModuleConfig']['show_realname'] && $GLOBALS['xoopsUser']->getVar('name')) {
+				$edit_user = $GLOBALS['xoopsUser']->getVar('name');
+			} else {
+				$edit_user = $GLOBALS['xoopsUser']->getVar('uname');
+			}
+		}
+		$post_edit              = [];
+		$post_edit['edit_user'] = $edit_user; // (?) The proper way is to store uid instead of name.
+		// However, to save queries when displaying, the current way is ok.
+		$post_edit['edit_time'] = time();
+		$post_edit['edit_msg']  = $post_editmsg;
+
+		$post_edits = $this->getVar('post_edit');
+		if (!empty($post_edits)) {
+			$post_edits = unserialize(base64_decode($post_edits));
+		}
+		if (!is_array($post_edits)) {
+			$post_edits = [];
+		}
+		$post_edits[] = $post_edit;
+		$post_edit    = base64_encode(serialize($post_edits));
+		unset($post_edits);
+		$this->setVar('post_edit', $post_edit);
+
+		return true;
+	}
+
+	/**
+	 * @return bool|string
+	 */
+	public function displayPostEdit()
+	{
+		global $myts;
+
+		if (empty($GLOBALS['xoopsModuleConfig']['recordedit_timelimit'])) {
+			return false;
+		}
+
+		$post_edit  = '';
+		$post_edits = $this->getVar('post_edit');
+		if (!empty($post_edits)) {
+			$post_edits = unserialize(base64_decode($post_edits));
+		}
+		if (!isset($post_edits) || !is_array($post_edits)) {
+			$post_edits = [];
+		}
+		if (is_array($post_edits) && count($post_edits) > 0) {
+			foreach ($post_edits as $postedit) {
+				$edit_time = (int)$postedit['edit_time'];
+				$edit_user = $postedit['edit_user'];
+				$edit_msg  = !empty($postedit['edit_msg']) ? $postedit['edit_msg'] : '';
+				// Start irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
+				if (empty($GLOBALS['xoopsModuleConfig']['do_latestedit'])) {
+					$post_edit = '';
+				}
+				// End irmtfan add option to do only the latest edit when do_latestedit=0 (Alfred)
+				// START hacked by irmtfan
+				// display/save all edit records.
+				$post_edit .= _MD_NEWBB_EDITEDBY . ' ' . $edit_user . ' ' . _MD_NEWBB_ON . ' ' . formatTimestamp($edit_time) . '<br>';
+				// if reason is not empty
+				if ('' !== $edit_msg) {
+					$post_edit .= _MD_NEWBB_EDITEDMSG . ' ' . $edit_msg . '<br>';
+				}
+				// START hacked by irmtfan
+			}
+		}
+
+		return $post_edit;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function &getPostBody()
+	{
+		global $viewtopic_users;
+		$newbbConfig = newbbLoadConfig();
+		require_once  dirname(__DIR__) . '/include/functions.user.php';
+		require_once  dirname(__DIR__) . '/include/functions.render.php';
+
+		$uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+		/** @var KarmaHandler $karmaHandler */
+		$karmaHandler = Newbb\Helper::getInstance()->getHandler('Karma');
+		$user_karma   = $karmaHandler->getUserKarma();
+
+		$post               = [];
+		$post['attachment'] = false;
+		$post_text          = newbbDisplayTarea($this->vars['post_text']['value'], $this->getVar('dohtml'), $this->getVar('dosmiley'), $this->getVar('doxcode'), $this->getVar('doimage'), $this->getVar('dobr'));
+		if (newbbIsAdmin($this->getVar('forum_id')) || $this->checkIdentity()) {
+			$post['text'] = $post_text . '<br>' . $this->displayAttachment();
+		} elseif ($newbbConfig['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
+			$post['text'] = sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma'));
+		} elseif ($newbbConfig['allow_require_reply'] && $this->getVar('require_reply')
+				  && (!$uid || !isset($viewtopic_users[$uid]))) {
+			$post['text'] = _MD_NEWBB_REPLY_REQUIREMENT;
+		} else {
+			$post['text'] = $post_text . '<br>' . $this->displayAttachment();
+		}
+		/** @var \XoopsMemberHandler $memberHandler */
+		$memberHandler = xoops_getHandler('member');
+		$eachposter    = $memberHandler->getUser($this->getVar('uid'));
+		if (is_object($eachposter) && $eachposter->isActive()) {
+			if ($newbbConfig['show_realname'] && $eachposter->getVar('name')) {
+				$post['author'] = $eachposter->getVar('name');
+			} else {
+				$post['author'] = $eachposter->getVar('uname');
+			}
+			unset($eachposter);
+		} else {
+			$post['author'] = $this->getVar('poster_name') ?: $GLOBALS['xoopsConfig']['anonymous'];
+		}
+
+		$post['subject'] = newbbHtmlspecialchars($this->vars['subject']['value']);
+
+		$post['date'] = $this->getVar('post_time');
+
+		return $post;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isTopic()
+	{
+		return !$this->getVar('pid');
+	}
+
+	/**
+	 * @param  string $action_tag
+	 * @return bool
+	 */
+	public function checkTimelimit($action_tag = 'edit_timelimit')
+	{
+		$newbbConfig = newbbLoadConfig();
+		if (empty($newbbConfig['edit_timelimit'])) {
+			return true;
+		}
+
+		return ($this->getVar('post_time') > time() - $newbbConfig[$action_tag] * 60);
+	}
+
+	/**
+	 * @param  int $uid
+	 * @return bool
+	 */
+	public function checkIdentity($uid = -1)
+	{
+		$uid = ($uid > -1) ? $uid : (is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0);
+		if ($this->getVar('uid') > 0) {
+			$user_ok = ($uid == $this->getVar('uid'));
+		} else {
+			static $user_ip;
+			if (!isset($user_ip)) {
+				$user_ip = \Xmf\IPAddress::fromRequest()->asReadable();
+			}
+			$user_ok = ($user_ip == $this->getVar('poster_ip'));
+		}
+
+		return $user_ok;
+	}
+
+	// TODO: cleaning up and merge with post hanldings in viewpost.php
+
+	/**
+	 * @param $isAdmin
+	 * @return array
+	 */
+	public function showPost($isAdmin)
+	{
+		global $xoopsModule, $myts;
+		global $forumUrl, $forumImage, $forumObject, $online, $viewmode;
+		global $viewtopic_users, $viewtopic_posters, $topicObject, $user_karma;
+		global $order, $start, $total_posts, $topic_status;
+		static $post_NO = 0;
+		static $name_anonymous;
+		/** @var TopicHandler $topicHandler */
+		$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		if (null === $name_anonymous) {
+			$name_anonymous = $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
+		}
+
+		require_once  dirname(__DIR__) . '/include/functions.time.php';
+		require_once  dirname(__DIR__) . '/include/functions.render.php';
+
+		$post_id  = $this->getVar('post_id');
+		$topic_id = $this->getVar('topic_id');
+		$forum_id = $this->getVar('forum_id');
+
+		$query_vars              = ['status', 'order', 'start', 'mode', 'viewmode'];
+		$query_array             = [];
+		$query_array['topic_id'] = "topic_id={$topic_id}";
+		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);
+
+		$uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
+
+		++$post_NO;
+		if ('desc' === strtolower($order)) {
+			$post_no = $total_posts - ($start + $post_NO) + 1;
+		} else {
+			$post_no = $start + $post_NO;
+		}
+
+		if ($isAdmin || $this->checkIdentity()) {
+			$post_text       = $this->getVar('post_text');
+			$post_attachment = $this->displayAttachment();
+		} elseif ($GLOBALS['xoopsModuleConfig']['enable_karma'] && $this->getVar('post_karma') > $user_karma) {
+			$post_text       = "<div class='karma'>" . sprintf(_MD_NEWBB_KARMA_REQUIREMENT, $user_karma, $this->getVar('post_karma')) . '</div>';
+			$post_attachment = '';
+		} elseif ($GLOBALS['xoopsModuleConfig']['allow_require_reply'] && $this->getVar('require_reply')
+				  && (!$uid || !in_array($uid, $viewtopic_posters))) {
+			$post_text       = "<div class='karma'>" . _MD_NEWBB_REPLY_REQUIREMENT . '</div>';
+			$post_attachment = '';
+		} else {
+			$post_text       = $this->getVar('post_text');
+			$post_attachment = $this->displayAttachment();
+		}
+
+		// Hightlight search words
+		$post_title = $this->getVar('subject');
+		if ($keywords = Request::getString('keywords', '', 'GET')) {
+			//$keywords   = $myts->htmlSpecialChars(trim(urldecode(Request::getString('keywords', '', 'GET'))));
+			$post_text  = Highlighter::apply($keywords, $post_text, '<mark>', '</mark>');
+			$post_title = Highlighter::apply($keywords, $post_title, '<mark>', '</mark>');
+		}
+
+		if (isset($viewtopic_users[$this->getVar('uid')])) {
+			$poster = $viewtopic_users[$this->getVar('uid')];
+		} else {
+			$name   = ($post_name = $this->getVar('poster_name')) ? $post_name : $name_anonymous;
+			$poster = [
+				'poster_uid' => 0,
+				'name'       => $name,
+				'link'       => $name
+			];
+		}
+
+		if ($posticon = $this->getVar('icon')) {
+			$post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/subject/' . $posticon . '" alt="" /></a>';
+		} else {
+			$post_image = '<a name="' . $post_id . '"><img src="' . XOOPS_URL . '/images/icons/posticon.gif" alt="" /></a>';
+		}
+
+		$thread_buttons = [];
+		$mod_buttons    = [];
+
+		if ($isAdmin && ($GLOBALS['xoopsUser'] && $GLOBALS['xoopsUser']->getVar('uid') !== $this->getVar('uid'))
+			&& $this->getVar('uid') > 0) {
+			$mod_buttons['bann']['image']    = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
+			$mod_buttons['bann']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+			$mod_buttons['bann']['name']     = _MD_NEWBB_SUSPEND_MANAGEMENT;
+			$thread_buttons['bann']['image'] = newbbDisplayImage('p_bann', _MD_NEWBB_SUSPEND_MANAGEMENT);
+			$thread_buttons['bann']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/moderate.php?forum=' . $forum_id . '&amp;uid=' . $this->getVar('uid');
+			$thread_buttons['bann']['name']  = _MD_NEWBB_SUSPEND_MANAGEMENT;
+		}
+
+		if ($GLOBALS['xoopsModuleConfig']['enable_permcheck']) {
+			//            /** @var TopicHandler $topicHandler */
+			//            $topicHandler =  Newbb\Helper::getInstance()->getHandler('Topic');
+			$topic_status = $topicObject->getVar('topic_status');
+			if ($topicHandler->getPermission($forum_id, $topic_status, 'edit')) {
+				$edit_ok = ($isAdmin || ($this->checkIdentity() && $this->checkTimelimit('edit_timelimit')));
+
+				if ($edit_ok) {
+					$thread_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
+					$thread_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+					$thread_buttons['edit']['name']  = _EDIT;
+					$mod_buttons['edit']['image']    = newbbDisplayImage('p_edit', _EDIT);
+					$mod_buttons['edit']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+					$mod_buttons['edit']['name']     = _EDIT;
+				}
+			}
+
+			if ($topicHandler->getPermission($forum_id, $topic_status, 'delete')) {
+				$delete_ok = ($isAdmin || ($this->checkIdentity() && $this->checkTimelimit('delete_timelimit')));
+
+				if ($delete_ok) {
+					$thread_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
+					$thread_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+					$thread_buttons['delete']['name']  = _DELETE;
+					$mod_buttons['delete']['image']    = newbbDisplayImage('p_delete', _DELETE);
+					$mod_buttons['delete']['link']     = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+					$mod_buttons['delete']['name']     = _DELETE;
+				}
+			}
+			if ($topicHandler->getPermission($forum_id, $topic_status, 'reply')) {
+				$thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
+				$thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+				$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?{$page_query}&amp;quotedac=1";
+				$thread_buttons['quote']['name']  = _MD_NEWBB_QUOTE;
+			}
+		} else {
+			$mod_buttons['edit']['image'] = newbbDisplayImage('p_edit', _EDIT);
+			$mod_buttons['edit']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/edit.php?{$page_query}";
+			$mod_buttons['edit']['name']  = _EDIT;
+
+			$mod_buttons['delete']['image'] = newbbDisplayImage('p_delete', _DELETE);
+			$mod_buttons['delete']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/delete.php?{$page_query}";
+			$mod_buttons['delete']['name']  = _DELETE;
+
+			$thread_buttons['reply']['image'] = newbbDisplayImage('p_reply', _MD_NEWBB_REPLY);
+			$thread_buttons['reply']['link']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/reply.php?{$page_query}";
+			$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?{$page_query}";
+			$thread_buttons['report']['name']  = _MD_NEWBB_REPORT;
+		}
+
+		$thread_action = [];
+		// irmtfan add pdf permission
+		if (file_exists(XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')
+			&& $topicHandler->getPermission($forum_id, $topic_status, 'pdf')) {
+			$thread_action['pdf']['image']  = newbbDisplayImage('pdf', _MD_NEWBB_PDF);
+			$thread_action['pdf']['link']   = XOOPS_URL . '/modules/newbb/makepdf.php?type=post&amp;pageid=0';
+			$thread_action['pdf']['name']   = _MD_NEWBB_PDF;
+			$thread_action['pdf']['target'] = '_blank';
+		}
+		// irmtfan add print permission
+		if ($topicHandler->getPermission($forum_id, $topic_status, 'print')) {
+			$thread_action['print']['image']  = newbbDisplayImage('printer', _MD_NEWBB_PRINT);
+			$thread_action['print']['link']   = XOOPS_URL . '/modules/newbb/print.php?form=2&amp;forum=' . $forum_id . '&amp;topic_id=' . $topic_id;
+			$thread_action['print']['name']   = _MD_NEWBB_PRINT;
+			$thread_action['print']['target'] = '_blank';
+		}
+
+		if ($GLOBALS['xoopsModuleConfig']['show_sociallinks']) {
+			$full_title  = $this->getVar('subject');
+			$clean_title = preg_replace('/[^A-Za-z0-9-]+/', '+', $this->getVar('subject'));
+			$full_link   = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+
+			$thread_action['social_twitter']['image']  = newbbDisplayImage('twitter', _MD_NEWBB_SHARE_TWITTER);
+			$thread_action['social_twitter']['link']   = 'http://twitter.com/share?text=' . $clean_title . '&amp;url=' . $full_link;
+			$thread_action['social_twitter']['name']   = _MD_NEWBB_SHARE_TWITTER;
+			$thread_action['social_twitter']['target'] = '_blank';
+
+			$thread_action['social_facebook']['image']  = newbbDisplayImage('facebook', _MD_NEWBB_SHARE_FACEBOOK);
+			$thread_action['social_facebook']['link']   = 'http://www.facebook.com/sharer.php?u=' . $full_link;
+			$thread_action['social_facebook']['name']   = _MD_NEWBB_SHARE_FACEBOOK;
+			$thread_action['social_facebook']['target'] = '_blank';
+
+			$thread_action['social_gplus']['image']  = newbbDisplayImage('googleplus', _MD_NEWBB_SHARE_GOOGLEPLUS);
+			$thread_action['social_gplus']['link']   = 'https://plusone.google.com/_/+1/confirm?hl=en&url=' . $full_link;
+			$thread_action['social_gplus']['name']   = _MD_NEWBB_SHARE_GOOGLEPLUS;
+			$thread_action['social_gplus']['target'] = '_blank';
+
+			$thread_action['social_linkedin']['image']  = newbbDisplayImage('linkedin', _MD_NEWBB_SHARE_LINKEDIN);
+			$thread_action['social_linkedin']['link']   = 'http://www.linkedin.com/shareArticle?mini=true&amp;title=' . $full_title . '&amp;url=' . $full_link;
+			$thread_action['social_linkedin']['name']   = _MD_NEWBB_SHARE_LINKEDIN;
+			$thread_action['social_linkedin']['target'] = '_blank';
+
+			$thread_action['social_delicious']['image']  = newbbDisplayImage('delicious', _MD_NEWBB_SHARE_DELICIOUS);
+			$thread_action['social_delicious']['link']   = 'http://del.icio.us/post?title=' . $full_title . '&amp;url=' . $full_link;
+			$thread_action['social_delicious']['name']   = _MD_NEWBB_SHARE_DELICIOUS;
+			$thread_action['social_delicious']['target'] = '_blank';
+
+			$thread_action['social_digg']['image']  = newbbDisplayImage('digg', _MD_NEWBB_SHARE_DIGG);
+			$thread_action['social_digg']['link']   = 'http://digg.com/submit?phase=2&amp;title=' . $full_title . '&amp;url=' . $full_link;
+			$thread_action['social_digg']['name']   = _MD_NEWBB_SHARE_DIGG;
+			$thread_action['social_digg']['target'] = '_blank';
+
+			$thread_action['social_reddit']['image']  = newbbDisplayImage('reddit', _MD_NEWBB_SHARE_REDDIT);
+			$thread_action['social_reddit']['link']   = 'http://reddit.com/submit?title=' . $full_title . '&amp;url=' . $full_link;
+			$thread_action['social_reddit']['name']   = _MD_NEWBB_SHARE_REDDIT;
+			$thread_action['social_reddit']['target'] = '_blank';
+
+			$thread_action['social_wong']['image']  = newbbDisplayImage('wong', _MD_NEWBB_SHARE_MRWONG);
+			$thread_action['social_wong']['link']   = 'http://www.mister-wong.de/index.php?action=addurl&bm_url=' . $full_link;
+			$thread_action['social_wong']['name']   = _MD_NEWBB_SHARE_MRWONG;
+			$thread_action['social_wong']['target'] = '_blank';
+		}
+
+		$post = [
+			'post_id'         => $post_id,
+			'post_parent_id'  => $this->getVar('pid'),
+			'post_date'       => newbbFormatTimestamp($this->getVar('post_time')),
+			'post_image'      => $post_image,
+			'post_title'      => $post_title,
+			// irmtfan $post_title to add highlight keywords
+			'post_text'       => $post_text,
+			'post_attachment' => $post_attachment,
+			'post_edit'       => $this->displayPostEdit(),
+			'post_no'         => $post_no,
+			'post_signature'  => $this->getVar('attachsig') ? @$poster['signature'] : '',
+			//            'poster_ip'       => ($isAdmin && $GLOBALS['xoopsModuleConfig']['show_ip']) ? long2ip($this->getVar('poster_ip')) : '',
+			'poster_ip'       => ($isAdmin
+								  && $GLOBALS['xoopsModuleConfig']['show_ip']) ? $this->getVar('poster_ip') : '',
+			'thread_action'   => $thread_action,
+			'thread_buttons'  => $thread_buttons,
+			'mod_buttons'     => $mod_buttons,
+			'poster'          => $poster,
+			'post_permalink'  => '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '"></a>'
+		];
+
+		unset($thread_buttons, $mod_buttons, $eachposter);
+
+		return $post;
+	}
 }