mambax7 / newbb5

include/functions.forum.php

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

include/config.php

Indentation +74 added lines, -74 removed lines

@@ -21,8 +21,8 @@ 
 
 $moduleDirName = basename(dirname(__DIR__));
 $uploadFolders = [
-    NEWBB_UPLOAD_PATH,
-    NEWBB_UPLOAD_PATH . '/thumbs'
+	NEWBB_UPLOAD_PATH,
+	NEWBB_UPLOAD_PATH . '/thumbs'
 ];
 
 /**
@@ -30,83 +30,83 @@ 
  */
 function getConfig()
 {
-    $moduleDirName      = basename(dirname(__DIR__));
-    $moduleDirNameUpper = strtoupper($moduleDirName);
-    return (object)[
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
-        'paths'          => [
-            'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
-        ],
-        'uploadFolders'  => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/thumbs',
+	$moduleDirName      = basename(dirname(__DIR__));
+	$moduleDirNameUpper = strtoupper($moduleDirName);
+	return (object)[
+		'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+		'paths'          => [
+			'dirname'    => $moduleDirName,
+			'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+			'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+			'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
+			'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+			'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+		],
+		'uploadFolders'  => [
+			constant($moduleDirNameUpper . '_UPLOAD_PATH'),
+			constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/thumbs',
 
-            //XOOPS_UPLOAD_PATH . '/flags'
-        ],
-        'copyBlankFiles' => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/thumbs',
-            //XOOPS_UPLOAD_PATH . '/flags'
-        ],
+			//XOOPS_UPLOAD_PATH . '/flags'
+		],
+		'copyBlankFiles' => [
+			constant($moduleDirNameUpper . '_UPLOAD_PATH'),
+			constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/thumbs',
+			//XOOPS_UPLOAD_PATH . '/flags'
+		],
 
-        'copyTestFolders' => [
-            //        constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            //[
-            //    constant($moduleDirNameUpper . '_PATH') . '/testdata/images',
-            //    constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/images',
-            //]
-        ],
+		'copyTestFolders' => [
+			//        constant($moduleDirNameUpper . '_UPLOAD_PATH'),
+			//[
+			//    constant($moduleDirNameUpper . '_PATH') . '/testdata/images',
+			//    constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/images',
+			//]
+		],
 
-        'templateFolders' => [
-            '/templates/',
-            '/templates/blocks/',
-            '/templates/admin/'
+		'templateFolders' => [
+			'/templates/',
+			'/templates/blocks/',
+			'/templates/admin/'
 
-        ],
-        'oldFiles'        => [
-            '/class/request.php',
-            '/class/registry.php',
-            '/class/utilities.php',
-            '/class/util.php',
-            // '/include/constants.php',
-            // '/include/functions.php',
-            '/ajaxrating.txt',
-        ],
-        'oldFolders'      => [
-            '/images',
-            '/css',
-            '/js',
-            '/tcpdf',
-            '/images',
-        ],
+		],
+		'oldFiles'        => [
+			'/class/request.php',
+			'/class/registry.php',
+			'/class/utilities.php',
+			'/class/util.php',
+			// '/include/constants.php',
+			// '/include/functions.php',
+			'/ajaxrating.txt',
+		],
+		'oldFolders'      => [
+			'/images',
+			'/css',
+			'/js',
+			'/tcpdf',
+			'/images',
+		],
 
-        'renameTables' => [
-            'bb_archive'     => 'newbb_archive',
-            'bb_categories'  => 'newbb_categories',
-            'bb_votedata'    => 'newbb_votedata',
-            'bb_forums'      => 'newbb_forums',
-            'bb_posts'       => 'newbb_posts',
-            'bb_posts_text'  => 'newbb_posts_text',
-            'bb_topics'      => 'newbb_topics',
-            'bb_online'      => 'newbb_online',
-            'bb_digest'      => 'newbb_digest',
-            'bb_report'      => 'newbb_report',
-            'bb_attachments' => 'newbb_attachments',
-            'bb_moderates'   => 'newbb_moderates',
-            'bb_reads_forum' => 'newbb_reads_forum',
-            'bb_reads_topic' => 'newbb_reads_topic',
-            'bb_type'        => 'newbb_type',
-            'bb_type_forum'  => 'newbb_type_forum',
-            'bb_stats'       => 'newbb_stats',
-            'bb_user_stats'  => 'newbb_user_stats',
-        ],
+		'renameTables' => [
+			'bb_archive'     => 'newbb_archive',
+			'bb_categories'  => 'newbb_categories',
+			'bb_votedata'    => 'newbb_votedata',
+			'bb_forums'      => 'newbb_forums',
+			'bb_posts'       => 'newbb_posts',
+			'bb_posts_text'  => 'newbb_posts_text',
+			'bb_topics'      => 'newbb_topics',
+			'bb_online'      => 'newbb_online',
+			'bb_digest'      => 'newbb_digest',
+			'bb_report'      => 'newbb_report',
+			'bb_attachments' => 'newbb_attachments',
+			'bb_moderates'   => 'newbb_moderates',
+			'bb_reads_forum' => 'newbb_reads_forum',
+			'bb_reads_topic' => 'newbb_reads_topic',
+			'bb_type'        => 'newbb_type',
+			'bb_type_forum'  => 'newbb_type_forum',
+			'bb_stats'       => 'newbb_stats',
+			'bb_user_stats'  => 'newbb_user_stats',
+		],
 
-        'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
+		'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
                      <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>',
-    ];
+	];
 }

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
 $moduleDirName = basename(dirname(__DIR__));
 $uploadFolders = [
     NEWBB_UPLOAD_PATH,
-    NEWBB_UPLOAD_PATH . '/thumbs'
+    NEWBB_UPLOAD_PATH.'/thumbs'
 ];
 
 /**
@@ -33,24 +33,24 @@ 
     $moduleDirName      = basename(dirname(__DIR__));
     $moduleDirNameUpper = strtoupper($moduleDirName);
     return (object)[
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+        'name'           => strtoupper($moduleDirName).' Module Configurator',
         'paths'          => [
             'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
         ],
         'uploadFolders'  => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/thumbs',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/thumbs',
 
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
         'copyBlankFiles' => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/thumbs',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/thumbs',
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
 
@@ -107,6 +107,6 @@ 
         ],
 
         'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>',
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG').'\' alt=\'XOOPS Project\' /></a>',
     ];
 }

include/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 (null !== $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 (null !== $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/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 (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;
+	}
 }