mambax7 / newbb5

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'
 ];
 
 function getConfig()
@@ -33,24 +33,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'
         ],
 
@@ -85,6 +85,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.stats.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_STATS_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_STATS')) {
@@ -102,7 +102,7 @@ 
      */
     function getTotalViews()
     {
-        $sql = 'SELECT sum(topic_views) FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' ';
+        $sql = 'SELECT sum(topic_views) FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' ';
         if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
             return null;
         }

include/functions.language.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_LANGUAGE_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_LANGUAGE')) {

include/functions.time.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_TIME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_TIME')) {
@@ -76,7 +76,7 @@ 
         // irmtfan no option when no selected value
         $forum_selection_since .= '<option value="">--------</option>';
         foreach ($select_array as $since) {
-            $forum_selection_since .= '<option value="' . $since . '"' . (($selected == $since) ? ' selected="selected"' : '') . '>';
+            $forum_selection_since .= '<option value="'.$since.'"'.(($selected == $since) ? ' selected="selected"' : '').'>';
             // START irmtfan functional since 0 and 365
             switch ($since) {
                 case 0:

include/functions.ini.php

Spacing +2 added lines, -2 removed lines

@@ -38,5 +38,5 @@
 /**
  * @return array
  */
-require_once __DIR__ . '/functions.config.php';
-require_once __DIR__ . '/functions.session.php';
+require_once __DIR__.'/functions.config.php';
+require_once __DIR__.'/functions.session.php';

include/functions.welcome.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_WELCOME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_WELCOME')) {
@@ -40,7 +40,7 @@ 
             return false;
         }
 
-        include __DIR__ . '/functions.welcome.inc.php';
+        include __DIR__.'/functions.welcome.inc.php';
         unset($forumObject);
 
         return $ret;

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)));
@@ -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');

rss.php

Spacing +20 added lines, -20 removed lines

@@ -31,12 +31,12 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 require_once $GLOBALS['xoops']->path('class/template.php');
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.rpc.php');
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-    require_once __DIR__ . '/seo_url.php';
+    require_once __DIR__.'/seo_url.php';
 }
 /* for seo */
 
@@ -59,7 +59,7 @@ 
     $validForums = array_intersect($forums, $validForums);
 } elseif ($category > 0) {
     $crit_top = new \CriteriaCompo(new \Criteria('cat_id', $category));
-    $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'));
+    $crit_top->add(new \Criteria('forum_id', '('.implode(', ', $validForums).')', 'IN'));
     $forums_top  = $forumHandler->getIds($crit_top);
     $validForums = array_intersect($forums_top, $validForums);
 }
@@ -71,7 +71,7 @@ 
 $forumSet = implode(',', $validForums);
 
 $charset = 'UTF-8';
-header('Content-Type:text/xml; charset=' . $charset);
+header('Content-Type:text/xml; charset='.$charset);
 
 $tpl                 = new \XoopsTpl();
 $tpl->caching        = 2;
@@ -84,25 +84,25 @@ 
 $xoopsCachedTemplateId = "newbbb_rss_$forumSet";
 $compile_id            = null;
 if (!$tpl->is_cached('db:newbb_rss.tpl', $xoopsCachedTemplateId, $compile_id)) {
-    require_once __DIR__ . '/include/functions.time.php';
+    require_once __DIR__.'/include/functions.time.php';
 
     //    /** @var Newbb\XmlrssHandler $xmlrssHandler */
     //    $xmlrssHandler = Newbb\Helper::getInstance()->getHandler('Xmlrss');
     $rss = $xmlrssHandler->create();
 
-    $rss->setVarRss('channel_title', $GLOBALS['xoopsConfig']['sitename'] . ' :: ' . _MD_NEWBB_FORUM);
-    $rss->channel_link = XOOPS_URL . '/';
-    $rss->setVarRss('channel_desc', $GLOBALS['xoopsConfig']['slogan'] . ' :: ' . $xoopsModule->getInfo('description'));
+    $rss->setVarRss('channel_title', $GLOBALS['xoopsConfig']['sitename'].' :: '._MD_NEWBB_FORUM);
+    $rss->channel_link = XOOPS_URL.'/';
+    $rss->setVarRss('channel_desc', $GLOBALS['xoopsConfig']['slogan'].' :: '.$xoopsModule->getInfo('description'));
     $rss->setVarRss('channel_lastbuild', formatTimestamp(time(), 'rss'));
     $rss->channel_webmaster = $GLOBALS['xoopsConfig']['adminmail'];
     $rss->channel_editor    = $GLOBALS['xoopsConfig']['adminmail'];
     $rss->setVarRss('channel_category', $xoopsModule->getVar('name'));
-    $rss->channel_generator = 'NewBB ' . $xoopsModule->getInfo('version');
+    $rss->channel_generator = 'NewBB '.$xoopsModule->getInfo('version');
     $rss->channel_language  = _LANGCODE;
     $rss->xml_encoding      = $charset;
-    $rss->image_url         = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image');
+    $rss->image_url         = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->getInfo('image');
 
-    $dimension = @getimagesize($GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/' . $xoopsModule->getInfo('image')));
+    $dimension = @getimagesize($GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/'.$xoopsModule->getInfo('image')));
     if (empty($dimension[0])) {
         $width = 88;
     } else {
@@ -119,7 +119,7 @@ 
     $rss->max_items            = $GLOBALS['xoopsModuleConfig']['rss_maxitems'];
     $rss->max_item_description = $GLOBALS['xoopsModuleConfig']['rss_maxdescription'];
 
-    $forumCriteria = ' AND t.forum_id IN (' . implode(',', $validForums) . ')';
+    $forumCriteria = ' AND t.forum_id IN ('.implode(',', $validForums).')';
     unset($validForums);
     $approveCriteria = ' AND t.approved = 1 AND p.approved = 1';
 
@@ -169,7 +169,7 @@ 
     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 $topic) {
@@ -184,16 +184,16 @@ 
         } else {
             $topic['uname'] = $topic['poster_name'] ? $myts->htmlSpecialChars($topic['poster_name']) : $myts->htmlSpecialChars($GLOBALS['xoopsConfig']['anonymous']);
         }
-        $description            = $topic['forum_name'] . '::';
-        $topic['topic_subject'] = empty($type_list[$topic['type_id']]) ? '' : '[' . $type_list[$topic['type_id']] . '] ';
-        $description            .= $topic['topic_subject'] . $topic['topic_title'] . "<br>\n";
+        $description            = $topic['forum_name'].'::';
+        $topic['topic_subject'] = empty($type_list[$topic['type_id']]) ? '' : '['.$type_list[$topic['type_id']].'] ';
+        $description            .= $topic['topic_subject'].$topic['topic_title']."<br>\n";
         $description            .= $myts->displayTarea($topic['post_text'], $topic['dohtml'], $topic['dosmiley'], $topic['doxcode'], $topic['dobr']);
-        $label                  = _MD_NEWBB_BY . ' ' . $topic['uname'];
+        $label                  = _MD_NEWBB_BY.' '.$topic['uname'];
         $time                   = formatTimestamp($topic['post_time'], 'rss');
-        $link                   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
+        $link                   = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?post_id='.$topic['post_id'].'';
         if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $link   = XOOPS_URL . '/' . REAL_MODULE_NAME . '/viewtopic.php?post_id=' . $topic['post_id'] . '';
-            $oldurl = '<a href=\'' . $link . '\'>';
+            $link   = XOOPS_URL.'/'.REAL_MODULE_NAME.'/viewtopic.php?post_id='.$topic['post_id'].'';
+            $oldurl = '<a href=\''.$link.'\'>';
             $newurl = seo_urls($oldurl);
             $newurl = str_replace('<a href=\'', '', $newurl);
             $newurl = str_replace('\'>', '', $newurl);

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