mambax7 / newbb5

blocks/newbb_block.php

Spacing +132 added lines, -132 removed lines

@@ -66,8 +66,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         = [];
@@ -76,7 +76,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':
@@ -102,7 +102,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();
@@ -158,13 +158,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) {
@@ -172,7 +172,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'];
@@ -184,7 +184,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']);
@@ -196,9 +196,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);
@@ -213,11 +213,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];
@@ -240,7 +240,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;
@@ -249,7 +249,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':
@@ -262,11 +262,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':
@@ -302,7 +302,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'
@@ -342,19 +342,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'];
@@ -363,7 +363,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']);
@@ -376,8 +376,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);
@@ -391,11 +391,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];
@@ -420,7 +420,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;
@@ -429,7 +429,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]) {
@@ -473,7 +473,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';
@@ -481,11 +481,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) {
@@ -502,15 +502,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']) . '" alt="" />';
+            $last_post_icon = '<img src="'.XOOPS_URL.'/images/subject/'.htmlspecialchars($arr['icon']).'" 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               = [];
@@ -540,8 +540,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);
@@ -555,11 +555,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
 
@@ -592,9 +592,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':
@@ -602,7 +602,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':
@@ -612,7 +612,7 @@ 
         default:
             $type = 'post';
             if (null !== $time_criteria) {
-                $extraCriteria = ' AND post_time > ' . $time_criteria;
+                $extraCriteria = ' AND post_time > '.$time_criteria;
             }
             break;
     }
@@ -636,17 +636,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);
@@ -661,12 +661,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];
 
@@ -679,45 +679,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]));
@@ -726,7 +726,7 @@ 
     if ($isAll) {
         $form .= ' selected';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -739,64 +739,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
 
@@ -806,7 +806,7 @@ 
     if ($isAll) {
         $form .= ' selected="selected"';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -819,49 +819,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]));
@@ -870,7 +870,7 @@ 
     if ($isAll) {
         $form .= ' selected="selected"';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -883,53 +883,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]));
@@ -938,7 +938,7 @@ 
     if ($isAll) {
         $form .= ' selected="selected"';
     }
-    $form .= '>' . _ALL . '</option>';
+    $form .= '>'._ALL.'</option>';
     $form .= newbbForumSelectBox($optionsForum);
     $form .= '</select><br>';
 
@@ -952,8 +952,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');
     }
@@ -977,8 +977,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');
     }
@@ -1002,8 +1002,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');
     }
@@ -1026,8 +1026,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');
     }

action.post.php

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $topic_id = Request::getInt('topic_id', 0, 'POST');
 $post_id  = Request::getArray('post_id', Request::getArray('post_id', [], 'POST'), 'GET');
@@ -42,7 +42,7 @@ 
 $isAdmin = newbbIsAdmin($forumObject);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 switch ($op) {
@@ -74,7 +74,7 @@ 
         sort($post_id);
         $topics      = [];
         $forums      = [];
-        $criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
+        $criteria    = new \Criteria('post_id', '('.implode(',', $post_id).')', 'IN');
         $postsObject = $postHandler->getObjects($criteria, true);
         foreach ($post_id as $post) {
             /** @var Newbb\Post $postObject */
@@ -97,23 +97,23 @@ 
             break;
         }
 
-        $criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
+        $criteria_topic = new \Criteria('topic_id', '('.implode(',', array_keys($topics)).')', 'IN');
         $topic_list     = $topicHandler->getList($criteria_topic, true);
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forum_list     = $forumHandler->getList($criteria_forum);
 
-        require_once __DIR__ . '/include/notification.inc.php';
+        require_once __DIR__.'/include/notification.inc.php';
         /** @var \XoopsNotificationHandler $notificationHandler */
         $notificationHandler = xoops_getHandler('notification');
         foreach ($post_id as $post) {
             $tags = [];
             /** @var Newbb\Post[] $postsObject [$post] */
             $tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&forum=' . $postsObject[$post]->getVar('forum_id');
+            $tags['THREAD_URL']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$postsObject[$post]->getVar('topic_id').'&forum='.$postsObject[$post]->getVar('forum_id');
             $tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
-            $tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
+            $tags['FORUM_URL']   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewforum.php?forum='.$postsObject[$post]->getVar('forum_id');
+            $tags['POST_URL']    = $tags['THREAD_URL'].'#forumpost'.$post;
             $notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
@@ -180,7 +180,7 @@ 
             $mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
             $posts  = $mytree->getAllChildId($post_id);
             if (count($posts) > 0) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
+                $criteria = new \Criteria('post_id', '('.implode(',', $posts).')', 'IN');
                 $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
             }
             /* split a post and all posts coming after */
@@ -207,7 +207,7 @@ 
                 }
             }
             if (count($post_update)) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
+                $criteria = new \Criteria('post_id', '('.implode(',', $post_update).')', 'IN');
                 $postHandler->updateAll('pid', $post_id, $criteria, true);
             }
         }
@@ -221,12 +221,12 @@ 
         break;
 }
 if (!empty($topic_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
 } elseif (!empty($forum_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

ratethread.php

Spacing +8 added lines, -8 removed lines

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

action.topic.php

Spacing +24 added lines, -24 removed lines

@@ -12,7 +12,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $forum_id = Request::getInt('forum_id', 0, 'POST');
 $topic_id = Request::getArray('topic_id', null, 'POST');
@@ -34,12 +34,12 @@ 
 $isAdmin = newbbIsAdmin($forum_id);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+    redirect_header(XOOPS_URL.'/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 switch ($op) {
     case 'restore':
         $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             /** @var Newbb\Topic $topicObject */
             $topicObject = $topicsObject[$id];
@@ -47,7 +47,7 @@ 
             $topicHandler->synchronization($topicObject);
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -56,7 +56,7 @@ 
         break;
     case 'approve':
         $forums       = [];
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             /** @var Newbb\Topic $topicObject */
             $topicObject = $topicsObject[$id];
@@ -65,7 +65,7 @@ 
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -75,21 +75,21 @@ 
             break;
         }
 
-        require_once __DIR__ . '/include/notification.inc.php';
+        require_once __DIR__.'/include/notification.inc.php';
         /** @var \XoopsNotificationHandler $notificationHandler */
         $notificationHandler = xoops_getHandler('notification');
         foreach (array_keys($topicsObject) as $id) {
             $topicObject         = $topicsObject[$id];
             $tags                = [];
             $tags['THREAD_NAME'] = $topicObject->getVar('topic_title');
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewtopic.php?topic_id=' . $id . '&forum=' . $topicObject->getVar('forum_id');
+            $tags['THREAD_URL']  = XOOPS_URL.'/modules/'.$moduleDirName.'/viewtopic.php?topic_id='.$id.'&forum='.$topicObject->getVar('forum_id');
             /** @var Newbb\Forum[] $forumsObject */
             $tags['FORUM_NAME'] = $forumsObject[$topicObject->getVar('forum_id')]->getVar('forum_name');
-            $tags['FORUM_URL']  = XOOPS_URL . '/modules/' . $moduleDirName . '/viewforum.php?forum=' . $topicObject->getVar('forum_id');
+            $tags['FORUM_URL']  = XOOPS_URL.'/modules/'.$moduleDirName.'/viewforum.php?forum='.$topicObject->getVar('forum_id');
             $notificationHandler->triggerEvent('global', 0, 'new_thread', $tags);
             $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_thread', $tags);
             $postObject       = $topicHandler->getTopPost($id);
-            $tags['POST_URL'] = $tags['THREAD_URL'] . '#forumpost' . $postObject->getVar('post_id');
+            $tags['POST_URL'] = $tags['THREAD_URL'].'#forumpost'.$postObject->getVar('post_id');
             $notificationHandler->triggerEvent('thread', $id, 'new_post', $tags);
             $notificationHandler->triggerEvent('forum', $topicObject->getVar('forum_id'), 'new_post', $tags);
             $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
@@ -104,7 +104,7 @@ 
     case 'delete':
         $forums = [];
         /** @var Newbb\TopicHandler|\XoopsPersistableObjectHandler $topicHandler */
-        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN'));
+        $topicsObject = $topicHandler->getAll(new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN'));
         foreach (array_keys($topicsObject) as $id) {
             /** @var Newbb\Topic $topicObject */
             $topicObject = $topicsObject[$id];
@@ -114,7 +114,7 @@ 
             $forums[$topicObject->getVar('forum_id')] = 1;
         }
 
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+        $criteria_forum = new \Criteria('forum_id', '('.implode(',', array_keys($forums)).')', 'IN');
         $forumsObject   = $forumHandler->getAll($criteria_forum);
         foreach (array_keys($forumsObject) as $id) {
             $forumHandler->synchronization($forumsObject[$id]);
@@ -125,7 +125,7 @@ 
         if (Request::getInt('newforum', 0, 'POST')
             && Request::getInt('newforum', 0, 'POST') !== $forum_id
             && $forumHandler->getPermission(Request::getInt('newforum', 0, 'POST'), 'post')) {
-            $criteria = new \Criteria('topic_id', '(' . implode(',', $topic_id) . ')', 'IN');
+            $criteria = new \Criteria('topic_id', '('.implode(',', $topic_id).')', 'IN');
             //            /** @var Newbb\PostHandler $postHandler */
             //            $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
             $postHandler->updateAll('forum_id', Request::getInt('newforum', 0, 'POST'), $criteria, true);
@@ -144,37 +144,37 @@ 
                 foreach (array_keys($forums) as $key) {
 
                     /** @var Newbb\Category[] $categories */
-                    $box .= "<option value='-1'>[" . $categories[$key]->getVar('cat_title') . ']</option>';
+                    $box .= "<option value='-1'>[".$categories[$key]->getVar('cat_title').']</option>';
                     foreach ($forums[$key] as $forumid => $_forum) {
-                        $box .= "<option value='" . $forumid . "'>-- " . $_forum['title'] . '</option>';
+                        $box .= "<option value='".$forumid."'>-- ".$_forum['title'].'</option>';
                         if (!isset($_forum['sub'])) {
                             continue;
                         }
                         foreach (array_keys($_forum['sub']) as $fid) {
-                            $box .= "<option value='" . $fid . "'>---- " . $_forum['sub'][$fid]['title'] . '</option>';
+                            $box .= "<option value='".$fid."'>---- ".$_forum['sub'][$fid]['title'].'</option>';
                         }
                     }
                 }
             } else {
-                $box .= "<option value='-1'>" . _MD_NEWBB_NOFORUMINDB . '</option>';
+                $box .= "<option value='-1'>"._MD_NEWBB_NOFORUMINDB.'</option>';
             }
             $box .= '</select>';
             unset($forums, $categories);
 
-            echo "<form action='" . Request::getString('PHP_SELF', '', 'SERVER') . "' method='post'>";
+            echo "<form action='".Request::getString('PHP_SELF', '', 'SERVER')."' method='post'>";
             echo "<table border='0' cellpadding='1' cellspacing='0' align='center' width='95%'>";
             echo "<tr><td class='bg2'>";
             echo "<table border='0' cellpadding='1' cellspacing='1' width='100%'>";
-            echo '<tr><td class="bg3">' . _MD_NEWBB_MOVETOPICTO . '</td><td class="bg1">';
+            echo '<tr><td class="bg3">'._MD_NEWBB_MOVETOPICTO.'</td><td class="bg1">';
             echo $box;
             echo '</td></tr>';
             echo '<tr class="bg3"><td colspan="2" align="center">';
             echo "<input type='hidden' name='op' value='move' />";
             echo "<input type='hidden' name='forum_id' value='{$forum_id}' />";
             foreach ($topic_id as $id) {
-                echo "<input type='hidden' name='topic_id[]' value='" . $id . "' />";
+                echo "<input type='hidden' name='topic_id[]' value='".$id."' />";
             }
-            echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
+            echo "<input type='submit' name='submit' value='"._SUBMIT."' />";
             echo '</td></tr></table></td></tr></table>';
             echo '</form>';
             include $GLOBALS['xoops']->path('footer.php');
@@ -186,10 +186,10 @@ 
 //$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
 $statsHandler->reset();
 if (empty($forum_id)) {
-    redirect_header(XOOPS_URL . '/modules/newbb/list.topic.php', 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL.'/modules/newbb/list.topic.php', 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
+    redirect_header(XOOPS_URL."/modules/newbb/viewforum.php?forum={$forum_id}", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
-require_once __DIR__ . '/footer.php';
+require_once __DIR__.'/footer.php';
 include $GLOBALS['xoops']->path('footer.php');

post.php

Spacing +30 added lines, -30 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]);
             }
         }
@@ -251,7 +251,7 @@ 
 
     if (isset($_FILES['userfile']['name']) && '' !== $_FILES['userfile']['name']
         && $topicHandler->getPermission($forumObject, $topic_status, 'attach')) {
-        require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php');
+        require_once $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname', 'n').'/class/uploader.php');
         $maxfilesize = $forumObject->getVar('attach_maxkb') * 1024;
         $uploaddir   = XOOPS_CACHE_PATH;
 
@@ -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]);
             }
         }
@@ -423,7 +423,7 @@ 
 
     $error_upload = '';
     if (isset($_FILES['userfile']['name']) && '' !== $_FILES['userfile']['name']) {
-        require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php');
+        require_once $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname', 'n').'/class/uploader.php');
         $maxfilesize = $forumObject->getVar('attach_maxkb') * 1024;
         $uploaddir   = XOOPS_CACHE_PATH;
 
@@ -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');

update_type.php

Spacing +13 added lines, -13 removed lines

@@ -8,7 +8,7 @@ 
  * @since          4.00
  * @package        module::newbb
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (!is_object($GLOBALS['xoopsUser']) || !$GLOBALS['xoopsUser']->isAdmin()) {
     exit(_NOPERM);
@@ -22,11 +22,11 @@ 
     exit('No need for update');
 }
 
-$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+$GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+$GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
 
 if (!$GLOBALS['xoopsDB']->queryF('
-        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . " (
+        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp')." (
           `type_id`             SMALLINT(4)         UNSIGNED NOT NULL AUTO_INCREMENT,
           `type_name`             VARCHAR(64)         NOT NULL DEFAULT '',
           `type_color`             VARCHAR(10)         NOT NULL DEFAULT '',
@@ -39,7 +39,7 @@ 
 }
 
 if (!$GLOBALS['xoopsDB']->queryF('
-        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . " (
+        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp')." (
           `tf_id`                 MEDIUMINT(4)         UNSIGNED NOT NULL AUTO_INCREMENT,
           `type_id`             SMALLINT(4)         UNSIGNED NOT NULL DEFAULT '0',
           `forum_id`             SMALLINT(4)         UNSIGNED NOT NULL DEFAULT '0',
@@ -50,7 +50,7 @@ 
           KEY `type_order`        (`type_order`)
         ) ENGINE=MyISAM;
     ")) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
     exit('Can not create tmp table for `bb_type_forum_tmp`');
 }
 
@@ -61,10 +61,10 @@ 
 foreach ($subjectpres as $subjectpre) {
     if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) {
         if (!$GLOBALS['xoopsDB']->queryF('
-                INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . '
+                INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp').'
                     (`type_name`, `type_color`)
                 VALUES
-                    (' . $GLOBALS['xoopsDB']->quoteString($matches[2]) . ', ' . $GLOBALS['xoopsDB']->quoteString($matches[1]) . ')
+                    (' . $GLOBALS['xoopsDB']->quoteString($matches[2]).', '.$GLOBALS['xoopsDB']->quoteString($matches[1]).')
             ')) {
             xoops_error("Can not add type of `{$matches[2]}`");
             continue;
@@ -73,8 +73,8 @@ 
     }
 }
 if (0 === count($types)) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
     exit('No type item created');
 }
 
@@ -87,14 +87,14 @@ 
             $type_query[] = "({$key}, {$forum_id}, {$order})";
         }
 
-        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
+        $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp').' (type_id, forum_id, type_order) '.' VALUES '.implode(', ', $type_query);
         if (false === ($result = $GLOBALS['xoopsDB']->queryF($sql))) {
             xoops_error($GLOBALS['xoopsDB']->error());
         }
     }
 } else {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
     exit('No type item to update');
 }
 

votepolls.php

Spacing +11 added lines, -11 removed lines

@@ -28,7 +28,7 @@ 
 use Xmf\Request;
 use XoopsModules\Xoopspoll;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $poll_id  = Request::getInt('poll_id', Request::getInt('poll_id', 0, 'POST'), 'GET');
 $topic_id = Request::getInt('topic_id', Request::getInt('topic_id', 0, 'POST'), 'GET');
 $forum    = Request::getInt('forum', Request::getInt('forum', 0, 'POST'), 'GET');
@@ -42,7 +42,7 @@ 
 
 if (!Request::getInt('option_id', 0, 'POST')) {
     // irmtfan - add error message - simple url
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_NOOPTION);
+    redirect_header(XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}", 1, _MD_NEWBB_POLL_NOOPTION);
 }
 // poll module
 $pollModuleHandler = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
@@ -60,7 +60,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
     }
@@ -81,7 +81,7 @@ 
             $optionId = Request::getInt('option_id', 0, 'POST');
         }
         if (!$pollObject->hasExpired()) {
-            $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_MUSTLOGIN');
+            $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_MUSTLOGIN');
             //@todo:: add $url to all redirects
             //            $url = $GLOBALS['xoops']->buildUrl("index.php", array('poll_id' => $poll_id));
             if ($pollObject->isAllowedToVote()) {
@@ -95,13 +95,13 @@ 
                             echo $pollObject->getHtmlErrors();
                             exit();
                         }
-                        $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_THANKSFORVOTE');
+                        $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_THANKSFORVOTE');
                     } else {
                         /* there was a problem registering the vote */
-                        redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_VOTE_ERROR'));
+                        redirect_header($GLOBALS['xoops']->buildUrl('index.php', ['poll_id' => $poll_id]), $classConstants::REDIRECT_DELAY_MEDIUM, constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_VOTE_ERROR'));
                     }
                 } else {
-                    $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ALREADYVOTED');
+                    $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_ALREADYVOTED');
                 }
                 /* set anon user vote (and the time they voted) */
                 if (!is_object($GLOBALS['xoopsUser'])) {
@@ -111,14 +111,14 @@ 
                     $classPollUtility::setVoteCookie($poll_id, $voteTime, 0);
                 }
             } else {
-                $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_CANNOTVOTE');
+                $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_CANNOTVOTE');
             }
         } else {
             /* poll has expired so just show the results */
-            $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . 'SORRYEXPIRED');
+            $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'SORRYEXPIRED');
         }
     } else {
-        $msg = constant('_MD_' . strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']) . '_ERROR_INVALID_POLLID');
+        $msg = constant('_MD_'.strtoupper($GLOBALS['xoopsModuleConfig']['poll_module']).'_ERROR_INVALID_POLLID');
     }
     if (null !== $url) {
         redirect_header($url, $classConstants::REDIRECT_DELAY_MEDIUM, $msg);
@@ -127,7 +127,7 @@ 
     }
     // old xoopspoll or umfrage or any clone from them
 } else {
-    $classLog = $classPoll . 'Log';
+    $classLog = $classPoll.'Log';
     if (is_object($GLOBALS['xoopsUser'])) {
         if ($classLog::hasVoted($poll_id, Request::getString('REMOTE_ADDR', '', 'SERVER'), $GLOBALS['xoopsUser']->getVar('uid'))) {
             $msg = _PL_ALREADYVOTED;

footer.php

Spacing +6 added lines, -6 removed lines

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

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));
-        $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));
+        $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');