mambax7 / newbb5

admin/admin_votedata.php

Indentation +64 added lines, -64 removed lines

@@ -36,56 +36,56 @@ 
 $op = $op = Request::getCmd('op', Request::getCmd('op', '', 'POST'), 'GET'); //!empty($_GET['op'])? $_GET['op'] : (!empty($_POST['op'])?$_POST['op']:"");
 
 switch ($op) {
-    case 'delvotes':
-        $rid      = Request::getInt('rid', 0, 'GET');
-        $topic_id = Request::getInt('topic_id', 0, 'GET');
-        $sql      = $GLOBALS['xoopsDB']->queryF('DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . " WHERE ratingid = $rid");
-        $GLOBALS['xoopsDB']->query($sql);
+	case 'delvotes':
+		$rid      = Request::getInt('rid', 0, 'GET');
+		$topic_id = Request::getInt('topic_id', 0, 'GET');
+		$sql      = $GLOBALS['xoopsDB']->queryF('DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . " WHERE ratingid = $rid");
+		$GLOBALS['xoopsDB']->query($sql);
 
-        $query       = 'SELECT rating FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' WHERE topic_id = ' . $topic_id . ' ';
-        $voteresult  = $GLOBALS['xoopsDB']->query($query);
-        $votesDB     = $GLOBALS['xoopsDB']->getRowsNum($voteresult);
-        $totalrating = 0;
-        while (false !== (list($rating) = $GLOBALS['xoopsDB']->fetchRow($voteresult))) {
-            $totalrating += $rating;
-        }
-        $finalrating = $totalrating / $votesDB;
-        $finalrating = number_format($finalrating, 4);
-        $sql         = sprintf('UPDATE `%s` SET rating = %u, votes = %u WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $finalrating, $votesDB, $topic_id);
-        $GLOBALS['xoopsDB']->queryF($sql);
+		$query       = 'SELECT rating FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' WHERE topic_id = ' . $topic_id . ' ';
+		$voteresult  = $GLOBALS['xoopsDB']->query($query);
+		$votesDB     = $GLOBALS['xoopsDB']->getRowsNum($voteresult);
+		$totalrating = 0;
+		while (false !== (list($rating) = $GLOBALS['xoopsDB']->fetchRow($voteresult))) {
+			$totalrating += $rating;
+		}
+		$finalrating = $totalrating / $votesDB;
+		$finalrating = number_format($finalrating, 4);
+		$sql         = sprintf('UPDATE `%s` SET rating = %u, votes = %u WHERE topic_id = %u', $GLOBALS['xoopsDB']->prefix('newbb_topics'), $finalrating, $votesDB, $topic_id);
+		$GLOBALS['xoopsDB']->queryF($sql);
 
-        redirect_header('admin_votedata.php', 1, _AM_NEWBB_VOTEDELETED);
-        break;
+		redirect_header('admin_votedata.php', 1, _AM_NEWBB_VOTEDELETED);
+		break;
 
-    case 'main':
-    default:
-        $start         = Request::getInt('start', 0, 'POST');
-        $useravgrating = '0';
-        $uservotes     = '0';
+	case 'main':
+	default:
+		$start         = Request::getInt('start', 0, 'POST');
+		$useravgrating = '0';
+		$uservotes     = '0';
 
-        $sql     = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' ORDER BY ratingtimestamp DESC';
-        $results = $GLOBALS['xoopsDB']->query($sql, 20, $start);
-        $votes   = $GLOBALS['xoopsDB']->getRowsNum($results);
+		$sql     = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' ORDER BY ratingtimestamp DESC';
+		$results = $GLOBALS['xoopsDB']->query($sql, 20, $start);
+		$votes   = $GLOBALS['xoopsDB']->getRowsNum($results);
 
-        $sql           = 'SELECT rating FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' ';
-        $result2       = $GLOBALS['xoopsDB']->query($sql, 20, $start);
-        $uservotes     = $GLOBALS['xoopsDB']->getRowsNum($result2);
-        $useravgrating = 0;
+		$sql           = 'SELECT rating FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' ';
+		$result2       = $GLOBALS['xoopsDB']->query($sql, 20, $start);
+		$uservotes     = $GLOBALS['xoopsDB']->getRowsNum($result2);
+		$useravgrating = 0;
 
-        while (false !== (list($rating2) = $GLOBALS['xoopsDB']->fetchRow($result2))) {
-            //            $useravgrating = $useravgrating + $rating2;
-            $useravgrating += $rating2;
-        }
-        if ($useravgrating > 0) {
-            //            $useravgrating = $useravgrating / $uservotes;
-            $useravgrating /= $uservotes;
-            $useravgrating = number_format($useravgrating, 2);
-        }
+		while (false !== (list($rating2) = $GLOBALS['xoopsDB']->fetchRow($result2))) {
+			//            $useravgrating = $useravgrating + $rating2;
+			$useravgrating += $rating2;
+		}
+		if ($useravgrating > 0) {
+			//            $useravgrating = $useravgrating / $uservotes;
+			$useravgrating /= $uservotes;
+			$useravgrating = number_format($useravgrating, 2);
+		}
 
-        xoops_cp_header();
-        $adminObject->displayNavigation(basename(__FILE__));
+		xoops_cp_header();
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        echo "<div style='padding: 8px;'>\n
+		echo "<div style='padding: 8px;'>\n
         <div><strong>" . _AM_NEWBB_VOTE_USERAVG . ": </strong>$useravgrating</div>\n
         <div><strong>" . _AM_NEWBB_VOTE_TOTALRATE . ": </strong>$uservotes</div>\n
         <div style='padding: 8px;'>\n
@@ -103,16 +103,16 @@ 
         <th align='center'>" . _AM_NEWBB_VOTE_DATE . "</th>\n
         <th align='center'>" . _AM_NEWBB_ACTION . "</th></tr>\n";
 
-        if (0 == $votes) {
-            echo "<tr><td align='center' colspan='7' class='head'>" . _AM_NEWBB_VOTE_NOVOTES . '</td></tr>';
-        }
-        while (false !== (list($ratingid, $topic_id, $ratinguser, $rating, $ratinghostname, $ratingtimestamp) = $GLOBALS['xoopsDB']->fetchRow($results))) {
-            $sql        = 'SELECT topic_title FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' WHERE topic_id=' . $topic_id . ' ';
-            $down_array = $GLOBALS['xoopsDB']->fetchArray($GLOBALS['xoopsDB']->query($sql));
+		if (0 == $votes) {
+			echo "<tr><td align='center' colspan='7' class='head'>" . _AM_NEWBB_VOTE_NOVOTES . '</td></tr>';
+		}
+		while (false !== (list($ratingid, $topic_id, $ratinguser, $rating, $ratinghostname, $ratingtimestamp) = $GLOBALS['xoopsDB']->fetchRow($results))) {
+			$sql        = 'SELECT topic_title FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' WHERE topic_id=' . $topic_id . ' ';
+			$down_array = $GLOBALS['xoopsDB']->fetchArray($GLOBALS['xoopsDB']->query($sql));
 
-            $formatted_date = formatTimestamp($ratingtimestamp, _DATESTRING);
-            $ratinguname    = newbbGetUnameFromId($ratinguser, $GLOBALS['xoopsModuleConfig']['show_realname']);
-            echo "
+			$formatted_date = formatTimestamp($ratingtimestamp, _DATESTRING);
+			$ratinguname    = newbbGetUnameFromId($ratinguser, $GLOBALS['xoopsModuleConfig']['show_realname']);
+			echo "
         <tr>\n
         <td class='head' align='center'>$ratingid</td>\n
         <td class='even' align='center'>$ratinguname</td>\n
@@ -122,18 +122,18 @@ 
         <td class='even' align='center'>$formatted_date</td>\n
         <td class='even' align='center'><strong><a href='admin_votedata.php?op=delvotes&amp;topic_id=$topic_id&amp;rid=$ratingid'>" . newbbDisplayImage('p_delete', _DELETE) . "</a></strong></td>\n
         </tr>\n";
-        }
-        echo '</table>';
-        echo '</td></tr></table>';
-        //Include page navigation
-        require_once $GLOBALS['xoops']->path('class/pagenav.php');
-        $page    = ($votes > 10) ? _AM_NEWBB_INDEX_PAGE : '';
-        $pagenav = new \XoopsPageNav($page, 20, $start, 'start');
-        echo '<div align="right" style="padding: 8px;">' . $page . '' . $pagenav->renderImageNav(4) . '</div>';
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_VOTE . '&nbsp;</legend>';
-        echo _AM_NEWBB_HELP_VOTE_TAB;
-        echo '</fieldset>';
-        break;
+		}
+		echo '</table>';
+		echo '</td></tr></table>';
+		//Include page navigation
+		require_once $GLOBALS['xoops']->path('class/pagenav.php');
+		$page    = ($votes > 10) ? _AM_NEWBB_INDEX_PAGE : '';
+		$pagenav = new \XoopsPageNav($page, 20, $start, 'start');
+		echo '<div align="right" style="padding: 8px;">' . $page . '' . $pagenav->renderImageNav(4) . '</div>';
+		echo '<fieldset>';
+		echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_VOTE . '&nbsp;</legend>';
+		echo _AM_NEWBB_HELP_VOTE_TAB;
+		echo '</fieldset>';
+		break;
 }
 require_once __DIR__ . '/admin_footer.php';

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

admin/admin_permissions.php

Indentation +225 added lines, -225 removed lines

@@ -35,7 +35,7 @@ 
 require_once __DIR__ . '/admin_header.php';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 if (!class_exists('XoopsGroupPermForm')) {
-    require_once $GLOBALS['xoops']->path('class/xoopsform/grouppermform.php');
+	require_once $GLOBALS['xoops']->path('class/xoopsform/grouppermform.php');
 }
 
 /**
@@ -60,247 +60,247 @@ 
 $perms            = $newbbpermHandler->getValidForumPerms();
 
 switch ($action) {
-    case 'template':
-        xoops_cp_header();
-        $adminObject->displayNavigation(basename(__FILE__));
-        echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
-        $opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_TEMPLAT, 'actionform', 'admin_permissions.php', 'get');
-        $op_select = new \XoopsFormSelect('', 'action');
-        $op_select->setExtra('onchange="document.forms.actionform.submit()"');
-        $op_select->addOptionArray([
-                                       'no'       => _SELECT,
-                                       'template' => _AM_NEWBB_PERM_TEMPLATE,
-                                       'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP,
-                                       'default'  => _AM_NEWBB_PERM_SETBYGROUP
-                                   ]);
-        $opform->addElement($op_select);
-        $opform->display();
+	case 'template':
+		xoops_cp_header();
+		$adminObject->displayNavigation(basename(__FILE__));
+		echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
+		$opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_TEMPLAT, 'actionform', 'admin_permissions.php', 'get');
+		$op_select = new \XoopsFormSelect('', 'action');
+		$op_select->setExtra('onchange="document.forms.actionform.submit()"');
+		$op_select->addOptionArray([
+									   'no'       => _SELECT,
+									   'template' => _AM_NEWBB_PERM_TEMPLATE,
+									   'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP,
+									   'default'  => _AM_NEWBB_PERM_SETBYGROUP
+								   ]);
+		$opform->addElement($op_select);
+		$opform->display();
 
-        $memberHandler = xoops_getHandler('member');
-        $glist         = $memberHandler->getGroupList();
-        $elements      = [];
-        $perm_template = $newbbpermHandler->getTemplate();
-        foreach (array_keys($glist) as $i) {
-            $selected   = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : [];
-            $ret_ele    = '<tr align="left" valign="top"><td class="head">' . $glist[$i] . '</td>';
-            $ret_ele    .= '<td class="even">';
-            $ret_ele    .= '<table class="outer"><tr><td class="odd"><table><tr>';
-            $ii         = 0;
-            $option_ids = [];
-            foreach ($perms as $perm) {
-                ++$ii;
-                if (0 == $ii % 5) {
-                    $ret_ele .= '</tr><tr>';
-                }
-                $checked      = in_array('forum_' . $perm, $selected) ? ' checked' : '';
-                $option_id    = $perm . '_' . $i;
-                $option_ids[] = $option_id;
-                $ret_ele      .= '<td><input name="perms[' . $i . '][' . 'forum_' . $perm . ']" id="' . $option_id . '" onclick="" value="1" type="checkbox"' . $checked . '>' . constant('_AM_NEWBB_CAN_' . strtoupper($perm)) . '<br></td>';
-            }
-            $ret_ele    .= '</tr></table></td><td class="even">';
-            $ret_ele    .= _ALL . ' <input id="checkall[' . $i . ']" type="checkbox" value="" onclick="var optionids = new Array(' . implode(', ', $option_ids) . '); xoopsCheckAllElements(optionids, \'checkall[' . $i . ']\')" />';
-            $ret_ele    .= '</td></tr></table>';
-            $ret_ele    .= '</td></tr>';
-            $elements[] = $ret_ele;
-        }
-        $tray = new \XoopsFormElementTray('');
-        $tray->addElement(new \XoopsFormHidden('action', 'template_save'));
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $ret = '<br><strong>' . _AM_NEWBB_PERM_TEMPLATE . '</strong><br>' . _AM_NEWBB_PERM_TEMPLATE_DESC . '<br>';
-        $ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $ret .= implode("\n", $elements);
-        $ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even" style="text-align:center;">';
-        $ret .= $tray->render();
-        $ret .= '</td></tr>';
-        $ret .= '</table></form>';
-        echo $ret;
-        require_once __DIR__ . '/admin_footer.php';
-        break;
+		$memberHandler = xoops_getHandler('member');
+		$glist         = $memberHandler->getGroupList();
+		$elements      = [];
+		$perm_template = $newbbpermHandler->getTemplate();
+		foreach (array_keys($glist) as $i) {
+			$selected   = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : [];
+			$ret_ele    = '<tr align="left" valign="top"><td class="head">' . $glist[$i] . '</td>';
+			$ret_ele    .= '<td class="even">';
+			$ret_ele    .= '<table class="outer"><tr><td class="odd"><table><tr>';
+			$ii         = 0;
+			$option_ids = [];
+			foreach ($perms as $perm) {
+				++$ii;
+				if (0 == $ii % 5) {
+					$ret_ele .= '</tr><tr>';
+				}
+				$checked      = in_array('forum_' . $perm, $selected) ? ' checked' : '';
+				$option_id    = $perm . '_' . $i;
+				$option_ids[] = $option_id;
+				$ret_ele      .= '<td><input name="perms[' . $i . '][' . 'forum_' . $perm . ']" id="' . $option_id . '" onclick="" value="1" type="checkbox"' . $checked . '>' . constant('_AM_NEWBB_CAN_' . strtoupper($perm)) . '<br></td>';
+			}
+			$ret_ele    .= '</tr></table></td><td class="even">';
+			$ret_ele    .= _ALL . ' <input id="checkall[' . $i . ']" type="checkbox" value="" onclick="var optionids = new Array(' . implode(', ', $option_ids) . '); xoopsCheckAllElements(optionids, \'checkall[' . $i . ']\')" />';
+			$ret_ele    .= '</td></tr></table>';
+			$ret_ele    .= '</td></tr>';
+			$elements[] = $ret_ele;
+		}
+		$tray = new \XoopsFormElementTray('');
+		$tray->addElement(new \XoopsFormHidden('action', 'template_save'));
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$ret = '<br><strong>' . _AM_NEWBB_PERM_TEMPLATE . '</strong><br>' . _AM_NEWBB_PERM_TEMPLATE_DESC . '<br>';
+		$ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
+		$ret .= implode("\n", $elements);
+		$ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even" style="text-align:center;">';
+		$ret .= $tray->render();
+		$ret .= '</td></tr>';
+		$ret .= '</table></form>';
+		echo $ret;
+		require_once __DIR__ . '/admin_footer.php';
+		break;
 
-    case 'template_save':
-        //        $res = $newbbpermHandler->setTemplate($_POST['perms'], $groupid = 0);
-        $res = $newbbpermHandler->setTemplate(Request::getArray('perms', '', 'POST'), $groupid = 0);
-        if ($res) {
-            redirect_header('admin_permissions.php', 2, _AM_NEWBB_PERM_TEMPLATE_CREATED);
-        } else {
-            redirect_header('admin_permissions.php?action=template', 2, _AM_NEWBB_PERM_TEMPLATE_ERROR);
-        }
-        break;
-    //        exit();
+	case 'template_save':
+		//        $res = $newbbpermHandler->setTemplate($_POST['perms'], $groupid = 0);
+		$res = $newbbpermHandler->setTemplate(Request::getArray('perms', '', 'POST'), $groupid = 0);
+		if ($res) {
+			redirect_header('admin_permissions.php', 2, _AM_NEWBB_PERM_TEMPLATE_CREATED);
+		} else {
+			redirect_header('admin_permissions.php?action=template', 2, _AM_NEWBB_PERM_TEMPLATE_ERROR);
+		}
+		break;
+	//        exit();
 
-    case 'apply':
-        $perm_template = $newbbpermHandler->getTemplate();
-        if (null === $perm_template) {
-            redirect_header('admin_permissions.php?action=template', 2, _AM_NEWBB_PERM_TEMPLATE);
-        }
-        xoops_cp_header();
-        $adminObject->displayNavigation(basename(__FILE__));
-        echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
-        $opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_APPLY, 'actionform', 'admin_permissions.php', 'get');
-        $op_select = new \XoopsFormSelect('', 'action');
-        $op_select->setExtra('onchange="document.forms.actionform.submit()"');
-        $op_select->addOptionArray([
-                                       'no'       => _SELECT,
-                                       'template' => _AM_NEWBB_PERM_TEMPLATE,
-                                       'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP
-                                   ]);
-        $opform->addElement($op_select);
-        $opform->display();
+	case 'apply':
+		$perm_template = $newbbpermHandler->getTemplate();
+		if (null === $perm_template) {
+			redirect_header('admin_permissions.php?action=template', 2, _AM_NEWBB_PERM_TEMPLATE);
+		}
+		xoops_cp_header();
+		$adminObject->displayNavigation(basename(__FILE__));
+		echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
+		$opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_APPLY, 'actionform', 'admin_permissions.php', 'get');
+		$op_select = new \XoopsFormSelect('', 'action');
+		$op_select->setExtra('onchange="document.forms.actionform.submit()"');
+		$op_select->addOptionArray([
+									   'no'       => _SELECT,
+									   'template' => _AM_NEWBB_PERM_TEMPLATE,
+									   'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP
+								   ]);
+		$opform->addElement($op_select);
+		$opform->display();
 
-        /** @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);
+		/** @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);
 
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
-        foreach (array_keys($forums) as $c) {
-            $fm_options[-1 * $c - 1000] = ' ';
-            $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);
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
+		foreach (array_keys($forums) as $c) {
+			$fm_options[-1 * $c - 1000] = ' ';
+			$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_PERM_TEMPLATEAPP, 'fmform', 'admin_permissions.php', '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('action', 'apply_save'));
-        $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $fmform->addElement($tray);
-        $fmform->display();
-        require_once __DIR__ . '/admin_footer.php';
-        break;
+		$fmform    = new \XoopsThemeForm(_AM_NEWBB_PERM_TEMPLATEAPP, 'fmform', 'admin_permissions.php', '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('action', 'apply_save'));
+		$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+		$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
+		$fmform->addElement($tray);
+		$fmform->display();
+		require_once __DIR__ . '/admin_footer.php';
+		break;
 
-    case 'apply_save':
-        if (!Request::getArray('forums', '', 'POST')) {
-            break;
-        }
-        foreach (Request::getArray('forums', '', 'POST') as $forum) {
-            if ($forum < 1) {
-                continue;
-            }
-            $newbbpermHandler->applyTemplate($forum, $module_id);
-        }
-        $cacheHelper = Newbb\Utility::cleanCache();
-        //$cacheHelper->delete('permission');
-        redirect_header('admin_permissions.php', 2, _AM_NEWBB_PERM_TEMPLATE_APPLIED);
-        break;
+	case 'apply_save':
+		if (!Request::getArray('forums', '', 'POST')) {
+			break;
+		}
+		foreach (Request::getArray('forums', '', 'POST') as $forum) {
+			if ($forum < 1) {
+				continue;
+			}
+			$newbbpermHandler->applyTemplate($forum, $module_id);
+		}
+		$cacheHelper = Newbb\Utility::cleanCache();
+		//$cacheHelper->delete('permission');
+		redirect_header('admin_permissions.php', 2, _AM_NEWBB_PERM_TEMPLATE_APPLIED);
+		break;
 
-    default:
-        xoops_cp_header();
+	default:
+		xoops_cp_header();
 
-        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
-        $criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
-        $criteriaCategory->setSort('cat_order');
-        $categories = $categoryHandler->getList($criteriaCategory);
+		$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);
-        }
+		if (0 === count($categories)) {
+			redirect_header('admin_cat_manager.php', 2, _AM_NEWBB_CREATENEWCATEGORY);
+		}
 
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
 
-        if (0 === count($forums)) {
-            redirect_header('admin_forum_manager.php', 2, _AM_NEWBB_CREATENEWFORUM);
-        }
+		if (0 === count($forums)) {
+			redirect_header('admin_forum_manager.php', 2, _AM_NEWBB_CREATENEWFORUM);
+		}
 
-        $adminObject->displayNavigation(basename(__FILE__));
-        echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
-        $opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP, 'actionform', 'admin_permissions.php', 'get');
-        $op_select = new \XoopsFormSelect('', 'action');
-        $op_select->setExtra('onchange="document.forms.actionform.submit()"');
-        $op_select->addOptionArray([
-                                       'no'       => _SELECT,
-                                       'template' => _AM_NEWBB_PERM_TEMPLATE,
-                                       'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP,
-                                       'default'  => _AM_NEWBB_PERM_SETBYGROUP
-                                   ]);
-        $opform->addElement($op_select);
-        $opform->display();
+		$adminObject->displayNavigation(basename(__FILE__));
+		echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
+		$opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP, 'actionform', 'admin_permissions.php', 'get');
+		$op_select = new \XoopsFormSelect('', 'action');
+		$op_select->setExtra('onchange="document.forms.actionform.submit()"');
+		$op_select->addOptionArray([
+									   'no'       => _SELECT,
+									   'template' => _AM_NEWBB_PERM_TEMPLATE,
+									   'apply'    => _AM_NEWBB_PERM_TEMPLATEAPP,
+									   'default'  => _AM_NEWBB_PERM_SETBYGROUP
+								   ]);
+		$opform->addElement($op_select);
+		$opform->display();
 
-        $op_options = ['category' => _AM_NEWBB_CAT_ACCESS];
-        $fm_options = [
-            'category' => [
-                'title'     => _AM_NEWBB_CAT_ACCESS,
-                'item'      => 'category_access',
-                'desc'      => '',
-                'anonymous' => true
-            ]
-        ];
-        foreach ($perms as $perm) {
-            $op_options[$perm] = constant('_AM_NEWBB_CAN_' . strtoupper($perm));
-            $fm_options[$perm] = [
-                'title'     => constant('_AM_NEWBB_CAN_' . strtoupper($perm)),
-                'item'      => 'forum_' . $perm,
-                'desc'      => '',
-                'anonymous' => true
-            ];
-        }
+		$op_options = ['category' => _AM_NEWBB_CAT_ACCESS];
+		$fm_options = [
+			'category' => [
+				'title'     => _AM_NEWBB_CAT_ACCESS,
+				'item'      => 'category_access',
+				'desc'      => '',
+				'anonymous' => true
+			]
+		];
+		foreach ($perms as $perm) {
+			$op_options[$perm] = constant('_AM_NEWBB_CAN_' . strtoupper($perm));
+			$fm_options[$perm] = [
+				'title'     => constant('_AM_NEWBB_CAN_' . strtoupper($perm)),
+				'item'      => 'forum_' . $perm,
+				'desc'      => '',
+				'anonymous' => true
+			];
+		}
 
-        $op_keys = array_keys($op_options);
-        $op      = strtolower(Request::getCmd('op', Request::getCmd('op', '', 'COOKIE'), 'GET'));
-        if (empty($op)) {
-            $op = $op_keys[0];
-            setcookie('op', isset($op_keys[1]) ? $op_keys[1] : '');
-        } elseif (false !== ($key = array_search($op, $op_keys))) {
-            setcookie('op', isset($op_keys[$key + 1]) ? $op_keys[$key + 1] : '');
-        }
+		$op_keys = array_keys($op_options);
+		$op      = strtolower(Request::getCmd('op', Request::getCmd('op', '', 'COOKIE'), 'GET'));
+		if (empty($op)) {
+			$op = $op_keys[0];
+			setcookie('op', isset($op_keys[1]) ? $op_keys[1] : '');
+		} elseif (false !== ($key = array_search($op, $op_keys))) {
+			setcookie('op', isset($op_keys[$key + 1]) ? $op_keys[$key + 1] : '');
+		}
 
-        $opform    = new \XoopsSimpleForm('', 'opform', 'admin_permissions.php', 'get');
-        $op_select = new \XoopsFormSelect('', 'op', $op);
-        $op_select->setExtra('onchange="document.forms.opform.submit()"');
-        $op_select->addOptionArray($op_options);
-        $opform->addElement($op_select);
-        $opform->display();
+		$opform    = new \XoopsSimpleForm('', 'opform', 'admin_permissions.php', 'get');
+		$op_select = new \XoopsFormSelect('', 'op', $op);
+		$op_select->setExtra('onchange="document.forms.opform.submit()"');
+		$op_select->addOptionArray($op_options);
+		$opform->addElement($op_select);
+		$opform->display();
 
-        $perm_desc = '';
+		$perm_desc = '';
 
-        $form = new Newbb\GroupPermForm($fm_options[$op]['title'], $module_id, $fm_options[$op]['item'], $fm_options[$op]['desc'], 'admin/admin_permissions.php', $fm_options[$op]['anonymous']);
+		$form = new Newbb\GroupPermForm($fm_options[$op]['title'], $module_id, $fm_options[$op]['item'], $fm_options[$op]['desc'], 'admin/admin_permissions.php', $fm_options[$op]['anonymous']);
 
-        $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
-        $criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
-        $criteriaCategory->setSort('cat_order');
-        $categories = $categoryHandler->getList($criteriaCategory);
-        if ('category' === $op) {
-            foreach (array_keys($categories) as $key) {
-                $form->addItem($key, $categories[$key]);
-            }
-            unset($categories);
-        } else {
-            $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-            $forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
-            if (count($forums) > 0) {
-                foreach (array_keys($forums) as $c) {
-                    $key_c = -1 * $c;
-                    $form->addItem($key_c, '<strong>[' . $categories[$c] . ']</strong>');
-                    foreach (array_keys($forums[$c]) as $f) {
-                        $pid = $forums[$c][$f]['parent_forum'] ?: $key_c;
-                        $form->addItem($f, $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'], $pid);
-                    }
-                }
-            }
-            unset($forums, $categories);
-        }
-        $form->display();
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_PERMISSION . '&nbsp;</legend>';
-        echo _AM_NEWBB_HELP_PERMISSION_TAB;
-        echo '</fieldset>';
-        // Since we can not control the permission update, a trick is used here
-        /** var Newbb\PermissionHandler $permissionHandler */
-        $permissionHandler = Newbb\Helper::getInstance()->getHandler('Permission');
-        $permissionHandler->createPermData();
-        $cacheHelper = Newbb\Utility::cleanCache();
-        //$cacheHelper->delete('permission');
-        require_once __DIR__ . '/admin_footer.php';
-        break;
+		$categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
+		$criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
+		$criteriaCategory->setSort('cat_order');
+		$categories = $categoryHandler->getList($criteriaCategory);
+		if ('category' === $op) {
+			foreach (array_keys($categories) as $key) {
+				$form->addItem($key, $categories[$key]);
+			}
+			unset($categories);
+		} else {
+			$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+			$forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
+			if (count($forums) > 0) {
+				foreach (array_keys($forums) as $c) {
+					$key_c = -1 * $c;
+					$form->addItem($key_c, '<strong>[' . $categories[$c] . ']</strong>');
+					foreach (array_keys($forums[$c]) as $f) {
+						$pid = $forums[$c][$f]['parent_forum'] ?: $key_c;
+						$form->addItem($f, $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'], $pid);
+					}
+				}
+			}
+			unset($forums, $categories);
+		}
+		$form->display();
+		echo '<fieldset>';
+		echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_PERMISSION . '&nbsp;</legend>';
+		echo _AM_NEWBB_HELP_PERMISSION_TAB;
+		echo '</fieldset>';
+		// Since we can not control the permission update, a trick is used here
+		/** var Newbb\PermissionHandler $permissionHandler */
+		$permissionHandler = Newbb\Helper::getInstance()->getHandler('Permission');
+		$permissionHandler->createPermData();
+		$cacheHelper = Newbb\Utility::cleanCache();
+		//$cacheHelper->delete('permission');
+		require_once __DIR__ . '/admin_footer.php';
+		break;
 }

admin/admin_forum_reorder.php

Indentation +72 added lines, -72 removed lines

@@ -39,84 +39,84 @@
 $forum      = Request::getArray('forum', null, 'POST');
 
 if (Request::getString('submit', '', 'POST')) {
-    $catOrdersCount = count($cat_orders);
-    for ($i = 0; $i < $catOrdersCount; ++$i) {
-        $sql = 'update ' . $GLOBALS['xoopsDB']->prefix('newbb_categories') . ' set cat_order = ' . $cat_orders[$i] . " WHERE cat_id=$cat[$i]";
-        if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-            redirect_header('admin_forum_reorder.php', 1, _AM_NEWBB_FORUM_ERROR);
-        }
-    }
-    $ordersCount = count($orders);
-    for ($i = 0; $i < $ordersCount; ++$i) {
-        $sql = 'update ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' set forum_order = ' . $orders[$i] . ' WHERE forum_id=' . $forum[$i];
-        if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-            redirect_header('admin_forum_reorder.php', 1, _AM_NEWBB_FORUM_ERROR);
-        }
-    }
-    redirect_header('admin_forum_reorder.php', 1, _AM_NEWBB_BOARDREORDER);
+	$catOrdersCount = count($cat_orders);
+	for ($i = 0; $i < $catOrdersCount; ++$i) {
+		$sql = 'update ' . $GLOBALS['xoopsDB']->prefix('newbb_categories') . ' set cat_order = ' . $cat_orders[$i] . " WHERE cat_id=$cat[$i]";
+		if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+			redirect_header('admin_forum_reorder.php', 1, _AM_NEWBB_FORUM_ERROR);
+		}
+	}
+	$ordersCount = count($orders);
+	for ($i = 0; $i < $ordersCount; ++$i) {
+		$sql = 'update ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' set forum_order = ' . $orders[$i] . ' WHERE forum_id=' . $forum[$i];
+		if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+			redirect_header('admin_forum_reorder.php', 1, _AM_NEWBB_FORUM_ERROR);
+		}
+	}
+	redirect_header('admin_forum_reorder.php', 1, _AM_NEWBB_BOARDREORDER);
 } else {
-    require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-    $orders     = [];
-    $cat_orders = [];
-    $forum      = [];
-    $cat        = [];
+	require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+	$orders     = [];
+	$cat_orders = [];
+	$forum      = [];
+	$cat        = [];
 
-    xoops_cp_header();
+	xoops_cp_header();
 
-    $adminObject->displayNavigation(basename(__FILE__));
+	$adminObject->displayNavigation(basename(__FILE__));
 
-    echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-    $tform = new \XoopsThemeForm(_AM_NEWBB_SETFORUMORDER, '', '');
-    $tform->display();
-    echo "<form name='reorder' method='post'>";
-    echo "<table border='0' width='100%' cellpadding='2' cellspacing='1' class='outer'>";
-    echo '<tr>';
-    echo "<td class='head' align='left' width='60%'><strong>" . _AM_NEWBB_REORDERTITLE . '</strong></td>';
-    echo "<td class='head' align='center'><strong>" . _AM_NEWBB_REORDERWEIGHT . '</strong></td>';
-    echo '</tr>';
+	echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+	$tform = new \XoopsThemeForm(_AM_NEWBB_SETFORUMORDER, '', '');
+	$tform->display();
+	echo "<form name='reorder' method='post'>";
+	echo "<table border='0' width='100%' cellpadding='2' cellspacing='1' class='outer'>";
+	echo '<tr>';
+	echo "<td class='head' align='left' width='60%'><strong>" . _AM_NEWBB_REORDERTITLE . '</strong></td>';
+	echo "<td class='head' align='center'><strong>" . _AM_NEWBB_REORDERWEIGHT . '</strong></td>';
+	echo '</tr>';
 
-    //    /** @var Newbb\ForumHandler $forumHandler */
-    //    $forumHandler     = Newbb\Helper::getInstance()->getHandler('Forum');
-    //    /** @var Newbb\CategoryHandler $categoryHandler */
-    //    $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
-    $criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
-    $criteriaCategory->setSort('cat_order');
-    $categories = $categoryHandler->getAll($criteriaCategory, ['cat_id', 'cat_order', 'cat_title']);
-    $forums     = $forumHandler->getTree(array_keys($categories), 0, 'all', '&nbsp;&nbsp;&nbsp;&nbsp;');
-    foreach (array_keys($categories) as $c) {
-        echo '<tr>';
-        echo "<td align='left' nowrap='nowrap' class='head' >" . $categories[$c]->getVar('cat_title') . '</td>';
-        echo "<td align='right' class='head'>";
-        echo "<input type='text' name='cat_orders[]' value='" . $categories[$c]->getVar('cat_order') . "' size='5' maxlength='5' />";
-        echo "<input type='hidden' name='cat[]' value='" . $c . "' />";
-        echo '</td>';
-        echo '</tr>';
+	//    /** @var Newbb\ForumHandler $forumHandler */
+	//    $forumHandler     = Newbb\Helper::getInstance()->getHandler('Forum');
+	//    /** @var Newbb\CategoryHandler $categoryHandler */
+	//    $categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
+	$criteriaCategory = new \CriteriaCompo(new \Criteria('1', 1));
+	$criteriaCategory->setSort('cat_order');
+	$categories = $categoryHandler->getAll($criteriaCategory, ['cat_id', 'cat_order', 'cat_title']);
+	$forums     = $forumHandler->getTree(array_keys($categories), 0, 'all', '&nbsp;&nbsp;&nbsp;&nbsp;');
+	foreach (array_keys($categories) as $c) {
+		echo '<tr>';
+		echo "<td align='left' nowrap='nowrap' class='head' >" . $categories[$c]->getVar('cat_title') . '</td>';
+		echo "<td align='right' class='head'>";
+		echo "<input type='text' name='cat_orders[]' value='" . $categories[$c]->getVar('cat_order') . "' size='5' maxlength='5' />";
+		echo "<input type='hidden' name='cat[]' value='" . $c . "' />";
+		echo '</td>';
+		echo '</tr>';
 
-        if (!isset($forums[$c])) {
-            continue;
-        }
-        $i = 0;
-        foreach ($forums[$c] as $key => $forum) {
-            echo '<tr>';
-            $class = ((++$i) % 2) ? 'odd' : 'even';
-            echo "<td align='left' nowrap='nowrap' class='" . $class . "'>" . $forum['prefix'] . $forum['forum_name'] . '</td>';
-            echo "<td align='left' class='" . $class . "'>";
-            echo $forum['prefix'] . "<input type='text' name='orders[]' value='" . $forum['forum_order'] . "' size='5' maxlength='5' />";
-            echo "<input type='hidden' name='forum[]' value='" . $key . "' />";
-            echo '</td>';
-            echo '</tr>';
-        }
-    }
-    echo "<tr><td class='even' align='center' colspan='6'>";
+		if (!isset($forums[$c])) {
+			continue;
+		}
+		$i = 0;
+		foreach ($forums[$c] as $key => $forum) {
+			echo '<tr>';
+			$class = ((++$i) % 2) ? 'odd' : 'even';
+			echo "<td align='left' nowrap='nowrap' class='" . $class . "'>" . $forum['prefix'] . $forum['forum_name'] . '</td>';
+			echo "<td align='left' class='" . $class . "'>";
+			echo $forum['prefix'] . "<input type='text' name='orders[]' value='" . $forum['forum_order'] . "' size='5' maxlength='5' />";
+			echo "<input type='hidden' name='forum[]' value='" . $key . "' />";
+			echo '</td>';
+			echo '</tr>';
+		}
+	}
+	echo "<tr><td class='even' align='center' colspan='6'>";
 
-    echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
-    echo '</td></tr>';
-    echo '</table>';
-    echo '</form>';
-    echo '</td></tr></table>';
-    echo '<fieldset>';
-    echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_ORDER . '&nbsp;</legend>';
-    echo _AM_NEWBB_HELP_ORDER_TAB;
-    echo '</fieldset>';
+	echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
+	echo '</td></tr>';
+	echo '</table>';
+	echo '</form>';
+	echo '</td></tr></table>';
+	echo '<fieldset>';
+	echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_ORDER . '&nbsp;</legend>';
+	echo _AM_NEWBB_HELP_ORDER_TAB;
+	echo '</fieldset>';
 }
 require_once __DIR__ . '/admin_footer.php';

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

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

admin/admin_footer.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 global $pathIcon32;
 
 if (!class_exists('\Xoops', false)) {
-    echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>\n";
+	echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . "</div>\n";
 }
 
 xoops_cp_footer();

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

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