mambax7 / newbb5

viewpost.php

Spacing +46 added lines, -46 removed lines

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

viewforum.php

Spacing +42 added lines, -42 removed lines

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

blocks/list_topic.php

Spacing +16 added lines, -16 removed lines

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

list.topic.php

Spacing +7 added lines, -7 removed lines

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

edit.php

Spacing +7 added lines, -7 removed lines

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

search.php

Spacing +30 added lines, -30 removed lines

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

include/onupdate.php

Spacing +11 added lines, -11 removed lines

@@ -21,7 +21,7 @@ 
 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)
     || !$GLOBALS['xoopsUser']->IsAdmin()) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**
@@ -88,21 +88,21 @@ 
         if ($tables->useTable($table)) {
             $tables->alterColumn($table, $column, $attributes, $newName);
             if (!$tables->executeQueue()) {
-                echo '<br>' . _AM_NEWBB_UPGRADEFAILED0 . ' ' . $migrate->getLastError();
+                echo '<br>'._AM_NEWBB_UPGRADEFAILED0.' '.$migrate->getLastError();
             }
         }
 
         //delete old HTML templates
         if (count($configurator->templateFolders) > 0) {
             foreach ($configurator->templateFolders as $folder) {
-                $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
+                $templateFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$folder);
                 if (is_dir($templateFolder)) {
                     $templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), ['..', '.']);
                     foreach ($templateList as $k => $v) {
-                        $fileInfo = new \SplFileInfo($templateFolder . $v);
+                        $fileInfo = new \SplFileInfo($templateFolder.$v);
                         if ('html' === $fileInfo->getExtension() && 'index.html' !== $fileInfo->getFilename()) {
-                            if (file_exists($templateFolder . $v)) {
-                                unlink($templateFolder . $v);
+                            if (file_exists($templateFolder.$v)) {
+                                unlink($templateFolder.$v);
                             }
                         }
                     }
@@ -114,7 +114,7 @@ 
         if (count($configurator->oldFiles) > 0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator->oldFiles) as $i) {
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
+                $tempFile = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFiles[$i]);
                 if (is_file($tempFile)) {
                     unlink($tempFile);
                 }
@@ -126,7 +126,7 @@ 
         if (count($configurator->oldFolders) > 0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator->oldFolders) as $i) {
-                $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
+                $tempFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFolders[$i]);
                 /* @var $folderHandler XoopsObjectHandler */
                 $folderHandler = \XoopsFile::getHandler('folder', $tempFolder);
                 $folderHandler->delete($tempFolder);
@@ -143,15 +143,15 @@ 
 
         //  ---  COPY blank.png FILES ---------------
         if (count($configurator->copyBlankFiles) > 0) {
-            $file = __DIR__ . '/../assets/images/blank.png';
+            $file = __DIR__.'/../assets/images/blank.png';
             foreach (array_keys($configurator->copyBlankFiles) as $i) {
-                $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+                $dest = $configurator->copyBlankFiles[$i].'/blank.png';
                 $utilityClass::copyFile($file, $dest);
             }
         }
 
         //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.html%\'';
+        $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('tplfile')." WHERE `tpl_module` = '".$module->getVar('dirname', 'n').'\' AND `tpl_file` LIKE \'%.html%\'';
         $GLOBALS['xoopsDB']->queryF($sql);
 
         /** @var XoopsGroupPermHandler $gpermHandler */

include/config.php

Spacing +13 added lines, -13 removed lines

@@ -20,12 +20,12 @@ 
  */
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
-require_once __DIR__ . '/common.php';
+require_once __DIR__.'/common.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 $uploadFolders = [
     NEWBB_UPLOAD_PATH,
-    NEWBB_UPLOAD_PATH . '/thumbs'
+    NEWBB_UPLOAD_PATH.'/thumbs'
 ];
 
 /**
@@ -36,24 +36,24 @@ 
     $moduleDirName      = basename(dirname(__DIR__));
     $moduleDirNameUpper = strtoupper($moduleDirName);
     return (object)[
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+        'name'           => strtoupper($moduleDirName).' Module Configurator',
         'paths'          => [
             'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
         ],
         'uploadFolders'  => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/thumbs',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/thumbs',
 
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
         'copyBlankFiles' => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/thumbs',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/thumbs',
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
 
@@ -88,6 +88,6 @@ 
             '/images',
         ],
         'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>',
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG').'\' alt=\'XOOPS Project\' /></a>',
     ];
 }

include/functions.config.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 use XoopsModules\Newbb;
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_CONFIG_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_CONFIG')) {
@@ -36,7 +36,7 @@ 
         }
 
         $configs = is_object($helper) ? $helper->getConfig() : [];
-        $plugins = include __DIR__ . '/plugin.php';
+        $plugins = include __DIR__.'/plugin.php';
         if (is_array($configs) && is_array($plugins)) {
             $configs = array_merge($configs, $plugins);
         }