mambax7 / newbb5

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

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/sitemap.plugin.php

Indentation +76 added lines, -76 removed lines

@@ -13,89 +13,89 @@
  */
 function b_sitemap_newbb()
 {
-    global $sitemap_configs;
-    $sitemap = [];
+	global $sitemap_configs;
+	$sitemap = [];
 
-    /** @var Newbb\ForumHandler $forumHandler */
-    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-    /* Allowed forums */
-    $forums_allowed = $forumHandler->getIdsByPermission();
+	/** @var Newbb\ForumHandler $forumHandler */
+	$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+	/* Allowed forums */
+	$forums_allowed = $forumHandler->getIdsByPermission();
 
-    /* fetch top forums */
-    $forums_top_id = [];
-    if (!empty($forums_allowed)) {
-        $crit_top = new \CriteriaCompo(new \Criteria('parent_forum', 0));
-        //$crit_top->add(new \Criteria("cat_id", "(".implode(", ", array_keys($categories)).")", "IN"));
-        $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
-        $forums_top_id = $forumHandler->getIds($crit_top);
-    }
+	/* fetch top forums */
+	$forums_top_id = [];
+	if (!empty($forums_allowed)) {
+		$crit_top = new \CriteriaCompo(new \Criteria('parent_forum', 0));
+		//$crit_top->add(new \Criteria("cat_id", "(".implode(", ", array_keys($categories)).")", "IN"));
+		$crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+		$forums_top_id = $forumHandler->getIds($crit_top);
+	}
 
-    $forums_sub_id = [];
-    if ((bool)$forums_top_id && $sitemap_configs['show_subcategoris']) {
-        $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '(' . implode(', ', $forums_top_id) . ')', 'IN'));
-        $crit_sub->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
-        $forums_sub_id = $forumHandler->getIds($crit_sub);
-    }
+	$forums_sub_id = [];
+	if ((bool)$forums_top_id && $sitemap_configs['show_subcategoris']) {
+		$crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '(' . implode(', ', $forums_top_id) . ')', 'IN'));
+		$crit_sub->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+		$forums_sub_id = $forumHandler->getIds($crit_sub);
+	}
 
-    /* Fetch forum data */
-    $forums_available = array_merge($forums_top_id, $forums_sub_id);
-    $forums_array     = [];
-    if ((bool)$forums_available) {
-        $crit_forum = new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN');
-        $crit_forum->setSort('cat_id ASC, parent_forum ASC, forum_order');
-        $crit_forum->setOrder('ASC');
-        $forums_array = $forumHandler->getAll($crit_forum, ['forum_name', 'parent_forum', 'cat_id'], false);
-    }
+	/* Fetch forum data */
+	$forums_available = array_merge($forums_top_id, $forums_sub_id);
+	$forums_array     = [];
+	if ((bool)$forums_available) {
+		$crit_forum = new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN');
+		$crit_forum->setSort('cat_id ASC, parent_forum ASC, forum_order');
+		$crit_forum->setOrder('ASC');
+		$forums_array = $forumHandler->getAll($crit_forum, ['forum_name', 'parent_forum', 'cat_id'], false);
+	}
 
-    $forums = [];
-    foreach ($forums_array as $forumid => $forum) {
-        if ((bool)$forum['parent_forum']) {
-            $forums[$forum['parent_forum']]['fchild'][$forumid] = [
-                'id'    => $forumid,
-                'url'   => 'viewforum.php?forum=' . $forumid,
-                'title' => $forum['forum_name']
-            ];
-        } else {
-            $forums[$forumid] = [
-                'id'    => $forumid,
-                'cid'   => $forum['cat_id'],
-                'url'   => 'viewforum.php?forum=' . $forumid,
-                'title' => $forum['forum_name']
-            ];
-        }
-    }
+	$forums = [];
+	foreach ($forums_array as $forumid => $forum) {
+		if ((bool)$forum['parent_forum']) {
+			$forums[$forum['parent_forum']]['fchild'][$forumid] = [
+				'id'    => $forumid,
+				'url'   => 'viewforum.php?forum=' . $forumid,
+				'title' => $forum['forum_name']
+			];
+		} else {
+			$forums[$forumid] = [
+				'id'    => $forumid,
+				'cid'   => $forum['cat_id'],
+				'url'   => 'viewforum.php?forum=' . $forumid,
+				'title' => $forum['forum_name']
+			];
+		}
+	}
 
-    if ($sitemap_configs['show_subcategoris']) {
-        /** @var Newbb\CategoryHandler $categoryHandler */
-        $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
-        $categories      = [];
-        $categories      = $categoryHandler->getByPermission('access', ['cat_id', 'cat_title'], false);
+	if ($sitemap_configs['show_subcategoris']) {
+		/** @var Newbb\CategoryHandler $categoryHandler */
+		$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
+		$categories      = [];
+		$categories      = $categoryHandler->getByPermission('access', ['cat_id', 'cat_title'], false);
 
-        foreach ($categories as $key => $category) {
-            $cat_id                         = $category['cat_id'];
-            $i                              = $cat_id;
-            $sitemap['parent'][$i]['id']    = $cat_id;
-            $sitemap['parent'][$i]['title'] = $category['cat_title'];
-            $sitemap['parent'][$i]['url']   = XOOPS_URL . '/modules/newbb/index.php?cat=' . $cat_id;
-        }
-        foreach ($forums as $id => $forum) {
-            $cid                                            = $forum['cid'];
-            $sitemap['parent'][$cid]['child'][$id]          = $forum;
-            $sitemap['parent'][$cid]['child'][$id]['image'] = 2;
-            if (empty($forum['fchild'])) {
-                continue;
-            }
+		foreach ($categories as $key => $category) {
+			$cat_id                         = $category['cat_id'];
+			$i                              = $cat_id;
+			$sitemap['parent'][$i]['id']    = $cat_id;
+			$sitemap['parent'][$i]['title'] = $category['cat_title'];
+			$sitemap['parent'][$i]['url']   = XOOPS_URL . '/modules/newbb/index.php?cat=' . $cat_id;
+		}
+		foreach ($forums as $id => $forum) {
+			$cid                                            = $forum['cid'];
+			$sitemap['parent'][$cid]['child'][$id]          = $forum;
+			$sitemap['parent'][$cid]['child'][$id]['image'] = 2;
+			if (empty($forum['fchild'])) {
+				continue;
+			}
 
-            foreach ($forum['fchild'] as $_id => $_forum) {
-                $sitemap['parent'][$cid]['child'][$_id]          = $_forum;
-                $sitemap['parent'][$cid]['child'][$_id]['image'] = 3;
-            }
-        }
-    } else {
-        foreach ($forums as $id => $forum) {
-            $sitemap['parent'][$id] = $forum;
-        }
-    }
+			foreach ($forum['fchild'] as $_id => $_forum) {
+				$sitemap['parent'][$cid]['child'][$_id]          = $_forum;
+				$sitemap['parent'][$cid]['child'][$_id]['image'] = 3;
+			}
+		}
+	} else {
+		foreach ($forums as $id => $forum) {
+			$sitemap['parent'][$id] = $forum;
+		}
+	}
 
-    return $sitemap;
+	return $sitemap;
 }

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

include/vars.php

Indentation +1 added lines, -1 removed lines

@@ -47,5 +47,5 @@
 
 // include customized variables
 if (is_object($GLOBALS['xoopsModule']) && 'newbb' === $GLOBALS['xoopsModule']->getVar('dirname', 'n')) {
-    $GLOBALS['xoopsModuleConfig'] = newbbLoadConfig();
+	$GLOBALS['xoopsModuleConfig'] = newbbLoadConfig();
 }

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

include/onupdate.php

Indentation +92 added lines, -92 removed lines

@@ -20,8 +20,8 @@ 
 use XoopsModules\Newbb;
 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)
-    || !$GLOBALS['xoopsUser']->IsAdmin()) {
-    exit('Restricted access' . PHP_EOL);
+	|| !$GLOBALS['xoopsUser']->IsAdmin()) {
+	exit('Restricted access' . PHP_EOL);
 }
 
 /**
@@ -31,9 +31,9 @@ 
  */
 function tableExists($tablename)
 {
-    $result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '$tablename'");
+	$result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '$tablename'");
 
-    return $GLOBALS['xoopsDB']->getRowsNum($result) > 0;
+	return $GLOBALS['xoopsDB']->getRowsNum($result) > 0;
 }
 
 /**
@@ -45,15 +45,15 @@ 
  */
 function xoops_module_pre_update_newbb(\XoopsModule $module)
 {
-    $moduleDirName = basename(dirname(__DIR__));
-    /** @var Newbb\Helper $helper */
-    /** @var Newbb\Utility $utility */
-    $helper  = Newbb\Helper::getInstance();
-    $utility = new Newbb\Utility();
-
-    $xoopsSuccess = $utility::checkVerXoops($module);
-    $phpSuccess   = $utility::checkVerPhp($module);
-    return $xoopsSuccess && $phpSuccess;
+	$moduleDirName = basename(dirname(__DIR__));
+	/** @var Newbb\Helper $helper */
+	/** @var Newbb\Utility $utility */
+	$helper  = Newbb\Helper::getInstance();
+	$utility = new Newbb\Utility();
+
+	$xoopsSuccess = $utility::checkVerXoops($module);
+	$phpSuccess   = $utility::checkVerPhp($module);
+	return $xoopsSuccess && $phpSuccess;
 }
 
 /**
@@ -67,83 +67,83 @@ 
 
 function xoops_module_update_newbb(\XoopsModule $module, $previousVersion = null)
 {
-    $moduleDirName = basename(dirname(__DIR__));
-    $capsDirName   = strtoupper($moduleDirName);
-
-    /** @var Newbb\Helper $helper */
-    /** @var Newbb\Utility $utility */
-    /** @var Newbb\Common\Configurator $configurator */
-    $helper       = Newbb\Helper::getInstance();
-    $utility      = new Newbb\Utility();
-    $configurator = new Newbb\Common\Configurator();
-
-    if ($previousVersion < 510) {
-
-        //delete old HTML templates
-        if (count($configurator->templateFolders) > 0) {
-            foreach ($configurator->templateFolders as $folder) {
-                $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
-                if (is_dir($templateFolder)) {
-                    $templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), ['..', '.']);
-                    foreach ($templateList as $k => $v) {
-                        $fileInfo = new \SplFileInfo($templateFolder . $v);
-                        if ('html' === $fileInfo->getExtension() && 'index.html' !== $fileInfo->getFilename()) {
-                            if (file_exists($templateFolder . $v)) {
-                                unlink($templateFolder . $v);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        //  ---  DELETE OLD FILES ---------------
-        if (count($configurator->oldFiles) > 0) {
-            //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-            foreach (array_keys($configurator->oldFiles) as $i) {
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
-                if (is_file($tempFile)) {
-                    unlink($tempFile);
-                }
-            }
-        }
-
-        //  ---  DELETE OLD FOLDERS ---------------
-        xoops_load('XoopsFile');
-        if (count($configurator->oldFolders) > 0) {
-            //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-            foreach (array_keys($configurator->oldFolders) as $i) {
-                $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
-                /* @var $folderHandler XoopsObjectHandler */
-                $folderHandler = \XoopsFile::getHandler('folder', $tempFolder);
-                $folderHandler->delete($tempFolder);
-            }
-        }
-
-        //  ---  CREATE FOLDERS ---------------
-        if (count($configurator->uploadFolders) > 0) {
-            //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-            foreach (array_keys($configurator->uploadFolders) as $i) {
-                $utility::createFolder($configurator->uploadFolders[$i]);
-            }
-        }
-
-        //  ---  COPY blank.png FILES ---------------
-        if (count($configurator->copyBlankFiles) > 0) {
-            $file =  dirname(__DIR__) . '/assets/images/blank.png';
-            foreach (array_keys($configurator->copyBlankFiles) as $i) {
-                $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
-                $utility::copyFile($file, $dest);
-            }
-        }
-
-        //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.html%\'';
-        $GLOBALS['xoopsDB']->queryF($sql);
-
-        /** @var XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-        return $grouppermHandler->deleteByModule($module->getVar('mid'), 'item_read');
-    }
-    return true;
+	$moduleDirName = basename(dirname(__DIR__));
+	$capsDirName   = strtoupper($moduleDirName);
+
+	/** @var Newbb\Helper $helper */
+	/** @var Newbb\Utility $utility */
+	/** @var Newbb\Common\Configurator $configurator */
+	$helper       = Newbb\Helper::getInstance();
+	$utility      = new Newbb\Utility();
+	$configurator = new Newbb\Common\Configurator();
+
+	if ($previousVersion < 510) {
+
+		//delete old HTML templates
+		if (count($configurator->templateFolders) > 0) {
+			foreach ($configurator->templateFolders as $folder) {
+				$templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
+				if (is_dir($templateFolder)) {
+					$templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), ['..', '.']);
+					foreach ($templateList as $k => $v) {
+						$fileInfo = new \SplFileInfo($templateFolder . $v);
+						if ('html' === $fileInfo->getExtension() && 'index.html' !== $fileInfo->getFilename()) {
+							if (file_exists($templateFolder . $v)) {
+								unlink($templateFolder . $v);
+							}
+						}
+					}
+				}
+			}
+		}
+
+		//  ---  DELETE OLD FILES ---------------
+		if (count($configurator->oldFiles) > 0) {
+			//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+			foreach (array_keys($configurator->oldFiles) as $i) {
+				$tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
+				if (is_file($tempFile)) {
+					unlink($tempFile);
+				}
+			}
+		}
+
+		//  ---  DELETE OLD FOLDERS ---------------
+		xoops_load('XoopsFile');
+		if (count($configurator->oldFolders) > 0) {
+			//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+			foreach (array_keys($configurator->oldFolders) as $i) {
+				$tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
+				/* @var $folderHandler XoopsObjectHandler */
+				$folderHandler = \XoopsFile::getHandler('folder', $tempFolder);
+				$folderHandler->delete($tempFolder);
+			}
+		}
+
+		//  ---  CREATE FOLDERS ---------------
+		if (count($configurator->uploadFolders) > 0) {
+			//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+			foreach (array_keys($configurator->uploadFolders) as $i) {
+				$utility::createFolder($configurator->uploadFolders[$i]);
+			}
+		}
+
+		//  ---  COPY blank.png FILES ---------------
+		if (count($configurator->copyBlankFiles) > 0) {
+			$file =  dirname(__DIR__) . '/assets/images/blank.png';
+			foreach (array_keys($configurator->copyBlankFiles) as $i) {
+				$dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+				$utility::copyFile($file, $dest);
+			}
+		}
+
+		//delete .html entries from the tpl table
+		$sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.html%\'';
+		$GLOBALS['xoopsDB']->queryF($sql);
+
+		/** @var XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+		return $grouppermHandler->deleteByModule($module->getVar('mid'), 'item_read');
+	}
+	return true;
 }

action.post.php

Indentation +183 added lines, -183 removed lines

@@ -23,8 +23,8 @@ 
 $mode = Request::getInt('mode', 1, 'GET');
 
 if (0 === count($post_id) || 0 === count($op)) {
-    // irmtfan - issue with javascript:history.go(-1)
-    redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_NO_SELECTION);
+	// irmtfan - issue with javascript:history.go(-1)
+	redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_NO_SELECTION);
 }
 ///** @var PostHandler $postHandler */
 //$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
@@ -33,199 +33,199 @@ 
 ///** @var NewbbForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 if (empty($topic_id)) {
-    $forumObject = null;
+	$forumObject = null;
 } else {
-    $topicObject = $topicHandler->get($topic_id);
-    $forum_id    = $topicObject->getVar('forum_id');
-    $forumObject = $forumHandler->get($forum_id);
+	$topicObject = $topicHandler->get($topic_id);
+	$forum_id    = $topicObject->getVar('forum_id');
+	$forumObject = $forumHandler->get($forum_id);
 }
 $isAdmin = newbbIsAdmin($forumObject);
 
 if (!$isAdmin) {
-    redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
+	redirect_header(XOOPS_URL . '/index.php', 2, _MD_NEWBB_NORIGHTTOACCESS);
 }
 
 switch ($op) {
-    case 'restore':
-        $post_id = array_values($post_id);
-        sort($post_id);
-        $topics = [];
-        $forums = [];
-        foreach ($post_id as $post) {
-            $postObject = $postHandler->get($post);
-            if ($postObject->getVar('topic_id') < 1) {
-                continue;
-            }
-
-            $postHandler->approve($postObject, true);
-            $topics[$postObject->getVar('topic_id')] = 1;
-            $forums[$postObject->getVar('forum_id')] = 1;
-            unset($postObject);
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-        break;
-    case 'approve':
-        $post_id = array_values($post_id);
-        sort($post_id);
-        $topics      = [];
-        $forums      = [];
-        $criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
-        $postsObject = $postHandler->getObjects($criteria, true);
-        foreach ($post_id as $post) {
-            /** @var Newbb\Post $postObject */
-            $postObject = $postsObject[$post];
-            if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
-                continue;
-            }
-            $postHandler->approve($postObject);
-            $topics[$postObject->getVar('topic_id')] = $post;
-            $forums[$postObject->getVar('forum_id')] = 1;
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-
-        if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
-            break;
-        }
-
-        $criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
-        $topic_list     = $topicHandler->getList($criteria_topic, true);
-
-        $criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
-        $forum_list     = $forumHandler->getList($criteria_forum);
-
-        require_once __DIR__ . '/include/notification.inc.php';
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler = xoops_getHandler('notification');
-        foreach ($post_id as $post) {
-            $tags = [];
-            /** @var Newbb\Post[] $postsObject [$post] */
-            $tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
-            $tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&amp;forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
-            $tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
-            $tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
-            $notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
-            $notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
-            $tags['POST_CONTENT'] = $postsObject[$post]->getVar('post_text');
-            $tags['POST_NAME']    = $postsObject[$post]->getVar('subject');
-            $notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
-            $notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_fullpost', $tags);
-        }
-        break;
-    case 'delete':
-        $post_id = array_values($post_id);
-        rsort($post_id);
-        $topics = [];
-        $forums = [];
-        foreach ($post_id as $post) {
-            $postObject = $postHandler->get($post);
-            if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
-                continue;
-            }
-            $topics[$postObject->getVar('topic_id')] = 1;
-            $forums[$postObject->getVar('forum_id')] = 1;
-            $postHandler->delete($postObject, true);
-            unset($postObject);
-        }
-        foreach (array_keys($topics) as $topic) {
-            $topicHandler->synchronization($topic);
-        }
-        foreach (array_keys($forums) as $forum) {
-            $forumHandler->synchronization($forum);
-        }
-        break;
-    case 'split':
-        /** @var Newbb\Post $postObject */
-        $postObject = $postHandler->get($post_id);
-        if (0 === count($post_id) || $postObject->isTopic()) {
-            break;
-        }
-        $topic_id = $postObject->getVar('topic_id');
-
-        $newtopic = $topicHandler->create();
-        $newtopic->setVar('topic_title', $postObject->getVar('subject'), true);
-        $newtopic->setVar('topic_poster', $postObject->getVar('uid'), true);
-        $newtopic->setVar('forum_id', $postObject->getVar('forum_id'), true);
-        $newtopic->setVar('topic_time', $postObject->getVar('post_time'), true);
-        $newtopic->setVar('poster_name', $postObject->getVar('poster_name'), true);
-        $newtopic->setVar('approved', 1, true);
-        $topicHandler->insert($newtopic, true);
-        $new_topic_id = $newtopic->getVar('topic_id');
-
-        $pid = $postObject->getVar('pid');
-
-        $postObject->setVar('topic_id', $new_topic_id, true);
-        $postObject->setVar('pid', 0, true);
-        $postHandler->insert($postObject);
-
-        /* split a single post */
-        if (1 === $mode) {
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-            $criteria->add(new \Criteria('pid', $post_id));
-            $postHandler->updateAll('pid', $pid, $criteria, true);
-        /* split a post and its children posts */
-        } elseif (2 === $mode) {
-            require_once $GLOBALS['xoops']->path('class/xoopstree.php');
-            $mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
-            $posts  = $mytree->getAllChildId($post_id);
-            if (count($posts) > 0) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
-                $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
-            }
-            /* split a post and all posts coming after */
-        } elseif (3 === $mode) {
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
-            $criteria->add(new \Criteria('post_id', $post_id, '>'));
-            $postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
-
-            unset($criteria);
-            $criteria = new \CriteriaCompo(new \Criteria('topic_id', $new_topic_id));
-            $criteria->add(new \Criteria('post_id', $post_id, '>'));
-            $postHandler->identifierName = 'pid';
-            $posts                       = $postHandler->getList($criteria);
-
-            unset($criteria);
-            $post_update = [];
-            foreach ($posts as $postid => $pid) {
-                //                if (!in_array($pid, array_keys($posts))) {
-                if (!array_key_exists($pid, $posts)) {
-                    $post_update[] = $pid;
-                }
-                if (!array_key_exists($pid, $posts)) {
-                    $post_update2[] = $pid;
-                }
-            }
-            if (count($post_update)) {
-                $criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
-                $postHandler->updateAll('pid', $post_id, $criteria, true);
-            }
-        }
-
-        $forum_id = $postObject->getVar('forum_id');
-        $topicHandler->synchronization($topic_id);
-        $topicHandler->synchronization($new_topic_id);
-        $sql    = sprintf('UPDATE "%s" SET forum_topics = forum_topics+1 WHERE forum_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_forums'), $forum_id);
-        $result = $GLOBALS['xoopsDB']->queryF($sql);
-
-        break;
+	case 'restore':
+		$post_id = array_values($post_id);
+		sort($post_id);
+		$topics = [];
+		$forums = [];
+		foreach ($post_id as $post) {
+			$postObject = $postHandler->get($post);
+			if ($postObject->getVar('topic_id') < 1) {
+				continue;
+			}
+
+			$postHandler->approve($postObject, true);
+			$topics[$postObject->getVar('topic_id')] = 1;
+			$forums[$postObject->getVar('forum_id')] = 1;
+			unset($postObject);
+		}
+		foreach (array_keys($topics) as $topic) {
+			$topicHandler->synchronization($topic);
+		}
+		foreach (array_keys($forums) as $forum) {
+			$forumHandler->synchronization($forum);
+		}
+		break;
+	case 'approve':
+		$post_id = array_values($post_id);
+		sort($post_id);
+		$topics      = [];
+		$forums      = [];
+		$criteria    = new \Criteria('post_id', '(' . implode(',', $post_id) . ')', 'IN');
+		$postsObject = $postHandler->getObjects($criteria, true);
+		foreach ($post_id as $post) {
+			/** @var Newbb\Post $postObject */
+			$postObject = $postsObject[$post];
+			if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
+				continue;
+			}
+			$postHandler->approve($postObject);
+			$topics[$postObject->getVar('topic_id')] = $post;
+			$forums[$postObject->getVar('forum_id')] = 1;
+		}
+		foreach (array_keys($topics) as $topic) {
+			$topicHandler->synchronization($topic);
+		}
+		foreach (array_keys($forums) as $forum) {
+			$forumHandler->synchronization($forum);
+		}
+
+		if (empty($GLOBALS['xoopsModuleConfig']['notification_enabled'])) {
+			break;
+		}
+
+		$criteria_topic = new \Criteria('topic_id', '(' . implode(',', array_keys($topics)) . ')', 'IN');
+		$topic_list     = $topicHandler->getList($criteria_topic, true);
+
+		$criteria_forum = new \Criteria('forum_id', '(' . implode(',', array_keys($forums)) . ')', 'IN');
+		$forum_list     = $forumHandler->getList($criteria_forum);
+
+		require_once __DIR__ . '/include/notification.inc.php';
+		/** @var \XoopsNotificationHandler $notificationHandler */
+		$notificationHandler = xoops_getHandler('notification');
+		foreach ($post_id as $post) {
+			$tags = [];
+			/** @var Newbb\Post[] $postsObject [$post] */
+			$tags['THREAD_NAME'] = $topic_list[$postsObject[$post]->getVar('topic_id')];
+			$tags['THREAD_URL']  = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $postsObject[$post]->getVar('topic_id') . '&amp;forum=' . $postsObject[$post]->getVar('forum_id');
+			$tags['FORUM_NAME']  = $forum_list[$postsObject[$post]->getVar('forum_id')];
+			$tags['FORUM_URL']   = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewforum.php?forum=' . $postsObject[$post]->getVar('forum_id');
+			$tags['POST_URL']    = $tags['THREAD_URL'] . '#forumpost' . $post;
+			$notificationHandler->triggerEvent('thread', $postsObject[$post]->getVar('topic_id'), 'new_post', $tags);
+			$notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_post', $tags);
+			$notificationHandler->triggerEvent('global', 0, 'new_post', $tags);
+			$tags['POST_CONTENT'] = $postsObject[$post]->getVar('post_text');
+			$tags['POST_NAME']    = $postsObject[$post]->getVar('subject');
+			$notificationHandler->triggerEvent('global', 0, 'new_fullpost', $tags);
+			$notificationHandler->triggerEvent('forum', $postsObject[$post]->getVar('forum_id'), 'new_fullpost', $tags);
+		}
+		break;
+	case 'delete':
+		$post_id = array_values($post_id);
+		rsort($post_id);
+		$topics = [];
+		$forums = [];
+		foreach ($post_id as $post) {
+			$postObject = $postHandler->get($post);
+			if (!empty($topic_id) && $topic_id !== $postObject->getVar('topic_id')) {
+				continue;
+			}
+			$topics[$postObject->getVar('topic_id')] = 1;
+			$forums[$postObject->getVar('forum_id')] = 1;
+			$postHandler->delete($postObject, true);
+			unset($postObject);
+		}
+		foreach (array_keys($topics) as $topic) {
+			$topicHandler->synchronization($topic);
+		}
+		foreach (array_keys($forums) as $forum) {
+			$forumHandler->synchronization($forum);
+		}
+		break;
+	case 'split':
+		/** @var Newbb\Post $postObject */
+		$postObject = $postHandler->get($post_id);
+		if (0 === count($post_id) || $postObject->isTopic()) {
+			break;
+		}
+		$topic_id = $postObject->getVar('topic_id');
+
+		$newtopic = $topicHandler->create();
+		$newtopic->setVar('topic_title', $postObject->getVar('subject'), true);
+		$newtopic->setVar('topic_poster', $postObject->getVar('uid'), true);
+		$newtopic->setVar('forum_id', $postObject->getVar('forum_id'), true);
+		$newtopic->setVar('topic_time', $postObject->getVar('post_time'), true);
+		$newtopic->setVar('poster_name', $postObject->getVar('poster_name'), true);
+		$newtopic->setVar('approved', 1, true);
+		$topicHandler->insert($newtopic, true);
+		$new_topic_id = $newtopic->getVar('topic_id');
+
+		$pid = $postObject->getVar('pid');
+
+		$postObject->setVar('topic_id', $new_topic_id, true);
+		$postObject->setVar('pid', 0, true);
+		$postHandler->insert($postObject);
+
+		/* split a single post */
+		if (1 === $mode) {
+			$criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+			$criteria->add(new \Criteria('pid', $post_id));
+			$postHandler->updateAll('pid', $pid, $criteria, true);
+		/* split a post and its children posts */
+		} elseif (2 === $mode) {
+			require_once $GLOBALS['xoops']->path('class/xoopstree.php');
+			$mytree = new \XoopsTree($GLOBALS['xoopsDB']->prefix('newbb_posts'), 'post_id', 'pid');
+			$posts  = $mytree->getAllChildId($post_id);
+			if (count($posts) > 0) {
+				$criteria = new \Criteria('post_id', '(' . implode(',', $posts) . ')', 'IN');
+				$postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
+			}
+			/* split a post and all posts coming after */
+		} elseif (3 === $mode) {
+			$criteria = new \CriteriaCompo(new \Criteria('topic_id', $topic_id));
+			$criteria->add(new \Criteria('post_id', $post_id, '>'));
+			$postHandler->updateAll('topic_id', $new_topic_id, $criteria, true);
+
+			unset($criteria);
+			$criteria = new \CriteriaCompo(new \Criteria('topic_id', $new_topic_id));
+			$criteria->add(new \Criteria('post_id', $post_id, '>'));
+			$postHandler->identifierName = 'pid';
+			$posts                       = $postHandler->getList($criteria);
+
+			unset($criteria);
+			$post_update = [];
+			foreach ($posts as $postid => $pid) {
+				//                if (!in_array($pid, array_keys($posts))) {
+				if (!array_key_exists($pid, $posts)) {
+					$post_update[] = $pid;
+				}
+				if (!array_key_exists($pid, $posts)) {
+					$post_update2[] = $pid;
+				}
+			}
+			if (count($post_update)) {
+				$criteria = new \Criteria('post_id', '(' . implode(',', $post_update) . ')', 'IN');
+				$postHandler->updateAll('pid', $post_id, $criteria, true);
+			}
+		}
+
+		$forum_id = $postObject->getVar('forum_id');
+		$topicHandler->synchronization($topic_id);
+		$topicHandler->synchronization($new_topic_id);
+		$sql    = sprintf('UPDATE "%s" SET forum_topics = forum_topics+1 WHERE forum_id = "%u"', $GLOBALS['xoopsDB']->prefix('newbb_forums'), $forum_id);
+		$result = $GLOBALS['xoopsDB']->queryF($sql);
+
+		break;
 }
 if (!empty($topic_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id=$topic_id", 2, _MD_NEWBB_DBUPDATED);
 } elseif (!empty($forum_id)) {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewforum.php?forum=$forum_id", 2, _MD_NEWBB_DBUPDATED);
 } else {
-    redirect_header(XOOPS_URL . "/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
+	redirect_header(XOOPS_URL . "/modules/newbb/viewpost.php?uid=$uid", 2, _MD_NEWBB_DBUPDATED);
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

search.php

Indentation +184 added lines, -184 removed lines

@@ -40,7 +40,7 @@ 
 $configHandler     = xoops_getHandler('config');
 $xoopsConfigSearch = $configHandler->getConfigsByCat(XOOPS_CONF_SEARCH);
 if (1 !== $xoopsConfigSearch['enable_search']) {
-    redirect_header(XOOPS_URL . '/modules/newbb/index.php', 2, _MD_NEWBB_SEARCHDISABLED);
+	redirect_header(XOOPS_URL . '/modules/newbb/index.php', 2, _MD_NEWBB_SEARCHDISABLED);
 }
 
 $GLOBALS['xoopsConfig']['module_cache'][$xoopsModule->getVar('mid')] = 0;
@@ -75,195 +75,195 @@ 
 $search_username = trim($uname);
 
 if ($GLOBALS['xoopsModuleConfig']['wol_enabled']) {
-    //    /** @var Newbb\OnlineHandler $onlineHandler */
-    //    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
-    $onlineHandler->init(0);
+	//    /** @var Newbb\OnlineHandler $onlineHandler */
+	//    $onlineHandler = Newbb\Helper::getInstance()->getHandler('Online');
+	$onlineHandler->init(0);
 }
 
 $xoopsTpl->assign('forumindex', sprintf(_MD_NEWBB_FORUMINDEX, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)));
 //$xoopsTpl->assign("img_folder", newbbDisplayImage($forumImage['topic']));
 
 if (!empty($uname) || Request::getString('submit', '') || !empty($term)) {
-    // irmtfan filter positive numbers
-    $selectlength = !empty($selectlength) ? abs($selectlength) : 200;
-    // irmtfan add select parameters for next search
-    $next_search['selectlength'] = $selectlength;
+	// irmtfan filter positive numbers
+	$selectlength = !empty($selectlength) ? abs($selectlength) : 200;
+	// irmtfan add select parameters for next search
+	$next_search['selectlength'] = $selectlength;
 
-    $start = Request::getInt('start', 0);
-    $forum = Request::getInt('forum', null);
-    if (empty($forum) || 'all' === $forum || (is_array($forum) && in_array('all', $forum, true))) {
-        $forum = [];
-    } elseif (!is_array($forum)) {
-        $forum = array_map('intval', explode('|', $forum));
-    }
-    $next_search['forum'] = implode('|', $forum);
-    // START irmtfan topic search
-    $topic                = Request::getString('topic', null);
-    $next_search['topic'] = $topic;
-    // END irmtfan topic search
-    // START irmtfan add show search
-    $show_search                = Request::getString('show_search', 'post_text');
-    $next_search['show_search'] = $show_search;
-    // START irmtfan add show search
+	$start = Request::getInt('start', 0);
+	$forum = Request::getInt('forum', null);
+	if (empty($forum) || 'all' === $forum || (is_array($forum) && in_array('all', $forum, true))) {
+		$forum = [];
+	} elseif (!is_array($forum)) {
+		$forum = array_map('intval', explode('|', $forum));
+	}
+	$next_search['forum'] = implode('|', $forum);
+	// START irmtfan topic search
+	$topic                = Request::getString('topic', null);
+	$next_search['topic'] = $topic;
+	// END irmtfan topic search
+	// START irmtfan add show search
+	$show_search                = Request::getString('show_search', 'post_text');
+	$next_search['show_search'] = $show_search;
+	// START irmtfan add show search
 
-    $addterms             = Request::getString('andor', 'AND');
-    $next_search['andor'] = $addterms;
-    $andor                = strtoupper($addterms);
-    if (!in_array($addterms, ['OR', 'AND'], true)) {
-        $andor = 'AND';
-    }
+	$addterms             = Request::getString('andor', 'AND');
+	$next_search['andor'] = $addterms;
+	$andor                = strtoupper($addterms);
+	if (!in_array($addterms, ['OR', 'AND'], true)) {
+		$andor = 'AND';
+	}
 
-    $uname_required       = false;
-    $next_search['uname'] = $search_username;
-    if (!empty($search_username)) {
-        $uname_required  = true;
-        $search_username = $GLOBALS['xoopsDB']->escape($search_username);
-        if (!$result = $GLOBALS['xoopsDB']->query('SELECT uid FROM ' . $GLOBALS['xoopsDB']->prefix('users') . " WHERE uname LIKE '%$search_username%'")) {
-            redirect_header(XOOPS_URL . '/search.php', 1, _MD_NEWBB_ERROROCCURED);
-        }
-        $uid = [];
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-            $uid[] = $row['uid'];
-        }
-    } else {
-        $uid = 0;
-    }
+	$uname_required       = false;
+	$next_search['uname'] = $search_username;
+	if (!empty($search_username)) {
+		$uname_required  = true;
+		$search_username = $GLOBALS['xoopsDB']->escape($search_username);
+		if (!$result = $GLOBALS['xoopsDB']->query('SELECT uid FROM ' . $GLOBALS['xoopsDB']->prefix('users') . " WHERE uname LIKE '%$search_username%'")) {
+			redirect_header(XOOPS_URL . '/search.php', 1, _MD_NEWBB_ERROROCCURED);
+		}
+		$uid = [];
+		while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+			$uid[] = $row['uid'];
+		}
+	} else {
+		$uid = 0;
+	}
 
-    $next_search['term'] = htmlspecialchars($term, ENT_QUOTES);
-    $query               = trim($term);
+	$next_search['term'] = htmlspecialchars($term, ENT_QUOTES);
+	$query               = trim($term);
 
-    if ('EXACT' !== $andor) {
-        $ignored_queries = []; // holds keywords that are shorter than allowed minimum length
-        $temp_queries    = str_getcsv($query, ' ', '"');
-        foreach ($temp_queries as $q) {
-            $q = trim($q);
-            if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
-                $queries[] = $q;
-            } else {
-                $ignored_queries[] = $q;
-            }
-        }
-        if (!$uname_required && 0 === count($queries)) {
-            redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-    } else {
-        //$query = trim($query);
-        if (!$uname_required && (strlen($query) < $xoopsConfigSearch['keyword_min'])) {
-            redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
-        }
-        $queries = [$query];
-    }
+	if ('EXACT' !== $andor) {
+		$ignored_queries = []; // holds keywords that are shorter than allowed minimum length
+		$temp_queries    = str_getcsv($query, ' ', '"');
+		foreach ($temp_queries as $q) {
+			$q = trim($q);
+			if (strlen($q) >= $xoopsConfigSearch['keyword_min']) {
+				$queries[] = $q;
+			} else {
+				$ignored_queries[] = $q;
+			}
+		}
+		if (!$uname_required && 0 === count($queries)) {
+			redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+	} else {
+		//$query = trim($query);
+		if (!$uname_required && (strlen($query) < $xoopsConfigSearch['keyword_min'])) {
+			redirect_header(XOOPS_URL . '/search.php', 2, sprintf(_SR_KEYTOOSHORT, $xoopsConfigSearch['keyword_min']));
+		}
+		$queries = [$query];
+	}
 
-    // entries must be lowercase
-    $allowed = ['p.post_time', 'p.subject']; // irmtfan just post time and subject
+	// entries must be lowercase
+	$allowed = ['p.post_time', 'p.subject']; // irmtfan just post time and subject
 
-    $sortby                = Request::getString('sortby', 'p.post_time');
-    $next_search['sortby'] = $sortby;
-    //$sortby = (in_array(strtolower($sortby), $allowed)) ? $sortby :  't.topic_last_post_id';
-    $sortby                  = in_array(strtolower($sortby), $allowed) ? $sortby : 'p.post_time';
-    $searchin                = Request::getString('searchin', 'both');
-    $next_search['searchin'] = $searchin;
-    // START irmtfan use criteria - add since and topic search
-    if (!empty($since)) {
-        $criteriaExtra->add(new \Criteria('p.post_time', time() - newbbGetSinceTime($since), '>='), 'OR');
-    }
-    if (is_numeric($topic) && !empty($topic)) {
-        $criteriaExtra->add(new \Criteria('p.topic_id', $topic), 'OR');
-    }
-    // END irmtfan use criteria -  add since and topic search
+	$sortby                = Request::getString('sortby', 'p.post_time');
+	$next_search['sortby'] = $sortby;
+	//$sortby = (in_array(strtolower($sortby), $allowed)) ? $sortby :  't.topic_last_post_id';
+	$sortby                  = in_array(strtolower($sortby), $allowed) ? $sortby : 'p.post_time';
+	$searchin                = Request::getString('searchin', 'both');
+	$next_search['searchin'] = $searchin;
+	// START irmtfan use criteria - add since and topic search
+	if (!empty($since)) {
+		$criteriaExtra->add(new \Criteria('p.post_time', time() - newbbGetSinceTime($since), '>='), 'OR');
+	}
+	if (is_numeric($topic) && !empty($topic)) {
+		$criteriaExtra->add(new \Criteria('p.topic_id', $topic), 'OR');
+	}
+	// END irmtfan use criteria -  add since and topic search
 
-    if ($uname_required && (!$uid || count($uid) < 1)) {
-        $results = [];
-    } // irmtfan bug fix array()
-    else {
-        $results = newbb_search($queries, $andor, $limit, $start, $uid, $forum, $sortby, $searchin, $criteriaExtra);
-    } // irmtfan $criteriaExtra
+	if ($uname_required && (!$uid || count($uid) < 1)) {
+		$results = [];
+	} // irmtfan bug fix array()
+	else {
+		$results = newbb_search($queries, $andor, $limit, $start, $uid, $forum, $sortby, $searchin, $criteriaExtra);
+	} // irmtfan $criteriaExtra
 
-    $search_info_keywords = Highlighter::apply($myts->htmlSpecialChars($term, ENT_QUOTES), implode(' ', $queries), '<mark>', '</mark>');
-    $num_results          = count($results);
-    if ($num_results < 1) {
-        $xoopsTpl->assign('lang_nomatch', _SR_NOMATCH);
-    } else {
-        $skipresults = 0;
-        foreach ($results as $row) {
-            $post_text_select    = '';
-            $post_subject_select = Highlighter::apply($queries, $row['title'], '<mark>', '</mark>');
-            if ('post_text' === $show_search) {
-                $post_text_select = Metagen::getSearchSummary($row['post_text'], $queries, $selectlength);
-                $post_text_select = Highlighter::apply($queries, $post_text_select, '<mark>', '</mark>');
-            }
-            // if no text remained after select text continue
-            if (empty($post_text_select) && empty($post_subject_select)) {
-                ++$skipresults;
-                continue;
-            }
-            $xoopsTpl->append('results', [
-                'forum_name' => $row['forum_name'],
-                'forum_link' => $row['forum_link'],
-                'link'       => $row['link'],
-                'title'      => $post_subject_select,
-                'poster'     => $row['poster'],
-                'post_time'  => formatTimestamp($row['time'], 'm'),
-                'post_text'  => $post_text_select
-            ]);
-        }
-        unset($results);
+	$search_info_keywords = Highlighter::apply($myts->htmlSpecialChars($term, ENT_QUOTES), implode(' ', $queries), '<mark>', '</mark>');
+	$num_results          = count($results);
+	if ($num_results < 1) {
+		$xoopsTpl->assign('lang_nomatch', _SR_NOMATCH);
+	} else {
+		$skipresults = 0;
+		foreach ($results as $row) {
+			$post_text_select    = '';
+			$post_subject_select = Highlighter::apply($queries, $row['title'], '<mark>', '</mark>');
+			if ('post_text' === $show_search) {
+				$post_text_select = Metagen::getSearchSummary($row['post_text'], $queries, $selectlength);
+				$post_text_select = Highlighter::apply($queries, $post_text_select, '<mark>', '</mark>');
+			}
+			// if no text remained after select text continue
+			if (empty($post_text_select) && empty($post_subject_select)) {
+				++$skipresults;
+				continue;
+			}
+			$xoopsTpl->append('results', [
+				'forum_name' => $row['forum_name'],
+				'forum_link' => $row['forum_link'],
+				'link'       => $row['link'],
+				'title'      => $post_subject_select,
+				'poster'     => $row['poster'],
+				'post_time'  => formatTimestamp($row['time'], 'm'),
+				'post_text'  => $post_text_select
+			]);
+		}
+		unset($results);
 
-        if (count($next_search) > 0) {
-            $items = [];
-            foreach ($next_search as $para => $val) {
-                $items[] = "{$para}=" . urlencode($val);
-            }
-            if (count($items) > 0) {
-                $paras = implode('&', $items);
-            }
-            unset($next_search, $items);
-        }
-        $search_url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/search.php?' . $paras;
-        // irmtfan remove to have just one query and appropriate next and prev links
-        //$next_results = newbb_search($queries, $andor, 1, $start + $limit, $uid, $forum, $sortby, $searchin, $subquery);
-        //$next_count = count($next_results);
-        //$has_next = false;
-        //if (is_array($next_results) && $next_count >0) {
-        //$has_next = true;
-        //}
-        // irmtfan if $results < $limit => it is impossible to have next
-        if ($num_results == $limit) {
-            $next            = $start + $limit;
-            $queries         = implode(',', $queries);
-            $search_url_next = htmlspecialchars($search_url . "&direction=next&start={$next}", ENT_QUOTES | ENT_HTML5);
-            $search_next     = '<a href="' . $search_url_next . '">' . _SR_NEXT . '</a>';
-            $xoopsTpl->assign('search_next', $search_next);
-            $xoopsTpl->assign('search_next_url', $search_url_next);
-        }
-        if ($start > 0) {
-            $prev            = $start - $limit;
-            $search_url_prev = htmlspecialchars($search_url . "&direction=previous&start={$prev}", ENT_QUOTES | ENT_HTML5);
-            $search_prev     = '<a href="' . $search_url_prev . '">' . _SR_PREVIOUS . '</a>';
-            $xoopsTpl->assign('search_prev', $search_prev);
-            $xoopsTpl->assign('search_prev_url', $search_url_prev);
-        }
-        // irmtfan if all results skipped then redirect to the next/previous page
-        if ($num_results == $skipresults) {
-            $direction           = Request::getString('direction', 'next');
-            $search_url_redirect = ('next' === strtolower($direction)) ? $search_url_next : $search_url_prev;
-            redirect_header($search_url_redirect, 1, constant(strtoupper("_SR_{$direction}")));
-        }
-    }
-    $search_info = _SR_KEYWORDS . ': ' . $search_info_keywords;
-    if ($uname_required) {
-        if ($search_info) {
-            $search_info .= '<br>';
-        }
-        $search_info .= _MD_NEWBB_USERNAME . ': ' . $myts->htmlSpecialChars($search_username);
-    }
-    // add num_results
-    $search_info .= '<br>' . sprintf(_SR_SHOWING, $start + 1, $start + $num_results);
-    // if any result skip show the counter
-    if (!empty($skipresults)) {
-        $search_info .= ' - ' . sprintf(_SR_FOUND, $num_results - $skipresults);
-    }
-    $xoopsTpl->assign('search_info', $search_info);
+		if (count($next_search) > 0) {
+			$items = [];
+			foreach ($next_search as $para => $val) {
+				$items[] = "{$para}=" . urlencode($val);
+			}
+			if (count($items) > 0) {
+				$paras = implode('&', $items);
+			}
+			unset($next_search, $items);
+		}
+		$search_url = XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/search.php?' . $paras;
+		// irmtfan remove to have just one query and appropriate next and prev links
+		//$next_results = newbb_search($queries, $andor, 1, $start + $limit, $uid, $forum, $sortby, $searchin, $subquery);
+		//$next_count = count($next_results);
+		//$has_next = false;
+		//if (is_array($next_results) && $next_count >0) {
+		//$has_next = true;
+		//}
+		// irmtfan if $results < $limit => it is impossible to have next
+		if ($num_results == $limit) {
+			$next            = $start + $limit;
+			$queries         = implode(',', $queries);
+			$search_url_next = htmlspecialchars($search_url . "&direction=next&start={$next}", ENT_QUOTES | ENT_HTML5);
+			$search_next     = '<a href="' . $search_url_next . '">' . _SR_NEXT . '</a>';
+			$xoopsTpl->assign('search_next', $search_next);
+			$xoopsTpl->assign('search_next_url', $search_url_next);
+		}
+		if ($start > 0) {
+			$prev            = $start - $limit;
+			$search_url_prev = htmlspecialchars($search_url . "&direction=previous&start={$prev}", ENT_QUOTES | ENT_HTML5);
+			$search_prev     = '<a href="' . $search_url_prev . '">' . _SR_PREVIOUS . '</a>';
+			$xoopsTpl->assign('search_prev', $search_prev);
+			$xoopsTpl->assign('search_prev_url', $search_url_prev);
+		}
+		// irmtfan if all results skipped then redirect to the next/previous page
+		if ($num_results == $skipresults) {
+			$direction           = Request::getString('direction', 'next');
+			$search_url_redirect = ('next' === strtolower($direction)) ? $search_url_next : $search_url_prev;
+			redirect_header($search_url_redirect, 1, constant(strtoupper("_SR_{$direction}")));
+		}
+	}
+	$search_info = _SR_KEYWORDS . ': ' . $search_info_keywords;
+	if ($uname_required) {
+		if ($search_info) {
+			$search_info .= '<br>';
+		}
+		$search_info .= _MD_NEWBB_USERNAME . ': ' . $myts->htmlSpecialChars($search_username);
+	}
+	// add num_results
+	$search_info .= '<br>' . sprintf(_SR_SHOWING, $start + 1, $start + $num_results);
+	// if any result skip show the counter
+	if (!empty($skipresults)) {
+		$search_info .= ' - ' . sprintf(_SR_FOUND, $num_results - $skipresults);
+	}
+	$xoopsTpl->assign('search_info', $search_info);
 }
 // assign template vars for search
 /* term */
@@ -273,12 +273,12 @@ 
 $andor_select = '<select name="andor" id="andor" class="form-control">';
 $andor_select .= '<option value="OR"';
 if ('OR' === $andor) {
-    $andor_select .= ' selected="selected"';
+	$andor_select .= ' selected="selected"';
 }
 $andor_select .= '>' . _SR_ANY . '</option>';
 $andor_select .= '<option value="AND"';
 if ('AND' === $andor || empty($andor)) {
-    $andor_select .= ' selected="selected"';
+	$andor_select .= ' selected="selected"';
 }
 $andor_select .= '>' . _SR_ALL . '</option>';
 $andor_select .= '</select>';
@@ -295,17 +295,17 @@ 
 $searchin_select = '';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="title"';
 if ('title' === $searchin) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . _MD_NEWBB_SUBJECT . ' </label>';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="text"';
 if ('text' === $searchin) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . _MD_NEWBB_BODY . ' </label>';
 $searchin_select .= '<label class="radio-inline"><input type="radio" name="searchin" value="both"';
 if ('both' === $searchin || empty($searchin)) {
-    $searchin_select .= ' checked';
+	$searchin_select .= ' checked';
 }
 $searchin_select .= ' />' . _MD_NEWBB_SUBJECT . ' & ' . _MD_NEWBB_BODY . ' </label>';
 $xoopsTpl->assign('searchin_radio', $searchin_select);
@@ -314,12 +314,12 @@ 
 $show_search_select = '';
 $show_search_select .= '<label class="radio-inline"><input type="radio" name="show_search" value="post"';
 if ('post' === $show_search) {
-    $show_search_select .= ' checked';
+	$show_search_select .= ' checked';
 }
 $show_search_select .= ' />' . _MD_NEWBB_POSTS . ' </label>';
 $show_search_select .= '<label class="radio-inline"><input type="radio" name="show_search" value="post_text"';
 if ('post_text' === $show_search || empty($show_search)) {
-    $show_search_select .= ' checked';
+	$show_search_select .= ' checked';
 }
 $show_search_select .= ' />' . _MD_NEWBB_SEARCHPOSTTEXT . ' </label>';
 $xoopsTpl->assign('show_search_radio', $show_search_select);
@@ -331,12 +331,12 @@ 
 $sortby_select = '<select name="sortby" id="sortby" class="form-control">';
 $sortby_select .= '<option value=\'p.post_time\'';
 if ('p.post_time' === $sortby || empty($sortby)) {
-    $sortby_select .= ' selected=\'selected\'';
+	$sortby_select .= ' selected=\'selected\'';
 }
 $sortby_select .= '>' . _MD_NEWBB_DATE . '</option>';
 $sortby_select .= '<option value=\'p.subject\'';
 if ('p.subject' === $sortby) {
-    $sortby_select .= ' selected="selected"';
+	$sortby_select .= ' selected="selected"';
 }
 $sortby_select .= '>' . _MD_NEWBB_TOPIC . '</option>';
 $sortby_select .= '</select>';
@@ -351,7 +351,7 @@ 
 $xoopsTpl->assign_by_ref('since_selection_box', $select_since);
 
 if ($xoopsConfigSearch['keyword_min'] > 0) {
-    $xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
+	$xoopsTpl->assign('search_rule', sprintf(_SR_KEYIGNORE, $xoopsConfigSearch['keyword_min']));
 }
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';