mambax7 / newbb5

delete.php

Indentation +85 added lines, -85 removed lines

@@ -16,17 +16,17 @@ 
 $ok = Request::getInt('ok', 0, 'POST');
 
 foreach (['forum', 'topic_id', 'post_id', 'order', 'pid', 'act'] as $getint) {
-    ${$getint} = Request::getInt($getint, 0, 'POST');
+	${$getint} = Request::getInt($getint, 0, 'POST');
 }
 
 foreach (['forum', 'topic_id', 'post_id', 'order', 'pid', 'act'] as $getint) {
-    ${$getint} = !empty(${$getint}) ? ${$getint} : Request::getInt($getint, 0, 'GET');
+	${$getint} = !empty(${$getint}) ? ${$getint} : Request::getInt($getint, 0, 'GET');
 }
 //$viewmode = (isset($_GET['viewmode']) && $_GET['viewmode'] !== 'flat') ? 'thread' : 'flat';
 //$viewmode = ($viewmode) ? $viewmode: (isset($_POST['viewmode'])?$_POST['viewmode'] : 'flat');
 
 $viewmode = (Request::getString('viewmode', '', 'GET')
-             && 'flat' !== Request::getString('viewmode', '', 'GET')) ? 'thread' : 'flat';
+			 && 'flat' !== Request::getString('viewmode', '', 'GET')) ? 'thread' : 'flat';
 $viewmode = $viewmode ?: (Request::getString('viewmode', '', 'POST') ?: 'flat');
 
 ///** @var Newbb\ForumHandler $forumHandler */
@@ -37,21 +37,21 @@ 
 //$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
 
 if (!empty($post_id)) {
-    $topic = $topicHandler->getByPost($post_id);
+	$topic = $topicHandler->getByPost($post_id);
 } else {
-    $topic = $topicHandler->get($topic_id);
+	$topic = $topicHandler->get($topic_id);
 }
 $topic_id = $topic->getVar('topic_id');
 if (!$topic_id) {
-    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum=' . $forum;
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
-    redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
+	$redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum=' . $forum;
+	$redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+	redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 $forum       = $topic->getVar('forum_id');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $isAdmin = newbbIsAdmin($forumObject);
@@ -62,95 +62,95 @@ 
 $topic_status = $topic->getVar('topic_status');
 if (($postObject->checkIdentity() || $isAdmin) && $topicHandler->getPermission($topic->getVar('forum_id'), $topic_status, 'delete')) {
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
 }
 
 if (!$isAdmin && !$postObject->checkTimelimit('delete_timelimit')) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init($forumObject);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init($forumObject);
 }
 
 if ($ok) {
-    $isDeleteOne = (1 === $ok);
-    if ($postObject->isTopic() && 0 == $topic->getVar('topic_replies')) {
-        $isDeleteOne = false;
-    }
-    if ($isDeleteOne && $postObject->isTopic() && $topic->getVar('topic_replies') > 0) {
-        //$postHandler->emptyTopic($postObject);
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
-    } else {
-        if (Request::getString('post_text', '', 'POST')) {
-            //send a message
-            /** @var \XoopsMemberHandler $memberHandler */
-            $memberHandler = xoops_getHandler('member');
-            $senduser      = $memberHandler->getUser($postObject->getVar('uid'));
-            if ($senduser->getVar('notify_method') > 0) {
-                $xoopsMailer = xoops_getMailer();
-                $xoopsMailer->reset();
-                if (1 == $senduser->getVar('notify_method')) {
-                    $xoopsMailer->usePM();
-                } else {
-                    $xoopsMailer->useMail();
-                }
-                $xoopsMailer->setHTML(true);
-                $xoopsMailer->setToUsers($senduser);
-                $xoopsMailer->setFromName($GLOBALS['xoopsUser']->getVar('uname'));
-                $xoopsMailer->setSubject(_MD_NEWBB_DELEDEDMSG_SUBJECT);
-                $forenurl = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postObject->getVar('topic_id') . '">' . $postObject->getVar('subject') . '</a>';
-                if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-                    $forenurl = seo_urls($forenurl);
-                }
-                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL . '/');
-                $body = $myts->nl2Br($body);
-                $xoopsMailer->setBody($body);
-                $xoopsMailer->send();
-            }
-        }
-        $postHandler->delete($postObject, $isDeleteOne);
-        $forumHandler->synchronization($forum);
-        $topicHandler->synchronization($topic_id);
-        //        /** @var Newbb\StatsHandler $statsHandler */
-        //        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
-        $statsHandler->reset();
-    }
+	$isDeleteOne = (1 === $ok);
+	if ($postObject->isTopic() && 0 == $topic->getVar('topic_replies')) {
+		$isDeleteOne = false;
+	}
+	if ($isDeleteOne && $postObject->isTopic() && $topic->getVar('topic_replies') > 0) {
+		//$postHandler->emptyTopic($postObject);
+		redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
+	} else {
+		if (Request::getString('post_text', '', 'POST')) {
+			//send a message
+			/** @var \XoopsMemberHandler $memberHandler */
+			$memberHandler = xoops_getHandler('member');
+			$senduser      = $memberHandler->getUser($postObject->getVar('uid'));
+			if ($senduser->getVar('notify_method') > 0) {
+				$xoopsMailer = xoops_getMailer();
+				$xoopsMailer->reset();
+				if (1 == $senduser->getVar('notify_method')) {
+					$xoopsMailer->usePM();
+				} else {
+					$xoopsMailer->useMail();
+				}
+				$xoopsMailer->setHTML(true);
+				$xoopsMailer->setToUsers($senduser);
+				$xoopsMailer->setFromName($GLOBALS['xoopsUser']->getVar('uname'));
+				$xoopsMailer->setSubject(_MD_NEWBB_DELEDEDMSG_SUBJECT);
+				$forenurl = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postObject->getVar('topic_id') . '">' . $postObject->getVar('subject') . '</a>';
+				if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
+					$forenurl = seo_urls($forenurl);
+				}
+				$body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL . '/');
+				$body = $myts->nl2Br($body);
+				$xoopsMailer->setBody($body);
+				$xoopsMailer->send();
+			}
+		}
+		$postHandler->delete($postObject, $isDeleteOne);
+		$forumHandler->synchronization($forum);
+		$topicHandler->synchronization($topic_id);
+		//        /** @var Newbb\StatsHandler $statsHandler */
+		//        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+		$statsHandler->reset();
+	}
 
-    //$postObject->loadFilters('delete');
-    if ($isDeleteOne) {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
-    } else {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
-    }
+	//$postObject->loadFilters('delete');
+	if ($isDeleteOne) {
+		redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
+	} else {
+		redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
+	}
 } else {
-    require_once $GLOBALS['xoops']->path('header.php');
-    //xoops_confirm(array('post_id' => $post_id, 'viewmode' => $viewmode, 'order' => $order, 'forum' => $forum, 'topic_id' => $topic_id, 'ok' => 1), 'delete.php', _MD_NEWBB_DEL_ONE);
-    echo '<div class="confirmMsg">' . _MD_NEWBB_DEL_ONE . '<br>
+	require_once $GLOBALS['xoops']->path('header.php');
+	//xoops_confirm(array('post_id' => $post_id, 'viewmode' => $viewmode, 'order' => $order, 'forum' => $forum, 'topic_id' => $topic_id, 'ok' => 1), 'delete.php', _MD_NEWBB_DEL_ONE);
+	echo '<div class="confirmMsg">' . _MD_NEWBB_DEL_ONE . '<br>
           <form method="post" action="' . XOOPS_URL . '/modules/newbb/delete.php">';
-    echo _MD_NEWBB_DELEDEDMSG . '<br>';
-    echo '<textarea name="post_text" cols="50" rows="5"></textarea><br>';
-    echo '<input type="hidden" name="post_id" value="' . htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="order" value="' . htmlspecialchars($order, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="forum" value="' . htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="topic_id" value="' . htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="ok" value="1" />';
-    echo $GLOBALS['xoopsSecurity']->getTokenHTML();
-    echo '<input type="submit" name="confirm_submit" value="' . _SUBMIT . '" title="' . _SUBMIT . '"/>
+	echo _MD_NEWBB_DELEDEDMSG . '<br>';
+	echo '<textarea name="post_text" cols="50" rows="5"></textarea><br>';
+	echo '<input type="hidden" name="post_id" value="' . htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5) . '" />';
+	echo '<input type="hidden" name="order" value="' . htmlspecialchars($order, ENT_QUOTES | ENT_HTML5) . '" />';
+	echo '<input type="hidden" name="forum" value="' . htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5) . '" />';
+	echo '<input type="hidden" name="topic_id" value="' . htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5) . '" />';
+	echo '<input type="hidden" name="ok" value="1" />';
+	echo $GLOBALS['xoopsSecurity']->getTokenHTML();
+	echo '<input type="submit" name="confirm_submit" value="' . _SUBMIT . '" title="' . _SUBMIT . '"/>
           <input type="button" name="confirm_back" value="' . _CANCEL . '" onclick="history.go(-1);" title="' . _CANCEL . '" />
           </form>
           </div>';
-    if ($isAdmin) {
-        xoops_confirm([
-                          'post_id'  => $post_id,
-                          'viewmode' => $viewmode,
-                          'order'    => $order,
-                          'forum'    => $forum,
-                          'topic_id' => $topic_id,
-                          'ok'       => 99
-                      ], 'delete.php', _MD_NEWBB_DEL_RELATED);
-    }
-    require_once $GLOBALS['xoops']->path('footer.php');
+	if ($isAdmin) {
+		xoops_confirm([
+						  'post_id'  => $post_id,
+						  'viewmode' => $viewmode,
+						  'order'    => $order,
+						  'forum'    => $forum,
+						  'topic_id' => $topic_id,
+						  'ok'       => 99
+					  ], 'delete.php', _MD_NEWBB_DEL_RELATED);
+	}
+	require_once $GLOBALS['xoops']->path('footer.php');
 }

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $ok = Request::getInt('ok', 0, 'POST');
 
@@ -43,15 +43,15 @@ 
 }
 $topic_id = $topic->getVar('topic_id');
 if (!$topic_id) {
-    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum=' . $forum;
-    $redirect = XOOPS_URL . '/modules/newbb/' . $redirect;
+    $redirect = empty($forum) ? 'index.php' : 'viewforum.php?forum='.$forum;
+    $redirect = XOOPS_URL.'/modules/newbb/'.$redirect;
     redirect_header($redirect, 2, _MD_NEWBB_ERRORTOPIC);
 }
 
 $forum       = $topic->getVar('forum_id');
 $forumObject = $forumHandler->get($forum);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 $isAdmin = newbbIsAdmin($forumObject);
@@ -62,11 +62,11 @@ 
 $topic_status = $topic->getVar('topic_status');
 if (($postObject->checkIdentity() || $isAdmin) && $topicHandler->getPermission($topic->getVar('forum_id'), $topic_status, 'delete')) {
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_DELNOTALLOWED);
 }
 
 if (!$isAdmin && !$postObject->checkTimelimit('delete_timelimit')) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?forum=$forum&topic_id=$topic_id&post_id=$post_id&pid=$pid", 2, _MD_NEWBB_TIMEISUPDEL);
 }
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
@@ -82,7 +82,7 @@ 
     }
     if ($isDeleteOne && $postObject->isTopic() && $topic->getVar('topic_replies') > 0) {
         //$postHandler->emptyTopic($postObject);
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&pid=$pid&forum=$forum", 2, _MD_NEWBB_POSTFIRSTWITHREPLYNODELETED);
     } else {
         if (Request::getString('post_text', '', 'POST')) {
             //send a message
@@ -101,11 +101,11 @@ 
                 $xoopsMailer->setToUsers($senduser);
                 $xoopsMailer->setFromName($GLOBALS['xoopsUser']->getVar('uname'));
                 $xoopsMailer->setSubject(_MD_NEWBB_DELEDEDMSG_SUBJECT);
-                $forenurl = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postObject->getVar('topic_id') . '">' . $postObject->getVar('subject') . '</a>';
+                $forenurl = '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$postObject->getVar('topic_id').'">'.$postObject->getVar('subject').'</a>';
                 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
                     $forenurl = seo_urls($forenurl);
                 }
-                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL . '/');
+                $body = sprintf(_MD_NEWBB_DELEDEDMSG_BODY, $senduser->getVar('uname'), $forenurl, Request::getString('post_text', '', 'POST'), $GLOBALS['xoopsUser']->getVar('uname'), $GLOBALS['xoopsConfig']['sitename'], XOOPS_URL.'/');
                 $body = $myts->nl2Br($body);
                 $xoopsMailer->setBody($body);
                 $xoopsMailer->send();
@@ -121,25 +121,25 @@ 
 
     //$postObject->loadFilters('delete');
     if ($isDeleteOne) {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id&amp;order=$order&amp;viewmode=$viewmode&amp;pid=$pid&amp;forum=$forum", 2, _MD_NEWBB_POSTDELETED);
     } else {
-        redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum", 2, _MD_NEWBB_POSTSDELETED);
     }
 } else {
     require_once $GLOBALS['xoops']->path('header.php');
     //xoops_confirm(array('post_id' => $post_id, 'viewmode' => $viewmode, 'order' => $order, 'forum' => $forum, 'topic_id' => $topic_id, 'ok' => 1), 'delete.php', _MD_NEWBB_DEL_ONE);
-    echo '<div class="confirmMsg">' . _MD_NEWBB_DEL_ONE . '<br>
-          <form method="post" action="' . XOOPS_URL . '/modules/newbb/delete.php">';
-    echo _MD_NEWBB_DELEDEDMSG . '<br>';
+    echo '<div class="confirmMsg">'._MD_NEWBB_DEL_ONE.'<br>
+          <form method="post" action="' . XOOPS_URL.'/modules/newbb/delete.php">';
+    echo _MD_NEWBB_DELEDEDMSG.'<br>';
     echo '<textarea name="post_text" cols="50" rows="5"></textarea><br>';
-    echo '<input type="hidden" name="post_id" value="' . htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="order" value="' . htmlspecialchars($order, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="forum" value="' . htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5) . '" />';
-    echo '<input type="hidden" name="topic_id" value="' . htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5) . '" />';
+    echo '<input type="hidden" name="post_id" value="'.htmlspecialchars($post_id, ENT_QUOTES | ENT_HTML5).'" />';
+    echo '<input type="hidden" name="order" value="'.htmlspecialchars($order, ENT_QUOTES | ENT_HTML5).'" />';
+    echo '<input type="hidden" name="forum" value="'.htmlspecialchars($forum, ENT_QUOTES | ENT_HTML5).'" />';
+    echo '<input type="hidden" name="topic_id" value="'.htmlspecialchars($topic_id, ENT_QUOTES | ENT_HTML5).'" />';
     echo '<input type="hidden" name="ok" value="1" />';
     echo $GLOBALS['xoopsSecurity']->getTokenHTML();
-    echo '<input type="submit" name="confirm_submit" value="' . _SUBMIT . '" title="' . _SUBMIT . '"/>
-          <input type="button" name="confirm_back" value="' . _CANCEL . '" onclick="history.go(-1);" title="' . _CANCEL . '" />
+    echo '<input type="submit" name="confirm_submit" value="'._SUBMIT.'" title="'._SUBMIT.'"/>
+          <input type="button" name="confirm_back" value="' . _CANCEL.'" onclick="history.go(-1);" title="'._CANCEL.'" />
           </form>
           </div>';
     if ($isAdmin) {

polls.php

Indentation +685 added lines, -685 removed lines

@@ -30,17 +30,17 @@ 
 xoops_load('XoopsLocal');
 $op      = 'add';
 $goodOps = [
-    'add',
-    'save',
-    'edit',
-    'update',
-    'addmore',
-    'savemore',
-    'delete',
-    'delete_ok',
-    'restart',
-    'restart_ok',
-    'log'
+	'add',
+	'save',
+	'edit',
+	'update',
+	'addmore',
+	'savemore',
+	'delete',
+	'delete_ok',
+	'restart',
+	'restart_ok',
+	'log'
 ];
 $op      = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'add';
 $op      = (!in_array($op, $goodOps)) ? 'add' : $op;
@@ -54,705 +54,705 @@ 
 $topicObject  = $topicHandler->get($topic_id);
 // topic exist
 if (is_object($topicObject)) {
-    $forum_id = $topicObject->getVar('forum_id');
+	$forum_id = $topicObject->getVar('forum_id');
 } else {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_POLLMODULE_ERROR . ': ' . _MD_NEWBB_FORUMNOEXIST);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_POLLMODULE_ERROR . ': ' . _MD_NEWBB_FORUMNOEXIST);
 }
 // forum access permission
 /** @var Newbb\ForumHandler $forumHandler */
 $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject  = $forumHandler->get($forum_id);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 // topic view permission
 if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
-    redirect_header('viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
+	redirect_header('viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
 }
 // poll module
 $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
 if (is_object($pollModuleHandler) && $pollModuleHandler->getVar('isactive')) {
-    // new xoopspoll module
-    if ($pollModuleHandler->getVar('version') >= 140) {
-        xoops_load('constants', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        xoops_load('pollUtility', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        xoops_load('request', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        xoops_loadLanguage('admin', $GLOBALS['xoopsModuleConfig']['poll_module']);
-        /** @var Xoopspoll\PollHandler $xpPollHandler */
-        $xpPollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
-        /** @var \XoopsPoll $pollObject */
-        $pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
-        // old xoopspoll or umfrage or any clone from them
-    } else {
-        require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
-        $classPoll  = $topicObject->loadOldPoll();
-        $pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
-    }
+	// new xoopspoll module
+	if ($pollModuleHandler->getVar('version') >= 140) {
+		xoops_load('constants', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		xoops_load('pollUtility', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		xoops_load('request', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		xoops_loadLanguage('admin', $GLOBALS['xoopsModuleConfig']['poll_module']);
+		/** @var Xoopspoll\PollHandler $xpPollHandler */
+		$xpPollHandler = Xoopspoll\Helper::getInstance()->getHandler('Poll');
+		/** @var \XoopsPoll $pollObject */
+		$pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
+		// old xoopspoll or umfrage or any clone from them
+	} else {
+		require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+		$classPoll  = $topicObject->loadOldPoll();
+		$pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
+	}
 } else {
-    // irmtfan - issue with javascript:history.go(-1)
-    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_POLLMODULE_ERROR);
+	// irmtfan - issue with javascript:history.go(-1)
+	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_POLLMODULE_ERROR);
 }
 // include header
 require_once $GLOBALS['xoops']->path('header.php');
 
 // no admin user permission
 if (is_object($GLOBALS['xoopsUser']) && !newbbIsAdmin($forumObject)) {
-    $perm = false;
-    if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'addpoll')) {
-        if (('add' === $op || 'save' === $op || 'update' === $op) && !$topicObject->getVar('topic_haspoll')
-            && ($GLOBALS['xoopsUser']->getVar('uid') == $topicObject->getVar('topic_poster'))) {
-            $perm = true;
-        } elseif (!empty($poll_id) && ($GLOBALS['xoopsUser']->getVar('uid') == $pollObject->getVar('user_id'))) {
-            $perm = true;
-        }
-    }
-    if (!$perm) {
-        redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _NOPERM);
-    }
+	$perm = false;
+	if ($topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'addpoll')) {
+		if (('add' === $op || 'save' === $op || 'update' === $op) && !$topicObject->getVar('topic_haspoll')
+			&& ($GLOBALS['xoopsUser']->getVar('uid') == $topicObject->getVar('topic_poster'))) {
+			$perm = true;
+		} elseif (!empty($poll_id) && ($GLOBALS['xoopsUser']->getVar('uid') == $pollObject->getVar('user_id'))) {
+			$perm = true;
+		}
+	}
+	if (!$perm) {
+		redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _NOPERM);
+	}
 }
 switch ($op) {
-    case 'add':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_CREATNEWPOLL . "</h4>\n";
-            $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $classOption  = $classPoll . 'Option';
-            $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
-            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
-                                                                                                          . XOOPS_URL
-                                                                                                          . '/userinfo.php?uid='
-                                                                                                          . $GLOBALS['xoopsUser']->getVar('uid')
-                                                                                                          . "'>"
-                                                                                                          . newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
-                                                                                                          . '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
-            $poll_form->addElement($author_label);
-            $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255);
-            $poll_form->addElement($question_text);
-            $desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description');
-            $poll_form->addElement($desc_tarea);
-            $currenttime = formatTimestamp(time(), 'Y-m-d H:i:s');
-            $endtime     = formatTimestamp(time() + 604800, 'Y-m-d H:i:s');
-            $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime) . '</small>', 'end_time', 30, 19, $endtime);
-            $poll_form->addElement($expire_text);
-
-            $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, 0);
-            $poll_form->addElement($weight_text);
-
-            $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', 0);
-            $poll_form->addElement($multi_yn);
-
-            $notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1);
-            $poll_form->addElement($notify_yn);
-
-            $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
-            for ($i = 0; $i < 10; ++$i) {
-                $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
-                $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
-                $option_tray->addElement($option_text);
-                $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
-                $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
-                $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . XOOPS_URL
-                                                      . '/modules/'
-                                                      . $GLOBALS['xoopsModuleConfig']['poll_module']
-                                                      . '/assets/images/colorbars/'
-                                                      . $current_bar
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
-                $option_tray->addElement($color_select);
-                $option_tray->addElement($color_label);
-                if (!next($barcolor_array)) {
-                    reset($barcolor_array);
-                }
-                unset($color_select, $color_label);
-            }
-            $poll_form->addElement($option_tray);
-
-            $poll_form->addElement(new \XoopsFormHidden('op', 'save'));
-            $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-            $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-            $poll_form->addElement(new \XoopsFormHidden('user_id', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0));
-            $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . '</h4>';
-            $poll_form->display();
-        }
-        break; // op: add
-
-    case 'edit':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_EDITPOLL . "</h4>\n";
-            $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $classOption  = $classPoll . 'Option';
-            $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_EDITPOLL, 'poll_form', 'polls.php', 'post', true);
-            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $pollObject->getVar('user_id') . "'>" . newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']) . '</a>');
-            $poll_form->addElement($author_label);
-            $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255, $pollObject->getVar('question', 'E'));
-            $poll_form->addElement($question_text);
-            $desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description', $pollObject->getVar('description', 'E'));
-            $poll_form->addElement($desc_tarea);
-            $date = formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s'); // important "Y-m-d H:i:s" use in jdf function
-            if (!$pollObject->hasExpired()) {
-                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '</small>', 'end_time', 20, 19, $date);
-                $poll_form->addElement($expire_text);
-            } else {
-                // irmtfan full URL - add topic_id
-                $restart_label = new \XoopsFormLabel(
-                    _MD_NEWBB_POLL_EXPIRATION,
-                                                    sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date) . "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_RESTART . '</a>'
-                );
-                $poll_form->addElement($restart_label);
-            }
-            $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, $pollObject->getVar('weight'));
-            $poll_form->addElement($weight_text);
-            $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', $pollObject->getVar('multiple'));
-            $poll_form->addElement($multi_yn);
-            $options_arr  =& $classOption::getAllByPollId($poll_id);
-            $notify_value = 1;
-            if (0 !== $pollObject->getVar('mail_status')) {
-                $notify_value = 0;
-            }
-            $notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', $notify_value);
-            $poll_form->addElement($notify_yn);
-            $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/"));
-            $i              = 0;
-            foreach ($options_arr as $option) {
-                /** @var \XoopsPoll $option */
-                $option_tray->addElement(new \XoopsFormText('', 'option_text[]', 50, 255, $option->getVar('option_text')));
-                $option_tray->addElement(new \XoopsFormHidden('option_id[]', $option->getVar('option_id')));
-                $color_select = new \XoopsFormSelect('', 'option_color[{$i}]', $option->getVar('option_color'));
-                $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
-                $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
-                $option_tray->addElement($color_select);
-                $option_tray->addElement($color_label);
-                unset($color_select, $color_label);
-                ++$i;
-            }
-            // irmtfan full URL
-            $more_label = new \XoopsFormLabel('', "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_ADDMORE . '</a>');
-            $option_tray->addElement($more_label);
-            $poll_form->addElement($option_tray);
-            $poll_form->addElement(new \XoopsFormHidden('op', 'update'));
-            $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-            $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-            $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-            $poll_form->display();
-        }
-        break; // op: edit
-
-    case 'save':
-        // old xoopspoll or umfrage or any clone from them
-        if ($pollModuleHandler->getVar('version') < 140) {
-            // check security token
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            /*
+	case 'add':
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			echo '<h4>' . _MD_NEWBB_POLL_CREATNEWPOLL . "</h4>\n";
+			$pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
+		// old xoopspoll or umfrage or any clone from them
+		} else {
+			$classOption  = $classPoll . 'Option';
+			$poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
+			$author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
+																										  . XOOPS_URL
+																										  . '/userinfo.php?uid='
+																										  . $GLOBALS['xoopsUser']->getVar('uid')
+																										  . "'>"
+																										  . newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
+																										  . '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
+			$poll_form->addElement($author_label);
+			$question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255);
+			$poll_form->addElement($question_text);
+			$desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description');
+			$poll_form->addElement($desc_tarea);
+			$currenttime = formatTimestamp(time(), 'Y-m-d H:i:s');
+			$endtime     = formatTimestamp(time() + 604800, 'Y-m-d H:i:s');
+			$expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime) . '</small>', 'end_time', 30, 19, $endtime);
+			$poll_form->addElement($expire_text);
+
+			$weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, 0);
+			$poll_form->addElement($weight_text);
+
+			$multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', 0);
+			$poll_form->addElement($multi_yn);
+
+			$notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1);
+			$poll_form->addElement($notify_yn);
+
+			$option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
+			$barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+			for ($i = 0; $i < 10; ++$i) {
+				$current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
+				$option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
+				$option_tray->addElement($option_text);
+				$color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
+				$color_select->addOptionArray($barcolor_array);
+				$color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
+				$color_label = new \XoopsFormLabel('', "<img src='"
+													  . XOOPS_URL
+													  . '/modules/'
+													  . $GLOBALS['xoopsModuleConfig']['poll_module']
+													  . '/assets/images/colorbars/'
+													  . $current_bar
+													  . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
+				$option_tray->addElement($color_select);
+				$option_tray->addElement($color_label);
+				if (!next($barcolor_array)) {
+					reset($barcolor_array);
+				}
+				unset($color_select, $color_label);
+			}
+			$poll_form->addElement($option_tray);
+
+			$poll_form->addElement(new \XoopsFormHidden('op', 'save'));
+			$poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+			$poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+			$poll_form->addElement(new \XoopsFormHidden('user_id', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0));
+			$poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+			echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . '</h4>';
+			$poll_form->display();
+		}
+		break; // op: add
+
+	case 'edit':
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			echo '<h4>' . _MD_NEWBB_POLL_EDITPOLL . "</h4>\n";
+			$pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
+		// old xoopspoll or umfrage or any clone from them
+		} else {
+			$classOption  = $classPoll . 'Option';
+			$poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_EDITPOLL, 'poll_form', 'polls.php', 'post', true);
+			$author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $pollObject->getVar('user_id') . "'>" . newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']) . '</a>');
+			$poll_form->addElement($author_label);
+			$question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255, $pollObject->getVar('question', 'E'));
+			$poll_form->addElement($question_text);
+			$desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description', $pollObject->getVar('description', 'E'));
+			$poll_form->addElement($desc_tarea);
+			$date = formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s'); // important "Y-m-d H:i:s" use in jdf function
+			if (!$pollObject->hasExpired()) {
+				$expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '</small>', 'end_time', 20, 19, $date);
+				$poll_form->addElement($expire_text);
+			} else {
+				// irmtfan full URL - add topic_id
+				$restart_label = new \XoopsFormLabel(
+					_MD_NEWBB_POLL_EXPIRATION,
+													sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date) . "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_RESTART . '</a>'
+				);
+				$poll_form->addElement($restart_label);
+			}
+			$weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, $pollObject->getVar('weight'));
+			$poll_form->addElement($weight_text);
+			$multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', $pollObject->getVar('multiple'));
+			$poll_form->addElement($multi_yn);
+			$options_arr  =& $classOption::getAllByPollId($poll_id);
+			$notify_value = 1;
+			if (0 !== $pollObject->getVar('mail_status')) {
+				$notify_value = 0;
+			}
+			$notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', $notify_value);
+			$poll_form->addElement($notify_yn);
+			$option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
+			$barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/"));
+			$i              = 0;
+			foreach ($options_arr as $option) {
+				/** @var \XoopsPoll $option */
+				$option_tray->addElement(new \XoopsFormText('', 'option_text[]', 50, 255, $option->getVar('option_text')));
+				$option_tray->addElement(new \XoopsFormHidden('option_id[]', $option->getVar('option_id')));
+				$color_select = new \XoopsFormSelect('', 'option_color[{$i}]', $option->getVar('option_color'));
+				$color_select->addOptionArray($barcolor_array);
+				$color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+				$color_label = new \XoopsFormLabel('', "<img src='"
+													  . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
+													  . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+				$option_tray->addElement($color_select);
+				$option_tray->addElement($color_label);
+				unset($color_select, $color_label);
+				++$i;
+			}
+			// irmtfan full URL
+			$more_label = new \XoopsFormLabel('', "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_ADDMORE . '</a>');
+			$option_tray->addElement($more_label);
+			$poll_form->addElement($option_tray);
+			$poll_form->addElement(new \XoopsFormHidden('op', 'update'));
+			$poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+			$poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+			$poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+
+			echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+			$poll_form->display();
+		}
+		break; // op: edit
+
+	case 'save':
+		// old xoopspoll or umfrage or any clone from them
+		if ($pollModuleHandler->getVar('version') < 140) {
+			// check security token
+			if (!$GLOBALS['xoopsSecurity']->check()) {
+				redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+			}
+			/*
              * The option check should be done before submitting
              */
-            $option_empty = true;
-            if (!Request::getString('option_text', '', 'POST')) {
-                // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-            }
-            $option_text = Request::getArray('option_text', '', 'POST');
-            foreach ($option_text as $optxt) {
-                if ('' !== trim($optxt)) {
-                    $option_empty = false;
-                    break;
-                }
-            }
-            if ($option_empty) {
-                // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-            }
-            $pollObject->setVar('question', Request::getString('question', '', 'POST'));
-            $pollObject->setVar('description', Request::getString('description', '', 'POST'));
-            $end_time = Request::getString('end_time', '', 'POST'); // (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
-            if ('' !== $end_time) {
-                $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
-                $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
-            } else {
-                // if expiration date is not set, set it to 10 days from now
-                $pollObject->setVar('end_time', time() + (86400 * 10));
-            }
-
-            $pollObject->setVar('display', 0);
-            $pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
-            $pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
-            $pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
-            if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
-                // if notify, set mail status to "not mailed"
-                $pollObject->setVar('mail_status', Xoopspoll\Constants::POLL_NOT_MAILED);
-            } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', Xoopspoll\Constants::POLL_MAILED);
-            }
-            $new_poll_id = $pollObject->store();
-            if (empty($new_poll_id)) {
-                xoops_error($pollObject->getHtmlErrors);
-                break;
-            }
-            $i            = 0;
-            $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
-            foreach ($option_text as $optxt) {
-                $optxt = trim($optxt);
-                /** @var Xoopspoll\Option $optionObject */
-                $optionObject = new $classOption();
-                if ('' !== $optxt) {
-                    $optionObject->setVar('option_text', $optxt);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $optionObject->setVar('poll_id', $new_poll_id);
-                    $optionObject->store();
-                }
-                ++$i;
-            }
-            // clear the template cache so changes take effect immediately
-            require_once $GLOBALS['xoops']->path('class/template.php');
-            xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
-            xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-
-            // update topic to indicate it has a poll
-            $topicObject->setVar('topic_haspoll', 1);
-            $topicObject->setVar('poll_id', $new_poll_id);
-            $success = $topicHandler->insert($topicObject);
-            if (!$success) {
-                xoops_error($topicHandler->getHtmlErrors());
-            } else {
-                redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
-            }
-            break;// op: save
-        }
-    // no break
-    case 'update':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        /* make sure there's at least one option */
-        $option_text   = Request::getString('option_text', '', 'POST');
-        $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
-        $option_string = trim($option_string);
-        if ('' === $option_string) {
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-        }
-
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            /** @var Xoopspoll\OptionHandler $xpOptHandler */
-            $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-            /** @var Xoopspoll\LogHandler $xpLogHandler */
-            $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-            //            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
-            $classConstants   = new XoopsModules\Xoopspoll\Constants();
-            $notify           = Request::getInt('notify', $classConstants::NOTIFICATION_ENABLED, 'POST');
-            $currentTimestamp = time();
-            //$xuEndTimestamp   = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_end_time', null, 'POST'))
-            //                                                             : strtotime(Request::getString('xu_end_time', null, 'POST'));
-            $xuEndTimestamp = strtotime(Request::getString('xu_end_time', null, 'POST'));
-            $endTimestamp   = (!Request::getString('xu_end_time', null, 'POST')) ? ($currentTimestamp + $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
-            //$xuStartTimestamp = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_start_time', null, 'POST'))
-            //                                                             : strtotime(Request::getString('xu_start_time', null, 'POST'));
-            $xuStartTimestamp = strtotime(Request::getString('xu_start_time', null, 'POST'));
-            $startTimestamp   = (!Request::getString('xu_start_time', null, 'POST')) ? ($endTimestamp - $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
-
-            //  don't allow changing start time if there are votes in the log
-            if (($startTimestamp < $pollObject->getVar('start_time'))
-                && ($xpLogHandler->getTotalVotesByPollId($poll_id) > 0)) {
-                $startTimestamp = $pollObject->getVar('start_time'); //don't change start time
-            }
-
-            $poll_vars = [
-                'user_id'     => Request::getInt('user_id', $GLOBALS['xoopsUser']->uid(), 'POST'),
-                'question'    => Request::getString('question', null, 'POST'),
-                'description' => Request::getText('description', null, 'POST'),
-                'mail_status' => ($classConstants::NOTIFICATION_ENABLED == $notify) ? $classConstants::POLL_NOT_MAILED : $classConstants::POLL_MAILED,
-                'mail_voter'  => Request::getInt('mail_voter', $classConstants::NOT_MAIL_POLL_TO_VOTER, 'POST'),
-                'start_time'  => $startTimestamp,
-                'end_time'    => $endTimestamp,
-                'display'     => Request::getInt('display', $classConstants::DO_NOT_DISPLAY_POLL_IN_BLOCK, 'POST'),
-                'visibility'  => Request::getInt('visibility', $classConstants::HIDE_NEVER, 'POST'),
-                'weight'      => Request::getInt('weight', $classConstants::DEFAULT_WEIGHT, 'POST'),
-                'multiple'    => Request::getInt('multiple', $classConstants::NOT_MULTIPLE_SELECT_POLL, 'POST'),
-                'multilimit'  => Request::getInt('multilimit', $classConstants::MULTIPLE_SELECT_LIMITLESS, 'POST'),
-                'anonymous'   => Request::getInt('anonymous', $classConstants::ANONYMOUS_VOTING_DISALLOWED, 'POST')
-            ];
-            $pollObject->setVars($poll_vars);
-            $poll_id = $xpPollHandler->insert($pollObject);
-            if (!$poll_id) {
-                $err = $pollObject->getHtmlErrors();
-                exit($err);
-            }
-
-            // now get the options
-            $optionIdArray    = Request::getArray('option_id', [], 'POST');
-            $optionIdArray    = array_map('intval', $optionIdArray);
-            $optionTextArray  = Request::getArray('option_text', [], 'POST');
-            $optionColorArray = Request::getArray('option_color', [], 'POST');
-
-            foreach ($optionIdArray as $key => $oId) {
-                if (!empty($oId) && ($optionObject = $xpOptHandler->get($oId))) {
-                    // existing option object so need to update it
-                    $optionTextArray[$key] = trim($optionTextArray[$key]);
-                    if ('' === $optionTextArray[$key]) {
-                        // want to delete this option
-                        if (false !== $xpOptHandler->delete($optionObject)) {
-                            // now remove it from the log
-                            $xpLogHandler->deleteByOptionId($optionObject->getVar('option_id'));
-                            //update vote count in poll
-                            $xpPollHandler->updateCount($pollObject);
-                        } else {
-                            xoops_error($xpLogHandler->getHtmlErrors());
-                            break;
-                        }
-                    } else {
-                        $optionObject->setVar('option_text', $optionTextArray[$key]);
-                        $optionObject->setVar('option_color', $optionColorArray[$key]);
-                        $optionObject->setVar('poll_id', $poll_id);
-                        $xpOptHandler->insert($optionObject);
-                    }
-                } else {
-                    // new option object
-                    $optionObject          = $xpOptHandler->create();
-                    $optionTextArray[$key] = trim($optionTextArray[$key]);
-                    if ('' !== $optionTextArray[$key]) { // ignore if text is empty
-                        $optionObject->setVar('option_text', $optionTextArray[$key]);
-                        $optionObject->setVar('option_color', $optionColorArray[$key]);
-                        $optionObject->setVar('poll_id', $poll_id);
-                        $xpOptHandler->insert($optionObject);
-                    }
-                    unset($optionObject);
-                }
-            }
-            // old xoopspoll or umfrage or any clone from them
-        } else {
-            $pollObject->setVar('question', Request::getString('question', '', 'POST'));
-            $pollObject->setVar('description', Request::getString('description', '', 'POST'));
-
-            $end_time = Request::getString('end_time', '', 'POST');
-            if ('' !== $end_time) {
-                $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
-                $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
-            }
-            $pollObject->setVar('display', 0);
-            $pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
-            $pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
-            $pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
-            if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
-                // if notify, set mail status to "not mailed"
-                $pollObject->setVar('mail_status', $classConstants::POLL_NOT_MAILED);
-            } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', $classConstants::POLL_MAILED);
-            }
-
-            if (!$pollObject->store()) {
-                xoops_error($pollObject->getHtmlErrors);
-                break;
-            }
-            $i            = 0;
-            $option_id    = Request::getArray('option_id', null, 'POST');
-            $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
-            $classLog     = $classPoll . 'Log';
-            foreach ($option_id as $opid) {
-                $optionObject    = new $classOption($opid);
-                $option_text[$i] = trim($option_text[$i]);
-                if ('' !== $option_text[$i]) {
-                    $optionObject->setVar('option_text', $option_text[$i]);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $optionObject->store();
-                } else {
-                    if (false !== $optionObject->delete()) {
-                        $classLog::deleteByOptionId($option->getVar('option_id'));
-                    }
-                }
-                ++$i;
-            }
-            $pollObject->updateCount();
-        }
-        // clear the template cache so changes take effect immediately
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
-        xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-
-        // update topic to indicate it has a poll
-        $topicObject->setVar('topic_haspoll', 1);
-        $topicObject->setVar('poll_id', $pollObject->getVar('poll_id'));
-        $success = $topicHandler->insert($topicObject);
-        if (!$success) {
-            xoops_error($topicHandler->getHtmlErrors());
-        } else {
-            redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
-        }
-        break;// op: save | update
-
-    case 'addmore':
-        $question = $pollObject->getVar('question');
-        unset($pollObject);
-        $poll_form = new \XoopsThemeForm(_MD_NEWBB_POLL_ADDMORE, 'poll_form', 'polls.php', 'post', true);
-        $poll_form->addElement(new \XoopsFormLabel(_MD_NEWBB_POLL_POLLQUESTION, $question));
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-            $option_tray  = $xpOptHandler->renderOptionFormTray($poll_id);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
-            for ($i = 0; $i < 10; ++$i) {
-                $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
-                $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
-                $option_tray->addElement($option_text);
-                $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
-                $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
-                $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
-                $option_tray->addElement($color_select);
-                $option_tray->addElement($color_label);
-                unset($color_select, $color_label, $option_text);
-                if (!next($barcolor_array)) {
-                    reset($barcolor_array);
-                }
-            }
-        }
-        $poll_form->addElement($option_tray);
-        $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-        $poll_form->addElement(new \XoopsFormHidden('op', 'savemore'));
-        $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-        $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-        $poll_form->display();
-        break;
-
-    case 'savemore':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-
-        $option_text   = Request::getString('option_text', '', 'POST');
-        $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
-        $option_string = trim($option_string);
-        if ('' === $option_string) {
-            // irmtfan - issue with javascript:history.go(-1)
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-        }
-        $i            = 0;
-        $option_color = Request::getArray('option_color', null, 'POST');
-        foreach ($option_text as $optxt) {
-            $optxt = trim($optxt);
-            if ('' !== $optxt) {
-                // new xoopspoll module
-                if ($pollModuleHandler->getVar('version') >= 140) {
-                    $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                    $optionObject = $xpOptHandler->create();
-                    $optionObject->setVar('option_text', $optxt);
-                    $optionObject->setVar('poll_id', $poll_id);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $xpOptHandler->insert($optionObject);
-                // old xoopspoll or umfrage or any clone from them
-                } else {
-                    $classOption  = $classPoll . 'Option';
-                    $optionObject = new $classOption();
-                    $optionObject->setVar('option_text', $optxt);
-                    $optionObject->setVar('poll_id', $poll_id);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $optionObject->store();
-                }
-                unset($optionObject);
-            }
-            ++$i;
-        }
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
-        xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-        redirect_header("polls.php?op=edit&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
-        break;
-
-    case 'delete':
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-        xoops_confirm(['op' => 'delete_ok', 'topic_id' => $topic_id, 'poll_id' => $poll_id], 'polls.php', sprintf(_MD_NEWBB_POLL_RUSUREDEL, $pollObject->getVar('question')));
-        break;
-
-    case 'delete_ok':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        //try and delete the poll
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $status = $xpPollHandler->delete($pollObject);
-            if (false !== $status) {
-                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-                $xpOptHandler->deleteByPollId($poll_id);
-                $xpLogHandler->deleteByPollId($poll_id);
-            } else {
-                $msg = $xpPollHandler->getHtmlErrors();
-            }
-            // old xoopspoll or umfrage or any clone from them
-        } else {
-            $status      = $pollObject->delete();
-            $classOption = $classPoll . 'Option';
-            $classLog    = $classPoll . 'Log';
-            if (false !== $status) {
-                $classOption::deleteByPollId($poll_id);
-                $classLog::deleteByPollId($poll_id);
-            } else {
-                $msg = $pollObject->getHtmlErrors();
-            }
-        }
-        if (false !== $status) {
-            require_once $GLOBALS['xoops']->path('class/template.php');
-            xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
-            xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-            // delete comments for this poll
-            xoops_comment_delete($xoopsModule->getVar('mid'), $poll_id);
-
-            $topicObject->setVar('votes', 0); // not sure why we want to clear votes too... but I left it alone
-            $topicObject->setVar('topic_haspoll', 0);
-            $topicObject->setVar('poll_id', 0);
-            $success = $topicHandler->insert($topicObject);
-            if (!$success) {
-                xoops_error($topicHandler->getHtmlErrors());
-                break;
-            }
-        } else {
-            xoops_error($msg);
-            break;
-        }
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
-        break;
-
-    case 'restart':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants   = new XoopsModules\Xoopspoll\Constants();
-            $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $default_poll_duration = (86400 * 10);
-        }
-        $poll_form   = new \XoopsThemeForm(_MD_NEWBB_POLL_RESTARTPOLL, 'poll_form', 'polls.php', 'post', true);
-        $expire_text = new \XoopsFormText(
-            _MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
-            _MD_NEWBB_POLL_EXPIREDAT,
-                                                                                                                                                                                                                     formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
-        ) . '</small>',
-                                         'end_time',
-            20,
-            19,
-            formatTimestamp(time() + $default_poll_duration, 'Y-m-d H:i:s')
-        );
-        $poll_form->addElement($expire_text);
-        $poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1));
-        $poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_RESET, 'reset', 0));
-        $poll_form->addElement(new \XoopsFormHidden('op', 'restart_ok'));
-        $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-        $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-        $poll_form->addElement(new \XoopsFormButton('', 'poll_submit', _MD_NEWBB_POLL_RESTART, 'submit'));
-
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-        $poll_form->display();
-        break;
-
-    case 'restart_ok':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants   = new XoopsModules\Xoopspoll\Constants();
-            $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
-            $poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
-            $poll_mailed           = $classConstants::POLL_MAILED;
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $default_poll_duration = (86400 * 10);
-            $poll_not_mailed       = Xoopspoll\Constants::POLL_NOT_MAILED;
-            $poll_mailed           = Xoopspoll\Constants::POLL_MAILED;
-        }
-
-        $end_time = !Request::getInt('end_time', 0, 'POST');
-        if (0 !== $end_time) {
-            $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
-            $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
-        } else {
-            $pollObject->setVar('end_time', time() + $default_poll_duration);
-        }
-
-        $isNotify = Request::getInt('notify', 0, 'POST');
-        if (!empty($isNotify) && ($end_time > time())) {
-            // if notify, set mail status to "not mailed"
-            $pollObject->setVar('mail_status', $poll_not_mailed);
-        } else {
-            // if not notify, set mail status to already "mailed"
-            $pollObject->setVar('mail_status', $poll_mailed);
-        }
-
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            if (!$xpPollHandler->insert($pollObject)) {  // update the poll
-                xoops_error($pollObject->getHtmlErrors());
-                exit();
-            }
-            if (Request::getInt('reset', 0, 'POST')) { // reset all vote/voter counters
-                /** @var Xoopspoll\OptionHandler $xpOptHandler */
-                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                /** @var Xoopspoll\LogHandler $xpLogHandler */
-                $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-                $xpLogHandler->deleteByPollId($poll_id);
-                $xpOptHandler->resetCountByPollId($poll_id);
-                $xpPollHandler->updateCount($pollObject);
-            }
-            // old xoopspoll or umfrage or any clone from them
-        } else {
-            if (!$pollObject->store()) { // update the poll
-                xoops_error($pollObject->getHtmlErrors());
-                exit();
-            }
-            if (Request::getInt('reset', 0, 'POST')) { // reset all logs
-                $classOption = $classPoll . 'Option';
-                $classLog    = $classPoll . 'Log';
-                $classLog::deleteByPollId($poll_id);
-                $classOption::resetCountByPollId($poll_id);
-                $pollObject->updateCount();
-            }
-        }
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
-        xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
-        break;
-
-    case 'log':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/main.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/index.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
-        }
-        break;
+			$option_empty = true;
+			if (!Request::getString('option_text', '', 'POST')) {
+				// irmtfan - issue with javascript:history.go(-1)
+				redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+			}
+			$option_text = Request::getArray('option_text', '', 'POST');
+			foreach ($option_text as $optxt) {
+				if ('' !== trim($optxt)) {
+					$option_empty = false;
+					break;
+				}
+			}
+			if ($option_empty) {
+				// irmtfan - issue with javascript:history.go(-1)
+				redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+			}
+			$pollObject->setVar('question', Request::getString('question', '', 'POST'));
+			$pollObject->setVar('description', Request::getString('description', '', 'POST'));
+			$end_time = Request::getString('end_time', '', 'POST'); // (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
+			if ('' !== $end_time) {
+				$timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
+				$pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
+			} else {
+				// if expiration date is not set, set it to 10 days from now
+				$pollObject->setVar('end_time', time() + (86400 * 10));
+			}
+
+			$pollObject->setVar('display', 0);
+			$pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
+			$pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
+			$pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
+			if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
+				// if notify, set mail status to "not mailed"
+				$pollObject->setVar('mail_status', Xoopspoll\Constants::POLL_NOT_MAILED);
+			} else {
+				// if not notify, set mail status to already "mailed"
+				$pollObject->setVar('mail_status', Xoopspoll\Constants::POLL_MAILED);
+			}
+			$new_poll_id = $pollObject->store();
+			if (empty($new_poll_id)) {
+				xoops_error($pollObject->getHtmlErrors);
+				break;
+			}
+			$i            = 0;
+			$option_color = Request::getArray('option_color', null, 'POST');
+			$classOption  = $classPoll . 'Option';
+			foreach ($option_text as $optxt) {
+				$optxt = trim($optxt);
+				/** @var Xoopspoll\Option $optionObject */
+				$optionObject = new $classOption();
+				if ('' !== $optxt) {
+					$optionObject->setVar('option_text', $optxt);
+					$optionObject->setVar('option_color', $option_color[$i]);
+					$optionObject->setVar('poll_id', $new_poll_id);
+					$optionObject->store();
+				}
+				++$i;
+			}
+			// clear the template cache so changes take effect immediately
+			require_once $GLOBALS['xoops']->path('class/template.php');
+			xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
+			xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+
+			// update topic to indicate it has a poll
+			$topicObject->setVar('topic_haspoll', 1);
+			$topicObject->setVar('poll_id', $new_poll_id);
+			$success = $topicHandler->insert($topicObject);
+			if (!$success) {
+				xoops_error($topicHandler->getHtmlErrors());
+			} else {
+				redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
+			}
+			break;// op: save
+		}
+	// no break
+	case 'update':
+		// check security token
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
+		/* make sure there's at least one option */
+		$option_text   = Request::getString('option_text', '', 'POST');
+		$option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
+		$option_string = trim($option_string);
+		if ('' === $option_string) {
+			redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+		}
+
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			/** @var Xoopspoll\OptionHandler $xpOptHandler */
+			$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+			/** @var Xoopspoll\LogHandler $xpLogHandler */
+			$xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+			//            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
+			$classConstants   = new XoopsModules\Xoopspoll\Constants();
+			$notify           = Request::getInt('notify', $classConstants::NOTIFICATION_ENABLED, 'POST');
+			$currentTimestamp = time();
+			//$xuEndTimestamp   = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_end_time', null, 'POST'))
+			//                                                             : strtotime(Request::getString('xu_end_time', null, 'POST'));
+			$xuEndTimestamp = strtotime(Request::getString('xu_end_time', null, 'POST'));
+			$endTimestamp   = (!Request::getString('xu_end_time', null, 'POST')) ? ($currentTimestamp + $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
+			//$xuStartTimestamp = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_start_time', null, 'POST'))
+			//                                                             : strtotime(Request::getString('xu_start_time', null, 'POST'));
+			$xuStartTimestamp = strtotime(Request::getString('xu_start_time', null, 'POST'));
+			$startTimestamp   = (!Request::getString('xu_start_time', null, 'POST')) ? ($endTimestamp - $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
+
+			//  don't allow changing start time if there are votes in the log
+			if (($startTimestamp < $pollObject->getVar('start_time'))
+				&& ($xpLogHandler->getTotalVotesByPollId($poll_id) > 0)) {
+				$startTimestamp = $pollObject->getVar('start_time'); //don't change start time
+			}
+
+			$poll_vars = [
+				'user_id'     => Request::getInt('user_id', $GLOBALS['xoopsUser']->uid(), 'POST'),
+				'question'    => Request::getString('question', null, 'POST'),
+				'description' => Request::getText('description', null, 'POST'),
+				'mail_status' => ($classConstants::NOTIFICATION_ENABLED == $notify) ? $classConstants::POLL_NOT_MAILED : $classConstants::POLL_MAILED,
+				'mail_voter'  => Request::getInt('mail_voter', $classConstants::NOT_MAIL_POLL_TO_VOTER, 'POST'),
+				'start_time'  => $startTimestamp,
+				'end_time'    => $endTimestamp,
+				'display'     => Request::getInt('display', $classConstants::DO_NOT_DISPLAY_POLL_IN_BLOCK, 'POST'),
+				'visibility'  => Request::getInt('visibility', $classConstants::HIDE_NEVER, 'POST'),
+				'weight'      => Request::getInt('weight', $classConstants::DEFAULT_WEIGHT, 'POST'),
+				'multiple'    => Request::getInt('multiple', $classConstants::NOT_MULTIPLE_SELECT_POLL, 'POST'),
+				'multilimit'  => Request::getInt('multilimit', $classConstants::MULTIPLE_SELECT_LIMITLESS, 'POST'),
+				'anonymous'   => Request::getInt('anonymous', $classConstants::ANONYMOUS_VOTING_DISALLOWED, 'POST')
+			];
+			$pollObject->setVars($poll_vars);
+			$poll_id = $xpPollHandler->insert($pollObject);
+			if (!$poll_id) {
+				$err = $pollObject->getHtmlErrors();
+				exit($err);
+			}
+
+			// now get the options
+			$optionIdArray    = Request::getArray('option_id', [], 'POST');
+			$optionIdArray    = array_map('intval', $optionIdArray);
+			$optionTextArray  = Request::getArray('option_text', [], 'POST');
+			$optionColorArray = Request::getArray('option_color', [], 'POST');
+
+			foreach ($optionIdArray as $key => $oId) {
+				if (!empty($oId) && ($optionObject = $xpOptHandler->get($oId))) {
+					// existing option object so need to update it
+					$optionTextArray[$key] = trim($optionTextArray[$key]);
+					if ('' === $optionTextArray[$key]) {
+						// want to delete this option
+						if (false !== $xpOptHandler->delete($optionObject)) {
+							// now remove it from the log
+							$xpLogHandler->deleteByOptionId($optionObject->getVar('option_id'));
+							//update vote count in poll
+							$xpPollHandler->updateCount($pollObject);
+						} else {
+							xoops_error($xpLogHandler->getHtmlErrors());
+							break;
+						}
+					} else {
+						$optionObject->setVar('option_text', $optionTextArray[$key]);
+						$optionObject->setVar('option_color', $optionColorArray[$key]);
+						$optionObject->setVar('poll_id', $poll_id);
+						$xpOptHandler->insert($optionObject);
+					}
+				} else {
+					// new option object
+					$optionObject          = $xpOptHandler->create();
+					$optionTextArray[$key] = trim($optionTextArray[$key]);
+					if ('' !== $optionTextArray[$key]) { // ignore if text is empty
+						$optionObject->setVar('option_text', $optionTextArray[$key]);
+						$optionObject->setVar('option_color', $optionColorArray[$key]);
+						$optionObject->setVar('poll_id', $poll_id);
+						$xpOptHandler->insert($optionObject);
+					}
+					unset($optionObject);
+				}
+			}
+			// old xoopspoll or umfrage or any clone from them
+		} else {
+			$pollObject->setVar('question', Request::getString('question', '', 'POST'));
+			$pollObject->setVar('description', Request::getString('description', '', 'POST'));
+
+			$end_time = Request::getString('end_time', '', 'POST');
+			if ('' !== $end_time) {
+				$timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
+				$pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
+			}
+			$pollObject->setVar('display', 0);
+			$pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
+			$pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
+			$pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
+			if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
+				// if notify, set mail status to "not mailed"
+				$pollObject->setVar('mail_status', $classConstants::POLL_NOT_MAILED);
+			} else {
+				// if not notify, set mail status to already "mailed"
+				$pollObject->setVar('mail_status', $classConstants::POLL_MAILED);
+			}
+
+			if (!$pollObject->store()) {
+				xoops_error($pollObject->getHtmlErrors);
+				break;
+			}
+			$i            = 0;
+			$option_id    = Request::getArray('option_id', null, 'POST');
+			$option_color = Request::getArray('option_color', null, 'POST');
+			$classOption  = $classPoll . 'Option';
+			$classLog     = $classPoll . 'Log';
+			foreach ($option_id as $opid) {
+				$optionObject    = new $classOption($opid);
+				$option_text[$i] = trim($option_text[$i]);
+				if ('' !== $option_text[$i]) {
+					$optionObject->setVar('option_text', $option_text[$i]);
+					$optionObject->setVar('option_color', $option_color[$i]);
+					$optionObject->store();
+				} else {
+					if (false !== $optionObject->delete()) {
+						$classLog::deleteByOptionId($option->getVar('option_id'));
+					}
+				}
+				++$i;
+			}
+			$pollObject->updateCount();
+		}
+		// clear the template cache so changes take effect immediately
+		require_once $GLOBALS['xoops']->path('class/template.php');
+		xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
+		xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+
+		// update topic to indicate it has a poll
+		$topicObject->setVar('topic_haspoll', 1);
+		$topicObject->setVar('poll_id', $pollObject->getVar('poll_id'));
+		$success = $topicHandler->insert($topicObject);
+		if (!$success) {
+			xoops_error($topicHandler->getHtmlErrors());
+		} else {
+			redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
+		}
+		break;// op: save | update
+
+	case 'addmore':
+		$question = $pollObject->getVar('question');
+		unset($pollObject);
+		$poll_form = new \XoopsThemeForm(_MD_NEWBB_POLL_ADDMORE, 'poll_form', 'polls.php', 'post', true);
+		$poll_form->addElement(new \XoopsFormLabel(_MD_NEWBB_POLL_POLLQUESTION, $question));
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+			$option_tray  = $xpOptHandler->renderOptionFormTray($poll_id);
+		// old xoopspoll or umfrage or any clone from them
+		} else {
+			$option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
+			$barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+			for ($i = 0; $i < 10; ++$i) {
+				$current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
+				$option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
+				$option_tray->addElement($option_text);
+				$color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
+				$color_select->addOptionArray($barcolor_array);
+				$color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+				$color_label = new \XoopsFormLabel('', "<img src='"
+													  . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
+													  . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+				$option_tray->addElement($color_select);
+				$option_tray->addElement($color_label);
+				unset($color_select, $color_label, $option_text);
+				if (!next($barcolor_array)) {
+					reset($barcolor_array);
+				}
+			}
+		}
+		$poll_form->addElement($option_tray);
+		$poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+		$poll_form->addElement(new \XoopsFormHidden('op', 'savemore'));
+		$poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+		$poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+
+		echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+		$poll_form->display();
+		break;
+
+	case 'savemore':
+		// check security token
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
+
+		$option_text   = Request::getString('option_text', '', 'POST');
+		$option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
+		$option_string = trim($option_string);
+		if ('' === $option_string) {
+			// irmtfan - issue with javascript:history.go(-1)
+			redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+		}
+		$i            = 0;
+		$option_color = Request::getArray('option_color', null, 'POST');
+		foreach ($option_text as $optxt) {
+			$optxt = trim($optxt);
+			if ('' !== $optxt) {
+				// new xoopspoll module
+				if ($pollModuleHandler->getVar('version') >= 140) {
+					$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+					$optionObject = $xpOptHandler->create();
+					$optionObject->setVar('option_text', $optxt);
+					$optionObject->setVar('poll_id', $poll_id);
+					$optionObject->setVar('option_color', $option_color[$i]);
+					$xpOptHandler->insert($optionObject);
+				// old xoopspoll or umfrage or any clone from them
+				} else {
+					$classOption  = $classPoll . 'Option';
+					$optionObject = new $classOption();
+					$optionObject->setVar('option_text', $optxt);
+					$optionObject->setVar('poll_id', $poll_id);
+					$optionObject->setVar('option_color', $option_color[$i]);
+					$optionObject->store();
+				}
+				unset($optionObject);
+			}
+			++$i;
+		}
+		require_once $GLOBALS['xoops']->path('class/template.php');
+		xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
+		xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+		redirect_header("polls.php?op=edit&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
+		break;
+
+	case 'delete':
+		echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+		xoops_confirm(['op' => 'delete_ok', 'topic_id' => $topic_id, 'poll_id' => $poll_id], 'polls.php', sprintf(_MD_NEWBB_POLL_RUSUREDEL, $pollObject->getVar('question')));
+		break;
+
+	case 'delete_ok':
+		// check security token
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
+		//try and delete the poll
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			$status = $xpPollHandler->delete($pollObject);
+			if (false !== $status) {
+				$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+				$xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+				$xpOptHandler->deleteByPollId($poll_id);
+				$xpLogHandler->deleteByPollId($poll_id);
+			} else {
+				$msg = $xpPollHandler->getHtmlErrors();
+			}
+			// old xoopspoll or umfrage or any clone from them
+		} else {
+			$status      = $pollObject->delete();
+			$classOption = $classPoll . 'Option';
+			$classLog    = $classPoll . 'Log';
+			if (false !== $status) {
+				$classOption::deleteByPollId($poll_id);
+				$classLog::deleteByPollId($poll_id);
+			} else {
+				$msg = $pollObject->getHtmlErrors();
+			}
+		}
+		if (false !== $status) {
+			require_once $GLOBALS['xoops']->path('class/template.php');
+			xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
+			xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+			// delete comments for this poll
+			xoops_comment_delete($xoopsModule->getVar('mid'), $poll_id);
+
+			$topicObject->setVar('votes', 0); // not sure why we want to clear votes too... but I left it alone
+			$topicObject->setVar('topic_haspoll', 0);
+			$topicObject->setVar('poll_id', 0);
+			$success = $topicHandler->insert($topicObject);
+			if (!$success) {
+				xoops_error($topicHandler->getHtmlErrors());
+				break;
+			}
+		} else {
+			xoops_error($msg);
+			break;
+		}
+		redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+		break;
+
+	case 'restart':
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			$classConstants   = new XoopsModules\Xoopspoll\Constants();
+			$default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
+		// old xoopspoll or umfrage or any clone from them
+		} else {
+			$default_poll_duration = (86400 * 10);
+		}
+		$poll_form   = new \XoopsThemeForm(_MD_NEWBB_POLL_RESTARTPOLL, 'poll_form', 'polls.php', 'post', true);
+		$expire_text = new \XoopsFormText(
+			_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
+			_MD_NEWBB_POLL_EXPIREDAT,
+																																																					 formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
+		) . '</small>',
+										 'end_time',
+			20,
+			19,
+			formatTimestamp(time() + $default_poll_duration, 'Y-m-d H:i:s')
+		);
+		$poll_form->addElement($expire_text);
+		$poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1));
+		$poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_RESET, 'reset', 0));
+		$poll_form->addElement(new \XoopsFormHidden('op', 'restart_ok'));
+		$poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+		$poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+		$poll_form->addElement(new \XoopsFormButton('', 'poll_submit', _MD_NEWBB_POLL_RESTART, 'submit'));
+
+		echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+		$poll_form->display();
+		break;
+
+	case 'restart_ok':
+		// check security token
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
+
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			$classConstants   = new XoopsModules\Xoopspoll\Constants();
+			$default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
+			$poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
+			$poll_mailed           = $classConstants::POLL_MAILED;
+		// old xoopspoll or umfrage or any clone from them
+		} else {
+			$default_poll_duration = (86400 * 10);
+			$poll_not_mailed       = Xoopspoll\Constants::POLL_NOT_MAILED;
+			$poll_mailed           = Xoopspoll\Constants::POLL_MAILED;
+		}
+
+		$end_time = !Request::getInt('end_time', 0, 'POST');
+		if (0 !== $end_time) {
+			$timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
+			$pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
+		} else {
+			$pollObject->setVar('end_time', time() + $default_poll_duration);
+		}
+
+		$isNotify = Request::getInt('notify', 0, 'POST');
+		if (!empty($isNotify) && ($end_time > time())) {
+			// if notify, set mail status to "not mailed"
+			$pollObject->setVar('mail_status', $poll_not_mailed);
+		} else {
+			// if not notify, set mail status to already "mailed"
+			$pollObject->setVar('mail_status', $poll_mailed);
+		}
+
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			if (!$xpPollHandler->insert($pollObject)) {  // update the poll
+				xoops_error($pollObject->getHtmlErrors());
+				exit();
+			}
+			if (Request::getInt('reset', 0, 'POST')) { // reset all vote/voter counters
+				/** @var Xoopspoll\OptionHandler $xpOptHandler */
+				$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+				/** @var Xoopspoll\LogHandler $xpLogHandler */
+				$xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+				$xpLogHandler->deleteByPollId($poll_id);
+				$xpOptHandler->resetCountByPollId($poll_id);
+				$xpPollHandler->updateCount($pollObject);
+			}
+			// old xoopspoll or umfrage or any clone from them
+		} else {
+			if (!$pollObject->store()) { // update the poll
+				xoops_error($pollObject->getHtmlErrors());
+				exit();
+			}
+			if (Request::getInt('reset', 0, 'POST')) { // reset all logs
+				$classOption = $classPoll . 'Option';
+				$classLog    = $classPoll . 'Log';
+				$classLog::deleteByPollId($poll_id);
+				$classOption::resetCountByPollId($poll_id);
+				$pollObject->updateCount();
+			}
+		}
+		require_once $GLOBALS['xoops']->path('class/template.php');
+		xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
+		xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+		redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+		break;
+
+	case 'log':
+		// new xoopspoll module
+		if ($pollModuleHandler->getVar('version') >= 140) {
+			redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/main.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
+		// old xoopspoll or umfrage or any clone from them
+		} else {
+			redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/index.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
+		}
+		break;
 } // switch
 
 // irmtfan move to footer.php

Switch Indentation +640 added lines, -640 removed lines

@@ -111,648 +111,648 @@
     }
 }
 switch ($op) {
-    case 'add':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_CREATNEWPOLL . "</h4>\n";
-            $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $classOption  = $classPoll . 'Option';
-            $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
-            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
-                                                                                                          . XOOPS_URL
-                                                                                                          . '/userinfo.php?uid='
-                                                                                                          . $GLOBALS['xoopsUser']->getVar('uid')
-                                                                                                          . "'>"
-                                                                                                          . newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
-                                                                                                          . '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
-            $poll_form->addElement($author_label);
-            $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255);
-            $poll_form->addElement($question_text);
-            $desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description');
-            $poll_form->addElement($desc_tarea);
-            $currenttime = formatTimestamp(time(), 'Y-m-d H:i:s');
-            $endtime     = formatTimestamp(time() + 604800, 'Y-m-d H:i:s');
-            $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime) . '</small>', 'end_time', 30, 19, $endtime);
-            $poll_form->addElement($expire_text);
-
-            $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, 0);
-            $poll_form->addElement($weight_text);
-
-            $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', 0);
-            $poll_form->addElement($multi_yn);
-
-            $notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1);
-            $poll_form->addElement($notify_yn);
-
-            $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
-            for ($i = 0; $i < 10; ++$i) {
-                $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
-                $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
-                $option_tray->addElement($option_text);
-                $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
-                $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
-                $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . XOOPS_URL
-                                                      . '/modules/'
-                                                      . $GLOBALS['xoopsModuleConfig']['poll_module']
-                                                      . '/assets/images/colorbars/'
-                                                      . $current_bar
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
-                $option_tray->addElement($color_select);
-                $option_tray->addElement($color_label);
-                if (!next($barcolor_array)) {
-                    reset($barcolor_array);
-                }
-                unset($color_select, $color_label);
-            }
-            $poll_form->addElement($option_tray);
-
-            $poll_form->addElement(new \XoopsFormHidden('op', 'save'));
-            $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-            $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-            $poll_form->addElement(new \XoopsFormHidden('user_id', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0));
-            $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . '</h4>';
-            $poll_form->display();
-        }
-        break; // op: add
-
-    case 'edit':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_EDITPOLL . "</h4>\n";
-            $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $classOption  = $classPoll . 'Option';
-            $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_EDITPOLL, 'poll_form', 'polls.php', 'post', true);
-            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $pollObject->getVar('user_id') . "'>" . newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']) . '</a>');
-            $poll_form->addElement($author_label);
-            $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255, $pollObject->getVar('question', 'E'));
-            $poll_form->addElement($question_text);
-            $desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description', $pollObject->getVar('description', 'E'));
-            $poll_form->addElement($desc_tarea);
-            $date = formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s'); // important "Y-m-d H:i:s" use in jdf function
-            if (!$pollObject->hasExpired()) {
-                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '</small>', 'end_time', 20, 19, $date);
-                $poll_form->addElement($expire_text);
-            } else {
-                // irmtfan full URL - add topic_id
-                $restart_label = new \XoopsFormLabel(
-                    _MD_NEWBB_POLL_EXPIRATION,
-                                                    sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date) . "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_RESTART . '</a>'
-                );
-                $poll_form->addElement($restart_label);
-            }
-            $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, $pollObject->getVar('weight'));
-            $poll_form->addElement($weight_text);
-            $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', $pollObject->getVar('multiple'));
-            $poll_form->addElement($multi_yn);
-            $options_arr  =& $classOption::getAllByPollId($poll_id);
-            $notify_value = 1;
-            if (0 !== $pollObject->getVar('mail_status')) {
-                $notify_value = 0;
-            }
-            $notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', $notify_value);
-            $poll_form->addElement($notify_yn);
-            $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/"));
-            $i              = 0;
-            foreach ($options_arr as $option) {
-                /** @var \XoopsPoll $option */
-                $option_tray->addElement(new \XoopsFormText('', 'option_text[]', 50, 255, $option->getVar('option_text')));
-                $option_tray->addElement(new \XoopsFormHidden('option_id[]', $option->getVar('option_id')));
-                $color_select = new \XoopsFormSelect('', 'option_color[{$i}]', $option->getVar('option_color'));
-                $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
-                $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
-                $option_tray->addElement($color_select);
-                $option_tray->addElement($color_label);
-                unset($color_select, $color_label);
-                ++$i;
-            }
-            // irmtfan full URL
-            $more_label = new \XoopsFormLabel('', "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_ADDMORE . '</a>');
-            $option_tray->addElement($more_label);
-            $poll_form->addElement($option_tray);
-            $poll_form->addElement(new \XoopsFormHidden('op', 'update'));
-            $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-            $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-            $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-            $poll_form->display();
-        }
-        break; // op: edit
-
-    case 'save':
-        // old xoopspoll or umfrage or any clone from them
-        if ($pollModuleHandler->getVar('version') < 140) {
-            // check security token
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            /*
+    	case 'add':
+        	// new xoopspoll module
+        	if ($pollModuleHandler->getVar('version') >= 140) {
+            	echo '<h4>' . _MD_NEWBB_POLL_CREATNEWPOLL . "</h4>\n";
+            	$pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
+        	// old xoopspoll or umfrage or any clone from them
+        	} else {
+            	$classOption  = $classPoll . 'Option';
+            	$poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
+            	$author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
+                                                                                                          	. XOOPS_URL
+                                                                                                          	. '/userinfo.php?uid='
+                                                                                                          	. $GLOBALS['xoopsUser']->getVar('uid')
+                                                                                                          	. "'>"
+                                                                                                          	. newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
+                                                                                                          	. '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
+            	$poll_form->addElement($author_label);
+            	$question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255);
+            	$poll_form->addElement($question_text);
+            	$desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description');
+            	$poll_form->addElement($desc_tarea);
+            	$currenttime = formatTimestamp(time(), 'Y-m-d H:i:s');
+            	$endtime     = formatTimestamp(time() + 604800, 'Y-m-d H:i:s');
+            	$expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime) . '</small>', 'end_time', 30, 19, $endtime);
+            	$poll_form->addElement($expire_text);
+
+            	$weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, 0);
+            	$poll_form->addElement($weight_text);
+
+            	$multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', 0);
+            	$poll_form->addElement($multi_yn);
+
+            	$notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1);
+            	$poll_form->addElement($notify_yn);
+
+            	$option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
+            	$barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+            	for ($i = 0; $i < 10; ++$i) {
+                	$current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
+                	$option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
+                	$option_tray->addElement($option_text);
+                	$color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
+                	$color_select->addOptionArray($barcolor_array);
+                	$color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
+                	$color_label = new \XoopsFormLabel('', "<img src='"
+                                                      	. XOOPS_URL
+                                                      	. '/modules/'
+                                                      	. $GLOBALS['xoopsModuleConfig']['poll_module']
+                                                      	. '/assets/images/colorbars/'
+                                                      	. $current_bar
+                                                      	. "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
+                	$option_tray->addElement($color_select);
+                	$option_tray->addElement($color_label);
+                	if (!next($barcolor_array)) {
+                    	reset($barcolor_array);
+                	}
+                	unset($color_select, $color_label);
+            	}
+            	$poll_form->addElement($option_tray);
+
+            	$poll_form->addElement(new \XoopsFormHidden('op', 'save'));
+            	$poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+            	$poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+            	$poll_form->addElement(new \XoopsFormHidden('user_id', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0));
+            	$poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+            	echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . '</h4>';
+            	$poll_form->display();
+        	}
+        	break; // op: add
+
+    	case 'edit':
+        	// new xoopspoll module
+        	if ($pollModuleHandler->getVar('version') >= 140) {
+            	echo '<h4>' . _MD_NEWBB_POLL_EDITPOLL . "</h4>\n";
+            	$pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
+        	// old xoopspoll or umfrage or any clone from them
+        	} else {
+            	$classOption  = $classPoll . 'Option';
+            	$poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_EDITPOLL, 'poll_form', 'polls.php', 'post', true);
+            	$author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $pollObject->getVar('user_id') . "'>" . newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']) . '</a>');
+            	$poll_form->addElement($author_label);
+            	$question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255, $pollObject->getVar('question', 'E'));
+            	$poll_form->addElement($question_text);
+            	$desc_tarea = new \XoopsFormTextarea(_MD_NEWBB_POLL_POLLDESC, 'description', $pollObject->getVar('description', 'E'));
+            	$poll_form->addElement($desc_tarea);
+            	$date = formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s'); // important "Y-m-d H:i:s" use in jdf function
+            	if (!$pollObject->hasExpired()) {
+                	$expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '</small>', 'end_time', 20, 19, $date);
+                	$poll_form->addElement($expire_text);
+            	} else {
+                	// irmtfan full URL - add topic_id
+                	$restart_label = new \XoopsFormLabel(
+                    	_MD_NEWBB_POLL_EXPIRATION,
+                                                    	sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date) . "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_RESTART . '</a>'
+                	);
+                	$poll_form->addElement($restart_label);
+            	}
+            	$weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, $pollObject->getVar('weight'));
+            	$poll_form->addElement($weight_text);
+            	$multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', $pollObject->getVar('multiple'));
+            	$poll_form->addElement($multi_yn);
+            	$options_arr  =& $classOption::getAllByPollId($poll_id);
+            	$notify_value = 1;
+            	if (0 !== $pollObject->getVar('mail_status')) {
+                	$notify_value = 0;
+            	}
+            	$notify_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', $notify_value);
+            	$poll_form->addElement($notify_yn);
+            	$option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
+            	$barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/"));
+            	$i              = 0;
+            	foreach ($options_arr as $option) {
+                	/** @var \XoopsPoll $option */
+                	$option_tray->addElement(new \XoopsFormText('', 'option_text[]', 50, 255, $option->getVar('option_text')));
+                	$option_tray->addElement(new \XoopsFormHidden('option_id[]', $option->getVar('option_id')));
+                	$color_select = new \XoopsFormSelect('', 'option_color[{$i}]', $option->getVar('option_color'));
+                	$color_select->addOptionArray($barcolor_array);
+                	$color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                	$color_label = new \XoopsFormLabel('', "<img src='"
+                                                      	. $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
+                                                      	. "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+                	$option_tray->addElement($color_select);
+                	$option_tray->addElement($color_label);
+                	unset($color_select, $color_label);
+                	++$i;
+            	}
+            	// irmtfan full URL
+            	$more_label = new \XoopsFormLabel('', "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_ADDMORE . '</a>');
+            	$option_tray->addElement($more_label);
+            	$poll_form->addElement($option_tray);
+            	$poll_form->addElement(new \XoopsFormHidden('op', 'update'));
+            	$poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+            	$poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+            	$poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+
+            	echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+            	$poll_form->display();
+        	}
+        	break; // op: edit
+
+    	case 'save':
+        	// old xoopspoll or umfrage or any clone from them
+        	if ($pollModuleHandler->getVar('version') < 140) {
+            	// check security token
+            	if (!$GLOBALS['xoopsSecurity']->check()) {
+                	redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            	}
+            	/*
              * The option check should be done before submitting
              */
-            $option_empty = true;
-            if (!Request::getString('option_text', '', 'POST')) {
-                // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-            }
-            $option_text = Request::getArray('option_text', '', 'POST');
-            foreach ($option_text as $optxt) {
-                if ('' !== trim($optxt)) {
-                    $option_empty = false;
-                    break;
-                }
-            }
-            if ($option_empty) {
-                // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-            }
-            $pollObject->setVar('question', Request::getString('question', '', 'POST'));
-            $pollObject->setVar('description', Request::getString('description', '', 'POST'));
-            $end_time = Request::getString('end_time', '', 'POST'); // (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
-            if ('' !== $end_time) {
-                $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
-                $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
-            } else {
-                // if expiration date is not set, set it to 10 days from now
-                $pollObject->setVar('end_time', time() + (86400 * 10));
-            }
-
-            $pollObject->setVar('display', 0);
-            $pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
-            $pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
-            $pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
-            if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
-                // if notify, set mail status to "not mailed"
-                $pollObject->setVar('mail_status', Xoopspoll\Constants::POLL_NOT_MAILED);
-            } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', Xoopspoll\Constants::POLL_MAILED);
-            }
-            $new_poll_id = $pollObject->store();
-            if (empty($new_poll_id)) {
-                xoops_error($pollObject->getHtmlErrors);
-                break;
-            }
-            $i            = 0;
-            $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
-            foreach ($option_text as $optxt) {
-                $optxt = trim($optxt);
-                /** @var Xoopspoll\Option $optionObject */
-                $optionObject = new $classOption();
-                if ('' !== $optxt) {
-                    $optionObject->setVar('option_text', $optxt);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $optionObject->setVar('poll_id', $new_poll_id);
-                    $optionObject->store();
-                }
-                ++$i;
-            }
-            // clear the template cache so changes take effect immediately
-            require_once $GLOBALS['xoops']->path('class/template.php');
-            xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
-            xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-
-            // update topic to indicate it has a poll
-            $topicObject->setVar('topic_haspoll', 1);
-            $topicObject->setVar('poll_id', $new_poll_id);
-            $success = $topicHandler->insert($topicObject);
-            if (!$success) {
-                xoops_error($topicHandler->getHtmlErrors());
-            } else {
-                redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
-            }
-            break;// op: save
-        }
-    // no break
-    case 'update':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        /* make sure there's at least one option */
-        $option_text   = Request::getString('option_text', '', 'POST');
-        $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
-        $option_string = trim($option_string);
-        if ('' === $option_string) {
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-        }
-
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            /** @var Xoopspoll\OptionHandler $xpOptHandler */
-            $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-            /** @var Xoopspoll\LogHandler $xpLogHandler */
-            $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-            //            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
-            $classConstants   = new XoopsModules\Xoopspoll\Constants();
-            $notify           = Request::getInt('notify', $classConstants::NOTIFICATION_ENABLED, 'POST');
-            $currentTimestamp = time();
-            //$xuEndTimestamp   = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_end_time', null, 'POST'))
-            //                                                             : strtotime(Request::getString('xu_end_time', null, 'POST'));
-            $xuEndTimestamp = strtotime(Request::getString('xu_end_time', null, 'POST'));
-            $endTimestamp   = (!Request::getString('xu_end_time', null, 'POST')) ? ($currentTimestamp + $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
-            //$xuStartTimestamp = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_start_time', null, 'POST'))
-            //                                                             : strtotime(Request::getString('xu_start_time', null, 'POST'));
-            $xuStartTimestamp = strtotime(Request::getString('xu_start_time', null, 'POST'));
-            $startTimestamp   = (!Request::getString('xu_start_time', null, 'POST')) ? ($endTimestamp - $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
-
-            //  don't allow changing start time if there are votes in the log
-            if (($startTimestamp < $pollObject->getVar('start_time'))
-                && ($xpLogHandler->getTotalVotesByPollId($poll_id) > 0)) {
-                $startTimestamp = $pollObject->getVar('start_time'); //don't change start time
-            }
-
-            $poll_vars = [
-                'user_id'     => Request::getInt('user_id', $GLOBALS['xoopsUser']->uid(), 'POST'),
-                'question'    => Request::getString('question', null, 'POST'),
-                'description' => Request::getText('description', null, 'POST'),
-                'mail_status' => ($classConstants::NOTIFICATION_ENABLED == $notify) ? $classConstants::POLL_NOT_MAILED : $classConstants::POLL_MAILED,
-                'mail_voter'  => Request::getInt('mail_voter', $classConstants::NOT_MAIL_POLL_TO_VOTER, 'POST'),
-                'start_time'  => $startTimestamp,
-                'end_time'    => $endTimestamp,
-                'display'     => Request::getInt('display', $classConstants::DO_NOT_DISPLAY_POLL_IN_BLOCK, 'POST'),
-                'visibility'  => Request::getInt('visibility', $classConstants::HIDE_NEVER, 'POST'),
-                'weight'      => Request::getInt('weight', $classConstants::DEFAULT_WEIGHT, 'POST'),
-                'multiple'    => Request::getInt('multiple', $classConstants::NOT_MULTIPLE_SELECT_POLL, 'POST'),
-                'multilimit'  => Request::getInt('multilimit', $classConstants::MULTIPLE_SELECT_LIMITLESS, 'POST'),
-                'anonymous'   => Request::getInt('anonymous', $classConstants::ANONYMOUS_VOTING_DISALLOWED, 'POST')
-            ];
-            $pollObject->setVars($poll_vars);
-            $poll_id = $xpPollHandler->insert($pollObject);
-            if (!$poll_id) {
-                $err = $pollObject->getHtmlErrors();
-                exit($err);
-            }
-
-            // now get the options
-            $optionIdArray    = Request::getArray('option_id', [], 'POST');
-            $optionIdArray    = array_map('intval', $optionIdArray);
-            $optionTextArray  = Request::getArray('option_text', [], 'POST');
-            $optionColorArray = Request::getArray('option_color', [], 'POST');
-
-            foreach ($optionIdArray as $key => $oId) {
-                if (!empty($oId) && ($optionObject = $xpOptHandler->get($oId))) {
-                    // existing option object so need to update it
-                    $optionTextArray[$key] = trim($optionTextArray[$key]);
-                    if ('' === $optionTextArray[$key]) {
-                        // want to delete this option
-                        if (false !== $xpOptHandler->delete($optionObject)) {
-                            // now remove it from the log
-                            $xpLogHandler->deleteByOptionId($optionObject->getVar('option_id'));
-                            //update vote count in poll
-                            $xpPollHandler->updateCount($pollObject);
-                        } else {
-                            xoops_error($xpLogHandler->getHtmlErrors());
-                            break;
-                        }
-                    } else {
-                        $optionObject->setVar('option_text', $optionTextArray[$key]);
-                        $optionObject->setVar('option_color', $optionColorArray[$key]);
-                        $optionObject->setVar('poll_id', $poll_id);
-                        $xpOptHandler->insert($optionObject);
-                    }
-                } else {
-                    // new option object
-                    $optionObject          = $xpOptHandler->create();
-                    $optionTextArray[$key] = trim($optionTextArray[$key]);
-                    if ('' !== $optionTextArray[$key]) { // ignore if text is empty
-                        $optionObject->setVar('option_text', $optionTextArray[$key]);
-                        $optionObject->setVar('option_color', $optionColorArray[$key]);
-                        $optionObject->setVar('poll_id', $poll_id);
-                        $xpOptHandler->insert($optionObject);
-                    }
-                    unset($optionObject);
-                }
-            }
-            // old xoopspoll or umfrage or any clone from them
-        } else {
-            $pollObject->setVar('question', Request::getString('question', '', 'POST'));
-            $pollObject->setVar('description', Request::getString('description', '', 'POST'));
-
-            $end_time = Request::getString('end_time', '', 'POST');
-            if ('' !== $end_time) {
-                $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
-                $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
-            }
-            $pollObject->setVar('display', 0);
-            $pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
-            $pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
-            $pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
-            if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
-                // if notify, set mail status to "not mailed"
-                $pollObject->setVar('mail_status', $classConstants::POLL_NOT_MAILED);
-            } else {
-                // if not notify, set mail status to already "mailed"
-                $pollObject->setVar('mail_status', $classConstants::POLL_MAILED);
-            }
-
-            if (!$pollObject->store()) {
-                xoops_error($pollObject->getHtmlErrors);
-                break;
-            }
-            $i            = 0;
-            $option_id    = Request::getArray('option_id', null, 'POST');
-            $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
-            $classLog     = $classPoll . 'Log';
-            foreach ($option_id as $opid) {
-                $optionObject    = new $classOption($opid);
-                $option_text[$i] = trim($option_text[$i]);
-                if ('' !== $option_text[$i]) {
-                    $optionObject->setVar('option_text', $option_text[$i]);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $optionObject->store();
-                } else {
-                    if (false !== $optionObject->delete()) {
-                        $classLog::deleteByOptionId($option->getVar('option_id'));
-                    }
-                }
-                ++$i;
-            }
-            $pollObject->updateCount();
-        }
-        // clear the template cache so changes take effect immediately
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
-        xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-
-        // update topic to indicate it has a poll
-        $topicObject->setVar('topic_haspoll', 1);
-        $topicObject->setVar('poll_id', $pollObject->getVar('poll_id'));
-        $success = $topicHandler->insert($topicObject);
-        if (!$success) {
-            xoops_error($topicHandler->getHtmlErrors());
-        } else {
-            redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
-        }
-        break;// op: save | update
-
-    case 'addmore':
-        $question = $pollObject->getVar('question');
-        unset($pollObject);
-        $poll_form = new \XoopsThemeForm(_MD_NEWBB_POLL_ADDMORE, 'poll_form', 'polls.php', 'post', true);
-        $poll_form->addElement(new \XoopsFormLabel(_MD_NEWBB_POLL_POLLQUESTION, $question));
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-            $option_tray  = $xpOptHandler->renderOptionFormTray($poll_id);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
-            for ($i = 0; $i < 10; ++$i) {
-                $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
-                $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
-                $option_tray->addElement($option_text);
-                $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
-                $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
-                $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
-                $option_tray->addElement($color_select);
-                $option_tray->addElement($color_label);
-                unset($color_select, $color_label, $option_text);
-                if (!next($barcolor_array)) {
-                    reset($barcolor_array);
-                }
-            }
-        }
-        $poll_form->addElement($option_tray);
-        $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-        $poll_form->addElement(new \XoopsFormHidden('op', 'savemore'));
-        $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-        $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-        $poll_form->display();
-        break;
-
-    case 'savemore':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-
-        $option_text   = Request::getString('option_text', '', 'POST');
-        $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
-        $option_string = trim($option_string);
-        if ('' === $option_string) {
-            // irmtfan - issue with javascript:history.go(-1)
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
-        }
-        $i            = 0;
-        $option_color = Request::getArray('option_color', null, 'POST');
-        foreach ($option_text as $optxt) {
-            $optxt = trim($optxt);
-            if ('' !== $optxt) {
-                // new xoopspoll module
-                if ($pollModuleHandler->getVar('version') >= 140) {
-                    $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                    $optionObject = $xpOptHandler->create();
-                    $optionObject->setVar('option_text', $optxt);
-                    $optionObject->setVar('poll_id', $poll_id);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $xpOptHandler->insert($optionObject);
-                // old xoopspoll or umfrage or any clone from them
-                } else {
-                    $classOption  = $classPoll . 'Option';
-                    $optionObject = new $classOption();
-                    $optionObject->setVar('option_text', $optxt);
-                    $optionObject->setVar('poll_id', $poll_id);
-                    $optionObject->setVar('option_color', $option_color[$i]);
-                    $optionObject->store();
-                }
-                unset($optionObject);
-            }
-            ++$i;
-        }
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
-        xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-        redirect_header("polls.php?op=edit&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
-        break;
-
-    case 'delete':
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-        xoops_confirm(['op' => 'delete_ok', 'topic_id' => $topic_id, 'poll_id' => $poll_id], 'polls.php', sprintf(_MD_NEWBB_POLL_RUSUREDEL, $pollObject->getVar('question')));
-        break;
-
-    case 'delete_ok':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        //try and delete the poll
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $status = $xpPollHandler->delete($pollObject);
-            if (false !== $status) {
-                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-                $xpOptHandler->deleteByPollId($poll_id);
-                $xpLogHandler->deleteByPollId($poll_id);
-            } else {
-                $msg = $xpPollHandler->getHtmlErrors();
-            }
-            // old xoopspoll or umfrage or any clone from them
-        } else {
-            $status      = $pollObject->delete();
-            $classOption = $classPoll . 'Option';
-            $classLog    = $classPoll . 'Log';
-            if (false !== $status) {
-                $classOption::deleteByPollId($poll_id);
-                $classLog::deleteByPollId($poll_id);
-            } else {
-                $msg = $pollObject->getHtmlErrors();
-            }
-        }
-        if (false !== $status) {
-            require_once $GLOBALS['xoops']->path('class/template.php');
-            xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
-            xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-            // delete comments for this poll
-            xoops_comment_delete($xoopsModule->getVar('mid'), $poll_id);
-
-            $topicObject->setVar('votes', 0); // not sure why we want to clear votes too... but I left it alone
-            $topicObject->setVar('topic_haspoll', 0);
-            $topicObject->setVar('poll_id', 0);
-            $success = $topicHandler->insert($topicObject);
-            if (!$success) {
-                xoops_error($topicHandler->getHtmlErrors());
-                break;
-            }
-        } else {
-            xoops_error($msg);
-            break;
-        }
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
-        break;
-
-    case 'restart':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants   = new XoopsModules\Xoopspoll\Constants();
-            $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $default_poll_duration = (86400 * 10);
-        }
-        $poll_form   = new \XoopsThemeForm(_MD_NEWBB_POLL_RESTARTPOLL, 'poll_form', 'polls.php', 'post', true);
-        $expire_text = new \XoopsFormText(
-            _MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
-            _MD_NEWBB_POLL_EXPIREDAT,
-                                                                                                                                                                                                                     formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
-        ) . '</small>',
-                                         'end_time',
-            20,
-            19,
-            formatTimestamp(time() + $default_poll_duration, 'Y-m-d H:i:s')
-        );
-        $poll_form->addElement($expire_text);
-        $poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1));
-        $poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_RESET, 'reset', 0));
-        $poll_form->addElement(new \XoopsFormHidden('op', 'restart_ok'));
-        $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
-        $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
-        $poll_form->addElement(new \XoopsFormButton('', 'poll_submit', _MD_NEWBB_POLL_RESTART, 'submit'));
-
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
-        $poll_form->display();
-        break;
-
-    case 'restart_ok':
-        // check security token
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants   = new XoopsModules\Xoopspoll\Constants();
-            $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
-            $poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
-            $poll_mailed           = $classConstants::POLL_MAILED;
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            $default_poll_duration = (86400 * 10);
-            $poll_not_mailed       = Xoopspoll\Constants::POLL_NOT_MAILED;
-            $poll_mailed           = Xoopspoll\Constants::POLL_MAILED;
-        }
-
-        $end_time = !Request::getInt('end_time', 0, 'POST');
-        if (0 !== $end_time) {
-            $timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
-            $pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
-        } else {
-            $pollObject->setVar('end_time', time() + $default_poll_duration);
-        }
-
-        $isNotify = Request::getInt('notify', 0, 'POST');
-        if (!empty($isNotify) && ($end_time > time())) {
-            // if notify, set mail status to "not mailed"
-            $pollObject->setVar('mail_status', $poll_not_mailed);
-        } else {
-            // if not notify, set mail status to already "mailed"
-            $pollObject->setVar('mail_status', $poll_mailed);
-        }
-
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            if (!$xpPollHandler->insert($pollObject)) {  // update the poll
-                xoops_error($pollObject->getHtmlErrors());
-                exit();
-            }
-            if (Request::getInt('reset', 0, 'POST')) { // reset all vote/voter counters
-                /** @var Xoopspoll\OptionHandler $xpOptHandler */
-                $xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
-                /** @var Xoopspoll\LogHandler $xpLogHandler */
-                $xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
-                $xpLogHandler->deleteByPollId($poll_id);
-                $xpOptHandler->resetCountByPollId($poll_id);
-                $xpPollHandler->updateCount($pollObject);
-            }
-            // old xoopspoll or umfrage or any clone from them
-        } else {
-            if (!$pollObject->store()) { // update the poll
-                xoops_error($pollObject->getHtmlErrors());
-                exit();
-            }
-            if (Request::getInt('reset', 0, 'POST')) { // reset all logs
-                $classOption = $classPoll . 'Option';
-                $classLog    = $classPoll . 'Log';
-                $classLog::deleteByPollId($poll_id);
-                $classOption::resetCountByPollId($poll_id);
-                $pollObject->updateCount();
-            }
-        }
-        require_once $GLOBALS['xoops']->path('class/template.php');
-        xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
-        xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
-        break;
-
-    case 'log':
-        // new xoopspoll module
-        if ($pollModuleHandler->getVar('version') >= 140) {
-            redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/main.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
-        // old xoopspoll or umfrage or any clone from them
-        } else {
-            redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/index.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
-        }
-        break;
+            	$option_empty = true;
+            	if (!Request::getString('option_text', '', 'POST')) {
+                	// irmtfan - issue with javascript:history.go(-1)
+                	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+            	}
+            	$option_text = Request::getArray('option_text', '', 'POST');
+            	foreach ($option_text as $optxt) {
+                	if ('' !== trim($optxt)) {
+                    	$option_empty = false;
+                    	break;
+                	}
+            	}
+            	if ($option_empty) {
+                	// irmtfan - issue with javascript:history.go(-1)
+                	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+            	}
+            	$pollObject->setVar('question', Request::getString('question', '', 'POST'));
+            	$pollObject->setVar('description', Request::getString('description', '', 'POST'));
+            	$end_time = Request::getString('end_time', '', 'POST'); // (empty($_POST['end_time'])) ? "" : $_POST['end_time'];
+            	if ('' !== $end_time) {
+                	$timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
+                	$pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
+            	} else {
+                	// if expiration date is not set, set it to 10 days from now
+                	$pollObject->setVar('end_time', time() + (86400 * 10));
+            	}
+
+            	$pollObject->setVar('display', 0);
+            	$pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
+            	$pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
+            	$pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
+            	if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
+                	// if notify, set mail status to "not mailed"
+                	$pollObject->setVar('mail_status', Xoopspoll\Constants::POLL_NOT_MAILED);
+            	} else {
+                	// if not notify, set mail status to already "mailed"
+                	$pollObject->setVar('mail_status', Xoopspoll\Constants::POLL_MAILED);
+            	}
+            	$new_poll_id = $pollObject->store();
+            	if (empty($new_poll_id)) {
+                	xoops_error($pollObject->getHtmlErrors);
+                	break;
+            	}
+            	$i            = 0;
+            	$option_color = Request::getArray('option_color', null, 'POST');
+            	$classOption  = $classPoll . 'Option';
+            	foreach ($option_text as $optxt) {
+                	$optxt = trim($optxt);
+                	/** @var Xoopspoll\Option $optionObject */
+                	$optionObject = new $classOption();
+                	if ('' !== $optxt) {
+                    	$optionObject->setVar('option_text', $optxt);
+                    	$optionObject->setVar('option_color', $option_color[$i]);
+                    	$optionObject->setVar('poll_id', $new_poll_id);
+                    	$optionObject->store();
+                	}
+                	++$i;
+            	}
+            	// clear the template cache so changes take effect immediately
+            	require_once $GLOBALS['xoops']->path('class/template.php');
+            	xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
+            	xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+
+            	// update topic to indicate it has a poll
+            	$topicObject->setVar('topic_haspoll', 1);
+            	$topicObject->setVar('poll_id', $new_poll_id);
+            	$success = $topicHandler->insert($topicObject);
+            	if (!$success) {
+                	xoops_error($topicHandler->getHtmlErrors());
+            	} else {
+                	redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
+            	}
+            	break;// op: save
+        	}
+    	// no break
+    	case 'update':
+        	// check security token
+        	if (!$GLOBALS['xoopsSecurity']->check()) {
+            	redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        	}
+        	/* make sure there's at least one option */
+        	$option_text   = Request::getString('option_text', '', 'POST');
+        	$option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
+        	$option_string = trim($option_string);
+        	if ('' === $option_string) {
+            	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+        	}
+
+        	// new xoopspoll module
+        	if ($pollModuleHandler->getVar('version') >= 140) {
+            	/** @var Xoopspoll\OptionHandler $xpOptHandler */
+            	$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+            	/** @var Xoopspoll\LogHandler $xpLogHandler */
+            	$xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+            	//            $classRequest = ucfirst($GLOBALS['xoopsModuleConfig']["poll_module"]) . "Request";
+            	$classConstants   = new XoopsModules\Xoopspoll\Constants();
+            	$notify           = Request::getInt('notify', $classConstants::NOTIFICATION_ENABLED, 'POST');
+            	$currentTimestamp = time();
+            	//$xuEndTimestamp   = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_end_time', null, 'POST'))
+            	//                                                             : strtotime(Request::getString('xu_end_time', null, 'POST'));
+            	$xuEndTimestamp = strtotime(Request::getString('xu_end_time', null, 'POST'));
+            	$endTimestamp   = (!Request::getString('xu_end_time', null, 'POST')) ? ($currentTimestamp + $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuEndTimestamp);
+            	//$xuStartTimestamp = method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime(Request::getString('xu_start_time', null, 'POST'))
+            	//                                                             : strtotime(Request::getString('xu_start_time', null, 'POST'));
+            	$xuStartTimestamp = strtotime(Request::getString('xu_start_time', null, 'POST'));
+            	$startTimestamp   = (!Request::getString('xu_start_time', null, 'POST')) ? ($endTimestamp - $classConstants::DEFAULT_POLL_DURATION) : userTimeToServerTime($xuStartTimestamp);
+
+            	//  don't allow changing start time if there are votes in the log
+            	if (($startTimestamp < $pollObject->getVar('start_time'))
+                	&& ($xpLogHandler->getTotalVotesByPollId($poll_id) > 0)) {
+                	$startTimestamp = $pollObject->getVar('start_time'); //don't change start time
+            	}
+
+            	$poll_vars = [
+                	'user_id'     => Request::getInt('user_id', $GLOBALS['xoopsUser']->uid(), 'POST'),
+                	'question'    => Request::getString('question', null, 'POST'),
+                	'description' => Request::getText('description', null, 'POST'),
+                	'mail_status' => ($classConstants::NOTIFICATION_ENABLED == $notify) ? $classConstants::POLL_NOT_MAILED : $classConstants::POLL_MAILED,
+                	'mail_voter'  => Request::getInt('mail_voter', $classConstants::NOT_MAIL_POLL_TO_VOTER, 'POST'),
+                	'start_time'  => $startTimestamp,
+                	'end_time'    => $endTimestamp,
+                	'display'     => Request::getInt('display', $classConstants::DO_NOT_DISPLAY_POLL_IN_BLOCK, 'POST'),
+                	'visibility'  => Request::getInt('visibility', $classConstants::HIDE_NEVER, 'POST'),
+                	'weight'      => Request::getInt('weight', $classConstants::DEFAULT_WEIGHT, 'POST'),
+                	'multiple'    => Request::getInt('multiple', $classConstants::NOT_MULTIPLE_SELECT_POLL, 'POST'),
+                	'multilimit'  => Request::getInt('multilimit', $classConstants::MULTIPLE_SELECT_LIMITLESS, 'POST'),
+                	'anonymous'   => Request::getInt('anonymous', $classConstants::ANONYMOUS_VOTING_DISALLOWED, 'POST')
+            	];
+            	$pollObject->setVars($poll_vars);
+            	$poll_id = $xpPollHandler->insert($pollObject);
+            	if (!$poll_id) {
+                	$err = $pollObject->getHtmlErrors();
+                	exit($err);
+            	}
+
+            	// now get the options
+            	$optionIdArray    = Request::getArray('option_id', [], 'POST');
+            	$optionIdArray    = array_map('intval', $optionIdArray);
+            	$optionTextArray  = Request::getArray('option_text', [], 'POST');
+            	$optionColorArray = Request::getArray('option_color', [], 'POST');
+
+            	foreach ($optionIdArray as $key => $oId) {
+                	if (!empty($oId) && ($optionObject = $xpOptHandler->get($oId))) {
+                    	// existing option object so need to update it
+                    	$optionTextArray[$key] = trim($optionTextArray[$key]);
+                    	if ('' === $optionTextArray[$key]) {
+                        	// want to delete this option
+                        	if (false !== $xpOptHandler->delete($optionObject)) {
+                            	// now remove it from the log
+                            	$xpLogHandler->deleteByOptionId($optionObject->getVar('option_id'));
+                            	//update vote count in poll
+                            	$xpPollHandler->updateCount($pollObject);
+                        	} else {
+                            	xoops_error($xpLogHandler->getHtmlErrors());
+                            	break;
+                        	}
+                    	} else {
+                        	$optionObject->setVar('option_text', $optionTextArray[$key]);
+                        	$optionObject->setVar('option_color', $optionColorArray[$key]);
+                        	$optionObject->setVar('poll_id', $poll_id);
+                        	$xpOptHandler->insert($optionObject);
+                    	}
+                	} else {
+                    	// new option object
+                    	$optionObject          = $xpOptHandler->create();
+                    	$optionTextArray[$key] = trim($optionTextArray[$key]);
+                    	if ('' !== $optionTextArray[$key]) { // ignore if text is empty
+                        	$optionObject->setVar('option_text', $optionTextArray[$key]);
+                        	$optionObject->setVar('option_color', $optionColorArray[$key]);
+                        	$optionObject->setVar('poll_id', $poll_id);
+                        	$xpOptHandler->insert($optionObject);
+                    	}
+                    	unset($optionObject);
+                	}
+            	}
+            	// old xoopspoll or umfrage or any clone from them
+        	} else {
+            	$pollObject->setVar('question', Request::getString('question', '', 'POST'));
+            	$pollObject->setVar('description', Request::getString('description', '', 'POST'));
+
+            	$end_time = Request::getString('end_time', '', 'POST');
+            	if ('' !== $end_time) {
+                	$timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
+                	$pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
+            	}
+            	$pollObject->setVar('display', 0);
+            	$pollObject->setVar('weight', Request::getInt('weight', 0, 'POST'));
+            	$pollObject->setVar('multiple', Request::getInt('multiple', 0, 'POST'));
+            	$pollObject->setVar('user_id', Request::getInt('user_id', 0, 'POST'));
+            	if (Request::getInt('notify', 0, 'POST') && $end_time > time()) {
+                	// if notify, set mail status to "not mailed"
+                	$pollObject->setVar('mail_status', $classConstants::POLL_NOT_MAILED);
+            	} else {
+                	// if not notify, set mail status to already "mailed"
+                	$pollObject->setVar('mail_status', $classConstants::POLL_MAILED);
+            	}
+
+            	if (!$pollObject->store()) {
+                	xoops_error($pollObject->getHtmlErrors);
+                	break;
+            	}
+            	$i            = 0;
+            	$option_id    = Request::getArray('option_id', null, 'POST');
+            	$option_color = Request::getArray('option_color', null, 'POST');
+            	$classOption  = $classPoll . 'Option';
+            	$classLog     = $classPoll . 'Log';
+            	foreach ($option_id as $opid) {
+                	$optionObject    = new $classOption($opid);
+                	$option_text[$i] = trim($option_text[$i]);
+                	if ('' !== $option_text[$i]) {
+                    	$optionObject->setVar('option_text', $option_text[$i]);
+                    	$optionObject->setVar('option_color', $option_color[$i]);
+                    	$optionObject->store();
+                	} else {
+                    	if (false !== $optionObject->delete()) {
+                        	$classLog::deleteByOptionId($option->getVar('option_id'));
+                    	}
+                	}
+                	++$i;
+            	}
+            	$pollObject->updateCount();
+        	}
+        	// clear the template cache so changes take effect immediately
+        	require_once $GLOBALS['xoops']->path('class/template.php');
+        	xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
+        	xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+
+        	// update topic to indicate it has a poll
+        	$topicObject->setVar('topic_haspoll', 1);
+        	$topicObject->setVar('poll_id', $pollObject->getVar('poll_id'));
+        	$success = $topicHandler->insert($topicObject);
+        	if (!$success) {
+            	xoops_error($topicHandler->getHtmlErrors());
+        	} else {
+            	redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
+        	}
+        	break;// op: save | update
+
+    	case 'addmore':
+        	$question = $pollObject->getVar('question');
+        	unset($pollObject);
+        	$poll_form = new \XoopsThemeForm(_MD_NEWBB_POLL_ADDMORE, 'poll_form', 'polls.php', 'post', true);
+        	$poll_form->addElement(new \XoopsFormLabel(_MD_NEWBB_POLL_POLLQUESTION, $question));
+        	// new xoopspoll module
+        	if ($pollModuleHandler->getVar('version') >= 140) {
+            	$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+            	$option_tray  = $xpOptHandler->renderOptionFormTray($poll_id);
+        	// old xoopspoll or umfrage or any clone from them
+        	} else {
+            	$option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
+            	$barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+            	for ($i = 0; $i < 10; ++$i) {
+                	$current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
+                	$option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
+                	$option_tray->addElement($option_text);
+                	$color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
+                	$color_select->addOptionArray($barcolor_array);
+                	$color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                	$color_label = new \XoopsFormLabel('', "<img src='"
+                                                      	. $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
+                                                      	. "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+                	$option_tray->addElement($color_select);
+                	$option_tray->addElement($color_label);
+                	unset($color_select, $color_label, $option_text);
+                	if (!next($barcolor_array)) {
+                    	reset($barcolor_array);
+                	}
+            	}
+        	}
+        	$poll_form->addElement($option_tray);
+        	$poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
+        	$poll_form->addElement(new \XoopsFormHidden('op', 'savemore'));
+        	$poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+        	$poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+
+        	echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        	$poll_form->display();
+        	break;
+
+    	case 'savemore':
+        	// check security token
+        	if (!$GLOBALS['xoopsSecurity']->check()) {
+            	redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        	}
+
+        	$option_text   = Request::getString('option_text', '', 'POST');
+        	$option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
+        	$option_string = trim($option_string);
+        	if ('' === $option_string) {
+            	// irmtfan - issue with javascript:history.go(-1)
+            	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+        	}
+        	$i            = 0;
+        	$option_color = Request::getArray('option_color', null, 'POST');
+        	foreach ($option_text as $optxt) {
+            	$optxt = trim($optxt);
+            	if ('' !== $optxt) {
+                	// new xoopspoll module
+                	if ($pollModuleHandler->getVar('version') >= 140) {
+                    	$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+                    	$optionObject = $xpOptHandler->create();
+                    	$optionObject->setVar('option_text', $optxt);
+                    	$optionObject->setVar('poll_id', $poll_id);
+                    	$optionObject->setVar('option_color', $option_color[$i]);
+                    	$xpOptHandler->insert($optionObject);
+                	// old xoopspoll or umfrage or any clone from them
+                	} else {
+                    	$classOption  = $classPoll . 'Option';
+                    	$optionObject = new $classOption();
+                    	$optionObject->setVar('option_text', $optxt);
+                    	$optionObject->setVar('poll_id', $poll_id);
+                    	$optionObject->setVar('option_color', $option_color[$i]);
+                    	$optionObject->store();
+                	}
+                	unset($optionObject);
+            	}
+            	++$i;
+        	}
+        	require_once $GLOBALS['xoops']->path('class/template.php');
+        	xoops_template_clear_module_cache($GLOBALS['xoopsModule']->getVar('mid'));
+        	xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+        	redirect_header("polls.php?op=edit&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
+        	break;
+
+    	case 'delete':
+        	echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        	xoops_confirm(['op' => 'delete_ok', 'topic_id' => $topic_id, 'poll_id' => $poll_id], 'polls.php', sprintf(_MD_NEWBB_POLL_RUSUREDEL, $pollObject->getVar('question')));
+        	break;
+
+    	case 'delete_ok':
+        	// check security token
+        	if (!$GLOBALS['xoopsSecurity']->check()) {
+            	redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        	}
+        	//try and delete the poll
+        	// new xoopspoll module
+        	if ($pollModuleHandler->getVar('version') >= 140) {
+            	$status = $xpPollHandler->delete($pollObject);
+            	if (false !== $status) {
+                	$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+                	$xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+                	$xpOptHandler->deleteByPollId($poll_id);
+                	$xpLogHandler->deleteByPollId($poll_id);
+            	} else {
+                	$msg = $xpPollHandler->getHtmlErrors();
+            	}
+            	// old xoopspoll or umfrage or any clone from them
+        	} else {
+            	$status      = $pollObject->delete();
+            	$classOption = $classPoll . 'Option';
+            	$classLog    = $classPoll . 'Log';
+            	if (false !== $status) {
+                	$classOption::deleteByPollId($poll_id);
+                	$classLog::deleteByPollId($poll_id);
+            	} else {
+                	$msg = $pollObject->getHtmlErrors();
+            	}
+        	}
+        	if (false !== $status) {
+            	require_once $GLOBALS['xoops']->path('class/template.php');
+            	xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
+            	xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+            	// delete comments for this poll
+            	xoops_comment_delete($xoopsModule->getVar('mid'), $poll_id);
+
+            	$topicObject->setVar('votes', 0); // not sure why we want to clear votes too... but I left it alone
+            	$topicObject->setVar('topic_haspoll', 0);
+            	$topicObject->setVar('poll_id', 0);
+            	$success = $topicHandler->insert($topicObject);
+            	if (!$success) {
+                	xoops_error($topicHandler->getHtmlErrors());
+                	break;
+            	}
+        	} else {
+            	xoops_error($msg);
+            	break;
+        	}
+        	redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+        	break;
+
+    	case 'restart':
+        	// new xoopspoll module
+        	if ($pollModuleHandler->getVar('version') >= 140) {
+            	$classConstants   = new XoopsModules\Xoopspoll\Constants();
+            	$default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
+        	// old xoopspoll or umfrage or any clone from them
+        	} else {
+            	$default_poll_duration = (86400 * 10);
+        	}
+        	$poll_form   = new \XoopsThemeForm(_MD_NEWBB_POLL_RESTARTPOLL, 'poll_form', 'polls.php', 'post', true);
+        	$expire_text = new \XoopsFormText(
+            	_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
+            	_MD_NEWBB_POLL_EXPIREDAT,
+                                                                                                                                                                                                                     	formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
+        	) . '</small>',
+                                         	'end_time',
+            	20,
+            	19,
+            	formatTimestamp(time() + $default_poll_duration, 'Y-m-d H:i:s')
+        	);
+        	$poll_form->addElement($expire_text);
+        	$poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_NOTIFY, 'notify', 1));
+        	$poll_form->addElement(new \XoopsFormRadioYN(_MD_NEWBB_POLL_RESET, 'reset', 0));
+        	$poll_form->addElement(new \XoopsFormHidden('op', 'restart_ok'));
+        	$poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
+        	$poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
+        	$poll_form->addElement(new \XoopsFormButton('', 'poll_submit', _MD_NEWBB_POLL_RESTART, 'submit'));
+
+        	echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        	$poll_form->display();
+        	break;
+
+    	case 'restart_ok':
+        	// check security token
+        	if (!$GLOBALS['xoopsSecurity']->check()) {
+            	redirect_header(Request::getString('PHP_SELF', '', 'SERVER'), 2, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+        	}
+
+        	// new xoopspoll module
+        	if ($pollModuleHandler->getVar('version') >= 140) {
+            	$classConstants   = new XoopsModules\Xoopspoll\Constants();
+            	$default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
+            	$poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
+            	$poll_mailed           = $classConstants::POLL_MAILED;
+        	// old xoopspoll or umfrage or any clone from them
+        	} else {
+            	$default_poll_duration = (86400 * 10);
+            	$poll_not_mailed       = Xoopspoll\Constants::POLL_NOT_MAILED;
+            	$poll_mailed           = Xoopspoll\Constants::POLL_MAILED;
+        	}
+
+        	$end_time = !Request::getInt('end_time', 0, 'POST');
+        	if (0 !== $end_time) {
+            	$timezone = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('timezone') : null;
+            	$pollObject->setVar('end_time', userTimeToServerTime(method_exists('XoopsLocal', 'strtotime') ? XoopsLocal::strtotime($end_time) : strtotime($end_time), $timezone));
+        	} else {
+            	$pollObject->setVar('end_time', time() + $default_poll_duration);
+        	}
+
+        	$isNotify = Request::getInt('notify', 0, 'POST');
+        	if (!empty($isNotify) && ($end_time > time())) {
+            	// if notify, set mail status to "not mailed"
+            	$pollObject->setVar('mail_status', $poll_not_mailed);
+        	} else {
+            	// if not notify, set mail status to already "mailed"
+            	$pollObject->setVar('mail_status', $poll_mailed);
+        	}
+
+        	// new xoopspoll module
+        	if ($pollModuleHandler->getVar('version') >= 140) {
+            	if (!$xpPollHandler->insert($pollObject)) {  // update the poll
+                	xoops_error($pollObject->getHtmlErrors());
+                	exit();
+            	}
+            	if (Request::getInt('reset', 0, 'POST')) { // reset all vote/voter counters
+                	/** @var Xoopspoll\OptionHandler $xpOptHandler */
+                	$xpOptHandler = Xoopspoll\Helper::getInstance()->getHandler('Option');
+                	/** @var Xoopspoll\LogHandler $xpLogHandler */
+                	$xpLogHandler = Xoopspoll\Helper::getInstance()->getHandler('Log');
+                	$xpLogHandler->deleteByPollId($poll_id);
+                	$xpOptHandler->resetCountByPollId($poll_id);
+                	$xpPollHandler->updateCount($pollObject);
+            	}
+            	// old xoopspoll or umfrage or any clone from them
+        	} else {
+            	if (!$pollObject->store()) { // update the poll
+                	xoops_error($pollObject->getHtmlErrors());
+                	exit();
+            	}
+            	if (Request::getInt('reset', 0, 'POST')) { // reset all logs
+                	$classOption = $classPoll . 'Option';
+                	$classLog    = $classPoll . 'Log';
+                	$classLog::deleteByPollId($poll_id);
+                	$classOption::resetCountByPollId($poll_id);
+                	$pollObject->updateCount();
+            	}
+        	}
+        	require_once $GLOBALS['xoops']->path('class/template.php');
+        	xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
+        	xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
+        	redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+        	break;
+
+    	case 'log':
+        	// new xoopspoll module
+        	if ($pollModuleHandler->getVar('version') >= 140) {
+            	redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/main.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
+        	// old xoopspoll or umfrage or any clone from them
+        	} else {
+            	redirect_header($GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/admin/index.php?op=log&amp;poll_id={$poll_id}"), 2, _MD_NEWBB_POLL_VIEWLOG);
+        	}
+        	break;
 } // switch
 
 // irmtfan move to footer.php

Spacing +47 added lines, -47 removed lines

@@ -23,7 +23,7 @@ 
 
 // rewrite by irmtfan and zyspec to accept xoopspoll 1.4 and all old xoopspoll and umfrage versions and all clones
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 require_once $GLOBALS['xoops']->path('class/xoopslists.php');
 require_once $GLOBALS['xoops']->path('class/xoopsblock.php');
@@ -56,18 +56,18 @@ 
 if (is_object($topicObject)) {
     $forum_id = $topicObject->getVar('forum_id');
 } else {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_POLLMODULE_ERROR . ': ' . _MD_NEWBB_FORUMNOEXIST);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_POLLMODULE_ERROR.': '._MD_NEWBB_FORUMNOEXIST);
 }
 // forum access permission
 /** @var Newbb\ForumHandler $forumHandler */
 $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 $forumObject  = $forumHandler->get($forum_id);
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 // topic view permission
 if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
-    redirect_header('viewforum.php?forum=' . $forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
+    redirect_header('viewforum.php?forum='.$forum_id, 2, _MD_NEWBB_NORIGHTTOVIEW);
 }
 // poll module
 $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
@@ -84,7 +84,7 @@ 
         $pollObject = $xpPollHandler->get($poll_id); // will create poll if poll_id = 0 exist
         // old xoopspoll or umfrage or any clone from them
     } else {
-        require_once $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+        require_once $GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/include/constants.php');
         $classPoll  = $topicObject->loadOldPoll();
         $pollObject = new $classPoll($poll_id); // will create poll if poll_id = 0 exist
     }
@@ -114,11 +114,11 @@ 
     case 'add':
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_CREATNEWPOLL . "</h4>\n";
+            echo '<h4>'._MD_NEWBB_POLL_CREATNEWPOLL."</h4>\n";
             $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
         // old xoopspoll or umfrage or any clone from them
         } else {
-            $classOption  = $classPoll . 'Option';
+            $classOption  = $classPoll.'Option';
             $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
             $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
                                                                                                           . XOOPS_URL
@@ -134,7 +134,7 @@ 
             $poll_form->addElement($desc_tarea);
             $currenttime = formatTimestamp(time(), 'Y-m-d H:i:s');
             $endtime     = formatTimestamp(time() + 604800, 'Y-m-d H:i:s');
-            $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime) . '</small>', 'end_time', 30, 19, $endtime);
+            $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION.'<br><small>'._MD_NEWBB_POLL_FORMAT.'<br>'.sprintf(_MD_NEWBB_POLL_CURRENTTIME, $currenttime).'</small>', 'end_time', 30, 19, $endtime);
             $poll_form->addElement($expire_text);
 
             $weight_text = new \XoopsFormText(_MD_NEWBB_POLL_DISPLAYORDER, 'weight', 6, 5, 0);
@@ -147,14 +147,14 @@ 
             $poll_form->addElement($notify_yn);
 
             $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/assets/images/colorbars/'));
             for ($i = 0; $i < 10; ++$i) {
                 $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
                 $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
                 $option_tray->addElement($option_text);
                 $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
                 $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
+                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/".$GLOBALS['xoopsModuleConfig']['poll_module'].'/assets/images/colorbars", "", "'.XOOPS_URL."\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
                                                       . XOOPS_URL
                                                       . '/modules/'
@@ -176,7 +176,7 @@ 
             $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
             $poll_form->addElement(new \XoopsFormHidden('user_id', is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0));
             $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . '</h4>';
+            echo '<h4>'._MD_NEWBB_POLL_POLLCONF.'</h4>';
             $poll_form->display();
         }
         break; // op: add
@@ -184,13 +184,13 @@ 
     case 'edit':
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            echo '<h4>' . _MD_NEWBB_POLL_EDITPOLL . "</h4>\n";
+            echo '<h4>'._MD_NEWBB_POLL_EDITPOLL."</h4>\n";
             $pollObject->renderForm(Request::getString('PHP_SELF', '', 'SERVER'), 'post', ['topic_id' => $topic_id]);
         // old xoopspoll or umfrage or any clone from them
         } else {
-            $classOption  = $classPoll . 'Option';
+            $classOption  = $classPoll.'Option';
             $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_EDITPOLL, 'poll_form', 'polls.php', 'post', true);
-            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $pollObject->getVar('user_id') . "'>" . newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']) . '</a>');
+            $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, "<a href='".XOOPS_URL.'/userinfo.php?uid='.$pollObject->getVar('user_id')."'>".newbbGetUnameFromId($pollObject->getVar('user_id'), $GLOBALS['xoopsModuleConfig']['show_realname']).'</a>');
             $poll_form->addElement($author_label);
             $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255, $pollObject->getVar('question', 'E'));
             $poll_form->addElement($question_text);
@@ -198,13 +198,13 @@ 
             $poll_form->addElement($desc_tarea);
             $date = formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s'); // important "Y-m-d H:i:s" use in jdf function
             if (!$pollObject->hasExpired()) {
-                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '</small>', 'end_time', 20, 19, $date);
+                $expire_text = new \XoopsFormText(_MD_NEWBB_POLL_EXPIRATION.'<br><small>'._MD_NEWBB_POLL_FORMAT.'<br>'.sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')).'</small>', 'end_time', 20, 19, $date);
                 $poll_form->addElement($expire_text);
             } else {
                 // irmtfan full URL - add topic_id
                 $restart_label = new \XoopsFormLabel(
                     _MD_NEWBB_POLL_EXPIRATION,
-                                                    sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date) . "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_RESTART . '</a>'
+                                                    sprintf(_MD_NEWBB_POLL_EXPIREDAT, $date)."<br><a href='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/polls.php?op=restart&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>"._MD_NEWBB_POLL_RESTART.'</a>'
                 );
                 $poll_form->addElement($restart_label);
             }
@@ -212,7 +212,7 @@ 
             $poll_form->addElement($weight_text);
             $multi_yn = new \XoopsFormRadioYN(_MD_NEWBB_POLL_ALLOWMULTI, 'multiple', $pollObject->getVar('multiple'));
             $poll_form->addElement($multi_yn);
-            $options_arr  =& $classOption::getAllByPollId($poll_id);
+            $options_arr  = & $classOption::getAllByPollId($poll_id);
             $notify_value = 1;
             if (0 !== $pollObject->getVar('mail_status')) {
                 $notify_value = 0;
@@ -228,9 +228,9 @@ 
                 $option_tray->addElement(new \XoopsFormHidden('option_id[]', $option->getVar('option_id')));
                 $color_select = new \XoopsFormSelect('', 'option_color[{$i}]', $option->getVar('option_color'));
                 $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[".$i."]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"".XOOPS_URL."\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
+                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/".$option->getVar('option_color', 'E'))
                                                       . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
                 $option_tray->addElement($color_select);
                 $option_tray->addElement($color_label);
@@ -238,7 +238,7 @@ 
                 ++$i;
             }
             // irmtfan full URL
-            $more_label = new \XoopsFormLabel('', "<br><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>" . _MD_NEWBB_POLL_ADDMORE . '</a>');
+            $more_label = new \XoopsFormLabel('', "<br><a href='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/polls.php?op=addmore&amp;poll_id={$poll_id}&amp;topic_id={$topic_id}'>"._MD_NEWBB_POLL_ADDMORE.'</a>');
             $option_tray->addElement($more_label);
             $poll_form->addElement($option_tray);
             $poll_form->addElement(new \XoopsFormHidden('op', 'update'));
@@ -246,7 +246,7 @@ 
             $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
             $poll_form->addElement(new \XoopsFormButtonTray('poll_submit', _SUBMIT, 'submit'));
 
-            echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+            echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
             $poll_form->display();
         }
         break; // op: edit
@@ -264,7 +264,7 @@ 
             $option_empty = true;
             if (!Request::getString('option_text', '', 'POST')) {
                 // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
             }
             $option_text = Request::getArray('option_text', '', 'POST');
             foreach ($option_text as $optxt) {
@@ -275,7 +275,7 @@ 
             }
             if ($option_empty) {
                 // irmtfan - issue with javascript:history.go(-1)
-                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+                redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
             }
             $pollObject->setVar('question', Request::getString('question', '', 'POST'));
             $pollObject->setVar('description', Request::getString('description', '', 'POST'));
@@ -306,7 +306,7 @@ 
             }
             $i            = 0;
             $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
+            $classOption  = $classPoll.'Option';
             foreach ($option_text as $optxt) {
                 $optxt = trim($optxt);
                 /** @var Xoopspoll\Option $optionObject */
@@ -333,7 +333,7 @@ 
             } else {
                 redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
             }
-            break;// op: save
+            break; // op: save
         }
     // no break
     case 'update':
@@ -346,7 +346,7 @@ 
         $option_string = is_array($option_text) ? implode('', $option_text) : $option_text;
         $option_string = trim($option_string);
         if ('' === $option_string) {
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
         }
 
         // new xoopspoll module
@@ -465,8 +465,8 @@ 
             $i            = 0;
             $option_id    = Request::getArray('option_id', null, 'POST');
             $option_color = Request::getArray('option_color', null, 'POST');
-            $classOption  = $classPoll . 'Option';
-            $classLog     = $classPoll . 'Log';
+            $classOption  = $classPoll.'Option';
+            $classLog     = $classPoll.'Log';
             foreach ($option_id as $opid) {
                 $optionObject    = new $classOption($opid);
                 $option_text[$i] = trim($option_text[$i]);
@@ -497,7 +497,7 @@ 
         } else {
             redirect_header("viewtopic.php?topic_id={$topic_id}", 2, _MD_NEWBB_POLL_DBUPDATED);
         }
-        break;// op: save | update
+        break; // op: save | update
 
     case 'addmore':
         $question = $pollObject->getVar('question');
@@ -511,14 +511,14 @@ 
         // old xoopspoll or umfrage or any clone from them
         } else {
             $option_tray    = new \XoopsFormElementTray(_MD_NEWBB_POLL_POLLOPTIONS, '');
-            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars/'));
+            $barcolor_array = \XoopsLists::getImgListAsArray($GLOBALS['xoops']->path('modules/'.$GLOBALS['xoopsModuleConfig']['poll_module'].'/assets/images/colorbars/'));
             for ($i = 0; $i < 10; ++$i) {
                 $current_bar = ('blank.gif' !== current($barcolor_array)) ? current($barcolor_array) : next($barcolor_array);
                 $option_text = new \XoopsFormText('', 'option_text[]', 50, 255);
                 $option_tray->addElement($option_text);
                 $color_select = new \XoopsFormSelect('', "option_color[{$i}]", $current_bar);
                 $color_select->addOptionArray($barcolor_array);
-                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
+                $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"".XOOPS_URL."\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
                                                       . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
                                                       . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
@@ -536,7 +536,7 @@ 
         $poll_form->addElement(new \XoopsFormHidden('topic_id', $topic_id));
         $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
 
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
         $poll_form->display();
         break;
 
@@ -551,7 +551,7 @@ 
         $option_string = trim($option_string);
         if ('' === $option_string) {
             // irmtfan - issue with javascript:history.go(-1)
-            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED . ': ' . _MD_NEWBB_POLL_POLLOPTIONS . ' !');
+            redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERROROCCURED.': '._MD_NEWBB_POLL_POLLOPTIONS.' !');
         }
         $i            = 0;
         $option_color = Request::getArray('option_color', null, 'POST');
@@ -568,7 +568,7 @@ 
                     $xpOptHandler->insert($optionObject);
                 // old xoopspoll or umfrage or any clone from them
                 } else {
-                    $classOption  = $classPoll . 'Option';
+                    $classOption  = $classPoll.'Option';
                     $optionObject = new $classOption();
                     $optionObject->setVar('option_text', $optxt);
                     $optionObject->setVar('poll_id', $poll_id);
@@ -586,7 +586,7 @@ 
         break;
 
     case 'delete':
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
         xoops_confirm(['op' => 'delete_ok', 'topic_id' => $topic_id, 'poll_id' => $poll_id], 'polls.php', sprintf(_MD_NEWBB_POLL_RUSUREDEL, $pollObject->getVar('question')));
         break;
 
@@ -610,8 +610,8 @@ 
             // old xoopspoll or umfrage or any clone from them
         } else {
             $status      = $pollObject->delete();
-            $classOption = $classPoll . 'Option';
-            $classLog    = $classPoll . 'Log';
+            $classOption = $classPoll.'Option';
+            $classLog    = $classPoll.'Log';
             if (false !== $status) {
                 $classOption::deleteByPollId($poll_id);
                 $classLog::deleteByPollId($poll_id);
@@ -638,13 +638,13 @@ 
             xoops_error($msg);
             break;
         }
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
         break;
 
     case 'restart':
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants   = new XoopsModules\Xoopspoll\Constants();
+            $classConstants = new XoopsModules\Xoopspoll\Constants();
             $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
         // old xoopspoll or umfrage or any clone from them
         } else {
@@ -652,10 +652,10 @@ 
         }
         $poll_form   = new \XoopsThemeForm(_MD_NEWBB_POLL_RESTARTPOLL, 'poll_form', 'polls.php', 'post', true);
         $expire_text = new \XoopsFormText(
-            _MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
+            _MD_NEWBB_POLL_EXPIRATION.'<br><small>'._MD_NEWBB_POLL_FORMAT.'<br>'.sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')).'<br>'.sprintf(
             _MD_NEWBB_POLL_EXPIREDAT,
                                                                                                                                                                                                                      formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
-        ) . '</small>',
+        ).'</small>',
                                          'end_time',
             20,
             19,
@@ -669,7 +669,7 @@ 
         $poll_form->addElement(new \XoopsFormHidden('poll_id', $poll_id));
         $poll_form->addElement(new \XoopsFormButton('', 'poll_submit', _MD_NEWBB_POLL_RESTART, 'submit'));
 
-        echo '<h4>' . _MD_NEWBB_POLL_POLLCONF . "</h4>\n";
+        echo '<h4>'._MD_NEWBB_POLL_POLLCONF."</h4>\n";
         $poll_form->display();
         break;
 
@@ -681,7 +681,7 @@ 
 
         // new xoopspoll module
         if ($pollModuleHandler->getVar('version') >= 140) {
-            $classConstants   = new XoopsModules\Xoopspoll\Constants();
+            $classConstants = new XoopsModules\Xoopspoll\Constants();
             $default_poll_duration = $classConstants::DEFAULT_POLL_DURATION;
             $poll_not_mailed       = $classConstants::POLL_NOT_MAILED;
             $poll_mailed           = $classConstants::POLL_MAILED;
@@ -731,8 +731,8 @@ 
                 exit();
             }
             if (Request::getInt('reset', 0, 'POST')) { // reset all logs
-                $classOption = $classPoll . 'Option';
-                $classLog    = $classPoll . 'Log';
+                $classOption = $classPoll.'Option';
+                $classLog    = $classPoll.'Log';
                 $classLog::deleteByPollId($poll_id);
                 $classOption::resetCountByPollId($poll_id);
                 $pollObject->updateCount();
@@ -741,7 +741,7 @@ 
         require_once $GLOBALS['xoops']->path('class/template.php');
         xoops_template_clear_module_cache($xoopsModule->getVar('mid'));
         xoops_template_clear_module_cache($pollModuleHandler->getVar('mid'));
-        redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
+        redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_DBUPDATED);
         break;
 
     case 'log':
@@ -756,5 +756,5 @@ 
 } // switch
 
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

footer.php

Indentation +3 added lines, -3 removed lines

@@ -36,9 +36,9 @@
 xoops_load('XoopsLists');
 $allfiles = \XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($js_rel_path));
 foreach ($allfiles as $jsfile) {
-    if ('js' === strtolower(pathinfo($jsfile, PATHINFO_EXTENSION))) {
-        $xoTheme->addScript($js_rel_path . '/' . $jsfile);
-    }
+	if ('js' === strtolower(pathinfo($jsfile, PATHINFO_EXTENSION))) {
+		$xoTheme->addScript($js_rel_path . '/' . $jsfile);
+	}
 }
 global $forumCookie;  // for $forumCookie["prefix"] revert last change - use global instead of include
 // add toggle script

Spacing +6 added lines, -6 removed lines

@@ -25,23 +25,23 @@
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.render.php');
 $iconHandler = newbbGetIconHandler();
 //  get css rel path from setted language
-$css_rel_path = $iconHandler->getPath('language/' . $GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'css');
+$css_rel_path = $iconHandler->getPath('language/'.$GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'css');
 // add local stylesheet
 /** @var xos_opal_Theme $xoTheme */
-$xoTheme->addStylesheet($css_rel_path . '/style.css');
+$xoTheme->addStylesheet($css_rel_path.'/style.css');
 
 //  get js rel path from setted language
-$js_rel_path = $iconHandler->getPath('language/' . $GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'js');
+$js_rel_path = $iconHandler->getPath('language/'.$GLOBALS['xoopsConfig']['language'], 'newbb', 'language/english', 'js');
 // add all local js files inside js directory
 xoops_load('XoopsLists');
 $allfiles = \XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($js_rel_path));
 foreach ($allfiles as $jsfile) {
     if ('js' === strtolower(pathinfo($jsfile, PATHINFO_EXTENSION))) {
-        $xoTheme->addScript($js_rel_path . '/' . $jsfile);
+        $xoTheme->addScript($js_rel_path.'/'.$jsfile);
     }
 }
-global $forumCookie;  // for $forumCookie["prefix"] revert last change - use global instead of include
+global $forumCookie; // for $forumCookie["prefix"] revert last change - use global instead of include
 // add toggle script
 //$toggle_script = "var toggle_cookie=\"" . $forumCookie['prefix'] . 'G' . '\';';
-$toggle_script = 'var toggle_cookie="' . $forumCookie['prefix'] . 'G";';
+$toggle_script = 'var toggle_cookie="'.$forumCookie['prefix'].'G";';
 $xoTheme->addScript(null, ['type' => 'text/javascript'], $toggle_script);

moderate.php

Indentation +129 added lines, -129 removed lines

@@ -21,75 +21,75 @@ 
 $forum_id     = Request::getInt('forum', 0);
 $isAdmin      = newbbIsAdmin($forum_id);
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 $is_administrator = $GLOBALS['xoopsUserIsAdmin'];
 ///** @var Newbb\ModerateHandler $moderateHandler */
 //$moderateHandler = Newbb\Helper::getInstance()->getHandler('Moderate');
 
 if (Request::hasVar('submit', 'POST') && Request::getInt('expire', 0, 'POST')) {
-    $ipWithMask = '';
-    if (0 == $forum_userid) {
-        $ipWithMask = Request::getString('ip', null, 'POST');
-        $mask       = '';
-        $ipParts    = explode('/', $ipWithMask);
-        $ip         = new \Xmf\IPAddress($ipParts[0]);
-        if (false === $ip->asReadable()) {
-            $ipWithMask = '';
-        } else {
-            $ipWithMask = $ip->asReadable();
-            $mask       = empty($ipParts[1]) ? 0 : (int)$ipParts[1];
-            $mask       = ($mask > ((4 === $ip->ipVersion()) ? 32 : 128) || $mask < 8) ? '' : $mask;
-            $ipWithMask .= empty($mask) ? '' : '/' . $mask;
-        }
-    }
-
-    $mod_end  = time() + Request::getInt('expire', 0, 'POST') * 3600 * 24;
-    $mod_desc = Request::getString('desc', '', 'POST');
-
-    $moderateObject = $moderateHandler->create();
-    $moderateObject->setVar('uid', $forum_userid);
-    $moderateObject->setVar('ip', $ipWithMask);
-    $moderateObject->setVar('forum_id', $forum_id);
-    $moderateObject->setVar('mod_start', time());
-    $moderateObject->setVar('mod_end', $mod_end);
-    $moderateObject->setVar('mod_desc', $mod_desc);
-    $res = $moderateHandler->insert($moderateObject);
-
-    redirect_header("moderate.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
+	$ipWithMask = '';
+	if (0 == $forum_userid) {
+		$ipWithMask = Request::getString('ip', null, 'POST');
+		$mask       = '';
+		$ipParts    = explode('/', $ipWithMask);
+		$ip         = new \Xmf\IPAddress($ipParts[0]);
+		if (false === $ip->asReadable()) {
+			$ipWithMask = '';
+		} else {
+			$ipWithMask = $ip->asReadable();
+			$mask       = empty($ipParts[1]) ? 0 : (int)$ipParts[1];
+			$mask       = ($mask > ((4 === $ip->ipVersion()) ? 32 : 128) || $mask < 8) ? '' : $mask;
+			$ipWithMask .= empty($mask) ? '' : '/' . $mask;
+		}
+	}
+
+	$mod_end  = time() + Request::getInt('expire', 0, 'POST') * 3600 * 24;
+	$mod_desc = Request::getString('desc', '', 'POST');
+
+	$moderateObject = $moderateHandler->create();
+	$moderateObject->setVar('uid', $forum_userid);
+	$moderateObject->setVar('ip', $ipWithMask);
+	$moderateObject->setVar('forum_id', $forum_id);
+	$moderateObject->setVar('mod_start', time());
+	$moderateObject->setVar('mod_end', $mod_end);
+	$moderateObject->setVar('mod_desc', $mod_desc);
+	$res = $moderateHandler->insert($moderateObject);
+
+	redirect_header("moderate.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
 } elseif (Request::hasVar('del')) {
-    $moderateObject = $moderateHandler->get(Request::getInt('del', 0, 'GET'));
-    if ($is_administrator || $moderateObject->getVar('forum_id') == $forum_id) {
-        $moderateHandler->delete($moderateObject, true);
-        redirect_header("moderate.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
-    }
+	$moderateObject = $moderateHandler->get(Request::getInt('del', 0, 'GET'));
+	if ($is_administrator || $moderateObject->getVar('forum_id') == $forum_id) {
+		$moderateHandler->delete($moderateObject, true);
+		redirect_header("moderate.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
+	}
 }
 
 $start    = Request::getInt('start', 0, 'GET');
 $sortname = Request::getString('sort', '', 'GET');
 
 switch ($sortname) {
-    case 'uid':
-        $sort  = 'uid ASC, ip';
-        $order = 'ASC';
-        break;
-    case 'start':
-        $sort  = 'mod_start';
-        $order = 'ASC';
-        break;
-    case 'expire':
-        $sort  = 'mod_end';
-        $order = 'DESC';
-        break;
-    default:
-        $sort  = 'forum_id ASC, uid ASC, ip';
-        $order = 'ASC';
-        break;
+	case 'uid':
+		$sort  = 'uid ASC, ip';
+		$order = 'ASC';
+		break;
+	case 'start':
+		$sort  = 'mod_start';
+		$order = 'ASC';
+		break;
+	case 'expire':
+		$sort  = 'mod_end';
+		$order = 'DESC';
+		break;
+	default:
+		$sort  = 'forum_id ASC, uid ASC, ip';
+		$order = 'ASC';
+		break;
 }
 // show all bans for module admin - for moderator just show its forum_id bans
 $criteria = new \CriteriaCompo();
 if (!$is_administrator) {
-    $criteria->add(new \Criteria('forum_id', $forum_id, '='));
+	$criteria->add(new \Criteria('forum_id', $forum_id, '='));
 }
 $criteria->setLimit($GLOBALS['xoopsModuleConfig']['topics_per_page']);
 $criteria->setStart($start);
@@ -100,75 +100,75 @@ 
 
 $url = 'moderate.php';
 if ($forum_id) {
-    $url .= '?forum=' . $forum_id;
+	$url .= '?forum=' . $forum_id;
 }
 $xoopsTpl->assign('moderate_url', $url);
 
 if (!empty($moderate_count)) {
-    $_users = [];
-    foreach (array_keys($moderateObjects) as $id) {
-        $_users[$moderateObjects[$id]->getVar('uid')] = 1;
-    }
-    $users = newbbGetUnameFromIds(array_keys($_users), $GLOBALS['xoopsModuleConfig']['show_realname'], true);
-
-    $columnHeaders ['uid']    = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=uid',
-        'header' => _MD_NEWBB_SUSPEND_UID,
-        'title'  => _MD_NEWBB_SUSPEND_UID,
-    ];
-    $columnHeaders ['start']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=start',
-        'header' => _MD_NEWBB_SUSPEND_START,
-        'title'  => _MD_NEWBB_SUSPEND_START,
-    ];
-    $columnHeaders['expire']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=expire',
-        'header' => _MD_NEWBB_SUSPEND_EXPIRE,
-        'title'  => _MD_NEWBB_SUSPEND_EXPIRE,
-    ];
-    $columnHeaders['forum']   = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=forum',
-        'header' => _MD_NEWBB_SUSPEND_SCOPE,
-        'title'  => _MD_NEWBB_SUSPEND_SCOPE,
-    ];
-    $columnHeaders['desc']    = [
-        'url'    => false,
-        'header' => _MD_NEWBB_SUSPEND_DESC,
-        'title'  => _MD_NEWBB_SUSPEND_DESC,
-    ];
-    $columnHeaders['options'] = [
-        'url'    => false,
-        'header' => _DELETE,
-        'title'  => _DELETE,
-    ];
-    $xoopsTpl->assign('columnHeaders', $columnHeaders);
-
-    //    /** @var Newbb\ForumHandler $forumHandler */
-    //    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-    $forum_list = $forumHandler->getAll(null, ['forum_name'], false);
-
-    $columnRows = [];
-    foreach (array_keys($moderateObjects) as $id) {
-        // for anon, show ip instead
-        $row['uid']     = ($moderateObjects[$id]->getVar('uid') ? (isset($users[$moderateObjects[$id]->getVar('uid')]) ? $users[$moderateObjects[$id]->getVar('uid')] : $moderateObjects[$id]->getVar('uid')) : $moderateObjects[$id]->getVar('ip'));
-        $row['start']   = formatTimestamp($moderateObjects[$id]->getVar('mod_start'));
-        $row['expire']  = formatTimestamp($moderateObjects[$id]->getVar('mod_end'));
-        $row['forum']   = ($moderateObjects[$id]->getVar('forum_id') ? $forum_list[$moderateObjects[$id]->getVar('forum_id')]['forum_name'] : _ALL);
-        $row['desc']    = ($moderateObjects[$id]->getVar('mod_desc') ?: _NONE);
-        $row['options'] = (($is_administrator
-                            || $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum=' . $forum_id . '&amp;del=' . $moderateObjects[$id]->getVar('mod_id') . '">' . _DELETE . '</a>' : '');
-        $columnRows[]   = $row;
-    }
-    $xoopsTpl->assign('columnRows', $columnRows);
-
-    if ($moderate_count > $GLOBALS['xoopsModuleConfig']['topics_per_page']) {
-        require_once $GLOBALS['xoops']->path('class/pagenav.php');
-        $nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum=' . $forum_id . '&amp;sort=' . $sortname);
-        //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-        //    $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . ' /' . $nav->url;
-        //}
-        $xoopsTpl->assign('moderate_page_nav', $nav->renderNav());
-    }
+	$_users = [];
+	foreach (array_keys($moderateObjects) as $id) {
+		$_users[$moderateObjects[$id]->getVar('uid')] = 1;
+	}
+	$users = newbbGetUnameFromIds(array_keys($_users), $GLOBALS['xoopsModuleConfig']['show_realname'], true);
+
+	$columnHeaders ['uid']    = [
+		'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=uid',
+		'header' => _MD_NEWBB_SUSPEND_UID,
+		'title'  => _MD_NEWBB_SUSPEND_UID,
+	];
+	$columnHeaders ['start']  = [
+		'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=start',
+		'header' => _MD_NEWBB_SUSPEND_START,
+		'title'  => _MD_NEWBB_SUSPEND_START,
+	];
+	$columnHeaders['expire']  = [
+		'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=expire',
+		'header' => _MD_NEWBB_SUSPEND_EXPIRE,
+		'title'  => _MD_NEWBB_SUSPEND_EXPIRE,
+	];
+	$columnHeaders['forum']   = [
+		'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=forum',
+		'header' => _MD_NEWBB_SUSPEND_SCOPE,
+		'title'  => _MD_NEWBB_SUSPEND_SCOPE,
+	];
+	$columnHeaders['desc']    = [
+		'url'    => false,
+		'header' => _MD_NEWBB_SUSPEND_DESC,
+		'title'  => _MD_NEWBB_SUSPEND_DESC,
+	];
+	$columnHeaders['options'] = [
+		'url'    => false,
+		'header' => _DELETE,
+		'title'  => _DELETE,
+	];
+	$xoopsTpl->assign('columnHeaders', $columnHeaders);
+
+	//    /** @var Newbb\ForumHandler $forumHandler */
+	//    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+	$forum_list = $forumHandler->getAll(null, ['forum_name'], false);
+
+	$columnRows = [];
+	foreach (array_keys($moderateObjects) as $id) {
+		// for anon, show ip instead
+		$row['uid']     = ($moderateObjects[$id]->getVar('uid') ? (isset($users[$moderateObjects[$id]->getVar('uid')]) ? $users[$moderateObjects[$id]->getVar('uid')] : $moderateObjects[$id]->getVar('uid')) : $moderateObjects[$id]->getVar('ip'));
+		$row['start']   = formatTimestamp($moderateObjects[$id]->getVar('mod_start'));
+		$row['expire']  = formatTimestamp($moderateObjects[$id]->getVar('mod_end'));
+		$row['forum']   = ($moderateObjects[$id]->getVar('forum_id') ? $forum_list[$moderateObjects[$id]->getVar('forum_id')]['forum_name'] : _ALL);
+		$row['desc']    = ($moderateObjects[$id]->getVar('mod_desc') ?: _NONE);
+		$row['options'] = (($is_administrator
+							|| $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum=' . $forum_id . '&amp;del=' . $moderateObjects[$id]->getVar('mod_id') . '">' . _DELETE . '</a>' : '');
+		$columnRows[]   = $row;
+	}
+	$xoopsTpl->assign('columnRows', $columnRows);
+
+	if ($moderate_count > $GLOBALS['xoopsModuleConfig']['topics_per_page']) {
+		require_once $GLOBALS['xoops']->path('class/pagenav.php');
+		$nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum=' . $forum_id . '&amp;sort=' . $sortname);
+		//if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
+		//    $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . ' /' . $nav->url;
+		//}
+		$xoopsTpl->assign('moderate_page_nav', $nav->renderNav());
+	}
 }
 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
@@ -179,19 +179,19 @@ 
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_DESC, 'desc', 50, 255));
 require_once __DIR__ . '/include/functions.forum.php';
 if (newbbIsAdmin()) {
-    $forumSel = '<select name="forum">';// if user doesn't select, default is "0" all forums
-    $forumSel .= '<option value="0"';
-    if (0 == $forum_id) {
-        $forumSel .= ' selected';
-    }
-    $forumSel                         .= '>' . _ALL . '</option>';
-    $forumSel                         .= newbbForumSelectBox($forum_id, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = true
-    $forumSel                         .= '</select>';
-    $forumEle                         = new \XoopsFormLabel(_MD_NEWBB_SELFORUM, $forumSel);
-    $forumEle->customValidationCode[] = 'if (document.suspend.forum.value < 0) {return false;} ';
-    $forum_form->addElement($forumEle);
+	$forumSel = '<select name="forum">';// if user doesn't select, default is "0" all forums
+	$forumSel .= '<option value="0"';
+	if (0 == $forum_id) {
+		$forumSel .= ' selected';
+	}
+	$forumSel                         .= '>' . _ALL . '</option>';
+	$forumSel                         .= newbbForumSelectBox($forum_id, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = true
+	$forumSel                         .= '</select>';
+	$forumEle                         = new \XoopsFormLabel(_MD_NEWBB_SELFORUM, $forumSel);
+	$forumEle->customValidationCode[] = 'if (document.suspend.forum.value < 0) {return false;} ';
+	$forum_form->addElement($forumEle);
 } else {
-    $forum_form->addElement(new \XoopsFormHidden('forum', $forum_id));
+	$forum_form->addElement(new \XoopsFormHidden('forum', $forum_id));
 }
 $forum_form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 $forum_form->assign($xoopsTpl);

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $xoTheme, $xoopsTpl;
 $GLOBALS['xoopsOption']['template_main'] = 'newbb_moderate.tpl';
@@ -21,7 +21,7 @@ 
 $forum_id     = Request::getInt('forum', 0);
 $isAdmin      = newbbIsAdmin($forum_id);
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 $is_administrator = $GLOBALS['xoopsUserIsAdmin'];
 ///** @var Newbb\ModerateHandler $moderateHandler */
@@ -38,9 +38,9 @@ 
             $ipWithMask = '';
         } else {
             $ipWithMask = $ip->asReadable();
-            $mask       = empty($ipParts[1]) ? 0 : (int)$ipParts[1];
+            $mask       = empty($ipParts[1]) ? 0 : (int) $ipParts[1];
             $mask       = ($mask > ((4 === $ip->ipVersion()) ? 32 : 128) || $mask < 8) ? '' : $mask;
-            $ipWithMask .= empty($mask) ? '' : '/' . $mask;
+            $ipWithMask .= empty($mask) ? '' : '/'.$mask;
         }
     }
 
@@ -100,7 +100,7 @@ 
 
 $url = 'moderate.php';
 if ($forum_id) {
-    $url .= '?forum=' . $forum_id;
+    $url .= '?forum='.$forum_id;
 }
 $xoopsTpl->assign('moderate_url', $url);
 
@@ -111,27 +111,27 @@ 
     }
     $users = newbbGetUnameFromIds(array_keys($_users), $GLOBALS['xoopsModuleConfig']['show_realname'], true);
 
-    $columnHeaders ['uid']    = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=uid',
+    $columnHeaders ['uid'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=uid',
         'header' => _MD_NEWBB_SUSPEND_UID,
         'title'  => _MD_NEWBB_SUSPEND_UID,
     ];
-    $columnHeaders ['start']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=start',
+    $columnHeaders ['start'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=start',
         'header' => _MD_NEWBB_SUSPEND_START,
         'title'  => _MD_NEWBB_SUSPEND_START,
     ];
-    $columnHeaders['expire']  = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=expire',
+    $columnHeaders['expire'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=expire',
         'header' => _MD_NEWBB_SUSPEND_EXPIRE,
         'title'  => _MD_NEWBB_SUSPEND_EXPIRE,
     ];
-    $columnHeaders['forum']   = [
-        'url'    => 'moderate.php?forum=' . $forum_id . '&amp;start=' . $start . '&amp;sort=forum',
+    $columnHeaders['forum'] = [
+        'url'    => 'moderate.php?forum='.$forum_id.'&amp;start='.$start.'&amp;sort=forum',
         'header' => _MD_NEWBB_SUSPEND_SCOPE,
         'title'  => _MD_NEWBB_SUSPEND_SCOPE,
     ];
-    $columnHeaders['desc']    = [
+    $columnHeaders['desc'] = [
         'url'    => false,
         'header' => _MD_NEWBB_SUSPEND_DESC,
         'title'  => _MD_NEWBB_SUSPEND_DESC,
@@ -156,14 +156,14 @@ 
         $row['forum']   = ($moderateObjects[$id]->getVar('forum_id') ? $forum_list[$moderateObjects[$id]->getVar('forum_id')]['forum_name'] : _ALL);
         $row['desc']    = ($moderateObjects[$id]->getVar('mod_desc') ?: _NONE);
         $row['options'] = (($is_administrator
-                            || $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum=' . $forum_id . '&amp;del=' . $moderateObjects[$id]->getVar('mod_id') . '">' . _DELETE . '</a>' : '');
+                            || $moderateObjects[$id]->getVar('forum_id') == $forum_id) ? '<a href="moderate.php?forum='.$forum_id.'&amp;del='.$moderateObjects[$id]->getVar('mod_id').'">'._DELETE.'</a>' : '');
         $columnRows[]   = $row;
     }
     $xoopsTpl->assign('columnRows', $columnRows);
 
     if ($moderate_count > $GLOBALS['xoopsModuleConfig']['topics_per_page']) {
         require_once $GLOBALS['xoops']->path('class/pagenav.php');
-        $nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum=' . $forum_id . '&amp;sort=' . $sortname);
+        $nav = new \XoopsPageNav($moderate_count, $GLOBALS['xoopsModuleConfig']['topics_per_page'], $start, 'start', 'forum='.$forum_id.'&amp;sort='.$sortname);
         //if (isset($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
         //    $nav->url = formatURL(Request::getString('SERVER_NAME', '', 'SERVER')) . ' /' . $nav->url;
         //}
@@ -177,14 +177,14 @@ 
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_IP, 'ip', 50, 50));
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_DURATION, 'expire', 20, 25, '5'), true);
 $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_SUSPEND_DESC, 'desc', 50, 255));
-require_once __DIR__ . '/include/functions.forum.php';
+require_once __DIR__.'/include/functions.forum.php';
 if (newbbIsAdmin()) {
-    $forumSel = '<select name="forum">';// if user doesn't select, default is "0" all forums
+    $forumSel = '<select name="forum">'; // if user doesn't select, default is "0" all forums
     $forumSel .= '<option value="0"';
     if (0 == $forum_id) {
         $forumSel .= ' selected';
     }
-    $forumSel                         .= '>' . _ALL . '</option>';
+    $forumSel                         .= '>'._ALL.'</option>';
     $forumSel                         .= newbbForumSelectBox($forum_id, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = true
     $forumSel                         .= '</select>';
     $forumEle                         = new \XoopsFormLabel(_MD_NEWBB_SELFORUM, $forumSel);
@@ -196,5 +196,5 @@ 
 $forum_form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 $forum_form->assign($xoopsTpl);
 
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');

blocks/list_topic.php

Indentation +156 added lines, -156 removed lines

@@ -15,7 +15,7 @@ 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
 if (defined('LIST_TOPIC_DEFINED')) {
-    return;
+	return;
 }
 define('LIST_TOPIC_DEFINED', true);
 
@@ -51,47 +51,47 @@ 
  */
 function newbb_list_topic_show($options)
 {
-    $newbbConfig = newbbLoadConfig(); // load all newbb configs
-
-    $topicRenderer            = new Newbb\TopicRenderer();
-    $topicRenderer->userlevel = $GLOBALS['xoopsUserIsAdmin'] ? 2 : is_object($GLOBALS['xoopsUser']); // Vistitor's level: 0 - anonymous; 1 - user; 2 - moderator or admin
-
-    $topicRenderer->force = true; // force against static vars for parse
-
-    $topicRenderer->is_multiple = true; // is it for multiple forums
-    $topicRenderer->config      =& $newbbConfig; // get all configs
-    if (!empty($options[6])) {
-        $topicRenderer->config['topics_per_page'] = (int)$options[6]; // number of topics (items) to display
-    }
-    $topicRenderer->config['topic_title_excerpt'] = (int)$options[10]; // topic title length 0 = dont excerpt
-    $topicRenderer->config['post_excerpt']        = (int)$options[11]; // post text excerpt 0 = no post text
-
-    $optionsStatus = explode(',', $options[0]); // status in where claus
-    $optionsForum  = explode(',', $options[12]);
-
-    // set and parse values:
-    // forum: parse positive values to forum IDs and negative values to category IDs. value=0 => all valid forums
-    $topicRenderer->setVars([
-                                'status'     => $optionsStatus,
-                                'uid'        => $options[1],
-                                'lastposter' => $options[2],
-                                'type'       => $options[3],
-                                'sort'       => $options[4],
-                                'order'      => $options[5],
-                                'since'      => $options[7],
-                                'forum'      => $optionsForum
-                            ]);
-    $block = [];
-    // headers to display in block
-    $block['headers'] = $topicRenderer->getHeader($options[8]);
-
-    // render a list of topics using all above criterias
-    list($block['topics'], $block['sticky']) = $topicRenderer->renderTopics();
-
-    // show index navigation
-    $block['indexNav'] = !empty($options[9]);
-
-    return $block;
+	$newbbConfig = newbbLoadConfig(); // load all newbb configs
+
+	$topicRenderer            = new Newbb\TopicRenderer();
+	$topicRenderer->userlevel = $GLOBALS['xoopsUserIsAdmin'] ? 2 : is_object($GLOBALS['xoopsUser']); // Vistitor's level: 0 - anonymous; 1 - user; 2 - moderator or admin
+
+	$topicRenderer->force = true; // force against static vars for parse
+
+	$topicRenderer->is_multiple = true; // is it for multiple forums
+	$topicRenderer->config      =& $newbbConfig; // get all configs
+	if (!empty($options[6])) {
+		$topicRenderer->config['topics_per_page'] = (int)$options[6]; // number of topics (items) to display
+	}
+	$topicRenderer->config['topic_title_excerpt'] = (int)$options[10]; // topic title length 0 = dont excerpt
+	$topicRenderer->config['post_excerpt']        = (int)$options[11]; // post text excerpt 0 = no post text
+
+	$optionsStatus = explode(',', $options[0]); // status in where claus
+	$optionsForum  = explode(',', $options[12]);
+
+	// set and parse values:
+	// forum: parse positive values to forum IDs and negative values to category IDs. value=0 => all valid forums
+	$topicRenderer->setVars([
+								'status'     => $optionsStatus,
+								'uid'        => $options[1],
+								'lastposter' => $options[2],
+								'type'       => $options[3],
+								'sort'       => $options[4],
+								'order'      => $options[5],
+								'since'      => $options[7],
+								'forum'      => $optionsForum
+							]);
+	$block = [];
+	// headers to display in block
+	$block['headers'] = $topicRenderer->getHeader($options[8]);
+
+	// render a list of topics using all above criterias
+	list($block['topics'], $block['sticky']) = $topicRenderer->renderTopics();
+
+	// show index navigation
+	$block['indexNav'] = !empty($options[9]);
+
+	return $block;
 }
 
 /**
@@ -100,118 +100,118 @@ 
  */
 function newbb_list_topic_edit($options)
 {
-    // require_once $GLOBALS['xoops']->path('class/blockform.php'); //reserve for 2.6
-    xoops_load('XoopsFormLoader');
-    // $form = new \XoopsBlockForm(); //reserve for 2.6
-    $form = new \XoopsThemeForm(_MB_NEWBB_DISPLAYMODE_DESC, 'list_topic', '');
-
-    $topicRenderer            = new Newbb\TopicRenderer();
-    $topicRenderer->userlevel = 2; // 2 - moderator or admin
-
-    // status element
-    $optionsStatus = explode(',', $options[0]);
-    $statusEle     = new \XoopsFormSelect(_MB_NEWBB_CRITERIA, 'options[0]', $optionsStatus, 5, true);
-    $status        = $topicRenderer->getStatus($topicRenderer->userlevel); // get all public status + admin status (admin mode, pending deleted)
-    $statusEle->addOptionArray($status);
-    $statusEle->setExtra("onchange = \"validate('options[0][]','select', true)\""); // if user dont select any option it select "all"
-    $statusEle->setDescription(_MB_NEWBB_CRITERIA_DESC);
-
-    // topic_poster element
-    $topicPosterRadioEle = new \XoopsFormRadio(_MB_NEWBB_AUTHOR, 'options[1]', $options[1]);
-    $topicPosterRadioEle->addOption(-1, _MD_NEWBB_TOTALUSER);
-    $topicPosterRadioEle->addOption((-1 !== $options[1]) ? $options[1] : 0, _SELECT); // if no user in selection box it select uid=0 anon users
-    $topicPosterRadioEle->setExtra("onchange=\"var el=document.getElementById('options[1]'); el.disabled=(this.id == 'options[1]1'); if (!el.value) {el.value= this.value}\""); // if user dont select any option it select "all"
-    $topicPosterSelectEle = new \XoopsFormSelectUser(_MB_NEWBB_AUTHOR, 'options[1]', true, explode(',', $options[1]), 5, true);// show $limit = 200 users when no user is selected;
-    $topicPosterEle       = new \XoopsFormLabel(_MB_NEWBB_AUTHOR, $topicPosterRadioEle->render() . $topicPosterSelectEle->render());
-
-    // lastposter element
-    $lastPosterRadioEle = new \XoopsFormRadio(_MD_NEWBB_POSTER, 'options[2]', $options[2]);
-    $lastPosterRadioEle->addOption(-1, _MD_NEWBB_TOTALUSER);
-    $lastPosterRadioEle->addOption((-1 !== $options[2]) ? $options[2] : 0, _SELECT); // if no user in selection box it select uid=1
-    $lastPosterRadioEle->setExtra("onchange=\"var el=document.getElementById('options[2]'); el.disabled=(this.id == 'options[2]1'); if (!el.value) {el.value= this.value}\""); // if user dont select any option it select "all"
-    $lastPosterSelectEle = new \XoopsFormSelectUser(_MD_NEWBB_POSTER, 'options[2]', true, explode(',', $options[2]), 5, true);// show $limit = 200 users when no user is selected;
-    $lastPosterEle       = new \XoopsFormLabel(_MD_NEWBB_POSTER, $lastPosterRadioEle->render() . $lastPosterSelectEle->render());
-
-    // type element
-    $types   = $topicRenderer->getTypes(); // get all available types in all forums
-    $typeEle = new \XoopsFormSelect(_MD_NEWBB_TYPE, 'options[3]', $options[3]);
-    $typeEle->addOption(0, _NONE);
-    if (!empty($types)) {
-        foreach ($types as $type_id => $type) {
-            $typeEle->addOption($type_id, $type['type_name']);
-        }
-    }
-
-    // sort element
-    $sortEle = new \XoopsFormSelect(_MD_NEWBB_SORTBY, 'options[4]', $options[4]);
-    $sortEle->setDescription(_MB_NEWBB_CRITERIA_SORT_DESC);
-    $sorts = $topicRenderer->getSort('', 'title');
-    $sortEle->addOptionArray($sorts);
-
-    // order element
-    $orderEle = new \XoopsFormSelect(_MB_NEWBB_CRITERIA_ORDER, 'options[5]', $options[5]);
-    $orderEle->addOption(0, _DESCENDING);
-    $orderEle->addOption(1, _ASCENDING);
-
-    // number of topics to display element
-    $numdispEle = new \XoopsFormText(_MB_NEWBB_DISPLAY, 'options[6]', 10, 255, (int)$options[6]);
-
-    $timeEle = new \XoopsFormText(_MB_NEWBB_TIME, 'options[7]', 10, 255, $options[7]);
-    $timeEle->setDescription(_MB_NEWBB_TIME_DESC);
-
-    // mode disp element
-    $options_headers = explode(',', $options[8]);
-    $modeEle         = new \XoopsFormCheckBox(_MB_NEWBB_DISPLAYMODE, 'options[8][]', $options_headers);
-    $modeEle->setDescription(_MB_NEWBB_DISPLAYMODE_DESC);
-    $modeEle->columns = 4;
-    $disps            = $topicRenderer->getHeader();
-    $modeEle->addOptionArray($disps);
-    $modeEle->setExtra("onchange = \"validate('options[8][]','checkbox', true)\""); // prevent user select no option
-    // Index navigation element
-    $navEle = new \XoopsFormRadioYN(_MB_NEWBB_INDEXNAV, 'options[9]', !empty($options[9]));
-
-    // Topic title element
-    $lengthEle = new \XoopsFormText(_MB_NEWBB_TITLE_LENGTH, 'options[10]', 10, 255, (int)$options[10]);
-    $lengthEle->setDescription(_MB_NEWBB_TITLE_LENGTH_DESC);
-
-    // Post text element
-    $postExcerptEle = new \XoopsFormText(_MB_NEWBB_POST_EXCERPT, 'options[11]', 10, 255, (int)$options[11]);
-    $postExcerptEle->setDescription(_MB_NEWBB_POST_EXCERPT_DESC);
-
-    //  forum element
-    $optionsForum = explode(',', $options[12]);
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
-    /** @var Newbb\ForumHandler $forumHandler */
-    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-    //get forum Ids by values. parse positive values to forum IDs and negative values to category IDs. value=0 => all valid forums
-    // Get accessible forums
-    $accessForums = $forumHandler->getIdsByValues(array_map('intval', $optionsForum));
-    $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
-    $forumSel     = "<select name=\"options[12][]\" multiple=\"multiple\" onchange = \"validate('options[12][]','select', true)\">";// if user dont select any it select "0"
-    $forumSel     .= '<option value="0" ';
-    if ($isAll) {
-        $forumSel     .= ' selected';
-        $accessForums = null; // just select _ALL option
-    }
-    $forumSel .= '>' . _ALL . '</option>';
-    $forumSel .= newbbForumSelectBox($accessForums, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = false
-    $forumSel .= '</select>';
-    $forumEle = new \XoopsFormLabel(_MB_NEWBB_FORUMLIST, $forumSel);
-
-    // add all elements to form
-    $form->addElement($statusEle);
-    $form->addElement($topicPosterEle);
-    $form->addElement($lastPosterEle);
-    $form->addElement($typeEle);
-    $form->addElement($sortEle);
-    $form->addElement($orderEle);
-    $form->addElement($numdispEle);
-    $form->addElement($timeEle);
-    $form->addElement($modeEle, true); // required: user should select at least one otherwise it will select the first one
-    $form->addElement($navEle);
-    $form->addElement($lengthEle);
-    $form->addElement($postExcerptEle);
-    $form->addElement($forumEle);
-
-    return $form->render();
+	// require_once $GLOBALS['xoops']->path('class/blockform.php'); //reserve for 2.6
+	xoops_load('XoopsFormLoader');
+	// $form = new \XoopsBlockForm(); //reserve for 2.6
+	$form = new \XoopsThemeForm(_MB_NEWBB_DISPLAYMODE_DESC, 'list_topic', '');
+
+	$topicRenderer            = new Newbb\TopicRenderer();
+	$topicRenderer->userlevel = 2; // 2 - moderator or admin
+
+	// status element
+	$optionsStatus = explode(',', $options[0]);
+	$statusEle     = new \XoopsFormSelect(_MB_NEWBB_CRITERIA, 'options[0]', $optionsStatus, 5, true);
+	$status        = $topicRenderer->getStatus($topicRenderer->userlevel); // get all public status + admin status (admin mode, pending deleted)
+	$statusEle->addOptionArray($status);
+	$statusEle->setExtra("onchange = \"validate('options[0][]','select', true)\""); // if user dont select any option it select "all"
+	$statusEle->setDescription(_MB_NEWBB_CRITERIA_DESC);
+
+	// topic_poster element
+	$topicPosterRadioEle = new \XoopsFormRadio(_MB_NEWBB_AUTHOR, 'options[1]', $options[1]);
+	$topicPosterRadioEle->addOption(-1, _MD_NEWBB_TOTALUSER);
+	$topicPosterRadioEle->addOption((-1 !== $options[1]) ? $options[1] : 0, _SELECT); // if no user in selection box it select uid=0 anon users
+	$topicPosterRadioEle->setExtra("onchange=\"var el=document.getElementById('options[1]'); el.disabled=(this.id == 'options[1]1'); if (!el.value) {el.value= this.value}\""); // if user dont select any option it select "all"
+	$topicPosterSelectEle = new \XoopsFormSelectUser(_MB_NEWBB_AUTHOR, 'options[1]', true, explode(',', $options[1]), 5, true);// show $limit = 200 users when no user is selected;
+	$topicPosterEle       = new \XoopsFormLabel(_MB_NEWBB_AUTHOR, $topicPosterRadioEle->render() . $topicPosterSelectEle->render());
+
+	// lastposter element
+	$lastPosterRadioEle = new \XoopsFormRadio(_MD_NEWBB_POSTER, 'options[2]', $options[2]);
+	$lastPosterRadioEle->addOption(-1, _MD_NEWBB_TOTALUSER);
+	$lastPosterRadioEle->addOption((-1 !== $options[2]) ? $options[2] : 0, _SELECT); // if no user in selection box it select uid=1
+	$lastPosterRadioEle->setExtra("onchange=\"var el=document.getElementById('options[2]'); el.disabled=(this.id == 'options[2]1'); if (!el.value) {el.value= this.value}\""); // if user dont select any option it select "all"
+	$lastPosterSelectEle = new \XoopsFormSelectUser(_MD_NEWBB_POSTER, 'options[2]', true, explode(',', $options[2]), 5, true);// show $limit = 200 users when no user is selected;
+	$lastPosterEle       = new \XoopsFormLabel(_MD_NEWBB_POSTER, $lastPosterRadioEle->render() . $lastPosterSelectEle->render());
+
+	// type element
+	$types   = $topicRenderer->getTypes(); // get all available types in all forums
+	$typeEle = new \XoopsFormSelect(_MD_NEWBB_TYPE, 'options[3]', $options[3]);
+	$typeEle->addOption(0, _NONE);
+	if (!empty($types)) {
+		foreach ($types as $type_id => $type) {
+			$typeEle->addOption($type_id, $type['type_name']);
+		}
+	}
+
+	// sort element
+	$sortEle = new \XoopsFormSelect(_MD_NEWBB_SORTBY, 'options[4]', $options[4]);
+	$sortEle->setDescription(_MB_NEWBB_CRITERIA_SORT_DESC);
+	$sorts = $topicRenderer->getSort('', 'title');
+	$sortEle->addOptionArray($sorts);
+
+	// order element
+	$orderEle = new \XoopsFormSelect(_MB_NEWBB_CRITERIA_ORDER, 'options[5]', $options[5]);
+	$orderEle->addOption(0, _DESCENDING);
+	$orderEle->addOption(1, _ASCENDING);
+
+	// number of topics to display element
+	$numdispEle = new \XoopsFormText(_MB_NEWBB_DISPLAY, 'options[6]', 10, 255, (int)$options[6]);
+
+	$timeEle = new \XoopsFormText(_MB_NEWBB_TIME, 'options[7]', 10, 255, $options[7]);
+	$timeEle->setDescription(_MB_NEWBB_TIME_DESC);
+
+	// mode disp element
+	$options_headers = explode(',', $options[8]);
+	$modeEle         = new \XoopsFormCheckBox(_MB_NEWBB_DISPLAYMODE, 'options[8][]', $options_headers);
+	$modeEle->setDescription(_MB_NEWBB_DISPLAYMODE_DESC);
+	$modeEle->columns = 4;
+	$disps            = $topicRenderer->getHeader();
+	$modeEle->addOptionArray($disps);
+	$modeEle->setExtra("onchange = \"validate('options[8][]','checkbox', true)\""); // prevent user select no option
+	// Index navigation element
+	$navEle = new \XoopsFormRadioYN(_MB_NEWBB_INDEXNAV, 'options[9]', !empty($options[9]));
+
+	// Topic title element
+	$lengthEle = new \XoopsFormText(_MB_NEWBB_TITLE_LENGTH, 'options[10]', 10, 255, (int)$options[10]);
+	$lengthEle->setDescription(_MB_NEWBB_TITLE_LENGTH_DESC);
+
+	// Post text element
+	$postExcerptEle = new \XoopsFormText(_MB_NEWBB_POST_EXCERPT, 'options[11]', 10, 255, (int)$options[11]);
+	$postExcerptEle->setDescription(_MB_NEWBB_POST_EXCERPT_DESC);
+
+	//  forum element
+	$optionsForum = explode(',', $options[12]);
+	require_once  dirname(__DIR__) . '/include/functions.forum.php';
+	/** @var Newbb\ForumHandler $forumHandler */
+	$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+	//get forum Ids by values. parse positive values to forum IDs and negative values to category IDs. value=0 => all valid forums
+	// Get accessible forums
+	$accessForums = $forumHandler->getIdsByValues(array_map('intval', $optionsForum));
+	$isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
+	$forumSel     = "<select name=\"options[12][]\" multiple=\"multiple\" onchange = \"validate('options[12][]','select', true)\">";// if user dont select any it select "0"
+	$forumSel     .= '<option value="0" ';
+	if ($isAll) {
+		$forumSel     .= ' selected';
+		$accessForums = null; // just select _ALL option
+	}
+	$forumSel .= '>' . _ALL . '</option>';
+	$forumSel .= newbbForumSelectBox($accessForums, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = false
+	$forumSel .= '</select>';
+	$forumEle = new \XoopsFormLabel(_MB_NEWBB_FORUMLIST, $forumSel);
+
+	// add all elements to form
+	$form->addElement($statusEle);
+	$form->addElement($topicPosterEle);
+	$form->addElement($lastPosterEle);
+	$form->addElement($typeEle);
+	$form->addElement($sortEle);
+	$form->addElement($orderEle);
+	$form->addElement($numdispEle);
+	$form->addElement($timeEle);
+	$form->addElement($modeEle, true); // required: user should select at least one otherwise it will select the first one
+	$form->addElement($navEle);
+	$form->addElement($lengthEle);
+	$form->addElement($postExcerptEle);
+	$form->addElement($forumEle);
+
+	return $form->render();
 }

Spacing +22 added lines, -22 removed lines

@@ -21,15 +21,15 @@ 
 
 //require_once dirname(__DIR__) . '/include/functions.ini.php';
 //require_once dirname(__DIR__) . '/class/TopicRenderer.php';
-require_once dirname(__DIR__) . '/footer.php'; // to include js/style files like validate function
+require_once dirname(__DIR__).'/footer.php'; // to include js/style files like validate function
 
 xoops_loadLanguage('main', 'newbb');
 
-require_once  dirname(__DIR__) . '/include/functions.config.php';
-require_once  dirname(__DIR__) . '/include/functions.time.php';
-require_once  dirname(__DIR__) . '/include/functions.session.php';
-require_once  dirname(__DIR__) . '/include/functions.render.php';
-require_once  dirname(__DIR__) . '/include/functions.user.php';
+require_once  dirname(__DIR__).'/include/functions.config.php';
+require_once  dirname(__DIR__).'/include/functions.time.php';
+require_once  dirname(__DIR__).'/include/functions.session.php';
+require_once  dirname(__DIR__).'/include/functions.render.php';
+require_once  dirname(__DIR__).'/include/functions.user.php';
 
 // options[0] - Status in WHERE claus: all(by default), sticky, digest,lock, poll, voted, viewed, replied, read, (UN_) , active, pending, deleted (admin) (It is  multi-select)
 // options[1] - Uid in WHERE claus: uid of the topic poster : -1 - all users (by default)
@@ -59,12 +59,12 @@ 
     $topicRenderer->force = true; // force against static vars for parse
 
     $topicRenderer->is_multiple = true; // is it for multiple forums
-    $topicRenderer->config      =& $newbbConfig; // get all configs
+    $topicRenderer->config      = & $newbbConfig; // get all configs
     if (!empty($options[6])) {
-        $topicRenderer->config['topics_per_page'] = (int)$options[6]; // number of topics (items) to display
+        $topicRenderer->config['topics_per_page'] = (int) $options[6]; // number of topics (items) to display
     }
-    $topicRenderer->config['topic_title_excerpt'] = (int)$options[10]; // topic title length 0 = dont excerpt
-    $topicRenderer->config['post_excerpt']        = (int)$options[11]; // post text excerpt 0 = no post text
+    $topicRenderer->config['topic_title_excerpt'] = (int) $options[10]; // topic title length 0 = dont excerpt
+    $topicRenderer->config['post_excerpt']        = (int) $options[11]; // post text excerpt 0 = no post text
 
     $optionsStatus = explode(',', $options[0]); // status in where claus
     $optionsForum  = explode(',', $options[12]);
@@ -121,16 +121,16 @@ 
     $topicPosterRadioEle->addOption(-1, _MD_NEWBB_TOTALUSER);
     $topicPosterRadioEle->addOption((-1 !== $options[1]) ? $options[1] : 0, _SELECT); // if no user in selection box it select uid=0 anon users
     $topicPosterRadioEle->setExtra("onchange=\"var el=document.getElementById('options[1]'); el.disabled=(this.id == 'options[1]1'); if (!el.value) {el.value= this.value}\""); // if user dont select any option it select "all"
-    $topicPosterSelectEle = new \XoopsFormSelectUser(_MB_NEWBB_AUTHOR, 'options[1]', true, explode(',', $options[1]), 5, true);// show $limit = 200 users when no user is selected;
-    $topicPosterEle       = new \XoopsFormLabel(_MB_NEWBB_AUTHOR, $topicPosterRadioEle->render() . $topicPosterSelectEle->render());
+    $topicPosterSelectEle = new \XoopsFormSelectUser(_MB_NEWBB_AUTHOR, 'options[1]', true, explode(',', $options[1]), 5, true); // show $limit = 200 users when no user is selected;
+    $topicPosterEle       = new \XoopsFormLabel(_MB_NEWBB_AUTHOR, $topicPosterRadioEle->render().$topicPosterSelectEle->render());
 
     // lastposter element
     $lastPosterRadioEle = new \XoopsFormRadio(_MD_NEWBB_POSTER, 'options[2]', $options[2]);
     $lastPosterRadioEle->addOption(-1, _MD_NEWBB_TOTALUSER);
     $lastPosterRadioEle->addOption((-1 !== $options[2]) ? $options[2] : 0, _SELECT); // if no user in selection box it select uid=1
     $lastPosterRadioEle->setExtra("onchange=\"var el=document.getElementById('options[2]'); el.disabled=(this.id == 'options[2]1'); if (!el.value) {el.value= this.value}\""); // if user dont select any option it select "all"
-    $lastPosterSelectEle = new \XoopsFormSelectUser(_MD_NEWBB_POSTER, 'options[2]', true, explode(',', $options[2]), 5, true);// show $limit = 200 users when no user is selected;
-    $lastPosterEle       = new \XoopsFormLabel(_MD_NEWBB_POSTER, $lastPosterRadioEle->render() . $lastPosterSelectEle->render());
+    $lastPosterSelectEle = new \XoopsFormSelectUser(_MD_NEWBB_POSTER, 'options[2]', true, explode(',', $options[2]), 5, true); // show $limit = 200 users when no user is selected;
+    $lastPosterEle       = new \XoopsFormLabel(_MD_NEWBB_POSTER, $lastPosterRadioEle->render().$lastPosterSelectEle->render());
 
     // type element
     $types   = $topicRenderer->getTypes(); // get all available types in all forums
@@ -154,7 +154,7 @@ 
     $orderEle->addOption(1, _ASCENDING);
 
     // number of topics to display element
-    $numdispEle = new \XoopsFormText(_MB_NEWBB_DISPLAY, 'options[6]', 10, 255, (int)$options[6]);
+    $numdispEle = new \XoopsFormText(_MB_NEWBB_DISPLAY, 'options[6]', 10, 255, (int) $options[6]);
 
     $timeEle = new \XoopsFormText(_MB_NEWBB_TIME, 'options[7]', 10, 255, $options[7]);
     $timeEle->setDescription(_MB_NEWBB_TIME_DESC);
@@ -171,29 +171,29 @@ 
     $navEle = new \XoopsFormRadioYN(_MB_NEWBB_INDEXNAV, 'options[9]', !empty($options[9]));
 
     // Topic title element
-    $lengthEle = new \XoopsFormText(_MB_NEWBB_TITLE_LENGTH, 'options[10]', 10, 255, (int)$options[10]);
+    $lengthEle = new \XoopsFormText(_MB_NEWBB_TITLE_LENGTH, 'options[10]', 10, 255, (int) $options[10]);
     $lengthEle->setDescription(_MB_NEWBB_TITLE_LENGTH_DESC);
 
     // Post text element
-    $postExcerptEle = new \XoopsFormText(_MB_NEWBB_POST_EXCERPT, 'options[11]', 10, 255, (int)$options[11]);
+    $postExcerptEle = new \XoopsFormText(_MB_NEWBB_POST_EXCERPT, 'options[11]', 10, 255, (int) $options[11]);
     $postExcerptEle->setDescription(_MB_NEWBB_POST_EXCERPT_DESC);
 
     //  forum element
     $optionsForum = explode(',', $options[12]);
-    require_once  dirname(__DIR__) . '/include/functions.forum.php';
+    require_once  dirname(__DIR__).'/include/functions.forum.php';
     /** @var Newbb\ForumHandler $forumHandler */
     $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
     //get forum Ids by values. parse positive values to forum IDs and negative values to category IDs. value=0 => all valid forums
     // Get accessible forums
     $accessForums = $forumHandler->getIdsByValues(array_map('intval', $optionsForum));
     $isAll        = (0 === count($optionsForum) || empty($optionsForum[0]));
-    $forumSel     = "<select name=\"options[12][]\" multiple=\"multiple\" onchange = \"validate('options[12][]','select', true)\">";// if user dont select any it select "0"
-    $forumSel     .= '<option value="0" ';
+    $forumSel     = "<select name=\"options[12][]\" multiple=\"multiple\" onchange = \"validate('options[12][]','select', true)\">"; // if user dont select any it select "0"
+    $forumSel .= '<option value="0" ';
     if ($isAll) {
-        $forumSel     .= ' selected';
+        $forumSel .= ' selected';
         $accessForums = null; // just select _ALL option
     }
-    $forumSel .= '>' . _ALL . '</option>';
+    $forumSel .= '>'._ALL.'</option>';
     $forumSel .= newbbForumSelectBox($accessForums, 'access', false); //$accessForums, $permission = "access", $delimitorCategory = false
     $forumSel .= '</select>';
     $forumEle = new \XoopsFormLabel(_MB_NEWBB_FORUMLIST, $forumSel);

blocks/newbb_block.php

Indentation +856 added lines, -856 removed lines

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

Spacing +130 added lines, -130 removed lines

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

blocks/newbb_block_tag.php

Indentation +20 added lines, -20 removed lines

@@ -20,12 +20,12 @@ 
  */
 function newbb_tag_block_cloud_show($options)
 {
-    if (!@require_once $GLOBALS['xoops']->path('modules/tag/blocks/block.php')) {
-        return null;
-    }
-    $block_content = tag_block_cloud_show($options, 'newbb');
+	if (!@require_once $GLOBALS['xoops']->path('modules/tag/blocks/block.php')) {
+		return null;
+	}
+	$block_content = tag_block_cloud_show($options, 'newbb');
 
-    return $block_content;
+	return $block_content;
 }
 
 /**
@@ -34,12 +34,12 @@ 
  */
 function newbb_tag_block_cloud_edit($options)
 {
-    if (!@require_once $GLOBALS['xoops']->path('modules/tag/blocks/block.php')) {
-        return null;
-    }
-    $form = tag_block_cloud_edit($options);
+	if (!@require_once $GLOBALS['xoops']->path('modules/tag/blocks/block.php')) {
+		return null;
+	}
+	$form = tag_block_cloud_edit($options);
 
-    return $form;
+	return $form;
 }
 
 /**#@+
@@ -49,12 +49,12 @@ 
  */
 function newbb_tag_block_top_show($options)
 {
-    if (!@require_once $GLOBALS['xoops']->path('modules/tag/blocks/block.php')) {
-        return null;
-    }
-    $block_content = tag_block_top_show($options, 'newbb');
+	if (!@require_once $GLOBALS['xoops']->path('modules/tag/blocks/block.php')) {
+		return null;
+	}
+	$block_content = tag_block_top_show($options, 'newbb');
 
-    return $block_content;
+	return $block_content;
 }
 
 /**
@@ -63,10 +63,10 @@ 
  */
 function newbb_tag_block_top_edit($options)
 {
-    if (!@require_once $GLOBALS['xoops']->path('modules/tag/blocks/block.php')) {
-        return null;
-    }
-    $form = tag_block_top_edit($options);
+	if (!@require_once $GLOBALS['xoops']->path('modules/tag/blocks/block.php')) {
+		return null;
+	}
+	$form = tag_block_top_edit($options);
 
-    return $form;
+	return $form;
 }

report.php

Indentation +69 added lines, -69 removed lines

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

Spacing +9 added lines, -9 removed lines

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

list.topic.php

Indentation +9 added lines, -9 removed lines

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

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 //$xoopsOption['xoops_module_header']= $xoops_module_header;
 $GLOBALS['xoopsOption']['template_main'] = 'newbb_viewall.tpl';
@@ -21,13 +21,13 @@ 
 // irmtfan new method
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/rss.php" />
+    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/rss.php" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 //$xoopsTpl->assign('xoops_module_header', $xoops_module_header);
 
-require_once __DIR__ . '/include/functions.time.php';
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.time.php';
+require_once __DIR__.'/include/functions.render.php';
 
 // irmtfan use require_once because it will redeclared in newbb/blocks/list_topic.php
 //require_once __DIR__ . '/./class/TopicRenderer.php';
@@ -87,7 +87,7 @@ 
 $xoopsTpl->assign('newpost_link', 'viewpost.php?status=new');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
+    require_once __DIR__.'/include/functions.forum.php';
     $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox());
 }
 $xoopsTpl->assign('menumode', $menumode);
@@ -95,12 +95,12 @@ 
 
 $xoopsTpl->assign('mode', $mode);
 $xoopsTpl->assign('status', $status);
-$xoopsTpl->assign('viewer_level', $topic_renderer->userlevel);// irmtfan use userlevel
+$xoopsTpl->assign('viewer_level', $topic_renderer->userlevel); // irmtfan use userlevel
 
 $pagetitle = sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES));
 $xoopsTpl->assign('forum_index_title', $pagetitle);
 $xoopsTpl->assign('xoops_pagetitle', $pagetitle);
 
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 require_once $GLOBALS['xoops']->path('footer.php');