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/search.inc.php

Indentation +106 added lines, -106 removed lines

@@ -28,119 +28,119 @@
  * @return array
  */
 function newbb_search(
-    $queryarray,
-    $andor,
-    $limit,
-    $offset,
-    $userid,
-    $forums = 0,
-    $sortby = 0,
-    $searchin = 'both',
-    CriteriaCompo $criteriaExtra = null
+	$queryarray,
+	$andor,
+	$limit,
+	$offset,
+	$userid,
+	$forums = 0,
+	$sortby = 0,
+	$searchin = 'both',
+	CriteriaCompo $criteriaExtra = null
 ) {
-    global $myts, $xoopsDB;
-    // irmtfan - in XOOPSCORE/search.php $GLOBALS['xoopsModuleConfig'] is not set
-    if (!isset($GLOBALS['xoopsModuleConfig'])) {
-        $GLOBALS['xoopsModuleConfig'] = newbbLoadConfig();
-    }
-    // irmtfan - in XOOPSCORE/search.php $xoopsModule is not set
-    if (!is_object($GLOBALS['xoopsModule']) && is_object($GLOBALS['module'])
-        && 'newbb' === $GLOBALS['module']->getVar('dirname')) {
-        $GLOBALS['xoopsModule'] = $GLOBALS['module'];
-    }
-    /** @var Newbb\ForumHandler $forumHandler */
-    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-    $validForums  = $forumHandler->getIdsByValues($forums); // can we use view permission? $forumHandler->getIdsByValues($forums, "view")
+	global $myts, $xoopsDB;
+	// irmtfan - in XOOPSCORE/search.php $GLOBALS['xoopsModuleConfig'] is not set
+	if (!isset($GLOBALS['xoopsModuleConfig'])) {
+		$GLOBALS['xoopsModuleConfig'] = newbbLoadConfig();
+	}
+	// irmtfan - in XOOPSCORE/search.php $xoopsModule is not set
+	if (!is_object($GLOBALS['xoopsModule']) && is_object($GLOBALS['module'])
+		&& 'newbb' === $GLOBALS['module']->getVar('dirname')) {
+		$GLOBALS['xoopsModule'] = $GLOBALS['module'];
+	}
+	/** @var Newbb\ForumHandler $forumHandler */
+	$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+	$validForums  = $forumHandler->getIdsByValues($forums); // can we use view permission? $forumHandler->getIdsByValues($forums, "view")
 
-    $criteriaPost = new \CriteriaCompo();
-    $criteriaPost->add(new \Criteria('p.approved', 1), 'AND'); // only active posts
+	$criteriaPost = new \CriteriaCompo();
+	$criteriaPost->add(new \Criteria('p.approved', 1), 'AND'); // only active posts
 
-    $forum_list = [];// get forum lists just for forum names
-    if (count($validForums) > 0) {
-        $criteriaPermissions = new \CriteriaCompo();
-        $criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND');
-        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false);
-    }
+	$forum_list = [];// get forum lists just for forum names
+	if (count($validForums) > 0) {
+		$criteriaPermissions = new \CriteriaCompo();
+		$criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND');
+		$forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false);
+	}
 
-    if (is_numeric($userid) && 0 !== $userid) {
-        $criteriaUser = new \CriteriaCompo();
-        $criteriaUser->add(new \Criteria('p.uid', $userid), 'OR');
-    } elseif (is_array($userid) && count($userid) > 0) {
-        $userid       = array_map('intval', $userid);
-        $criteriaUser = new \CriteriaCompo();
-        $criteriaUser->add(new \Criteria('p.uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR');
-    }
+	if (is_numeric($userid) && 0 !== $userid) {
+		$criteriaUser = new \CriteriaCompo();
+		$criteriaUser->add(new \Criteria('p.uid', $userid), 'OR');
+	} elseif (is_array($userid) && count($userid) > 0) {
+		$userid       = array_map('intval', $userid);
+		$criteriaUser = new \CriteriaCompo();
+		$criteriaUser->add(new \Criteria('p.uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR');
+	}
 
-    $count = 0;
-    if (is_array($queryarray)) {
-        $count = count($queryarray);
-    }
-    $highlightKey = '';
-    if ($count > 0) {
-        $criteriaKeywords = new \CriteriaCompo();
-        foreach ($queryarray as $queryTerm) {
-            $termCriteria  = new \CriteriaCompo();
-            $queryTermLike = '%' . $xoopsDB->escape($queryTerm) . '%';
-            if ('title' === $searchin || 'both' === $searchin) {
-                $termCriteria->add(new \Criteria('p.subject', $queryTermLike, 'LIKE'), 'OR');
-            }
-            if ('text' === $searchin || 'both' === $searchin) {
-                $termCriteria->add(new \Criteria('t.post_text', $queryTermLike, 'LIKE'), 'OR');
-            }
-            $criteriaKeywords->add($termCriteria, $andor);
-        }
-        // add highlight keywords to post links
-        $highlightKey = '&keywords=' . implode(' ', $queryarray);
-        $highlightKey = str_replace(' ', '+', $highlightKey);
-    }
-    $criteria = new \CriteriaCompo();
-    $criteria->add($criteriaPost, 'AND');
-    if (isset($criteriaPermissions)) {
-        $criteria->add($criteriaPermissions, 'AND');
-    }
-    if (isset($criteriaUser)) {
-        $criteria->add($criteriaUser, 'AND');
-    }
-    if (isset($criteriaKeywords)) {
-        $criteria->add($criteriaKeywords, 'AND');
-    }
-    if (isset($criteriaExtra)) {
-        $criteria->add($criteriaExtra, 'AND');
-    }
-    //$criteria->setLimit($limit); // no need for this
-    //$criteria->setStart($offset); // no need for this
+	$count = 0;
+	if (is_array($queryarray)) {
+		$count = count($queryarray);
+	}
+	$highlightKey = '';
+	if ($count > 0) {
+		$criteriaKeywords = new \CriteriaCompo();
+		foreach ($queryarray as $queryTerm) {
+			$termCriteria  = new \CriteriaCompo();
+			$queryTermLike = '%' . $xoopsDB->escape($queryTerm) . '%';
+			if ('title' === $searchin || 'both' === $searchin) {
+				$termCriteria->add(new \Criteria('p.subject', $queryTermLike, 'LIKE'), 'OR');
+			}
+			if ('text' === $searchin || 'both' === $searchin) {
+				$termCriteria->add(new \Criteria('t.post_text', $queryTermLike, 'LIKE'), 'OR');
+			}
+			$criteriaKeywords->add($termCriteria, $andor);
+		}
+		// add highlight keywords to post links
+		$highlightKey = '&keywords=' . implode(' ', $queryarray);
+		$highlightKey = str_replace(' ', '+', $highlightKey);
+	}
+	$criteria = new \CriteriaCompo();
+	$criteria->add($criteriaPost, 'AND');
+	if (isset($criteriaPermissions)) {
+		$criteria->add($criteriaPermissions, 'AND');
+	}
+	if (isset($criteriaUser)) {
+		$criteria->add($criteriaUser, 'AND');
+	}
+	if (isset($criteriaKeywords)) {
+		$criteria->add($criteriaKeywords, 'AND');
+	}
+	if (isset($criteriaExtra)) {
+		$criteria->add($criteriaExtra, 'AND');
+	}
+	//$criteria->setLimit($limit); // no need for this
+	//$criteria->setStart($offset); // no need for this
 
-    if (empty($sortby)) {
-        $sortby = 'p.post_time';
-    }
-    $criteria->setSort($sortby);
-    $order = 'ASC';
-    if ('p.post_time' === $sortby) {
-        $order = 'DESC';
-    }
-    $criteria->setOrder($order);
+	if (empty($sortby)) {
+		$sortby = 'p.post_time';
+	}
+	$criteria->setSort($sortby);
+	$order = 'ASC';
+	if ('p.post_time' === $sortby) {
+		$order = 'DESC';
+	}
+	$criteria->setOrder($order);
 
-    /** @var Newbb\PostHandler $postHandler */
-    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-    $posts       = $postHandler->getPostsByLimit($criteria, $limit, $offset);
+	/** @var Newbb\PostHandler $postHandler */
+	$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+	$posts       = $postHandler->getPostsByLimit($criteria, $limit, $offset);
 
-    $ret = [];
-    $i   = 0;
-    foreach (array_keys($posts) as $id) {
-        /** @var Newbb\Post $post */
-        $post                  = $posts[$id];
-        $post_data             = $post->getPostBody();
-        $ret[$i]['topic_id']   = $post->getVar('topic_id');
-        $ret[$i]['link']       = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post->getVar('post_id') . $highlightKey; // add highlight key
-        $ret[$i]['title']      = $post_data['subject'];
-        $ret[$i]['time']       = $post_data['date'];
-        $ret[$i]['forum_name'] = $myts->htmlSpecialChars($forum_list[$post->getVar('forum_id')]['forum_name']);
-        $ret[$i]['forum_link'] = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $post->getVar('forum_id');
-        $ret[$i]['post_text']  = $post_data['text'];
-        $ret[$i]['uid']        = $post->getVar('uid');
-        $ret[$i]['poster']     = $post->getVar('uid') ? '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $ret[$i]['uid'] . '">' . $post_data['author'] . '</a>' : $post_data['author'];
-        ++$i;
-    }
+	$ret = [];
+	$i   = 0;
+	foreach (array_keys($posts) as $id) {
+		/** @var Newbb\Post $post */
+		$post                  = $posts[$id];
+		$post_data             = $post->getPostBody();
+		$ret[$i]['topic_id']   = $post->getVar('topic_id');
+		$ret[$i]['link']       = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post->getVar('post_id') . $highlightKey; // add highlight key
+		$ret[$i]['title']      = $post_data['subject'];
+		$ret[$i]['time']       = $post_data['date'];
+		$ret[$i]['forum_name'] = $myts->htmlSpecialChars($forum_list[$post->getVar('forum_id')]['forum_name']);
+		$ret[$i]['forum_link'] = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $post->getVar('forum_id');
+		$ret[$i]['post_text']  = $post_data['text'];
+		$ret[$i]['uid']        = $post->getVar('uid');
+		$ret[$i]['poster']     = $post->getVar('uid') ? '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $ret[$i]['uid'] . '">' . $post_data['author'] . '</a>' : $post_data['author'];
+		++$i;
+	}
 
-    return $ret;
+	return $ret;
 }

include/form.post.php

Indentation +163 added lines, -163 removed lines

@@ -30,69 +30,69 @@ 
 
 //check banning
 $moderated_id    = (is_object($GLOBALS['xoopsUser'])
-                    && $GLOBALS['xoopsUser']->uid() > 0) ? $GLOBALS['xoopsUser']->uid() : 0;
+					&& $GLOBALS['xoopsUser']->uid() > 0) ? $GLOBALS['xoopsUser']->uid() : 0;
 $moderated_ip    = Request::getString('REMOTE_ADDR', '', 'SERVER');
 $moderated_forum = $forumObject->getVar('forum_id');
 /** @var Newbb\ModerateHandler $moderateHandler */
 $moderateHandler = Newbb\Helper::getInstance()->getHandler('Moderate');
 if (!$moderateHandler->verifyUser($moderated_id, '', $moderated_forum)) {
-    $criteria = new \CriteriaCompo();
-    $criteria->add(new \Criteria('uid', $moderated_id, '='));
-    $criteria->setSort('mod_end');
-    $criteria->setOrder('DESC');
-    $mod  = $moderateHandler->getObjects($criteria, false, false);
-    $tage = ($mod[0]['mod_end'] - $mod[0]['mod_start']) / 60 / 60 / 24;
-    $msg  = $myts->displayTarea(sprintf(_MD_NEWBB_SUSPEND_TEXT, newbbGetUnameFromId($moderated_id), (int)$tage, $mod[0]['mod_desc'], formatTimestamp($mod[0]['mod_end'])), 1);
-    xoops_error($msg, _MD_NEWBB_SUSPEND_NOACCESS);
-    require_once $GLOBALS['xoops']->path('footer.php');
-    exit();
+	$criteria = new \CriteriaCompo();
+	$criteria->add(new \Criteria('uid', $moderated_id, '='));
+	$criteria->setSort('mod_end');
+	$criteria->setOrder('DESC');
+	$mod  = $moderateHandler->getObjects($criteria, false, false);
+	$tage = ($mod[0]['mod_end'] - $mod[0]['mod_start']) / 60 / 60 / 24;
+	$msg  = $myts->displayTarea(sprintf(_MD_NEWBB_SUSPEND_TEXT, newbbGetUnameFromId($moderated_id), (int)$tage, $mod[0]['mod_desc'], formatTimestamp($mod[0]['mod_end'])), 1);
+	xoops_error($msg, _MD_NEWBB_SUSPEND_NOACCESS);
+	require_once $GLOBALS['xoops']->path('footer.php');
+	exit();
 }
 
 $xoopsTpl->assign('category', ['id' => $forumObject->getVar('cat_id'), 'title' => $categoryObject->getVar('cat_title')]);
 $xoopsTpl->assign('parentforum', $forumHandler->getParents($forumObject));
 $xoopsTpl->assign([
-                      'forum_id'   => $forumObject->getVar('forum_id'),
-                      'forum_name' => $forumObject->getVar('forum_name')
-                  ]);
+					  'forum_id'   => $forumObject->getVar('forum_id'),
+					  'forum_name' => $forumObject->getVar('forum_name')
+				  ]);
 
 if (!is_object($topicObject)) {
-    $topicObject = $topicHandler->create();
+	$topicObject = $topicHandler->create();
 }
 
 $editby = false;
 if ($topicObject->isNew()) {
-    $form_title = _MD_NEWBB_POSTNEW;
+	$form_title = _MD_NEWBB_POSTNEW;
 } elseif ($postObject->isNew()) {
-    if (empty($postParentObject)) {
-        $postParentObject = $postHandler->get($pid);
-    }
-    $form_title = _MD_NEWBB_REPLY . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}&amp;post_id={$pid}\" rel=\"external\">" . $postParentObject->getVar('subject') . '</a>';
+	if (empty($postParentObject)) {
+		$postParentObject = $postHandler->get($pid);
+	}
+	$form_title = _MD_NEWBB_REPLY . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}&amp;post_id={$pid}\" rel=\"external\">" . $postParentObject->getVar('subject') . '</a>';
 } else {
-    $form_title = _EDIT . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $postObject->getVar('subject') . '</a>';
-    $editby     = true;
+	$form_title = _EDIT . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $postObject->getVar('subject') . '</a>';
+	$editby     = true;
 }
 $xoopsTpl->assign('form_title', $form_title);
 
 foreach ([
-             'start',
-             'topic_id',
-             'post_id',
-             'pid',
-             'isreply',
-             'isedit',
-             'contents_preview'
-         ] as $getint) {
-    ${$getint} = Request::getInt($getint, (!empty(${$getint}) ? ${$getint} : 0), 'GET'); // isset($_GET[$getint]) ? (int)($_GET[$getint]) : ((!empty(${$getint})) ? ${$getint} : 0);
+			 'start',
+			 'topic_id',
+			 'post_id',
+			 'pid',
+			 'isreply',
+			 'isedit',
+			 'contents_preview'
+		 ] as $getint) {
+	${$getint} = Request::getInt($getint, (!empty(${$getint}) ? ${$getint} : 0), 'GET'); // isset($_GET[$getint]) ? (int)($_GET[$getint]) : ((!empty(${$getint})) ? ${$getint} : 0);
 }
 foreach ([
-             'order',
-             'viewmode',
-             'hidden',
-             'newbb_form',
-             'icon',
-             'op'
-         ] as $getstr) {
-    ${$getstr} = Request::getString($getstr, (!empty(${$getstr}) ? ${$getstr} : ''), 'GET'); //isset($_GET[$getstr]) ? $_GET[$getstr] : ((!empty(${$getstr})) ? ${$getstr} : '');
+			 'order',
+			 'viewmode',
+			 'hidden',
+			 'newbb_form',
+			 'icon',
+			 'op'
+		 ] as $getstr) {
+	${$getstr} = Request::getString($getstr, (!empty(${$getstr}) ? ${$getstr} : ''), 'GET'); //isset($_GET[$getstr]) ? $_GET[$getstr] : ((!empty(${$getstr})) ? ${$getstr} : '');
 }
 
 /** @var Newbb\TopicHandler $topicHandler */
@@ -105,30 +105,30 @@ 
 $forum_form->setExtra('enctype="multipart/form-data"');
 
 if ($editby) {
-    $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_EDITEDMSG, 'editwhy', 60, 100, ''));
+	$forum_form->addElement(new \XoopsFormText(_MD_NEWBB_EDITEDMSG, 'editwhy', 60, 100, ''));
 }
 
 $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
 if (newbbIsAdmin($forumObject)
-    || ($topicHandler->getPermission($forumObject, $topic_status, 'type')
-        && (0 == $topic_id
-            || $uid == $topicHandler->get(@$topic_id, 'topic_poster')))) {
-    $type_id = $topicHandler->get(@$topic_id, 'type_id');
-    /** @var Newbb\TypeHandler $typeHandler */
-    $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-    $types       = $typeHandler->getByForum($forumObject->getVar('forum_id'));
-    if (!empty($types)) {
-        $type_element = new \XoopsFormSelect(_MD_NEWBB_TYPE, 'type_id', $type_id);
-        //$type_element = new \XoopsFormRadio(_MD_NEWBB_TYPE, 'type_id', $type_id);
-        $type_element->addOption(0, _NONE);
-        foreach ($types as $key => $type) {
-            //$value = empty($type["type_color"]) ? $type["type_name"] : "<em style=\"font-style: normal; color: " . $type["type_color"] . ";\">" . $type["type_name"] . "</em>";
-            $type_element->addOption($key, $type['type_name']);
-        }
-        $forum_form->addElement($type_element);
-    } else {
-        $forum_form->addElement(new \XoopsFormHidden('type_id', 0));
-    }
+	|| ($topicHandler->getPermission($forumObject, $topic_status, 'type')
+		&& (0 == $topic_id
+			|| $uid == $topicHandler->get(@$topic_id, 'topic_poster')))) {
+	$type_id = $topicHandler->get(@$topic_id, 'type_id');
+	/** @var Newbb\TypeHandler $typeHandler */
+	$typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
+	$types       = $typeHandler->getByForum($forumObject->getVar('forum_id'));
+	if (!empty($types)) {
+		$type_element = new \XoopsFormSelect(_MD_NEWBB_TYPE, 'type_id', $type_id);
+		//$type_element = new \XoopsFormRadio(_MD_NEWBB_TYPE, 'type_id', $type_id);
+		$type_element->addOption(0, _NONE);
+		foreach ($types as $key => $type) {
+			//$value = empty($type["type_color"]) ? $type["type_name"] : "<em style=\"font-style: normal; color: " . $type["type_color"] . ";\">" . $type["type_name"] . "</em>";
+			$type_element->addOption($key, $type['type_name']);
+		}
+		$forum_form->addElement($type_element);
+	} else {
+		$forum_form->addElement(new \XoopsFormHidden('type_id', 0));
+	}
 }
 
 $subject_form = new \XoopsFormText(_MD_NEWBB_SUBJECTC, 'subject', 60, 100, $subject);
@@ -136,32 +136,32 @@ 
 $forum_form->addElement($subject_form, true);
 
 if (!is_object($GLOBALS['xoopsUser'])) {
-    $required = !empty($GLOBALS['xoopsModuleConfig']['require_name']);
-    $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_NAMEMAIL, 'poster_name', 60, 255, (!empty($isedit) && !empty($poster_name)) ? $poster_name : ''), $required);
+	$required = !empty($GLOBALS['xoopsModuleConfig']['require_name']);
+	$forum_form->addElement(new \XoopsFormText(_MD_NEWBB_NAMEMAIL, 'poster_name', 60, 255, (!empty($isedit) && !empty($poster_name)) ? $poster_name : ''), $required);
 }
 
 $icons_radio   = new \XoopsFormRadio(_MD_NEWBB_MESSAGEICON, 'icon', $icon);
 $subject_icons = \XoopsLists::getSubjectsList();
 foreach ($subject_icons as $iconfile) {
-    $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
+	$icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
 }
 $forum_form->addElement($icons_radio);
 
 $nohtml = !$topicHandler->getPermission($forumObject, $topic_status, 'html');
 
 if (Request::getString('editor', '', 'POST')) {
-    $editor = trim(Request::getString('editor', '', 'POST'));
-    newbbSetCookie('editor', $editor);
+	$editor = trim(Request::getString('editor', '', 'POST'));
+	newbbSetCookie('editor', $editor);
 } elseif (!$editor = newbbGetCookie('editor')) {
-    if (empty($editor)) {
-        $editor = @ $GLOBALS['xoopsModuleConfig']['editor_default'];
-    }
+	if (empty($editor)) {
+		$editor = @ $GLOBALS['xoopsModuleConfig']['editor_default'];
+	}
 }
 if (count(@$GLOBALS['xoopsModuleConfig']['editor_allowed']) > 0) {
-    if (!in_array($editor, $GLOBALS['xoopsModuleConfig']['editor_allowed'])) {
-        $editor = $GLOBALS['xoopsModuleConfig']['editor_allowed'][0];
-        newbbSetCookie('editor', $editor);
-    }
+	if (!in_array($editor, $GLOBALS['xoopsModuleConfig']['editor_allowed'])) {
+		$editor = $GLOBALS['xoopsModuleConfig']['editor_allowed'][0];
+		newbbSetCookie('editor', $editor);
+	}
 }
 
 $forum_form->addElement(new \XoopsFormSelectEditor($forum_form, 'editor', $editor, $nohtml, @$GLOBALS['xoopsModuleConfig']['editor_allowed'][0]));
@@ -178,31 +178,31 @@ 
 $forum_form->addElement($_editor, true);
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_tag']) && (empty($postObject) || $postObject->isTopic())) {
-    $topic_tags = '';
-    if (Request::getString('topic_tags', '', 'POST')) {
-        $topic_tags = $myts->htmlSpecialChars(Request::getString('topic_tags', '', 'POST'));
-    } elseif (!empty($topic_id)) {
-        $topic_tags = $topicHandler->get($topic_id, 'topic_tags');
-    }
-    if (xoops_load('formtag', 'tag') && class_exists('TagFormTag')) {
-        $forum_form->addElement(new TagFormTag('topic_tags', 60, 255, $topic_tags));
-    }
+	$topic_tags = '';
+	if (Request::getString('topic_tags', '', 'POST')) {
+		$topic_tags = $myts->htmlSpecialChars(Request::getString('topic_tags', '', 'POST'));
+	} elseif (!empty($topic_id)) {
+		$topic_tags = $topicHandler->get($topic_id, 'topic_tags');
+	}
+	if (xoops_load('formtag', 'tag') && class_exists('TagFormTag')) {
+		$forum_form->addElement(new TagFormTag('topic_tags', 60, 255, $topic_tags));
+	}
 }
 
 $options_tray = new \XoopsFormElementTray(_MD_NEWBB_OPTIONS, '<br>');
 if (is_object($GLOBALS['xoopsUser']) && 1 == $GLOBALS['xoopsModuleConfig']['allow_user_anonymous']) {
-    $noname          = (!empty($isedit) && is_object($postObject) && 0 == $postObject->getVar('uid')) ? 1 : 0;
-    $noname_checkbox = new \XoopsFormCheckBox('', 'noname', $noname);
-    $noname_checkbox->addOption(1, _MD_NEWBB_POSTANONLY);
-    $options_tray->addElement($noname_checkbox);
+	$noname          = (!empty($isedit) && is_object($postObject) && 0 == $postObject->getVar('uid')) ? 1 : 0;
+	$noname_checkbox = new \XoopsFormCheckBox('', 'noname', $noname);
+	$noname_checkbox->addOption(1, _MD_NEWBB_POSTANONLY);
+	$options_tray->addElement($noname_checkbox);
 }
 
 if (!$nohtml) {
-    $html_checkbox = new \XoopsFormCheckBox('', 'dohtml', $dohtml);
-    $html_checkbox->addOption(1, _MD_NEWBB_DOHTML);
-    $options_tray->addElement($html_checkbox);
+	$html_checkbox = new \XoopsFormCheckBox('', 'dohtml', $dohtml);
+	$html_checkbox->addOption(1, _MD_NEWBB_DOHTML);
+	$options_tray->addElement($html_checkbox);
 } else {
-    $forum_form->addElement(new \XoopsFormHidden('dohtml', 0));
+	$forum_form->addElement(new \XoopsFormHidden('dohtml', 0));
 }
 
 $smiley_checkbox = new \XoopsFormCheckBox('', 'dosmiley', $dosmiley);
@@ -214,99 +214,99 @@ 
 $options_tray->addElement($xcode_checkbox);
 
 if (!$nohtml) {
-    $br_checkbox = new \XoopsFormCheckBox('', 'dobr', $dobr);
-    $br_checkbox->addOption(1, _MD_NEWBB_DOBR);
-    $options_tray->addElement($br_checkbox);
+	$br_checkbox = new \XoopsFormCheckBox('', 'dobr', $dobr);
+	$br_checkbox->addOption(1, _MD_NEWBB_DOBR);
+	$options_tray->addElement($br_checkbox);
 } else {
-    $forum_form->addElement(new \XoopsFormHidden('dobr', 1));
+	$forum_form->addElement(new \XoopsFormHidden('dobr', 1));
 }
 
 if (is_object($GLOBALS['xoopsUser']) && $topicHandler->getPermission($forumObject, $topic_status, 'signature')) {
-    $attachsig_checkbox = new \XoopsFormCheckBox('', 'attachsig', $attachsig);
-    $attachsig_checkbox->addOption(1, _MD_NEWBB_ATTACHSIG);
-    $options_tray->addElement($attachsig_checkbox);
+	$attachsig_checkbox = new \XoopsFormCheckBox('', 'attachsig', $attachsig);
+	$attachsig_checkbox->addOption(1, _MD_NEWBB_ATTACHSIG);
+	$options_tray->addElement($attachsig_checkbox);
 }
 $notify = 0;
 if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsModuleConfig']['notification_enabled']) {
-    if (!empty($notify)) {
-        // If 'notify' set, use that value (e.g. preview or upload)
-        //$notify = 1;
-    } else {
-        // Otherwise, check previous subscribed status...
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler = xoops_getHandler('notification');
-        if (!empty($topic_id)
-            && $notificationHandler->isSubscribed('thread', $topic_id, 'new_post', $xoopsModule->getVar('mid'), $GLOBALS['xoopsUser']->getVar('uid'))) {
-            $notify = 1;
-        }
-    }
-
-    $notify_checkbox = new \XoopsFormCheckBox('', 'notify', $notify);
-    $notify_checkbox->addOption(1, _MD_NEWBB_NEWPOSTNOTIFY);
-    $options_tray->addElement($notify_checkbox);
+	if (!empty($notify)) {
+		// If 'notify' set, use that value (e.g. preview or upload)
+		//$notify = 1;
+	} else {
+		// Otherwise, check previous subscribed status...
+		/** @var \XoopsNotificationHandler $notificationHandler */
+		$notificationHandler = xoops_getHandler('notification');
+		if (!empty($topic_id)
+			&& $notificationHandler->isSubscribed('thread', $topic_id, 'new_post', $xoopsModule->getVar('mid'), $GLOBALS['xoopsUser']->getVar('uid'))) {
+			$notify = 1;
+		}
+	}
+
+	$notify_checkbox = new \XoopsFormCheckBox('', 'notify', $notify);
+	$notify_checkbox->addOption(1, _MD_NEWBB_NEWPOSTNOTIFY);
+	$options_tray->addElement($notify_checkbox);
 }
 $forum_form->addElement($options_tray);
 
 if ($topicHandler->getPermission($forumObject, $topic_status, 'attach')) {
-    $upload_tray = new \XoopsFormElementTray(_MD_NEWBB_ATTACHMENT);
-    $upload_tray->addElement(new \XoopsFormFile('', 'userfile', $forumObject->getVar('attach_maxkb') * 1024));
-    $upload_tray->addElement(new \XoopsFormButton('', 'contents_upload', _MD_NEWBB_UPLOAD, 'submit'));
-    $upload_tray->addElement(new \XoopsFormLabel('<br><br>' . _MD_NEWBB_MAX_FILESIZE . ':', $forumObject->getVar('attach_maxkb') . 'Kb; '));
-    $extensions = trim(str_replace('|', ' ', $forumObject->getVar('attach_ext')));
-    $extensions = (empty($extensions) || '*' === $extensions) ? _ALL : $extensions;
-    $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS . ':', $extensions));
-    $upload_tray->addElement(new \XoopsFormLabel('<br>' . sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
-    $forum_form->addElement($upload_tray);
+	$upload_tray = new \XoopsFormElementTray(_MD_NEWBB_ATTACHMENT);
+	$upload_tray->addElement(new \XoopsFormFile('', 'userfile', $forumObject->getVar('attach_maxkb') * 1024));
+	$upload_tray->addElement(new \XoopsFormButton('', 'contents_upload', _MD_NEWBB_UPLOAD, 'submit'));
+	$upload_tray->addElement(new \XoopsFormLabel('<br><br>' . _MD_NEWBB_MAX_FILESIZE . ':', $forumObject->getVar('attach_maxkb') . 'Kb; '));
+	$extensions = trim(str_replace('|', ' ', $forumObject->getVar('attach_ext')));
+	$extensions = (empty($extensions) || '*' === $extensions) ? _ALL : $extensions;
+	$upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS . ':', $extensions));
+	$upload_tray->addElement(new \XoopsFormLabel('<br>' . sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
+	$forum_form->addElement($upload_tray);
 }
 
 if (!empty($attachments) && is_array($attachments) && count($attachments)) {
-    $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_THIS_FILE_WAS_ATTACHED_TO_THIS_POST, 'delete_attach[]');
-    foreach ($attachments as $key => $attachment) {
-        $attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['nameDisplay'] . '</a><br>';
-        $delete_attach_checkbox->addOption($key, $attach);
-    }
-    $forum_form->addElement($delete_attach_checkbox);
-    unset($delete_attach_checkbox);
+	$delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_THIS_FILE_WAS_ATTACHED_TO_THIS_POST, 'delete_attach[]');
+	foreach ($attachments as $key => $attachment) {
+		$attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['nameDisplay'] . '</a><br>';
+		$delete_attach_checkbox->addOption($key, $attach);
+	}
+	$forum_form->addElement($delete_attach_checkbox);
+	unset($delete_attach_checkbox);
 }
 
 if (!empty($attachments_tmp) && is_array($attachments_tmp) && count($attachments_tmp)) {
-    $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]');
-    $url_prefix             = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
-    foreach ($attachments_tmp as $key => $attachment) {
-        $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>';
-        $delete_attach_checkbox->addOption($key, $attach);
-    }
-    $forum_form->addElement($delete_attach_checkbox);
-    unset($delete_attach_checkbox);
-    $attachments_tmp = base64_encode(serialize($attachments_tmp));
-    $forum_form->addElement(new \XoopsFormHidden('attachments_tmp', $attachments_tmp));
+	$delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]');
+	$url_prefix             = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
+	foreach ($attachments_tmp as $key => $attachment) {
+		$attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>';
+		$delete_attach_checkbox->addOption($key, $attach);
+	}
+	$forum_form->addElement($delete_attach_checkbox);
+	unset($delete_attach_checkbox);
+	$attachments_tmp = base64_encode(serialize($attachments_tmp));
+	$forum_form->addElement(new \XoopsFormHidden('attachments_tmp', $attachments_tmp));
 }
 $radiobox = null;
 if ($GLOBALS['xoopsModuleConfig']['enable_karma'] || $GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
-    $view_require = $require_reply ? 'require_reply' : ($post_karma ? 'require_karma' : 'require_null');
-    $radiobox     = new \XoopsFormRadio(_MD_NEWBB_VIEW_REQUIRE, 'view_require', $view_require);
-    if ($GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
-        $radiobox->addOption('require_reply', _MD_NEWBB_REQUIRE_REPLY);
-    }
-    if ($GLOBALS['xoopsModuleConfig']['enable_karma']) {
-        $karmas = array_map('trim', explode(',', $GLOBALS['xoopsModuleConfig']['karma_options']));
-        if (count($karmas) > 1) {
-            foreach ($karmas as $karma) {
-                $karma_array[(string)$karma] = (int)$karma;
-            }
-            $karma_select = new \XoopsFormSelect('', 'post_karma', $post_karma);
-            $karma_select->addOptionArray($karma_array);
-            $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA . $karma_select->render());
-        }
-    }
-    $radiobox->addOption('require_null', _MD_NEWBB_REQUIRE_NULL);
+	$view_require = $require_reply ? 'require_reply' : ($post_karma ? 'require_karma' : 'require_null');
+	$radiobox     = new \XoopsFormRadio(_MD_NEWBB_VIEW_REQUIRE, 'view_require', $view_require);
+	if ($GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
+		$radiobox->addOption('require_reply', _MD_NEWBB_REQUIRE_REPLY);
+	}
+	if ($GLOBALS['xoopsModuleConfig']['enable_karma']) {
+		$karmas = array_map('trim', explode(',', $GLOBALS['xoopsModuleConfig']['karma_options']));
+		if (count($karmas) > 1) {
+			foreach ($karmas as $karma) {
+				$karma_array[(string)$karma] = (int)$karma;
+			}
+			$karma_select = new \XoopsFormSelect('', 'post_karma', $post_karma);
+			$karma_select->addOptionArray($karma_array);
+			$radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA . $karma_select->render());
+		}
+	}
+	$radiobox->addOption('require_null', _MD_NEWBB_REQUIRE_NULL);
 }
 if (null !== $radiobox) {
-    $forum_form->addElement($radiobox);
+	$forum_form->addElement($radiobox);
 }
 
 if (empty($uid)) {
-    $forum_form->addElement(new \XoopsFormCaptcha());
+	$forum_form->addElement(new \XoopsFormCaptcha());
 }
 
 $forum_form->addElement(new \XoopsFormHidden('pid', @$pid));
@@ -327,20 +327,20 @@ 
 
 $cancel_button = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
 if (!empty($topic_id)) {
-    $extra = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . (int)$topic_id;
+	$extra = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . (int)$topic_id;
 } else {
-    $extra = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $forumObject->getVar('forum_id');
+	$extra = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $forumObject->getVar('forum_id');
 }
 $cancel_button->setExtra("onclick='location=\"" . $extra . "\"'");
 $cancel_button->setExtra("tabindex='6'");
 
 if (!empty($isreply) && !empty($hidden)) {
-    $forum_form->addElement(new \XoopsFormHidden('hidden', $hidden));
+	$forum_form->addElement(new \XoopsFormHidden('hidden', $hidden));
 
-    $quote_button = new \XoopsFormButton('', 'quote', _MD_NEWBB_QUOTE, 'button');
-    $quote_button->setExtra("onclick='xoopsGetElementById(\"message\").value=xoopsGetElementById(\"message\").value+ xoopsGetElementById(\"hidden\").value;xoopsGetElementById(\"hidden\").value=\"\";'");
-    $quote_button->setExtra("tabindex='4'");
-    $button_tray->addElement($quote_button);
+	$quote_button = new \XoopsFormButton('', 'quote', _MD_NEWBB_QUOTE, 'button');
+	$quote_button->setExtra("onclick='xoopsGetElementById(\"message\").value=xoopsGetElementById(\"message\").value+ xoopsGetElementById(\"hidden\").value;xoopsGetElementById(\"hidden\").value=\"\";'");
+	$quote_button->setExtra("tabindex='4'");
+	$button_tray->addElement($quote_button);
 }
 
 $preview_button = new \XoopsFormButton('', 'btn_preview', _PREVIEW, 'button');

include/functions.render.php

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 (isset($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 (isset($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;
+	}
 }

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;

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/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;
     }
 }