mambax7 / newbb5

include/functions.read.php

Indentation +61 added lines, -61 removed lines

@@ -17,75 +17,75 @@
 define('NEWBB_FUNCTIONS_READ_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_READ')) {
-    define('NEWBB_FUNCTIONS_READ', 1);
+	define('NEWBB_FUNCTIONS_READ', 1);
 
-    /**
-     * @param        $type
-     * @param        $item_id
-     * @param        $post_id
-     * @param  null  $uid
-     * @return mixed
-     */
-    function newbbSetRead($type, $item_id, $post_id, $uid = null)
-    {
-        /** @var Newbb\ReadHandler $readHandler */
-        $readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
+	/**
+	 * @param        $type
+	 * @param        $item_id
+	 * @param        $post_id
+	 * @param  null  $uid
+	 * @return mixed
+	 */
+	function newbbSetRead($type, $item_id, $post_id, $uid = null)
+	{
+		/** @var Newbb\ReadHandler $readHandler */
+		$readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
 
-        return $readHandler->setRead($item_id, $post_id, $uid);
-    }
+		return $readHandler->setRead($item_id, $post_id, $uid);
+	}
 
-    /**
-     * @param        $type
-     * @param        $item_id
-     * @param  null  $uid
-     * @return mixed
-     */
-    function newbbGetRead($type, $item_id, $uid = null)
-    {
-        /** @var Newbb\ReadHandler $readHandler */
-        $readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
+	/**
+	 * @param        $type
+	 * @param        $item_id
+	 * @param  null  $uid
+	 * @return mixed
+	 */
+	function newbbGetRead($type, $item_id, $uid = null)
+	{
+		/** @var Newbb\ReadHandler $readHandler */
+		$readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
 
-        return $readHandler->getRead($item_id, $uid);
-    }
+		return $readHandler->getRead($item_id, $uid);
+	}
 
-    /**
-     * @param  int  $status
-     * @param  null $uid
-     * @return mixed
-     */
-    function newbbSetReadForum($status = 0, $uid = null)
-    {
-        /** @var Newbb\ReadForumHandler $readHandler */
-        $readForumHandler = Newbb\Helper::getInstance()->getHandler('Readforum');
+	/**
+	 * @param  int  $status
+	 * @param  null $uid
+	 * @return mixed
+	 */
+	function newbbSetReadForum($status = 0, $uid = null)
+	{
+		/** @var Newbb\ReadForumHandler $readHandler */
+		$readForumHandler = Newbb\Helper::getInstance()->getHandler('Readforum');
 
-        return $readForumHandler->setReadItems($status, $uid);
-    }
+		return $readForumHandler->setReadItems($status, $uid);
+	}
 
-    /**
-     * @param  int  $status
-     * @param  int  $forum_id
-     * @param  null $uid
-     * @return mixed
-     */
-    function newbbSetReadTopic($status = 0, $forum_id = 0, $uid = null)
-    {
-        /** @var Newbb\ReadtopicHandler $readHandler */
-        $readTopicHandler = Newbb\Helper::getInstance()->getHandler('Readtopic');
+	/**
+	 * @param  int  $status
+	 * @param  int  $forum_id
+	 * @param  null $uid
+	 * @return mixed
+	 */
+	function newbbSetReadTopic($status = 0, $forum_id = 0, $uid = null)
+	{
+		/** @var Newbb\ReadtopicHandler $readHandler */
+		$readTopicHandler = Newbb\Helper::getInstance()->getHandler('Readtopic');
 
-        return $readTopicHandler->setReadItems($status, $forum_id, $uid);
-    }
+		return $readTopicHandler->setReadItems($status, $forum_id, $uid);
+	}
 
-    /**
-     * @param        $type
-     * @param        $items
-     * @param  null  $uid
-     * @return mixed
-     */
-    function newbbIsRead($type, &$items, $uid = null)
-    {
-        /** @var Newbb\ReadHandler $readHandler */
-        $readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
+	/**
+	 * @param        $type
+	 * @param        $items
+	 * @param  null  $uid
+	 * @return mixed
+	 */
+	function newbbIsRead($type, &$items, $uid = null)
+	{
+		/** @var Newbb\ReadHandler $readHandler */
+		$readHandler = Newbb\Helper::getInstance()->getHandler('Read'.$type);
 
-        return $readHandler->isReadItems($items, $uid);
-    }
+		return $readHandler->isReadItems($items, $uid);
+	}
 }

Spacing +1 added lines, -1 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_READ_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_READ')) {

include/functions.php

Indentation +7 added lines, -7 removed lines

@@ -15,12 +15,12 @@
 define('NEWBB_FUNCTIONS_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS')) {
-    define('NEWBB_FUNCTIONS', 1);
+	define('NEWBB_FUNCTIONS', 1);
 
-    require_once __DIR__ . '/functions.image.php';
-    require_once __DIR__ . '/functions.user.php';
-    require_once __DIR__ . '/functions.render.php';
-    require_once __DIR__ . '/functions.forum.php';
-    require_once __DIR__ . '/functions.session.php';
-    require_once __DIR__ . '/functions.stats.php';
+	require_once __DIR__ . '/functions.image.php';
+	require_once __DIR__ . '/functions.user.php';
+	require_once __DIR__ . '/functions.render.php';
+	require_once __DIR__ . '/functions.forum.php';
+	require_once __DIR__ . '/functions.session.php';
+	require_once __DIR__ . '/functions.stats.php';
 }

Spacing +7 added lines, -7 removed lines

@@ -11,16 +11,16 @@
 
 // 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_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS')) {
     define('NEWBB_FUNCTIONS', 1);
 
-    require_once __DIR__ . '/functions.image.php';
-    require_once __DIR__ . '/functions.user.php';
-    require_once __DIR__ . '/functions.render.php';
-    require_once __DIR__ . '/functions.forum.php';
-    require_once __DIR__ . '/functions.session.php';
-    require_once __DIR__ . '/functions.stats.php';
+    require_once __DIR__.'/functions.image.php';
+    require_once __DIR__.'/functions.user.php';
+    require_once __DIR__.'/functions.render.php';
+    require_once __DIR__.'/functions.forum.php';
+    require_once __DIR__.'/functions.session.php';
+    require_once __DIR__.'/functions.stats.php';
 }

include/functions.user.php

Indentation +141 added lines, -141 removed lines

@@ -29,10 +29,10 @@ 
  */
 function newbbGetUnameFromIds($uid, $usereal = 0, $linked = false)
 {
-    xoops_load('xoopsuserutility');
-    $ids = \XoopsUserUtility::getUnameFromIds($uid, $usereal, $linked);
+	xoops_load('xoopsuserutility');
+	$ids = \XoopsUserUtility::getUnameFromIds($uid, $usereal, $linked);
 
-    return $ids;
+	return $ids;
 }
 
 /**
@@ -43,9 +43,9 @@ 
  */
 function newbbGetUnameFromId($uid, $usereal = 0, $linked = false)
 {
-    xoops_load('xoopsuserutility');
+	xoops_load('xoopsuserutility');
 
-    return \XoopsUserUtility::getUnameFromId($uid, $usereal, $linked);
+	return \XoopsUserUtility::getUnameFromId($uid, $usereal, $linked);
 }
 
 /**
@@ -57,41 +57,41 @@ 
  */
 function newbbIsAdministrator($user = -1, $mid = 0)
 {
-    global $xoopsModule;
-
-    if (is_numeric($user) && -1 == $user) {
-        $user = $GLOBALS['xoopsUser'];
-    }
-    if (!is_object($user) && (int)$user < 1) {
-        return false;
-    }
-    $uid = is_object($user) ? $user->getVar('uid') : (int)$user;
-
-    if (!$mid) {
-        if (is_object($xoopsModule) && 'newbb' === $xoopsModule->getVar('dirname', 'n')) {
-            $mid = $xoopsModule->getVar('mid', 'n');
-        } else {
-            /** @var \XoopsModuleHandler $moduleHandler */
-            $moduleHandler = xoops_getHandler('module');
-            $newbb_module  = $moduleHandler->getByDirname('newbb');
-            $mid           = $newbb_module->getVar('mid', 'n');
-            unset($newbb_module);
-        }
-    }
-
-    if (is_object($xoopsModule) && is_object($GLOBALS['xoopsUser']) && $mid == $xoopsModule->getVar('mid', 'n')
-        && $uid == $GLOBALS['xoopsUser']->getVar('uid', 'n')) {
-        return $GLOBALS['xoopsUserIsAdmin'];
-    }
-
-    /** @var \XoopsMemberHandler $memberHandler */
-    $memberHandler = xoops_getHandler('member');
-    $groups        = $memberHandler->getGroupsByUser($uid);
-
-    /** @var \XoopsGroupPermHandler $grouppermHandler */
-    $grouppermHandler = xoops_getHandler('groupperm');
-
-    return $grouppermHandler->checkRight('module_admin', $mid, $groups);
+	global $xoopsModule;
+
+	if (is_numeric($user) && -1 == $user) {
+		$user = $GLOBALS['xoopsUser'];
+	}
+	if (!is_object($user) && (int)$user < 1) {
+		return false;
+	}
+	$uid = is_object($user) ? $user->getVar('uid') : (int)$user;
+
+	if (!$mid) {
+		if (is_object($xoopsModule) && 'newbb' === $xoopsModule->getVar('dirname', 'n')) {
+			$mid = $xoopsModule->getVar('mid', 'n');
+		} else {
+			/** @var \XoopsModuleHandler $moduleHandler */
+			$moduleHandler = xoops_getHandler('module');
+			$newbb_module  = $moduleHandler->getByDirname('newbb');
+			$mid           = $newbb_module->getVar('mid', 'n');
+			unset($newbb_module);
+		}
+	}
+
+	if (is_object($xoopsModule) && is_object($GLOBALS['xoopsUser']) && $mid == $xoopsModule->getVar('mid', 'n')
+		&& $uid == $GLOBALS['xoopsUser']->getVar('uid', 'n')) {
+		return $GLOBALS['xoopsUserIsAdmin'];
+	}
+
+	/** @var \XoopsMemberHandler $memberHandler */
+	$memberHandler = xoops_getHandler('member');
+	$groups        = $memberHandler->getGroupsByUser($uid);
+
+	/** @var \XoopsGroupPermHandler $grouppermHandler */
+	$grouppermHandler = xoops_getHandler('groupperm');
+
+	return $grouppermHandler->checkRight('module_admin', $mid, $groups);
 }
 
 /**
@@ -103,24 +103,24 @@ 
  */
 function newbbIsModerator(&$forum, $user = -1)
 {
-    if (!is_object($forum)) {
-        $forum_id = (int)$forum;
-        if (0 == $forum_id) {
-            return false;
-        }
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forum        = $forumHandler->get($forum_id);
-    }
-
-    if (is_numeric($user) && -1 == $user) {
-        $user = $GLOBALS['xoopsUser'];
-    }
-    if (!is_object($user) && (int)$user < 1) {
-        return false;
-    }
-    $uid = is_object($user) ? $user->getVar('uid', 'n') : (int)$user;
-
-    return in_array($uid, $forum->getVar('forum_moderator'), true);
+	if (!is_object($forum)) {
+		$forum_id = (int)$forum;
+		if (0 == $forum_id) {
+			return false;
+		}
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forum        = $forumHandler->get($forum_id);
+	}
+
+	if (is_numeric($user) && -1 == $user) {
+		$user = $GLOBALS['xoopsUser'];
+	}
+	if (!is_object($user) && (int)$user < 1) {
+		return false;
+	}
+	$uid = is_object($user) ? $user->getVar('uid', 'n') : (int)$user;
+
+	return in_array($uid, $forum->getVar('forum_moderator'), true);
 }
 
 /**
@@ -131,31 +131,31 @@ 
  */
 function newbbIsAdmin($forum = 0)
 {
-    global $xoopsModule;
-    static $_cachedModerators;
-
-    if (empty($forum)) {
-        return $GLOBALS['xoopsUserIsAdmin'];
-    }
-
-    if (!is_object($GLOBALS['xoopsUser'])) {
-        return false;
-    }
-
-    if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $xoopsModule->getVar('dirname')) {
-        return true;
-    }
-
-    $cache_id = is_object($forum) ? $forum->getVar('forum_id', 'n') : (int)$forum;
-    if (!isset($_cachedModerators[$cache_id])) {
-        if (!is_object($forum)) {
-            $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-            $forum        = $forumHandler->get((int)$forum);
-        }
-        $_cachedModerators[$cache_id] = $forum->getVar('forum_moderator');
-    }
-
-    return in_array($GLOBALS['xoopsUser']->getVar('uid'), $_cachedModerators[$cache_id]);
+	global $xoopsModule;
+	static $_cachedModerators;
+
+	if (empty($forum)) {
+		return $GLOBALS['xoopsUserIsAdmin'];
+	}
+
+	if (!is_object($GLOBALS['xoopsUser'])) {
+		return false;
+	}
+
+	if ($GLOBALS['xoopsUserIsAdmin'] && 'newbb' === $xoopsModule->getVar('dirname')) {
+		return true;
+	}
+
+	$cache_id = is_object($forum) ? $forum->getVar('forum_id', 'n') : (int)$forum;
+	if (!isset($_cachedModerators[$cache_id])) {
+		if (!is_object($forum)) {
+			$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+			$forum        = $forumHandler->get((int)$forum);
+		}
+		$_cachedModerators[$cache_id] = $forum->getVar('forum_moderator');
+	}
+
+	return in_array($GLOBALS['xoopsUser']->getVar('uid'), $_cachedModerators[$cache_id]);
 }
 
 /* use hardcoded DB query to save queries */
@@ -165,47 +165,47 @@ 
  */
 function newbbIsModuleAdministrators(array $uid = [])
 {
-    global $xoopsModule;
-    $module_administrators = [];
-
-    //    $xoopsMembershipHandler = xoops_getHandler('membership');
-    //    $xoopsMembershipTable   = $xoopsMembershipHandler->table;
-
-    /** @var \XoopsMembershipHandler $xoopsMembershipHandler */
-    $xoopsMembershipHandler = xoops_getHandler('membership');
-    $xoopsMembershipTable   = $xoopsMembershipHandler->table;
-    /** @var \XoopsGroupPermHandler $xoopsGroupPermHandler */
-    $xoopsGroupPermHandler = xoops_getHandler('groupperm');
-    $xoopsGroupPermTable   = $xoopsGroupPermHandler->table;
-
-    if (!(bool)$uid) {
-        return $module_administrators;
-    }
-    $mid = $xoopsModule->getVar('mid');
-
-    $sql = 'SELECT COUNT(l.groupid) AS count, l.uid FROM '
-           . $xoopsMembershipTable
-           . ' AS l'
-           . ' LEFT JOIN '
-           . $xoopsGroupPermTable
-           . ' AS p ON p.gperm_groupid=l.groupid'
-           . ' WHERE l.uid IN ('
-           . implode(', ', array_map('intval', $uid))
-           . ')'
-           . "    AND p.gperm_modid = '1' AND p.gperm_name = 'module_admin' AND p.gperm_itemid = '"
-           . (int)$mid
-           . "'"
-           . ' GROUP BY l.uid';
-
-    if ($result = $GLOBALS['xoopsDB']->query($sql)) {
-        while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
-            if (!empty($myrow['count'])) {
-                $module_administrators[] = $myrow['uid'];
-            }
-        }
-    }
-
-    return $module_administrators;
+	global $xoopsModule;
+	$module_administrators = [];
+
+	//    $xoopsMembershipHandler = xoops_getHandler('membership');
+	//    $xoopsMembershipTable   = $xoopsMembershipHandler->table;
+
+	/** @var \XoopsMembershipHandler $xoopsMembershipHandler */
+	$xoopsMembershipHandler = xoops_getHandler('membership');
+	$xoopsMembershipTable   = $xoopsMembershipHandler->table;
+	/** @var \XoopsGroupPermHandler $xoopsGroupPermHandler */
+	$xoopsGroupPermHandler = xoops_getHandler('groupperm');
+	$xoopsGroupPermTable   = $xoopsGroupPermHandler->table;
+
+	if (!(bool)$uid) {
+		return $module_administrators;
+	}
+	$mid = $xoopsModule->getVar('mid');
+
+	$sql = 'SELECT COUNT(l.groupid) AS count, l.uid FROM '
+		   . $xoopsMembershipTable
+		   . ' AS l'
+		   . ' LEFT JOIN '
+		   . $xoopsGroupPermTable
+		   . ' AS p ON p.gperm_groupid=l.groupid'
+		   . ' WHERE l.uid IN ('
+		   . implode(', ', array_map('intval', $uid))
+		   . ')'
+		   . "    AND p.gperm_modid = '1' AND p.gperm_name = 'module_admin' AND p.gperm_itemid = '"
+		   . (int)$mid
+		   . "'"
+		   . ' GROUP BY l.uid';
+
+	if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+		while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
+			if (!empty($myrow['count'])) {
+				$module_administrators[] = $myrow['uid'];
+			}
+		}
+	}
+
+	return $module_administrators;
 }
 
 /* use hardcoded DB query to save queries */
@@ -216,22 +216,22 @@ 
  */
 function newbbIsForumModerators(array $uid = [], $mid = 0)
 {
-    $forum_moderators = [];
-
-    if (!(bool)$uid) {
-        return $forum_moderators;
-    }
-
-    $sql = 'SELECT forum_moderator FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums');
-    if ($result = $GLOBALS['xoopsDB']->query($sql)) {
-        while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
-            if (empty($myrow['forum_moderator'])) {
-                continue;
-            }
-            $forum_moderators = array_merge($forum_moderators, unserialize($myrow['forum_moderator']));
-        }
-    }
-
-    return array_unique($forum_moderators);
+	$forum_moderators = [];
+
+	if (!(bool)$uid) {
+		return $forum_moderators;
+	}
+
+	$sql = 'SELECT forum_moderator FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums');
+	if ($result = $GLOBALS['xoopsDB']->query($sql)) {
+		while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {
+			if (empty($myrow['forum_moderator'])) {
+				continue;
+			}
+			$forum_moderators = array_merge($forum_moderators, unserialize($myrow['forum_moderator']));
+		}
+	}
+
+	return array_unique($forum_moderators);
 }
 //ENDIF;

include/functions.recon.php

Indentation +38 added lines, -38 removed lines

@@ -17,45 +17,45 @@
 define('NEWBB_FUNCTIONS_RECON_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RECON')) {
-    define('NEWBB_FUNCTIONS_RECON', 1);
+	define('NEWBB_FUNCTIONS_RECON', 1);
 
-    /**
-     * @param  null $type
-     * @return bool
-     */
-    function newbbSynchronization($type = null)
-    {
-        $allTypes = [
-            'category',
-            'forum',
-            'topic',
-            'post',
-            'report',
-            'rate',
-            'moderate',
-            'readtopic',
-            'readforum',
-            'stats'
-        ];
-        $type     = [];
-        $type     = empty($type) ? $allTypes : (is_array($type) ? $type : [$type]);
-        foreach ($type as $item) {
-            $handler = Newbb\Helper::getInstance()->getHandler($item);
-            if ('stats' !== $item) {
-                $handler->synchronization();
-            } else {
-                $handler->reset();
-            }
+	/**
+	 * @param  null $type
+	 * @return bool
+	 */
+	function newbbSynchronization($type = null)
+	{
+		$allTypes = [
+			'category',
+			'forum',
+			'topic',
+			'post',
+			'report',
+			'rate',
+			'moderate',
+			'readtopic',
+			'readforum',
+			'stats'
+		];
+		$type     = [];
+		$type     = empty($type) ? $allTypes : (is_array($type) ? $type : [$type]);
+		foreach ($type as $item) {
+			$handler = Newbb\Helper::getInstance()->getHandler($item);
+			if ('stats' !== $item) {
+				$handler->synchronization();
+			} else {
+				$handler->reset();
+			}
 
-            if (method_exists($handler, 'cleanExpires')) {
-                $handler->cleanExpires();
-            }
-            if (method_exists($handler, 'clearGarbage')) {
-                $handler->clearGarbage();
-            }
-            unset($handler);
-        }
+			if (method_exists($handler, 'cleanExpires')) {
+				$handler->cleanExpires();
+			}
+			if (method_exists($handler, 'clearGarbage')) {
+				$handler->clearGarbage();
+			}
+			unset($handler);
+		}
 
-        return true;
-    }
+		return true;
+	}
 }

Spacing +1 added lines, -1 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_RECON_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RECON')) {

include/module.php

Indentation +131 added lines, -131 removed lines

@@ -33,7 +33,7 @@ 
 use XoopsModules\Newbb;
 
 if (defined('XOOPS_MODULE_NEWBB_FUCTIONS')) {
-    exit();
+	exit();
 }
 define('XOOPS_MODULE_NEWBB_FUCTIONS', 1);
 
@@ -46,46 +46,46 @@ 
  */
 function xoops_module_update_newbb(\XoopsModule $module, $oldversion = null)
 {
-    $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-    $cacheHelper->delete('config');
-
-    $newbbConfig = newbbLoadConfig();
-
-    // remove old html template files
-    // create an array with all folders, and then run this once
-
-    $templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/');
-    $template_list     = array_diff(scandir($templateDirectory, SCANDIR_SORT_NONE), ['..', '.']);
-    foreach ($template_list as $k => $v) {
-        $fileinfo = new \SplFileInfo($templateDirectory . $v);
-        if ('html' === $fileinfo->getExtension() && 'index.html' !== $fileinfo->getFilename()) {
-            @unlink($templateDirectory . $v);
-        }
-    }
-    $templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/blocks');
-    $template_list     = array_diff(scandir($templateDirectory, SCANDIR_SORT_NONE), ['..', '.']);
-    foreach ($template_list as $k => $v) {
-        $fileinfo = new \SplFileInfo($templateDirectory . $v);
-        if ('html' === $fileinfo->getExtension() && 'index.html' !== $fileinfo->getFilename()) {
-            @unlink($templateDirectory . $v);
-        }
-    }
-    // Load class XoopsFile
-    xoops_load('xoopsfile');
-    //remove /images directory
-    $imagesDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/images/');
-    $folderHandler   = \XoopsFile::getHandler('folder', $imagesDirectory);
-    $folderHandler->delete($imagesDirectory);
-
-    //remove old changelogs
-    array_map('unlink', glob(dirname(__DIR__) . '/docs/changelog-rev*.txt'));
-
-    if (!empty($newbbConfig['syncOnUpdate'])) {
-        require_once  dirname(__DIR__) . '/include/functions.recon.php';
-        newbbSynchronization();
-    }
-
-    return true;
+	$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+	$cacheHelper->delete('config');
+
+	$newbbConfig = newbbLoadConfig();
+
+	// remove old html template files
+	// create an array with all folders, and then run this once
+
+	$templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/');
+	$template_list     = array_diff(scandir($templateDirectory, SCANDIR_SORT_NONE), ['..', '.']);
+	foreach ($template_list as $k => $v) {
+		$fileinfo = new \SplFileInfo($templateDirectory . $v);
+		if ('html' === $fileinfo->getExtension() && 'index.html' !== $fileinfo->getFilename()) {
+			@unlink($templateDirectory . $v);
+		}
+	}
+	$templateDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/templates/blocks');
+	$template_list     = array_diff(scandir($templateDirectory, SCANDIR_SORT_NONE), ['..', '.']);
+	foreach ($template_list as $k => $v) {
+		$fileinfo = new \SplFileInfo($templateDirectory . $v);
+		if ('html' === $fileinfo->getExtension() && 'index.html' !== $fileinfo->getFilename()) {
+			@unlink($templateDirectory . $v);
+		}
+	}
+	// Load class XoopsFile
+	xoops_load('xoopsfile');
+	//remove /images directory
+	$imagesDirectory = $GLOBALS['xoops']->path('modules/' . $module->getVar('dirname', 'n') . '/images/');
+	$folderHandler   = \XoopsFile::getHandler('folder', $imagesDirectory);
+	$folderHandler->delete($imagesDirectory);
+
+	//remove old changelogs
+	array_map('unlink', glob(dirname(__DIR__) . '/docs/changelog-rev*.txt'));
+
+	if (!empty($newbbConfig['syncOnUpdate'])) {
+		require_once  dirname(__DIR__) . '/include/functions.recon.php';
+		newbbSynchronization();
+	}
+
+	return true;
 }
 
 /**
@@ -94,11 +94,11 @@ 
  */
 function xoops_module_pre_update_newbb(\XoopsModule $module)
 {
-    XoopsLoad::load('migrate', 'newbb');
-    $newbbMigrate = new Newbb\Migrate();
-    $newbbMigrate->synchronizeSchema();
+	XoopsLoad::load('migrate', 'newbb');
+	$newbbMigrate = new Newbb\Migrate();
+	$newbbMigrate->synchronizeSchema();
 
-    return true;
+	return true;
 }
 
 /**
@@ -107,12 +107,12 @@ 
  */
 function xoops_module_pre_install_newbb(\XoopsModule $module)
 {
-    $mod_tables =& $module->getInfo('tables');
-    foreach ($mod_tables as $table) {
-        $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
-    }
+	$mod_tables =& $module->getInfo('tables');
+	foreach ($mod_tables as $table) {
+		$GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+	}
 
-    return true;
+	return true;
 }
 
 /**
@@ -121,85 +121,85 @@ 
  */
 function xoops_module_install_newbb(\XoopsModule $module)
 {
-    /* Create a test category */
-    /** @var Newbb\CategoryHandler $categoryHandler */
-    $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
-    $category        = $categoryHandler->create();
-    $category->setVar('cat_title', _MI_NEWBB_INSTALL_CAT_TITLE, true);
-    $category->setVar('cat_image', '', true);
-    $category->setVar('cat_description', _MI_NEWBB_INSTALL_CAT_DESC, true);
-    $category->setVar('cat_url', 'https://xoops.org XOOPS Project', true);
-    if (!$cat_id = $categoryHandler->insert($category)) {
-        return true;
-    }
-
-    /* Create a forum for test */
-    /** @var Newbb\ForumHandler $forumHandler */
-    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-    $forum        = $forumHandler->create();
-    $forum->setVar('forum_name', _MI_NEWBB_INSTALL_FORUM_NAME, true);
-    $forum->setVar('forum_desc', _MI_NEWBB_INSTALL_FORUM_DESC, true);
-    $forum->setVar('forum_moderator', []);
-    $forum->setVar('parent_forum', 0);
-    $forum->setVar('cat_id', $cat_id);
-    $forum->setVar('attach_maxkb', 100);
-    $forum->setVar('attach_ext', 'zip|jpg|gif|png');
-    $forum->setVar('hot_threshold', 20);
-    $forum_id = $forumHandler->insert($forum);
-
-    /* Set corresponding permissions for the category and the forum */
-    $module_id = $module->getVar('mid');
-    /** @var XoopsGroupPermHandler $grouppermHandler */
-    $grouppermHandler = xoops_getHandler('groupperm');
-    $groups_view  = [XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS];
-    $groups_post  = [XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS];
-    // irmtfan bug fix: html and signature permissions, add: pdf and print permissions
-    $post_items = [
-        'post',
-        'reply',
-        'edit',
-        'delete',
-        'addpoll',
-        'vote',
-        'attach',
-        'noapprove',
-        'type',
-        'html',
-        'signature',
-        'pdf',
-        'print'
-    ];
-    foreach ($groups_view as $group_id) {
-        $grouppermHandler->addRight('category_access', $cat_id, $group_id, $module_id);
-        $grouppermHandler->addRight('forum_access', $forum_id, $group_id, $module_id);
-        $grouppermHandler->addRight('forum_view', $forum_id, $group_id, $module_id);
-    }
-    foreach ($groups_post as $group_id) {
-        foreach ($post_items as $item) {
-            $grouppermHandler->addRight('forum_' . $item, $forum_id, $group_id, $module_id);
-        }
-    }
-
-    /* Create a test post */
-    require_once __DIR__ . '/functions.user.php';
-    /** @var Newbb\PostHandler $postHandler */
-    $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-    /** @var  $forumpost */
-    $forumpost = $postHandler->create();
-    $forumpost->setVar('poster_ip', \Xmf\IPAddress::fromRequest()->asReadable());
-    $forumpost->setVar('uid', $GLOBALS['xoopsUser']->getVar('uid'));
-    $forumpost->setVar('approved', 1);
-    $forumpost->setVar('forum_id', $forum_id);
-    $forumpost->setVar('subject', _MI_NEWBB_INSTALL_POST_SUBJECT, true);
-    $forumpost->setVar('dohtml', 1);
-    $forumpost->setVar('dosmiley', 1);
-    $forumpost->setVar('doxcode', 1);
-    $forumpost->setVar('dobr', 1);
-    $forumpost->setVar('icon', '', true);
-    $forumpost->setVar('attachsig', 1);
-    $forumpost->setVar('post_time', time());
-    $forumpost->setVar('post_text', _MI_NEWBB_INSTALL_POST_TEXT, true);
-    $postid = $postHandler->insert($forumpost);
-
-    return true;
+	/* Create a test category */
+	/** @var Newbb\CategoryHandler $categoryHandler */
+	$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
+	$category        = $categoryHandler->create();
+	$category->setVar('cat_title', _MI_NEWBB_INSTALL_CAT_TITLE, true);
+	$category->setVar('cat_image', '', true);
+	$category->setVar('cat_description', _MI_NEWBB_INSTALL_CAT_DESC, true);
+	$category->setVar('cat_url', 'https://xoops.org XOOPS Project', true);
+	if (!$cat_id = $categoryHandler->insert($category)) {
+		return true;
+	}
+
+	/* Create a forum for test */
+	/** @var Newbb\ForumHandler $forumHandler */
+	$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+	$forum        = $forumHandler->create();
+	$forum->setVar('forum_name', _MI_NEWBB_INSTALL_FORUM_NAME, true);
+	$forum->setVar('forum_desc', _MI_NEWBB_INSTALL_FORUM_DESC, true);
+	$forum->setVar('forum_moderator', []);
+	$forum->setVar('parent_forum', 0);
+	$forum->setVar('cat_id', $cat_id);
+	$forum->setVar('attach_maxkb', 100);
+	$forum->setVar('attach_ext', 'zip|jpg|gif|png');
+	$forum->setVar('hot_threshold', 20);
+	$forum_id = $forumHandler->insert($forum);
+
+	/* Set corresponding permissions for the category and the forum */
+	$module_id = $module->getVar('mid');
+	/** @var XoopsGroupPermHandler $grouppermHandler */
+	$grouppermHandler = xoops_getHandler('groupperm');
+	$groups_view  = [XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS];
+	$groups_post  = [XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS];
+	// irmtfan bug fix: html and signature permissions, add: pdf and print permissions
+	$post_items = [
+		'post',
+		'reply',
+		'edit',
+		'delete',
+		'addpoll',
+		'vote',
+		'attach',
+		'noapprove',
+		'type',
+		'html',
+		'signature',
+		'pdf',
+		'print'
+	];
+	foreach ($groups_view as $group_id) {
+		$grouppermHandler->addRight('category_access', $cat_id, $group_id, $module_id);
+		$grouppermHandler->addRight('forum_access', $forum_id, $group_id, $module_id);
+		$grouppermHandler->addRight('forum_view', $forum_id, $group_id, $module_id);
+	}
+	foreach ($groups_post as $group_id) {
+		foreach ($post_items as $item) {
+			$grouppermHandler->addRight('forum_' . $item, $forum_id, $group_id, $module_id);
+		}
+	}
+
+	/* Create a test post */
+	require_once __DIR__ . '/functions.user.php';
+	/** @var Newbb\PostHandler $postHandler */
+	$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+	/** @var  $forumpost */
+	$forumpost = $postHandler->create();
+	$forumpost->setVar('poster_ip', \Xmf\IPAddress::fromRequest()->asReadable());
+	$forumpost->setVar('uid', $GLOBALS['xoopsUser']->getVar('uid'));
+	$forumpost->setVar('approved', 1);
+	$forumpost->setVar('forum_id', $forum_id);
+	$forumpost->setVar('subject', _MI_NEWBB_INSTALL_POST_SUBJECT, true);
+	$forumpost->setVar('dohtml', 1);
+	$forumpost->setVar('dosmiley', 1);
+	$forumpost->setVar('doxcode', 1);
+	$forumpost->setVar('dobr', 1);
+	$forumpost->setVar('icon', '', true);
+	$forumpost->setVar('attachsig', 1);
+	$forumpost->setVar('post_time', time());
+	$forumpost->setVar('post_text', _MI_NEWBB_INSTALL_POST_TEXT, true);
+	$postid = $postHandler->insert($forumpost);
+
+	return true;
 }

Spacing +13 added lines, -13 removed lines

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

include/plugin.php

Indentation +3 added lines, -3 removed lines

@@ -74,9 +74,9 @@
 // MENU handler
 /* You could remove anyone by commenting out in order to disable it */
 $customConfig['valid_menumodes'] = [
-    0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
-    //1 => _MD_NEWBB_MENU_CLICK,    // for "click to expand"
-    //2 => _MD_NEWBB_MENU_HOVER        // for "mouse hover to expand"
+	0 => _MD_NEWBB_MENU_SELECT,    // for selectbox
+	//1 => _MD_NEWBB_MENU_CLICK,    // for "click to expand"
+	//2 => _MD_NEWBB_MENU_HOVER        // for "mouse hover to expand"
 ];
 
 // view latest edit

include/config.php

Indentation +54 added lines, -54 removed lines

@@ -22,8 +22,8 @@ 
 
 $moduleDirName = basename(dirname(__DIR__));
 $uploadFolders = [
-    NEWBB_UPLOAD_PATH,
-    NEWBB_UPLOAD_PATH . '/thumbs'
+	NEWBB_UPLOAD_PATH,
+	NEWBB_UPLOAD_PATH . '/thumbs'
 ];
 
 /**
@@ -31,61 +31,61 @@ 
  */
 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',
-        ],
-        'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
+		],
+		'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',
+		],
+		'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

@@ -23,7 +23,7 @@ 
 $moduleDirName = basename(dirname(__DIR__));
 $uploadFolders = [
     NEWBB_UPLOAD_PATH,
-    NEWBB_UPLOAD_PATH . '/thumbs'
+    NEWBB_UPLOAD_PATH.'/thumbs'
 ];
 
 /**
@@ -34,24 +34,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'
         ],
 
@@ -86,6 +86,6 @@ 
             '/images',
         ],
         'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>',
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG').'\' alt=\'XOOPS Project\' /></a>',
     ];
 }

include/functions.rpc.php

Indentation +30 added lines, -30 removed lines

@@ -15,36 +15,36 @@
 define('NEWBB_FUNCTIONS_RPC_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RPC')) {
-    define('NEWBB_FUNCTIONS_RPC', 1);
+	define('NEWBB_FUNCTIONS_RPC', 1);
 
-    /**
-     * Function to respond to a trackback
-     * @param int    $error
-     * @param string $error_message
-     */
-    function newbbTrackbackResponse($error = 0, $error_message = '')
-    {
-        $moduleConfig = newbbLoadConfig();
+	/**
+	 * Function to respond to a trackback
+	 * @param int    $error
+	 * @param string $error_message
+	 */
+	function newbbTrackbackResponse($error = 0, $error_message = '')
+	{
+		$moduleConfig = newbbLoadConfig();
 
-        if (!empty($moduleConfig['rss_utf8'])) {
-            $charset       = 'utf-8';
-            $error_message = xoops_utf8_encode($error_message);
-        } else {
-            $charset = _CHARSET;
-        }
-        header('Content-Type: text/xml; charset="' . $charset . '"');
-        if ($error) {
-            echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
-            echo '<response>\n';
-            echo '<error>1</error>\n';
-            echo '<message>$error_message</message>\n';
-            echo '</response>';
-            exit();
-        } else {
-            echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
-            echo '<response>\n';
-            echo '<error>0</error>\n';
-            echo '</response>';
-        }
-    }
+		if (!empty($moduleConfig['rss_utf8'])) {
+			$charset       = 'utf-8';
+			$error_message = xoops_utf8_encode($error_message);
+		} else {
+			$charset = _CHARSET;
+		}
+		header('Content-Type: text/xml; charset="' . $charset . '"');
+		if ($error) {
+			echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+			echo '<response>\n';
+			echo '<error>1</error>\n';
+			echo '<message>$error_message</message>\n';
+			echo '</response>';
+			exit();
+		} else {
+			echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+			echo '<response>\n';
+			echo '<error>0</error>\n';
+			echo '</response>';
+		}
+	}
 }

Spacing +4 added lines, -4 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_RPC_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RPC')) {
@@ -32,16 +32,16 @@ 
         } else {
             $charset = _CHARSET;
         }
-        header('Content-Type: text/xml; charset="' . $charset . '"');
+        header('Content-Type: text/xml; charset="'.$charset.'"');
         if ($error) {
-            echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+            echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n";
             echo '<response>\n';
             echo '<error>1</error>\n';
             echo '<message>$error_message</message>\n';
             echo '</response>';
             exit();
         } else {
-            echo '<?xml version="1.0" encoding="' . $charset . '"?' . ">\n";
+            echo '<?xml version="1.0" encoding="'.$charset.'"?'.">\n";
             echo '<response>\n';
             echo '<error>0</error>\n';
             echo '</response>';

include/functions.welcome.inc.php

Indentation +74 added lines, -74 removed lines

@@ -14,8 +14,8 @@ 
 global $xoopsModule, $myts, $xoopsUser, $forumObject;
 
 if (!defined('XOOPS_ROOT_PATH') || !is_object($forumObject) || !is_object($GLOBALS['xoopsUser'])
-    || !is_object($xoopsModule)) {
-    return;
+	|| !is_object($xoopsModule)) {
+	return;
 }
 
 $forum_id    = $forumObject->getVar('forum_id');
@@ -41,67 +41,67 @@ 
 /** @var \XoopsModuleHandler $moduleHandler */
 $moduleHandler = xoops_getHandler('module');
 if ($mod = @$moduleHandler->getByDirname('profile', true)) {
-    $grouppermHandler = xoops_getHandler('groupperm');
-    $groups       = [XOOPS_GROUP_ANONYMOUS, XOOPS_GROUP_USERS];
+	$grouppermHandler = xoops_getHandler('groupperm');
+	$groups       = [XOOPS_GROUP_ANONYMOUS, XOOPS_GROUP_USERS];
 
-    if (!defined('_PROFILE_MA_ALLABOUT')) {
-        $mod->loadLanguage();
-    }
-    /** var Newbb\PermissionHandler $permHandler */
-    $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-    $show_ids    = $permHandler->getItemIds('profile_show', $groups, $mod->getVar('mid'));
-    $visible_ids = $permHandler->getItemIds('profile_visible', $groups, $mod->getVar('mid'));
-    unset($mod);
-    $fieldids = array_intersect($show_ids, $visible_ids);
-    /** @var \ProfileProfileHandler $profileHandler */
-    $profileHandler = xoops_getModuleHandler('profile', 'profile');
-    $fields         = $profileHandler->loadFields();
-    /** @var \ProfileCategoryHandler $catHandler */
-    $catHandler = xoops_getModuleHandler('category', 'profile');
-    $categories = $catHandler->getObjects(null, true, false);
-    /** @var \ProfileFieldHandler $fieldcatHandler */
-    $fieldcatHandler = xoops_getModuleHandler('category', 'profile');
-    $fieldcats       = $fieldcatHandler->getObjects(null, true, false);
+	if (!defined('_PROFILE_MA_ALLABOUT')) {
+		$mod->loadLanguage();
+	}
+	/** var Newbb\PermissionHandler $permHandler */
+	$permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+	$show_ids    = $permHandler->getItemIds('profile_show', $groups, $mod->getVar('mid'));
+	$visible_ids = $permHandler->getItemIds('profile_visible', $groups, $mod->getVar('mid'));
+	unset($mod);
+	$fieldids = array_intersect($show_ids, $visible_ids);
+	/** @var \ProfileProfileHandler $profileHandler */
+	$profileHandler = xoops_getModuleHandler('profile', 'profile');
+	$fields         = $profileHandler->loadFields();
+	/** @var \ProfileCategoryHandler $catHandler */
+	$catHandler = xoops_getModuleHandler('category', 'profile');
+	$categories = $catHandler->getObjects(null, true, false);
+	/** @var \ProfileFieldHandler $fieldcatHandler */
+	$fieldcatHandler = xoops_getModuleHandler('category', 'profile');
+	$fieldcats       = $fieldcatHandler->getObjects(null, true, false);
 
-    // Add core fields
-    $categories[0]['cat_title'] = sprintf(_MD_NEWBB_AUTO_CREATE_ABOUT, $GLOBALS['xoopsUser']->getVar('uname'));
-    $avatar                     = trim($GLOBALS['xoopsUser']->getVar('user_avatar'));
-    if (!empty($avatar) && 'blank.gif' !== $avatar) {
-        $categories[0]['fields'][] = [
-            'title' => _MD_NEWBB_AUTO_CREATE_AVATARS,
-            'value' => "<img src='" . XOOPS_UPLOAD_URL . '/' . $GLOBALS['xoopsUser']->getVar('user_avatar') . "' alt='" . $GLOBALS['xoopsUser']->getVar('uname') . "' />"
-        ];
-        $weights[0][]              = 0;
-    }
-    if (1 == $GLOBALS['xoopsUser']->getVar('user_viewemail')) {
-        $email                     = $GLOBALS['xoopsUser']->getVar('email', 'E');
-        $categories[0]['fields'][] = ['title' => _MD_NEWBB_AUTO_CREATE_EMAIL, 'value' => $email];
-        $weights[0][]              = 0;
-    }
+	// Add core fields
+	$categories[0]['cat_title'] = sprintf(_MD_NEWBB_AUTO_CREATE_ABOUT, $GLOBALS['xoopsUser']->getVar('uname'));
+	$avatar                     = trim($GLOBALS['xoopsUser']->getVar('user_avatar'));
+	if (!empty($avatar) && 'blank.gif' !== $avatar) {
+		$categories[0]['fields'][] = [
+			'title' => _MD_NEWBB_AUTO_CREATE_AVATARS,
+			'value' => "<img src='" . XOOPS_UPLOAD_URL . '/' . $GLOBALS['xoopsUser']->getVar('user_avatar') . "' alt='" . $GLOBALS['xoopsUser']->getVar('uname') . "' />"
+		];
+		$weights[0][]              = 0;
+	}
+	if (1 == $GLOBALS['xoopsUser']->getVar('user_viewemail')) {
+		$email                     = $GLOBALS['xoopsUser']->getVar('email', 'E');
+		$categories[0]['fields'][] = ['title' => _MD_NEWBB_AUTO_CREATE_EMAIL, 'value' => $email];
+		$weights[0][]              = 0;
+	}
 
-    // Add dynamic fields
-    foreach (array_keys($fields) as $i) {
-        if (in_array($fields[$i]->getVar('fieldid'), $fieldids)) {
-            $catid = isset($fieldcats[$fields[$i]->getVar('fieldid')]) ? $fieldcats[$fields[$i]->getVar('fieldid')]['catid'] : 0;
-            $value = $fields[$i]->getOutputValue($GLOBALS['xoopsUser']);
-            if (is_array($value)) {
-                $value = implode('<br>', array_values($value));
-            }
+	// Add dynamic fields
+	foreach (array_keys($fields) as $i) {
+		if (in_array($fields[$i]->getVar('fieldid'), $fieldids)) {
+			$catid = isset($fieldcats[$fields[$i]->getVar('fieldid')]) ? $fieldcats[$fields[$i]->getVar('fieldid')]['catid'] : 0;
+			$value = $fields[$i]->getOutputValue($GLOBALS['xoopsUser']);
+			if (is_array($value)) {
+				$value = implode('<br>', array_values($value));
+			}
 
-            if (empty($value)) {
-                continue;
-            }
-            $categories[$catid]['fields'][] = ['title' => $fields[$i]->getVar('field_title'), 'value' => $value];
-            $weights[$catid][]              = isset($fieldcats[$fields[$i]->getVar('fieldid')]) ? (int)$fieldcats[$fields[$i]->getVar('fieldid')]['field_weight'] : 1;
-        }
-    }
+			if (empty($value)) {
+				continue;
+			}
+			$categories[$catid]['fields'][] = ['title' => $fields[$i]->getVar('field_title'), 'value' => $value];
+			$weights[$catid][]              = isset($fieldcats[$fields[$i]->getVar('fieldid')]) ? (int)$fieldcats[$fields[$i]->getVar('fieldid')]['field_weight'] : 1;
+		}
+	}
 
-    foreach (array_keys($categories) as $i) {
-        if (isset($categories[$i]['fields'])) {
-            array_multisort($weights[$i], SORT_ASC, array_keys($categories[$i]['fields']), SORT_ASC, $categories[$i]['fields']);
-        }
-    }
-    ksort($categories);
+	foreach (array_keys($categories) as $i) {
+		if (isset($categories[$i]['fields'])) {
+			array_multisort($weights[$i], SORT_ASC, array_keys($categories[$i]['fields']), SORT_ASC, $categories[$i]['fields']);
+		}
+	}
+	ksort($categories);
 }
 
 $message = sprintf(_MD_NEWBB_WELCOME_MESSAGE, $GLOBALS['xoopsUser']->getVar('uname')) . "\n\n";
@@ -123,20 +123,20 @@ 
 $post_id = $postHandler->insert($postObject);
 
 if (!empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
-    $tags                = [];
-    $tags['THREAD_NAME'] = $subject;
-    $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '&amp;topic_id=' . $postObject->getVar('topic_id') . '&amp;forum=' . $forum_id;
-    $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post_id;
-    require_once __DIR__ . '/notification.inc.php';
-    $forum_info         = newbb_notify_iteminfo('forum', $forum_id);
-    $tags['FORUM_NAME'] = $forum_info['name'];
-    $tags['FORUM_URL']  = $forum_info['url'];
-    /** @var \XoopsNotificationHandler $notificationHandler */
-    $notificationHandler = xoops_getHandler('notification');
-    $notificationHandler->triggerEvent('forum', $forum_id, 'new_thread', $tags);
-    $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
-    $notificationHandler->triggerEvent('forum', $forum_id, 'new_post', $tags);
-    $tags['POST_CONTENT'] = $message;
-    $tags['POST_NAME']    = $subject;
-    $notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
+	$tags                = [];
+	$tags['THREAD_NAME'] = $subject;
+	$tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?post_id=' . $post_id . '&amp;topic_id=' . $postObject->getVar('topic_id') . '&amp;forum=' . $forum_id;
+	$tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post_id;
+	require_once __DIR__ . '/notification.inc.php';
+	$forum_info         = newbb_notify_iteminfo('forum', $forum_id);
+	$tags['FORUM_NAME'] = $forum_info['name'];
+	$tags['FORUM_URL']  = $forum_info['url'];
+	/** @var \XoopsNotificationHandler $notificationHandler */
+	$notificationHandler = xoops_getHandler('notification');
+	$notificationHandler->triggerEvent('forum', $forum_id, 'new_thread', $tags);
+	$notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
+	$notificationHandler->triggerEvent('forum', $forum_id, 'new_post', $tags);
+	$tags['POST_CONTENT'] = $message;
+	$tags['POST_NAME']    = $subject;
+	$notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
 }

Spacing +6 added lines, -6 removed lines

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