mambax7 / newbb5

notification_update.php

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
 // URL: http://www.myweb.ne.jp/, https://xoops.org/, http://jp.xoops.org/ //
 // Project: XOOPS Project                                                    //
 // ------------------------------------------------------------------------- //
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 include $GLOBALS['xoops']->path('include/notification_update.php');

include/form.forum.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
 // The forum instanciation
-$form_forum = new \XoopsThemeForm(_AM_NEWBB_EDITTHISFORUM . ' ' . $forumObject->getVar('forum_name'), 'form_forum', xoops_getenv('PHP_SELF'));
+$form_forum = new \XoopsThemeForm(_AM_NEWBB_EDITTHISFORUM.' '.$forumObject->getVar('forum_name'), 'form_forum', xoops_getenv('PHP_SELF'));
 
 // Forum name
 $form_forum->addElement(new \XoopsFormText(_AM_NEWBB_FORUMNAME, 'forum_name', 50, 80, $forumObject->getVar('forum_name', 'E')), true);
@@ -65,7 +65,7 @@ 
 $perm_checkbox = new \XoopsFormCheckBox('', 'perm_template', $forumObject->isNew());
 $perm_checkbox->addOption(1, _AM_NEWBB_PERM_TEMPLATEAPP);
 $perm_tray->addElement($perm_checkbox);
-$perm_tray->addElement(new \XoopsFormLabel('', '<a href="admin_permissions.php?action=template" rel="external" title="">' . _AM_NEWBB_PERM_TEMPLATE . '</a>'));
+$perm_tray->addElement(new \XoopsFormLabel('', '<a href="admin_permissions.php?action=template" rel="external" title="">'._AM_NEWBB_PERM_TEMPLATE.'</a>'));
 $form_forum->addElement($perm_tray);
 
 $form_forum->addElement(new \XoopsFormHidden('forum', $forumObject->getVar('forum_id')));

include/module.php

Spacing +13 added lines, -13 removed lines

@@ -54,34 +54,34 @@ 
     // remove old html template files
     // create an array with all folders, and then run this once
 
-    $templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/');
+    $templateDirectory = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname', 'n').'/templates/');
     $template_list     = array_diff(scandir($templateDirectory, SCANDIR_SORT_NONE), ['..', '.']);
     foreach ($template_list as $k => $v) {
-        $fileinfo = new \SplFileInfo($templateDirectory . $v);
+        $fileinfo = new \SplFileInfo($templateDirectory.$v);
         if ('html' === $fileinfo->getExtension() && 'index.html' !== $fileinfo->getFilename()) {
-            @unlink($templateDirectory . $v);
+            @unlink($templateDirectory.$v);
         }
     }
-    $templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/blocks');
+    $templateDirectory = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname', 'n').'/templates/blocks');
     $template_list     = array_diff(scandir($templateDirectory, SCANDIR_SORT_NONE), ['..', '.']);
     foreach ($template_list as $k => $v) {
-        $fileinfo = new \SplFileInfo($templateDirectory . $v);
+        $fileinfo = new \SplFileInfo($templateDirectory.$v);
         if ('html' === $fileinfo->getExtension() && 'index.html' !== $fileinfo->getFilename()) {
-            @unlink($templateDirectory . $v);
+            @unlink($templateDirectory.$v);
         }
     }
     // Load class XoopsFile
     xoops_load('xoopsfile');
     //remove /images directory
-    $imagesDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/images/');
+    $imagesDirectory = $GLOBALS['xoops']->path('modules/'.$module->getVar('dirname', 'n').'/images/');
     $folderHandler   = \XoopsFile::getHandler('folder', $imagesDirectory);
     $folderHandler->delete($imagesDirectory);
 
     //remove old changelogs
-    array_map('unlink', glob(dirname(__DIR__) . '/docs/changelog-rev*.txt'));
+    array_map('unlink', glob(dirname(__DIR__).'/docs/changelog-rev*.txt'));
 
     if (!empty($newbbConfig['syncOnUpdate'])) {
-        require_once __DIR__ . '/../include/functions.recon.php';
+        require_once __DIR__.'/../include/functions.recon.php';
         newbbSynchronization();
     }
 
@@ -107,9 +107,9 @@ 
  */
 function xoops_module_pre_install_newbb(\XoopsModule $module)
 {
-    $mod_tables =& $module->getInfo('tables');
+    $mod_tables = & $module->getInfo('tables');
     foreach ($mod_tables as $table) {
-        $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+        $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
     }
 
     return true;
@@ -176,12 +176,12 @@ 
     }
     foreach ($groups_post as $group_id) {
         foreach ($post_items as $item) {
-            $gpermHandler->addRight('forum_' . $item, $forum_id, $group_id, $module_id);
+            $gpermHandler->addRight('forum_'.$item, $forum_id, $group_id, $module_id);
         }
     }
 
     /* Create a test post */
-    require_once __DIR__ . '/functions.user.php';
+    require_once __DIR__.'/functions.user.php';
     /** @var Newbb\PostHandler $postHandler */
     $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
     /** @var  $forumpost */

include/functions.welcome.inc.php

Spacing +5 added lines, -5 removed lines

@@ -67,7 +67,7 @@ 
     if (!empty($avatar) && 'blank.gif' !== $avatar) {
         $categories[0]['fields'][] = [
             'title' => _MD_NEWBB_AUTO_CREATE_AVATARS,
-            'value' => "<img src='" . XOOPS_UPLOAD_URL . '/' . $GLOBALS['xoopsUser']->getVar('user_avatar') . "' alt='" . $GLOBALS['xoopsUser']->getVar('uname') . "' />"
+            'value' => "<img src='".XOOPS_UPLOAD_URL.'/'.$GLOBALS['xoopsUser']->getVar('user_avatar')."' alt='".$GLOBALS['xoopsUser']->getVar('uname')."' />"
         ];
         $weights[0][]              = 0;
     }
@@ -102,7 +102,7 @@ 
     ksort($categories);
 }
 
-$message = sprintf(_MD_NEWBB_WELCOME_MESSAGE, $GLOBALS['xoopsUser']->getVar('uname')) . "\n\n";
+$message = sprintf(_MD_NEWBB_WELCOME_MESSAGE, $GLOBALS['xoopsUser']->getVar('uname'))."\n\n";
 //$message .= _PROFILE . ": <a href='" . XOOPS_URL . '/userinfo.php?uid=' . $GLOBALS['xoopsUser']->getVar('uid') . "'><strong>" . $GLOBALS['xoopsUser']->getVar('uname') . '</strong></a> ';
 //$message .= " | <a target='_blank' href='".XOOPS_URL . '/pmlite.php?send2=1&amp;to_userid=' . $GLOBALS['xoopsUser']->getVar('uid') . "'>" . _MD_NEWBB_PM . "</a>\n";
 $message .= sprintf($GLOBALS['xoopsModuleConfig']['welcome_forum_message']);
@@ -123,9 +123,9 @@ 
 if (!empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
     $tags                = [];
     $tags['THREAD_NAME'] = $subject;
-    $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '&amp;topic_id=' . $postObject->getVar('topic_id') . '&amp;forum=' . $forum_id;
-    $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post_id;
-    require_once __DIR__ . '/notification.inc.php';
+    $tags['THREAD_URL']  = XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?post_id='.$post_id.'&amp;topic_id='.$postObject->getVar('topic_id').'&amp;forum='.$forum_id;
+    $tags['POST_URL']    = $tags['THREAD_URL'].'#forumpost'.$post_id;
+    require_once __DIR__.'/notification.inc.php';
     $forum_info         = newbb_notify_iteminfo('forum', $forum_id);
     $tags['FORUM_NAME'] = $forum_info['name'];
     $tags['FORUM_URL']  = $forum_info['url'];

include/functions.session.php

Spacing +7 added lines, -7 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_SESSION_LOADED', true);
 xoops_load('XoopsRequest');
 
@@ -35,11 +35,11 @@ 
         if (is_array($string)) {
             $value = [];
             foreach ($string as $key => $val) {
-                $value[] = $key . '|' . $val;
+                $value[] = $key.'|'.$val;
             }
             $string = implode(',', $value);
         }
-        $_SESSION['newbb_' . $name] = $string;
+        $_SESSION['newbb_'.$name] = $string;
     }
 
     /**
@@ -49,7 +49,7 @@ 
      */
     function newbbGetSession($name, $isArray = false)
     {
-        $value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false;
+        $value = !empty($_SESSION['newbb_'.$name]) ? $_SESSION['newbb_'.$name] : false;
         if ($isArray) {
             $_value = $value ? explode(',', $value) : [];
             $value  = [];
@@ -77,11 +77,11 @@ 
         if (is_array($string)) {
             $value = [];
             foreach ($string as $key => $val) {
-                $value[] = $key . '|' . $val;
+                $value[] = $key.'|'.$val;
             }
             $string = implode(',', $value);
         }
-        setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
+        setcookie($forumCookie['prefix'].$name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
     }
 
     /**
@@ -93,7 +93,7 @@ 
     {
         global $forumCookie;
         //        $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null;
-        $value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE');
+        $value = Request::getString($forumCookie['prefix'].$name, null, 'COOKIE');
 
         if ($isArray) {
             $_value = $value ? explode(',', $value) : [];

include/functions.php

Spacing +7 added lines, -7 removed lines

@@ -11,16 +11,16 @@
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || include __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || include __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS')) {
     define('NEWBB_FUNCTIONS', 1);
 
-    require_once __DIR__ . '/functions.image.php';
-    require_once __DIR__ . '/functions.user.php';
-    require_once __DIR__ . '/functions.render.php';
-    require_once __DIR__ . '/functions.forum.php';
-    require_once __DIR__ . '/functions.session.php';
-    require_once __DIR__ . '/functions.stats.php';
+    require_once __DIR__.'/functions.image.php';
+    require_once __DIR__.'/functions.user.php';
+    require_once __DIR__.'/functions.render.php';
+    require_once __DIR__.'/functions.forum.php';
+    require_once __DIR__.'/functions.session.php';
+    require_once __DIR__.'/functions.stats.php';
 }

include/vars.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.ini.php');
-require_once __DIR__ . '/functions.session.php';
+require_once __DIR__.'/functions.session.php';
 
 // NewBB cookie structure
 /* NewBB cookie storage
@@ -33,7 +33,7 @@ 
 $forumCookie['path']   = '/';
 $forumCookie['secure'] = false;
 $forumCookie['expire'] = time() + 3600 * 24 * 30; // one month
-$forumCookie['prefix'] = 'newbb_' . (is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : '0IP' . \Xmf\IPAddress::fromRequest()->asReadable()); // irmtfan IP for anons - use $GLOBALS["xoopsUser"]
+$forumCookie['prefix'] = 'newbb_'.(is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : '0IP'.\Xmf\IPAddress::fromRequest()->asReadable()); // irmtfan IP for anons - use $GLOBALS["xoopsUser"]
 
 // set LastVisitTemp cookie, which only gets the time from the LastVisit cookie if it does not exist yet
 // otherwise, it gets the time from the LastVisitTemp cookie

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')) {