mambax7 / newbb5

preloads/autoloader.php

Indentation +19 added lines, -19 removed lines

@@ -4,29 +4,29 @@
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(function ($class) {
-    // project-specific namespace prefix
-    $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+	// project-specific namespace prefix
+	$prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
 
-    // base directory for the namespace prefix
-    $base_dir =  dirname(__DIR__) . '/class/';
+	// base directory for the namespace prefix
+	$base_dir =  dirname(__DIR__) . '/class/';
 
-    // does the class use the namespace prefix?
-    $len = strlen($prefix);
+	// does the class use the namespace prefix?
+	$len = strlen($prefix);
 
-    if (0 !== strncmp($prefix, $class, $len)) {
-        return;
-    }
+	if (0 !== strncmp($prefix, $class, $len)) {
+		return;
+	}
 
-    // get the relative class name
-    $relativeClass = substr($class, $len);
+	// get the relative class name
+	$relativeClass = substr($class, $len);
 
-    // replace the namespace prefix with the base directory, replace namespace
-    // separators with directory separators in the relative class name, append
-    // with .php
-    $file = $base_dir . str_replace('\\', '/', $relativeClass) . '.php';
+	// replace the namespace prefix with the base directory, replace namespace
+	// separators with directory separators in the relative class name, append
+	// with .php
+	$file = $base_dir . str_replace('\\', '/', $relativeClass) . '.php';
 
-    // if the file exists, require it
-    if (file_exists($file)) {
-        require_once $file;
-    }
+	// if the file exists, require it
+	if (file_exists($file)) {
+		require_once $file;
+	}
 });

Spacing +4 added lines, -4 removed lines

@@ -3,12 +3,12 @@ 
 /**
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     // project-specific namespace prefix
-    $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+    $prefix = 'XoopsModules\\'.ucfirst(basename(dirname(__DIR__)));
 
     // base directory for the namespace prefix
-    $base_dir =  dirname(__DIR__) . '/class/';
+    $base_dir = dirname(__DIR__).'/class/';
 
     // does the class use the namespace prefix?
     $len = strlen($prefix);
@@ -23,7 +23,7 @@ 
     // replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file = $base_dir . str_replace('\\', '/', $relativeClass) . '.php';
+    $file = $base_dir.str_replace('\\', '/', $relativeClass).'.php';
 
     // if the file exists, require it
     if (file_exists($file)) {

preloads/core.php

Indentation +8 added lines, -8 removed lines

@@ -22,12 +22,12 @@
  */
 class NewbbCorePreload extends \XoopsPreloadItem
 {
-    // to add PSR-4 autoloader
-    /**
-     * @param $args
-     */
-    public static function eventCoreIncludeCommonEnd($args)
-    {
-        require_once __DIR__   . '/autoloader.php';
-    }
+	// to add PSR-4 autoloader
+	/**
+	 * @param $args
+	 */
+	public static function eventCoreIncludeCommonEnd($args)
+	{
+		require_once __DIR__   . '/autoloader.php';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
      */
     public static function eventCoreIncludeCommonEnd($args)
     {
-        require_once __DIR__   . '/autoloader.php';
+        require_once __DIR__.'/autoloader.php';
     }
 }

admin/admin_report.php

Indentation +133 added lines, -133 removed lines

@@ -47,146 +47,146 @@
 xoops_cp_header();
 
 switch ($op) {
-    case 'save':
-        $report_ids = Request::getArray('report_id', '', 'POST');
-        //        $report_ids = Request::getInt('report_id', 0, 'POST'); //$_POST['report_id'];
-        // irmtfan add error redirect header
-        if (0 === count($report_ids)) {
-            redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
-        }
-        $report_memos = Request::getArray('report_memo', [], 'POST'); // isset($_POST['report_memo']) ? $_POST['report_memo'] : array();
-        foreach ($report_ids as $rid => $value) {
-            if (!$value) {
-                continue;
-            }
-            $reportObject = $reportHandler->get($rid);
-            $reportObject->setVar('report_result', 1);
-            $reportObject->setVar('report_memo', $report_memos[$rid]);
-            $reportHandler->insert($reportObject);
-        }
-        // irmtfan add message
-        redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTSAVE);
-        break;
+	case 'save':
+		$report_ids = Request::getArray('report_id', '', 'POST');
+		//        $report_ids = Request::getInt('report_id', 0, 'POST'); //$_POST['report_id'];
+		// irmtfan add error redirect header
+		if (0 === count($report_ids)) {
+			redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
+		}
+		$report_memos = Request::getArray('report_memo', [], 'POST'); // isset($_POST['report_memo']) ? $_POST['report_memo'] : array();
+		foreach ($report_ids as $rid => $value) {
+			if (!$value) {
+				continue;
+			}
+			$reportObject = $reportHandler->get($rid);
+			$reportObject->setVar('report_result', 1);
+			$reportObject->setVar('report_memo', $report_memos[$rid]);
+			$reportHandler->insert($reportObject);
+		}
+		// irmtfan add message
+		redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTSAVE);
+		break;
 
-    case 'delete':
-        $report_ids = Request::getArray('report_id', [], 'POST');// $_POST['report_id'];
-        // irmtfan add error redirect header
-        if (0 === count($report_ids)) {
-            redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
-        }
-        foreach ($report_ids as $rid => $value) {
-            if (!$value) {
-                continue;
-            }
-            if ($reportObject = $reportHandler->get($rid)) {
-                $reportHandler->delete($reportObject);
-            }
-        }
-        // irmtfan add message
-        redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTDELETE);
-        break;
+	case 'delete':
+		$report_ids = Request::getArray('report_id', [], 'POST');// $_POST['report_id'];
+		// irmtfan add error redirect header
+		if (0 === count($report_ids)) {
+			redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
+		}
+		foreach ($report_ids as $rid => $value) {
+			if (!$value) {
+				continue;
+			}
+			if ($reportObject = $reportHandler->get($rid)) {
+				$reportHandler->delete($reportObject);
+			}
+		}
+		// irmtfan add message
+		redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTDELETE);
+		break;
 
-    case 'default':
-    default:
-        require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
+	case 'default':
+	default:
+		require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+		require_once  dirname(__DIR__) . '/include/functions.user.php';
 
-        if ('processed' !== $item) {
-            $process_result = 0;
-            $item_other     = 'admin_report.php?item=processed';
-            $title_other    = _AM_NEWBB_PROCESSEDREPORT;
-            $extra          = _AM_NEWBB_REPORTEXTRA;
-        } else {
-            $process_result = 1;
-            $item_other     = 'admin_report.php?item=process';
-            $title_other    = _AM_NEWBB_PROCESSREPORT;
-            $extra          = _DELETE;
-        }
+		if ('processed' !== $item) {
+			$process_result = 0;
+			$item_other     = 'admin_report.php?item=processed';
+			$title_other    = _AM_NEWBB_PROCESSEDREPORT;
+			$extra          = _AM_NEWBB_REPORTEXTRA;
+		} else {
+			$process_result = 1;
+			$item_other     = 'admin_report.php?item=process';
+			$title_other    = _AM_NEWBB_PROCESSREPORT;
+			$extra          = _DELETE;
+		}
 
-        $limit = 10;
+		$limit = 10;
 
-        $adminObject->displayNavigation(basename(__FILE__));
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        //if (!$newXoopsModuleGui) loadModuleAdminMenu(6,_AM_NEWBB_REPORTADMIN);
-        //    else $adminObject->displayNavigation(basename(__FILE__));
-        $adminObject->addItemButton($title_other, $item_other, $icon = 'add');
-        $adminObject->displayButton('left');
-        echo _AM_NEWBB_REPORTADMIN_HELP;
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo '<form action="' . xoops_getenv('PHP_SELF') . '" method="post">';
-        echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
-        echo "<tr align='center'>";
-        echo "<th class='bg3' width='80%'>" . _AM_NEWBB_REPORTTITLE . '</th>';
-        echo "<th class='bg3' width='10%'>" . $extra . '</th>';
-        echo '</tr>';
+		//if (!$newXoopsModuleGui) loadModuleAdminMenu(6,_AM_NEWBB_REPORTADMIN);
+		//    else $adminObject->displayNavigation(basename(__FILE__));
+		$adminObject->addItemButton($title_other, $item_other, $icon = 'add');
+		$adminObject->displayButton('left');
+		echo _AM_NEWBB_REPORTADMIN_HELP;
+		echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+		echo '<form action="' . xoops_getenv('PHP_SELF') . '" method="post">';
+		echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
+		echo "<tr align='center'>";
+		echo "<th class='bg3' width='80%'>" . _AM_NEWBB_REPORTTITLE . '</th>';
+		echo "<th class='bg3' width='10%'>" . $extra . '</th>';
+		echo '</tr>';
 
-        $reports = $reportHandler->getAllReports('report_id', 'ASC', $limit, $start, $process_result);
-        foreach ($reports as $report) {
-            $post_link = '<a href="'
-                         . XOOPS_URL
-                         . '/modules/'
-                         . $xoopsModule->getVar('dirname')
-                         . '/viewtopic.php?post_id='
-                         . $report['post_id']
-                         . '&amp;topic_id='
-                         . $report['topic_id']
-                         . '&amp;forum='
-                         . $report['forum_id']
-                         . '&amp;viewmode=thread" target="checkreport">'
-                         . $myts->htmlSpecialChars($report['subject'])
-                         . '</a>';
-            $checkbox  = '<input type="checkbox" name="report_id[' . $report['report_id'] . ']" value="1" checked />';
-            if ('processed' !== $item) {
-                $memo = '<input type="text" name="report_memo[' . $report['report_id'] . ']" maxlength="255" size="80" />';
-            } else {
-                $memo = $myts->htmlSpecialChars($report['report_memo']);
-            }
-            echo "<tr class='odd' align='left'>";
-            echo '<td>' . _AM_NEWBB_REPORTPOST . ': ' . $post_link . '</td>';
-            echo "<td align='center'>" . $report['report_id'] . '</td>';
-            echo '</tr>';
-            echo "<tr class='odd' align='left'>";
-            echo '<td>' . _AM_NEWBB_REPORTTEXT . ': ' . $myts->htmlSpecialChars($report['report_text']) . '</td>';
-            $uid           = (int)$report['reporter_uid'];
-            $reporter_name = newbbGetUnameFromId($uid, $GLOBALS['xoopsModuleConfig']['show_realname']);
-            $reporter      = !empty($uid) ? "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $uid . "'>" . $reporter_name . '</a><br>' : '';
-            echo "<td align='center'>" . $reporter . $report['reporter_ip'] . '</td>';
-            echo '</tr>';
-            echo "<tr class='odd' align='left'>";
-            echo '<td>' . _AM_NEWBB_REPORTMEMO . ': ' . $memo . '</td>';
-            echo "<td align='center' >" . $checkbox . '</td>';
-            echo '</tr>';
-            echo "<tr colspan='2'><td height='2'></td></tr>";
-        }
-        $buttons = '';
-        if ('processed' !== $item) {
-            $submit  = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-            $buttons .= $submit->render() . ' ';
-        }
-        $delete  = new \XoopsFormButton('', 'delete', _DELETE, 'submit');
-        $buttons .= $delete->render() . ' ';
-        $cancel  = new \XoopsFormButton('', 'cancel', _CANCEL, 'reset');
-        $buttons .= $cancel->render();
-        echo "<tr colspan='2'><td align='center'>{$buttons}</td></tr>";
-        $hidden = new \XoopsFormHidden('start', $start);
-        echo $hidden->render();
-        $hidden = new \XoopsFormHidden('item', $item);
-        echo $hidden->render() . '</form>';
+		$reports = $reportHandler->getAllReports('report_id', 'ASC', $limit, $start, $process_result);
+		foreach ($reports as $report) {
+			$post_link = '<a href="'
+						 . XOOPS_URL
+						 . '/modules/'
+						 . $xoopsModule->getVar('dirname')
+						 . '/viewtopic.php?post_id='
+						 . $report['post_id']
+						 . '&amp;topic_id='
+						 . $report['topic_id']
+						 . '&amp;forum='
+						 . $report['forum_id']
+						 . '&amp;viewmode=thread" target="checkreport">'
+						 . $myts->htmlSpecialChars($report['subject'])
+						 . '</a>';
+			$checkbox  = '<input type="checkbox" name="report_id[' . $report['report_id'] . ']" value="1" checked />';
+			if ('processed' !== $item) {
+				$memo = '<input type="text" name="report_memo[' . $report['report_id'] . ']" maxlength="255" size="80" />';
+			} else {
+				$memo = $myts->htmlSpecialChars($report['report_memo']);
+			}
+			echo "<tr class='odd' align='left'>";
+			echo '<td>' . _AM_NEWBB_REPORTPOST . ': ' . $post_link . '</td>';
+			echo "<td align='center'>" . $report['report_id'] . '</td>';
+			echo '</tr>';
+			echo "<tr class='odd' align='left'>";
+			echo '<td>' . _AM_NEWBB_REPORTTEXT . ': ' . $myts->htmlSpecialChars($report['report_text']) . '</td>';
+			$uid           = (int)$report['reporter_uid'];
+			$reporter_name = newbbGetUnameFromId($uid, $GLOBALS['xoopsModuleConfig']['show_realname']);
+			$reporter      = !empty($uid) ? "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $uid . "'>" . $reporter_name . '</a><br>' : '';
+			echo "<td align='center'>" . $reporter . $report['reporter_ip'] . '</td>';
+			echo '</tr>';
+			echo "<tr class='odd' align='left'>";
+			echo '<td>' . _AM_NEWBB_REPORTMEMO . ': ' . $memo . '</td>';
+			echo "<td align='center' >" . $checkbox . '</td>';
+			echo '</tr>';
+			echo "<tr colspan='2'><td height='2'></td></tr>";
+		}
+		$buttons = '';
+		if ('processed' !== $item) {
+			$submit  = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+			$buttons .= $submit->render() . ' ';
+		}
+		$delete  = new \XoopsFormButton('', 'delete', _DELETE, 'submit');
+		$buttons .= $delete->render() . ' ';
+		$cancel  = new \XoopsFormButton('', 'cancel', _CANCEL, 'reset');
+		$buttons .= $cancel->render();
+		echo "<tr colspan='2'><td align='center'>{$buttons}</td></tr>";
+		$hidden = new \XoopsFormHidden('start', $start);
+		echo $hidden->render();
+		$hidden = new \XoopsFormHidden('item', $item);
+		echo $hidden->render() . '</form>';
 
-        echo '</table>';
-        echo '</td></tr></table>';
-        $nav = new \XoopsPageNav(
-            $reportHandler->getCount(new \Criteria('report_result', $process_result)),
-            $limit,
-            $start,
-            'start',
-            'item=' . $item
-        );
-        echo $nav->renderNav(4);
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_REPORT . '&nbsp;</legend>';
-        echo _AM_NEWBB_HELP_REPORT_TAB;
-        echo '</fieldset>';
-        break;
+		echo '</table>';
+		echo '</td></tr></table>';
+		$nav = new \XoopsPageNav(
+			$reportHandler->getCount(new \Criteria('report_result', $process_result)),
+			$limit,
+			$start,
+			'start',
+			'item=' . $item
+		);
+		echo $nav->renderNav(4);
+		echo '<fieldset>';
+		echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_REPORT . '&nbsp;</legend>';
+		echo _AM_NEWBB_HELP_REPORT_TAB;
+		echo '</fieldset>';
+		break;
 }
 require_once __DIR__ . '/admin_footer.php';

Spacing +27 added lines, -27 removed lines

@@ -31,7 +31,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 require_once $GLOBALS['xoops']->path('class/pagenav.php');
 
 $op    = Request::getCmd('op', 'default');
@@ -52,7 +52,7 @@ 
         //        $report_ids = Request::getInt('report_id', 0, 'POST'); //$_POST['report_id'];
         // irmtfan add error redirect header
         if (0 === count($report_ids)) {
-            redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
+            redirect_header("admin_report.php?item={$item}".(empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
         }
         $report_memos = Request::getArray('report_memo', [], 'POST'); // isset($_POST['report_memo']) ? $_POST['report_memo'] : array();
         foreach ($report_ids as $rid => $value) {
@@ -65,14 +65,14 @@ 
             $reportHandler->insert($reportObject);
         }
         // irmtfan add message
-        redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTSAVE);
+        redirect_header("admin_report.php?item={$item}".(empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTSAVE);
         break;
 
     case 'delete':
-        $report_ids = Request::getArray('report_id', [], 'POST');// $_POST['report_id'];
+        $report_ids = Request::getArray('report_id', [], 'POST'); // $_POST['report_id'];
         // irmtfan add error redirect header
         if (0 === count($report_ids)) {
-            redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
+            redirect_header("admin_report.php?item={$item}".(empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
         }
         foreach ($report_ids as $rid => $value) {
             if (!$value) {
@@ -83,13 +83,13 @@ 
             }
         }
         // irmtfan add message
-        redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTDELETE);
+        redirect_header("admin_report.php?item={$item}".(empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTDELETE);
         break;
 
     case 'default':
     default:
         require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-        require_once  dirname(__DIR__) . '/include/functions.user.php';
+        require_once  dirname(__DIR__).'/include/functions.user.php';
 
         if ('processed' !== $item) {
             $process_result = 0;
@@ -112,12 +112,12 @@ 
         $adminObject->addItemButton($title_other, $item_other, $icon = 'add');
         $adminObject->displayButton('left');
         echo _AM_NEWBB_REPORTADMIN_HELP;
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo '<form action="' . xoops_getenv('PHP_SELF') . '" method="post">';
+        echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
+        echo '<form action="'.xoops_getenv('PHP_SELF').'" method="post">';
         echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
         echo "<tr align='center'>";
-        echo "<th class='bg3' width='80%'>" . _AM_NEWBB_REPORTTITLE . '</th>';
-        echo "<th class='bg3' width='10%'>" . $extra . '</th>';
+        echo "<th class='bg3' width='80%'>"._AM_NEWBB_REPORTTITLE.'</th>';
+        echo "<th class='bg3' width='10%'>".$extra.'</th>';
         echo '</tr>';
 
         $reports = $reportHandler->getAllReports('report_id', 'ASC', $limit, $start, $process_result);
@@ -135,43 +135,43 @@ 
                          . '&amp;viewmode=thread" target="checkreport">'
                          . $myts->htmlSpecialChars($report['subject'])
                          . '</a>';
-            $checkbox  = '<input type="checkbox" name="report_id[' . $report['report_id'] . ']" value="1" checked />';
+            $checkbox = '<input type="checkbox" name="report_id['.$report['report_id'].']" value="1" checked />';
             if ('processed' !== $item) {
-                $memo = '<input type="text" name="report_memo[' . $report['report_id'] . ']" maxlength="255" size="80" />';
+                $memo = '<input type="text" name="report_memo['.$report['report_id'].']" maxlength="255" size="80" />';
             } else {
                 $memo = $myts->htmlSpecialChars($report['report_memo']);
             }
             echo "<tr class='odd' align='left'>";
-            echo '<td>' . _AM_NEWBB_REPORTPOST . ': ' . $post_link . '</td>';
-            echo "<td align='center'>" . $report['report_id'] . '</td>';
+            echo '<td>'._AM_NEWBB_REPORTPOST.': '.$post_link.'</td>';
+            echo "<td align='center'>".$report['report_id'].'</td>';
             echo '</tr>';
             echo "<tr class='odd' align='left'>";
-            echo '<td>' . _AM_NEWBB_REPORTTEXT . ': ' . $myts->htmlSpecialChars($report['report_text']) . '</td>';
+            echo '<td>'._AM_NEWBB_REPORTTEXT.': '.$myts->htmlSpecialChars($report['report_text']).'</td>';
             $uid           = (int)$report['reporter_uid'];
             $reporter_name = newbbGetUnameFromId($uid, $GLOBALS['xoopsModuleConfig']['show_realname']);
-            $reporter      = !empty($uid) ? "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $uid . "'>" . $reporter_name . '</a><br>' : '';
-            echo "<td align='center'>" . $reporter . $report['reporter_ip'] . '</td>';
+            $reporter      = !empty($uid) ? "<a href='".XOOPS_URL.'/userinfo.php?uid='.$uid."'>".$reporter_name.'</a><br>' : '';
+            echo "<td align='center'>".$reporter.$report['reporter_ip'].'</td>';
             echo '</tr>';
             echo "<tr class='odd' align='left'>";
-            echo '<td>' . _AM_NEWBB_REPORTMEMO . ': ' . $memo . '</td>';
-            echo "<td align='center' >" . $checkbox . '</td>';
+            echo '<td>'._AM_NEWBB_REPORTMEMO.': '.$memo.'</td>';
+            echo "<td align='center' >".$checkbox.'</td>';
             echo '</tr>';
             echo "<tr colspan='2'><td height='2'></td></tr>";
         }
         $buttons = '';
         if ('processed' !== $item) {
-            $submit  = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-            $buttons .= $submit->render() . ' ';
+            $submit = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+            $buttons .= $submit->render().' ';
         }
         $delete  = new \XoopsFormButton('', 'delete', _DELETE, 'submit');
-        $buttons .= $delete->render() . ' ';
+        $buttons .= $delete->render().' ';
         $cancel  = new \XoopsFormButton('', 'cancel', _CANCEL, 'reset');
         $buttons .= $cancel->render();
         echo "<tr colspan='2'><td align='center'>{$buttons}</td></tr>";
         $hidden = new \XoopsFormHidden('start', $start);
         echo $hidden->render();
         $hidden = new \XoopsFormHidden('item', $item);
-        echo $hidden->render() . '</form>';
+        echo $hidden->render().'</form>';
 
         echo '</table>';
         echo '</td></tr></table>';
@@ -180,13 +180,13 @@ 
             $limit,
             $start,
             'start',
-            'item=' . $item
+            'item='.$item
         );
         echo $nav->renderNav(4);
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_REPORT . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_REPORT.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_REPORT_TAB;
         echo '</fieldset>';
         break;
 }
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/index.php

Indentation +61 added lines, -61 removed lines

@@ -49,10 +49,10 @@ 
  */
 function newbb_admin_mkdir($target, $mode = 0777)
 {
-    $target = str_replace('..', '', $target);
+	$target = str_replace('..', '', $target);
 
-    // http://www.php.net/manual/en/function.mkdir.php
-    return is_dir($target) || (newbb_admin_mkdir(dirname($target), $mode) && mkdir($target, $mode));
+	// http://www.php.net/manual/en/function.mkdir.php
+	return is_dir($target) || (newbb_admin_mkdir(dirname($target), $mode) && mkdir($target, $mode));
 }
 
 /**
@@ -62,9 +62,9 @@ 
  */
 function newbb_admin_chmod($target, $mode = 0777)
 {
-    $target = str_replace('..', '', $target);
+	$target = str_replace('..', '', $target);
 
-    return @chmod($target, $mode);
+	return @chmod($target, $mode);
 }
 
 /**
@@ -72,32 +72,32 @@ 
  */
 function newbb_getImageLibs()
 {
-    $imageLibs = [];
-    unset($output, $status);
-    if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-        $path = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
-        @exec($path . 'convert -version', $output, $status);
-        if (empty($status) && !empty($output) && preg_match("/imagemagick[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
-            $imageLibs['imagemagick'] = $matches[0];
-        }
-
-        unset($output, $status);
-    }
-    if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-        $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
-        @exec($path . 'jpegtopnm -version 2>&1', $output, $status);
-        if (empty($status) && !empty($output) && preg_match("/netpbm[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
-            $imageLibs['netpbm'] = $matches[0];
-        }
-        unset($output, $status);
-    }
-
-    if (function_exists('gd_info')) {
-        $tmpInfo         = gd_info();
-        $imageLibs['gd'] = $tmpInfo['GD Version'];
-    }
-
-    return $imageLibs;
+	$imageLibs = [];
+	unset($output, $status);
+	if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
+		$path = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
+		@exec($path . 'convert -version', $output, $status);
+		if (empty($status) && !empty($output) && preg_match("/imagemagick[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
+			$imageLibs['imagemagick'] = $matches[0];
+		}
+
+		unset($output, $status);
+	}
+	if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
+		$path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
+		@exec($path . 'jpegtopnm -version 2>&1', $output, $status);
+		if (empty($status) && !empty($output) && preg_match("/netpbm[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
+			$imageLibs['netpbm'] = $matches[0];
+		}
+		unset($output, $status);
+	}
+
+	if (function_exists('gd_info')) {
+		$tmpInfo         = gd_info();
+		$imageLibs['gd'] = $tmpInfo['GD Version'];
+	}
+
+	return $imageLibs;
 }
 
 xoops_cp_header();
@@ -113,7 +113,7 @@ 
 //XOOPS_POLL
 $xoopspoll = $moduleHandler->getByDirname($GLOBALS['xoopsModuleConfig']['poll_module']);
 if (is_object($xoopspoll)) {
-    $isOK = $xoopspoll->getVar('isactive');
+	$isOK = $xoopspoll->getVar('isactive');
 }
 // END irmtfan add a poll_module config
 
@@ -121,19 +121,19 @@ 
 $postmaxsize_iniphp = return_bytes(@ini_get('post_max_size'));
 $uploadlimit        = _AM_NEWBB_MEMLIMITTOLARGE;
 if ($postmaxsize_iniphp < $memlimit_iniphp) {
-    $uploadlimit = sprintf(_AM_NEWBB_MEMLIMITOK, return_bytes($postmaxsize_iniphp, true));
+	$uploadlimit = sprintf(_AM_NEWBB_MEMLIMITOK, return_bytes($postmaxsize_iniphp, true));
 }
 
 $adminObject->addInfoBox(_AM_NEWBB_PREFERENCES);
 // START irmtfan better poll module display link and version - check if xoops poll module is available
 if ($isOK) {
-    $pollLink = _AM_NEWBB_AVAILABLE . ': ';
-    $pollLink .= '<a href="' . XOOPS_URL . '/modules/' . $xoopspoll->getVar('dirname') . '/admin/index.php"';
-    $pollLink .= ' alt="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
-    $pollLink .= ' title="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
-    $pollLink .= '>' . '(' . $xoopspoll->getVar('name') . ')</a>';
+	$pollLink = _AM_NEWBB_AVAILABLE . ': ';
+	$pollLink .= '<a href="' . XOOPS_URL . '/modules/' . $xoopspoll->getVar('dirname') . '/admin/index.php"';
+	$pollLink .= ' alt="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
+	$pollLink .= ' title="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
+	$pollLink .= '>' . '(' . $xoopspoll->getVar('name') . ')</a>';
 } else {
-    $pollLink = _AM_NEWBB_NOTAVAILABLE;
+	$pollLink = _AM_NEWBB_NOTAVAILABLE;
 }
 $adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_POLLMODULE . ': %s', $pollLink));
 // END irmtfan better poll module display link and version - check if xoops poll module is available
@@ -153,8 +153,8 @@ 
 $adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PROCESSED . ': %s', $reportHandler->getCount(new \Criteria('report_result', 1))));
 
 foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-    Newbb\Utility::prepareFolder($uploadFolders[$i]);
-    $adminObject->addConfigBoxLine($uploadFolders[$i], 'folder');
+	Newbb\Utility::prepareFolder($uploadFolders[$i]);
+	$adminObject->addConfigBoxLine($uploadFolders[$i], 'folder');
 }
 
 $adminObject->displayNavigation(basename(__FILE__));
@@ -174,24 +174,24 @@ 
  */
 function return_bytes($sizeAsString, $b = false)
 {
-    if (false === $b) {
-        switch (substr($sizeAsString, -1)) {
-            case 'M':
-            case 'm':
-                return (int)$sizeAsString * 1048576;
-            case 'K':
-            case 'k':
-                return (int)$sizeAsString * 1024;
-            case 'G':
-            case 'g':
-                return (int)$sizeAsString * 1073741824;
-            default:
-                return $sizeAsString;
-        }
-    } else {
-        $base   = log($sizeAsString) / log(1024);
-        $suffix = ['', 'KB', 'MB', 'GB', 'TB'];
-
-        return round(1024 ** ($base - floor($base))) . ' ' . $suffix[(int)floor($base)];
-    }
+	if (false === $b) {
+		switch (substr($sizeAsString, -1)) {
+			case 'M':
+			case 'm':
+				return (int)$sizeAsString * 1048576;
+			case 'K':
+			case 'k':
+				return (int)$sizeAsString * 1024;
+			case 'G':
+			case 'g':
+				return (int)$sizeAsString * 1073741824;
+			default:
+				return $sizeAsString;
+		}
+	} else {
+		$base   = log($sizeAsString) / log(1024);
+		$suffix = ['', 'KB', 'MB', 'GB', 'TB'];
+
+		return round(1024 ** ($base - floor($base))) . ' ' . $suffix[(int)floor($base)];
+	}
 }

Spacing +26 added lines, -26 removed lines

@@ -31,12 +31,12 @@ 
 
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 //require_once  dirname(__DIR__) . '/class/Utility.php';
-require_once  dirname(__DIR__) . '/include/functions.stats.php';
+require_once  dirname(__DIR__).'/include/functions.stats.php';
 
-$attach_path = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/');
-$thumb_path  = $attach_path . 'thumbs/';
+$attach_path = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/');
+$thumb_path  = $attach_path.'thumbs/';
 $folder      = [$attach_path, $thumb_path];
 
 /** @var Xmf\Module\Admin $adminObject */
@@ -75,8 +75,8 @@ 
     $imageLibs = [];
     unset($output, $status);
     if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-        $path = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
-        @exec($path . 'convert -version', $output, $status);
+        $path = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'].'/';
+        @exec($path.'convert -version', $output, $status);
         if (empty($status) && !empty($output) && preg_match("/imagemagick[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
             $imageLibs['imagemagick'] = $matches[0];
         }
@@ -84,8 +84,8 @@ 
         unset($output, $status);
     }
     if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] || 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
-        $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
-        @exec($path . 'jpegtopnm -version 2>&1', $output, $status);
+        $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'].'/';
+        @exec($path.'jpegtopnm -version 2>&1', $output, $status);
         if (empty($status) && !empty($output) && preg_match("/netpbm[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
             $imageLibs['netpbm'] = $matches[0];
         }
@@ -127,30 +127,30 @@ 
 $adminObject->addInfoBox(_AM_NEWBB_PREFERENCES);
 // START irmtfan better poll module display link and version - check if xoops poll module is available
 if ($isOK) {
-    $pollLink = _AM_NEWBB_AVAILABLE . ': ';
-    $pollLink .= '<a href="' . XOOPS_URL . '/modules/' . $xoopspoll->getVar('dirname') . '/admin/index.php"';
-    $pollLink .= ' alt="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
-    $pollLink .= ' title="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
-    $pollLink .= '>' . '(' . $xoopspoll->getVar('name') . ')</a>';
+    $pollLink = _AM_NEWBB_AVAILABLE.': ';
+    $pollLink .= '<a href="'.XOOPS_URL.'/modules/'.$xoopspoll->getVar('dirname').'/admin/index.php"';
+    $pollLink .= ' alt="'.$xoopspoll->getVar('name').' '._VERSION.' ('.$xoopspoll->getInfo('version').') "';
+    $pollLink .= ' title="'.$xoopspoll->getVar('name').' '._VERSION.' ('.$xoopspoll->getInfo('version').') "';
+    $pollLink .= '>'.'('.$xoopspoll->getVar('name').')</a>';
 } else {
     $pollLink = _AM_NEWBB_NOTAVAILABLE;
 }
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_POLLMODULE . ': %s', $pollLink));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_POLLMODULE.': %s', $pollLink));
 // END irmtfan better poll module display link and version - check if xoops poll module is available
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_IMAGEMAGICK . ' %s', array_key_exists('imagemagick', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['imagemagick'] : _AM_NEWBB_NOTAVAILABLE));
-$adminObject->addInfoBoxLine(sprintf('NetPBM' . ': %s', array_key_exists('netpbm', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['netpbm'] : _AM_NEWBB_NOTAVAILABLE));
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_GDLIB . ' %s', array_key_exists('gd', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['gd'] : _AM_NEWBB_NOTAVAILABLE));
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_UPLOAD . ' %s', $uploadlimit));
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_INDEX_PDF_PAGE . '', ''));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_IMAGEMAGICK.' %s', array_key_exists('imagemagick', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['imagemagick'] : _AM_NEWBB_NOTAVAILABLE));
+$adminObject->addInfoBoxLine(sprintf('NetPBM'.': %s', array_key_exists('netpbm', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['netpbm'] : _AM_NEWBB_NOTAVAILABLE));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_GDLIB.' %s', array_key_exists('gd', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['gd'] : _AM_NEWBB_NOTAVAILABLE));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_UPLOAD.' %s', $uploadlimit));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_INDEX_PDF_PAGE.'', ''));
 
 $adminObject->addInfoBox(_AM_NEWBB_BOARDSUMMARY);
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALTOPICS . ': %s', getTotalTopics()));
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALPOSTS . ': %s', getTotalPosts()));
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALVIEWS . ': %s', getTotalViews()));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALTOPICS.': %s', getTotalTopics()));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALPOSTS.': %s', getTotalPosts()));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALVIEWS.': %s', getTotalViews()));
 
 $adminObject->addInfoBox(_AM_NEWBB_REPORT);
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PENDING . ': %s', $reportHandler->getCount(new \Criteria('report_result', 0))));
-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PROCESSED . ': %s', $reportHandler->getCount(new \Criteria('report_result', 1))));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PENDING.': %s', $reportHandler->getCount(new \Criteria('report_result', 0))));
+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PROCESSED.': %s', $reportHandler->getCount(new \Criteria('report_result', 1))));
 
 foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
     Newbb\Utility::prepareFolder($uploadFolders[$i]);
@@ -160,7 +160,7 @@ 
 $adminObject->displayNavigation(basename(__FILE__));
 $adminObject->displayIndex();
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';
 
 $cacheHelper = Newbb\Utility::cleanCache();
 //$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
@@ -192,6 +192,6 @@ 
         $base   = log($sizeAsString) / log(1024);
         $suffix = ['', 'KB', 'MB', 'GB', 'TB'];
 
-        return round(1024 ** ($base - floor($base))) . ' ' . $suffix[(int)floor($base)];
+        return round(1024 ** ($base - floor($base))).' '.$suffix[(int)floor($base)];
     }
 }

admin/admin_header.php

Indentation +2 added lines, -2 removed lines

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

Spacing +6 added lines, -6 removed lines

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

admin/admin_forum_manager.php

Indentation +241 added lines, -241 removed lines

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

Spacing +59 added lines, -59 removed lines

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

admin/admin_synchronization.php

Indentation +75 added lines, -75 removed lines

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

Spacing +31 added lines, -31 removed lines

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

admin/admin_forum_prune.php

Indentation +173 added lines, -173 removed lines

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

Spacing +22 added lines, -22 removed lines

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

admin/admin_cat_manager.php

Indentation +146 added lines, -146 removed lines

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

Switch Indentation +93 added lines, -93 removed lines

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

Spacing +21 added lines, -21 removed lines

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