mambax7 / newbb5

admin/admin_header.php

Indentation +2 added lines, -2 removed lines

@@ -51,8 +51,8 @@
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $xoopsTpl = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$xoopsTpl = new \XoopsTpl();
 }
 
 $pathIcon16    = Xmf\Module\Admin::iconUrl('', 16);

Spacing +6 added lines, -6 removed lines

@@ -33,15 +33,15 @@
 use XoopsModules\Newbb;
 
 //require_once $GLOBALS['xoops']->path('include/cp_header.php');
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/vars.php');
-require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/functions.user.php');
-require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/functions.render.php');
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require_once $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/include/vars.php');
+require_once $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/include/functions.user.php');
+require_once $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/include/functions.render.php');
 //require_once $GLOBALS['xoops']->path('Frameworks/art/functions.php');
 //require_once $GLOBALS['xoops']->path('Frameworks/art/functions.admin.php');
 
-require_once dirname(__DIR__) . '/include/config.php';
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/config.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 /** @var Newbb\Helper $helper */
 $helper = Newbb\Helper::getInstance();

admin/admin_forum_manager.php

Indentation +241 added lines, -241 removed lines

@@ -48,269 +48,269 @@
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 switch ($op) {
-    case 'moveforum':
-        //if (!$newXoopsModuleGui) loadModuleAdminMenu(2, "");
+	case 'moveforum':
+		//if (!$newXoopsModuleGui) loadModuleAdminMenu(2, "");
 
-        if (Request::getInt('dest_forum', 0, 'POST')) {
-            $dest = Request::getInt('dest_forum', 0, 'POST');
-            if ($dest > 0) {
-                $pid        = $dest;
-                $forum_dest = $forumHandler->get($pid);
-                $cid        = $forum_dest->getVar('cat_id');
-                unset($forum_dest);
-            } else {
-                $cid = abs($dest);
-                $pid = 0;
-            }
-            $forumObject = $forumHandler->get($forum_id);
-            $forumObject->setVar('cat_id', $cid);
-            $forumObject->setVar('parent_forum', $pid);
-            $forumHandler->insert($forumObject);
-            if ($forumHandler->insert($forumObject)) {
-                if ($cid !== $forumObject->getVar('cat_id') && $subforums = newbbGetSubForum($forum_id)) {
-                    $forums = array_map('intval', array_values($subforums));
-                    $forumHandler->updateAll('cat_id', $cid, new \Criteria('forum_id', '(' . implode(', ', $forums) . ')', 'IN'));
-                }
+		if (Request::getInt('dest_forum', 0, 'POST')) {
+			$dest = Request::getInt('dest_forum', 0, 'POST');
+			if ($dest > 0) {
+				$pid        = $dest;
+				$forum_dest = $forumHandler->get($pid);
+				$cid        = $forum_dest->getVar('cat_id');
+				unset($forum_dest);
+			} else {
+				$cid = abs($dest);
+				$pid = 0;
+			}
+			$forumObject = $forumHandler->get($forum_id);
+			$forumObject->setVar('cat_id', $cid);
+			$forumObject->setVar('parent_forum', $pid);
+			$forumHandler->insert($forumObject);
+			if ($forumHandler->insert($forumObject)) {
+				if ($cid !== $forumObject->getVar('cat_id') && $subforums = newbbGetSubForum($forum_id)) {
+					$forums = array_map('intval', array_values($subforums));
+					$forumHandler->updateAll('cat_id', $cid, new \Criteria('forum_id', '(' . implode(', ', $forums) . ')', 'IN'));
+				}
 
-                //$cacheHelper->delete('forum');
-                redirect_header('admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MOVED);
-            } else {
-                redirect_header('admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
-            }
-        } else {
-            $box = '<select name="dest_forum">';
-            $box .= '<option value=0 selected>' . _SELECT . '</option>';
-            $box .= newbbForumSelectBox($forum_id, 'all', true, true);
-            $box .= '</select>';
+				//$cacheHelper->delete('forum');
+				redirect_header('admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MOVED);
+			} else {
+				redirect_header('admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
+			}
+		} else {
+			$box = '<select name="dest_forum">';
+			$box .= '<option value=0 selected>' . _SELECT . '</option>';
+			$box .= newbbForumSelectBox($forum_id, 'all', true, true);
+			$box .= '</select>';
 
-            echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-            echo '<form action="./admin_forum_manager.php" method="post" name="forummove" id="forummove">';
-            echo '<input type="hidden" name="op" value="moveforum" />';
-            echo '<input type="hidden" name="forum" value=' . $forum_id . ' />';
-            echo '<table border="0" cellpadding="1" cellspacing="0" align="center" valign="top" width="95%"><tr>';
-            echo '<td class="bg2" align="center"><strong>' . _AM_NEWBB_MOVETHISFORUM . '</strong></td>';
-            echo '</tr>';
-            echo '<tr><td class="bg1" align="center">' . $box . '</td></tr>';
-            echo '<tr><td align="center"><input type="submit" name="save" value=' . _GO . ' class="button" /></td></tr>';
-            echo '</table></form>';
-            echo '</td></tr></table>';
-        }
-        break;
+			echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+			echo '<form action="./admin_forum_manager.php" method="post" name="forummove" id="forummove">';
+			echo '<input type="hidden" name="op" value="moveforum" />';
+			echo '<input type="hidden" name="forum" value=' . $forum_id . ' />';
+			echo '<table border="0" cellpadding="1" cellspacing="0" align="center" valign="top" width="95%"><tr>';
+			echo '<td class="bg2" align="center"><strong>' . _AM_NEWBB_MOVETHISFORUM . '</strong></td>';
+			echo '</tr>';
+			echo '<tr><td class="bg1" align="center">' . $box . '</td></tr>';
+			echo '<tr><td align="center"><input type="submit" name="save" value=' . _GO . ' class="button" /></td></tr>';
+			echo '</table></form>';
+			echo '</td></tr></table>';
+		}
+		break;
 
-    case 'mergeforum':
-        //if (!$newXoopsModuleGui) loadModuleAdminMenu(2, "");
+	case 'mergeforum':
+		//if (!$newXoopsModuleGui) loadModuleAdminMenu(2, "");
 
-        if (Request::getString('dest_forum', '', 'POST')) {
-            $forum_dest = $forumHandler->get(Request::getString('dest_forum', '', 'POST'));
-            if (is_object($forum_dest)) {
-                $cid         = $forum_dest->getVar('cat_id');
-                $sql         = '    UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '    SET forum_id=' . Request::getInt('dest_forum', 0, 'POST') . "    WHERE forum_id=$forum_id";
-                $result_post = $GLOBALS['xoopsDB']->queryF($sql);
+		if (Request::getString('dest_forum', '', 'POST')) {
+			$forum_dest = $forumHandler->get(Request::getString('dest_forum', '', 'POST'));
+			if (is_object($forum_dest)) {
+				$cid         = $forum_dest->getVar('cat_id');
+				$sql         = '    UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '    SET forum_id=' . Request::getInt('dest_forum', 0, 'POST') . "    WHERE forum_id=$forum_id";
+				$result_post = $GLOBALS['xoopsDB']->queryF($sql);
 
-                $sql          = '    UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '    SET forum_id=' . Request::getInt('dest_forum', 0, 'POST') . "    WHERE forum_id=$forum_id";
-                $result_topic = $GLOBALS['xoopsDB']->queryF($sql);
+				$sql          = '    UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '    SET forum_id=' . Request::getInt('dest_forum', 0, 'POST') . "    WHERE forum_id=$forum_id";
+				$result_topic = $GLOBALS['xoopsDB']->queryF($sql);
 
-                $forumObject = $forumHandler->get($forum_id);
-                $forumHandler->updateAll('parent_forum', Request::getInt('dest_forum', 0, 'POST'), new \Criteria('parent_forum', $forum_id));
-                if ($cid !== $forumObject->getVar('cat_id') && $subforums = newbbGetSubForum($forum_id)) {
-                    $forums = array_map('intval', array_values($subforums));
-                    $forumHandler->updateAll('cat_id', $cid, new \Criteria('forum_id', '(' . implode(', ', $forums) . ')', 'IN'));
-                }
+				$forumObject = $forumHandler->get($forum_id);
+				$forumHandler->updateAll('parent_forum', Request::getInt('dest_forum', 0, 'POST'), new \Criteria('parent_forum', $forum_id));
+				if ($cid !== $forumObject->getVar('cat_id') && $subforums = newbbGetSubForum($forum_id)) {
+					$forums = array_map('intval', array_values($subforums));
+					$forumHandler->updateAll('cat_id', $cid, new \Criteria('forum_id', '(' . implode(', ', $forums) . ')', 'IN'));
+				}
 
-                $forumHandler->delete($forumObject);
+				$forumHandler->delete($forumObject);
 
-                $forumHandler->synchronization($forum_dest);
-                unset($forum_dest);
-                $cacheHelper->delete('forum');
+				$forumHandler->synchronization($forum_dest);
+				unset($forum_dest);
+				$cacheHelper->delete('forum');
 
-                redirect_header('admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MERGED);
-            } else {
-                redirect_header('admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
-            }
-        } else {
-            $box = '<select name="dest_forum">';
-            $box .= '<option value=0 selected>' . _SELECT . '</option>';
-            $box .= newbbForumSelectBox($forum_id, 'all');
-            $box .= '</select>';
-            echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-            echo '<form action="' . xoops_getenv('PHP_SELF') . '" method="post" name="forummove" id="forummove">';
-            echo '<input type="hidden" name="op" value="mergeforum" />';
-            echo '<input type="hidden" name="forum" value=' . $forum_id . ' />';
-            echo '<table border="0" cellpadding="1" cellspacing="0" align="center" valign="top" width="95%"><tr>';
-            echo '<td class="bg2" align="center"><strong>' . _AM_NEWBB_MERGETHISFORUM . '</strong></td>';
-            echo '</tr>';
-            echo '<tr><td class="bg1" align="center">' . _AM_NEWBB_MERGETO_FORUM . '</td></tr>';
-            echo '<tr><td class="bg1" align="center">' . $box . '</td></tr>';
-            echo '<tr><td align="center"><input type="submit" name="save" value=' . _GO . ' class="button" /></td></tr>';
-            echo '</form></table>';
-            echo '</td></tr></table>';
-        }
-        break;
+				redirect_header('admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_FORUM_MERGED);
+			} else {
+				redirect_header('admin_forum_manager.php?op=manage', 2, _AM_NEWBB_MSG_ERR_FORUM_MOVED);
+			}
+		} else {
+			$box = '<select name="dest_forum">';
+			$box .= '<option value=0 selected>' . _SELECT . '</option>';
+			$box .= newbbForumSelectBox($forum_id, 'all');
+			$box .= '</select>';
+			echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+			echo '<form action="' . xoops_getenv('PHP_SELF') . '" method="post" name="forummove" id="forummove">';
+			echo '<input type="hidden" name="op" value="mergeforum" />';
+			echo '<input type="hidden" name="forum" value=' . $forum_id . ' />';
+			echo '<table border="0" cellpadding="1" cellspacing="0" align="center" valign="top" width="95%"><tr>';
+			echo '<td class="bg2" align="center"><strong>' . _AM_NEWBB_MERGETHISFORUM . '</strong></td>';
+			echo '</tr>';
+			echo '<tr><td class="bg1" align="center">' . _AM_NEWBB_MERGETO_FORUM . '</td></tr>';
+			echo '<tr><td class="bg1" align="center">' . $box . '</td></tr>';
+			echo '<tr><td align="center"><input type="submit" name="save" value=' . _GO . ' class="button" /></td></tr>';
+			echo '</form></table>';
+			echo '</td></tr></table>';
+		}
+		break;
 
-    case 'save':
+	case 'save':
 
-        if ($forum_id) {
-            $forumObject = $forumHandler->get($forum_id);
-            $message     = _AM_NEWBB_FORUMUPDATE;
-        } else {
-            $forumObject = $forumHandler->create();
-            $message     = _AM_NEWBB_FORUMCREATED;
-        }
+		if ($forum_id) {
+			$forumObject = $forumHandler->get($forum_id);
+			$message     = _AM_NEWBB_FORUMUPDATE;
+		} else {
+			$forumObject = $forumHandler->create();
+			$message     = _AM_NEWBB_FORUMCREATED;
+		}
 
-        $forumObject->setVar('forum_name', Request::getString('forum_name', '', 'POST'));
-        $forumObject->setVar('forum_desc', Request::getString('forum_desc', '', 'POST'));
-        $forumObject->setVar('forum_order', Request::getInt('forum_order', 0, 'POST'));
-        $forumObject->setVar('forum_moderator', Request::getArray('forum_moderator', [], 'POST'));
-        $forumObject->setVar('parent_forum', Request::getInt('parent_forum', 0, 'POST'));
-        $forumObject->setVar('attach_maxkb', Request::getInt('attach_maxkb', 0, 'POST'));
-        $forumObject->setVar('attach_ext', Request::getString('attach_ext', '', 'POST'));
-        $forumObject->setVar('hot_threshold', Request::getInt('hot_threshold', 0, 'POST'));
-        if (Request::getInt('parent_forum', 0, 'POST')) {
-            $parentObject    = $forumHandler->get(Request::getInt('parent_forum', 0, 'POST'), ['cat_id']);
-            $_POST['cat_id'] = $parentObject->getVar('cat_id');
-        }
-        $forumObject->setVar('cat_id', Request::getInt('cat_id', 0, 'POST'));
+		$forumObject->setVar('forum_name', Request::getString('forum_name', '', 'POST'));
+		$forumObject->setVar('forum_desc', Request::getString('forum_desc', '', 'POST'));
+		$forumObject->setVar('forum_order', Request::getInt('forum_order', 0, 'POST'));
+		$forumObject->setVar('forum_moderator', Request::getArray('forum_moderator', [], 'POST'));
+		$forumObject->setVar('parent_forum', Request::getInt('parent_forum', 0, 'POST'));
+		$forumObject->setVar('attach_maxkb', Request::getInt('attach_maxkb', 0, 'POST'));
+		$forumObject->setVar('attach_ext', Request::getString('attach_ext', '', 'POST'));
+		$forumObject->setVar('hot_threshold', Request::getInt('hot_threshold', 0, 'POST'));
+		if (Request::getInt('parent_forum', 0, 'POST')) {
+			$parentObject    = $forumHandler->get(Request::getInt('parent_forum', 0, 'POST'), ['cat_id']);
+			$_POST['cat_id'] = $parentObject->getVar('cat_id');
+		}
+		$forumObject->setVar('cat_id', Request::getInt('cat_id', 0, 'POST'));
 
-        if ($forumHandler->insert($forumObject)) {
-            //$cacheHelper->delete('forum');
-            if (Request::getInt('perm_template', 0, 'POST')) {
-                //                /** var Newbb\PermissionHandler $permHandler */
-                //                $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-                $perm_template = $permHandler->getTemplate();
-                /** @var \XoopsMemberHandler $memberHandler */
-                $memberHandler = xoops_getHandler('member');
-                $glist         = $memberHandler->getGroupList();
-                $perms         = $permHandler->getValidForumPerms(true);
-                foreach (array_keys($glist) as $group) {
-                    foreach ($perms as $perm) {
-                        $ids = $permHandler->getItemIds($perm, $group, $xoopsModule->getVar('mid'));
-                        if (!in_array($forumObject->getVar('forum_id'), $ids)) {
-                            if (empty($perm_template[$group][$perm])) {
-                                $permHandler->deleteRight($perm, $forumObject->getVar('forum_id'), $group, $xoopsModule->getVar('mid'));
-                            } else {
-                                $permHandler->addRight($perm, $forumObject->getVar('forum_id'), $group, $xoopsModule->getVar('mid'));
-                            }
-                        }
-                    }
-                }
-            }
-            redirect_header('admin_forum_manager.php', 2, $message);
-        } else {
-            redirect_header('admin_forum_manager.php?op=mod&amp;forum=' . $forumObject->getVar('forum_id') . '', 2, _AM_NEWBB_FORUM_ERROR);
-        }
-        break;
+		if ($forumHandler->insert($forumObject)) {
+			//$cacheHelper->delete('forum');
+			if (Request::getInt('perm_template', 0, 'POST')) {
+				//                /** var Newbb\PermissionHandler $permHandler */
+				//                $permHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+				$perm_template = $permHandler->getTemplate();
+				/** @var \XoopsMemberHandler $memberHandler */
+				$memberHandler = xoops_getHandler('member');
+				$glist         = $memberHandler->getGroupList();
+				$perms         = $permHandler->getValidForumPerms(true);
+				foreach (array_keys($glist) as $group) {
+					foreach ($perms as $perm) {
+						$ids = $permHandler->getItemIds($perm, $group, $xoopsModule->getVar('mid'));
+						if (!in_array($forumObject->getVar('forum_id'), $ids)) {
+							if (empty($perm_template[$group][$perm])) {
+								$permHandler->deleteRight($perm, $forumObject->getVar('forum_id'), $group, $xoopsModule->getVar('mid'));
+							} else {
+								$permHandler->addRight($perm, $forumObject->getVar('forum_id'), $group, $xoopsModule->getVar('mid'));
+							}
+						}
+					}
+				}
+			}
+			redirect_header('admin_forum_manager.php', 2, $message);
+		} else {
+			redirect_header('admin_forum_manager.php?op=mod&amp;forum=' . $forumObject->getVar('forum_id') . '', 2, _AM_NEWBB_FORUM_ERROR);
+		}
+		break;
 
-    case 'mod':
-        $forumObject = $forumHandler->get($forum_id);
-        require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/form.forum.php');
-        break;
+	case 'mod':
+		$forumObject = $forumHandler->get($forum_id);
+		require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/form.forum.php');
+		break;
 
-    case 'del':
-        if (1 !== Request::getInt('confirm', 0, 'POST')) {
-            xoops_confirm(['op' => 'del', 'forum' => Request::getInt('forum', 0, 'GET'), 'confirm' => 1], 'admin_forum_manager.php', _AM_NEWBB_TWDAFAP);
-            break;
-        } else {
-            $forumObject = $forumHandler->get(Request::getInt('forum', 0, 'POST'));
-            $forumHandler->delete($forumObject);
-            //$cacheHelper->delete('forum');
-            redirect_header('admin_forum_manager.php?op=manage', 1, _AM_NEWBB_FORUMREMOVED);
-        }
-        break;
+	case 'del':
+		if (1 !== Request::getInt('confirm', 0, 'POST')) {
+			xoops_confirm(['op' => 'del', 'forum' => Request::getInt('forum', 0, 'GET'), 'confirm' => 1], 'admin_forum_manager.php', _AM_NEWBB_TWDAFAP);
+			break;
+		} else {
+			$forumObject = $forumHandler->get(Request::getInt('forum', 0, 'POST'));
+			$forumHandler->delete($forumObject);
+			//$cacheHelper->delete('forum');
+			redirect_header('admin_forum_manager.php?op=manage', 1, _AM_NEWBB_FORUMREMOVED);
+		}
+		break;
 
-    case 'addforum':
-        echo '<br>';
-        $parent_forum = Request::getInt('forum', 0, 'GET');
-        $cat_id       = Request::getInt('cat_id', 0, 'GET');
-        if (!$parent_forum && !$cat_id) {
-            break;
-        }
-        $forumObject = $forumHandler->create();
-        $forumObject->setVar('parent_forum', $parent_forum);
-        $forumObject->setVar('cat_id', $cat_id);
-        require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/form.forum.php');
-        break;
+	case 'addforum':
+		echo '<br>';
+		$parent_forum = Request::getInt('forum', 0, 'GET');
+		$cat_id       = Request::getInt('cat_id', 0, 'GET');
+		if (!$parent_forum && !$cat_id) {
+			break;
+		}
+		$forumObject = $forumHandler->create();
+		$forumObject->setVar('parent_forum', $parent_forum);
+		$forumObject->setVar('cat_id', $cat_id);
+		require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/form.forum.php');
+		break;
 
-    default:
+	default:
 
-        //        /** @var Newbb\CategoryHandler $categoryHandler */
-        //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
-        $criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
-        $criteriaCategory->setSort('cat_order');
-        $categories = $categoryHandler->getList($criteriaCategory);
-        if (0 === count($categories)) {
-            redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CREATENEWCATEGORY);
-        }
+		//        /** @var Newbb\CategoryHandler $categoryHandler */
+		//        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
+		$criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
+		$criteriaCategory->setSort('cat_order');
+		$categories = $categoryHandler->getList($criteriaCategory);
+		if (0 === count($categories)) {
+			redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CREATENEWCATEGORY);
+		}
 
-        $echo = $adminObject->displayNavigation(basename(__FILE__));
-        $echo .= "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        $echo .= "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        $echo .= "<tr align='center'>";
-        $echo .= "<th class='bg3' colspan='2'>" . _AM_NEWBB_NAME . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_EDIT . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_DELETE . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_ADD . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_MOVE . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_MERGE . '</th>';
-        $echo .= '</tr>';
+		$echo = $adminObject->displayNavigation(basename(__FILE__));
+		$echo .= "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		$echo .= "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		$echo .= "<tr align='center'>";
+		$echo .= "<th class='bg3' colspan='2'>" . _AM_NEWBB_NAME . '</th>';
+		$echo .= "<th class='bg3'>" . _AM_NEWBB_EDIT . '</th>';
+		$echo .= "<th class='bg3'>" . _AM_NEWBB_DELETE . '</th>';
+		$echo .= "<th class='bg3'>" . _AM_NEWBB_ADD . '</th>';
+		$echo .= "<th class='bg3'>" . _AM_NEWBB_MOVE . '</th>';
+		$echo .= "<th class='bg3'>" . _AM_NEWBB_MERGE . '</th>';
+		$echo .= '</tr>';
 
-        //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
-        $criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
-        $criteriaCategory->setSort('cat_order');
-        $categories = $categoryHandler->getList($criteriaCategory);
-        $forums     = $forumHandler->getTree(array_keys($categories), 0, 'all');
-        foreach (array_keys($categories) as $c) {
-            $category       = $categories[$c];
-            $cat_id         = $c;
-            $cat_link       = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/index.php?viewcat=' . $cat_id . '">' . $category . '</a>';
-            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&amp;cat_id=' . $cat_id . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
-            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&amp;cat_id=' . $cat_id . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
-            $forum_add_link = '<a href="admin_forum_manager.php?op=addforum&amp;cat_id=' . $cat_id . '">' . newbbDisplayImage('new_forum') . '</a>';
-            $echo           .= "<tr class='even' align='left'>";
-            $echo           .= "<td width='100%' colspan='2'><strong>" . $cat_link . '</strong></td>';
-            $echo           .= "<td align='center'>" . $cat_edit_link . '</td>';
-            $echo           .= "<td align='center'>" . $cat_del_link . '</td>';
-            $echo           .= "<td align='center'>" . $forum_add_link . '</td>';
-            $echo           .= '<td></td>';
-            $echo           .= '<td></td>';
-            $echo           .= '</tr>';
-            if (!isset($forums[$c])) {
-                continue;
-            }
-            $i = 0;
-            foreach (array_keys($forums[$c]) as $f) {
-                $forum        = $forums[$c][$f];
-                $f_link       = $forum['prefix'] . '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewforum.php?forum=' . $f . '">' . $forum['forum_name'] . '</a>';
-                $f_edit_link  = '<a href="admin_forum_manager.php?op=mod&amp;forum=' . $f . '">' . newbbDisplayImage('admin_edit', _AM_NEWBB_EDIT) . '</a>';
-                $f_del_link   = '<a href="admin_forum_manager.php?op=del&amp;forum=' . $f . '">' . newbbDisplayImage('admin_delete', _AM_NEWBB_DELETE) . '</a>';
-                $sf_add_link  = '<a href="admin_forum_manager.php?op=addforum&amp;cat_id=' . $c . '&forum=' . $f . '">' . newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM) . '</a>';
-                $f_move_link  = '<a href="admin_forum_manager.php?op=moveforum&amp;forum=' . $f . '">' . newbbDisplayImage('admin_move', _AM_NEWBB_MOVE) . '</a>';
-                $f_merge_link = '<a href="admin_forum_manager.php?op=mergeforum&amp;forum=' . $f . '">' . newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE) . '</a>';
+		//        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
+		$criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
+		$criteriaCategory->setSort('cat_order');
+		$categories = $categoryHandler->getList($criteriaCategory);
+		$forums     = $forumHandler->getTree(array_keys($categories), 0, 'all');
+		foreach (array_keys($categories) as $c) {
+			$category       = $categories[$c];
+			$cat_id         = $c;
+			$cat_link       = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/index.php?viewcat=' . $cat_id . '">' . $category . '</a>';
+			$cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&amp;cat_id=' . $cat_id . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
+			$cat_del_link   = '<a href="admin_cat_manager.php?op=del&amp;cat_id=' . $cat_id . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
+			$forum_add_link = '<a href="admin_forum_manager.php?op=addforum&amp;cat_id=' . $cat_id . '">' . newbbDisplayImage('new_forum') . '</a>';
+			$echo           .= "<tr class='even' align='left'>";
+			$echo           .= "<td width='100%' colspan='2'><strong>" . $cat_link . '</strong></td>';
+			$echo           .= "<td align='center'>" . $cat_edit_link . '</td>';
+			$echo           .= "<td align='center'>" . $cat_del_link . '</td>';
+			$echo           .= "<td align='center'>" . $forum_add_link . '</td>';
+			$echo           .= '<td></td>';
+			$echo           .= '<td></td>';
+			$echo           .= '</tr>';
+			if (!isset($forums[$c])) {
+				continue;
+			}
+			$i = 0;
+			foreach (array_keys($forums[$c]) as $f) {
+				$forum        = $forums[$c][$f];
+				$f_link       = $forum['prefix'] . '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewforum.php?forum=' . $f . '">' . $forum['forum_name'] . '</a>';
+				$f_edit_link  = '<a href="admin_forum_manager.php?op=mod&amp;forum=' . $f . '">' . newbbDisplayImage('admin_edit', _AM_NEWBB_EDIT) . '</a>';
+				$f_del_link   = '<a href="admin_forum_manager.php?op=del&amp;forum=' . $f . '">' . newbbDisplayImage('admin_delete', _AM_NEWBB_DELETE) . '</a>';
+				$sf_add_link  = '<a href="admin_forum_manager.php?op=addforum&amp;cat_id=' . $c . '&forum=' . $f . '">' . newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM) . '</a>';
+				$f_move_link  = '<a href="admin_forum_manager.php?op=moveforum&amp;forum=' . $f . '">' . newbbDisplayImage('admin_move', _AM_NEWBB_MOVE) . '</a>';
+				$f_merge_link = '<a href="admin_forum_manager.php?op=mergeforum&amp;forum=' . $f . '">' . newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE) . '</a>';
 
-                $class = (($i++) % 2) ? 'odd' : 'even';
-                $echo  .= "<tr class='" . $class . "' align='left'><td></td>";
-                $echo  .= '<td><strong>' . $f_link . '</strong></td>';
-                $echo  .= "<td align='center'>" . $f_edit_link . '</td>';
-                $echo  .= "<td align='center'>" . $f_del_link . '</td>';
-                $echo  .= "<td align='center'>" . $sf_add_link . '</td>';
-                $echo  .= "<td align='center'>" . $f_move_link . '</td>';
-                $echo  .= "<td align='center'>" . $f_merge_link . '</td>';
-                $echo  .= '</tr>';
-            }
-        }
-        unset($forums, $categories);
+				$class = (($i++) % 2) ? 'odd' : 'even';
+				$echo  .= "<tr class='" . $class . "' align='left'><td></td>";
+				$echo  .= '<td><strong>' . $f_link . '</strong></td>';
+				$echo  .= "<td align='center'>" . $f_edit_link . '</td>';
+				$echo  .= "<td align='center'>" . $f_del_link . '</td>';
+				$echo  .= "<td align='center'>" . $sf_add_link . '</td>';
+				$echo  .= "<td align='center'>" . $f_move_link . '</td>';
+				$echo  .= "<td align='center'>" . $f_merge_link . '</td>';
+				$echo  .= '</tr>';
+			}
+		}
+		unset($forums, $categories);
 
-        echo $echo;
-        echo '</table>';
-        echo '</td></tr></table>';
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_FORUM . '&nbsp;</legend>';
-        echo _AM_NEWBB_HELP_FORUM_TAB;
-        echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
-        echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
-        echo '<br>' . newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM) . '&nbsp;-&nbsp;' . _AM_NEWBB_CREATEFORUM;
-        echo '<br>' . newbbDisplayImage('admin_move', _AM_NEWBB_MOVE) . '&nbsp;-&nbsp;' . _AM_NEWBB_MOVE;
-        echo '<br>' . newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE) . '&nbsp;-&nbsp;' . _AM_NEWBB_MERGE;
-        echo '</fieldset>';
-        break;
+		echo $echo;
+		echo '</table>';
+		echo '</td></tr></table>';
+		echo '<fieldset>';
+		echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_FORUM . '&nbsp;</legend>';
+		echo _AM_NEWBB_HELP_FORUM_TAB;
+		echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
+		echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
+		echo '<br>' . newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM) . '&nbsp;-&nbsp;' . _AM_NEWBB_CREATEFORUM;
+		echo '<br>' . newbbDisplayImage('admin_move', _AM_NEWBB_MOVE) . '&nbsp;-&nbsp;' . _AM_NEWBB_MOVE;
+		echo '<br>' . newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE) . '&nbsp;-&nbsp;' . _AM_NEWBB_MERGE;
+		echo '</fieldset>';
+		break;
 }
 require_once __DIR__ . '/admin_footer.php';

Spacing +59 added lines, -59 removed lines

@@ -32,11 +32,11 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 require_once $GLOBALS['xoops']->path('class/xoopstree.php');
 require_once $GLOBALS['xoops']->path('class/pagenav.php');
-require_once  dirname(__DIR__) . '/include/functions.forum.php';
-require_once  dirname(__DIR__) . '/include/functions.render.php';
+require_once  dirname(__DIR__).'/include/functions.forum.php';
+require_once  dirname(__DIR__).'/include/functions.render.php';
 
 $cacheHelper = Newbb\Utility::cleanCache();
 
@@ -69,7 +69,7 @@ 
             if ($forumHandler->insert($forumObject)) {
                 if ($cid !== $forumObject->getVar('cat_id') && $subforums = newbbGetSubForum($forum_id)) {
                     $forums = array_map('intval', array_values($subforums));
-                    $forumHandler->updateAll('cat_id', $cid, new \Criteria('forum_id', '(' . implode(', ', $forums) . ')', 'IN'));
+                    $forumHandler->updateAll('cat_id', $cid, new \Criteria('forum_id', '('.implode(', ', $forums).')', 'IN'));
                 }
 
                 //$cacheHelper->delete('forum');
@@ -79,19 +79,19 @@ 
             }
         } else {
             $box = '<select name="dest_forum">';
-            $box .= '<option value=0 selected>' . _SELECT . '</option>';
+            $box .= '<option value=0 selected>'._SELECT.'</option>';
             $box .= newbbForumSelectBox($forum_id, 'all', true, true);
             $box .= '</select>';
 
-            echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+            echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
             echo '<form action="./admin_forum_manager.php" method="post" name="forummove" id="forummove">';
             echo '<input type="hidden" name="op" value="moveforum" />';
-            echo '<input type="hidden" name="forum" value=' . $forum_id . ' />';
+            echo '<input type="hidden" name="forum" value='.$forum_id.' />';
             echo '<table border="0" cellpadding="1" cellspacing="0" align="center" valign="top" width="95%"><tr>';
-            echo '<td class="bg2" align="center"><strong>' . _AM_NEWBB_MOVETHISFORUM . '</strong></td>';
+            echo '<td class="bg2" align="center"><strong>'._AM_NEWBB_MOVETHISFORUM.'</strong></td>';
             echo '</tr>';
-            echo '<tr><td class="bg1" align="center">' . $box . '</td></tr>';
-            echo '<tr><td align="center"><input type="submit" name="save" value=' . _GO . ' class="button" /></td></tr>';
+            echo '<tr><td class="bg1" align="center">'.$box.'</td></tr>';
+            echo '<tr><td align="center"><input type="submit" name="save" value='._GO.' class="button" /></td></tr>';
             echo '</table></form>';
             echo '</td></tr></table>';
         }
@@ -104,17 +104,17 @@ 
             $forum_dest = $forumHandler->get(Request::getString('dest_forum', '', 'POST'));
             if (is_object($forum_dest)) {
                 $cid         = $forum_dest->getVar('cat_id');
-                $sql         = '    UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '    SET forum_id=' . Request::getInt('dest_forum', 0, 'POST') . "    WHERE forum_id=$forum_id";
+                $sql         = '    UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_posts').'    SET forum_id='.Request::getInt('dest_forum', 0, 'POST')."    WHERE forum_id=$forum_id";
                 $result_post = $GLOBALS['xoopsDB']->queryF($sql);
 
-                $sql          = '    UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . '    SET forum_id=' . Request::getInt('dest_forum', 0, 'POST') . "    WHERE forum_id=$forum_id";
+                $sql          = '    UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_topics').'    SET forum_id='.Request::getInt('dest_forum', 0, 'POST')."    WHERE forum_id=$forum_id";
                 $result_topic = $GLOBALS['xoopsDB']->queryF($sql);
 
                 $forumObject = $forumHandler->get($forum_id);
                 $forumHandler->updateAll('parent_forum', Request::getInt('dest_forum', 0, 'POST'), new \Criteria('parent_forum', $forum_id));
                 if ($cid !== $forumObject->getVar('cat_id') && $subforums = newbbGetSubForum($forum_id)) {
                     $forums = array_map('intval', array_values($subforums));
-                    $forumHandler->updateAll('cat_id', $cid, new \Criteria('forum_id', '(' . implode(', ', $forums) . ')', 'IN'));
+                    $forumHandler->updateAll('cat_id', $cid, new \Criteria('forum_id', '('.implode(', ', $forums).')', 'IN'));
                 }
 
                 $forumHandler->delete($forumObject);
@@ -129,19 +129,19 @@ 
             }
         } else {
             $box = '<select name="dest_forum">';
-            $box .= '<option value=0 selected>' . _SELECT . '</option>';
+            $box .= '<option value=0 selected>'._SELECT.'</option>';
             $box .= newbbForumSelectBox($forum_id, 'all');
             $box .= '</select>';
-            echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-            echo '<form action="' . xoops_getenv('PHP_SELF') . '" method="post" name="forummove" id="forummove">';
+            echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+            echo '<form action="'.xoops_getenv('PHP_SELF').'" method="post" name="forummove" id="forummove">';
             echo '<input type="hidden" name="op" value="mergeforum" />';
-            echo '<input type="hidden" name="forum" value=' . $forum_id . ' />';
+            echo '<input type="hidden" name="forum" value='.$forum_id.' />';
             echo '<table border="0" cellpadding="1" cellspacing="0" align="center" valign="top" width="95%"><tr>';
-            echo '<td class="bg2" align="center"><strong>' . _AM_NEWBB_MERGETHISFORUM . '</strong></td>';
+            echo '<td class="bg2" align="center"><strong>'._AM_NEWBB_MERGETHISFORUM.'</strong></td>';
             echo '</tr>';
-            echo '<tr><td class="bg1" align="center">' . _AM_NEWBB_MERGETO_FORUM . '</td></tr>';
-            echo '<tr><td class="bg1" align="center">' . $box . '</td></tr>';
-            echo '<tr><td align="center"><input type="submit" name="save" value=' . _GO . ' class="button" /></td></tr>';
+            echo '<tr><td class="bg1" align="center">'._AM_NEWBB_MERGETO_FORUM.'</td></tr>';
+            echo '<tr><td class="bg1" align="center">'.$box.'</td></tr>';
+            echo '<tr><td align="center"><input type="submit" name="save" value='._GO.' class="button" /></td></tr>';
             echo '</form></table>';
             echo '</td></tr></table>';
         }
@@ -196,13 +196,13 @@ 
             }
             redirect_header('admin_forum_manager.php', 2, $message);
         } else {
-            redirect_header('admin_forum_manager.php?op=mod&amp;forum=' . $forumObject->getVar('forum_id') . '', 2, _AM_NEWBB_FORUM_ERROR);
+            redirect_header('admin_forum_manager.php?op=mod&amp;forum='.$forumObject->getVar('forum_id').'', 2, _AM_NEWBB_FORUM_ERROR);
         }
         break;
 
     case 'mod':
         $forumObject = $forumHandler->get($forum_id);
-        require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/form.forum.php');
+        require_once $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/include/form.forum.php');
         break;
 
     case 'del':
@@ -227,7 +227,7 @@ 
         $forumObject = $forumHandler->create();
         $forumObject->setVar('parent_forum', $parent_forum);
         $forumObject->setVar('cat_id', $cat_id);
-        require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/include/form.forum.php');
+        require_once $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/include/form.forum.php');
         break;
 
     default:
@@ -242,15 +242,15 @@ 
         }
 
         $echo = $adminObject->displayNavigation(basename(__FILE__));
-        $echo .= "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+        $echo .= "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
         $echo .= "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         $echo .= "<tr align='center'>";
-        $echo .= "<th class='bg3' colspan='2'>" . _AM_NEWBB_NAME . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_EDIT . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_DELETE . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_ADD . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_MOVE . '</th>';
-        $echo .= "<th class='bg3'>" . _AM_NEWBB_MERGE . '</th>';
+        $echo .= "<th class='bg3' colspan='2'>"._AM_NEWBB_NAME.'</th>';
+        $echo .= "<th class='bg3'>"._AM_NEWBB_EDIT.'</th>';
+        $echo .= "<th class='bg3'>"._AM_NEWBB_DELETE.'</th>';
+        $echo .= "<th class='bg3'>"._AM_NEWBB_ADD.'</th>';
+        $echo .= "<th class='bg3'>"._AM_NEWBB_MOVE.'</th>';
+        $echo .= "<th class='bg3'>"._AM_NEWBB_MERGE.'</th>';
         $echo .= '</tr>';
 
         //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
@@ -261,15 +261,15 @@ 
         foreach (array_keys($categories) as $c) {
             $category       = $categories[$c];
             $cat_id         = $c;
-            $cat_link       = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/index.php?viewcat=' . $cat_id . '">' . $category . '</a>';
-            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&amp;cat_id=' . $cat_id . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
-            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&amp;cat_id=' . $cat_id . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
-            $forum_add_link = '<a href="admin_forum_manager.php?op=addforum&amp;cat_id=' . $cat_id . '">' . newbbDisplayImage('new_forum') . '</a>';
+            $cat_link       = '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/index.php?viewcat='.$cat_id.'">'.$category.'</a>';
+            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&amp;cat_id='.$cat_id.'">'.newbbDisplayImage('admin_edit', _EDIT).'</a>';
+            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&amp;cat_id='.$cat_id.'">'.newbbDisplayImage('admin_delete', _DELETE).'</a>';
+            $forum_add_link = '<a href="admin_forum_manager.php?op=addforum&amp;cat_id='.$cat_id.'">'.newbbDisplayImage('new_forum').'</a>';
             $echo           .= "<tr class='even' align='left'>";
-            $echo           .= "<td width='100%' colspan='2'><strong>" . $cat_link . '</strong></td>';
-            $echo           .= "<td align='center'>" . $cat_edit_link . '</td>';
-            $echo           .= "<td align='center'>" . $cat_del_link . '</td>';
-            $echo           .= "<td align='center'>" . $forum_add_link . '</td>';
+            $echo           .= "<td width='100%' colspan='2'><strong>".$cat_link.'</strong></td>';
+            $echo           .= "<td align='center'>".$cat_edit_link.'</td>';
+            $echo           .= "<td align='center'>".$cat_del_link.'</td>';
+            $echo           .= "<td align='center'>".$forum_add_link.'</td>';
             $echo           .= '<td></td>';
             $echo           .= '<td></td>';
             $echo           .= '</tr>';
@@ -279,21 +279,21 @@ 
             $i = 0;
             foreach (array_keys($forums[$c]) as $f) {
                 $forum        = $forums[$c][$f];
-                $f_link       = $forum['prefix'] . '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/viewforum.php?forum=' . $f . '">' . $forum['forum_name'] . '</a>';
-                $f_edit_link  = '<a href="admin_forum_manager.php?op=mod&amp;forum=' . $f . '">' . newbbDisplayImage('admin_edit', _AM_NEWBB_EDIT) . '</a>';
-                $f_del_link   = '<a href="admin_forum_manager.php?op=del&amp;forum=' . $f . '">' . newbbDisplayImage('admin_delete', _AM_NEWBB_DELETE) . '</a>';
-                $sf_add_link  = '<a href="admin_forum_manager.php?op=addforum&amp;cat_id=' . $c . '&forum=' . $f . '">' . newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM) . '</a>';
-                $f_move_link  = '<a href="admin_forum_manager.php?op=moveforum&amp;forum=' . $f . '">' . newbbDisplayImage('admin_move', _AM_NEWBB_MOVE) . '</a>';
-                $f_merge_link = '<a href="admin_forum_manager.php?op=mergeforum&amp;forum=' . $f . '">' . newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE) . '</a>';
+                $f_link       = $forum['prefix'].'<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/viewforum.php?forum='.$f.'">'.$forum['forum_name'].'</a>';
+                $f_edit_link  = '<a href="admin_forum_manager.php?op=mod&amp;forum='.$f.'">'.newbbDisplayImage('admin_edit', _AM_NEWBB_EDIT).'</a>';
+                $f_del_link   = '<a href="admin_forum_manager.php?op=del&amp;forum='.$f.'">'.newbbDisplayImage('admin_delete', _AM_NEWBB_DELETE).'</a>';
+                $sf_add_link  = '<a href="admin_forum_manager.php?op=addforum&amp;cat_id='.$c.'&forum='.$f.'">'.newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM).'</a>';
+                $f_move_link  = '<a href="admin_forum_manager.php?op=moveforum&amp;forum='.$f.'">'.newbbDisplayImage('admin_move', _AM_NEWBB_MOVE).'</a>';
+                $f_merge_link = '<a href="admin_forum_manager.php?op=mergeforum&amp;forum='.$f.'">'.newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE).'</a>';
 
                 $class = (($i++) % 2) ? 'odd' : 'even';
-                $echo  .= "<tr class='" . $class . "' align='left'><td></td>";
-                $echo  .= '<td><strong>' . $f_link . '</strong></td>';
-                $echo  .= "<td align='center'>" . $f_edit_link . '</td>';
-                $echo  .= "<td align='center'>" . $f_del_link . '</td>';
-                $echo  .= "<td align='center'>" . $sf_add_link . '</td>';
-                $echo  .= "<td align='center'>" . $f_move_link . '</td>';
-                $echo  .= "<td align='center'>" . $f_merge_link . '</td>';
+                $echo  .= "<tr class='".$class."' align='left'><td></td>";
+                $echo  .= '<td><strong>'.$f_link.'</strong></td>';
+                $echo  .= "<td align='center'>".$f_edit_link.'</td>';
+                $echo  .= "<td align='center'>".$f_del_link.'</td>';
+                $echo  .= "<td align='center'>".$sf_add_link.'</td>';
+                $echo  .= "<td align='center'>".$f_move_link.'</td>';
+                $echo  .= "<td align='center'>".$f_merge_link.'</td>';
                 $echo  .= '</tr>';
             }
         }
@@ -303,14 +303,14 @@ 
         echo '</table>';
         echo '</td></tr></table>';
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_FORUM . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_FORUM.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_FORUM_TAB;
-        echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
-        echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
-        echo '<br>' . newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM) . '&nbsp;-&nbsp;' . _AM_NEWBB_CREATEFORUM;
-        echo '<br>' . newbbDisplayImage('admin_move', _AM_NEWBB_MOVE) . '&nbsp;-&nbsp;' . _AM_NEWBB_MOVE;
-        echo '<br>' . newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE) . '&nbsp;-&nbsp;' . _AM_NEWBB_MERGE;
+        echo '<br>'.newbbDisplayImage('admin_edit', _EDIT).'&nbsp;-&nbsp;'._EDIT;
+        echo '<br>'.newbbDisplayImage('admin_delete', _DELETE).'&nbsp;-&nbsp;'._DELETE;
+        echo '<br>'.newbbDisplayImage('new_forum', _AM_NEWBB_CREATEFORUM).'&nbsp;-&nbsp;'._AM_NEWBB_CREATEFORUM;
+        echo '<br>'.newbbDisplayImage('admin_move', _AM_NEWBB_MOVE).'&nbsp;-&nbsp;'._AM_NEWBB_MOVE;
+        echo '<br>'.newbbDisplayImage('admin_merge', _AM_NEWBB_MERGE).'&nbsp;-&nbsp;'._AM_NEWBB_MERGE;
         echo '</fieldset>';
         break;
 }
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/admin_synchronization.php

Indentation +75 added lines, -75 removed lines

@@ -22,83 +22,83 @@
 $start = Request::getInt('start', 0, 'GET'); //(int)( @$_GET['start'] );
 
 switch (Request::getString('type', '', 'GET')) {// @$_GET['type'])
-    // irmtfan rewrite forum sync
-    case 'forum':
-        $result = newbbSynchronization('forum');
-        if (!empty($result)) {
-            redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_FORUM . '<br>' . _AM_NEWBB_DATABASEUPDATED);
-        }
-        break;
-    // irmtfan rewrite topic sync
-    case 'topic':
-        $limit = Request::getInt('limit', 1000, 'POST'); //empty($_GET['limit']) ? 1000 : (int)($_GET['limit']);
-        //        /** @var Newbb\TopicHandler $topicHandler */
-        //        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        $criteria = new \Criteria('approved', 1);
-        if ($start >= ($count = $topicHandler->getCount($criteria))) {
-            break;
-        }
-        $criteria->setStart($start);
-        $criteria->setLimit($limit);
-        $topicObjs = $topicHandler->getAll($criteria);
-        foreach ($topicObjs as $tObj) {
-            $topicHandler->synchronization($tObj);
-        }
-        $result = newbbSynchronization('topic');
-        redirect_header('admin_synchronization.php?type=topic&amp;start=' . ($start + $limit) . "&amp;limit={$limit}", 2, _AM_NEWBB_SYNCHING . " {$count}: {$start} - " . ($start + $limit));
-        break;
-    // irmtfan rewrite post sync
-    case 'post':
-        $result = newbbSynchronization('post');
-        if (!empty($result)) {
-            redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_POST . '<br>' . _AM_NEWBB_DATABASEUPDATED);
-        }
-        break;
-    // irmtfan - user is not in recon functions - only here
-    case 'user':
-        $limit = Request::getInt('limit', 1000, 'GET'); //empty($_GET['limit']) ? 1000 : (int)($_GET['limit']);
-        /** @var \XoopsUserHandler $userHandler */
-        $userHandler = xoops_getHandler('user');
-        if ($start >= ($count = $userHandler->getCount())) {
-            break;
-        }
-        $sql    = '    SELECT uid' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('users');
-        $result = $GLOBALS['xoopsDB']->query($sql, $limit, $start);
-        while (false !== (list($uid) = $GLOBALS['xoopsDB']->fetchRow($result))) {
-            // irmtfan approved=1 AND
-            $sql = '    SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . "    WHERE topic_poster = {$uid}";
-            $ret = $GLOBALS['xoopsDB']->query($sql);
-            list($topics) = $GLOBALS['xoopsDB']->fetchRow($ret);
-            // irmtfan approved=1 AND
-            $sql = '    SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . "    WHERE topic_digest > 0 AND topic_poster = {$uid}";
-            $ret = $GLOBALS['xoopsDB']->query($sql);
-            list($digests) = $GLOBALS['xoopsDB']->fetchRow($ret);
-            // irmtfan approved=1 AND
-            $sql = '    SELECT count(*), MAX(post_time)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . "    WHERE uid = {$uid}";
-            $ret = $GLOBALS['xoopsDB']->query($sql);
-            list($posts, $lastpost) = $GLOBALS['xoopsDB']->fetchRow($ret);
+	// irmtfan rewrite forum sync
+	case 'forum':
+		$result = newbbSynchronization('forum');
+		if (!empty($result)) {
+			redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_FORUM . '<br>' . _AM_NEWBB_DATABASEUPDATED);
+		}
+		break;
+	// irmtfan rewrite topic sync
+	case 'topic':
+		$limit = Request::getInt('limit', 1000, 'POST'); //empty($_GET['limit']) ? 1000 : (int)($_GET['limit']);
+		//        /** @var Newbb\TopicHandler $topicHandler */
+		//        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		$criteria = new \Criteria('approved', 1);
+		if ($start >= ($count = $topicHandler->getCount($criteria))) {
+			break;
+		}
+		$criteria->setStart($start);
+		$criteria->setLimit($limit);
+		$topicObjs = $topicHandler->getAll($criteria);
+		foreach ($topicObjs as $tObj) {
+			$topicHandler->synchronization($tObj);
+		}
+		$result = newbbSynchronization('topic');
+		redirect_header('admin_synchronization.php?type=topic&amp;start=' . ($start + $limit) . "&amp;limit={$limit}", 2, _AM_NEWBB_SYNCHING . " {$count}: {$start} - " . ($start + $limit));
+		break;
+	// irmtfan rewrite post sync
+	case 'post':
+		$result = newbbSynchronization('post');
+		if (!empty($result)) {
+			redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_POST . '<br>' . _AM_NEWBB_DATABASEUPDATED);
+		}
+		break;
+	// irmtfan - user is not in recon functions - only here
+	case 'user':
+		$limit = Request::getInt('limit', 1000, 'GET'); //empty($_GET['limit']) ? 1000 : (int)($_GET['limit']);
+		/** @var \XoopsUserHandler $userHandler */
+		$userHandler = xoops_getHandler('user');
+		if ($start >= ($count = $userHandler->getCount())) {
+			break;
+		}
+		$sql    = '    SELECT uid' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('users');
+		$result = $GLOBALS['xoopsDB']->query($sql, $limit, $start);
+		while (false !== (list($uid) = $GLOBALS['xoopsDB']->fetchRow($result))) {
+			// irmtfan approved=1 AND
+			$sql = '    SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . "    WHERE topic_poster = {$uid}";
+			$ret = $GLOBALS['xoopsDB']->query($sql);
+			list($topics) = $GLOBALS['xoopsDB']->fetchRow($ret);
+			// irmtfan approved=1 AND
+			$sql = '    SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . "    WHERE topic_digest > 0 AND topic_poster = {$uid}";
+			$ret = $GLOBALS['xoopsDB']->query($sql);
+			list($digests) = $GLOBALS['xoopsDB']->fetchRow($ret);
+			// irmtfan approved=1 AND
+			$sql = '    SELECT count(*), MAX(post_time)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . "    WHERE uid = {$uid}";
+			$ret = $GLOBALS['xoopsDB']->query($sql);
+			list($posts, $lastpost) = $GLOBALS['xoopsDB']->fetchRow($ret);
 
-            $GLOBALS['xoopsDB']->queryF('    REPLACE INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_user_stats') . "    SET uid = '{$uid}', user_topics = '{$topics}', user_posts = '{$posts}', user_digests = '{$digests}', user_lastpost = '{$lastpost}'");
-        }
+			$GLOBALS['xoopsDB']->queryF('    REPLACE INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_user_stats') . "    SET uid = '{$uid}', user_topics = '{$topics}', user_posts = '{$posts}', user_digests = '{$digests}', user_lastpost = '{$lastpost}'");
+		}
 
-        redirect_header('admin_synchronization.php?type=user&amp;start=' . ($start + $limit) . "&amp;limit={$limit}", 2, _AM_NEWBB_SYNCHING . " {$count}: {$start} - " . ($start + $limit));
-        break;
-    // irmtfan rewrite stats reset
-    case 'stats':
-        $result = newbbSynchronization('stats');
-        break;
-    // START irmtfan add read sync
-    case 'read':
-        $result = newbbSynchronization(['readtopic', 'readforum']);
-        if (!empty($result)) {
-            redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_READ . '<br>' . _AM_NEWBB_DATABASEUPDATED);
-        }
-        exit();
-    // END irmtfan add read sync
-    case 'misc':
-    default:
-        newbbSynchronization();
-        break;
+		redirect_header('admin_synchronization.php?type=user&amp;start=' . ($start + $limit) . "&amp;limit={$limit}", 2, _AM_NEWBB_SYNCHING . " {$count}: {$start} - " . ($start + $limit));
+		break;
+	// irmtfan rewrite stats reset
+	case 'stats':
+		$result = newbbSynchronization('stats');
+		break;
+	// START irmtfan add read sync
+	case 'read':
+		$result = newbbSynchronization(['readtopic', 'readforum']);
+		if (!empty($result)) {
+			redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_READ . '<br>' . _AM_NEWBB_DATABASEUPDATED);
+		}
+		exit();
+	// END irmtfan add read sync
+	case 'misc':
+	default:
+		newbbSynchronization();
+		break;
 }
 
 // <legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_SYNCFORUM . '</legend>';

Spacing +31 added lines, -31 removed lines

@@ -12,9 +12,9 @@ 
 use Xmf\Request;
 
 // irmtfan - TODO - should be changed completly with Newbb new function newbbSynchronization
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
-require_once  dirname(__DIR__) . '/include/functions.recon.php';
+require_once  dirname(__DIR__).'/include/functions.recon.php';
 $form = '';
 $form .= $adminObject->displayNavigation(basename(__FILE__));
 
@@ -26,7 +26,7 @@ 
     case 'forum':
         $result = newbbSynchronization('forum');
         if (!empty($result)) {
-            redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_FORUM . '<br>' . _AM_NEWBB_DATABASEUPDATED);
+            redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_FORUM.'<br>'._AM_NEWBB_DATABASEUPDATED);
         }
         break;
     // irmtfan rewrite topic sync
@@ -45,13 +45,13 @@ 
             $topicHandler->synchronization($tObj);
         }
         $result = newbbSynchronization('topic');
-        redirect_header('admin_synchronization.php?type=topic&amp;start=' . ($start + $limit) . "&amp;limit={$limit}", 2, _AM_NEWBB_SYNCHING . " {$count}: {$start} - " . ($start + $limit));
+        redirect_header('admin_synchronization.php?type=topic&amp;start='.($start + $limit)."&amp;limit={$limit}", 2, _AM_NEWBB_SYNCHING." {$count}: {$start} - ".($start + $limit));
         break;
     // irmtfan rewrite post sync
     case 'post':
         $result = newbbSynchronization('post');
         if (!empty($result)) {
-            redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_POST . '<br>' . _AM_NEWBB_DATABASEUPDATED);
+            redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_POST.'<br>'._AM_NEWBB_DATABASEUPDATED);
         }
         break;
     // irmtfan - user is not in recon functions - only here
@@ -62,26 +62,26 @@ 
         if ($start >= ($count = $userHandler->getCount())) {
             break;
         }
-        $sql    = '    SELECT uid' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('users');
+        $sql    = '    SELECT uid'.'    FROM '.$GLOBALS['xoopsDB']->prefix('users');
         $result = $GLOBALS['xoopsDB']->query($sql, $limit, $start);
         while (false !== (list($uid) = $GLOBALS['xoopsDB']->fetchRow($result))) {
             // irmtfan approved=1 AND
-            $sql = '    SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . "    WHERE topic_poster = {$uid}";
+            $sql = '    SELECT count(*)'.'    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics')."    WHERE topic_poster = {$uid}";
             $ret = $GLOBALS['xoopsDB']->query($sql);
             list($topics) = $GLOBALS['xoopsDB']->fetchRow($ret);
             // irmtfan approved=1 AND
-            $sql = '    SELECT count(*)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . "    WHERE topic_digest > 0 AND topic_poster = {$uid}";
+            $sql = '    SELECT count(*)'.'    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics')."    WHERE topic_digest > 0 AND topic_poster = {$uid}";
             $ret = $GLOBALS['xoopsDB']->query($sql);
             list($digests) = $GLOBALS['xoopsDB']->fetchRow($ret);
             // irmtfan approved=1 AND
-            $sql = '    SELECT count(*), MAX(post_time)' . '    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . "    WHERE uid = {$uid}";
+            $sql = '    SELECT count(*), MAX(post_time)'.'    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts')."    WHERE uid = {$uid}";
             $ret = $GLOBALS['xoopsDB']->query($sql);
             list($posts, $lastpost) = $GLOBALS['xoopsDB']->fetchRow($ret);
 
-            $GLOBALS['xoopsDB']->queryF('    REPLACE INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_user_stats') . "    SET uid = '{$uid}', user_topics = '{$topics}', user_posts = '{$posts}', user_digests = '{$digests}', user_lastpost = '{$lastpost}'");
+            $GLOBALS['xoopsDB']->queryF('    REPLACE INTO '.$GLOBALS['xoopsDB']->prefix('newbb_user_stats')."    SET uid = '{$uid}', user_topics = '{$topics}', user_posts = '{$posts}', user_digests = '{$digests}', user_lastpost = '{$lastpost}'");
         }
 
-        redirect_header('admin_synchronization.php?type=user&amp;start=' . ($start + $limit) . "&amp;limit={$limit}", 2, _AM_NEWBB_SYNCHING . " {$count}: {$start} - " . ($start + $limit));
+        redirect_header('admin_synchronization.php?type=user&amp;start='.($start + $limit)."&amp;limit={$limit}", 2, _AM_NEWBB_SYNCHING." {$count}: {$start} - ".($start + $limit));
         break;
     // irmtfan rewrite stats reset
     case 'stats':
@@ -91,7 +91,7 @@ 
     case 'read':
         $result = newbbSynchronization(['readtopic', 'readforum']);
         if (!empty($result)) {
-            redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_READ . '<br>' . _AM_NEWBB_DATABASEUPDATED);
+            redirect_header('admin_synchronization.php', 2, _AM_NEWBB_SYNC_TYPE_READ.'<br>'._AM_NEWBB_DATABASEUPDATED);
         }
         exit();
     // END irmtfan add read sync
@@ -105,70 +105,70 @@ 
 
 $form .= '<form action="admin_synchronization.php" method="get">';
 $form .= '<div style="padding: 10px 2px;">';
-$form .= '<h2>' . _AM_NEWBB_SYNC_TYPE_FORUM . '</h2>';
+$form .= '<h2>'._AM_NEWBB_SYNC_TYPE_FORUM.'</h2>';
 $form .= '<input type="hidden" name="type" value="forum">';
 // $form .= _AM_NEWBB_SYNC_ITEMS.'<input type="text" name="limit" value="20">'; // irmtfan remove
-$form .= '<input type="submit" name="submit" value=' . _SUBMIT . ' />';
+$form .= '<input type="submit" name="submit" value='._SUBMIT.' />';
 $form .= '</div>';
 $form .= '</form>';
 
 $form .= '<form action="admin_synchronization.php" method="get">';
 $form .= '<div style="padding: 10px 2px;">';
-$form .= '<h2>' . _AM_NEWBB_SYNC_TYPE_TOPIC . '</h2>';
+$form .= '<h2>'._AM_NEWBB_SYNC_TYPE_TOPIC.'</h2>';
 $form .= '<input type="hidden" name="type" value="topic">';
-$form .= _AM_NEWBB_SYNC_ITEMS . '<input type="text" name="limit" value="1000">';
-$form .= '<input type="submit" name="submit" value=' . _SUBMIT . ' />';
+$form .= _AM_NEWBB_SYNC_ITEMS.'<input type="text" name="limit" value="1000">';
+$form .= '<input type="submit" name="submit" value='._SUBMIT.' />';
 $form .= '</div>';
 $form .= '</form>';
 
 $form .= '<form action="admin_synchronization.php" method="get">';
 $form .= '<div style="padding: 10px 2px;">';
-$form .= '<h2>' . _AM_NEWBB_SYNC_TYPE_POST . '</h2>';
+$form .= '<h2>'._AM_NEWBB_SYNC_TYPE_POST.'</h2>';
 $form .= '<input type="hidden" name="type" value="post">';
 // $form .= _AM_NEWBB_SYNC_ITEMS.'<input type="text" name="limit" value="1000">'; // irmtfan remove
-$form .= '<input type="submit" name="submit" value=' . _SUBMIT . ' />';
+$form .= '<input type="submit" name="submit" value='._SUBMIT.' />';
 $form .= '</div>';
 $form .= '</form>';
 
 $form .= '<form action="admin_synchronization.php" method="get">';
 $form .= '<div style="padding: 10px 2px;">';
-$form .= '<h2>' . _AM_NEWBB_SYNC_TYPE_USER . '</h2>';
+$form .= '<h2>'._AM_NEWBB_SYNC_TYPE_USER.'</h2>';
 $form .= '<input type="hidden" name="type" value="user">';
-$form .= _AM_NEWBB_SYNC_ITEMS . '<input type="text" name="limit" value="1000">';
-$form .= '<input type="submit" name="submit" value=' . _SUBMIT . ' />';
+$form .= _AM_NEWBB_SYNC_ITEMS.'<input type="text" name="limit" value="1000">';
+$form .= '<input type="submit" name="submit" value='._SUBMIT.' />';
 $form .= '</div>';
 $form .= '</form>';
 // START irmtfan add read sync
 $form .= '<form action="admin_synchronization.php" method="get">';
 $form .= '<div style="padding: 10px 2px;">';
-$form .= '<h2>' . _AM_NEWBB_SYNC_TYPE_READ . '</h2>';
+$form .= '<h2>'._AM_NEWBB_SYNC_TYPE_READ.'</h2>';
 $form .= '<input type="hidden" name="type" value="read">';
-$form .= '<input type="submit" name="submit" value=' . _SUBMIT . ' />';
+$form .= '<input type="submit" name="submit" value='._SUBMIT.' />';
 $form .= '</div>';
 $form .= '</form>';
 // END irmtfan add read sync
 
 $form .= '<form action="admin_synchronization.php" method="get">';
 $form .= '<div style="padding: 10px 2px;">';
-$form .= '<h2>' . _AM_NEWBB_SYNC_TYPE_STATS . '</h2>';
+$form .= '<h2>'._AM_NEWBB_SYNC_TYPE_STATS.'</h2>';
 $form .= '<input type="hidden" name="type" value="stats">';
 //$form .= _AM_NEWBB_SYNC_ITEMS.'<input type="text" name="limit" value="1000">';
-$form .= '<input type="submit" name="submit" value=' . _SUBMIT . ' />';
+$form .= '<input type="submit" name="submit" value='._SUBMIT.' />';
 $form .= '</div>';
 $form .= '</form>';
 
 $form .= '<form action="admin_synchronization.php" method="get">';
 $form .= '<div style="padding: 10px 2px;">';
-$form .= '<h2>' . _AM_NEWBB_SYNC_TYPE_MISC . '</h2>';
+$form .= '<h2>'._AM_NEWBB_SYNC_TYPE_MISC.'</h2>';
 $form .= '<input type="hidden" name="type" value="misc">';
-$form .= '<input type="submit" name="submit" value=' . _SUBMIT . ' />';
+$form .= '<input type="submit" name="submit" value='._SUBMIT.' />';
 $form .= '</div>';
 $form .= '</form>';
-echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
 echo $form;
 echo '</td></tr></table>';
 echo '<fieldset>';
-echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_SYNC . '&nbsp;</legend>';
+echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_SYNC.'&nbsp;</legend>';
 echo _AM_NEWBB_HELP_SYNC_TAB;
 echo '</fieldset>';
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/admin_forum_prune.php

Indentation +173 added lines, -173 removed lines

@@ -39,156 +39,156 @@ 
 echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
 
 if (Request::hasVar('submit', 'POST')) {
-    $post_list       = null;
-    $topic_list      = null;
-    $topics_number   = 0;
-    $posts_number    = 0;
-    $selected_forums = '';
-    // irmtfan fix if it is array
-    $temp = Request::getArray('forums', null, 'POST');
-    if (!$temp || !$temp[0]) {
-        redirect_header('admin_forum_prune.php', 1, _AM_NEWBB_PRUNE_FORUMSELERROR);
-    } elseif (is_array(Request::getArray('forums', '', 'POST'))) {
-        $selected_forums = implode(',', Request::getArray('forums', null, 'POST'));
-    } else {
-        $selected_forums = Request::getArray('forums', null, 'POST');
-    }
+	$post_list       = null;
+	$topic_list      = null;
+	$topics_number   = 0;
+	$posts_number    = 0;
+	$selected_forums = '';
+	// irmtfan fix if it is array
+	$temp = Request::getArray('forums', null, 'POST');
+	if (!$temp || !$temp[0]) {
+		redirect_header('admin_forum_prune.php', 1, _AM_NEWBB_PRUNE_FORUMSELERROR);
+	} elseif (is_array(Request::getArray('forums', '', 'POST'))) {
+		$selected_forums = implode(',', Request::getArray('forums', null, 'POST'));
+	} else {
+		$selected_forums = Request::getArray('forums', null, 'POST');
+	}
 
-    $prune_days  = Request::getInt('days', 0, 'POST');
-    $prune_ddays = time() - $prune_days;
-    $archive     = Request::getInt('archive', 0, 'POST');
-    $sticky      = Request::getInt('sticky', 0, 'POST');
-    $digest      = Request::getInt('digest', 0, 'POST');
-    $lock        = Request::getInt('lock', 0, 'POST');
-    $hot         = Request::getInt('hot', 0, 'POST');
-    $store       = Request::getInt('store', null, 'POST');
+	$prune_days  = Request::getInt('days', 0, 'POST');
+	$prune_ddays = time() - $prune_days;
+	$archive     = Request::getInt('archive', 0, 'POST');
+	$sticky      = Request::getInt('sticky', 0, 'POST');
+	$digest      = Request::getInt('digest', 0, 'POST');
+	$lock        = Request::getInt('lock', 0, 'POST');
+	$hot         = Request::getInt('hot', 0, 'POST');
+	$store       = Request::getInt('store', null, 'POST');
 
-    $sql = 'SELECT t.topic_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '  p
+	$sql = 'SELECT t.topic_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '  p
                     WHERE t.forum_id IN (' . $selected_forums . ')
                     AND p.post_id =t.topic_last_post_id ';
 
-    if ($sticky) {
-        $sql .= ' AND t.topic_sticky <> 1 ';
-    }
-    if ($digest) {
-        $sql .= ' AND t.topic_digest <> 1 ';
-    }
-    if ($lock) {
-        $sql .= ' AND t.topic_status <> 1 ';
-    }
-    if (0 !== $hot) {
-        $sql .= ' AND t.topic_replies < ' . $hot . ' ';
-    }
+	if ($sticky) {
+		$sql .= ' AND t.topic_sticky <> 1 ';
+	}
+	if ($digest) {
+		$sql .= ' AND t.topic_digest <> 1 ';
+	}
+	if ($lock) {
+		$sql .= ' AND t.topic_status <> 1 ';
+	}
+	if (0 !== $hot) {
+		$sql .= ' AND t.topic_replies < ' . $hot . ' ';
+	}
 
-    $sql .= ' AND p.post_time<= ' . $prune_ddays . ' ';
-    // Ok now we have the sql query completed, go for topic_id's and posts_id's
-    $topics = [];
-    if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-        return _MD_NEWBB_ERROR;
-    }
-    // Dave_L code
-    while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-        $topics[] = $row['topic_id'];
-    }
-    $topics_number = count($topics);
-    $topic_list    = implode(',', $topics);
-    $post_list     = '';
+	$sql .= ' AND p.post_time<= ' . $prune_ddays . ' ';
+	// Ok now we have the sql query completed, go for topic_id's and posts_id's
+	$topics = [];
+	if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+		return _MD_NEWBB_ERROR;
+	}
+	// Dave_L code
+	while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+		$topics[] = $row['topic_id'];
+	}
+	$topics_number = count($topics);
+	$topic_list    = implode(',', $topics);
+	$post_list     = '';
 
-    if ('' !== $topic_list) {
-        $sql = 'SELECT post_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE topic_id IN (' . $topic_list . ')';
+	if ('' !== $topic_list) {
+		$sql = 'SELECT post_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE topic_id IN (' . $topic_list . ')';
 
-        $posts = [];
-        if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-            return _MD_NEWBB_ERROR;
-        }
-        // Dave_L code
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
-            $posts[] = $row['post_id'];
-        }
-        $posts_number = count($posts);
-        $post_list    = implode(',', $posts);
-    }
-    // OKZ Now we have al posts id and topics id
-    if ('' !== $post_list) {
-        // COPY POSTS TO OTHER FORUM
-        if (null !== $store) {
-            $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . " SET forum_id=$store WHERE topic_id IN ($topic_list)";
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                return _MD_NEWBB_ERROR;
-            }
+		$posts = [];
+		if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+			return _MD_NEWBB_ERROR;
+		}
+		// Dave_L code
+		while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($result))) {
+			$posts[] = $row['post_id'];
+		}
+		$posts_number = count($posts);
+		$post_list    = implode(',', $posts);
+	}
+	// OKZ Now we have al posts id and topics id
+	if ('' !== $post_list) {
+		// COPY POSTS TO OTHER FORUM
+		if (null !== $store) {
+			$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . " SET forum_id=$store WHERE topic_id IN ($topic_list)";
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				return _MD_NEWBB_ERROR;
+			}
 
-            $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . " SET forum_id=$store WHERE topic_id IN ($topic_list)";
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                return _MD_NEWBB_ERROR;
-            }
-        } else {
-            // ARCHIVING POSTS
-            if (1 == $archive) {
-                $result = $GLOBALS['xoopsDB']->query('SELECT p.topic_id, p.post_id, t.post_text FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' p, ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . " t WHERE p.post_id IN ($post_list) AND p.post_id=t.post_id");
-                while (false !== (list($topic_id, $post_id, $post_text) = $GLOBALS['xoopsDB']->fetchRow($result))) {
-                    $sql = $GLOBALS['xoopsDB']->query('INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_archive') . " (topic_id, post_id, post_text) VALUES ($topic_id, $post_id, $post_text)");
-                }
-            }
-            // DELETE POSTS
-            $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . " WHERE topic_id IN ($topic_list)";
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                return _MD_NEWBB_ERROR;
-            }
-            // DELETE TOPICS
-            $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . " WHERE topic_id IN ($topic_list)";
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                return _MD_NEWBB_ERROR;
-            }
-            // DELETE POSTS_TEXT
-            $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . " WHERE post_id IN ($post_list)";
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                return _MD_NEWBB_ERROR;
-            }
-            // SYNC FORUMS AFTER DELETE
-            //            /** @var Newbb\ForumHandler $forumHandler */
-            //            $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-            $forumHandler->synchronization();
-            // I THINK POSTS AND TOPICS HAVE BEEN DESTROYED :LOL:
-        }
-    }
+			$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . " SET forum_id=$store WHERE topic_id IN ($topic_list)";
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				return _MD_NEWBB_ERROR;
+			}
+		} else {
+			// ARCHIVING POSTS
+			if (1 == $archive) {
+				$result = $GLOBALS['xoopsDB']->query('SELECT p.topic_id, p.post_id, t.post_text FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' p, ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . " t WHERE p.post_id IN ($post_list) AND p.post_id=t.post_id");
+				while (false !== (list($topic_id, $post_id, $post_text) = $GLOBALS['xoopsDB']->fetchRow($result))) {
+					$sql = $GLOBALS['xoopsDB']->query('INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_archive') . " (topic_id, post_id, post_text) VALUES ($topic_id, $post_id, $post_text)");
+				}
+			}
+			// DELETE POSTS
+			$sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . " WHERE topic_id IN ($topic_list)";
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				return _MD_NEWBB_ERROR;
+			}
+			// DELETE TOPICS
+			$sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . " WHERE topic_id IN ($topic_list)";
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				return _MD_NEWBB_ERROR;
+			}
+			// DELETE POSTS_TEXT
+			$sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . " WHERE post_id IN ($post_list)";
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				return _MD_NEWBB_ERROR;
+			}
+			// SYNC FORUMS AFTER DELETE
+			//            /** @var Newbb\ForumHandler $forumHandler */
+			//            $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+			$forumHandler->synchronization();
+			// I THINK POSTS AND TOPICS HAVE BEEN DESTROYED :LOL:
+		}
+	}
 
-    $tform = new \XoopsThemeForm(_AM_NEWBB_PRUNE_RESULTS_TITLE, 'prune_results', xoops_getenv('PHP_SELF'));
-    $tform->addElement(new \XoopsFormLabel(_AM_NEWBB_PRUNE_RESULTS_FORUMS, $selected_forums));
-    $tform->addElement(new \XoopsFormLabel(_AM_NEWBB_PRUNE_RESULTS_TOPICS, $topics_number));
-    $tform->addElement(new \XoopsFormLabel(_AM_NEWBB_PRUNE_RESULTS_POSTS, $posts_number));
-    $tform->display();
+	$tform = new \XoopsThemeForm(_AM_NEWBB_PRUNE_RESULTS_TITLE, 'prune_results', xoops_getenv('PHP_SELF'));
+	$tform->addElement(new \XoopsFormLabel(_AM_NEWBB_PRUNE_RESULTS_FORUMS, $selected_forums));
+	$tform->addElement(new \XoopsFormLabel(_AM_NEWBB_PRUNE_RESULTS_TOPICS, $topics_number));
+	$tform->addElement(new \XoopsFormLabel(_AM_NEWBB_PRUNE_RESULTS_POSTS, $posts_number));
+	$tform->display();
 } else {
-    $sform = new \XoopsThemeForm(_AM_NEWBB_PRUNE_TITLE, 'prune', xoops_getenv('PHP_SELF'));
-    $sform->setExtra('enctype="multipart/form-data"');
+	$sform = new \XoopsThemeForm(_AM_NEWBB_PRUNE_TITLE, 'prune', xoops_getenv('PHP_SELF'));
+	$sform->setExtra('enctype="multipart/form-data"');
 
-    /* Let User select the number of days
+	/* Let User select the number of days
     $sform->addElement( new \XoopsFormText(_AM_NEWBB_PRUNE_DAYS , 'days', 5, 10,100 ), true );
     */
-    // $sql="SELECT p.topic_id, p.post_id t.post_text FROM ".$GLOBALS['xoopsDB']->prefix("newbb_posts")." p, ".$GLOBALS['xoopsDB']->prefix("newbb_posts_text")." t WHERE p.post_id IN ($post_list) AND p.post_id=t.post_id";
-    // $result = $GLOBALS['xoopsDB']->query();
-    // Days selected by selbox (better error control :lol:)
-    $days = new \XoopsFormSelect(_AM_NEWBB_PRUNE_DAYS, 'days', null, 1, false);
-    $days->addOptionArray([
-                              604800   => _AM_NEWBB_PRUNE_WEEK,
-                              1209600  => _AM_NEWBB_PRUNE_2WEEKS,
-                              2592000  => _AM_NEWBB_PRUNE_MONTH,
-                              5184000  => _AM_NEWBB_PRUNE_2MONTH,
-                              10368000 => _AM_NEWBB_PRUNE_4MONTH,
-                              31536000 => _AM_NEWBB_PRUNE_YEAR,
-                              63072000 => _AM_NEWBB_PRUNE_2YEARS
-                          ]);
-    $sform->addElement($days);
-    // START irmtfan remove hardcode db access
-    require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/footer.php'); // to include js files
-    require_once dirname(__DIR__) . '/include/functions.forum.php';
-    $forumSelMulti  = "<select name=\"forums[]\" multiple=\"multiple\" onfocus = \"validate('forums[]','select', false,true)\">";// disable all categories
-    $forumSelSingle = "<select name=\"store\" onfocus = \"validate('store','select', false,true)\">"; // disable all categories
-    $forumSelBox    = '<option value = 0 >-- ' . _AM_NEWBB_PERM_FORUMS . ' --</option>';
-    $forumSelBox    .= newbbForumSelectBox(null, 'access', false); //$accessForums = nothing, $permission = "access", $delimitorCategory = false
-    $forumSelBox    .= '</select>';
-    $forumEle       = new \XoopsFormLabel(_AM_NEWBB_PRUNE_FORUMS, $forumSelMulti . $forumSelBox);
-    $storeEle       = new \XoopsFormLabel(_AM_NEWBB_PRUNE_STORE, $forumSelSingle . $forumSelBox);
-    /* irmtfan remove hardcode
+	// $sql="SELECT p.topic_id, p.post_id t.post_text FROM ".$GLOBALS['xoopsDB']->prefix("newbb_posts")." p, ".$GLOBALS['xoopsDB']->prefix("newbb_posts_text")." t WHERE p.post_id IN ($post_list) AND p.post_id=t.post_id";
+	// $result = $GLOBALS['xoopsDB']->query();
+	// Days selected by selbox (better error control :lol:)
+	$days = new \XoopsFormSelect(_AM_NEWBB_PRUNE_DAYS, 'days', null, 1, false);
+	$days->addOptionArray([
+							  604800   => _AM_NEWBB_PRUNE_WEEK,
+							  1209600  => _AM_NEWBB_PRUNE_2WEEKS,
+							  2592000  => _AM_NEWBB_PRUNE_MONTH,
+							  5184000  => _AM_NEWBB_PRUNE_2MONTH,
+							  10368000 => _AM_NEWBB_PRUNE_4MONTH,
+							  31536000 => _AM_NEWBB_PRUNE_YEAR,
+							  63072000 => _AM_NEWBB_PRUNE_2YEARS
+						  ]);
+	$sform->addElement($days);
+	// START irmtfan remove hardcode db access
+	require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/footer.php'); // to include js files
+	require_once dirname(__DIR__) . '/include/functions.forum.php';
+	$forumSelMulti  = "<select name=\"forums[]\" multiple=\"multiple\" onfocus = \"validate('forums[]','select', false,true)\">";// disable all categories
+	$forumSelSingle = "<select name=\"store\" onfocus = \"validate('store','select', false,true)\">"; // disable all categories
+	$forumSelBox    = '<option value = 0 >-- ' . _AM_NEWBB_PERM_FORUMS . ' --</option>';
+	$forumSelBox    .= newbbForumSelectBox(null, 'access', false); //$accessForums = nothing, $permission = "access", $delimitorCategory = false
+	$forumSelBox    .= '</select>';
+	$forumEle       = new \XoopsFormLabel(_AM_NEWBB_PRUNE_FORUMS, $forumSelMulti . $forumSelBox);
+	$storeEle       = new \XoopsFormLabel(_AM_NEWBB_PRUNE_STORE, $forumSelSingle . $forumSelBox);
+	/* irmtfan remove hardcode
     $checkbox = new \XoopsFormCheckBox(_AM_NEWBB_PRUNE_FORUMS, 'forums');
     $radiobox = new \XoopsFormRadio(_AM_NEWBB_PRUNE_STORE, 'store');
     // PUAJJ I HATE IT, please tidy up
@@ -206,52 +206,52 @@ 
         echo "DB ERROR";
     }
     */
-    // END irmtfan remove hardcode db access
+	// END irmtfan remove hardcode db access
 
-    $sform->addElement(/*$checkbox*/
-        $forumEle); // irmtfan
+	$sform->addElement(/*$checkbox*/
+		$forumEle); // irmtfan
 
-    $sticky_confirmation = new \XoopsFormRadio(_AM_NEWBB_PRUNE_STICKY, 'sticky', 1);
-    $sticky_confirmation->addOption(1, _AM_NEWBB_PRUNE_YES);
-    $sticky_confirmation->addOption(0, _AM_NEWBB_PRUNE_NO);
-    $sform->addElement($sticky_confirmation);
+	$sticky_confirmation = new \XoopsFormRadio(_AM_NEWBB_PRUNE_STICKY, 'sticky', 1);
+	$sticky_confirmation->addOption(1, _AM_NEWBB_PRUNE_YES);
+	$sticky_confirmation->addOption(0, _AM_NEWBB_PRUNE_NO);
+	$sform->addElement($sticky_confirmation);
 
-    $digest_confirmation = new \XoopsFormRadio(_AM_NEWBB_PRUNE_DIGEST, 'digest', 1);
-    $digest_confirmation->addOption(1, _AM_NEWBB_PRUNE_YES);
-    $digest_confirmation->addOption(0, _AM_NEWBB_PRUNE_NO);
-    $sform->addElement($digest_confirmation);
+	$digest_confirmation = new \XoopsFormRadio(_AM_NEWBB_PRUNE_DIGEST, 'digest', 1);
+	$digest_confirmation->addOption(1, _AM_NEWBB_PRUNE_YES);
+	$digest_confirmation->addOption(0, _AM_NEWBB_PRUNE_NO);
+	$sform->addElement($digest_confirmation);
 
-    $lock_confirmation = new \XoopsFormRadio(_AM_NEWBB_PRUNE_LOCK, 'lock', 0);
-    $lock_confirmation->addOption(1, _AM_NEWBB_PRUNE_YES);
-    $lock_confirmation->addOption(0, _AM_NEWBB_PRUNE_NO);
-    $sform->addElement($lock_confirmation);
+	$lock_confirmation = new \XoopsFormRadio(_AM_NEWBB_PRUNE_LOCK, 'lock', 0);
+	$lock_confirmation->addOption(1, _AM_NEWBB_PRUNE_YES);
+	$lock_confirmation->addOption(0, _AM_NEWBB_PRUNE_NO);
+	$sform->addElement($lock_confirmation);
 
-    $hot_confirmation = new \XoopsFormSelect(_AM_NEWBB_PRUNE_HOT, 'hot', null, 1, false);
-    $hot_confirmation->addOptionArray([
-                                          '0'  => 0,
-                                          '5'  => 5,
-                                          '10' => 10,
-                                          '15' => 15,
-                                          '20' => 20,
-                                          '25' => 25,
-                                          '30' => 30
-                                      ]);
-    $sform->addElement($hot_confirmation);
+	$hot_confirmation = new \XoopsFormSelect(_AM_NEWBB_PRUNE_HOT, 'hot', null, 1, false);
+	$hot_confirmation->addOptionArray([
+										  '0'  => 0,
+										  '5'  => 5,
+										  '10' => 10,
+										  '15' => 15,
+										  '20' => 20,
+										  '25' => 25,
+										  '30' => 30
+									  ]);
+	$sform->addElement($hot_confirmation);
 
-    $sform->addElement(/*$radiobox*/
-        $storeEle); // irmtfan
+	$sform->addElement(/*$radiobox*/
+		$storeEle); // irmtfan
 
-    $archive_confirmation = new \XoopsFormRadio(_AM_NEWBB_PRUNE_ARCHIVE, 'archive', 1);
-    $archive_confirmation->addOption(1, _AM_NEWBB_PRUNE_YES);
-    $archive_confirmation->addOption(0, _AM_NEWBB_PRUNE_NO);
-    $sform->addElement($archive_confirmation);
+	$archive_confirmation = new \XoopsFormRadio(_AM_NEWBB_PRUNE_ARCHIVE, 'archive', 1);
+	$archive_confirmation->addOption(1, _AM_NEWBB_PRUNE_YES);
+	$archive_confirmation->addOption(0, _AM_NEWBB_PRUNE_NO);
+	$sform->addElement($archive_confirmation);
 
-    $button_tray = new \XoopsFormElementTray('', '');
-    $button_tray->addElement(new \XoopsFormButton('', 'submit', _AM_NEWBB_PRUNE_SUBMIT, 'submit'));
-    $button_tray->addElement(new \XoopsFormButton('', 'reset', _AM_NEWBB_PRUNE_RESET, 'reset'));
-    $sform->addElement($button_tray);
+	$button_tray = new \XoopsFormElementTray('', '');
+	$button_tray->addElement(new \XoopsFormButton('', 'submit', _AM_NEWBB_PRUNE_SUBMIT, 'submit'));
+	$button_tray->addElement(new \XoopsFormButton('', 'reset', _AM_NEWBB_PRUNE_RESET, 'reset'));
+	$sform->addElement($button_tray);
 
-    $sform->display();
+	$sform->display();
 }
 
 echo '</td></tr></table>';

Spacing +22 added lines, -22 removed lines

@@ -27,7 +27,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
 xoops_cp_header();
@@ -36,7 +36,7 @@ 
 //if (!$newXoopsModuleGui) loadModuleAdminMenu(5, _AM_NEWBB_PRUNE_TITLE);
 //    else $adminObject->displayNavigation(basename(__FILE__));
 
-echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
 
 if (Request::hasVar('submit', 'POST')) {
     $post_list       = null;
@@ -63,8 +63,8 @@ 
     $hot         = Request::getInt('hot', 0, 'POST');
     $store       = Request::getInt('store', null, 'POST');
 
-    $sql = 'SELECT t.topic_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . '  p
-                    WHERE t.forum_id IN (' . $selected_forums . ')
+    $sql = 'SELECT t.topic_id FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' t, '.$GLOBALS['xoopsDB']->prefix('newbb_posts').'  p
+                    WHERE t.forum_id IN (' . $selected_forums.')
                     AND p.post_id =t.topic_last_post_id ';
 
     if ($sticky) {
@@ -77,10 +77,10 @@ 
         $sql .= ' AND t.topic_status <> 1 ';
     }
     if (0 !== $hot) {
-        $sql .= ' AND t.topic_replies < ' . $hot . ' ';
+        $sql .= ' AND t.topic_replies < '.$hot.' ';
     }
 
-    $sql .= ' AND p.post_time<= ' . $prune_ddays . ' ';
+    $sql .= ' AND p.post_time<= '.$prune_ddays.' ';
     // Ok now we have the sql query completed, go for topic_id's and posts_id's
     $topics = [];
     if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
@@ -95,7 +95,7 @@ 
     $post_list     = '';
 
     if ('' !== $topic_list) {
-        $sql = 'SELECT post_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE topic_id IN (' . $topic_list . ')';
+        $sql = 'SELECT post_id FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' WHERE topic_id IN ('.$topic_list.')';
 
         $posts = [];
         if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
@@ -112,35 +112,35 @@ 
     if ('' !== $post_list) {
         // COPY POSTS TO OTHER FORUM
         if (null !== $store) {
-            $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . " SET forum_id=$store WHERE topic_id IN ($topic_list)";
+            $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_posts')." SET forum_id=$store WHERE topic_id IN ($topic_list)";
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 return _MD_NEWBB_ERROR;
             }
 
-            $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . " SET forum_id=$store WHERE topic_id IN ($topic_list)";
+            $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_topics')." SET forum_id=$store WHERE topic_id IN ($topic_list)";
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 return _MD_NEWBB_ERROR;
             }
         } else {
             // ARCHIVING POSTS
             if (1 == $archive) {
-                $result = $GLOBALS['xoopsDB']->query('SELECT p.topic_id, p.post_id, t.post_text FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' p, ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . " t WHERE p.post_id IN ($post_list) AND p.post_id=t.post_id");
+                $result = $GLOBALS['xoopsDB']->query('SELECT p.topic_id, p.post_id, t.post_text FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' p, '.$GLOBALS['xoopsDB']->prefix('newbb_posts_text')." t WHERE p.post_id IN ($post_list) AND p.post_id=t.post_id");
                 while (false !== (list($topic_id, $post_id, $post_text) = $GLOBALS['xoopsDB']->fetchRow($result))) {
-                    $sql = $GLOBALS['xoopsDB']->query('INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_archive') . " (topic_id, post_id, post_text) VALUES ($topic_id, $post_id, $post_text)");
+                    $sql = $GLOBALS['xoopsDB']->query('INSERT INTO '.$GLOBALS['xoopsDB']->prefix('newbb_archive')." (topic_id, post_id, post_text) VALUES ($topic_id, $post_id, $post_text)");
                 }
             }
             // DELETE POSTS
-            $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . " WHERE topic_id IN ($topic_list)";
+            $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts')." WHERE topic_id IN ($topic_list)";
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 return _MD_NEWBB_ERROR;
             }
             // DELETE TOPICS
-            $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . " WHERE topic_id IN ($topic_list)";
+            $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics')." WHERE topic_id IN ($topic_list)";
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 return _MD_NEWBB_ERROR;
             }
             // DELETE POSTS_TEXT
-            $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts_text') . " WHERE post_id IN ($post_list)";
+            $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts_text')." WHERE post_id IN ($post_list)";
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 return _MD_NEWBB_ERROR;
             }
@@ -179,15 +179,15 @@ 
                           ]);
     $sform->addElement($days);
     // START irmtfan remove hardcode db access
-    require_once $GLOBALS['xoops']->path('modules/' . $xoopsModule->getVar('dirname') . '/footer.php'); // to include js files
-    require_once dirname(__DIR__) . '/include/functions.forum.php';
-    $forumSelMulti  = "<select name=\"forums[]\" multiple=\"multiple\" onfocus = \"validate('forums[]','select', false,true)\">";// disable all categories
+    require_once $GLOBALS['xoops']->path('modules/'.$xoopsModule->getVar('dirname').'/footer.php'); // to include js files
+    require_once dirname(__DIR__).'/include/functions.forum.php';
+    $forumSelMulti  = "<select name=\"forums[]\" multiple=\"multiple\" onfocus = \"validate('forums[]','select', false,true)\">"; // disable all categories
     $forumSelSingle = "<select name=\"store\" onfocus = \"validate('store','select', false,true)\">"; // disable all categories
-    $forumSelBox    = '<option value = 0 >-- ' . _AM_NEWBB_PERM_FORUMS . ' --</option>';
+    $forumSelBox    = '<option value = 0 >-- '._AM_NEWBB_PERM_FORUMS.' --</option>';
     $forumSelBox    .= newbbForumSelectBox(null, 'access', false); //$accessForums = nothing, $permission = "access", $delimitorCategory = false
     $forumSelBox    .= '</select>';
-    $forumEle       = new \XoopsFormLabel(_AM_NEWBB_PRUNE_FORUMS, $forumSelMulti . $forumSelBox);
-    $storeEle       = new \XoopsFormLabel(_AM_NEWBB_PRUNE_STORE, $forumSelSingle . $forumSelBox);
+    $forumEle       = new \XoopsFormLabel(_AM_NEWBB_PRUNE_FORUMS, $forumSelMulti.$forumSelBox);
+    $storeEle       = new \XoopsFormLabel(_AM_NEWBB_PRUNE_STORE, $forumSelSingle.$forumSelBox);
     /* irmtfan remove hardcode
     $checkbox = new \XoopsFormCheckBox(_AM_NEWBB_PRUNE_FORUMS, 'forums');
     $radiobox = new \XoopsFormRadio(_AM_NEWBB_PRUNE_STORE, 'store');
@@ -256,7 +256,7 @@ 
 
 echo '</td></tr></table>';
 echo '<fieldset>';
-echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_PRUNE . '&nbsp;</legend>';
+echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_PRUNE.'&nbsp;</legend>';
 echo _AM_NEWBB_HELP_PRUNE_TAB;
 echo '</fieldset>';
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/admin_cat_manager.php

Indentation +146 added lines, -146 removed lines

@@ -49,7 +49,7 @@ 
  */
 function newCategory()
 {
-    editCategory();
+	editCategory();
 }
 
 /**
@@ -60,154 +60,154 @@ 
  */
 function editCategory(\XoopsObject $categoryObject = null)
 {
-    global $xoopsModule;
-    $categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
-    if (null === $categoryObject) {
-        $categoryObject = $categoryHandler->create();
-    }
-    $groups_cat_access = null;
-    require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-
-    if (!$categoryObject->isNew()) {
-        $sform = new \XoopsThemeForm(_AM_NEWBB_EDITCATEGORY . ' ' . $categoryObject->getVar('cat_title'), 'op', xoops_getenv('PHP_SELF'));
-    } else {
-        $sform = new \XoopsThemeForm(_AM_NEWBB_CREATENEWCATEGORY, 'op', xoops_getenv('PHP_SELF'));
-        $categoryObject->setVar('cat_title', '');
-        $categoryObject->setVar('cat_image', '');
-        $categoryObject->setVar('cat_description', '');
-        $categoryObject->setVar('cat_order', 0);
-        $categoryObject->setVar('cat_url', 'https://xoops.org/modules/newbb/ newBB Support');
-    }
-
-    $sform->addElement(new \XoopsFormText(_AM_NEWBB_SETCATEGORYORDER, 'cat_order', 5, 10, $categoryObject->getVar('cat_order')), false);
-    $sform->addElement(new \XoopsFormText(_AM_NEWBB_CATEGORY, 'title', 50, 80, $categoryObject->getVar('cat_title', 'E')), true);
-    $sform->addElement(new \XoopsFormDhtmlTextArea(_AM_NEWBB_CATEGORYDESC, 'cat_description', $categoryObject->getVar('cat_description', 'E'), 10, 60), false);
-
-    $imgdir      = '/modules/' . $xoopsModule->getVar('dirname') . '/assets/images/category';
-    $cat_image   = $categoryObject->getVar('cat_image');
-    $cat_image   = empty($cat_image) ? 'blank.gif' : $cat_image;
-    $graph_array = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . $imgdir . '/');
-    array_unshift($graph_array, _NONE);
-    $cat_image_select = new \XoopsFormSelect('', 'cat_image', $categoryObject->getVar('cat_image'));
-    $cat_image_select->addOptionArray($graph_array);
-    $cat_image_select->setExtra("onchange=\"showImgSelected('img', 'cat_image', '/" . $imgdir . "/', '', '" . XOOPS_URL . "')\"");
-    $cat_image_tray = new \XoopsFormElementTray(_AM_NEWBB_IMAGE, ' ');
-    $cat_image_tray->addElement($cat_image_select);
-    $cat_image_tray->addElement(new \XoopsFormLabel('', "<br><img src='" . XOOPS_URL . $imgdir . '/' . $cat_image . " 'name='img' id='img' alt='' />"));
-    $sform->addElement($cat_image_tray);
-
-    $sform->addElement(new \XoopsFormText(_AM_NEWBB_SPONSORLINK, 'cat_url', 50, 80, $categoryObject->getVar('cat_url', 'E')), false);
-    $sform->addElement(new \XoopsFormHidden('cat_id', $categoryObject->getVar('cat_id')));
-
-    $button_tray = new \XoopsFormElementTray('', '');
-    $button_tray->addElement(new \XoopsFormHidden('op', 'save'));
-
-    $butt_save = new \XoopsFormButton('', '', _SUBMIT, 'submit');
-    $butt_save->setExtra('onclick="this.form.elements.op.value=\'save\'"');
-    $button_tray->addElement($butt_save);
-    if ($categoryObject->getVar('cat_id')) {
-        $butt_delete = new \XoopsFormButton('', '', _CANCEL, 'submit');
-        $butt_delete->setExtra('onclick="this.form.elements.op.value=\'default\'"');
-        $button_tray->addElement($butt_delete);
-    }
-    $sform->addElement($button_tray);
-    $sform->display();
+	global $xoopsModule;
+	$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
+	if (null === $categoryObject) {
+		$categoryObject = $categoryHandler->create();
+	}
+	$groups_cat_access = null;
+	require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+
+	if (!$categoryObject->isNew()) {
+		$sform = new \XoopsThemeForm(_AM_NEWBB_EDITCATEGORY . ' ' . $categoryObject->getVar('cat_title'), 'op', xoops_getenv('PHP_SELF'));
+	} else {
+		$sform = new \XoopsThemeForm(_AM_NEWBB_CREATENEWCATEGORY, 'op', xoops_getenv('PHP_SELF'));
+		$categoryObject->setVar('cat_title', '');
+		$categoryObject->setVar('cat_image', '');
+		$categoryObject->setVar('cat_description', '');
+		$categoryObject->setVar('cat_order', 0);
+		$categoryObject->setVar('cat_url', 'https://xoops.org/modules/newbb/ newBB Support');
+	}
+
+	$sform->addElement(new \XoopsFormText(_AM_NEWBB_SETCATEGORYORDER, 'cat_order', 5, 10, $categoryObject->getVar('cat_order')), false);
+	$sform->addElement(new \XoopsFormText(_AM_NEWBB_CATEGORY, 'title', 50, 80, $categoryObject->getVar('cat_title', 'E')), true);
+	$sform->addElement(new \XoopsFormDhtmlTextArea(_AM_NEWBB_CATEGORYDESC, 'cat_description', $categoryObject->getVar('cat_description', 'E'), 10, 60), false);
+
+	$imgdir      = '/modules/' . $xoopsModule->getVar('dirname') . '/assets/images/category';
+	$cat_image   = $categoryObject->getVar('cat_image');
+	$cat_image   = empty($cat_image) ? 'blank.gif' : $cat_image;
+	$graph_array = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . $imgdir . '/');
+	array_unshift($graph_array, _NONE);
+	$cat_image_select = new \XoopsFormSelect('', 'cat_image', $categoryObject->getVar('cat_image'));
+	$cat_image_select->addOptionArray($graph_array);
+	$cat_image_select->setExtra("onchange=\"showImgSelected('img', 'cat_image', '/" . $imgdir . "/', '', '" . XOOPS_URL . "')\"");
+	$cat_image_tray = new \XoopsFormElementTray(_AM_NEWBB_IMAGE, '&nbsp;');
+	$cat_image_tray->addElement($cat_image_select);
+	$cat_image_tray->addElement(new \XoopsFormLabel('', "<br><img src='" . XOOPS_URL . $imgdir . '/' . $cat_image . " 'name='img' id='img' alt='' />"));
+	$sform->addElement($cat_image_tray);
+
+	$sform->addElement(new \XoopsFormText(_AM_NEWBB_SPONSORLINK, 'cat_url', 50, 80, $categoryObject->getVar('cat_url', 'E')), false);
+	$sform->addElement(new \XoopsFormHidden('cat_id', $categoryObject->getVar('cat_id')));
+
+	$button_tray = new \XoopsFormElementTray('', '');
+	$button_tray->addElement(new \XoopsFormHidden('op', 'save'));
+
+	$butt_save = new \XoopsFormButton('', '', _SUBMIT, 'submit');
+	$butt_save->setExtra('onclick="this.form.elements.op.value=\'save\'"');
+	$button_tray->addElement($butt_save);
+	if ($categoryObject->getVar('cat_id')) {
+		$butt_delete = new \XoopsFormButton('', '', _CANCEL, 'submit');
+		$butt_delete->setExtra('onclick="this.form.elements.op.value=\'default\'"');
+		$button_tray->addElement($butt_delete);
+	}
+	$sform->addElement($button_tray);
+	$sform->display();
 }
 
 switch ($op) {
-    case 'mod':
-        $categoryObject = ($cat_id > 0) ? $categoryHandler->get($cat_id) : $categoryHandler->create();
-        //        if (!$newXoopsModuleGui) {
-        //            //loadModuleAdminMenu(1, ( $cat_id > 0) ? _AM_NEWBB_EDITCATEGORY . $categoryObject->getVar('cat_title') : _AM_NEWBB_CREATENEWCATEGORY);
-        //            echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_EDITCATEGORY . '</legend>';
-        //        } else {
-        $adminObject->displayNavigation(basename(__FILE__));
-        //        }
-        echo '<br>';
-        editCategory($categoryObject);
-        break;
-
-    case 'del':
-        if (!Request::getBool('confirm', '', 'POST')) {
-            xoops_confirm(['op' => 'del', 'cat_id' => Request::getInt('cat_id', 0, 'GET'), 'confirm' => 1], 'admin_cat_manager.php', _AM_NEWBB_WAYSYWTDTTAL);
-            break;
-        } else {
-            $categoryObject = $categoryHandler->create(false);
-            $categoryObject->setVar('cat_id', Request::getInt('cat_id', 0, 'POST'));
-            $categoryHandler->delete($categoryObject);
-
-            redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CATEGORYDELETED);
-        }
-        break;
-
-    case 'save':
-        $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-        $cacheHelper->delete('permission_category');
-        if ($cat_id) {
-            $categoryObject = $categoryHandler->get($cat_id);
-            $message        = _AM_NEWBB_CATEGORYUPDATED;
-        } else {
-            $categoryObject = $categoryHandler->create();
-            $message        = _AM_NEWBB_CATEGORYCREATED;
-        }
-
-        $categoryObject->setVar('cat_title', Request::getString('title', '', 'POST'));
-        $categoryObject->setVar('cat_image', Request::getString('cat_image', '', 'POST'));
-        $categoryObject->setVar('cat_order', Request::getInt('cat_order', 0, 'POST'));
-        $categoryObject->setVar('cat_description', Request::getText('cat_description', '', 'POST'));
-        $categoryObject->setVar('cat_url', Request::getString('cat_url', '', 'POST'));
-
-        $cat_isNew = $categoryObject->isNew();
-        if (!$categoryHandler->insert($categoryObject)) {
-            $message = _AM_NEWBB_DATABASEERROR;
-        }
-        if (($cat_id = $categoryObject->getVar('cat_id')) && $cat_isNew) {
-            $categoryHandler->applyPermissionTemplate($categoryObject);
-        }
-        redirect_header('admin_cat_manager.php', 2, $message);
-        break;
-
-    default:
-        if (!$categories = $categoryHandler->getByPermission('all')) {
-            $adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
-            $adminObject->displayButton('left');
-
-            echo '<br>';
-            newCategory();
-            break;
-        }
-        $adminObject->displayNavigation(basename(__FILE__));
-        $adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
-        $adminObject->displayButton('left');
-
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th align='left' class='bg3'>" . _AM_NEWBB_CATEGORY1 . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_EDIT . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_DELETE . '</th>';
-        echo '</tr>';
-
-        foreach ($categories as $key => $onecat) {
-            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
-            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
-            $cat_title_link = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php?cat=' . $onecat->getVar('cat_id') . '">' . $onecat->getVar('cat_title') . '</a>';
-
-            echo "<tr class='odd' align='left'>";
-            echo '<td>' . $cat_title_link . '</td>';
-            echo "<td align='center'>" . $cat_edit_link . '</td>';
-            echo "<td align='center'>" . $cat_del_link . '</td>';
-            echo '</tr>';
-        }
-        echo '</table>';
-        echo '</td></tr></table>';
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_CATEGORY . '&nbsp;</legend>';
-        echo _AM_NEWBB_HELP_CATEGORY_TAB;
-        echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
-        echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
-        echo '</fieldset>';
-        break;
+	case 'mod':
+		$categoryObject = ($cat_id > 0) ? $categoryHandler->get($cat_id) : $categoryHandler->create();
+		//        if (!$newXoopsModuleGui) {
+		//            //loadModuleAdminMenu(1, ( $cat_id > 0) ? _AM_NEWBB_EDITCATEGORY . $categoryObject->getVar('cat_title') : _AM_NEWBB_CREATENEWCATEGORY);
+		//            echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_EDITCATEGORY . '</legend>';
+		//        } else {
+		$adminObject->displayNavigation(basename(__FILE__));
+		//        }
+		echo '<br>';
+		editCategory($categoryObject);
+		break;
+
+	case 'del':
+		if (!Request::getBool('confirm', '', 'POST')) {
+			xoops_confirm(['op' => 'del', 'cat_id' => Request::getInt('cat_id', 0, 'GET'), 'confirm' => 1], 'admin_cat_manager.php', _AM_NEWBB_WAYSYWTDTTAL);
+			break;
+		} else {
+			$categoryObject = $categoryHandler->create(false);
+			$categoryObject->setVar('cat_id', Request::getInt('cat_id', 0, 'POST'));
+			$categoryHandler->delete($categoryObject);
+
+			redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CATEGORYDELETED);
+		}
+		break;
+
+	case 'save':
+		$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+		$cacheHelper->delete('permission_category');
+		if ($cat_id) {
+			$categoryObject = $categoryHandler->get($cat_id);
+			$message        = _AM_NEWBB_CATEGORYUPDATED;
+		} else {
+			$categoryObject = $categoryHandler->create();
+			$message        = _AM_NEWBB_CATEGORYCREATED;
+		}
+
+		$categoryObject->setVar('cat_title', Request::getString('title', '', 'POST'));
+		$categoryObject->setVar('cat_image', Request::getString('cat_image', '', 'POST'));
+		$categoryObject->setVar('cat_order', Request::getInt('cat_order', 0, 'POST'));
+		$categoryObject->setVar('cat_description', Request::getText('cat_description', '', 'POST'));
+		$categoryObject->setVar('cat_url', Request::getString('cat_url', '', 'POST'));
+
+		$cat_isNew = $categoryObject->isNew();
+		if (!$categoryHandler->insert($categoryObject)) {
+			$message = _AM_NEWBB_DATABASEERROR;
+		}
+		if (($cat_id = $categoryObject->getVar('cat_id')) && $cat_isNew) {
+			$categoryHandler->applyPermissionTemplate($categoryObject);
+		}
+		redirect_header('admin_cat_manager.php', 2, $message);
+		break;
+
+	default:
+		if (!$categories = $categoryHandler->getByPermission('all')) {
+			$adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
+			$adminObject->displayButton('left');
+
+			echo '<br>';
+			newCategory();
+			break;
+		}
+		$adminObject->displayNavigation(basename(__FILE__));
+		$adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
+		$adminObject->displayButton('left');
+
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th align='left' class='bg3'>" . _AM_NEWBB_CATEGORY1 . '</th>';
+		echo "<th class='bg3' width='10%'>" . _AM_NEWBB_EDIT . '</th>';
+		echo "<th class='bg3' width='10%'>" . _AM_NEWBB_DELETE . '</th>';
+		echo '</tr>';
+
+		foreach ($categories as $key => $onecat) {
+			$cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
+			$cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
+			$cat_title_link = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php?cat=' . $onecat->getVar('cat_id') . '">' . $onecat->getVar('cat_title') . '</a>';
+
+			echo "<tr class='odd' align='left'>";
+			echo '<td>' . $cat_title_link . '</td>';
+			echo "<td align='center'>" . $cat_edit_link . '</td>';
+			echo "<td align='center'>" . $cat_del_link . '</td>';
+			echo '</tr>';
+		}
+		echo '</table>';
+		echo '</td></tr></table>';
+		echo '<fieldset>';
+		echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_CATEGORY . '&nbsp;</legend>';
+		echo _AM_NEWBB_HELP_CATEGORY_TAB;
+		echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
+		echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
+		echo '</fieldset>';
+		break;
 }
 
 $cacheHelper = Newbb\Utility::cleanCache();

Switch Indentation +93 added lines, -93 removed lines

@@ -115,99 +115,99 @@
 }
 
 switch ($op) {
-    case 'mod':
-        $categoryObject = ($cat_id > 0) ? $categoryHandler->get($cat_id) : $categoryHandler->create();
-        //        if (!$newXoopsModuleGui) {
-        //            //loadModuleAdminMenu(1, ( $cat_id > 0) ? _AM_NEWBB_EDITCATEGORY . $categoryObject->getVar('cat_title') : _AM_NEWBB_CREATENEWCATEGORY);
-        //            echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_EDITCATEGORY . '</legend>';
-        //        } else {
-        $adminObject->displayNavigation(basename(__FILE__));
-        //        }
-        echo '<br>';
-        editCategory($categoryObject);
-        break;
-
-    case 'del':
-        if (!Request::getBool('confirm', '', 'POST')) {
-            xoops_confirm(['op' => 'del', 'cat_id' => Request::getInt('cat_id', 0, 'GET'), 'confirm' => 1], 'admin_cat_manager.php', _AM_NEWBB_WAYSYWTDTTAL);
-            break;
-        } else {
-            $categoryObject = $categoryHandler->create(false);
-            $categoryObject->setVar('cat_id', Request::getInt('cat_id', 0, 'POST'));
-            $categoryHandler->delete($categoryObject);
-
-            redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CATEGORYDELETED);
-        }
-        break;
-
-    case 'save':
-        $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
-        $cacheHelper->delete('permission_category');
-        if ($cat_id) {
-            $categoryObject = $categoryHandler->get($cat_id);
-            $message        = _AM_NEWBB_CATEGORYUPDATED;
-        } else {
-            $categoryObject = $categoryHandler->create();
-            $message        = _AM_NEWBB_CATEGORYCREATED;
-        }
-
-        $categoryObject->setVar('cat_title', Request::getString('title', '', 'POST'));
-        $categoryObject->setVar('cat_image', Request::getString('cat_image', '', 'POST'));
-        $categoryObject->setVar('cat_order', Request::getInt('cat_order', 0, 'POST'));
-        $categoryObject->setVar('cat_description', Request::getText('cat_description', '', 'POST'));
-        $categoryObject->setVar('cat_url', Request::getString('cat_url', '', 'POST'));
-
-        $cat_isNew = $categoryObject->isNew();
-        if (!$categoryHandler->insert($categoryObject)) {
-            $message = _AM_NEWBB_DATABASEERROR;
-        }
-        if (($cat_id = $categoryObject->getVar('cat_id')) && $cat_isNew) {
-            $categoryHandler->applyPermissionTemplate($categoryObject);
-        }
-        redirect_header('admin_cat_manager.php', 2, $message);
-        break;
-
-    default:
-        if (!$categories = $categoryHandler->getByPermission('all')) {
-            $adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
-            $adminObject->displayButton('left');
-
-            echo '<br>';
-            newCategory();
-            break;
-        }
-        $adminObject->displayNavigation(basename(__FILE__));
-        $adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
-        $adminObject->displayButton('left');
-
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th align='left' class='bg3'>" . _AM_NEWBB_CATEGORY1 . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_EDIT . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_DELETE . '</th>';
-        echo '</tr>';
-
-        foreach ($categories as $key => $onecat) {
-            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
-            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
-            $cat_title_link = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php?cat=' . $onecat->getVar('cat_id') . '">' . $onecat->getVar('cat_title') . '</a>';
-
-            echo "<tr class='odd' align='left'>";
-            echo '<td>' . $cat_title_link . '</td>';
-            echo "<td align='center'>" . $cat_edit_link . '</td>';
-            echo "<td align='center'>" . $cat_del_link . '</td>';
-            echo '</tr>';
-        }
-        echo '</table>';
-        echo '</td></tr></table>';
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_CATEGORY . '&nbsp;</legend>';
-        echo _AM_NEWBB_HELP_CATEGORY_TAB;
-        echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
-        echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
-        echo '</fieldset>';
-        break;
+    	case 'mod':
+        	$categoryObject = ($cat_id > 0) ? $categoryHandler->get($cat_id) : $categoryHandler->create();
+        	//        if (!$newXoopsModuleGui) {
+        	//            //loadModuleAdminMenu(1, ( $cat_id > 0) ? _AM_NEWBB_EDITCATEGORY . $categoryObject->getVar('cat_title') : _AM_NEWBB_CREATENEWCATEGORY);
+        	//            echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_EDITCATEGORY . '</legend>';
+        	//        } else {
+        	$adminObject->displayNavigation(basename(__FILE__));
+        	//        }
+        	echo '<br>';
+        	editCategory($categoryObject);
+        	break;
+
+    	case 'del':
+        	if (!Request::getBool('confirm', '', 'POST')) {
+            	xoops_confirm(['op' => 'del', 'cat_id' => Request::getInt('cat_id', 0, 'GET'), 'confirm' => 1], 'admin_cat_manager.php', _AM_NEWBB_WAYSYWTDTTAL);
+            	break;
+        	} else {
+            	$categoryObject = $categoryHandler->create(false);
+            	$categoryObject->setVar('cat_id', Request::getInt('cat_id', 0, 'POST'));
+            	$categoryHandler->delete($categoryObject);
+
+            	redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CATEGORYDELETED);
+        	}
+        	break;
+
+    	case 'save':
+        	$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
+        	$cacheHelper->delete('permission_category');
+        	if ($cat_id) {
+            	$categoryObject = $categoryHandler->get($cat_id);
+            	$message        = _AM_NEWBB_CATEGORYUPDATED;
+        	} else {
+            	$categoryObject = $categoryHandler->create();
+            	$message        = _AM_NEWBB_CATEGORYCREATED;
+        	}
+
+        	$categoryObject->setVar('cat_title', Request::getString('title', '', 'POST'));
+        	$categoryObject->setVar('cat_image', Request::getString('cat_image', '', 'POST'));
+        	$categoryObject->setVar('cat_order', Request::getInt('cat_order', 0, 'POST'));
+        	$categoryObject->setVar('cat_description', Request::getText('cat_description', '', 'POST'));
+        	$categoryObject->setVar('cat_url', Request::getString('cat_url', '', 'POST'));
+
+        	$cat_isNew = $categoryObject->isNew();
+        	if (!$categoryHandler->insert($categoryObject)) {
+            	$message = _AM_NEWBB_DATABASEERROR;
+        	}
+        	if (($cat_id = $categoryObject->getVar('cat_id')) && $cat_isNew) {
+            	$categoryHandler->applyPermissionTemplate($categoryObject);
+        	}
+        	redirect_header('admin_cat_manager.php', 2, $message);
+        	break;
+
+    	default:
+        	if (!$categories = $categoryHandler->getByPermission('all')) {
+            	$adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
+            	$adminObject->displayButton('left');
+
+            	echo '<br>';
+            	newCategory();
+            	break;
+        	}
+        	$adminObject->displayNavigation(basename(__FILE__));
+        	$adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
+        	$adminObject->displayButton('left');
+
+        	echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+        	echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+        	echo "<tr align='center'>";
+        	echo "<th align='left' class='bg3'>" . _AM_NEWBB_CATEGORY1 . '</th>';
+        	echo "<th class='bg3' width='10%'>" . _AM_NEWBB_EDIT . '</th>';
+        	echo "<th class='bg3' width='10%'>" . _AM_NEWBB_DELETE . '</th>';
+        	echo '</tr>';
+
+        	foreach ($categories as $key => $onecat) {
+            	$cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
+            	$cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
+            	$cat_title_link = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php?cat=' . $onecat->getVar('cat_id') . '">' . $onecat->getVar('cat_title') . '</a>';
+
+            	echo "<tr class='odd' align='left'>";
+            	echo '<td>' . $cat_title_link . '</td>';
+            	echo "<td align='center'>" . $cat_edit_link . '</td>';
+            	echo "<td align='center'>" . $cat_del_link . '</td>';
+            	echo '</tr>';
+        	}
+        	echo '</table>';
+        	echo '</td></tr></table>';
+        	echo '<fieldset>';
+        	echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_CATEGORY . '&nbsp;</legend>';
+        	echo _AM_NEWBB_HELP_CATEGORY_TAB;
+        	echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
+        	echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
+        	echo '</fieldset>';
+        	break;
 }
 
 $cacheHelper = Newbb\Utility::cleanCache();

Spacing +21 added lines, -21 removed lines

@@ -32,8 +32,8 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/admin_header.php';
-require_once  dirname(__DIR__) . '/include/functions.render.php';
+require_once __DIR__.'/admin_header.php';
+require_once  dirname(__DIR__).'/include/functions.render.php';
 
 xoops_cp_header();
 
@@ -69,7 +69,7 @@ 
     require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
     if (!$categoryObject->isNew()) {
-        $sform = new \XoopsThemeForm(_AM_NEWBB_EDITCATEGORY . ' ' . $categoryObject->getVar('cat_title'), 'op', xoops_getenv('PHP_SELF'));
+        $sform = new \XoopsThemeForm(_AM_NEWBB_EDITCATEGORY.' '.$categoryObject->getVar('cat_title'), 'op', xoops_getenv('PHP_SELF'));
     } else {
         $sform = new \XoopsThemeForm(_AM_NEWBB_CREATENEWCATEGORY, 'op', xoops_getenv('PHP_SELF'));
         $categoryObject->setVar('cat_title', '');
@@ -83,17 +83,17 @@ 
     $sform->addElement(new \XoopsFormText(_AM_NEWBB_CATEGORY, 'title', 50, 80, $categoryObject->getVar('cat_title', 'E')), true);
     $sform->addElement(new \XoopsFormDhtmlTextArea(_AM_NEWBB_CATEGORYDESC, 'cat_description', $categoryObject->getVar('cat_description', 'E'), 10, 60), false);
 
-    $imgdir      = '/modules/' . $xoopsModule->getVar('dirname') . '/assets/images/category';
+    $imgdir      = '/modules/'.$xoopsModule->getVar('dirname').'/assets/images/category';
     $cat_image   = $categoryObject->getVar('cat_image');
     $cat_image   = empty($cat_image) ? 'blank.gif' : $cat_image;
-    $graph_array = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH . $imgdir . '/');
+    $graph_array = \XoopsLists::getImgListAsArray(XOOPS_ROOT_PATH.$imgdir.'/');
     array_unshift($graph_array, _NONE);
     $cat_image_select = new \XoopsFormSelect('', 'cat_image', $categoryObject->getVar('cat_image'));
     $cat_image_select->addOptionArray($graph_array);
-    $cat_image_select->setExtra("onchange=\"showImgSelected('img', 'cat_image', '/" . $imgdir . "/', '', '" . XOOPS_URL . "')\"");
+    $cat_image_select->setExtra("onchange=\"showImgSelected('img', 'cat_image', '/".$imgdir."/', '', '".XOOPS_URL."')\"");
     $cat_image_tray = new \XoopsFormElementTray(_AM_NEWBB_IMAGE, ' ');
     $cat_image_tray->addElement($cat_image_select);
-    $cat_image_tray->addElement(new \XoopsFormLabel('', "<br><img src='" . XOOPS_URL . $imgdir . '/' . $cat_image . " 'name='img' id='img' alt='' />"));
+    $cat_image_tray->addElement(new \XoopsFormLabel('', "<br><img src='".XOOPS_URL.$imgdir.'/'.$cat_image." 'name='img' id='img' alt='' />"));
     $sform->addElement($cat_image_tray);
 
     $sform->addElement(new \XoopsFormText(_AM_NEWBB_SPONSORLINK, 'cat_url', 50, 80, $categoryObject->getVar('cat_url', 'E')), false);
@@ -180,32 +180,32 @@ 
         $adminObject->addItemButton(_AM_NEWBB_CREATENEWCATEGORY, 'admin_cat_manager.php?op=mod', $icon = 'add');
         $adminObject->displayButton('left');
 
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th align='left' class='bg3'>" . _AM_NEWBB_CATEGORY1 . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_EDIT . '</th>';
-        echo "<th class='bg3' width='10%'>" . _AM_NEWBB_DELETE . '</th>';
+        echo "<th align='left' class='bg3'>"._AM_NEWBB_CATEGORY1.'</th>';
+        echo "<th class='bg3' width='10%'>"._AM_NEWBB_EDIT.'</th>';
+        echo "<th class='bg3' width='10%'>"._AM_NEWBB_DELETE.'</th>';
         echo '</tr>';
 
         foreach ($categories as $key => $onecat) {
-            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_edit', _EDIT) . '</a>';
-            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id=' . $onecat->getVar('cat_id') . '">' . newbbDisplayImage('admin_delete', _DELETE) . '</a>';
-            $cat_title_link = '<a href="' . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/index.php?cat=' . $onecat->getVar('cat_id') . '">' . $onecat->getVar('cat_title') . '</a>';
+            $cat_edit_link  = '<a href="admin_cat_manager.php?op=mod&cat_id='.$onecat->getVar('cat_id').'">'.newbbDisplayImage('admin_edit', _EDIT).'</a>';
+            $cat_del_link   = '<a href="admin_cat_manager.php?op=del&cat_id='.$onecat->getVar('cat_id').'">'.newbbDisplayImage('admin_delete', _DELETE).'</a>';
+            $cat_title_link = '<a href="'.XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/index.php?cat='.$onecat->getVar('cat_id').'">'.$onecat->getVar('cat_title').'</a>';
 
             echo "<tr class='odd' align='left'>";
-            echo '<td>' . $cat_title_link . '</td>';
-            echo "<td align='center'>" . $cat_edit_link . '</td>';
-            echo "<td align='center'>" . $cat_del_link . '</td>';
+            echo '<td>'.$cat_title_link.'</td>';
+            echo "<td align='center'>".$cat_edit_link.'</td>';
+            echo "<td align='center'>".$cat_del_link.'</td>';
             echo '</tr>';
         }
         echo '</table>';
         echo '</td></tr></table>';
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_CATEGORY . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_CATEGORY.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_CATEGORY_TAB;
-        echo '<br>' . newbbDisplayImage('admin_edit', _EDIT) . '&nbsp;-&nbsp;' . _EDIT;
-        echo '<br>' . newbbDisplayImage('admin_delete', _DELETE) . '&nbsp;-&nbsp;' . _DELETE;
+        echo '<br>'.newbbDisplayImage('admin_edit', _EDIT).'&nbsp;-&nbsp;'._EDIT;
+        echo '<br>'.newbbDisplayImage('admin_delete', _DELETE).'&nbsp;-&nbsp;'._DELETE;
         echo '</fieldset>';
         break;
 }
@@ -213,4 +213,4 @@ 
 $cacheHelper = Newbb\Utility::cleanCache();
 //$cacheHelper->delete('permission_category');
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/admin_type_manager.php

Indentation +389 added lines, -389 removed lines

@@ -32,19 +32,19 @@ 
  */
 $op       = Request::getCmd('op', '');
 $validOps = [
-    'save_type',
-    'delete',
-    'template',
-    'save_template',
-    'apply',
-    'save_apply',
-    'forum',
-    'edit_forum',
-    'save_forum',
-    'add'
+	'save_type',
+	'delete',
+	'template',
+	'save_template',
+	'apply',
+	'save_apply',
+	'forum',
+	'edit_forum',
+	'save_forum',
+	'add'
 ];
 if (!in_array($op, $validOps, true)) {
-    $op = '';
+	$op = '';
 }
 
 ///** @var Newbb\TypeHandler $typeHandler */
@@ -52,386 +52,386 @@ 
 $cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
 
 switch ($op) {
-    case 'save_type':
-        $type_names0 = $_POST['type_name'];
-        $type_names  = Request::getArray('type_name', null, 'POST');
-        $type_del    = [];
-        foreach (array_keys($type_names) as $key) {
-            if (Request::getBool('isnew', '', 'POST')) {
-                $typeObject = $typeHandler->create();
-            } elseif (!$typeObject = $typeHandler->get($key)) {
-                continue;
-            }
-
-            //            if (Request::getArray("type_del[$key]", '', 'POST')) {
-            $temp = Request::getArray('type_del', '', 'POST');
-            if ($temp[$key]) {
-                $type_del[] = $key;
-                continue;
-            } else {
-                foreach (['type_name', 'type_color', 'type_description'] as $var) {
-                    //                    if ($typeObject->getVar($var) != @$_POST[$var][$key]) {
-                    //                        $typeObject->setVar($var, @$_POST[$var][$key]);
-                    //                    }
-                    $temp = Request::getArray($var, '', 'POST');
-                    if ($typeObject->getVar($var) != $temp[$key]) {
-                        $typeObject->setVar($var, $temp[$key]);
-                    }
-
-                    //                    $typeObject->setVar($var, Request::getArray($var, '', 'POST')[$key]);
-                }
-                $typeHandler->insert($typeObject);
-                unset($typeObject);
-            }
-        }
-        if (count($type_del) > 0) {
-            $type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', $type_del) . ')', 'IN'));
-            xoops_confirm(['op' => 'delete', 'type_del' => serialize($type_del)], xoops_getenv('PHP_SELF'), sprintf(_AM_NEWBB_TODEL_TYPE, implode(', ', array_values($type_list))), '', false);
-        } else {
-            redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
-        }
-        break;
-
-    case 'delete':
-        $type_dels = @unserialize(Request::getString('type_del', '', 'POST'));
-        foreach ($type_dels as $key) {
-            if (!$typeObject = $typeHandler->get($key)) {
-                continue;
-            }
-            $typeHandler->delete($typeObject);
-            unset($typeObject);
-        }
-        redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
-        break;
-
-    case 'template':
-        $typesObject = $typeHandler->getAll();
-        if (0 === count($typesObject)) {
-            redirect_header(xoops_getenv('PHP_SELF'), 2, _AM_NEWBB_TYPE_ADD_ERR);
-        }
-
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-        $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
-        echo '</tr>';
-
-        if ($templates = $cacheHelper->read('type_template')) {
-            arsort($templates);
-            foreach ($templates as $order => $key) {
-                if (!isset($typesObject[$key])) {
-                    continue;
-                }
-                $typeObject = $typesObject[$key];
-                echo "<tr class='even' align='left'>";
-                echo "<td><input type='text' name='type_order[{$key}]' value='" . $order . "' size='10' /></td>";
-                echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-                echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-                echo '</tr>';
-                unset($typesObject[$key]);
-            }
-            echo "<tr><td colspan='3' height='5px'></td></tr>";
-        }
-        foreach ($typesObject as $key => $typeObject) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-            echo '</tr>';
-        }
-
-        echo "<tr><td colspan='3' style='text-align:center;'>";
-        echo "<input type='hidden' name='op' value='save_template' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
-        echo '</td></tr></table>';
-        echo '</form>';
-        echo '</td></tr></table>';
-        break;
-
-    case 'save_template':
-        $templates = array_flip(array_filter(Request::getArray('type_order', [], 'POST')));
-        $cacheHelper->write('type_template', $templates);
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _MD_NEWBB_DBUPDATED);
-        break;
-
-    case 'apply':
-        if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
-        }
-
-        //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
-        $criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
-        $criteriaCategory->setSort('cat_order');
-        $categories = $categoryHandler->getList($criteriaCategory);
-        //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forums = $forumHandler->getTree(array_keys($categories), 0, 'all');
-        foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
-            foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
-            }
-        }
-        unset($forums, $categories);
-        $fmform    = new \XoopsThemeForm(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'fmform', xoops_getenv('PHP_SELF'), 'post', true);
-        $fm_select = new \XoopsFormSelect(_AM_NEWBB_PERM_FORUMS, 'forums', null, 10, true);
-        $fm_select->addOptionArray($fm_options);
-        $fmform->addElement($fm_select);
-        $tray = new \XoopsFormElementTray('');
-        $tray->addElement(new \XoopsFormHidden('op', 'save_apply'));
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $fmform->addElement($tray);
-
-        //loadModuleAdminMenu(11, _AM_NEWBB_TYPE_TEMPLATE_APPLY);
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-        $adminObject->displayButton('left');
-
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
-        echo '</tr>';
-
-        $typesObject = $typeHandler->getAll(new \Criteria('type_id', '(' . implode(', ', array_values($templates)) . ')', 'IN'));
-        arsort($templates);
-        foreach ($templates as $order => $key) {
-            if (!isset($typesObject[$key])) {
-                continue;
-            }
-            $typeObject = $typesObject[$key];
-            echo "<tr class='even' align='left'>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $order . '</td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-            echo '</tr>';
-            unset($typesObject[$key]);
-        }
-        echo '</table>';
-        echo '</td></tr></table>';
-        echo '<br>';
-        $fmform->display();
-        break;
-
-    case 'save_apply':
-        if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
-        }
-        foreach (Request::getArray('forums', [], 'POST') as $forum) {
-            if ($forum < 1) {
-                continue;
-            }
-            $typeHandler->updateByForum($forum, array_flip($templates));
-        }
-        redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
-        break;
-
-    case 'forum':
-        //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
-        $criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
-        $criteriaCategory->setSort('cat_order');
-        $categories = $categoryHandler->getList($criteriaCategory);
-        if (empty($categories)) {
-            redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CREATENEWCATEGORY);
-        }
-        //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forums = $forumHandler->getTree(array_keys($categories));
-        if (empty($forums)) {
-            redirect_header('admin_forum_manager.php', 2, _AM_NEWBB_CREATENEWFORUM);
-        }
-
-        foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
-            foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
-            }
-        }
-        unset($forums, $categories);
-        $fmform    = new \XoopsThemeForm(_AM_NEWBB_TYPE_FORUM, 'fmform', xoops_getenv('PHP_SELF'), 'post', true);
-        $fm_select = new \XoopsFormSelect(_AM_NEWBB_PERM_FORUMS, 'forum', null, 5, false);
-        $fm_select->addOptionArray($fm_options);
-        $fmform->addElement($fm_select);
-        $tray = new \XoopsFormElementTray('');
-        $tray->addElement(new \XoopsFormHidden('op', 'edit_forum'));
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $fmform->addElement($tray);
-
-        //loadModuleAdminMenu(11, _AM_NEWBB_TYPE_FORUM);
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-        $adminObject->displayButton('left');
-
-        $fmform->display();
-        break;
-
-    case 'edit_forum':
-        if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
-        }
-
-        //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        if (!$forumObject = $forumHandler->get(Request::getInt('forum', 0, 'POST'))) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
-        }
-
-        $typesObject = $typeHandler->getAll();
-        if (0 === count($typesObject)) {
-            redirect_header(xoops_getenv('PHP_SELF'), 2, _AM_NEWBB_TYPE_ADD_ERR);
-        }
-
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-        $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-        $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
-        echo '</tr>';
-
-        $types       = $typeHandler->getByForum(Request::getInt('forum', 0, 'POST'));
-        $types_order = [];
-        foreach ($types as $key => $type) {
-            $types_order[] = $type['type_order'];
-        }
-        array_multisort($types_order, $types);
-        foreach ($types as $key => $type) {
-            if (!isset($typesObject[$type['type_id']])) {
-                continue;
-            }
-            $typeObject = $typesObject[$type['type_id']];
-            echo "<tr class='even' align='left'>";
-            echo "<td><input type='text' name='type_order[" . $type['type_id'] . "]' value='" . $type['type_order'] . "' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-            echo '</tr>';
-            unset($typesObject[$type['type_id']]);
-        }
-        echo "<tr><td colspan='3' height='5px'></td></tr>";
-        foreach ($typesObject as $key => $typeObject) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
-            echo '</tr>';
-        }
-
-        echo "<tr><td colspan='3' style='text-align:center;'>";
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_EDITFORUM_DESC . '</legend>';
-        echo "<input type='hidden' name='forum' value='" . Request::getInt('forum', 0, 'POST') . "' />";
-        echo "<input type='hidden' name='op' value='save_forum' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
-        echo '</td></tr></table>';
-        echo '</form>';
-        echo '</td></tr></table>';
-        break;
-
-    case 'save_forum':
-        if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
-        }
-        $typeHandler->updateByForum(Request::getInt('forum', 0, 'POST'), Request::getArray('type_order', null, 'POST'));
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _MD_NEWBB_DBUPDATED);
-        break;
-
-    case 'add':
-    default:
-        $typesObject = $typeHandler->getAll();
-        if (0 === count($typesObject)) {
-            $op    = 'add';
-            $title = _AM_NEWBB_TYPE_ADD;
-        } else {
-            $title = _AM_NEWBB_TYPE_LIST;
-        }
-
-        if ('add' !== $op) {
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-            $adminObject->displayButton('left');
-        }
-        echo _AM_NEWBB_TYPE_HELP;
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        if ('add' !== $op) {
-            echo "<th class='bg3' width='5%'>" . _DELETE . '</th>';
-        }
-        echo "<th align='left' class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='15%'>" . _AM_NEWBB_TYPE_COLOR . '</th>';
-        echo "<th align='left' class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
-        echo '</tr>';
+	case 'save_type':
+		$type_names0 = $_POST['type_name'];
+		$type_names  = Request::getArray('type_name', null, 'POST');
+		$type_del    = [];
+		foreach (array_keys($type_names) as $key) {
+			if (Request::getBool('isnew', '', 'POST')) {
+				$typeObject = $typeHandler->create();
+			} elseif (!$typeObject = $typeHandler->get($key)) {
+				continue;
+			}
+
+			//            if (Request::getArray("type_del[$key]", '', 'POST')) {
+			$temp = Request::getArray('type_del', '', 'POST');
+			if ($temp[$key]) {
+				$type_del[] = $key;
+				continue;
+			} else {
+				foreach (['type_name', 'type_color', 'type_description'] as $var) {
+					//                    if ($typeObject->getVar($var) != @$_POST[$var][$key]) {
+					//                        $typeObject->setVar($var, @$_POST[$var][$key]);
+					//                    }
+					$temp = Request::getArray($var, '', 'POST');
+					if ($typeObject->getVar($var) != $temp[$key]) {
+						$typeObject->setVar($var, $temp[$key]);
+					}
+
+					//                    $typeObject->setVar($var, Request::getArray($var, '', 'POST')[$key]);
+				}
+				$typeHandler->insert($typeObject);
+				unset($typeObject);
+			}
+		}
+		if (count($type_del) > 0) {
+			$type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', $type_del) . ')', 'IN'));
+			xoops_confirm(['op' => 'delete', 'type_del' => serialize($type_del)], xoops_getenv('PHP_SELF'), sprintf(_AM_NEWBB_TODEL_TYPE, implode(', ', array_values($type_list))), '', false);
+		} else {
+			redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
+		}
+		break;
+
+	case 'delete':
+		$type_dels = @unserialize(Request::getString('type_del', '', 'POST'));
+		foreach ($type_dels as $key) {
+			if (!$typeObject = $typeHandler->get($key)) {
+				continue;
+			}
+			$typeHandler->delete($typeObject);
+			unset($typeObject);
+		}
+		redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
+		break;
+
+	case 'template':
+		$typesObject = $typeHandler->getAll();
+		if (0 === count($typesObject)) {
+			redirect_header(xoops_getenv('PHP_SELF'), 2, _AM_NEWBB_TYPE_ADD_ERR);
+		}
+
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+		$adminObject->displayButton('left');
+		echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
+		echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+		echo '</tr>';
+
+		if ($templates = $cacheHelper->read('type_template')) {
+			arsort($templates);
+			foreach ($templates as $order => $key) {
+				if (!isset($typesObject[$key])) {
+					continue;
+				}
+				$typeObject = $typesObject[$key];
+				echo "<tr class='even' align='left'>";
+				echo "<td><input type='text' name='type_order[{$key}]' value='" . $order . "' size='10' /></td>";
+				echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+				echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+				echo '</tr>';
+				unset($typesObject[$key]);
+			}
+			echo "<tr><td colspan='3' height='5px'></td></tr>";
+		}
+		foreach ($typesObject as $key => $typeObject) {
+			echo "<tr class='odd' align='left'>";
+			echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
+			echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+			echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+			echo '</tr>';
+		}
+
+		echo "<tr><td colspan='3' style='text-align:center;'>";
+		echo "<input type='hidden' name='op' value='save_template' />";
+		echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
+		echo "<input type='reset' value='" . _CANCEL . "' />";
+		echo '</td></tr></table>';
+		echo '</form>';
+		echo '</td></tr></table>';
+		break;
+
+	case 'save_template':
+		$templates = array_flip(array_filter(Request::getArray('type_order', [], 'POST')));
+		$cacheHelper->write('type_template', $templates);
+		redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _MD_NEWBB_DBUPDATED);
+		break;
+
+	case 'apply':
+		if (!$templates = $cacheHelper->read('type_template')) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
+		}
+
+		//        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
+		$criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
+		$criteriaCategory->setSort('cat_order');
+		$categories = $categoryHandler->getList($criteriaCategory);
+		//        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forums = $forumHandler->getTree(array_keys($categories), 0, 'all');
+		foreach (array_keys($forums) as $c) {
+			$fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+			foreach (array_keys($forums[$c]) as $f) {
+				$fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+			}
+		}
+		unset($forums, $categories);
+		$fmform    = new \XoopsThemeForm(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'fmform', xoops_getenv('PHP_SELF'), 'post', true);
+		$fm_select = new \XoopsFormSelect(_AM_NEWBB_PERM_FORUMS, 'forums', null, 10, true);
+		$fm_select->addOptionArray($fm_options);
+		$fmform->addElement($fm_select);
+		$tray = new \XoopsFormElementTray('');
+		$tray->addElement(new \XoopsFormHidden('op', 'save_apply'));
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$fmform->addElement($tray);
+
+		//loadModuleAdminMenu(11, _AM_NEWBB_TYPE_TEMPLATE_APPLY);
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+		$adminObject->displayButton('left');
+
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
+		echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+		echo '</tr>';
+
+		$typesObject = $typeHandler->getAll(new \Criteria('type_id', '(' . implode(', ', array_values($templates)) . ')', 'IN'));
+		arsort($templates);
+		foreach ($templates as $order => $key) {
+			if (!isset($typesObject[$key])) {
+				continue;
+			}
+			$typeObject = $typesObject[$key];
+			echo "<tr class='even' align='left'>";
+			echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+			echo '<td>' . $order . '</td>';
+			echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+			echo '</tr>';
+			unset($typesObject[$key]);
+		}
+		echo '</table>';
+		echo '</td></tr></table>';
+		echo '<br>';
+		$fmform->display();
+		break;
+
+	case 'save_apply':
+		if (!$templates = $cacheHelper->read('type_template')) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
+		}
+		foreach (Request::getArray('forums', [], 'POST') as $forum) {
+			if ($forum < 1) {
+				continue;
+			}
+			$typeHandler->updateByForum($forum, array_flip($templates));
+		}
+		redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
+		break;
+
+	case 'forum':
+		//        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
+		$criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
+		$criteriaCategory->setSort('cat_order');
+		$categories = $categoryHandler->getList($criteriaCategory);
+		if (empty($categories)) {
+			redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CREATENEWCATEGORY);
+		}
+		//        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forums = $forumHandler->getTree(array_keys($categories));
+		if (empty($forums)) {
+			redirect_header('admin_forum_manager.php', 2, _AM_NEWBB_CREATENEWFORUM);
+		}
+
+		foreach (array_keys($forums) as $c) {
+			$fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+			foreach (array_keys($forums[$c]) as $f) {
+				$fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+			}
+		}
+		unset($forums, $categories);
+		$fmform    = new \XoopsThemeForm(_AM_NEWBB_TYPE_FORUM, 'fmform', xoops_getenv('PHP_SELF'), 'post', true);
+		$fm_select = new \XoopsFormSelect(_AM_NEWBB_PERM_FORUMS, 'forum', null, 5, false);
+		$fm_select->addOptionArray($fm_options);
+		$fmform->addElement($fm_select);
+		$tray = new \XoopsFormElementTray('');
+		$tray->addElement(new \XoopsFormHidden('op', 'edit_forum'));
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$fmform->addElement($tray);
+
+		//loadModuleAdminMenu(11, _AM_NEWBB_TYPE_FORUM);
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+		$adminObject->displayButton('left');
+
+		$fmform->display();
+		break;
+
+	case 'edit_forum':
+		if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+		}
+
+		//        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		if (!$forumObject = $forumHandler->get(Request::getInt('forum', 0, 'POST'))) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+		}
+
+		$typesObject = $typeHandler->getAll();
+		if (0 === count($typesObject)) {
+			redirect_header(xoops_getenv('PHP_SELF'), 2, _AM_NEWBB_TYPE_ADD_ERR);
+		}
+
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+		$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+		$adminObject->displayButton('left');
+		echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
+		echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
+		echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+		echo '</tr>';
+
+		$types       = $typeHandler->getByForum(Request::getInt('forum', 0, 'POST'));
+		$types_order = [];
+		foreach ($types as $key => $type) {
+			$types_order[] = $type['type_order'];
+		}
+		array_multisort($types_order, $types);
+		foreach ($types as $key => $type) {
+			if (!isset($typesObject[$type['type_id']])) {
+				continue;
+			}
+			$typeObject = $typesObject[$type['type_id']];
+			echo "<tr class='even' align='left'>";
+			echo "<td><input type='text' name='type_order[" . $type['type_id'] . "]' value='" . $type['type_order'] . "' size='10' /></td>";
+			echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+			echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+			echo '</tr>';
+			unset($typesObject[$type['type_id']]);
+		}
+		echo "<tr><td colspan='3' height='5px'></td></tr>";
+		foreach ($typesObject as $key => $typeObject) {
+			echo "<tr class='odd' align='left'>";
+			echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
+			echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
+			echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+			echo '</tr>';
+		}
+
+		echo "<tr><td colspan='3' style='text-align:center;'>";
+		echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_EDITFORUM_DESC . '</legend>';
+		echo "<input type='hidden' name='forum' value='" . Request::getInt('forum', 0, 'POST') . "' />";
+		echo "<input type='hidden' name='op' value='save_forum' />";
+		echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
+		echo "<input type='reset' value='" . _CANCEL . "' />";
+		echo '</td></tr></table>';
+		echo '</form>';
+		echo '</td></tr></table>';
+		break;
+
+	case 'save_forum':
+		if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
+			redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
+		}
+		$typeHandler->updateByForum(Request::getInt('forum', 0, 'POST'), Request::getArray('type_order', null, 'POST'));
+		redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _MD_NEWBB_DBUPDATED);
+		break;
+
+	case 'add':
+	default:
+		$typesObject = $typeHandler->getAll();
+		if (0 === count($typesObject)) {
+			$op    = 'add';
+			$title = _AM_NEWBB_TYPE_ADD;
+		} else {
+			$title = _AM_NEWBB_TYPE_LIST;
+		}
+
+		if ('add' !== $op) {
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_ADD, 'admin_type_manager.php?op=add', $icon = 'add');
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+			$adminObject->displayButton('left');
+		}
+		echo _AM_NEWBB_TYPE_HELP;
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo "<form name='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		if ('add' !== $op) {
+			echo "<th class='bg3' width='5%'>" . _DELETE . '</th>';
+		}
+		echo "<th align='left' class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
+		echo "<th class='bg3' width='15%'>" . _AM_NEWBB_TYPE_COLOR . '</th>';
+		echo "<th align='left' class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+		echo '</tr>';
 
 //        $isColorpicker = require_once $GLOBALS['xoops']->path('class/xoopsform/formcolorpicker.php');
-        xoops_load('XoopsFormColorPicker');
-
-        if ('add' !== $op) {
-            foreach ($typesObject as $key => $typeObject) {
-                echo "<tr class='odd' align='left'>";
-                echo "<td><input type='checkbox' name='type_del[{$key}]' /></td>";
-                echo "<td><input type='text' name='type_name[{$key}]' value='" . $typeObject->getVar('type_name') . "' size='10' /></td>";
-                if ($isColorpicker) {
-                    $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$key}]", $typeObject->getVar('type_color'));
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
-                } else {
-                    echo "<td><input type='text' name='type_color[{$key}]' value='" . $typeObject->getVar('type_color') . "' size='10' /></td>";
-                }
-                echo "<td><input type='text' name='type_description[{$key}]' value='" . $typeObject->getVar('type_description') . "' size='30' /></td>";
-                echo '</tr>';
-            }
-            echo "<tr><td colspan='4' style='text-align:center;'>";
-        } else {
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
-            $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
-            $adminObject->displayButton('left');
-            for ($i = 0; $i < 10; ++$i) {
-                echo "<tr class='odd' align='left'>";
-                echo "<td><input type='text' name='type_name[{$i}]' value='' size='10' /></td>";
-                if ($isColorpicker) {
-                    $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$i}]", '');
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
-                } else {
-                    echo "<td><input type='text' name='type_color[{$i}]' value='' size='10' /></td>";
-                }
-                echo "<td><input type='text' name='type_description[{$i}]' value='' size='40' /></td>";
-                echo '</tr>';
-            }
-            echo "<tr><td colspan='3' style='text-align:center;'>";
-            echo "<input type='hidden' name='isnew' value='1' />";
-        }
-        echo "<input type='hidden' name='op' value='save_type' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
-        echo '</td></tr></table>';
-        echo '</form>';
-        echo '</td></tr></table>';
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_TYPE . '&nbsp;</legend>';
-        echo _AM_NEWBB_HELP_TYPE_TAB;
-        echo '</fieldset>';
-        break;
+		xoops_load('XoopsFormColorPicker');
+
+		if ('add' !== $op) {
+			foreach ($typesObject as $key => $typeObject) {
+				echo "<tr class='odd' align='left'>";
+				echo "<td><input type='checkbox' name='type_del[{$key}]' /></td>";
+				echo "<td><input type='text' name='type_name[{$key}]' value='" . $typeObject->getVar('type_name') . "' size='10' /></td>";
+				if ($isColorpicker) {
+					$form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$key}]", $typeObject->getVar('type_color'));
+					echo '<td>' . $form_colorpicker->render() . '</td>';
+				} else {
+					echo "<td><input type='text' name='type_color[{$key}]' value='" . $typeObject->getVar('type_color') . "' size='10' /></td>";
+				}
+				echo "<td><input type='text' name='type_description[{$key}]' value='" . $typeObject->getVar('type_description') . "' size='30' /></td>";
+				echo '</tr>';
+			}
+			echo "<tr><td colspan='4' style='text-align:center;'>";
+		} else {
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
+			$adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
+			$adminObject->displayButton('left');
+			for ($i = 0; $i < 10; ++$i) {
+				echo "<tr class='odd' align='left'>";
+				echo "<td><input type='text' name='type_name[{$i}]' value='' size='10' /></td>";
+				if ($isColorpicker) {
+					$form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$i}]", '');
+					echo '<td>' . $form_colorpicker->render() . '</td>';
+				} else {
+					echo "<td><input type='text' name='type_color[{$i}]' value='' size='10' /></td>";
+				}
+				echo "<td><input type='text' name='type_description[{$i}]' value='' size='40' /></td>";
+				echo '</tr>';
+			}
+			echo "<tr><td colspan='3' style='text-align:center;'>";
+			echo "<input type='hidden' name='isnew' value='1' />";
+		}
+		echo "<input type='hidden' name='op' value='save_type' />";
+		echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
+		echo "<input type='reset' value='" . _CANCEL . "' />";
+		echo '</td></tr></table>';
+		echo '</form>';
+		echo '</td></tr></table>';
+		echo '<fieldset>';
+		echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_TYPE . '&nbsp;</legend>';
+		echo _AM_NEWBB_HELP_TYPE_TAB;
+		echo '</fieldset>';
+		break;
 }
 
 require_once __DIR__ . '/admin_footer.php';

Spacing +64 added lines, -64 removed lines

@@ -12,7 +12,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 echo '<br>';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
@@ -85,7 +85,7 @@ 
             }
         }
         if (count($type_del) > 0) {
-            $type_list = $typeHandler->getList(new \Criteria('type_id', '(' . implode(', ', $type_del) . ')', 'IN'));
+            $type_list = $typeHandler->getList(new \Criteria('type_id', '('.implode(', ', $type_del).')', 'IN'));
             xoops_confirm(['op' => 'delete', 'type_del' => serialize($type_del)], xoops_getenv('PHP_SELF'), sprintf(_AM_NEWBB_TODEL_TYPE, implode(', ', array_values($type_list))), '', false);
         } else {
             redirect_header(xoops_getenv('PHP_SELF'), 2, _MD_NEWBB_DBUPDATED);
@@ -115,14 +115,14 @@ 
         $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE_APPLY, 'admin_type_manager.php?op=apply', $icon = 'add');
         $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
         $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo '<legend style="font-weight: bold; color: #900;">'._AM_NEWBB_TYPE_ORDER_DESC.'</legend>';
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo "<form name='template' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_ORDER.'</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
         if ($templates = $cacheHelper->read('type_template')) {
@@ -133,9 +133,9 @@ 
                 }
                 $typeObject = $typesObject[$key];
                 echo "<tr class='even' align='left'>";
-                echo "<td><input type='text' name='type_order[{$key}]' value='" . $order . "' size='10' /></td>";
-                echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-                echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+                echo "<td><input type='text' name='type_order[{$key}]' value='".$order."' size='10' /></td>";
+                echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+                echo '<td>'.$typeObject->getVar('type_description').'</td>';
                 echo '</tr>';
                 unset($typesObject[$key]);
             }
@@ -144,15 +144,15 @@ 
         foreach ($typesObject as $key => $typeObject) {
             echo "<tr class='odd' align='left'>";
             echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
         }
 
         echo "<tr><td colspan='3' style='text-align:center;'>";
         echo "<input type='hidden' name='op' value='save_template' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
+        echo "<input type='submit' name='submit' value='"._SUBMIT."' /> ";
+        echo "<input type='reset' value='"._CANCEL."' />";
         echo '</td></tr></table>';
         echo '</form>';
         echo '</td></tr></table>';
@@ -161,12 +161,12 @@ 
     case 'save_template':
         $templates = array_flip(array_filter(Request::getArray('type_order', [], 'POST')));
         $cacheHelper->write('type_template', $templates);
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _MD_NEWBB_DBUPDATED);
+        redirect_header(xoops_getenv('PHP_SELF').'?op=template', 2, _MD_NEWBB_DBUPDATED);
         break;
 
     case 'apply':
         if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE_ERR);
         }
 
         //        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
@@ -176,9 +176,9 @@ 
         //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
         $forums = $forumHandler->getTree(array_keys($categories), 0, 'all');
         foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+            $fm_options[-1 * $c] = '['.$categories[$c].']';
             foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+                $fm_options[$f] = $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'];
             }
         }
         unset($forums, $categories);
@@ -199,15 +199,15 @@ 
         $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
         $adminObject->displayButton('left');
 
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_ORDER.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
-        $typesObject = $typeHandler->getAll(new \Criteria('type_id', '(' . implode(', ', array_values($templates)) . ')', 'IN'));
+        $typesObject = $typeHandler->getAll(new \Criteria('type_id', '('.implode(', ', array_values($templates)).')', 'IN'));
         arsort($templates);
         foreach ($templates as $order => $key) {
             if (!isset($typesObject[$key])) {
@@ -215,9 +215,9 @@ 
             }
             $typeObject = $typesObject[$key];
             echo "<tr class='even' align='left'>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $order . '</td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$order.'</td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
             unset($typesObject[$key]);
         }
@@ -229,7 +229,7 @@ 
 
     case 'save_apply':
         if (!$templates = $cacheHelper->read('type_template')) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=template', 2, _AM_NEWBB_TYPE_TEMPLATE);
         }
         foreach (Request::getArray('forums', [], 'POST') as $forum) {
             if ($forum < 1) {
@@ -255,9 +255,9 @@ 
         }
 
         foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
+            $fm_options[-1 * $c] = '['.$categories[$c].']';
             foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+                $fm_options[$f] = $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'];
             }
         }
         unset($forums, $categories);
@@ -282,12 +282,12 @@ 
 
     case 'edit_forum':
         if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
         }
 
         //        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
         if (!$forumObject = $forumHandler->get(Request::getInt('forum', 0, 'POST'))) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _AM_NEWBB_TYPE_FORUM_ERR);
         }
 
         $typesObject = $typeHandler->getAll();
@@ -299,14 +299,14 @@ 
         $adminObject->addItemButton(_AM_NEWBB_TYPE_TEMPLATE, 'admin_type_manager.php?op=template', $icon = 'add');
         $adminObject->addItemButton(_AM_NEWBB_TYPE_FORUM, 'admin_type_manager.php?op=forum', $icon = 'add');
         $adminObject->displayButton('left');
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_ORDER_DESC . '</legend>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='template' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo '<legend style="font-weight: bold; color: #900;">'._AM_NEWBB_TYPE_ORDER_DESC.'</legend>';
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo "<form name='template' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_ORDER . '</th>';
-        echo "<th class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_ORDER.'</th>';
+        echo "<th class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
         $types       = $typeHandler->getByForum(Request::getInt('forum', 0, 'POST'));
@@ -321,9 +321,9 @@ 
             }
             $typeObject = $typesObject[$type['type_id']];
             echo "<tr class='even' align='left'>";
-            echo "<td><input type='text' name='type_order[" . $type['type_id'] . "]' value='" . $type['type_order'] . "' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><input type='text' name='type_order[".$type['type_id']."]' value='".$type['type_order']."' size='10' /></td>";
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
             unset($typesObject[$type['type_id']]);
         }
@@ -331,17 +331,17 @@ 
         foreach ($typesObject as $key => $typeObject) {
             echo "<tr class='odd' align='left'>";
             echo "<td><input type='text' name='type_order[{$key}]' value='0' size='10' /></td>";
-            echo "<td><em style='color:" . $typeObject->getVar('type_color') . ";'>" . $typeObject->getVar('type_name') . '</em></td>';
-            echo '<td>' . $typeObject->getVar('type_description') . '</td>';
+            echo "<td><em style='color:".$typeObject->getVar('type_color').";'>".$typeObject->getVar('type_name').'</em></td>';
+            echo '<td>'.$typeObject->getVar('type_description').'</td>';
             echo '</tr>';
         }
 
         echo "<tr><td colspan='3' style='text-align:center;'>";
-        echo '<legend style="font-weight: bold; color: #900;">' . _AM_NEWBB_TYPE_EDITFORUM_DESC . '</legend>';
-        echo "<input type='hidden' name='forum' value='" . Request::getInt('forum', 0, 'POST') . "' />";
+        echo '<legend style="font-weight: bold; color: #900;">'._AM_NEWBB_TYPE_EDITFORUM_DESC.'</legend>';
+        echo "<input type='hidden' name='forum' value='".Request::getInt('forum', 0, 'POST')."' />";
         echo "<input type='hidden' name='op' value='save_forum' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
+        echo "<input type='submit' name='submit' value='"._SUBMIT."' /> ";
+        echo "<input type='reset' value='"._CANCEL."' />";
         echo '</td></tr></table>';
         echo '</form>';
         echo '</td></tr></table>';
@@ -349,10 +349,10 @@ 
 
     case 'save_forum':
         if (!Request::getInt('forum', 0, 'POST') || Request::getInt('forum', 0, 'POST') < 1) {
-            redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
+            redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _AM_NEWBB_TYPE_FORUM);
         }
         $typeHandler->updateByForum(Request::getInt('forum', 0, 'POST'), Request::getArray('type_order', null, 'POST'));
-        redirect_header(xoops_getenv('PHP_SELF') . '?op=forum', 2, _MD_NEWBB_DBUPDATED);
+        redirect_header(xoops_getenv('PHP_SELF').'?op=forum', 2, _MD_NEWBB_DBUPDATED);
         break;
 
     case 'add':
@@ -372,16 +372,16 @@ 
             $adminObject->displayButton('left');
         }
         echo _AM_NEWBB_TYPE_HELP;
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo "<form name='list' method='post' action='" . xoops_getenv('PHP_SELF') . "'>";
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo "<form name='list' method='post' action='".xoops_getenv('PHP_SELF')."'>";
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
         if ('add' !== $op) {
-            echo "<th class='bg3' width='5%'>" . _DELETE . '</th>';
+            echo "<th class='bg3' width='5%'>"._DELETE.'</th>';
         }
-        echo "<th align='left' class='bg3' width='20%'>" . _AM_NEWBB_TYPE_NAME . '</th>';
-        echo "<th class='bg3' width='15%'>" . _AM_NEWBB_TYPE_COLOR . '</th>';
-        echo "<th align='left' class='bg3'>" . _AM_NEWBB_TYPE_DESCRIPTION . '</th>';
+        echo "<th align='left' class='bg3' width='20%'>"._AM_NEWBB_TYPE_NAME.'</th>';
+        echo "<th class='bg3' width='15%'>"._AM_NEWBB_TYPE_COLOR.'</th>';
+        echo "<th align='left' class='bg3'>"._AM_NEWBB_TYPE_DESCRIPTION.'</th>';
         echo '</tr>';
 
 //        $isColorpicker = require_once $GLOBALS['xoops']->path('class/xoopsform/formcolorpicker.php');
@@ -391,14 +391,14 @@ 
             foreach ($typesObject as $key => $typeObject) {
                 echo "<tr class='odd' align='left'>";
                 echo "<td><input type='checkbox' name='type_del[{$key}]' /></td>";
-                echo "<td><input type='text' name='type_name[{$key}]' value='" . $typeObject->getVar('type_name') . "' size='10' /></td>";
+                echo "<td><input type='text' name='type_name[{$key}]' value='".$typeObject->getVar('type_name')."' size='10' /></td>";
                 if ($isColorpicker) {
                     $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$key}]", $typeObject->getVar('type_color'));
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
+                    echo '<td>'.$form_colorpicker->render().'</td>';
                 } else {
-                    echo "<td><input type='text' name='type_color[{$key}]' value='" . $typeObject->getVar('type_color') . "' size='10' /></td>";
+                    echo "<td><input type='text' name='type_color[{$key}]' value='".$typeObject->getVar('type_color')."' size='10' /></td>";
                 }
-                echo "<td><input type='text' name='type_description[{$key}]' value='" . $typeObject->getVar('type_description') . "' size='30' /></td>";
+                echo "<td><input type='text' name='type_description[{$key}]' value='".$typeObject->getVar('type_description')."' size='30' /></td>";
                 echo '</tr>';
             }
             echo "<tr><td colspan='4' style='text-align:center;'>";
@@ -411,7 +411,7 @@ 
                 echo "<td><input type='text' name='type_name[{$i}]' value='' size='10' /></td>";
                 if ($isColorpicker) {
                     $form_colorpicker = new \XoopsFormColorPicker('', "type_color[{$i}]", '');
-                    echo '<td>' . $form_colorpicker->render() . '</td>';
+                    echo '<td>'.$form_colorpicker->render().'</td>';
                 } else {
                     echo "<td><input type='text' name='type_color[{$i}]' value='' size='10' /></td>";
                 }
@@ -422,16 +422,16 @@ 
             echo "<input type='hidden' name='isnew' value='1' />";
         }
         echo "<input type='hidden' name='op' value='save_type' />";
-        echo "<input type='submit' name='submit' value='" . _SUBMIT . "' /> ";
-        echo "<input type='reset' value='" . _CANCEL . "' />";
+        echo "<input type='submit' name='submit' value='"._SUBMIT."' /> ";
+        echo "<input type='reset' value='"._CANCEL."' />";
         echo '</td></tr></table>';
         echo '</form>';
         echo '</td></tr></table>';
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_TYPE . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_TYPE.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_TYPE_TAB;
         echo '</fieldset>';
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/menu.php

Indentation +42 added lines, -42 removed lines

@@ -39,84 +39,84 @@
 $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_INDEX,
-    'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . 'home.png'
+	'title' => _MI_NEWBB_ADMENU_INDEX,
+	'link'  => 'admin/index.php',
+	'icon'  => $pathIcon32 . 'home.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_CATEGORY,
-    'link'  => 'admin/admin_cat_manager.php',
-    'icon'  => $pathIcon32 . 'category.png'
+	'title' => _MI_NEWBB_ADMENU_CATEGORY,
+	'link'  => 'admin/admin_cat_manager.php',
+	'icon'  => $pathIcon32 . 'category.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_FORUM,
-    'link'  => 'admin/admin_forum_manager.php',
-    'icon'  => $pathIcon32 . 'forums.png'
+	'title' => _MI_NEWBB_ADMENU_FORUM,
+	'link'  => 'admin/admin_forum_manager.php',
+	'icon'  => $pathIcon32 . 'forums.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_PERMISSION,
-    'link'  => 'admin/admin_permissions.php',
-    'icon'  => $pathIcon32 . 'permissions.png'
+	'title' => _MI_NEWBB_ADMENU_PERMISSION,
+	'link'  => 'admin/admin_permissions.php',
+	'icon'  => $pathIcon32 . 'permissions.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_ORDER,
-    'link'  => 'admin/admin_forum_reorder.php',
-    'icon'  => $pathIcon32 . 'compfile.png'
+	'title' => _MI_NEWBB_ADMENU_ORDER,
+	'link'  => 'admin/admin_forum_reorder.php',
+	'icon'  => $pathIcon32 . 'compfile.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_PRUNE,
-    'link'  => 'admin/admin_forum_prune.php',
-    'icon'  => $pathIcon32 . 'update.png'
+	'title' => _MI_NEWBB_ADMENU_PRUNE,
+	'link'  => 'admin/admin_forum_prune.php',
+	'icon'  => $pathIcon32 . 'update.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_REPORT,
-    'link'  => 'admin/admin_report.php',
-    'icon'  => $pathIcon32 . 'content.png'
+	'title' => _MI_NEWBB_ADMENU_REPORT,
+	'link'  => 'admin/admin_report.php',
+	'icon'  => $pathIcon32 . 'content.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_DIGEST,
-    'link'  => 'admin/admin_digest.php',
-    'icon'  => $pathIcon32 . 'digest.png'
+	'title' => _MI_NEWBB_ADMENU_DIGEST,
+	'link'  => 'admin/admin_digest.php',
+	'icon'  => $pathIcon32 . 'digest.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_VOTE,
-    'link'  => 'admin/admin_votedata.php',
-    'icon'  => $pathIcon32 . 'button_ok.png'
+	'title' => _MI_NEWBB_ADMENU_VOTE,
+	'link'  => 'admin/admin_votedata.php',
+	'icon'  => $pathIcon32 . 'button_ok.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_TYPE,
-    'link'  => 'admin/admin_type_manager.php',
-    'icon'  => $pathIcon32 . 'type.png'
+	'title' => _MI_NEWBB_ADMENU_TYPE,
+	'link'  => 'admin/admin_type_manager.php',
+	'icon'  => $pathIcon32 . 'type.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_GROUPMOD,
-    'link'  => 'admin/admin_groupmod.php',
-    'icon'  => $pathIcon32 . 'groupmod.png'
+	'title' => _MI_NEWBB_ADMENU_GROUPMOD,
+	'link'  => 'admin/admin_groupmod.php',
+	'icon'  => $pathIcon32 . 'groupmod.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_SYNC,
-    'link'  => 'admin/admin_synchronization.php',
-    'icon'  => $pathIcon32 . 'synchronized.png'
+	'title' => _MI_NEWBB_ADMENU_SYNC,
+	'link'  => 'admin/admin_synchronization.php',
+	'icon'  => $pathIcon32 . 'synchronized.png'
 ];
 
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_MIGRATE,
-    'link'  => 'admin/migrate.php',
-    'icon'  => $pathIcon32 . 'database_go.png'
+	'title' => _MI_NEWBB_ADMENU_MIGRATE,
+	'link'  => 'admin/migrate.php',
+	'icon'  => $pathIcon32 . 'database_go.png'
 ];
 $adminmenu[] = [
-    'title' => _MI_NEWBB_ADMENU_ABOUT,
-    'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . 'about.png'
+	'title' => _MI_NEWBB_ADMENU_ABOUT,
+	'link'  => 'admin/about.php',
+	'icon'  => $pathIcon32 . 'about.png'
 ];

Spacing +14 added lines, -14 removed lines

@@ -41,82 +41,82 @@
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_INDEX,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . 'home.png'
+    'icon'  => $pathIcon32.'home.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_CATEGORY,
     'link'  => 'admin/admin_cat_manager.php',
-    'icon'  => $pathIcon32 . 'category.png'
+    'icon'  => $pathIcon32.'category.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_FORUM,
     'link'  => 'admin/admin_forum_manager.php',
-    'icon'  => $pathIcon32 . 'forums.png'
+    'icon'  => $pathIcon32.'forums.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_PERMISSION,
     'link'  => 'admin/admin_permissions.php',
-    'icon'  => $pathIcon32 . 'permissions.png'
+    'icon'  => $pathIcon32.'permissions.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_ORDER,
     'link'  => 'admin/admin_forum_reorder.php',
-    'icon'  => $pathIcon32 . 'compfile.png'
+    'icon'  => $pathIcon32.'compfile.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_PRUNE,
     'link'  => 'admin/admin_forum_prune.php',
-    'icon'  => $pathIcon32 . 'update.png'
+    'icon'  => $pathIcon32.'update.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_REPORT,
     'link'  => 'admin/admin_report.php',
-    'icon'  => $pathIcon32 . 'content.png'
+    'icon'  => $pathIcon32.'content.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_DIGEST,
     'link'  => 'admin/admin_digest.php',
-    'icon'  => $pathIcon32 . 'digest.png'
+    'icon'  => $pathIcon32.'digest.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_VOTE,
     'link'  => 'admin/admin_votedata.php',
-    'icon'  => $pathIcon32 . 'button_ok.png'
+    'icon'  => $pathIcon32.'button_ok.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_TYPE,
     'link'  => 'admin/admin_type_manager.php',
-    'icon'  => $pathIcon32 . 'type.png'
+    'icon'  => $pathIcon32.'type.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_GROUPMOD,
     'link'  => 'admin/admin_groupmod.php',
-    'icon'  => $pathIcon32 . 'groupmod.png'
+    'icon'  => $pathIcon32.'groupmod.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_SYNC,
     'link'  => 'admin/admin_synchronization.php',
-    'icon'  => $pathIcon32 . 'synchronized.png'
+    'icon'  => $pathIcon32.'synchronized.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_MIGRATE,
     'link'  => 'admin/migrate.php',
-    'icon'  => $pathIcon32 . 'database_go.png'
+    'icon'  => $pathIcon32.'database_go.png'
 ];
 $adminmenu[] = [
     'title' => _MI_NEWBB_ADMENU_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . 'about.png'
+    'icon'  => $pathIcon32.'about.png'
 ];

class/Common/Configurator.php

Indentation +28 added lines, -28 removed lines

@@ -27,35 +27,35 @@
  */
 class Configurator
 {
-    public $name;
-    public $paths           = [];
-    public $uploadFolders   = [];
-    public $copyBlankFiles  = [];
-    public $copyTestFolders = [];
-    public $templateFolders = [];
-    public $oldFiles        = [];
-    public $oldFolders      = [];
-    public $modCopyright;
+	public $name;
+	public $paths           = [];
+	public $uploadFolders   = [];
+	public $copyBlankFiles  = [];
+	public $copyTestFolders = [];
+	public $templateFolders = [];
+	public $oldFiles        = [];
+	public $oldFolders      = [];
+	public $modCopyright;
 
-    /**
-     * Configurator constructor.
-     */
-    public function __construct()
-    {
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $capsDirName   = strtoupper($moduleDirName);
+	/**
+	 * Configurator constructor.
+	 */
+	public function __construct()
+	{
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		$capsDirName   = strtoupper($moduleDirName);
 
-        require_once  dirname(dirname(__DIR__)) . '/include/config.php';
-        $config = getConfig();
+		require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+		$config = getConfig();
 
-        $this->name            = $config->name;
-        $this->paths           = $config->paths;
-        $this->uploadFolders   = $config->uploadFolders;
-        $this->copyBlankFiles  = $config->copyBlankFiles;
-        $this->copyTestFolders = $config->copyTestFolders;
-        $this->templateFolders = $config->templateFolders;
-        $this->oldFiles        = $config->oldFiles;
-        $this->oldFolders      = $config->oldFolders;
-        $this->modCopyright    = $config->modCopyright;
-    }
+		$this->name            = $config->name;
+		$this->paths           = $config->paths;
+		$this->uploadFolders   = $config->uploadFolders;
+		$this->copyBlankFiles  = $config->copyBlankFiles;
+		$this->copyTestFolders = $config->copyTestFolders;
+		$this->templateFolders = $config->templateFolders;
+		$this->oldFiles        = $config->oldFiles;
+		$this->oldFolders      = $config->oldFolders;
+		$this->modCopyright    = $config->modCopyright;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         $moduleDirName = basename(dirname(dirname(__DIR__)));
         $capsDirName   = strtoupper($moduleDirName);
 
-        require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+        require_once  dirname(dirname(__DIR__)).'/include/config.php';
         $config = getConfig();
 
         $this->name            = $config->name;

class/Common/VersionChecks.php

Indentation +54 added lines, -54 removed lines

@@ -17,63 +17,63 @@
  */
 trait VersionChecks
 {
-    /**
-     *
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @param null|string  $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
-    {
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        xoops_loadLanguage('admin', $moduleDirName);
+	/**
+	 *
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule $module
+	 *
+	 * @param null|string  $requiredVer
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
+	{
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		$moduleDirNameUpper   = strtoupper($moduleDirName);
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		xoops_loadLanguage('admin', $moduleDirName);
 
-        //check for minimum XOOPS version
-        $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
-        if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
-        }
-        $success = true;
+		//check for minimum XOOPS version
+		$currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
+		if (null === $requiredVer) {
+			$requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+		}
+		$success = true;
 
-        if (version_compare($currentVer, $requiredVer, '<')) {
-            $success = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
-        }
+		if (version_compare($currentVer, $requiredVer, '<')) {
+			$success = false;
+			$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 
-    /**
-     *
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(\XoopsModule $module)
-    {
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
-        xoops_loadLanguage('admin', $module->dirname());
-        // check for minimum PHP version
-        $success = true;
-        $verNum  = PHP_VERSION;
-        $reqVer  = $module->getInfo('min_php');
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
-                $success = false;
-            }
-        }
+	/**
+	 *
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(\XoopsModule $module)
+	{
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		$moduleDirNameUpper   = strtoupper($moduleDirName);
+		xoops_loadLanguage('admin', $module->dirname());
+		// check for minimum PHP version
+		$success = true;
+		$verNum  = PHP_VERSION;
+		$reqVer  = $module->getInfo('min_php');
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+				$success = false;
+			}
+		}
 
-        return $success;
-    }
+		return $success;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
     public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null)
     {
         $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
+        $moduleDirNameUpper = strtoupper($moduleDirName);
         if (null === $module) {
             $module = \XoopsModule::getByDirname($moduleDirName);
         }
@@ -38,13 +38,13 @@ 
         //check for minimum XOOPS version
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $success = true;
 
         if (version_compare($currentVer, $requiredVer, '<')) {
             $success = false;
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
         }
 
         return $success;
@@ -61,7 +61,7 @@ 
     public static function checkVerPhp(\XoopsModule $module)
     {
         $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
+        $moduleDirNameUpper = strtoupper($moduleDirName);
         xoops_loadLanguage('admin', $module->dirname());
         // check for minimum PHP version
         $success = true;
@@ -69,7 +69,7 @@ 
         $reqVer  = $module->getInfo('min_php');
         if (false !== $reqVer && '' !== $reqVer) {
             if (version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
                 $success = false;
             }
         }