mambax7 / newbb5

admin/admin_type_manager.php

Indentation +389 added lines, -389 removed lines

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

Spacing +64 added lines, -64 removed lines

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

admin/menu.php

Indentation +42 added lines, -42 removed lines

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

Spacing +14 added lines, -14 removed lines

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

class/Common/Configurator.php

Indentation +28 added lines, -28 removed lines

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

Spacing +1 added lines, -1 removed lines

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

class/Common/VersionChecks.php

Indentation +54 added lines, -54 removed lines

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

Spacing +5 added lines, -5 removed lines

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

class/Common/Migrate.php

Indentation +86 added lines, -86 removed lines

@@ -22,96 +22,96 @@
  */
 class Migrate extends \Xmf\Database\Migrate
 {
-    private $renameTables;
+	private $renameTables;
 
-    /**
-     * Migrate constructor.
-     * @throws \RuntimeException
-     * @throws \InvalidArgumentException
-     */
-    public function __construct()
-    {   require_once  dirname(dirname(__DIR__)) . '/include/config.php';
-        $config = getConfig();
-        $this->renameTables            = $config->renameTables;
+	/**
+	 * Migrate constructor.
+	 * @throws \RuntimeException
+	 * @throws \InvalidArgumentException
+	 */
+	public function __construct()
+	{   require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+		$config = getConfig();
+		$this->renameTables            = $config->renameTables;
 
-        $moduleDirName = basename(dirname(dirname(__DIR__)));
-        parent::__construct($moduleDirName);
-    }
+		$moduleDirName = basename(dirname(dirname(__DIR__)));
+		parent::__construct($moduleDirName);
+	}
 
-    /**
-     * change table prefix if needed
-     */
-    private function changePrefix()
-    {
-        foreach ($this->renameTables as $oldName => $newName) {
-            if ($this->tableHandler->useTable($oldName)) {
-                $this->tableHandler->renameTable($oldName, $newName);
-            }
-        }
-    }
+	/**
+	 * change table prefix if needed
+	 */
+	private function changePrefix()
+	{
+		foreach ($this->renameTables as $oldName => $newName) {
+			if ($this->tableHandler->useTable($oldName)) {
+				$this->tableHandler->renameTable($oldName, $newName);
+			}
+		}
+	}
 
-    /**
-     * Change integer IPv4 column to varchar IPv6 capable
-     *
-     * @param string $tableName  table to convert
-     * @param string $columnName column with IP address
-     *
-     * @return void
-     */
-    private function convertIPAddresses($tableName, $columnName)
-    {
-        if ($this->tableHandler->useTable($tableName)) {
-            $attributes = $this->tableHandler->getColumnAttributes($tableName, $columnName);
-            if (false !== strpos($attributes, ' int(')) {
-                if (false === strpos($attributes, 'unsigned')) {
-                    $this->tableHandler->alterColumn($tableName, $columnName, " bigint(16) NOT NULL  DEFAULT '0' ");
-                    $this->tableHandler->update($tableName, [$columnName => "4294967296 + $columnName"], "WHERE $columnName < 0", false);
-                }
-                $this->tableHandler->alterColumn($tableName, $columnName, " varchar(45)  NOT NULL  DEFAULT '' ");
-                $this->tableHandler->update($tableName, [$columnName => "INET_NTOA($columnName)"], '', false);
-            }
-        }
-    }
+	/**
+	 * Change integer IPv4 column to varchar IPv6 capable
+	 *
+	 * @param string $tableName  table to convert
+	 * @param string $columnName column with IP address
+	 *
+	 * @return void
+	 */
+	private function convertIPAddresses($tableName, $columnName)
+	{
+		if ($this->tableHandler->useTable($tableName)) {
+			$attributes = $this->tableHandler->getColumnAttributes($tableName, $columnName);
+			if (false !== strpos($attributes, ' int(')) {
+				if (false === strpos($attributes, 'unsigned')) {
+					$this->tableHandler->alterColumn($tableName, $columnName, " bigint(16) NOT NULL  DEFAULT '0' ");
+					$this->tableHandler->update($tableName, [$columnName => "4294967296 + $columnName"], "WHERE $columnName < 0", false);
+				}
+				$this->tableHandler->alterColumn($tableName, $columnName, " varchar(45)  NOT NULL  DEFAULT '' ");
+				$this->tableHandler->update($tableName, [$columnName => "INET_NTOA($columnName)"], '', false);
+			}
+		}
+	}
 
-    /**
-     * Move do* columns from newbb_posts to newbb_posts_text table
-     *
-     * @return void
-     */
-    private function moveDoColumns()
-    {
-        $tableName    = 'newbb_posts_text';
-        $srcTableName = 'newbb_posts';
-        if (false !== $this->tableHandler->useTable($tableName)
-            && false !== $this->tableHandler->useTable($srcTableName)) {
-            $attributes = $this->tableHandler->getColumnAttributes($tableName, 'dohtml');
-            if (false === $attributes) {
-                $this->synchronizeTable($tableName);
-                $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
-                $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
-                $this->tableHandler->addToQueue($sql);
-            }
-        }
-    }
+	/**
+	 * Move do* columns from newbb_posts to newbb_posts_text table
+	 *
+	 * @return void
+	 */
+	private function moveDoColumns()
+	{
+		$tableName    = 'newbb_posts_text';
+		$srcTableName = 'newbb_posts';
+		if (false !== $this->tableHandler->useTable($tableName)
+			&& false !== $this->tableHandler->useTable($srcTableName)) {
+			$attributes = $this->tableHandler->getColumnAttributes($tableName, 'dohtml');
+			if (false === $attributes) {
+				$this->synchronizeTable($tableName);
+				$updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
+				$joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
+				$sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+				$this->tableHandler->addToQueue($sql);
+			}
+		}
+	}
 
-    /**
-     * Perform any upfront actions before synchronizing the schema
-     *
-     * Some typical uses include
-     *   table and column renames
-     *   data conversions
-     *
-     * @return void
-     */
-    protected function preSyncActions()
-    {
-        // change 'bb' table prefix to 'newbb'
-        $this->changePrefix();
-        // columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
-        $this->moveDoColumns();
-        // Convert IP address columns from int to readable varchar(45) for IPv6
-        $this->convertIPAddresses('newbb_posts', 'poster_ip');
-        $this->convertIPAddresses('newbb_report', 'reporter_ip');
-    }
+	/**
+	 * Perform any upfront actions before synchronizing the schema
+	 *
+	 * Some typical uses include
+	 *   table and column renames
+	 *   data conversions
+	 *
+	 * @return void
+	 */
+	protected function preSyncActions()
+	{
+		// change 'bb' table prefix to 'newbb'
+		$this->changePrefix();
+		// columns dohtml, dosmiley, doxcode, doimage and dobr moved between tables as some point
+		$this->moveDoColumns();
+		// Convert IP address columns from int to readable varchar(45) for IPv6
+		$this->convertIPAddresses('newbb_posts', 'poster_ip');
+		$this->convertIPAddresses('newbb_report', 'reporter_ip');
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@ 
      * @throws \InvalidArgumentException
      */
     public function __construct()
-    {   require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+    {   require_once  dirname(dirname(__DIR__)).'/include/config.php';
         $config = getConfig();
-        $this->renameTables            = $config->renameTables;
+        $this->renameTables = $config->renameTables;
 
         $moduleDirName = basename(dirname(dirname(__DIR__)));
         parent::__construct($moduleDirName);
@@ -89,7 +89,7 @@ 
                 $this->synchronizeTable($tableName);
                 $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
                 $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n"."SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n".'  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
                 $this->tableHandler->addToQueue($sql);
             }
         }

class/RateHandler.php

Indentation +26 added lines, -26 removed lines

@@ -39,32 +39,32 @@
  */
 class RateHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_votedata', Rate::class, 'ratingid', '');
-    }
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_votedata', Rate::class, 'ratingid', '');
+	}
 
-    /**
-     *
-     */
-    public function synchronization()
-    {
-        //        return;
-    }
+	/**
+	 *
+	 */
+	public function synchronization()
+	{
+		//        return;
+	}
 
-    /**
-     * clean orphan items from database
-     *
-     * @param  string $table_link
-     * @param  string $field_link
-     * @param  string $field_object
-     * @return bool   true on success
-     */
-    public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
-    {
-        return parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
-    }
+	/**
+	 * clean orphan items from database
+	 *
+	 * @param  string $table_link
+	 * @param  string $field_link
+	 * @param  string $field_object
+	 * @return bool   true on success
+	 */
+	public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
+	{
+		return parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
+	}
 }

class/PostHandler.php

Indentation +545 added lines, -545 removed lines

@@ -41,555 +41,555 @@
  */
 class PostHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_posts', Post::class, 'post_id', 'subject');
-    }
-
-    /**
-     * @param  mixed $id
-     * @param  null  $var
-     * @return null|\XoopsObject
-     */
-    public function get($id = null, $var = null) //get($id)
-    {
-        $id   = (int)$id;
-        $post = null;
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' t ON p.post_id=t.post_id WHERE p.post_id=' . $id;
-        if ($array = $this->db->fetchArray($this->db->query($sql))) {
-            $post = $this->create(false);
-            $post->assignVars($array);
-        }
-
-        return $post;
-    }
-
-    /**
-     * @param  int             $limit
-     * @param  int             $start
-     * @param  \CriteriaElement $criteria
-     * @param  null            $fields
-     * @param  bool            $asObject
-     * @param  int             $topic_id
-     * @param  int             $approved
-     * @return array
-     */
-    //    public function getByLimit($topic_id, $limit, $approved = 1)
-    public function &getByLimit(
-        $limit = 0,
-        $start = 0,
-        \CriteriaElement $criteria = null,
-        $fields = null,
-        $asObject = true,
-        $topic_id = 0,
-        $approved = 1
-    ) {
-        $sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
-                  . $this->db->prefix('newbb_posts')
-                  . ' p LEFT JOIN '
-                  . $this->db->prefix('newbb_posts_text')
-                  . ' t ON p.post_id=t.post_id LEFT JOIN '
-                  . $this->db->prefix('newbb_topics')
-                  . ' tp ON tp.topic_id=p.topic_id WHERE p.topic_id='
-                  . $topic_id
-                  . ' AND p.approved ='
-                  . $approved
-                  . ' ORDER BY p.post_time DESC';
-        $result = $this->db->query($sql, $limit, 0);
-        $ret    = [];
-        while (false !== ($myrow = $this->db->fetchArray($result))) {
-            $post = $this->create(false);
-            $post->assignVars($myrow);
-
-            $ret[$myrow['post_id']] = $post;
-            unset($post);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param Post $post
-     * @return mixed
-     */
-    public function getPostForPDF(&$post)
-    {
-        return $post->getPostBody(true);
-    }
-
-    /**
-     * @param Post $post
-     * @return mixed
-     */
-    public function getPostForPrint(&$post)
-    {
-        return $post->getPostBody();
-    }
-
-    /**
-     * @param  int|Post|\XoopsObject $post
-     * @param  bool $force
-     * @return bool
-     */
-    public function approve(&$post, $force = false)
-    {
-        if (empty($post)) {
-            return false;
-        }
-        if (is_numeric($post)) {
-            $post = $this->get($post);
-        }
-
-        $wasApproved = $post->getVar('approved');
-        // irmtfan approve post if the approved = 0 (pending) or -1 (deleted)
-        if (empty($force) && $wasApproved > 0) {
-            return true;
-        }
-        $post->setVar('approved', 1);
-        $this->insert($post, true);
-
-        /** @var Newbb\TopicHandler $topicHandler */
-        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        $topicObject  = $topicHandler->get($post->getVar('topic_id'));
-        if ($topicObject->getVar('topic_last_post_id') < $post->getVar('post_id')) {
-            $topicObject->setVar('topic_last_post_id', $post->getVar('post_id'));
-        }
-        if ($post->isTopic()) {
-            $topicObject->setVar('approved', 1);
-        } else {
-            $topicObject->setVar('topic_replies', $topicObject->getVar('topic_replies') + 1);
-        }
-        $topicHandler->insert($topicObject, true);
-
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forumObject  = $forumHandler->get($post->getVar('forum_id'));
-        if ($forumObject->getVar('forum_last_post_id') < $post->getVar('post_id')) {
-            $forumObject->setVar('forum_last_post_id', $post->getVar('post_id'));
-        }
-        $forumObject->setVar('forum_posts', $forumObject->getVar('forum_posts') + 1);
-        if ($post->isTopic()) {
-            $forumObject->setVar('forum_topics', $forumObject->getVar('forum_topics') + 1);
-        }
-        $forumHandler->insert($forumObject, true);
-
-        // Update user stats
-        if ($post->getVar('uid') > 0) {
-            /** @var \XoopsMemberHandler $memberHandler */
-            $memberHandler = xoops_getHandler('member');
-            $poster        = $memberHandler->getUser($post->getVar('uid'));
-            if (is_object($poster) && $post->getVar('uid') == $poster->getVar('uid')) {
-                $poster->setVar('posts', $poster->getVar('posts') + 1);
-                $res = $memberHandler->insertUser($poster, true);
-                unset($poster);
-            }
-        }
-
-        // Update forum stats
-        /** @var StatsHandler $statsHandler */
-        $statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
-        $statsHandler->update($post->getVar('forum_id'), 'post');
-        if ($post->isTopic()) {
-            $statsHandler->update($post->getVar('forum_id'), 'topic');
-        }
-
-        return true;
-    }
-
-    /**
-     * @param \XoopsObject $post
-     * @param  bool        $force
-     * @return bool
-     */
-    public function insert(\XoopsObject $post, $force = true) //insert(&$post, $force = true)
-    {
-        $topicObject = null;
-        // Set the post time
-        // The time should be "publish" time. To be adjusted later
-        if (!$post->getVar('post_time')) {
-            $post->setVar('post_time', time());
-        }
-
-        /** @var Newbb\TopicHandler $topicHandler */
-        $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-        // Verify the topic ID
-        if ($topic_id = $post->getVar('topic_id')) {
-            $topicObject = $topicHandler->get($topic_id);
-            // Invalid topic OR the topic is no approved and the post is not top post
-            if (!$topicObject//    || (!$post->isTopic() && $topicObject->getVar("approved") < 1)
-            ) {
-                return false;
-            }
-        }
-        if (empty($topic_id)) {
-            $post->setVar('topic_id', 0);
-            $post->setVar('pid', 0);
-            $post->setNew();
-            $topicObject = $topicHandler->create();
-        }
-        $textHandler    = Newbb\Helper::getInstance()->getHandler('Text');
-        $post_text_vars = ['post_text', 'post_edit', 'dohtml', 'doxcode', 'dosmiley', 'doimage', 'dobr'];
-        if ($post->isNew()) {
-            if (!$topic_id = $post->getVar('topic_id')) {
-                $topicObject->setVar('topic_title', $post->getVar('subject', 'n'));
-                $topicObject->setVar('topic_poster', $post->getVar('uid'));
-                $topicObject->setVar('forum_id', $post->getVar('forum_id'));
-                $topicObject->setVar('topic_time', $post->getVar('post_time'));
-                $topicObject->setVar('poster_name', $post->getVar('poster_name'));
-                $topicObject->setVar('approved', $post->getVar('approved'));
-
-                if (!$topic_id = $topicHandler->insert($topicObject, $force)) {
-                    $post->deleteAttachment();
-                    $post->setErrors('insert topic error');
-
-                    //xoops_error($topicObject->getErrors());
-                    return false;
-                }
-                $post->setVar('topic_id', $topic_id);
-
-                $pid = 0;
-                $post->setVar('pid', 0);
-            } elseif (!$post->getVar('pid')) {
-                $pid = $topicHandler->getTopPostId($topic_id);
-                $post->setVar('pid', $pid);
-            }
-
-            $textObject = $textHandler->create();
-            foreach ($post_text_vars as $key) {
-                $textObject->vars[$key] = $post->vars[$key];
-            }
-            $post->destroyVars($post_text_vars);
-
-            //            if (!$post_id = parent::insert($post, $force)) {
-            //                return false;
-            //            }
-
-            if (!$post_id = parent::insert($post, $force)) {
-                return false;
-            } else {
-                $post->unsetNew();
-            }
-
-            $textObject->setVar('post_id', $post_id);
-            if (!$textHandler->insert($textObject, $force)) {
-                $this->delete($post);
-                $post->setErrors('post text insert error');
-
-                //xoops_error($textObject->getErrors());
-                return false;
-            }
-            if ($post->getVar('approved') > 0) {
-                $this->approve($post, true);
-            }
-            $post->setVar('post_id', $post_id);
-        } else {
-            if ($post->isTopic()) {
-                if ($post->getVar('subject') !== $topicObject->getVar('topic_title')) {
-                    $topicObject->setVar('topic_title', $post->getVar('subject', 'n'));
-                }
-                if ($post->getVar('approved') !== $topicObject->getVar('approved')) {
-                    $topicObject->setVar('approved', $post->getVar('approved'));
-                }
-                $topicObject->setDirty();
-                if (!$result = $topicHandler->insert($topicObject, $force)) {
-                    $post->setErrors('update topic error');
-
-                    //xoops_error($topicObject->getErrors());
-                    return false;
-                }
-            }
-            $textObject = $textHandler->get($post->getVar('post_id'));
-            $textObject->setDirty();
-            foreach ($post_text_vars as $key) {
-                $textObject->vars[$key] = $post->vars[$key];
-            }
-            $post->destroyVars($post_text_vars);
-            if (!$post_id = parent::insert($post, $force)) {
-                //xoops_error($post->getErrors());
-                return false;
-            } else {
-                $post->unsetNew();
-            }
-            if (!$textHandler->insert($textObject, $force)) {
-                $post->setErrors('update post text error');
-
-                //xoops_error($textObject->getErrors());
-                return false;
-            }
-        }
-
-        return $post->getVar('post_id');
-    }
-
-    /**
-     * @param \XoopsObject|Post $post
-     * @param  bool        $isDeleteOne
-     * @param  bool        $force
-     * @return bool
-     */
-    public function delete(\XoopsObject $post, $isDeleteOne = true, $force = false)
-    {
-        if (!is_object($post) || 0 == $post->getVar('post_id')) {
-            return false;
-        }
-
-        if ($isDeleteOne) {
-            if ($post->isTopic()) {
-                $criteria = new \CriteriaCompo(new \Criteria('topic_id', $post->getVar('topic_id')));
-                $criteria->add(new \Criteria('approved', 1));
-                $criteria->add(new \Criteria('pid', 0, '>'));
-                if ($this->getPostCount($criteria) > 0) {
-                    return false;
-                }
-            }
-
-            return $this->myDelete($post, $force);
-        } else {
-            require_once $GLOBALS['xoops']->path('class/xoopstree.php');
-            $mytree = new \XoopsTree($this->db->prefix('newbb_posts'), 'post_id', 'pid');
-            $arr    = $mytree->getAllChild($post->getVar('post_id'));
-            // irmtfan - delete childs in a reverse order
-            for ($i = count($arr) - 1; $i >= 0; $i--) {
-                $childpost = $this->create(false);
-                $childpost->assignVars($arr[$i]);
-                $this->myDelete($childpost, $force);
-                unset($childpost);
-            }
-            $this->myDelete($post, $force);
-        }
-
-        return true;
-    }
-
-    /**
-     * @param  Post|\XoopsObject $post
-     * @param  bool $force
-     * @return bool
-     */
-    public function myDelete(Post $post, $force = false)
-    {
-        global $xoopsModule;
-
-        if (!is_object($post) || 0 == $post->getVar('post_id')) {
-            return false;
-        }
-
-        /* Set active post as deleted */
-        if ($post->getVar('approved') > 0 && empty($force)) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET approved = -1 WHERE post_id = ' . $post->getVar('post_id');
-            if (!$result = $this->db->queryF($sql)) {
-            }
-            /* delete pending post directly */
-        } else {
-            $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts'), $post->getVar('post_id'));
-            if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('delete post error: ' . $sql);
-
-                return false;
-            }
-            $post->deleteAttachment();
-
-            $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts_text'), $post->getVar('post_id'));
-            if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('Could not remove post text: ' . $sql);
-
-                return false;
-            }
-        }
-
-        if ($post->isTopic()) {
-            $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-            /** @var Topic $topicObject */
-            $topicObject = $topicHandler->get($post->getVar('topic_id'));
-            if (is_object($topicObject) && $topicObject->getVar('approved') > 0 && empty($force)) {
-                $topiccount_toupdate = 1;
-                $topicObject->setVar('approved', -1);
-                $topicHandler->insert($topicObject);
-                xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'thread', $post->getVar('topic_id'));
-            } else {
-                if (is_object($topicObject)) {
-                    if ($topicObject->getVar('approved') > 0) {
-                        xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'thread', $post->getVar('topic_id'));
-                    }
-
-                    $poll_id = $topicObject->getVar('poll_id');
-                    // START irmtfan poll_module
-                    $topicObject->deletePoll($poll_id);
-                    // END irmtfan poll_module
-                }
-
-                $sql = sprintf('DELETE FROM `%s` WHERE topic_id = %u', $this->db->prefix('newbb_topics'), $post->getVar('topic_id'));
-                if (!$result = $this->db->queryF($sql)) {
-                    //xoops_error($this->db->error());
-                }
-                $sql = sprintf('DELETE FROM `%s` WHERE topic_id = %u', $this->db->prefix('newbb_votedata'), $post->getVar('topic_id'));
-                if (!$result = $this->db->queryF($sql)) {
-                    //xoops_error($this->db->error());
-                }
-            }
-        } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . ' t
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_posts', Post::class, 'post_id', 'subject');
+	}
+
+	/**
+	 * @param  mixed $id
+	 * @param  null  $var
+	 * @return null|\XoopsObject
+	 */
+	public function get($id = null, $var = null) //get($id)
+	{
+		$id   = (int)$id;
+		$post = null;
+		$sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' t ON p.post_id=t.post_id WHERE p.post_id=' . $id;
+		if ($array = $this->db->fetchArray($this->db->query($sql))) {
+			$post = $this->create(false);
+			$post->assignVars($array);
+		}
+
+		return $post;
+	}
+
+	/**
+	 * @param  int             $limit
+	 * @param  int             $start
+	 * @param  \CriteriaElement $criteria
+	 * @param  null            $fields
+	 * @param  bool            $asObject
+	 * @param  int             $topic_id
+	 * @param  int             $approved
+	 * @return array
+	 */
+	//    public function getByLimit($topic_id, $limit, $approved = 1)
+	public function &getByLimit(
+		$limit = 0,
+		$start = 0,
+		\CriteriaElement $criteria = null,
+		$fields = null,
+		$asObject = true,
+		$topic_id = 0,
+		$approved = 1
+	) {
+		$sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
+				  . $this->db->prefix('newbb_posts')
+				  . ' p LEFT JOIN '
+				  . $this->db->prefix('newbb_posts_text')
+				  . ' t ON p.post_id=t.post_id LEFT JOIN '
+				  . $this->db->prefix('newbb_topics')
+				  . ' tp ON tp.topic_id=p.topic_id WHERE p.topic_id='
+				  . $topic_id
+				  . ' AND p.approved ='
+				  . $approved
+				  . ' ORDER BY p.post_time DESC';
+		$result = $this->db->query($sql, $limit, 0);
+		$ret    = [];
+		while (false !== ($myrow = $this->db->fetchArray($result))) {
+			$post = $this->create(false);
+			$post->assignVars($myrow);
+
+			$ret[$myrow['post_id']] = $post;
+			unset($post);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param Post $post
+	 * @return mixed
+	 */
+	public function getPostForPDF(&$post)
+	{
+		return $post->getPostBody(true);
+	}
+
+	/**
+	 * @param Post $post
+	 * @return mixed
+	 */
+	public function getPostForPrint(&$post)
+	{
+		return $post->getPostBody();
+	}
+
+	/**
+	 * @param  int|Post|\XoopsObject $post
+	 * @param  bool $force
+	 * @return bool
+	 */
+	public function approve(&$post, $force = false)
+	{
+		if (empty($post)) {
+			return false;
+		}
+		if (is_numeric($post)) {
+			$post = $this->get($post);
+		}
+
+		$wasApproved = $post->getVar('approved');
+		// irmtfan approve post if the approved = 0 (pending) or -1 (deleted)
+		if (empty($force) && $wasApproved > 0) {
+			return true;
+		}
+		$post->setVar('approved', 1);
+		$this->insert($post, true);
+
+		/** @var Newbb\TopicHandler $topicHandler */
+		$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		$topicObject  = $topicHandler->get($post->getVar('topic_id'));
+		if ($topicObject->getVar('topic_last_post_id') < $post->getVar('post_id')) {
+			$topicObject->setVar('topic_last_post_id', $post->getVar('post_id'));
+		}
+		if ($post->isTopic()) {
+			$topicObject->setVar('approved', 1);
+		} else {
+			$topicObject->setVar('topic_replies', $topicObject->getVar('topic_replies') + 1);
+		}
+		$topicHandler->insert($topicObject, true);
+
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forumObject  = $forumHandler->get($post->getVar('forum_id'));
+		if ($forumObject->getVar('forum_last_post_id') < $post->getVar('post_id')) {
+			$forumObject->setVar('forum_last_post_id', $post->getVar('post_id'));
+		}
+		$forumObject->setVar('forum_posts', $forumObject->getVar('forum_posts') + 1);
+		if ($post->isTopic()) {
+			$forumObject->setVar('forum_topics', $forumObject->getVar('forum_topics') + 1);
+		}
+		$forumHandler->insert($forumObject, true);
+
+		// Update user stats
+		if ($post->getVar('uid') > 0) {
+			/** @var \XoopsMemberHandler $memberHandler */
+			$memberHandler = xoops_getHandler('member');
+			$poster        = $memberHandler->getUser($post->getVar('uid'));
+			if (is_object($poster) && $post->getVar('uid') == $poster->getVar('uid')) {
+				$poster->setVar('posts', $poster->getVar('posts') + 1);
+				$res = $memberHandler->insertUser($poster, true);
+				unset($poster);
+			}
+		}
+
+		// Update forum stats
+		/** @var StatsHandler $statsHandler */
+		$statsHandler = Newbb\Helper::getInstance()->getHandler('Stats');
+		$statsHandler->update($post->getVar('forum_id'), 'post');
+		if ($post->isTopic()) {
+			$statsHandler->update($post->getVar('forum_id'), 'topic');
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param \XoopsObject $post
+	 * @param  bool        $force
+	 * @return bool
+	 */
+	public function insert(\XoopsObject $post, $force = true) //insert(&$post, $force = true)
+	{
+		$topicObject = null;
+		// Set the post time
+		// The time should be "publish" time. To be adjusted later
+		if (!$post->getVar('post_time')) {
+			$post->setVar('post_time', time());
+		}
+
+		/** @var Newbb\TopicHandler $topicHandler */
+		$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+		// Verify the topic ID
+		if ($topic_id = $post->getVar('topic_id')) {
+			$topicObject = $topicHandler->get($topic_id);
+			// Invalid topic OR the topic is no approved and the post is not top post
+			if (!$topicObject//    || (!$post->isTopic() && $topicObject->getVar("approved") < 1)
+			) {
+				return false;
+			}
+		}
+		if (empty($topic_id)) {
+			$post->setVar('topic_id', 0);
+			$post->setVar('pid', 0);
+			$post->setNew();
+			$topicObject = $topicHandler->create();
+		}
+		$textHandler    = Newbb\Helper::getInstance()->getHandler('Text');
+		$post_text_vars = ['post_text', 'post_edit', 'dohtml', 'doxcode', 'dosmiley', 'doimage', 'dobr'];
+		if ($post->isNew()) {
+			if (!$topic_id = $post->getVar('topic_id')) {
+				$topicObject->setVar('topic_title', $post->getVar('subject', 'n'));
+				$topicObject->setVar('topic_poster', $post->getVar('uid'));
+				$topicObject->setVar('forum_id', $post->getVar('forum_id'));
+				$topicObject->setVar('topic_time', $post->getVar('post_time'));
+				$topicObject->setVar('poster_name', $post->getVar('poster_name'));
+				$topicObject->setVar('approved', $post->getVar('approved'));
+
+				if (!$topic_id = $topicHandler->insert($topicObject, $force)) {
+					$post->deleteAttachment();
+					$post->setErrors('insert topic error');
+
+					//xoops_error($topicObject->getErrors());
+					return false;
+				}
+				$post->setVar('topic_id', $topic_id);
+
+				$pid = 0;
+				$post->setVar('pid', 0);
+			} elseif (!$post->getVar('pid')) {
+				$pid = $topicHandler->getTopPostId($topic_id);
+				$post->setVar('pid', $pid);
+			}
+
+			$textObject = $textHandler->create();
+			foreach ($post_text_vars as $key) {
+				$textObject->vars[$key] = $post->vars[$key];
+			}
+			$post->destroyVars($post_text_vars);
+
+			//            if (!$post_id = parent::insert($post, $force)) {
+			//                return false;
+			//            }
+
+			if (!$post_id = parent::insert($post, $force)) {
+				return false;
+			} else {
+				$post->unsetNew();
+			}
+
+			$textObject->setVar('post_id', $post_id);
+			if (!$textHandler->insert($textObject, $force)) {
+				$this->delete($post);
+				$post->setErrors('post text insert error');
+
+				//xoops_error($textObject->getErrors());
+				return false;
+			}
+			if ($post->getVar('approved') > 0) {
+				$this->approve($post, true);
+			}
+			$post->setVar('post_id', $post_id);
+		} else {
+			if ($post->isTopic()) {
+				if ($post->getVar('subject') !== $topicObject->getVar('topic_title')) {
+					$topicObject->setVar('topic_title', $post->getVar('subject', 'n'));
+				}
+				if ($post->getVar('approved') !== $topicObject->getVar('approved')) {
+					$topicObject->setVar('approved', $post->getVar('approved'));
+				}
+				$topicObject->setDirty();
+				if (!$result = $topicHandler->insert($topicObject, $force)) {
+					$post->setErrors('update topic error');
+
+					//xoops_error($topicObject->getErrors());
+					return false;
+				}
+			}
+			$textObject = $textHandler->get($post->getVar('post_id'));
+			$textObject->setDirty();
+			foreach ($post_text_vars as $key) {
+				$textObject->vars[$key] = $post->vars[$key];
+			}
+			$post->destroyVars($post_text_vars);
+			if (!$post_id = parent::insert($post, $force)) {
+				//xoops_error($post->getErrors());
+				return false;
+			} else {
+				$post->unsetNew();
+			}
+			if (!$textHandler->insert($textObject, $force)) {
+				$post->setErrors('update post text error');
+
+				//xoops_error($textObject->getErrors());
+				return false;
+			}
+		}
+
+		return $post->getVar('post_id');
+	}
+
+	/**
+	 * @param \XoopsObject|Post $post
+	 * @param  bool        $isDeleteOne
+	 * @param  bool        $force
+	 * @return bool
+	 */
+	public function delete(\XoopsObject $post, $isDeleteOne = true, $force = false)
+	{
+		if (!is_object($post) || 0 == $post->getVar('post_id')) {
+			return false;
+		}
+
+		if ($isDeleteOne) {
+			if ($post->isTopic()) {
+				$criteria = new \CriteriaCompo(new \Criteria('topic_id', $post->getVar('topic_id')));
+				$criteria->add(new \Criteria('approved', 1));
+				$criteria->add(new \Criteria('pid', 0, '>'));
+				if ($this->getPostCount($criteria) > 0) {
+					return false;
+				}
+			}
+
+			return $this->myDelete($post, $force);
+		} else {
+			require_once $GLOBALS['xoops']->path('class/xoopstree.php');
+			$mytree = new \XoopsTree($this->db->prefix('newbb_posts'), 'post_id', 'pid');
+			$arr    = $mytree->getAllChild($post->getVar('post_id'));
+			// irmtfan - delete childs in a reverse order
+			for ($i = count($arr) - 1; $i >= 0; $i--) {
+				$childpost = $this->create(false);
+				$childpost->assignVars($arr[$i]);
+				$this->myDelete($childpost, $force);
+				unset($childpost);
+			}
+			$this->myDelete($post, $force);
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param  Post|\XoopsObject $post
+	 * @param  bool $force
+	 * @return bool
+	 */
+	public function myDelete(Post $post, $force = false)
+	{
+		global $xoopsModule;
+
+		if (!is_object($post) || 0 == $post->getVar('post_id')) {
+			return false;
+		}
+
+		/* Set active post as deleted */
+		if ($post->getVar('approved') > 0 && empty($force)) {
+			$sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET approved = -1 WHERE post_id = ' . $post->getVar('post_id');
+			if (!$result = $this->db->queryF($sql)) {
+			}
+			/* delete pending post directly */
+		} else {
+			$sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts'), $post->getVar('post_id'));
+			if (!$result = $this->db->queryF($sql)) {
+				$post->setErrors('delete post error: ' . $sql);
+
+				return false;
+			}
+			$post->deleteAttachment();
+
+			$sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts_text'), $post->getVar('post_id'));
+			if (!$result = $this->db->queryF($sql)) {
+				$post->setErrors('Could not remove post text: ' . $sql);
+
+				return false;
+			}
+		}
+
+		if ($post->isTopic()) {
+			$topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+			/** @var Topic $topicObject */
+			$topicObject = $topicHandler->get($post->getVar('topic_id'));
+			if (is_object($topicObject) && $topicObject->getVar('approved') > 0 && empty($force)) {
+				$topiccount_toupdate = 1;
+				$topicObject->setVar('approved', -1);
+				$topicHandler->insert($topicObject);
+				xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'thread', $post->getVar('topic_id'));
+			} else {
+				if (is_object($topicObject)) {
+					if ($topicObject->getVar('approved') > 0) {
+						xoops_notification_deletebyitem($xoopsModule->getVar('mid'), 'thread', $post->getVar('topic_id'));
+					}
+
+					$poll_id = $topicObject->getVar('poll_id');
+					// START irmtfan poll_module
+					$topicObject->deletePoll($poll_id);
+					// END irmtfan poll_module
+				}
+
+				$sql = sprintf('DELETE FROM `%s` WHERE topic_id = %u', $this->db->prefix('newbb_topics'), $post->getVar('topic_id'));
+				if (!$result = $this->db->queryF($sql)) {
+					//xoops_error($this->db->error());
+				}
+				$sql = sprintf('DELETE FROM `%s` WHERE topic_id = %u', $this->db->prefix('newbb_votedata'), $post->getVar('topic_id'));
+				if (!$result = $this->db->queryF($sql)) {
+					//xoops_error($this->db->error());
+				}
+			}
+		} else {
+			$sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . ' t
                             LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.topic_id = t.topic_id
                             SET t.topic_last_post_id = p.post_id
                             WHERE t.topic_last_post_id = ' . $post->getVar('post_id') . '
                                     AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id=t.topic_id)';
-            if (!$result = $this->db->queryF($sql)) {
-            }
-        }
-
-        $postcount_toupdate = $post->getVar('approved');
-
-        if ($postcount_toupdate > 0) {
-
-            // Update user stats
-            if ($post->getVar('uid') > 0) {
-                /** @var \XoopsMemberHandler $memberHandler */
-                $memberHandler = xoops_getHandler('member');
-                $poster        = $memberHandler->getUser($post->getVar('uid'));
-                if (is_object($poster) && $post->getVar('uid') == $poster->getVar('uid')) {
-                    $poster->setVar('posts', $poster->getVar('posts') - 1);
-                    $res = $memberHandler->insertUser($poster, true);
-                    unset($poster);
-                }
-            }
-            // irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
-            if (!$post->isTopic()) {
-                $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET pid = ' . $post->getVar('pid') . ' WHERE approved=1 AND pid=' . $post->getVar('post_id');
-                if (!$result = $this->db->queryF($sql)) {
-                    //xoops_error($this->db->error());
-                }
-            }
-        }
-
-        return true;
-    }
-
-    // START irmtfan enhance getPostCount when there is join (read_mode = 2)
-
-    /**
-     * @param  null $criteria
-     * @param  null $join
-     * @return int|null
-     */
-    public function getPostCount($criteria = null, $join = null)
-    {
-        // if not join get the count from XOOPS/class/model/stats as before
-        if (empty($join)) {
-            return parent::getCount($criteria);
-        }
-
-        $sql = 'SELECT COUNT(*) as count' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
-        // LEFT JOIN
-        $sql .= $join;
-        // WHERE
-        if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-        }
-        if (!$result = $this->db->query($sql)) {
-            //xoops_error($this->db->error().'<br>'.$sql);
-            return null;
-        }
-        $myrow = $this->db->fetchArray($result);
-        $count = $myrow['count'];
-
-        return $count;
-    }
-    // END irmtfan enhance getPostCount when there is join (read_mode = 2)
-    /*
+			if (!$result = $this->db->queryF($sql)) {
+			}
+		}
+
+		$postcount_toupdate = $post->getVar('approved');
+
+		if ($postcount_toupdate > 0) {
+
+			// Update user stats
+			if ($post->getVar('uid') > 0) {
+				/** @var \XoopsMemberHandler $memberHandler */
+				$memberHandler = xoops_getHandler('member');
+				$poster        = $memberHandler->getUser($post->getVar('uid'));
+				if (is_object($poster) && $post->getVar('uid') == $poster->getVar('uid')) {
+					$poster->setVar('posts', $poster->getVar('posts') - 1);
+					$res = $memberHandler->insertUser($poster, true);
+					unset($poster);
+				}
+			}
+			// irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
+			if (!$post->isTopic()) {
+				$sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET pid = ' . $post->getVar('pid') . ' WHERE approved=1 AND pid=' . $post->getVar('post_id');
+				if (!$result = $this->db->queryF($sql)) {
+					//xoops_error($this->db->error());
+				}
+			}
+		}
+
+		return true;
+	}
+
+	// START irmtfan enhance getPostCount when there is join (read_mode = 2)
+
+	/**
+	 * @param  null $criteria
+	 * @param  null $join
+	 * @return int|null
+	 */
+	public function getPostCount($criteria = null, $join = null)
+	{
+		// if not join get the count from XOOPS/class/model/stats as before
+		if (empty($join)) {
+			return parent::getCount($criteria);
+		}
+
+		$sql = 'SELECT COUNT(*) as count' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+		// LEFT JOIN
+		$sql .= $join;
+		// WHERE
+		if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+		}
+		if (!$result = $this->db->query($sql)) {
+			//xoops_error($this->db->error().'<br>'.$sql);
+			return null;
+		}
+		$myrow = $this->db->fetchArray($result);
+		$count = $myrow['count'];
+
+		return $count;
+	}
+	// END irmtfan enhance getPostCount when there is join (read_mode = 2)
+	/*
      * TODO: combining viewtopic.php
      */
-    /**
-     * @param  null $criteria
-     * @param  int  $limit
-     * @param  int  $start
-     * @param  null $join
-     * @return array
-     */
-    public function getPostsByLimit($criteria = null, $limit = 1, $start = 0, $join = null)
-    {
-        $ret = [];
-        $sql = 'SELECT p.*, t.* ' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
-        if (!empty($join)) {
-            $sql .= $join;
-        }
-        if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
-            }
-        }
-        $result = $this->db->query($sql, (int)$limit, (int)$start);
-        if (!$result) {
-            //xoops_error($this->db->error());
-            return $ret;
-        }
-        while (false !== ($myrow = $this->db->fetchArray($result))) {
-            $post = $this->create(false);
-            $post->assignVars($myrow);
-            $ret[$myrow['post_id']] = $post;
-            unset($post);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @return bool
-     */
-    public function synchronization()
-    {
-        //$this->cleanOrphan();
-        return true;
-    }
-
-    /**
-     * clean orphan items from database
-     *
-     * @param  string $table_link
-     * @param  string $field_link
-     * @param  string $field_object
-     * @return bool   true on success
-     */
-    public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
-    {
-        $this->deleteAll(new \Criteria('post_time', 0), true, true);
-        parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
-        parent::cleanOrphan($this->db->prefix('newbb_posts_text'), 'post_id');
-
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_posts_text') . ' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM ' . $this->table . ') )';
-        if (!$result = $this->db->queryF($sql)) {
-            //xoops_error($this->db->error());
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * clean expired objects from database
-     *
-     * @param  int $expire time limit for expiration
-     * @return bool true on success
-     */
-    public function cleanExpires($expire = 0)
-    {
-        // irmtfan if 0 no cleanup look include/plugin.php
-        if (!func_num_args()) {
-            $newbbConfig = newbbLoadConfig();
-            $expire      = isset($newbbConfig['pending_expire']) ? (int)$newbbConfig['pending_expire'] : 7;
-            $expire      = $expire * 24 * 3600; // days to seconds
-        }
-        if (empty($expire)) {
-            return false;
-        }
-        $crit_expire = new \CriteriaCompo(new \Criteria('approved', 0, '<='));
-        //if (!empty($expire)) {
-        $crit_expire->add(new \Criteria('post_time', time() - (int)$expire, '<'));
-
-        //}
-        return $this->deleteAll($crit_expire, true/*, true*/);
-    }
+	/**
+	 * @param  null $criteria
+	 * @param  int  $limit
+	 * @param  int  $start
+	 * @param  null $join
+	 * @return array
+	 */
+	public function getPostsByLimit($criteria = null, $limit = 1, $start = 0, $join = null)
+	{
+		$ret = [];
+		$sql = 'SELECT p.*, t.* ' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+		if (!empty($join)) {
+			$sql .= $join;
+		}
+		if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
+			$sql .= ' ' . $criteria->renderWhere();
+			if ('' !== $criteria->getSort()) {
+				$sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+			}
+		}
+		$result = $this->db->query($sql, (int)$limit, (int)$start);
+		if (!$result) {
+			//xoops_error($this->db->error());
+			return $ret;
+		}
+		while (false !== ($myrow = $this->db->fetchArray($result))) {
+			$post = $this->create(false);
+			$post->assignVars($myrow);
+			$ret[$myrow['post_id']] = $post;
+			unset($post);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function synchronization()
+	{
+		//$this->cleanOrphan();
+		return true;
+	}
+
+	/**
+	 * clean orphan items from database
+	 *
+	 * @param  string $table_link
+	 * @param  string $field_link
+	 * @param  string $field_object
+	 * @return bool   true on success
+	 */
+	public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
+	{
+		$this->deleteAll(new \Criteria('post_time', 0), true, true);
+		parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
+		parent::cleanOrphan($this->db->prefix('newbb_posts_text'), 'post_id');
+
+		$sql = 'DELETE FROM ' . $this->db->prefix('newbb_posts_text') . ' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM ' . $this->table . ') )';
+		if (!$result = $this->db->queryF($sql)) {
+			//xoops_error($this->db->error());
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * clean expired objects from database
+	 *
+	 * @param  int $expire time limit for expiration
+	 * @return bool true on success
+	 */
+	public function cleanExpires($expire = 0)
+	{
+		// irmtfan if 0 no cleanup look include/plugin.php
+		if (!func_num_args()) {
+			$newbbConfig = newbbLoadConfig();
+			$expire      = isset($newbbConfig['pending_expire']) ? (int)$newbbConfig['pending_expire'] : 7;
+			$expire      = $expire * 24 * 3600; // days to seconds
+		}
+		if (empty($expire)) {
+			return false;
+		}
+		$crit_expire = new \CriteriaCompo(new \Criteria('approved', 0, '<='));
+		//if (!empty($expire)) {
+		$crit_expire->add(new \Criteria('post_time', time() - (int)$expire, '<'));
+
+		//}
+		return $this->deleteAll($crit_expire, true/*, true*/);
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -58,7 +58,7 @@ 
     {
         $id   = (int)$id;
         $post = null;
-        $sql  = 'SELECT p.*, t.* FROM ' . $this->db->prefix('newbb_posts') . ' p LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' t ON p.post_id=t.post_id WHERE p.post_id=' . $id;
+        $sql  = 'SELECT p.*, t.* FROM '.$this->db->prefix('newbb_posts').' p LEFT JOIN '.$this->db->prefix('newbb_posts_text').' t ON p.post_id=t.post_id WHERE p.post_id='.$id;
         if ($array = $this->db->fetchArray($this->db->query($sql))) {
             $post = $this->create(false);
             $post->assignVars($array);
@@ -87,7 +87,7 @@ 
         $topic_id = 0,
         $approved = 1
     ) {
-        $sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
+        $sql = 'SELECT p.*, t.*, tp.topic_status FROM '
                   . $this->db->prefix('newbb_posts')
                   . ' p LEFT JOIN '
                   . $this->db->prefix('newbb_posts_text')
@@ -379,14 +379,14 @@ 
 
         /* Set active post as deleted */
         if ($post->getVar('approved') > 0 && empty($force)) {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET approved = -1 WHERE post_id = ' . $post->getVar('post_id');
+            $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET approved = -1 WHERE post_id = '.$post->getVar('post_id');
             if (!$result = $this->db->queryF($sql)) {
             }
             /* delete pending post directly */
         } else {
             $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('delete post error: ' . $sql);
+                $post->setErrors('delete post error: '.$sql);
 
                 return false;
             }
@@ -394,7 +394,7 @@ 
 
             $sql = sprintf('DELETE FROM `%s` WHERE post_id = %u', $this->db->prefix('newbb_posts_text'), $post->getVar('post_id'));
             if (!$result = $this->db->queryF($sql)) {
-                $post->setErrors('Could not remove post text: ' . $sql);
+                $post->setErrors('Could not remove post text: '.$sql);
 
                 return false;
             }
@@ -431,11 +431,11 @@ 
                 }
             }
         } else {
-            $sql = 'UPDATE ' . $this->db->prefix('newbb_topics') . ' t
-                            LEFT JOIN ' . $this->db->prefix('newbb_posts') . ' p ON p.topic_id = t.topic_id
+            $sql = 'UPDATE '.$this->db->prefix('newbb_topics').' t
+                            LEFT JOIN ' . $this->db->prefix('newbb_posts').' p ON p.topic_id = t.topic_id
                             SET t.topic_last_post_id = p.post_id
-                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id') . '
-                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts') . ' WHERE topic_id=t.topic_id)';
+                            WHERE t.topic_last_post_id = ' . $post->getVar('post_id').'
+                                    AND p.post_id = (SELECT MAX(post_id) FROM ' . $this->db->prefix('newbb_posts').' WHERE topic_id=t.topic_id)';
             if (!$result = $this->db->queryF($sql)) {
             }
         }
@@ -457,7 +457,7 @@ 
             }
             // irmtfan - just update the pid for approved posts when the post is not topic (pid=0)
             if (!$post->isTopic()) {
-                $sql = 'UPDATE ' . $this->db->prefix('newbb_posts') . ' SET pid = ' . $post->getVar('pid') . ' WHERE approved=1 AND pid=' . $post->getVar('post_id');
+                $sql = 'UPDATE '.$this->db->prefix('newbb_posts').' SET pid = '.$post->getVar('pid').' WHERE approved=1 AND pid='.$post->getVar('post_id');
                 if (!$result = $this->db->queryF($sql)) {
                     //xoops_error($this->db->error());
                 }
@@ -481,12 +481,12 @@ 
             return parent::getCount($criteria);
         }
 
-        $sql = 'SELECT COUNT(*) as count' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT COUNT(*) as count'.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         // LEFT JOIN
         $sql .= $join;
         // WHERE
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$result = $this->db->query($sql)) {
             //xoops_error($this->db->error().'<br>'.$sql);
@@ -511,14 +511,14 @@ 
     public function getPostsByLimit($criteria = null, $limit = 1, $start = 0, $join = null)
     {
         $ret = [];
-        $sql = 'SELECT p.*, t.* ' . ' FROM ' . $this->db->prefix('newbb_posts') . ' AS p' . ' LEFT JOIN ' . $this->db->prefix('newbb_posts_text') . ' AS t ON t.post_id = p.post_id';
+        $sql = 'SELECT p.*, t.* '.' FROM '.$this->db->prefix('newbb_posts').' AS p'.' LEFT JOIN '.$this->db->prefix('newbb_posts_text').' AS t ON t.post_id = p.post_id';
         if (!empty($join)) {
             $sql .= $join;
         }
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' !== $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
         }
         $result = $this->db->query($sql, (int)$limit, (int)$start);
@@ -559,7 +559,7 @@ 
         parent::cleanOrphan($this->db->prefix('newbb_topics'), 'topic_id');
         parent::cleanOrphan($this->db->prefix('newbb_posts_text'), 'post_id');
 
-        $sql = 'DELETE FROM ' . $this->db->prefix('newbb_posts_text') . ' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM ' . $this->table . ') )';
+        $sql = 'DELETE FROM '.$this->db->prefix('newbb_posts_text').' WHERE (post_id NOT IN ( SELECT DISTINCT post_id FROM '.$this->table.') )';
         if (!$result = $this->db->queryF($sql)) {
             //xoops_error($this->db->error());
             return false;

class/TextHandler.php

Indentation +19 added lines, -19 removed lines

@@ -19,24 +19,24 @@
  */
 class TextHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db = null)
-    {
-        parent::__construct($db, 'newbb_posts_text', Text::class, 'post_id', '');
-    }
+	/**
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db = null)
+	{
+		parent::__construct($db, 'newbb_posts_text', Text::class, 'post_id', '');
+	}
 
-    /**
-     * clean orphan items from database
-     *
-     * @param  string $table_link
-     * @param  string $field_link
-     * @param  string $field_object
-     * @return bool   true on success
-     */
-    public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
-    {
-        return parent::cleanOrphan($this->db->prefix('newbb_posts'), 'post_id');
-    }
+	/**
+	 * clean orphan items from database
+	 *
+	 * @param  string $table_link
+	 * @param  string $field_link
+	 * @param  string $field_object
+	 * @return bool   true on success
+	 */
+	public function cleanOrphan($table_link = '', $field_link = '', $field_object = '') //cleanOrphan()
+	{
+		return parent::cleanOrphan($this->db->prefix('newbb_posts'), 'post_id');
+	}
 }

include/functions.config.php

Indentation +32 added lines, -32 removed lines

@@ -17,37 +17,37 @@
 define('NEWBB_FUNCTIONS_CONFIG_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_CONFIG')) {
-    define('NEWBB_FUNCTIONS_CONFIG', 1);
-
-    /**
-     * @return array
-     * @internal param string $category
-     * @internal param string $dirname
-     */
-    function newbbLoadConfig()
-    {
+	define('NEWBB_FUNCTIONS_CONFIG', 1);
+
+	/**
+	 * @return array
+	 * @internal param string $category
+	 * @internal param string $dirname
+	 */
+	function newbbLoadConfig()
+	{
 //        require_once dirname(__DIR__) . '/class/Helper.php';
-        //$helper = NewBB::getInstance();
-        /** @var \XoopsModules\Newbb\Helper $helper */
-        $helper = \XoopsModules\Newbb\Helper::getInstance();
-        static $configs = null;
-
-        if (null !== $configs) {
-            return $configs;
-        }
-
-        $configs = is_object($helper) ? $helper->getConfig() : [];
-        $plugins = require __DIR__   . '/plugin.php';
-        if (is_array($configs) && is_array($plugins)) {
-            $configs = array_merge($configs, $plugins);
-        }
-        if (!isset($GLOBALS['xoopsModuleConfig'])) {
-            $GLOBALS['xoopsModuleConfig'] = [];
-        }
-        if (is_array($configs)) {
-            $GLOBALS['xoopsModuleConfig'] = array_merge($GLOBALS['xoopsModuleConfig'], $configs);
-        }
-
-        return $configs;
-    }
+		//$helper = NewBB::getInstance();
+		/** @var \XoopsModules\Newbb\Helper $helper */
+		$helper = \XoopsModules\Newbb\Helper::getInstance();
+		static $configs = null;
+
+		if (null !== $configs) {
+			return $configs;
+		}
+
+		$configs = is_object($helper) ? $helper->getConfig() : [];
+		$plugins = require __DIR__   . '/plugin.php';
+		if (is_array($configs) && is_array($plugins)) {
+			$configs = array_merge($configs, $plugins);
+		}
+		if (!isset($GLOBALS['xoopsModuleConfig'])) {
+			$GLOBALS['xoopsModuleConfig'] = [];
+		}
+		if (is_array($configs)) {
+			$GLOBALS['xoopsModuleConfig'] = array_merge($GLOBALS['xoopsModuleConfig'], $configs);
+		}
+
+		return $configs;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 use XoopsModules\Newbb;
 
-defined('NEWBB_FUNCTIONS_INI') || require __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_CONFIG_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_CONFIG')) {
@@ -37,7 +37,7 @@ 
         }
 
         $configs = is_object($helper) ? $helper->getConfig() : [];
-        $plugins = require __DIR__   . '/plugin.php';
+        $plugins = require __DIR__.'/plugin.php';
         if (is_array($configs) && is_array($plugins)) {
             $configs = array_merge($configs, $plugins);
         }