mambax7 / newbb5

include/common.php

Indentation +28 added lines, -28 removed lines

@@ -50,19 +50,19 @@ 
 //define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
 
 if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+	define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
+	define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
+	define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
+	define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
+	define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
+	define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
 }
 
 
@@ -133,15 +133,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+	'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
+	'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
+	'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
+	'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
+	'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
+	'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
+	'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
+	'0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
+	'1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
 ];
 
 $debug = false;
@@ -150,16 +150,16 @@ 
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $GLOBALS['xoopsTpl'] = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
 $GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
 // Local icons path
 if (is_object($helper->getModule())) {
-    $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
-    $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
+	$pathModIcon16 = $helper->getModule()->getInfo('modicons16');
+	$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
-    $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

Spacing +27 added lines, -27 removed lines

@@ -23,10 +23,10 @@ 
 use XoopsModules\Newbb;
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
-require_once dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
-$moduleDirNameUpper   = strtoupper($moduleDirName); //$capsDirName
+$moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName
 
 /** @var \XoopsDatabase $db */
 /** @var Newbb\Helper $helper */
@@ -49,20 +49,20 @@ 
 //define('NEWBB_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
 //define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 
@@ -133,15 +133,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -154,12 +154,12 @@ 
     $GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);
 // Local icons path
 if (is_object($helper->getModule())) {
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

include/oninstall.php

Indentation +52 added lines, -52 removed lines

@@ -30,20 +30,20 @@ 
  */
 function xoops_module_pre_install_newbb(\XoopsModule $module)
 {
-    require_once dirname(__DIR__) . '/preloads/autoloader.php';
-    /** @var Newbb\Utility $utility */
-    $utility      = new \XoopsModules\Newbb\Utility();
-    $xoopsSuccess = $utility::checkVerXoops($module);
-    $phpSuccess   = $utility::checkVerPhp($module);
+	require_once dirname(__DIR__) . '/preloads/autoloader.php';
+	/** @var Newbb\Utility $utility */
+	$utility      = new \XoopsModules\Newbb\Utility();
+	$xoopsSuccess = $utility::checkVerXoops($module);
+	$phpSuccess   = $utility::checkVerPhp($module);
 
-    if (false !== $xoopsSuccess && false !== $phpSuccess) {
-        $moduleTables =& $module->getInfo('tables');
-        foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
-        }
-    }
+	if (false !== $xoopsSuccess && false !== $phpSuccess) {
+		$moduleTables =& $module->getInfo('tables');
+		foreach ($moduleTables as $table) {
+			$GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+		}
+	}
 
-    return $xoopsSuccess && $phpSuccess;
+	return $xoopsSuccess && $phpSuccess;
 }
 
 /**
@@ -55,50 +55,50 @@ 
  */
 function xoops_module_install_newbb(\XoopsModule $module)
 {
-    require_once  dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-    require_once  dirname(__DIR__) . '/include/config.php';
+	require_once  dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+	require_once  dirname(__DIR__) . '/include/config.php';
 
-    $moduleDirName = basename(dirname(__DIR__));
+	$moduleDirName = basename(dirname(__DIR__));
 
-    /** @var Newbb\Helper $helper */
-    $helper = Newbb\Helper::getInstance();
-    $utility      = new Newbb\Utility();
-    $configurator = new Newbb\Common\Configurator();
-    // Load language files
-    $helper->loadLanguage('admin');
-    $helper->loadLanguage('modinfo');
+	/** @var Newbb\Helper $helper */
+	$helper = Newbb\Helper::getInstance();
+	$utility      = new Newbb\Utility();
+	$configurator = new Newbb\Common\Configurator();
+	// Load language files
+	$helper->loadLanguage('admin');
+	$helper->loadLanguage('modinfo');
 
-    // default Permission Settings ----------------------
-    global $xoopsModule, $xoopsDB;
-    $moduleId     = $xoopsModule->getVar('mid');
-    $moduleId2    = $helper->getModule()->mid();
-    $grouppermHandler = xoops_getHandler('groupperm');
-    // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+	// default Permission Settings ----------------------
+	global $xoopsModule, $xoopsDB;
+	$moduleId     = $xoopsModule->getVar('mid');
+	$moduleId2    = $helper->getModule()->mid();
+	$grouppermHandler = xoops_getHandler('groupperm');
+	// access rights ------------------------------------------
+	$grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
-    //  ---  CREATE FOLDERS ---------------
-    if (count($configurator->uploadFolders) > 0) {
-        //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-        foreach (array_keys($configurator->uploadFolders) as $i) {
-            $utility::createFolder($configurator->uploadFolders[$i]);
-        }
-    }
+	//  ---  CREATE FOLDERS ---------------
+	if (count($configurator->uploadFolders) > 0) {
+		//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+		foreach (array_keys($configurator->uploadFolders) as $i) {
+			$utility::createFolder($configurator->uploadFolders[$i]);
+		}
+	}
 
-    //  ---  COPY blank.png FILES ---------------
-    if (count($configurator->copyBlankFiles) > 0) {
-        $file =  dirname(__DIR__) . '/assets/images/blank.png';
-        foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
-            $utility::copyFile($file, $dest);
-        }
-    }
-    //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
-    $xoopsDB->queryF($sql);
+	//  ---  COPY blank.png FILES ---------------
+	if (count($configurator->copyBlankFiles) > 0) {
+		$file =  dirname(__DIR__) . '/assets/images/blank.png';
+		foreach (array_keys($configurator->copyBlankFiles) as $i) {
+			$dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+			$utility::copyFile($file, $dest);
+		}
+	}
+	//delete .html entries from the tpl table
+	$sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+	$xoopsDB->queryF($sql);
 
-    return true;
+	return true;
 }

Spacing +13 added lines, -13 removed lines

@@ -30,16 +30,16 @@ 
  */
 function xoops_module_pre_install_newbb(\XoopsModule $module)
 {
-    require_once dirname(__DIR__) . '/preloads/autoloader.php';
+    require_once dirname(__DIR__).'/preloads/autoloader.php';
     /** @var Newbb\Utility $utility */
     $utility      = new \XoopsModules\Newbb\Utility();
     $xoopsSuccess = $utility::checkVerXoops($module);
     $phpSuccess   = $utility::checkVerPhp($module);
 
     if (false !== $xoopsSuccess && false !== $phpSuccess) {
-        $moduleTables =& $module->getInfo('tables');
+        $moduleTables = & $module->getInfo('tables');
         foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
         }
     }
 
@@ -55,8 +55,8 @@ 
  */
 function xoops_module_install_newbb(\XoopsModule $module)
 {
-    require_once  dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-    require_once  dirname(__DIR__) . '/include/config.php';
+    require_once  dirname(dirname(dirname(__DIR__))).'/mainfile.php';
+    require_once  dirname(__DIR__).'/include/config.php';
 
     $moduleDirName = basename(dirname(__DIR__));
 
@@ -74,11 +74,11 @@ 
     $moduleId2    = $helper->getModule()->mid();
     $grouppermHandler = xoops_getHandler('groupperm');
     // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
     //  ---  CREATE FOLDERS ---------------
     if (count($configurator->uploadFolders) > 0) {
@@ -90,14 +90,14 @@ 
 
     //  ---  COPY blank.png FILES ---------------
     if (count($configurator->copyBlankFiles) > 0) {
-        $file =  dirname(__DIR__) . '/assets/images/blank.png';
+        $file = dirname(__DIR__).'/assets/images/blank.png';
         foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+            $dest = $configurator->copyBlankFiles[$i].'/blank.png';
             $utility::copyFile($file, $dest);
         }
     }
     //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+    $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$xoopsModule->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.html%'";
     $xoopsDB->queryF($sql);
 
     return true;

include/functions.render.php

Spacing +3 added lines, -3 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_RENDER_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RENDER')) {
@@ -67,7 +67,7 @@ 
         if (0 !== $br) {
             $text = $myts->nl2Br($text);
         }
-        $text = $myts->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+        $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
 
         return $text;
     }
@@ -98,7 +98,7 @@ 
     {
         $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
         if (empty($asImage)) {
-            $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>';
+            $button = "<a href='{$link}' title='{$alt}' {$extra}>".newbbDisplayImage($button, $alt, true).'</a>';
         }
 
         return $button;

Indentation +133 added lines, -133 removed lines

@@ -17,146 +17,146 @@
 define('NEWBB_FUNCTIONS_RENDER_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RENDER')) {
-    define('NEWBB_FUNCTIONS_RENDER', 1);
+	define('NEWBB_FUNCTIONS_RENDER', 1);
 
-    /*
+	/*
      * Sorry, we have to use the stupid solution unless there is an option in MyTextSanitizer:: htmlspecialchars();
      */
-    /**
-     * @param $text
-     * @return mixed
-     */
-    function newbbHtmlspecialchars(&$text)
-    {
-        return preg_replace(['/&/i', '/ /i'], ['&', ' '], htmlspecialchars($text, ENT_QUOTES | ENT_HTML5));
-    }
-
-    /**
-     * @param        $text
-     * @param  int   $html
-     * @param  int   $smiley
-     * @param  int   $xcode
-     * @param  int   $image
-     * @param  int   $br
-     * @return mixed
-     */
-    function &newbbDisplayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
-    {
-        global $myts;
-
-        if (1 !== $html) {
-            // html not allowed
-            $text = newbbHtmlspecialchars($text);
-        }
-        $text = $myts->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
-        $text = $myts->makeClickable($text);
-        if (0 !== $smiley) {
-            // process smiley
-            $text = $myts->smiley($text);
-        }
-        if (0 !== $xcode) {
-            // decode xcode
-            if (0 !== $image) {
-                // image allowed
-                $text = $myts->xoopsCodeDecode($text);
-            } else {
-                // image not allowed
-                $text = $myts->xoopsCodeDecode($text, 0);
-            }
-        }
-        if (0 !== $br) {
-            $text = $myts->nl2Br($text);
-        }
-        $text = $myts->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
-
-        return $text;
-    }
-
-    /**
-     * @param $document
-     * @return string
-     */
-    function newbbHtml2text($document)
-    {
-        $text = strip_tags($document);
-
-        return $text;
-    }
-
-    /**
-     * Display forrum button
-     *
-     * @param          $link
-     * @param          $button
-     * @param  string  $alt     alt message
-     * @param  boolean $asImage true for image mode; false for text mode
-     * @param  string  $extra   extra attribute for the button
-     * @return mixed
-     * @internal param string $image image/button name, without extension
-     */
-    function newbbGetButton($link, $button, $alt = '', $asImage = true, $extra = "class='forum_button'")
-    {
-        $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
-        if (empty($asImage)) {
-            $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>';
-        }
-
-        return $button;
-    }
-
-    /**
-     * Display forrum images
-     *
-     * @param  string  $image   image name, without extension
-     * @param  string  $alt     alt message
-     * @param  boolean $display true for return image anchor; faulse for assign to $xoopsTpl
-     * @param  string  $extra   extra attribute for the image
-     * @return mixed
-     */
-    function newbbDisplayImage($image, $alt = '', $display = true, $extra = "class='forum_icon'")
-    {
-        $iconHandler = newbbGetIconHandler();
-        // START hacked by irmtfan
-        // to show text links instead of buttons - func_num_args()==2 => only when $image, $alt is set and optional $display not set
-
-        if (2 == func_num_args()) {
-            // overall setting
-            if (!empty($GLOBALS['xoopsModuleConfig']['display_text_links'])) {
-                $display = false;
-            }
-            // if set for each link => overwrite $display
-            if (isset($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image])) {
-                $display = empty($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image]);
-            }
-        }
-        // END hacked by irmtfan
-        if (empty($display)) {
-            return $iconHandler->assignImage($image, $alt, $extra);
-        } else {
-            return $iconHandler->getImage($image, $alt, $extra);
-        }
-    }
-
-    /**
-     * @return Newbb\IconHandler
-     */
-    function newbbGetIconHandler()
-    {
-        global $xoTheme;
-        static $iconHandler;
-
-        if (null !== $iconHandler) {
-            return $iconHandler;
-        }
+	/**
+	 * @param $text
+	 * @return mixed
+	 */
+	function newbbHtmlspecialchars(&$text)
+	{
+		return preg_replace(['/&amp;/i', '/&nbsp;/i'], ['&', '&amp;nbsp;'], htmlspecialchars($text, ENT_QUOTES | ENT_HTML5));
+	}
+
+	/**
+	 * @param        $text
+	 * @param  int   $html
+	 * @param  int   $smiley
+	 * @param  int   $xcode
+	 * @param  int   $image
+	 * @param  int   $br
+	 * @return mixed
+	 */
+	function &newbbDisplayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
+	{
+		global $myts;
+
+		if (1 !== $html) {
+			// html not allowed
+			$text = newbbHtmlspecialchars($text);
+		}
+		$text = $myts->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
+		$text = $myts->makeClickable($text);
+		if (0 !== $smiley) {
+			// process smiley
+			$text = $myts->smiley($text);
+		}
+		if (0 !== $xcode) {
+			// decode xcode
+			if (0 !== $image) {
+				// image allowed
+				$text = $myts->xoopsCodeDecode($text);
+			} else {
+				// image not allowed
+				$text = $myts->xoopsCodeDecode($text, 0);
+			}
+		}
+		if (0 !== $br) {
+			$text = $myts->nl2Br($text);
+		}
+		$text = $myts->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+
+		return $text;
+	}
+
+	/**
+	 * @param $document
+	 * @return string
+	 */
+	function newbbHtml2text($document)
+	{
+		$text = strip_tags($document);
+
+		return $text;
+	}
+
+	/**
+	 * Display forrum button
+	 *
+	 * @param          $link
+	 * @param          $button
+	 * @param  string  $alt     alt message
+	 * @param  boolean $asImage true for image mode; false for text mode
+	 * @param  string  $extra   extra attribute for the button
+	 * @return mixed
+	 * @internal param string $image image/button name, without extension
+	 */
+	function newbbGetButton($link, $button, $alt = '', $asImage = true, $extra = "class='forum_button'")
+	{
+		$button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
+		if (empty($asImage)) {
+			$button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>';
+		}
+
+		return $button;
+	}
+
+	/**
+	 * Display forrum images
+	 *
+	 * @param  string  $image   image name, without extension
+	 * @param  string  $alt     alt message
+	 * @param  boolean $display true for return image anchor; faulse for assign to $xoopsTpl
+	 * @param  string  $extra   extra attribute for the image
+	 * @return mixed
+	 */
+	function newbbDisplayImage($image, $alt = '', $display = true, $extra = "class='forum_icon'")
+	{
+		$iconHandler = newbbGetIconHandler();
+		// START hacked by irmtfan
+		// to show text links instead of buttons - func_num_args()==2 => only when $image, $alt is set and optional $display not set
+
+		if (2 == func_num_args()) {
+			// overall setting
+			if (!empty($GLOBALS['xoopsModuleConfig']['display_text_links'])) {
+				$display = false;
+			}
+			// if set for each link => overwrite $display
+			if (isset($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image])) {
+				$display = empty($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image]);
+			}
+		}
+		// END hacked by irmtfan
+		if (empty($display)) {
+			return $iconHandler->assignImage($image, $alt, $extra);
+		} else {
+			return $iconHandler->getImage($image, $alt, $extra);
+		}
+	}
+
+	/**
+	 * @return Newbb\IconHandler
+	 */
+	function newbbGetIconHandler()
+	{
+		global $xoTheme;
+		static $iconHandler;
+
+		if (null !== $iconHandler) {
+			return $iconHandler;
+		}
 
 //        if (!class_exists('IconHandler')) {
 //            require_once dirname(__DIR__) . '/class/icon.php';
 //        }
 
-        $iconHandler           = Newbb\IconHandler::getInstance();
-        $iconHandler->template = $xoTheme->template;
-        $iconHandler->init($GLOBALS['xoopsConfig']['language']);
+		$iconHandler           = Newbb\IconHandler::getInstance();
+		$iconHandler->template = $xoTheme->template;
+		$iconHandler->init($GLOBALS['xoopsConfig']['language']);
 
-        return $iconHandler;
-    }
+		return $iconHandler;
+	}
 }

include/functions.welcome.php

Indentation +30 added lines, -30 removed lines

@@ -17,34 +17,34 @@
 define('NEWBB_FUNCTIONS_WELCOME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_WELCOME')) {
-    define('NEWBB_FUNCTIONS_WELCOME', true);
-
-    /**
-     * @return bool
-     */
-    function newbbWelcome()
-    {
-        global $forumObject;
-        $ret = '';
-
-        $forumId = @$GLOBALS['xoopsModuleConfig']['welcome_forum'];
-        if (!$forumId) {
-            return false;
-        }
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forumObject  = $forumHandler->get($forumId);
-        if (!$forumObject || !$forumHandler->getPermission($forumObject)) {
-            unset($forumObject);
-
-            return false;
-        }
-
-        require_once __DIR__   . '/functions.welcome.inc.php';
-        unset($forumObject);
-
-        return $ret;
-    }
-
-    newbbWelcome();
+	define('NEWBB_FUNCTIONS_WELCOME', true);
+
+	/**
+	 * @return bool
+	 */
+	function newbbWelcome()
+	{
+		global $forumObject;
+		$ret = '';
+
+		$forumId = @$GLOBALS['xoopsModuleConfig']['welcome_forum'];
+		if (!$forumId) {
+			return false;
+		}
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forumObject  = $forumHandler->get($forumId);
+		if (!$forumObject || !$forumHandler->getPermission($forumObject)) {
+			unset($forumObject);
+
+			return false;
+		}
+
+		require_once __DIR__   . '/functions.welcome.inc.php';
+		unset($forumObject);
+
+		return $ret;
+	}
+
+	newbbWelcome();
 }

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;
         }
 
-        require_once __DIR__   . '/functions.welcome.inc.php';
+        require_once __DIR__.'/functions.welcome.inc.php';
         unset($forumObject);
 
         return $ret;

include/onuninstall.php

Indentation +29 added lines, -29 removed lines

@@ -19,8 +19,8 @@ 
 
 function xoops_module_pre_uninstall_newbb(\XoopsModule $module)
 {
-    // Do some synchronization
-    return true;
+	// Do some synchronization
+	return true;
 }
 
 /**
@@ -32,36 +32,36 @@ 
  */
 function xoops_module_uninstall_newbb(\XoopsModule $module)
 {
-    //    return true;
+	//    return true;
 
-    $moduleDirName  = basename(dirname(__DIR__));
-    $moduleDirNameUpper   = strtoupper($moduleDirName);
-    /** @var \XoopsModules\Newbb\Helper $helper */
-    $helper = \XoopsModules\Newbb\Helper::getInstance();
+	$moduleDirName  = basename(dirname(__DIR__));
+	$moduleDirNameUpper   = strtoupper($moduleDirName);
+	/** @var \XoopsModules\Newbb\Helper $helper */
+	$helper = \XoopsModules\Newbb\Helper::getInstance();
 
-    /** @var Newbb\Utility $utility */
-    $utility = new \XoopsModules\Newbb\Utility();
+	/** @var Newbb\Utility $utility */
+	$utility = new \XoopsModules\Newbb\Utility();
 
-    $success = true;
-    $helper->loadLanguage('admin');
+	$success = true;
+	$helper->loadLanguage('admin');
 
-    //------------------------------------------------------------------
-    // Remove uploads folder (and all subfolders) if they exist
-    //------------------------------------------------------------------
+	//------------------------------------------------------------------
+	// Remove uploads folder (and all subfolders) if they exist
+	//------------------------------------------------------------------
 
-    $old_directories = [$GLOBALS['xoops']->path("uploads/{$moduleDirName}")];
-    foreach ($old_directories as $old_dir) {
-        $dirInfo = new \SplFileInfo($old_dir);
-        if ($dirInfo->isDir()) {
-            // The directory exists so delete it
-            if (false === $utility::rrmdir($old_dir)) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
-                $success = false;
-            }
-        }
-        unset($dirInfo);
-    }
-    /*
+	$old_directories = [$GLOBALS['xoops']->path("uploads/{$moduleDirName}")];
+	foreach ($old_directories as $old_dir) {
+		$dirInfo = new \SplFileInfo($old_dir);
+		if ($dirInfo->isDir()) {
+			// The directory exists so delete it
+			if (false === $utility::rrmdir($old_dir)) {
+				$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
+				$success = false;
+			}
+		}
+		unset($dirInfo);
+	}
+	/*
     //------------ START ----------------
     //------------------------------------------------------------------
     // Remove xsitemap.xml from XOOPS root folder if it exists
@@ -75,6 +75,6 @@ 
 //    return $success && $delOk; // use this if you're using this routine
 */
 
-    return $success;
-    //------------ END  ----------------
+	return $success;
+	//------------ END  ----------------
 }

Spacing +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@ 
 {
     //    return true;
 
-    $moduleDirName  = basename(dirname(__DIR__));
-    $moduleDirNameUpper   = strtoupper($moduleDirName);
+    $moduleDirName = basename(dirname(__DIR__));
+    $moduleDirNameUpper = strtoupper($moduleDirName);
     /** @var \XoopsModules\Newbb\Helper $helper */
     $helper = \XoopsModules\Newbb\Helper::getInstance();
 
@@ -55,7 +55,7 @@ 
         if ($dirInfo->isDir()) {
             // The directory exists so delete it
             if (false === $utility::rrmdir($old_dir)) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $old_dir));
                 $success = false;
             }
         }

include/functions.session.php

Indentation +85 added lines, -85 removed lines

@@ -17,101 +17,101 @@
 define('NEWBB_FUNCTIONS_SESSION_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_SESSION')) {
-    define('NEWBB_FUNCTIONS_SESSION', 1);
+	define('NEWBB_FUNCTIONS_SESSION', 1);
 
-    /*
+	/*
      * Currently the newbb session/cookie handlers are limited to:
      * -- one dimension
      * -- "," and "|" are preserved
      *
      */
-    /**
-     * @param        $name
-     * @param string|array $string
-     */
-    function newbbSetSession($name, $string = '')
-    {
-        if (is_array($string)) {
-            $value = [];
-            foreach ($string as $key => $val) {
-                $value[] = $key . '|' . $val;
-            }
-            $string = implode(',', $value);
-        }
-        $_SESSION['newbb_' . $name] = $string;
-    }
+	/**
+	 * @param        $name
+	 * @param string|array $string
+	 */
+	function newbbSetSession($name, $string = '')
+	{
+		if (is_array($string)) {
+			$value = [];
+			foreach ($string as $key => $val) {
+				$value[] = $key . '|' . $val;
+			}
+			$string = implode(',', $value);
+		}
+		$_SESSION['newbb_' . $name] = $string;
+	}
 
-    /**
-     * @param             $name
-     * @param  bool       $isArray
-     * @return array|bool
-     */
-    function newbbGetSession($name, $isArray = false)
-    {
-        $value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false;
-        if ($isArray) {
-            $_value = $value ? explode(',', $value) : [];
-            $value  = [];
-            if (count($_value) > 0) {
-                foreach ($_value as $string) {
-                    $key         = substr($string, 0, strpos($string, '|'));
-                    $val         = substr($string, strpos($string, '|') + 1);
-                    $value[$key] = $val;
-                }
-            }
-            unset($_value);
-        }
+	/**
+	 * @param             $name
+	 * @param  bool       $isArray
+	 * @return array|bool
+	 */
+	function newbbGetSession($name, $isArray = false)
+	{
+		$value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false;
+		if ($isArray) {
+			$_value = $value ? explode(',', $value) : [];
+			$value  = [];
+			if (count($_value) > 0) {
+				foreach ($_value as $string) {
+					$key         = substr($string, 0, strpos($string, '|'));
+					$val         = substr($string, strpos($string, '|') + 1);
+					$value[$key] = $val;
+				}
+			}
+			unset($_value);
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * @param        $name
-     * @param string|array $string
-     * @param int    $expire
-     */
-    function newbbSetCookie($name, $string = '', $expire = 0)
-    {
-        global $forumCookie;
-        if (is_array($string)) {
-            $value = [];
-            foreach ($string as $key => $val) {
-                $value[] = $key . '|' . $val;
-            }
-            $string = implode(',', $value);
-        }
-        setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
-    }
+	/**
+	 * @param        $name
+	 * @param string|array $string
+	 * @param int    $expire
+	 */
+	function newbbSetCookie($name, $string = '', $expire = 0)
+	{
+		global $forumCookie;
+		if (is_array($string)) {
+			$value = [];
+			foreach ($string as $key => $val) {
+				$value[] = $key . '|' . $val;
+			}
+			$string = implode(',', $value);
+		}
+		setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
+	}
 
-    /**
-     * @param             $name
-     * @param  bool       $isArray
-     * @return array|null
-     */
-    function newbbGetCookie($name, $isArray = false)
-    {
-        global $forumCookie;
-        //        $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null;
-        $value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE');
+	/**
+	 * @param             $name
+	 * @param  bool       $isArray
+	 * @return array|null
+	 */
+	function newbbGetCookie($name, $isArray = false)
+	{
+		global $forumCookie;
+		//        $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null;
+		$value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE');
 
-        if ($isArray) {
-            $_value = $value ? explode(',', $value) : [];
-            $value  = [];
-            if (count($_value) > 0) {
-                foreach ($_value as $string) {
-                    $sep = strpos($string, '|');
-                    if (false === $sep) {
-                        $value[] = $string;
-                    } else {
-                        $key         = substr($string, 0, $sep);
-                        $val         = substr($string, $sep + 1);
-                        $value[$key] = $val;
-                    }
-                }
-            }
-            unset($_value);
-        }
+		if ($isArray) {
+			$_value = $value ? explode(',', $value) : [];
+			$value  = [];
+			if (count($_value) > 0) {
+				foreach ($_value as $string) {
+					$sep = strpos($string, '|');
+					if (false === $sep) {
+						$value[] = $string;
+					} else {
+						$key         = substr($string, 0, $sep);
+						$val         = substr($string, $sep + 1);
+						$value[$key] = $val;
+					}
+				}
+			}
+			unset($_value);
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 }

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);
 
 if (!defined('NEWBB_FUNCTIONS_SESSION')) {
@@ -34,11 +34,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;
     }
 
     /**
@@ -48,7 +48,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  = [];
@@ -76,11 +76,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']);
     }
 
     /**
@@ -92,7 +92,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/display.php

Indentation +139 added lines, -139 removed lines

@@ -69,161 +69,161 @@
 // uncomment to show text link instead of images (set to true)
 $displayText[''] = //$displayText['blank'] =
 
-    //$displayText['attachment'] =
-    //$displayText['whosonline'] =
-    //$displayText['statistik'] =
-    //$displayText['lastposticon'] =
-
-    //$displayText['plus'] =
-    //$displayText['minus'] =
-
-    //$displayText['forum'] =
-    //$displayText['forum_new'] =
-
-    //$displayText['topic'] =
-    //$displayText['topic_hot'] =
-    //$displayText['topic_sticky'] =
-    //$displayText['topic_digest'] =
-    //$displayText['topic_locked'] =
-    //$displayText['topic_new'] =
-    //$displayText['topic_hot_new'] =
-    //$displayText['topic_my'] =
-
-    //$displayText['post'] =
-
-    //$displayText['poll'] =
-    //$displayText['rss'] =
-    //$displayText['pdf'] =
-    //$displayText['subforum'] =
-
-    //$displayText['admin_move'] =
-    //$displayText['admin_merge'] =
-    //$displayText['admin_edit'] =
-    //$displayText['admin_delete'] =
-
-    //$displayText['document'] =
-
-    //$displayText['previous'] =
-    //$displayText['next'] =
-    //$displayText['right'] =
-    //$displayText['down'] =
-    //$displayText['up'] =
-    //$displayText['printer'] =
-    //$displayText['new_forum']  =
-
-    //$displayText['facebook'] =
-    //$displayText['twitter'] =
-    //$displayText['linkedin'] =
-    //$displayText['googleplus'] =
-    //$displayText['stumbleupon'] =
-    //$displayText['friendfeed'] =
-    //$displayText['digg'] =
-    //$displayText['reddit'] =
-    //$displayText['delicious'] =
-    //$displayText['technorati'] =
-    //$displayText['wong'] =
-    //$displayText['anonym'] =
-    //$displayText['more'] =
-    //$displayText['less'] =
+	//$displayText['attachment'] =
+	//$displayText['whosonline'] =
+	//$displayText['statistik'] =
+	//$displayText['lastposticon'] =
+
+	//$displayText['plus'] =
+	//$displayText['minus'] =
+
+	//$displayText['forum'] =
+	//$displayText['forum_new'] =
+
+	//$displayText['topic'] =
+	//$displayText['topic_hot'] =
+	//$displayText['topic_sticky'] =
+	//$displayText['topic_digest'] =
+	//$displayText['topic_locked'] =
+	//$displayText['topic_new'] =
+	//$displayText['topic_hot_new'] =
+	//$displayText['topic_my'] =
+
+	//$displayText['post'] =
+
+	//$displayText['poll'] =
+	//$displayText['rss'] =
+	//$displayText['pdf'] =
+	//$displayText['subforum'] =
+
+	//$displayText['admin_move'] =
+	//$displayText['admin_merge'] =
+	//$displayText['admin_edit'] =
+	//$displayText['admin_delete'] =
+
+	//$displayText['document'] =
+
+	//$displayText['previous'] =
+	//$displayText['next'] =
+	//$displayText['right'] =
+	//$displayText['down'] =
+	//$displayText['up'] =
+	//$displayText['printer'] =
+	//$displayText['new_forum']  =
+
+	//$displayText['facebook'] =
+	//$displayText['twitter'] =
+	//$displayText['linkedin'] =
+	//$displayText['googleplus'] =
+	//$displayText['stumbleupon'] =
+	//$displayText['friendfeed'] =
+	//$displayText['digg'] =
+	//$displayText['reddit'] =
+	//$displayText['delicious'] =
+	//$displayText['technorati'] =
+	//$displayText['wong'] =
+	//$displayText['anonym'] =
+	//$displayText['more'] =
+	//$displayText['less'] =
 
 $displayText['p_delete'] = $displayText['p_reply'] = $displayText['p_quote'] = $displayText['p_edit'] = $displayText['p_report'] = $displayText['t_new'] = $displayText['t_poll'] = $displayText['t_qr'] = $displayText['t_qr_expand'] = $displayText['t_reply'] =
 
-    //$displayText['online'] =
-    //$displayText['offline'] =
+	//$displayText['online'] =
+	//$displayText['offline'] =
 
-    //$displayText['new_subforum'] =
+	//$displayText['new_subforum'] =
 
 $displayText['p_bann'] =
 
-    true;
+	true;
 
 for ($i = 1; $i <= 5; ++$i) {
-    //$displayText['rate'.$i] = true;
+	//$displayText['rate'.$i] = true;
 }
 
 // uncomment to show images instead of text links (set to false)
 $displayText[''] = //$displayText['blank'] =
 
-    //$displayText['attachment'] =
-    //$displayText['whosonline'] =
-    //$displayText['statistik'] =
-    //$displayText['lastposticon'] =
-
-    //$displayText['plus'] =
-    //$displayText['minus'] =
-
-    //$displayText['forum'] =
-    //$displayText['forum_new'] =
-
-    //$displayText['topic'] =
-    //$displayText['topic_hot'] =
-    //$displayText['topic_sticky'] =
-    //$displayText['topic_digest'] =
-    //$displayText['topic_locked'] =
-    //$displayText['topic_new'] =
-    //$displayText['topic_hot_new'] =
-    //$displayText['topic_my'] =
-
-    //$displayText['post'] =
-
-    //$displayText['poll'] =
-    //$displayText['rss'] =
-    //$displayText['pdf'] =
-    //$displayText['subforum'] =
-
-    //$displayText['admin_move'] =
-    //$displayText['admin_merge'] =
-    //$displayText['admin_edit'] =
-    //$displayText['admin_delete'] =
-
-    //$displayText['document'] =
-
-    //$displayText['previous'] =
-    //$displayText['next'] =
-    //$displayText['right'] =
-    //$displayText['down'] =
-    //$displayText['up'] =
-    //$displayText['printer'] =
-    //$displayText['new_forum']  =
-
-    //$displayText['facebook'] =
-    //$displayText['twitter'] =
-    //$displayText['linkedin'] =
-    //$displayText['googleplus'] =
-    //$displayText['stumbleupon'] =
-    //$displayText['friendfeed'] =
-    //$displayText['digg'] =
-    //$displayText['reddit'] =
-    //$displayText['delicious'] =
-    //$displayText['technorati'] =
-    //$displayText['wong'] =
-    //$displayText['anonym'] =
-    //$displayText['more'] =
-    //$displayText['less'] =
-
-    //$displayText['p_delete'] =
-    //$displayText['p_reply'] =
-    //$displayText['p_quote'] =
-    //$displayText['p_edit'] =
-    //$displayText['p_report'] =
-
-    //$displayText['t_new'] =
-    //$displayText['t_poll'] =
-    //$displayText['t_qr'] =
-    //$displayText['t_qr_expand'] =
-    //$displayText['t_reply'] =
-
-    //$displayText['online'] =
-    //$displayText['offline'] =
-
-    //$displayText['new_subforum'] =
-
-    //$displayText['p_bann'] =
-
-    false;
+	//$displayText['attachment'] =
+	//$displayText['whosonline'] =
+	//$displayText['statistik'] =
+	//$displayText['lastposticon'] =
+
+	//$displayText['plus'] =
+	//$displayText['minus'] =
+
+	//$displayText['forum'] =
+	//$displayText['forum_new'] =
+
+	//$displayText['topic'] =
+	//$displayText['topic_hot'] =
+	//$displayText['topic_sticky'] =
+	//$displayText['topic_digest'] =
+	//$displayText['topic_locked'] =
+	//$displayText['topic_new'] =
+	//$displayText['topic_hot_new'] =
+	//$displayText['topic_my'] =
+
+	//$displayText['post'] =
+
+	//$displayText['poll'] =
+	//$displayText['rss'] =
+	//$displayText['pdf'] =
+	//$displayText['subforum'] =
+
+	//$displayText['admin_move'] =
+	//$displayText['admin_merge'] =
+	//$displayText['admin_edit'] =
+	//$displayText['admin_delete'] =
+
+	//$displayText['document'] =
+
+	//$displayText['previous'] =
+	//$displayText['next'] =
+	//$displayText['right'] =
+	//$displayText['down'] =
+	//$displayText['up'] =
+	//$displayText['printer'] =
+	//$displayText['new_forum']  =
+
+	//$displayText['facebook'] =
+	//$displayText['twitter'] =
+	//$displayText['linkedin'] =
+	//$displayText['googleplus'] =
+	//$displayText['stumbleupon'] =
+	//$displayText['friendfeed'] =
+	//$displayText['digg'] =
+	//$displayText['reddit'] =
+	//$displayText['delicious'] =
+	//$displayText['technorati'] =
+	//$displayText['wong'] =
+	//$displayText['anonym'] =
+	//$displayText['more'] =
+	//$displayText['less'] =
+
+	//$displayText['p_delete'] =
+	//$displayText['p_reply'] =
+	//$displayText['p_quote'] =
+	//$displayText['p_edit'] =
+	//$displayText['p_report'] =
+
+	//$displayText['t_new'] =
+	//$displayText['t_poll'] =
+	//$displayText['t_qr'] =
+	//$displayText['t_qr_expand'] =
+	//$displayText['t_reply'] =
+
+	//$displayText['online'] =
+	//$displayText['offline'] =
+
+	//$displayText['new_subforum'] =
+
+	//$displayText['p_bann'] =
+
+	false;
 
 for ($i = 1; $i <= 5; ++$i) {
-    //$displayText['rate'.$i] = false;
+	//$displayText['rate'.$i] = false;
 }
 
 return $displayText;

include/functions.topic.php

Indentation +28 added lines, -28 removed lines

@@ -15,35 +15,35 @@
 define('NEWBB_FUNCTIONS_TOPIC_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_TOPIC')) {
-    define('NEWBB_FUNCTIONS_TOPIC', 1);
+	define('NEWBB_FUNCTIONS_TOPIC', 1);
 
-    /**
-     * Create full title of a topic
-     *
-     * the title is composed of [type_name] if type_id is greater than 0 plus topic Title
-     * @param         $topicTitle
-     * @param  null   $prefixName
-     * @param  null   $prefixColor
-     * @return string
-     */
-    function newbbGetTopicTitle($topicTitle, $prefixName = null, $prefixColor = null)
-    {
-        return getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null);
-    }
+	/**
+	 * Create full title of a topic
+	 *
+	 * the title is composed of [type_name] if type_id is greater than 0 plus topic Title
+	 * @param         $topicTitle
+	 * @param  null   $prefixName
+	 * @param  null   $prefixColor
+	 * @return string
+	 */
+	function newbbGetTopicTitle($topicTitle, $prefixName = null, $prefixColor = null)
+	{
+		return getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null);
+	}
 
-    /**
-     * @param         $topicTitle
-     * @param  null   $prefixName
-     * @param  null   $prefixColor
-     * @return string
-     */
-    function getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null)
-    {
-        if (empty($prefixName)) {
-            return $topicTitle;
-        }
-        $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: ' . $prefixColor . ';">[' . $prefixName . ']</em> ' : '[' . $prefixName . '] ';
+	/**
+	 * @param         $topicTitle
+	 * @param  null   $prefixName
+	 * @param  null   $prefixColor
+	 * @return string
+	 */
+	function getTopicTitle($topicTitle, $prefixName = null, $prefixColor = null)
+	{
+		if (empty($prefixName)) {
+			return $topicTitle;
+		}
+		$topicPrefix = $prefixColor ? '<em style="font-style: normal; color: ' . $prefixColor . ';">[' . $prefixName . ']</em> ' : '[' . $prefixName . '] ';
 
-        return $topicPrefix . $topicTitle;
-    }
+		return $topicPrefix . $topicTitle;
+	}
 }

Spacing +3 added lines, -3 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_TOPIC_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_TOPIC')) {
@@ -42,8 +42,8 @@ 
         if (empty($prefixName)) {
             return $topicTitle;
         }
-        $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: ' . $prefixColor . ';">[' . $prefixName . ']</em> ' : '[' . $prefixName . '] ';
+        $topicPrefix = $prefixColor ? '<em style="font-style: normal; color: '.$prefixColor.';">['.$prefixName.']</em> ' : '['.$prefixName.'] ';
 
-        return $topicPrefix . $topicTitle;
+        return $topicPrefix.$topicTitle;
     }
 }

include/functions.forum.php

Spacing +9 added lines, -9 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_FORUM_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_FORUM')) {
@@ -40,8 +40,8 @@ 
             $groups = $xoopsUser->getGroups();
         }
         sort($groups);
-        $groupKey = 'forumselect_' . $permission . '_' . md5(implode(',', $groups));
-        $forums   = $cacheHelper->cacheRead($groupKey, function () use ($categories, $permission) {
+        $groupKey = 'forumselect_'.$permission.'_'.md5(implode(',', $groups));
+        $forums   = $cacheHelper->cacheRead($groupKey, function() use ($categories, $permission) {
             /** @var Newbb\CategoryHandler $categoryHandler */
             $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
             $categories      = $categoryHandler->getByPermission($permission, ['cat_id', 'cat_order', 'cat_title'], false);
@@ -61,7 +61,7 @@ 
                 if ($categoryDelimiter) {
                     $box .= "<option value=0>&nbsp;</option>\n";
                 }
-                $box .= "<option value='" . (-1 * $key) . "'>[" . $categories[$key]['cat_title'] . "]</option>\n";
+                $box .= "<option value='".(-1 * $key)."'>[".$categories[$key]['cat_title']."]</option>\n";
                 if (empty($forums[$key])) {
                     continue;
                 }
@@ -69,11 +69,11 @@ 
                     if ($see && in_array($f, $value)) {
                         continue;
                     }
-                    $box .= "<option value='{$f}' " . (in_array($f, $value) ? ' selected' : '') . '>' . $forum['prefix'] . $forum['forum_name'] . "</option>\n";
+                    $box .= "<option value='{$f}' ".(in_array($f, $value) ? ' selected' : '').'>'.$forum['prefix'].$forum['forum_name']."</option>\n";
                 }
             }
         } else {
-            $box .= '<option value=0>' . _MD_NEWBB_NOFORUMINDB . "</option>\n";
+            $box .= '<option value=0>'._MD_NEWBB_NOFORUMINDB."</option>\n";
         }
         unset($forums, $categories);
 
@@ -86,11 +86,11 @@ 
      */
     function newbbMakeJumpbox($forum_id = 0)
     {
-        $box = '<form name="forum_jumpbox" method="get" action="' . XOOPS_URL . '/modules/newbb/viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value &lt; 1) {return false;}">';
+        $box = '<form name="forum_jumpbox" method="get" action="'.XOOPS_URL.'/modules/newbb/viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value &lt; 1) {return false;}">';
         $box .= '<select class="select" name="forum" onchange="if (this.options[this.selectedIndex].value >0) { document.forms.forum_jumpbox.submit();}">';
-        $box .= '<option value=0>-- ' . _MD_NEWBB_SELFORUM . ' --</option>';
+        $box .= '<option value=0>-- '._MD_NEWBB_SELFORUM.' --</option>';
         $box .= newbbForumSelectBox($forum_id);
-        $box .= "</select> <input type='submit' class='button' value='" . _GO . "' /></form>";
+        $box .= "</select> <input type='submit' class='button' value='"._GO."' /></form>";
         unset($forums, $categories);
 
         return $box;

Indentation +191 added lines, -191 removed lines

@@ -17,198 +17,198 @@
 define('NEWBB_FUNCTIONS_FORUM_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_FORUM')) {
-    define('NEWBB_FUNCTIONS_FORUM', 1);
-
-    /**
-     * @param  null|array $value             selected forum id
-     * @param  string     $permission        permission (access, all, etc.)
-     * @param  bool       $categoryDelimiter show delimiter between categories
-     * @param  bool       $see
-     * @return string
-     */
-    function newbbForumSelectBox($value = null, $permission = 'access', $categoryDelimiter = true, $see = false)
-    {
-        global $xoopsUser;
-        /** @var Newbb\CategoryHandler $categoryHandler */
-        $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
-        $categories      = $categoryHandler->getByPermission($permission, ['cat_id', 'cat_order', 'cat_title'], false);
-
-        $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-
-        $groups = [XOOPS_GROUP_ANONYMOUS];
-        if (is_object($xoopsUser)) {
-            $groups = $xoopsUser->getGroups();
-        }
-        sort($groups);
-        $groupKey = 'forumselect_' . $permission . '_' . md5(implode(',', $groups));
-        $forums   = $cacheHelper->cacheRead($groupKey, function () use ($categories, $permission) {
-            /** @var Newbb\CategoryHandler $categoryHandler */
-            $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
-            $categories      = $categoryHandler->getByPermission($permission, ['cat_id', 'cat_order', 'cat_title'], false);
-
-            /** @var Newbb\ForumHandler $forumHandler */
-            $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-            $forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
-
-            return $forums;
-        }, 300);
-
-        $value = is_array($value) ? $value : [$value];
-        //$see = is_array($see) ? $see : array($see);
-        $box = '';
-        if (count($forums) > 0) {
-            foreach (array_keys($categories) as $key) {
-                if ($categoryDelimiter) {
-                    $box .= "<option value=0>&nbsp;</option>\n";
-                }
-                $box .= "<option value='" . (-1 * $key) . "'>[" . $categories[$key]['cat_title'] . "]</option>\n";
-                if (empty($forums[$key])) {
-                    continue;
-                }
-                foreach ($forums[$key] as $f => $forum) {
-                    if ($see && in_array($f, $value)) {
-                        continue;
-                    }
-                    $box .= "<option value='{$f}' " . (in_array($f, $value) ? ' selected' : '') . '>' . $forum['prefix'] . $forum['forum_name'] . "</option>\n";
-                }
-            }
-        } else {
-            $box .= '<option value=0>' . _MD_NEWBB_NOFORUMINDB . "</option>\n";
-        }
-        unset($forums, $categories);
-
-        return $box;
-    }
-
-    /**
-     * @param  int $forum_id
-     * @return string
-     */
-    function newbbMakeJumpbox($forum_id = 0)
-    {
-        $box = '<form name="forum_jumpbox" method="get" action="' . XOOPS_URL . '/modules/newbb/viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value &lt; 1) {return false;}">';
-        $box .= '<select class="select" name="forum" onchange="if (this.options[this.selectedIndex].value >0) { document.forms.forum_jumpbox.submit();}">';
-        $box .= '<option value=0>-- ' . _MD_NEWBB_SELFORUM . ' --</option>';
-        $box .= newbbForumSelectBox($forum_id);
-        $box .= "</select> <input type='submit' class='button' value='" . _GO . "' /></form>";
-        unset($forums, $categories);
-
-        return $box;
-    }
-
-    /**
-     * Get structured forums
-     *
-     * This is a temporary solution
-     * To be substituted with a new tree handler
-     *
-     * @int integer    $pid    parent forum ID
-     *
-     * @param  int  $pid
-     * @param  bool $refresh
-     * @return array
-     */
-    function newbbGetSubForum($pid = 0, $refresh = false)
-    {
-        static $list;
-        if (null === $list) {
-            $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-            $list        = $cacheHelper->read('forum_sub');
-        }
-
-        if (!is_array($list) || $refresh) {
-            $list = newbbCreateSubForumList();
-        }
-        if (0 == $pid) {
-            return $list;
-        } else {
-            return @$list[$pid];
-        }
-    }
-
-    /**
-     * @return array
-     */
-    function newbbCreateSubForumList()
-    {
-        /** @var Newbb\ForumHandler $forumHandler */
+	define('NEWBB_FUNCTIONS_FORUM', 1);
+
+	/**
+	 * @param  null|array $value             selected forum id
+	 * @param  string     $permission        permission (access, all, etc.)
+	 * @param  bool       $categoryDelimiter show delimiter between categories
+	 * @param  bool       $see
+	 * @return string
+	 */
+	function newbbForumSelectBox($value = null, $permission = 'access', $categoryDelimiter = true, $see = false)
+	{
+		global $xoopsUser;
+		/** @var Newbb\CategoryHandler $categoryHandler */
+		$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
+		$categories      = $categoryHandler->getByPermission($permission, ['cat_id', 'cat_order', 'cat_title'], false);
+
+		$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+
+		$groups = [XOOPS_GROUP_ANONYMOUS];
+		if (is_object($xoopsUser)) {
+			$groups = $xoopsUser->getGroups();
+		}
+		sort($groups);
+		$groupKey = 'forumselect_' . $permission . '_' . md5(implode(',', $groups));
+		$forums   = $cacheHelper->cacheRead($groupKey, function () use ($categories, $permission) {
+			/** @var Newbb\CategoryHandler $categoryHandler */
+			$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
+			$categories      = $categoryHandler->getByPermission($permission, ['cat_id', 'cat_order', 'cat_title'], false);
+
+			/** @var Newbb\ForumHandler $forumHandler */
+			$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+			$forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
+
+			return $forums;
+		}, 300);
+
+		$value = is_array($value) ? $value : [$value];
+		//$see = is_array($see) ? $see : array($see);
+		$box = '';
+		if (count($forums) > 0) {
+			foreach (array_keys($categories) as $key) {
+				if ($categoryDelimiter) {
+					$box .= "<option value=0>&nbsp;</option>\n";
+				}
+				$box .= "<option value='" . (-1 * $key) . "'>[" . $categories[$key]['cat_title'] . "]</option>\n";
+				if (empty($forums[$key])) {
+					continue;
+				}
+				foreach ($forums[$key] as $f => $forum) {
+					if ($see && in_array($f, $value)) {
+						continue;
+					}
+					$box .= "<option value='{$f}' " . (in_array($f, $value) ? ' selected' : '') . '>' . $forum['prefix'] . $forum['forum_name'] . "</option>\n";
+				}
+			}
+		} else {
+			$box .= '<option value=0>' . _MD_NEWBB_NOFORUMINDB . "</option>\n";
+		}
+		unset($forums, $categories);
+
+		return $box;
+	}
+
+	/**
+	 * @param  int $forum_id
+	 * @return string
+	 */
+	function newbbMakeJumpbox($forum_id = 0)
+	{
+		$box = '<form name="forum_jumpbox" method="get" action="' . XOOPS_URL . '/modules/newbb/viewforum.php" onsubmit="javascript: if (document.forum_jumpbox.forum.value &lt; 1) {return false;}">';
+		$box .= '<select class="select" name="forum" onchange="if (this.options[this.selectedIndex].value >0) { document.forms.forum_jumpbox.submit();}">';
+		$box .= '<option value=0>-- ' . _MD_NEWBB_SELFORUM . ' --</option>';
+		$box .= newbbForumSelectBox($forum_id);
+		$box .= "</select> <input type='submit' class='button' value='" . _GO . "' /></form>";
+		unset($forums, $categories);
+
+		return $box;
+	}
+
+	/**
+	 * Get structured forums
+	 *
+	 * This is a temporary solution
+	 * To be substituted with a new tree handler
+	 *
+	 * @int integer    $pid    parent forum ID
+	 *
+	 * @param  int  $pid
+	 * @param  bool $refresh
+	 * @return array
+	 */
+	function newbbGetSubForum($pid = 0, $refresh = false)
+	{
+		static $list;
+		if (null === $list) {
+			$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+			$list        = $cacheHelper->read('forum_sub');
+		}
+
+		if (!is_array($list) || $refresh) {
+			$list = newbbCreateSubForumList();
+		}
+		if (0 == $pid) {
+			return $list;
+		} else {
+			return @$list[$pid];
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	function newbbCreateSubForumList()
+	{
+		/** @var Newbb\ForumHandler $forumHandler */
 //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $criteria     = new \CriteriaCompo(null, 1);
-        $criteria->setSort('cat_id ASC, parent_forum ASC, forum_order');
-        $criteria->setOrder('ASC');
-        $forumsObject = $forumHandler->getObjects($criteria);
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$criteria     = new \CriteriaCompo(null, 1);
+		$criteria->setSort('cat_id ASC, parent_forum ASC, forum_order');
+		$criteria->setOrder('ASC');
+		$forumsObject = $forumHandler->getObjects($criteria);
 //        require_once $GLOBALS['xoops']->path('modules/newbb/class/Tree.php');
-        $tree        = new Newbb\ObjectTree($forumsObject, 'forum_id', 'parent_forum');
-        $forum_array = [];
-        foreach (array_keys($forumsObject) as $key) {
-            if (!$child = array_keys($tree->getAllChild($forumsObject[$key]->getVar('forum_id')))) {
-                continue;
-            }
-            $forum_array[$forumsObject[$key]->getVar('forum_id')] = $child;
-        }
-        unset($forumsObject, $tree, $criteria);
-
-        $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-        $cacheHelper->write('forum_sub', $forum_array);
-
-        return $forum_array;
-    }
-
-    /**
-     * @param  int  $forum_id
-     * @param  bool $refresh
-     * @return array|mixed|null
-     */
-    function newbbGetParentForum($forum_id = 0, $refresh = false)
-    {
-        static $list = null;
-
-        if (null === $list) {
-            $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-            $list        = $cacheHelper->read('forum_parent');
-        }
-        if (!is_array($list) || $refresh) {
-            $list = newbbCreateParentForumList();
-        }
-        if (0 == $forum_id) {
-            return $list;
-        } else {
-            return @$list[$forum_id];
-        }
-    }
-
-    /**
-     * @return array
-     */
-    function newbbCreateParentForumList()
-    {
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $criteria     = new \Criteria('1', 1);
-        $criteria->setSort('parent_forum');
-        $criteria->setOrder('ASC');
-        $forumsObject = $forumHandler->getObjects($criteria);
+		$tree        = new Newbb\ObjectTree($forumsObject, 'forum_id', 'parent_forum');
+		$forum_array = [];
+		foreach (array_keys($forumsObject) as $key) {
+			if (!$child = array_keys($tree->getAllChild($forumsObject[$key]->getVar('forum_id')))) {
+				continue;
+			}
+			$forum_array[$forumsObject[$key]->getVar('forum_id')] = $child;
+		}
+		unset($forumsObject, $tree, $criteria);
+
+		$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+		$cacheHelper->write('forum_sub', $forum_array);
+
+		return $forum_array;
+	}
+
+	/**
+	 * @param  int  $forum_id
+	 * @param  bool $refresh
+	 * @return array|mixed|null
+	 */
+	function newbbGetParentForum($forum_id = 0, $refresh = false)
+	{
+		static $list = null;
+
+		if (null === $list) {
+			$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+			$list        = $cacheHelper->read('forum_parent');
+		}
+		if (!is_array($list) || $refresh) {
+			$list = newbbCreateParentForumList();
+		}
+		if (0 == $forum_id) {
+			return $list;
+		} else {
+			return @$list[$forum_id];
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	function newbbCreateParentForumList()
+	{
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$criteria     = new \Criteria('1', 1);
+		$criteria->setSort('parent_forum');
+		$criteria->setOrder('ASC');
+		$forumsObject = $forumHandler->getObjects($criteria);
 //        require_once $GLOBALS['xoops']->path('modules/newbb/class/Tree.php');
-        $tree        = new Newbb\ObjectTree($forumsObject, 'forum_id', 'parent_forum');
-        $forum_array = [];
-        foreach (array_keys($forumsObject) as $key) {
-            $parent_forum = $forumsObject[$key]->getVar('parent_forum');
-            if (!$parent_forum) {
-                continue;
-            }
-            if (isset($forum_array[$parent_forum])) {
-                $forum_array[$forumsObject[$key]->getVar('forum_id')]   = $forum_array[$parent_forum];
-                $forum_array[$forumsObject[$key]->getVar('forum_id')][] = $parent_forum;
-            } else {
-                $forum_array[$forumsObject[$key]->getVar('forum_id')] = $tree->getParentForums($forumsObject[$key]->getVar('forum_id'));
-            }
-        }
-        unset($forumsObject, $tree, $criteria);
-
-        $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-        $cacheHelper->write('forum_parent', $forum_array);
-
-        return $forum_array;
-    }
+		$tree        = new Newbb\ObjectTree($forumsObject, 'forum_id', 'parent_forum');
+		$forum_array = [];
+		foreach (array_keys($forumsObject) as $key) {
+			$parent_forum = $forumsObject[$key]->getVar('parent_forum');
+			if (!$parent_forum) {
+				continue;
+			}
+			if (isset($forum_array[$parent_forum])) {
+				$forum_array[$forumsObject[$key]->getVar('forum_id')]   = $forum_array[$parent_forum];
+				$forum_array[$forumsObject[$key]->getVar('forum_id')][] = $parent_forum;
+			} else {
+				$forum_array[$forumsObject[$key]->getVar('forum_id')] = $tree->getParentForums($forumsObject[$key]->getVar('forum_id'));
+			}
+		}
+		unset($forumsObject, $tree, $criteria);
+
+		$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+		$cacheHelper->write('forum_parent', $forum_array);
+
+		return $forum_array;
+	}
 }