mambax7 / newbb5

polls.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 {
-        include $GLOBALS['xoops']->path('modules/' . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/include/constants.php');
+        include $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';
 include $GLOBALS['xoops']->path('footer.php');

viewforum.php

Spacing +42 added lines, -42 removed lines

@@ -11,12 +11,12 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (!Request::getInt('forum', 0, 'GET')) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
-require_once __DIR__ . '/include/functions.read.php';
+require_once __DIR__.'/include/functions.read.php';
 
 /*
  * Build the page query
@@ -25,7 +25,7 @@ 
 $query_array = [];
 foreach ($query_vars as $var) {
     if (Request::getString($var, '', 'GET')) {
-        $query_array[$var] = "{$var}=" . Request::getString($var, '', 'GET');
+        $query_array[$var] = "{$var}=".Request::getString($var, '', 'GET');
     }
 }
 $page_query = implode('&', array_values($query_array));
@@ -39,8 +39,8 @@ 
         $markresult = _MD_NEWBB_MARK_UNREAD;
     }
     newbbSetReadTopic($markvalue, Request::getInt('forum', 0, 'GET'));
-    $url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?' . $page_query;
-    redirect_header($url, 2, _MD_NEWBB_ALL_TOPIC_MARKED . ' ' . $markresult);
+    $url = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?'.$page_query;
+    redirect_header($url, 2, _MD_NEWBB_ALL_TOPIC_MARKED.' '.$markresult);
 }
 
 $forum_id = Request::getInt('forum', 0, 'GET');
@@ -67,25 +67,25 @@ 
 $forumObject = $forumHandler->get($forum_id);
 
 if (!$forumObject) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _MD_NEWBB_ERRORFORUM);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/index.php', 2, _MD_NEWBB_ERRORFORUM);
 }
 
 if (!$forumHandler->getPermission($forumObject)) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php', 2, _NOPERM);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/index.php', 2, _NOPERM);
 }
 newbbSetRead('forum', $forum_id, $forumObject->getVar('forum_last_post_id'));
 
-$xoops_pagetitle = $forumObject->getVar('forum_name') . ' [' . $xoopsModule->getVar('name') . ']';
+$xoops_pagetitle = $forumObject->getVar('forum_name').' ['.$xoopsModule->getVar('name').']';
 
 $xoopsOption['template_main']   = 'newbb_viewforum.tpl';
 $xoopsOption['xoops_pagetitle'] = $xoops_pagetitle;
 
 require_once $GLOBALS['xoops']->path('header.php');
-require_once __DIR__ . '/include/functions.render.php';
+require_once __DIR__.'/include/functions.render.php';
 
 if (!empty($GLOBALS['xoopsModuleConfig']['rss_enable'])) {
     $xoopsTpl->assign('xoops_module_header', '
-    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name') . '-' . $forumObject->getVar('forum_name') . '" href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/rss.php?f=' . $forum_id . '" />
+    <link rel="alternate" type="application/xml+rss" title="' . $xoopsModule->getVar('name').'-'.$forumObject->getVar('forum_name').'" href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/rss.php?f='.$forum_id.'" />
     ' . @$xoopsTpl->get_template_vars('xoops_module_header'));
 }
 $forumDescription = $forumObject->getVar('forum_desc');
@@ -119,16 +119,16 @@ 
 
 if ($forumHandler->getPermission($forumObject, 'post')) {
     $xoopsTpl->assign('viewer_level', $isAdmin ? 2 : 1);
-    $xoopsTpl->assign('forum_post_or_register', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/newtopic.php?forum={$forum_id}\">" . newbbDisplayImage('t_new', _MD_NEWBB_POSTNEW) . '</a>');
+    $xoopsTpl->assign('forum_post_or_register', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/newtopic.php?forum={$forum_id}\">".newbbDisplayImage('t_new', _MD_NEWBB_POSTNEW).'</a>');
     if ($pollmodules && $forumHandler->getPermission($forumObject, 'addpoll')) {
         $t_poll = newbbDisplayImage('t_poll', _MD_NEWBB_ADDPOLL);
-        $xoopsTpl->assign('forum_addpoll', '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/polls.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
+        $xoopsTpl->assign('forum_addpoll', '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/polls.php?op=add&amp;forum={$forum_id}\">{$t_poll}</a>");
     }
 } else {
     $xoopsTpl->assign('viewer_level', 0);
     if (!is_object($GLOBALS['xoopsUser']) && !empty($GLOBALS['xoopsModuleConfig']['show_reg'])) {
-        $redirect = preg_replace("|(.*)\/modules\/Newbb\/(.*)|", "\\1/modules/newbb/newtopic.php?forum=" . $forum_id, htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5));
-        $xoopsTpl->assign('forum_post_or_register', "<a href='" . XOOPS_URL . "/user.php?xoops_redirect={$redirect}'>" . _MD_NEWBB_REGTOPOST . '</a>');
+        $redirect = preg_replace("|(.*)\/modules\/Newbb\/(.*)|", "\\1/modules/newbb/newtopic.php?forum=".$forum_id, htmlspecialchars($xoopsRequestUri, ENT_QUOTES | ENT_HTML5));
+        $xoopsTpl->assign('forum_post_or_register', "<a href='".XOOPS_URL."/user.php?xoops_redirect={$redirect}'>"._MD_NEWBB_REGTOPOST.'</a>');
         $xoopsTpl->assign('forum_addpoll', '');
     } else {
         $xoopsTpl->assign('forum_post_or_register', '');
@@ -139,7 +139,7 @@ 
 $xoopsTpl->assign_by_ref('parentforum', $parentforum);
 
 $criteria = new \CriteriaCompo(new \Criteria('parent_forum', $forum_id));
-$criteria->add(new \Criteria('forum_id', '(' . implode(', ', $forumHandler->getIdsByPermission('access')) . ')', 'IN'));
+$criteria->add(new \Criteria('forum_id', '('.implode(', ', $forumHandler->getIdsByPermission('access')).')', 'IN'));
 $criteria->setSort('forum_order');
 
 if ($forums = $forumHandler->getAll($criteria, null, false)) {
@@ -175,7 +175,7 @@ 
 
 $forum_selection_sort = '<select name="sort">';
 foreach ($sel_sort_array as $sort_k => $sort_v) {
-    $forum_selection_sort .= '<option value="' . $sort_k . '"' . (($sort == $sort_k) ? ' selected="selected"' : '') . '>' . $sort_v . '</option>';
+    $forum_selection_sort .= '<option value="'.$sort_k.'"'.(($sort == $sort_k) ? ' selected="selected"' : '').'>'.$sort_v.'</option>';
 }
 $forum_selection_sort .= '</select>';
 
@@ -184,14 +184,14 @@ 
 $order                 = (!Request::getString('order', '', 'GET')
                           || 'ASC' !== Request::getString('order', '', 'GET')) ? 'DESC' : 'ASC';
 $forum_selection_order = '<select name="order">';
-$forum_selection_order .= '<option value="ASC"' . (('ASC' === $order) ? ' selected' : '') . '>' . _MD_NEWBB_ASCENDING . '</option>';
-$forum_selection_order .= '<option value="DESC"' . (('DESC' === $order) ? ' selected' : '') . '>' . _MD_NEWBB_DESCENDING . '</option>';
+$forum_selection_order .= '<option value="ASC"'.(('ASC' === $order) ? ' selected' : '').'>'._MD_NEWBB_ASCENDING.'</option>';
+$forum_selection_order .= '<option value="DESC"'.(('DESC' === $order) ? ' selected' : '').'>'._MD_NEWBB_DESCENDING.'</option>';
 $forum_selection_order .= '</select>';
 
 $xoopsTpl->assign_by_ref('forum_selection_order', $forum_selection_order);
 
 $since = Request::getInt('since', $GLOBALS['xoopsModuleConfig']['since_default'], 'GET');
-require_once __DIR__ . '/include/functions.time.php';
+require_once __DIR__.'/include/functions.time.php';
 $forum_selection_since = newbbSinceSelectBox($since);
 $xoopsTpl->assign_by_ref('forum_selection_since', $forum_selection_since);
 
@@ -200,14 +200,14 @@ 
 $page_query_sort = implode('&amp;', array_values($query_sort));
 unset($query_sort);
 // irmtfan - edit: u.uname => t.topic_poster | t.topic_time => t.topic_id | p.post_time => t.topic_last_post_id
-$xoopsTpl->assign('h_topic_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_title&amp;order=" . (('t.topic_title' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_reply_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_replies&amp;order=" . (('t.topic_replies' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_poster_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_poster&amp;order=" . (('t.topic_poster' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_views_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_views&amp;order=" . (('t.topic_views' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_rating_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.rating&amp;order=" . (('t.rating' === $sort
+$xoopsTpl->assign('h_topic_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_title&amp;order=".(('t.topic_title' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_reply_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_replies&amp;order=".(('t.topic_replies' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_poster_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_poster&amp;order=".(('t.topic_poster' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_views_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_views&amp;order=".(('t.topic_views' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_rating_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.rating&amp;order=".(('t.rating' === $sort
                                                                                                                                   && 'DESC' === $order) ? 'ASC' : 'DESC')); // irmtfan t.topic_ratings to t.rating
-$xoopsTpl->assign('h_date_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_last_post_id&amp;order=" . (('t.topic_last_post_id' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
-$xoopsTpl->assign('h_publish_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_id&amp;order=" . (('t.topic_id' === $sort
+$xoopsTpl->assign('h_date_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_last_post_id&amp;order=".(('t.topic_last_post_id' === $sort && 'DESC' === $order) ? 'ASC' : 'DESC'));
+$xoopsTpl->assign('h_publish_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_sort}&amp;sort=t.topic_id&amp;order=".(('t.topic_id' === $sort
                                                                                                                                      && 'DESC' === $order) ? 'ASC' : 'DESC'));
 $xoopsTpl->assign('forum_since', $since); // For $since in search.php
 
@@ -237,11 +237,11 @@ 
 $xoopsTpl->assign('img_digest', newbbDisplayImage('topic_digest', _MD_NEWBB_TOPICDIGEST));
 $xoopsTpl->assign('img_poll', newbbDisplayImage('poll', _MD_NEWBB_TOPICHASPOLL));
 
-$xoopsTpl->assign('mark_read', XOOPS_URL . "/modules/newbb/viewforum.php?mark=1&amp;{$page_query}");
-$xoopsTpl->assign('mark_unread', XOOPS_URL . "/modules/newbb/viewforum.php?mark=2&amp;{$page_query}");
+$xoopsTpl->assign('mark_read', XOOPS_URL."/modules/newbb/viewforum.php?mark=1&amp;{$page_query}");
+$xoopsTpl->assign('mark_unread', XOOPS_URL."/modules/newbb/viewforum.php?mark=2&amp;{$page_query}");
 
-$xoopsTpl->assign('post_link', XOOPS_URL . '/modules/newbb/viewpost.php?forum=' . $forum_id);
-$xoopsTpl->assign('newpost_link', XOOPS_URL . '/modules/newbb/viewpost.php?status=new&amp;forum=' . $forum_id);
+$xoopsTpl->assign('post_link', XOOPS_URL.'/modules/newbb/viewpost.php?forum='.$forum_id);
+$xoopsTpl->assign('newpost_link', XOOPS_URL.'/modules/newbb/viewpost.php?status=new&amp;forum='.$forum_id);
 
 $query_type = $query_array;
 unset($query_type['type']);
@@ -252,16 +252,16 @@ 
 $typeOptions = null;
 $types       = [];
 if ($types = $typeHandler->getByForum($forum_id)) {
-    $typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}"];
+    $typeOptions[] = ['title' => _ALL, 'link' => XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_type}"];
     foreach ($types as $key => $item) {
         $typeOptions[] = [
             'title' => $item['type_name'],
-            'link'  => XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_type}&amp;type={$key}"
+            'link'  => XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_type}&amp;type={$key}"
         ];
     }
 }
 if ($type > 0) {
-    require_once __DIR__ . '/include/functions.topic.php';
+    require_once __DIR__.'/include/functions.topic.php';
     $xoopsTpl->assign('forum_topictype', getTopicTitle('', $types[$type]['type_name'], $types[$type]['type_color']));
 }
 $xoopsTpl->assign_by_ref('typeOptions', $typeOptions);
@@ -270,11 +270,11 @@ 
 unset($query_status['status']);
 $page_query_status = implode('&amp;', array_values($query_status));
 unset($query_status);
-$xoopsTpl->assign('newpost_link', XOOPS_URL . '/modules/newbb/viewpost.php?status=new&amp;forum=' . $forumObject->getVar('forum_id'));
-$xoopsTpl->assign('all_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}");
-$xoopsTpl->assign('digest_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=digest");
-$xoopsTpl->assign('unreplied_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unreplied");
-$xoopsTpl->assign('unread_link', XOOPS_URL . "/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unread");
+$xoopsTpl->assign('newpost_link', XOOPS_URL.'/modules/newbb/viewpost.php?status=new&amp;forum='.$forumObject->getVar('forum_id'));
+$xoopsTpl->assign('all_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}");
+$xoopsTpl->assign('digest_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&amp;status=digest");
+$xoopsTpl->assign('unreplied_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unreplied");
+$xoopsTpl->assign('unread_link', XOOPS_URL."/modules/newbb/viewforum.php?{$page_query_status}&amp;status=unread");
 switch ($status) {
     case 'digest':
         $current_status = _MD_NEWBB_DIGEST;
@@ -322,7 +322,7 @@ 
 }
 
 if (!empty($GLOBALS['xoopsModuleConfig']['show_jump'])) {
-    require_once __DIR__ . '/include/functions.forum.php';
+    require_once __DIR__.'/include/functions.forum.php';
     $xoopsTpl->assign('forum_jumpbox', newbbMakeJumpbox($forum_id));
 }
 
@@ -335,8 +335,8 @@ 
 }
 
 if (1 == $GLOBALS['xoopsModuleConfig']['rss_enable']) {
-    $xoopsTpl->assign('rss_button', "<div align='right'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/rss.php?f=' . $forum_id . "' title='RSS feed' target='_blank'>" . newbbDisplayImage('rss', 'RSS feed') . '</a></div>');
+    $xoopsTpl->assign('rss_button', "<div align='right'><a href='".XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/rss.php?f='.$forum_id."' title='RSS feed' target='_blank'>".newbbDisplayImage('rss', 'RSS feed').'</a></div>');
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

blocks/newbb_block.php

Spacing +132 added lines, -132 removed lines

@@ -56,8 +56,8 @@ 
     global $accessForums;
     global $xoopsLogger;
 
-    require_once __DIR__ . '/../include/functions.config.php';
-    require_once __DIR__ . '/../include/functions.time.php';
+    require_once __DIR__.'/../include/functions.config.php';
+    require_once __DIR__.'/../include/functions.time.php';
 
     $myts          = \MyTextSanitizer::getInstance();
     $block         = [];
@@ -66,7 +66,7 @@ 
     $extraCriteria = '';
     if (!empty($options[2])) {
         //require_once __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 __DIR__ . '/../include/functions.user.php';
+    require_once __DIR__.'/../include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
 
     if (count($types) > 0) {
         /** @var Newbb\TypeHandler $typeHandler */
         $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+        $type_list   = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', array_keys($types)).')', 'IN'));
     }
 
     foreach ($rows as $arr) {
@@ -162,7 +162,7 @@ 
         xoops_loadLanguage('main', 'newbb');
         $topic                  = [];
         $topic_page_jump        = newbbDisplayImage('lastposticon', _MD_NEWBB_GOTOLASTPOST);
-        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . ']';
+        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '['.$type_list[$arr['type_id']].']';
 
         $topic['post_id']      = $arr['post_id'];
         $topic['topic_status'] = $arr['topic_status'];
@@ -174,7 +174,7 @@ 
         if (!empty($options[5])) {
             $title = xoops_substr($title, 0, $options[5]);
         }
-        $topic['title']   = $topic['topic_subject'] . ' ' . $title;
+        $topic['title']   = $topic['topic_subject'].' '.$title;
         $topic['replies'] = $arr['topic_replies'];
         $topic['views']   = $arr['topic_views'];
         $topic['time']    = newbbFormatTimestamp($arr['post_time']);
@@ -186,9 +186,9 @@ 
         $topic['topic_poster']    = $topic_poster;
         $topic['topic_page_jump'] = $topic_page_jump;
         // START irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
-        $seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+        $seo_url       = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'];
+        $seo_topic_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'];
+        $seo_forum_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'];
         if (!empty($newbbConfig['do_rewrite'])) {
             $topic['seo_url']       = seo_urls($seo_url);
             $topic['seo_topic_url'] = seo_urls($seo_topic_url);
@@ -203,11 +203,11 @@ 
         unset($topic);
     }
     // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME;
     $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php';
     $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php';
     $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
     // END irmtfan remove hardcoded html in URLs
     $block['indexNav'] = (int)$options[4];
@@ -230,7 +230,7 @@ 
 function b_newbb_topic_show($options)
 {
     global $accessForums;
-    require_once __DIR__ . '/../include/functions.time.php';
+    require_once __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 __DIR__ . '/../include/functions.user.php';
+    require_once __DIR__.'/../include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
     if (count($types) > 0) {
         /** @var Newbb\TypeHandler $typeHandler */
         $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-        $type_list   = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', array_keys($types)) . ')', 'IN'));
+        $type_list   = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', array_keys($types)).')', 'IN'));
     }
 
     foreach ($rows as $arr) {
         // irmtfan remove $topic_page_jump because there is no last post
         //$topic_page_jump = '';
         $topic                  = [];
-        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '[' . $type_list[$arr['type_id']] . '] ';
+        $topic['topic_subject'] = empty($type_list[$arr['type_id']]) ? '' : '['.$type_list[$arr['type_id']].'] ';
         $topic['forum_id']      = $arr['forum_id'];
         $topic['forum_name']    = $myts->htmlSpecialChars($arr['forum_name']);
         $topic['id']            = $arr['topic_id'];
@@ -353,7 +353,7 @@ 
         if (!empty($options[5])) {
             $title = xoops_substr($title, 0, $options[5]);
         }
-        $topic['title']   = $topic['topic_subject'] . $title;
+        $topic['title']   = $topic['topic_subject'].$title;
         $topic['replies'] = $arr['topic_replies'];
         $topic['views']   = $arr['topic_views'];
         $topic['time']    = newbbFormatTimestamp($arr['topic_time']);
@@ -366,8 +366,8 @@ 
         // irmtfan remove $topic_page_jump because there is no last post
         //$topic['topic_page_jump'] = $topic_page_jump;
         // START irmtfan remove hardcoded html in URLs - add $seo_topic_url
-        $seo_topic_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?topic_id=' . $topic['id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+        $seo_topic_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?topic_id='.$topic['id'];
+        $seo_forum_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'];
 
         if (!empty($newbbConfig['do_rewrite'])) {
             $topic['seo_topic_url'] = seo_urls($seo_topic_url);
@@ -381,11 +381,11 @@ 
         unset($topic);
     }
     // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME;
     $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php';
     $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php';
     $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
     // END irmtfan remove hardcoded html in URLs
     $block['indexNav'] = (int)$options[4];
@@ -410,7 +410,7 @@ 
     global $accessForums;
     global $newbbConfig;
 
-    require_once __DIR__ . '/../include/functions.time.php';
+    require_once __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 __DIR__ . '/../include/functions.user.php';
+    require_once __DIR__.'/../include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname'], true);
 
     foreach ($rows as $arr) {
         //if ($arr['icon'] && is_file($GLOBALS['xoops']->path('images/subject/' . $arr['icon']))) {
         if (!empty($arr['icon'])) {
-            $last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/' . htmlspecialchars($arr['icon'], ENT_QUOTES | ENT_HTML5) . '" alt="" />';
+            $last_post_icon = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($arr['icon'], ENT_QUOTES | ENT_HTML5).'" alt="" />';
         } else {
-            $last_post_icon = '<img src="' . XOOPS_URL . '/images/subject/icon1.gif" alt="" />';
+            $last_post_icon = '<img src="'.XOOPS_URL.'/images/subject/icon1.gif" alt="" />';
         }
         //$topic['jump_post'] = "<a href='" . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id=" . $arr['post_id'] ."#forumpost" . $arr['post_id'] . "'>" . $last_post_icon . '</a>';
         $topic               = [];
@@ -530,8 +530,8 @@ 
             $topic['post_text'] = $post_text;
         }
         // START irmtfan remove hardcoded html in URLs
-        $seo_url       = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'];
-        $seo_forum_url = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewforum.php?forum=' . $topic['forum_id'];
+        $seo_url       = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'];
+        $seo_forum_url = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewforum.php?forum='.$topic['forum_id'];
         // END irmtfan remove hardcoded html in URLs
         if (!empty($newbbConfig['do_rewrite'])) {
             $topic['seo_url']       = seo_urls($seo_url);
@@ -545,11 +545,11 @@ 
         unset($topic);
     }
     // START irmtfan remove hardcoded html in URLs
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME;
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME;
     $block['seo_top_allforums'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/list.topic.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/list.topic.php';
     $block['seo_top_alltopics'] = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
-    $seo_top_allforums          = XOOPS_URL . '/' . SEO_MODULE_NAME . '/viewpost.php';
+    $seo_top_allforums          = XOOPS_URL.'/'.SEO_MODULE_NAME.'/viewpost.php';
     $block['seo_top_allposts']  = !empty($newbbConfig['do_rewrite']) ? seo_urls($seo_top_allforums) : $seo_top_allforums;
     // END irmtfan remove hardcoded html in URLs
 
@@ -582,9 +582,9 @@ 
     $extraCriteria = '';
     $time_criteria = null;
     if (!empty($options[2])) {
-        require_once __DIR__ . '/../include/functions.time.php';
+        require_once __DIR__.'/../include/functions.time.php';
         $time_criteria = time() - newbbGetSinceTime($options[2]);
-        $extraCriteria = ' AND topic_time > ' . $time_criteria;
+        $extraCriteria = ' AND topic_time > '.$time_criteria;
     }
     switch ($options[0]) {
         case 'topic':
@@ -592,7 +592,7 @@ 
         case 'digest':
             $extraCriteria = ' AND topic_digest = 1';
             if (null !== $time_criteria) {
-                $extraCriteria .= ' AND digest_time > ' . $time_criteria;
+                $extraCriteria .= ' AND digest_time > '.$time_criteria;
             }
             break;
         case 'sticky':
@@ -602,7 +602,7 @@ 
         default:
             $type = 'post';
             if (null !== $time_criteria) {
-                $extraCriteria = ' AND post_time > ' . $time_criteria;
+                $extraCriteria = ' AND post_time > '.$time_criteria;
             }
             break;
     }
@@ -626,17 +626,17 @@ 
     }
 
     if ('topic' === $type) {
-        $forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
+        $forumCriteria   = ' AND forum_id IN ('.implode(',', $allowedForums).')';
         $approveCriteria = ' AND approved = 1';
         $query           = 'SELECT DISTINCT topic_poster AS author, COUNT(*) AS count
-                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '
-                    WHERE topic_poster>0 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' GROUP BY topic_poster ORDER BY ' . $order . ' DESC';
+                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics').'
+                    WHERE topic_poster>0 ' . $forumCriteria.$approveCriteria.$extraCriteria.' GROUP BY topic_poster ORDER BY '.$order.' DESC';
     } else {
-        $forumCriteria   = ' AND forum_id IN (' . implode(',', $allowedForums) . ')';
+        $forumCriteria   = ' AND forum_id IN ('.implode(',', $allowedForums).')';
         $approveCriteria = ' AND approved = 1';
         $query           = 'SELECT DISTINCT uid AS author, COUNT(*) AS count
-                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '
-                    WHERE uid > 0 ' . $forumCriteria . $approveCriteria . $extraCriteria . ' GROUP BY uid ORDER BY ' . $order . ' DESC';
+                    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts').'
+                    WHERE uid > 0 ' . $forumCriteria.$approveCriteria.$extraCriteria.' GROUP BY uid ORDER BY '.$order.' DESC';
     }
 
     $result = $GLOBALS['xoopsDB']->query($query, $options[1], 0);
@@ -651,12 +651,12 @@ 
     if (count($author) < 1) {
         return $block;
     }
-    require_once __DIR__ . '/../include/functions.user.php';
+    require_once __DIR__.'/../include/functions.user.php';
     $author_name = newbbGetUnameFromIds(array_keys($author), $newbbConfig['show_realname']);
     foreach (array_keys($author) as $uid) {
         $author[$uid]['name'] = $myts->htmlSpecialChars($author_name[$uid]);
     }
-    $block['authors']   =& $author;
+    $block['authors']   = & $author;
     $block['disp_mode'] = $options[3]; // 0 - full view; 1 - lite view;
     $block['indexNav']  = (int)$options[4];
 
@@ -669,45 +669,45 @@ 
  */
 function b_newbb_edit($options)
 {
-    require_once __DIR__ . '/../include/functions.forum.php';
+    require_once __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 __DIR__ . '/../include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    require_once __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 __DIR__ . '/../include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    require_once __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 __DIR__ . '/../include/functions.forum.php';
-    $form = _MB_NEWBB_CRITERIA . "<select name='options[0]'>";
+    require_once __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');
     }
@@ -967,8 +967,8 @@ 
 {
 
     // 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');
     }
@@ -992,8 +992,8 @@ 
 {
 
     // 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');
     }
@@ -1016,8 +1016,8 @@ 
 function b_newbb_custom_author($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/list_topic.php

Spacing +16 added lines, -16 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 __DIR__ . '/../include/functions.config.php';
-require_once __DIR__ . '/../include/functions.time.php';
-require_once __DIR__ . '/../include/functions.session.php';
-require_once __DIR__ . '/../include/functions.render.php';
-require_once __DIR__ . '/../include/functions.user.php';
+require_once __DIR__.'/../include/functions.config.php';
+require_once __DIR__.'/../include/functions.time.php';
+require_once __DIR__.'/../include/functions.session.php';
+require_once __DIR__.'/../include/functions.render.php';
+require_once __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,7 +59,7 @@ 
     $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
     }
@@ -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
@@ -180,20 +180,20 @@ 
 
     //  forum element
     $optionsForum = explode(',', $options[12]);
-    require_once __DIR__ . '/../include/functions.forum.php';
+    require_once __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);

reply.php

Spacing +11 added lines, -11 removed lines

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

list.topic.php

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 //$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';
 include $GLOBALS['xoops']->path('footer.php');

edit.php

Spacing +7 added lines, -7 removed lines

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

search.php

Spacing +30 added lines, -30 removed lines

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

post.php

Spacing +28 added lines, -28 removed lines

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