mambax7 / newbb5

class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -34,19 +34,19 @@ 
         //        $sql   .= " WHERE metakey='version' LIMIT 1";
         //        $query = $GLOBALS['xoopsDB']->query($sql);
         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO')."</legend>\n";
         $html .= "<div style='padding: 8px;'>\n";
         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
         //        $html .= "<br>\n";
         //        $html .= "<br>\n";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+        $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI')."</div>\n";
         $html .= "<ul>\n";
         //
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+        $gdlib = function_exists('gd_info') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;
         if (function_exists('gd_info')) {
             if (true === ($gdlib = gd_info())) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+                $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
             }
         }
         //
@@ -56,18 +56,18 @@ 
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
         //
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+        $downloads = ini_get('file_uploads') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;
         //
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: blue;">'.ini_get('upload_max_filesize')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: blue;">'.ini_get('post_max_size')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: blue;">'.ini_get('memory_limit')."</span></b>\n";
         $html .= "</ul>\n";
         $html .= "<ul>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n";
         $html .= "</ul>\n";
         $html .= "<br>\n";
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+        $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n";
         $html .= '</div>';
         $html .= '</fieldset><br>';
 

Indentation +55 added lines, -55 removed lines

@@ -17,60 +17,60 @@
  */
 trait ServerStats
 {
-    /**
-     * serverStats()
-     *
-     * @return string
-     */
-    public static function getServerStats()
-    {
-        //mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
-        $moduleDirName      = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper = strtoupper($moduleDirName);
-        xoops_loadLanguage('common', $moduleDirName);
-        $html = '';
-        //        $sql   = 'SELECT metavalue';
-        //        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
-        //        $sql   .= " WHERE metakey='version' LIMIT 1";
-        //        $query = $GLOBALS['xoopsDB']->query($sql);
-        //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
-        $html .= "<div style='padding: 8px;'>\n";
-        //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
-        //        $html .= "<br>\n";
-        //        $html .= "<br>\n";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
-        $html .= "<ul>\n";
-        //
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
-        if (function_exists('gd_info')) {
-            if (true === ($gdlib = gd_info())) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
-            }
-        }
-        //
-        //    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
-        //
-        //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
-        //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
-        //
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
-        //
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
-        $html .= "</ul>\n";
-        $html .= "<ul>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
-        $html .= "</ul>\n";
-        $html .= "<br>\n";
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
-        $html .= '</div>';
-        $html .= '</fieldset><br>';
+	/**
+	 * serverStats()
+	 *
+	 * @return string
+	 */
+	public static function getServerStats()
+	{
+		//mb    $wfdownloads = WfdownloadsWfdownloads::getInstance();
+		$moduleDirName      = basename(dirname(dirname(__DIR__)));
+		$moduleDirNameUpper = strtoupper($moduleDirName);
+		xoops_loadLanguage('common', $moduleDirName);
+		$html = '';
+		//        $sql   = 'SELECT metavalue';
+		//        $sql   .= ' FROM ' . $GLOBALS['xoopsDB']->prefix('wfdownloads_meta');
+		//        $sql   .= " WHERE metakey='version' LIMIT 1";
+		//        $query = $GLOBALS['xoopsDB']->query($sql);
+		//        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
+		$html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+		$html .= "<div style='padding: 8px;'>\n";
+		//        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
+		//        $html .= "<br>\n";
+		//        $html .= "<br>\n";
+		$html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+		$html .= "<ul>\n";
+		//
+		$gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
+		$html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+		if (function_exists('gd_info')) {
+			if (true === ($gdlib = gd_info())) {
+				$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+			}
+		}
+		//
+		//    $safemode = ini_get('safe_mode') ? constant('CO_' . $moduleDirNameUpper . '_ON') . constant('CO_' . $moduleDirNameUpper . '_SAFEMODEPROBLEMS : constant('CO_' . $moduleDirNameUpper . '_OFF');
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SAFEMODESTATUS . $safemode;
+		//
+		//    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
+		//    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
+		//
+		$downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
+		$html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+		//
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
+		$html .= "</ul>\n";
+		$html .= "<ul>\n";
+		$html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+		$html .= "</ul>\n";
+		$html .= "<br>\n";
+		$html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+		$html .= '</div>';
+		$html .= '</fieldset><br>';
 
-        return $html;
-    }
+		return $html;
+	}
 }

update_type.php

Spacing +13 added lines, -13 removed lines

@@ -8,7 +8,7 @@ 
  * @since          4.00
  * @package        module::newbb
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 if (!is_object($GLOBALS['xoopsUser']) || !$GLOBALS['xoopsUser']->isAdmin()) {
     exit(_NOPERM);
@@ -22,11 +22,11 @@ 
     exit('No need for update');
 }
 
-$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+$GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+$GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
 
 if (!$GLOBALS['xoopsDB']->queryF('
-        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . " (
+        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp')." (
           `type_id`             SMALLINT(4)         UNSIGNED NOT NULL AUTO_INCREMENT,
           `type_name`             VARCHAR(64)         NOT NULL DEFAULT '',
           `type_color`             VARCHAR(10)         NOT NULL DEFAULT '',
@@ -39,7 +39,7 @@ 
 }
 
 if (!$GLOBALS['xoopsDB']->queryF('
-        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . " (
+        CREATE TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp')." (
           `tf_id`                 MEDIUMINT(4)         UNSIGNED NOT NULL AUTO_INCREMENT,
           `type_id`             SMALLINT(4)         UNSIGNED NOT NULL DEFAULT '0',
           `forum_id`             SMALLINT(4)         UNSIGNED NOT NULL DEFAULT '0',
@@ -50,7 +50,7 @@ 
           KEY `type_order`        (`type_order`)
         ) ENGINE=MyISAM;
     ")) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
     exit('Can not create tmp table for `bb_type_forum_tmp`');
 }
 
@@ -61,10 +61,10 @@ 
 foreach ($subjectpres as $subjectpre) {
     if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) {
         if (!$GLOBALS['xoopsDB']->queryF('
-                INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . '
+                INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp').'
                     (`type_name`, `type_color`)
                 VALUES
-                    (' . $GLOBALS['xoopsDB']->quoteString($matches[2]) . ', ' . $GLOBALS['xoopsDB']->quoteString($matches[1]) . ')
+                    (' . $GLOBALS['xoopsDB']->quoteString($matches[2]).', '.$GLOBALS['xoopsDB']->quoteString($matches[1]).')
             ')) {
             xoops_error("Can not add type of `{$matches[2]}`");
             continue;
@@ -73,8 +73,8 @@ 
     }
 }
 if (0 === count($types)) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
     exit('No type item created');
 }
 
@@ -87,14 +87,14 @@ 
             $type_query[] = "({$key}, {$forum_id}, {$order})";
         }
 
-        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
+        $sql = 'INSERT INTO '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp').' (type_id, forum_id, type_order) '.' VALUES '.implode(', ', $type_query);
         if (false === ($result = $GLOBALS['xoopsDB']->queryF($sql))) {
             xoops_error($GLOBALS['xoopsDB']->error());
         }
     }
 } else {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+    $GLOBALS['xoopsDB']->queryF('DROP TABLE '.$GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
     exit('No type item to update');
 }
 

Indentation +29 added lines, -29 removed lines

@@ -11,15 +11,15 @@ 
 require_once __DIR__ . '/header.php';
 
 if (!is_object($GLOBALS['xoopsUser']) || !$GLOBALS['xoopsUser']->isAdmin()) {
-    exit(_NOPERM);
+	exit(_NOPERM);
 }
 
 if ($xoopsModule->getVar('version') >= 401) {
-    exit('Version not valid');
+	exit('Version not valid');
 }
 
 if (empty($GLOBALS['xoopsModuleConfig']['subject_prefix'])) {
-    exit('No need for update');
+	exit('No need for update');
 }
 
 $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
@@ -35,7 +35,7 @@ 
           PRIMARY KEY              (`type_id`)
         ) ENGINE=MyISAM;
     ")) {
-    exit('Can not create tmp table for `bb_type_tmp`');
+	exit('Can not create tmp table for `bb_type_tmp`');
 }
 
 if (!$GLOBALS['xoopsDB']->queryF('
@@ -50,8 +50,8 @@ 
           KEY `type_order`        (`type_order`)
         ) ENGINE=MyISAM;
     ")) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    exit('Can not create tmp table for `bb_type_forum_tmp`');
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+	exit('Can not create tmp table for `bb_type_forum_tmp`');
 }
 
 //$typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
@@ -59,43 +59,43 @@ 
 $types       = [];
 $order       = 1;
 foreach ($subjectpres as $subjectpre) {
-    if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) {
-        if (!$GLOBALS['xoopsDB']->queryF('
+	if (preg_match("/<[^#]*color=[\"'](#[^'\"\s]*)[^>]>[\[]?([^<\]]*)[\]]?/is", $subjectpre, $matches)) {
+		if (!$GLOBALS['xoopsDB']->queryF('
                 INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp') . '
                     (`type_name`, `type_color`)
                 VALUES
                     (' . $GLOBALS['xoopsDB']->quoteString($matches[2]) . ', ' . $GLOBALS['xoopsDB']->quoteString($matches[1]) . ')
             ')) {
-            xoops_error("Can not add type of `{$matches[2]}`");
-            continue;
-        }
-        $types[$GLOBALS['xoopsDB']->getInsertId()] = $order++;
-    }
+			xoops_error("Can not add type of `{$matches[2]}`");
+			continue;
+		}
+		$types[$GLOBALS['xoopsDB']->getInsertId()] = $order++;
+	}
 }
 if (0 === count($types)) {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
-    exit('No type item created');
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+	exit('No type item created');
 }
 
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 if ($forums_type = $forumHandler->getIds(new \Criteria('allow_subject_prefix', 1))) {
-    foreach ($forums_type as $forum_id) {
-        $type_query = [];
-        foreach ($types as $key => $order) {
-            $type_query[] = "({$key}, {$forum_id}, {$order})";
-        }
+	foreach ($forums_type as $forum_id) {
+		$type_query = [];
+		foreach ($types as $key => $order) {
+			$type_query[] = "({$key}, {$forum_id}, {$order})";
+		}
 
-        $sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
-        if (false === ($result = $GLOBALS['xoopsDB']->queryF($sql))) {
-            xoops_error($GLOBALS['xoopsDB']->error());
-        }
-    }
+		$sql = 'INSERT INTO ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp') . ' (type_id, forum_id, type_order) ' . ' VALUES ' . implode(', ', $type_query);
+		if (false === ($result = $GLOBALS['xoopsDB']->queryF($sql))) {
+			xoops_error($GLOBALS['xoopsDB']->error());
+		}
+	}
 } else {
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
-    $GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
-    exit('No type item to update');
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_tmp'));
+	$GLOBALS['xoopsDB']->queryF('DROP TABLE ' . $GLOBALS['xoopsDB']->prefix('newbb_type_forum_tmp'));
+	exit('No type item to update');
 }
 
 die('update succeeded');

print.php

Spacing +12 added lines, -12 removed lines

@@ -40,7 +40,7 @@ 
  *
  */
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 error_reporting(0);
 $xoopsLogger->activated = false;
@@ -65,9 +65,9 @@ 
         $topic_id         = $post->getVar('topic_id');
         $post_data        = $postHandler->getPostForPrint($post);
         $isPost           = 1;
-        $post_data['url'] = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+        $post_data['url'] = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$post_id;
         if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $post_data['url'] = seo_urls('<a href="' . $post_data['url'] . '"></a>');
+            $post_data['url'] = seo_urls('<a href="'.$post_data['url'].'"></a>');
             $post_data['url'] = str_replace('<a href="', '', $post_data['url']);
             $post_data['url'] = str_replace('"></a>', '', $post_data['url']);
         }
@@ -113,7 +113,7 @@ 
     echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
-            <img src='" . XOOPS_URL . "/modules/newbb/assets/images/xoopsbb_slogo.png' border='0' alt='' />
+            <img src='" . XOOPS_URL."/modules/newbb/assets/images/xoopsbb_slogo.png' border='0' alt='' />
             <br><br> ";
 
     $postsArray = $topicHandler->getAllPosts($topicObject);
@@ -122,25 +122,25 @@ 
             continue;
         }
         $post_data = $postHandler->getPostForPrint($post);
-        echo "<h2 style='margin: 0;'>" . $post_data['subject'] . "</h2>
-              <div align='center'>" . _POSTEDBY . '&nbsp;' . $post_data['author'] . '&nbsp;' . _ON . '&nbsp;' . formatTimestamp($post_data['date']) . "</div>
+        echo "<h2 style='margin: 0;'>".$post_data['subject']."</h2>
+              <div align='center'>" . _POSTEDBY.'&nbsp;'.$post_data['author'].'&nbsp;'._ON.'&nbsp;'.formatTimestamp($post_data['date'])."</div>
               <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
-               <div>" . $post_data['text'] . "</div>
+               <div>" . $post_data['text']."</div>
               <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div><br>";
     }
-    echo '<p>' . _MD_NEWBB_COMEFROM . '&nbsp;' . XOOPS_URL . '/newbb/viewtopic.php?forum=' . $forum_id . '&amp;topic_id=' . $topic_id . '</p>';
+    echo '<p>'._MD_NEWBB_COMEFROM.'&nbsp;'.XOOPS_URL.'/newbb/viewtopic.php?forum='.$forum_id.'&amp;topic_id='.$topic_id.'</p>';
     echo '</div></div>';
     echo '</body></html>';
 } else {
     echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
-            <h2 style='margin: 0;'>" . $post_data['subject'] . "</h2></div>
-            <div align='center'>" . _POSTEDBY . '&nbsp;' . $post_data['author'] . '&nbsp;' . _ON . '&nbsp;' . formatTimestamp($post_data['date']) . "</div>
+            <h2 style='margin: 0;'>" . $post_data['subject']."</h2></div>
+            <div align='center'>" . _POSTEDBY.'&nbsp;'.$post_data['author'].'&nbsp;'._ON.'&nbsp;'.formatTimestamp($post_data['date'])."</div>
             <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
-            <div>" . $post_data['text'] . "</div>
+            <div>" . $post_data['text']."</div>
             <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div>
-            <p>" . _MD_NEWBB_COMEFROM . '&nbsp;' . $post_data['url'] . '</p>
+            <p>" . _MD_NEWBB_COMEFROM.'&nbsp;'.$post_data['url'].'</p>
             </div>
             <br><br></body></html>';
 }

Indentation +65 added lines, -65 removed lines

@@ -46,93 +46,93 @@
 $xoopsLogger->activated = false;
 
 if (!Request::getString('post_data', '', 'POST')) {
-    $forum    = Request::getInt('forum', 0, 'GET');
-    $topic_id = Request::getInt('topic_id', 0, 'GET');
-    $post_id  = Request::getInt('post_id', 0, 'GET');
+	$forum    = Request::getInt('forum', 0, 'GET');
+	$topic_id = Request::getInt('topic_id', 0, 'GET');
+	$post_id  = Request::getInt('post_id', 0, 'GET');
 
-    if (0 === $post_id && 0 === $topic_id) {
-        exit(_MD_NEWBB_ERRORTOPIC);
-    }
+	if (0 === $post_id && 0 === $topic_id) {
+		exit(_MD_NEWBB_ERRORTOPIC);
+	}
 
-    if (0 !== $post_id) {
-        //        /** @var Newbb\PostHandler $postHandler */
-        //        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
-        /** @var Newbb\Post $post */
-        $post = $postHandler->get($post_id);
-        if (!$approved = $post->getVar('approved')) {
-            exit(_MD_NEWBB_NORIGHTTOVIEW);
-        }
-        $topic_id         = $post->getVar('topic_id');
-        $post_data        = $postHandler->getPostForPrint($post);
-        $isPost           = 1;
-        $post_data['url'] = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
-        if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
-            $post_data['url'] = seo_urls('<a href="' . $post_data['url'] . '"></a>');
-            $post_data['url'] = str_replace('<a href="', '', $post_data['url']);
-            $post_data['url'] = str_replace('"></a>', '', $post_data['url']);
-        }
-    }
+	if (0 !== $post_id) {
+		//        /** @var Newbb\PostHandler $postHandler */
+		//        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
+		/** @var Newbb\Post $post */
+		$post = $postHandler->get($post_id);
+		if (!$approved = $post->getVar('approved')) {
+			exit(_MD_NEWBB_NORIGHTTOVIEW);
+		}
+		$topic_id         = $post->getVar('topic_id');
+		$post_data        = $postHandler->getPostForPrint($post);
+		$isPost           = 1;
+		$post_data['url'] = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post_id;
+		if (!empty($GLOBALS['xoopsModuleConfig']['do_rewrite'])) {
+			$post_data['url'] = seo_urls('<a href="' . $post_data['url'] . '"></a>');
+			$post_data['url'] = str_replace('<a href="', '', $post_data['url']);
+			$post_data['url'] = str_replace('"></a>', '', $post_data['url']);
+		}
+	}
 
-    //    /** @var Newbb\TopicHandler $topicHandler */
-    //    $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
-    $topicObject = $topicHandler->get($topic_id);
-    $topic_id    = $topicObject->getVar('topic_id');
-    $forum       = $topicObject->getVar('forum_id');
-    if (!$approved = $topicObject->getVar('approved')) {
-        exit(_MD_NEWBB_NORIGHTTOVIEW);
-    }
+	//    /** @var Newbb\TopicHandler $topicHandler */
+	//    $topicHandler = Newbb\Helper::getInstance()->getHandler('Topic');
+	$topicObject = $topicHandler->get($topic_id);
+	$topic_id    = $topicObject->getVar('topic_id');
+	$forum       = $topicObject->getVar('forum_id');
+	if (!$approved = $topicObject->getVar('approved')) {
+		exit(_MD_NEWBB_NORIGHTTOVIEW);
+	}
 
-    $isAdmin = newbbIsAdmin($forumObject);
-    if (!$isAdmin && $topicObject->getVar('approved') < 0) {
-        exit(_MD_NEWBB_NORIGHTTOVIEW);
-    }
+	$isAdmin = newbbIsAdmin($forumObject);
+	if (!$isAdmin && $topicObject->getVar('approved') < 0) {
+		exit(_MD_NEWBB_NORIGHTTOVIEW);
+	}
 
-    //    /** @var Newbb\ForumHandler $forumHandler */
-    //    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-    $forum       = $topicObject->getVar('forum_id');
-    $forumObject = $forumHandler->get($forum);
-    if (!$forumHandler->getPermission($forumObject)) {
-        exit(_MD_NEWBB_NORIGHTTOVIEW);
-    }
+	//    /** @var Newbb\ForumHandler $forumHandler */
+	//    $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+	$forum       = $topicObject->getVar('forum_id');
+	$forumObject = $forumHandler->get($forum);
+	if (!$forumHandler->getPermission($forumObject)) {
+		exit(_MD_NEWBB_NORIGHTTOVIEW);
+	}
 
-    if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
-        exit(_MD_NEWBB_NORIGHTTOVIEW);
-    }
-    // irmtfan add print permission
-    if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'print')) {
-        exit(_MD_NEWBB_NORIGHTTOPRINT);
-    }
+	if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'view')) {
+		exit(_MD_NEWBB_NORIGHTTOVIEW);
+	}
+	// irmtfan add print permission
+	if (!$topicHandler->getPermission($forumObject, $topicObject->getVar('topic_status'), 'print')) {
+		exit(_MD_NEWBB_NORIGHTTOPRINT);
+	}
 } else {
-    $post_data = unserialize(base64_decode(Request::getString('post_data', '', 'POST')));
-    $isPost    = 1;
+	$post_data = unserialize(base64_decode(Request::getString('post_data', '', 'POST')));
+	$isPost    = 1;
 }
 
 xoops_header(false);
 
 if (empty($isPost)) {
-    echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
+	echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
             <img src='" . XOOPS_URL . "/modules/newbb/assets/images/xoopsbb_slogo.png' border='0' alt='' />
             <br><br> ";
 
-    $postsArray = $topicHandler->getAllPosts($topicObject);
-    foreach ($postsArray as $post) {
-        if (!$post->getVar('approved')) {
-            continue;
-        }
-        $post_data = $postHandler->getPostForPrint($post);
-        echo "<h2 style='margin: 0;'>" . $post_data['subject'] . "</h2>
+	$postsArray = $topicHandler->getAllPosts($topicObject);
+	foreach ($postsArray as $post) {
+		if (!$post->getVar('approved')) {
+			continue;
+		}
+		$post_data = $postHandler->getPostForPrint($post);
+		echo "<h2 style='margin: 0;'>" . $post_data['subject'] . "</h2>
               <div align='center'>" . _POSTEDBY . '&nbsp;' . $post_data['author'] . '&nbsp;' . _ON . '&nbsp;' . formatTimestamp($post_data['date']) . "</div>
               <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
                <div>" . $post_data['text'] . "</div>
               <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div><br>";
-    }
-    echo '<p>' . _MD_NEWBB_COMEFROM . '&nbsp;' . XOOPS_URL . '/newbb/viewtopic.php?forum=' . $forum_id . '&amp;topic_id=' . $topic_id . '</p>';
-    echo '</div></div>';
-    echo '</body></html>';
+	}
+	echo '<p>' . _MD_NEWBB_COMEFROM . '&nbsp;' . XOOPS_URL . '/newbb/viewtopic.php?forum=' . $forum_id . '&amp;topic_id=' . $topic_id . '</p>';
+	echo '</div></div>';
+	echo '</body></html>';
 } else {
-    echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
+	echo "</head><body style='background-color:#ffffff; color:#000000;' onload='window.print()'>
             <div style='width: 750px; border: 1px solid #000; padding: 20px;'>
             <div style='text-align: center; display: block; margin: 0 0 6px 0;'>
             <h2 style='margin: 0;'>" . $post_data['subject'] . "</h2></div>

digest.php

Spacing +3 added lines, -3 removed lines

@@ -16,7 +16,7 @@ 
     define('XOOPS_XMLRPC', 1);
 }
 ob_start();
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 if (0 == $GLOBALS['xoopsModuleConfig']['email_digest']) {
     echo '<br>Not set';
 
@@ -25,6 +25,6 @@ 
 /** @var Newbb\DigestHandler $digestHandler */
 $digestHandler = Newbb\Helper::getInstance()->getHandler('Digest');
 $msg           = $digestHandler->process();
-$msg           .= ob_get_contents();
+$msg .= ob_get_contents();
 ob_end_clean();
-echo '<br>' . $msg;
+echo '<br>'.$msg;

Indentation +3 added lines, -3 removed lines

@@ -13,14 +13,14 @@
 
 // Why the skip-DB-security check defined only for XMLRPC? We also need it!!! ~_*
 if (!defined('XOOPS_XMLRPC')) {
-    define('XOOPS_XMLRPC', 1);
+	define('XOOPS_XMLRPC', 1);
 }
 ob_start();
 require_once __DIR__ . '/header.php';
 if (0 == $GLOBALS['xoopsModuleConfig']['email_digest']) {
-    echo '<br>Not set';
+	echo '<br>Not set';
 
-    return false;
+	return false;
 }
 /** @var Newbb\DigestHandler $digestHandler */
 $digestHandler = Newbb\Helper::getInstance()->getHandler('Digest');

admin/admin_votedata.php

Spacing +22 added lines, -22 removed lines

@@ -31,7 +31,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $op = $op = Request::getCmd('op', Request::getCmd('op', '', 'POST'), 'GET'); //!empty($_GET['op'])? $_GET['op'] : (!empty($_POST['op'])?$_POST['op']:"");
 
@@ -39,10 +39,10 @@ 
     case 'delvotes':
         $rid      = Request::getInt('rid', 0, 'GET');
         $topic_id = Request::getInt('topic_id', 0, 'GET');
-        $sql      = $GLOBALS['xoopsDB']->queryF('DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . " WHERE ratingid = $rid");
+        $sql      = $GLOBALS['xoopsDB']->queryF('DELETE FROM '.$GLOBALS['xoopsDB']->prefix('newbb_votedata')." WHERE ratingid = $rid");
         $GLOBALS['xoopsDB']->query($sql);
 
-        $query       = 'SELECT rating FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' WHERE topic_id = ' . $topic_id . ' ';
+        $query       = 'SELECT rating FROM '.$GLOBALS['xoopsDB']->prefix('newbb_votedata').' WHERE topic_id = '.$topic_id.' ';
         $voteresult  = $GLOBALS['xoopsDB']->query($query);
         $votesDB     = $GLOBALS['xoopsDB']->getRowsNum($voteresult);
         $totalrating = 0;
@@ -63,11 +63,11 @@ 
         $useravgrating = '0';
         $uservotes     = '0';
 
-        $sql     = 'SELECT * FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' ORDER BY ratingtimestamp DESC';
+        $sql     = 'SELECT * FROM '.$GLOBALS['xoopsDB']->prefix('newbb_votedata').' ORDER BY ratingtimestamp DESC';
         $results = $GLOBALS['xoopsDB']->query($sql, 20, $start);
         $votes   = $GLOBALS['xoopsDB']->getRowsNum($results);
 
-        $sql           = 'SELECT rating FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_votedata') . ' ';
+        $sql           = 'SELECT rating FROM '.$GLOBALS['xoopsDB']->prefix('newbb_votedata').' ';
         $result2       = $GLOBALS['xoopsDB']->query($sql, 20, $start);
         $uservotes     = $GLOBALS['xoopsDB']->getRowsNum($result2);
         $useravgrating = 0;
@@ -86,28 +86,28 @@ 
         $adminObject->displayNavigation(basename(__FILE__));
 
         echo "<div style='padding: 8px;'>\n
-        <div><strong>" . _AM_NEWBB_VOTE_USERAVG . ": </strong>$useravgrating</div>\n
-        <div><strong>" . _AM_NEWBB_VOTE_TOTALRATE . ": </strong>$uservotes</div>\n
+        <div><strong>" . _AM_NEWBB_VOTE_USERAVG.": </strong>$useravgrating</div>\n
+        <div><strong>"._AM_NEWBB_VOTE_TOTALRATE.": </strong>$uservotes</div>\n
         <div style='padding: 8px;'>\n
-        <ul><li> " . _AM_NEWBB_VOTE_DELETEDSC . "</li></ul>
+        <ul><li> "._AM_NEWBB_VOTE_DELETEDSC."</li></ul>
         <div>\n
         <br>\n
         <table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>
         <table width='100%' cellspacing='1' cellpadding='2' class='outer'>\n
         <tr>\n
-        <th align='center'>" . _AM_NEWBB_VOTE_ID . "</th>\n
-        <th align='center'>" . _AM_NEWBB_VOTE_USER . "</th>\n
-        <th align='center'>" . _AM_NEWBB_VOTE_IP . "</th>\n
-        <th align='center'>" . _AM_NEWBB_VOTE_FILETITLE . "</th>\n
-        <th align='center'>" . _AM_NEWBB_VOTE_RATING . "</th>\n
-        <th align='center'>" . _AM_NEWBB_VOTE_DATE . "</th>\n
-        <th align='center'>" . _AM_NEWBB_ACTION . "</th></tr>\n";
+        <th align='center'>" . _AM_NEWBB_VOTE_ID."</th>\n
+        <th align='center'>" . _AM_NEWBB_VOTE_USER."</th>\n
+        <th align='center'>" . _AM_NEWBB_VOTE_IP."</th>\n
+        <th align='center'>" . _AM_NEWBB_VOTE_FILETITLE."</th>\n
+        <th align='center'>" . _AM_NEWBB_VOTE_RATING."</th>\n
+        <th align='center'>" . _AM_NEWBB_VOTE_DATE."</th>\n
+        <th align='center'>" . _AM_NEWBB_ACTION."</th></tr>\n";
 
         if (0 == $votes) {
-            echo "<tr><td align='center' colspan='7' class='head'>" . _AM_NEWBB_VOTE_NOVOTES . '</td></tr>';
+            echo "<tr><td align='center' colspan='7' class='head'>"._AM_NEWBB_VOTE_NOVOTES.'</td></tr>';
         }
         while (false !== (list($ratingid, $topic_id, $ratinguser, $rating, $ratinghostname, $ratingtimestamp) = $GLOBALS['xoopsDB']->fetchRow($results))) {
-            $sql        = 'SELECT topic_title FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' WHERE topic_id=' . $topic_id . ' ';
+            $sql        = 'SELECT topic_title FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' WHERE topic_id='.$topic_id.' ';
             $down_array = $GLOBALS['xoopsDB']->fetchArray($GLOBALS['xoopsDB']->query($sql));
 
             $formatted_date = formatTimestamp($ratingtimestamp, _DATESTRING);
@@ -117,10 +117,10 @@ 
         <td class='head' align='center'>$ratingid</td>\n
         <td class='even' align='center'>$ratinguname</td>\n
         <td class='even' align='center' >$ratinghostname</td>\n
-        <td class='even' align='left'><a href='" . XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . $topic_id . "' target='topic'>" . $myts->htmlSpecialChars($down_array['topic_title']) . "</a></td>\n
+        <td class='even' align='left'><a href='".XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.$topic_id."' target='topic'>".$myts->htmlSpecialChars($down_array['topic_title'])."</a></td>\n
         <td class='even' align='center'>$rating</td>\n
         <td class='even' align='center'>$formatted_date</td>\n
-        <td class='even' align='center'><strong><a href='admin_votedata.php?op=delvotes&amp;topic_id=$topic_id&amp;rid=$ratingid'>" . newbbDisplayImage('p_delete', _DELETE) . "</a></strong></td>\n
+        <td class='even' align='center'><strong><a href='admin_votedata.php?op=delvotes&amp;topic_id=$topic_id&amp;rid=$ratingid'>".newbbDisplayImage('p_delete', _DELETE)."</a></strong></td>\n
         </tr>\n";
         }
         echo '</table>';
@@ -129,11 +129,11 @@ 
         require_once $GLOBALS['xoops']->path('class/pagenav.php');
         $page    = ($votes > 10) ? _AM_NEWBB_INDEX_PAGE : '';
         $pagenav = new \XoopsPageNav($page, 20, $start, 'start');
-        echo '<div align="right" style="padding: 8px;">' . $page . '' . $pagenav->renderImageNav(4) . '</div>';
+        echo '<div align="right" style="padding: 8px;">'.$page.''.$pagenav->renderImageNav(4).'</div>';
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_VOTE . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_VOTE.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_VOTE_TAB;
         echo '</fieldset>';
         break;
 }
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Indentation +64 added lines, -64 removed lines

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

admin/about.php

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
 // Project: XOOPS Project                                                    //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
 \Xmf\Module\Admin::setPaypal('PBQZ7D6LT6UBC');
 $adminObject->displayAbout(false);
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/admin_digest.php

Spacing +15 added lines, -15 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', Request::getCmd('op', 'default', 'POST'), 'GET'); // !empty($_GET['op'])? $_GET['op'] : (!empty($_POST['op'])?$_POST['op']:"default");
@@ -87,16 +87,16 @@ 
 
         //if (!$newXoopsModuleGui) loadModuleAdminMenu(7,_AM_NEWBB_DIGESTADMIN);
         //    else $adminObject->displayNavigation(basename(__FILE__));
-        echo '<ul><li>' . _AM_NEWBB_DIGEST_HELP_1 . '</li>';
-        echo '<li>' . _AM_NEWBB_DIGEST_HELP_2 . '</li>';
-        echo '<li>' . _AM_NEWBB_DIGEST_HELP_3 . '</li>';
-        echo '<li>' . _AM_NEWBB_DIGEST_HELP_4 . '</li></ul>';
-        echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
-        echo '<form action="' . xoops_getenv('PHP_SELF') . '" method="post">';
+        echo '<ul><li>'._AM_NEWBB_DIGEST_HELP_1.'</li>';
+        echo '<li>'._AM_NEWBB_DIGEST_HELP_2.'</li>';
+        echo '<li>'._AM_NEWBB_DIGEST_HELP_3.'</li>';
+        echo '<li>'._AM_NEWBB_DIGEST_HELP_4.'</li></ul>';
+        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='2%'>" . _DELETE . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_DIGESTCONTENT . '</th>';
+        echo "<th class='bg3' width='2%'>"._DELETE.'</th>';
+        echo "<th class='bg3'>"._AM_NEWBB_DIGESTCONTENT.'</th>';
         echo '</tr>';
 
         $digests = [];
@@ -105,22 +105,22 @@ 
         $digests = $digestHandler->getAllDigests($start, $limit);
         foreach ($digests as $digest) {
             echo "<tr class='odd' align='left'>";
-            echo "<td align='center' ><input type='checkbox' name='digest_id[" . $digest['digest_id'] . "]' value='1' /></td>";
-            echo '<td><strong>#' . $digest['digest_id'] . ' @ ' . formatTimestamp($digest['digest_time']) . '</strong><br>' . str_replace("\n", '<br>', $digest['digest_content']) . '</td>';
+            echo "<td align='center' ><input type='checkbox' name='digest_id[".$digest['digest_id']."]' value='1' /></td>";
+            echo '<td><strong>#'.$digest['digest_id'].' @ '.formatTimestamp($digest['digest_time']).'</strong><br>'.str_replace("\n", '<br>', $digest['digest_content']).'</td>';
             echo '</tr>';
             echo "<tr colspan='2'><td height='2'></td></tr>";
         }
         $submit = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-        echo "<tr><td colspan='2' align='center'>" . $submit->render() . '</td></tr>';
+        echo "<tr><td colspan='2' align='center'>".$submit->render().'</td></tr>';
         $hidden = new \XoopsFormHidden('op', 'delete');
         echo $hidden->render();
         $hidden = new \XoopsFormHidden('item', $item);
-        echo $hidden->render() . '</form>';
+        echo $hidden->render().'</form>';
 
         echo '</table>';
         echo '</td></tr></table>';
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _AM_NEWBB_PREFERENCES . '&nbsp;-&nbsp;' . _MI_NEWBB_ADMENU_DIGEST . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._AM_NEWBB_PREFERENCES.'&nbsp;-&nbsp;'._MI_NEWBB_ADMENU_DIGEST.'&nbsp;</legend>';
         echo _AM_NEWBB_DIGEST_HELP_AUTO_DIGEST;
         echo '</fieldset>';
         $nav = new \XoopsPageNav($digestHandler->getDigestCount(), $limit, $start, 'start');
@@ -128,4 +128,4 @@ 
 
         break;
 }
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Indentation +76 added lines, -76 removed lines

@@ -42,90 +42,90 @@
 
 xoops_cp_header();
 switch ($op) {
-    case 'delete':
-        $digest_ids = Request::getArray('digest_id', [], 'POST');
-        //        /** @var Newbb\DigestHandler $digestHandler */
-        //        $digestHandler = Newbb\Helper::getInstance()->getHandler('Digest');
-        foreach ($digest_ids as $did => $value) {
-            $digest = $digestHandler->get($did);
-            $digestHandler->delete($digest);
-        }
-        redirect_header('admin_digest.php', 1);
-        break;
+	case 'delete':
+		$digest_ids = Request::getArray('digest_id', [], 'POST');
+		//        /** @var Newbb\DigestHandler $digestHandler */
+		//        $digestHandler = Newbb\Helper::getInstance()->getHandler('Digest');
+		foreach ($digest_ids as $did => $value) {
+			$digest = $digestHandler->get($did);
+			$digestHandler->delete($digest);
+		}
+		redirect_header('admin_digest.php', 1);
+		break;
 
-    case 'digest':
-        xoops_confirm(['op' => 'digestconfirmed'], 'admin_digest.php', _AM_NEWBB_DIGEST_CONFIRM);
-        break;
-    case 'digestconfirmed':
-        $message = '';
-        if ('POST' === Request::getMethod()) {
-            //            $digestHandler = Newbb\Helper::getInstance()->getHandler('Digest');
+	case 'digest':
+		xoops_confirm(['op' => 'digestconfirmed'], 'admin_digest.php', _AM_NEWBB_DIGEST_CONFIRM);
+		break;
+	case 'digestconfirmed':
+		$message = '';
+		if ('POST' === Request::getMethod()) {
+			//            $digestHandler = Newbb\Helper::getInstance()->getHandler('Digest');
 
-            switch ($digestHandler->process(true)) {
-                case 0:
-                    $message = _AM_NEWBB_DIGEST_SENT;
-                    break;
-                case 4:
-                    $message = _AM_NEWBB_DIGEST_NOT_SENT;
-                    break;
-                default:
-                    $message = _AM_NEWBB_DIGEST_FAILED;
-                    break;
-            }
-        }
-        redirect_header('admin_digest.php', 1, $message);
-        break;
+			switch ($digestHandler->process(true)) {
+				case 0:
+					$message = _AM_NEWBB_DIGEST_SENT;
+					break;
+				case 4:
+					$message = _AM_NEWBB_DIGEST_NOT_SENT;
+					break;
+				default:
+					$message = _AM_NEWBB_DIGEST_FAILED;
+					break;
+			}
+		}
+		redirect_header('admin_digest.php', 1, $message);
+		break;
 
-    default:
-        require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+	default:
+		require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 
-        $limit = 5;
-        $adminObject->displayNavigation(basename(__FILE__));
+		$limit = 5;
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        $adminObject->addItemButton(_AM_NEWBB_DIGEST, 'admin_digest.php?op=digest', $icon = 'add');
-        $adminObject->displayButton('left');
+		$adminObject->addItemButton(_AM_NEWBB_DIGEST, 'admin_digest.php?op=digest', $icon = 'add');
+		$adminObject->displayButton('left');
 
-        //if (!$newXoopsModuleGui) loadModuleAdminMenu(7,_AM_NEWBB_DIGESTADMIN);
-        //    else $adminObject->displayNavigation(basename(__FILE__));
-        echo '<ul><li>' . _AM_NEWBB_DIGEST_HELP_1 . '</li>';
-        echo '<li>' . _AM_NEWBB_DIGEST_HELP_2 . '</li>';
-        echo '<li>' . _AM_NEWBB_DIGEST_HELP_3 . '</li>';
-        echo '<li>' . _AM_NEWBB_DIGEST_HELP_4 . '</li></ul>';
-        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='2%'>" . _DELETE . '</th>';
-        echo "<th class='bg3'>" . _AM_NEWBB_DIGESTCONTENT . '</th>';
-        echo '</tr>';
+		//if (!$newXoopsModuleGui) loadModuleAdminMenu(7,_AM_NEWBB_DIGESTADMIN);
+		//    else $adminObject->displayNavigation(basename(__FILE__));
+		echo '<ul><li>' . _AM_NEWBB_DIGEST_HELP_1 . '</li>';
+		echo '<li>' . _AM_NEWBB_DIGEST_HELP_2 . '</li>';
+		echo '<li>' . _AM_NEWBB_DIGEST_HELP_3 . '</li>';
+		echo '<li>' . _AM_NEWBB_DIGEST_HELP_4 . '</li></ul>';
+		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='2%'>" . _DELETE . '</th>';
+		echo "<th class='bg3'>" . _AM_NEWBB_DIGESTCONTENT . '</th>';
+		echo '</tr>';
 
-        $digests = [];
-        //        /** @var Newbb\DigestHandler $digestHandler */
-        //        $digestHandler = Newbb\Helper::getInstance()->getHandler('Digest');
-        $digests = $digestHandler->getAllDigests($start, $limit);
-        foreach ($digests as $digest) {
-            echo "<tr class='odd' align='left'>";
-            echo "<td align='center' ><input type='checkbox' name='digest_id[" . $digest['digest_id'] . "]' value='1' /></td>";
-            echo '<td><strong>#' . $digest['digest_id'] . ' @ ' . formatTimestamp($digest['digest_time']) . '</strong><br>' . str_replace("\n", '<br>', $digest['digest_content']) . '</td>';
-            echo '</tr>';
-            echo "<tr colspan='2'><td height='2'></td></tr>";
-        }
-        $submit = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-        echo "<tr><td colspan='2' align='center'>" . $submit->render() . '</td></tr>';
-        $hidden = new \XoopsFormHidden('op', 'delete');
-        echo $hidden->render();
-        $hidden = new \XoopsFormHidden('item', $item);
-        echo $hidden->render() . '</form>';
+		$digests = [];
+		//        /** @var Newbb\DigestHandler $digestHandler */
+		//        $digestHandler = Newbb\Helper::getInstance()->getHandler('Digest');
+		$digests = $digestHandler->getAllDigests($start, $limit);
+		foreach ($digests as $digest) {
+			echo "<tr class='odd' align='left'>";
+			echo "<td align='center' ><input type='checkbox' name='digest_id[" . $digest['digest_id'] . "]' value='1' /></td>";
+			echo '<td><strong>#' . $digest['digest_id'] . ' @ ' . formatTimestamp($digest['digest_time']) . '</strong><br>' . str_replace("\n", '<br>', $digest['digest_content']) . '</td>';
+			echo '</tr>';
+			echo "<tr colspan='2'><td height='2'></td></tr>";
+		}
+		$submit = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+		echo "<tr><td colspan='2' align='center'>" . $submit->render() . '</td></tr>';
+		$hidden = new \XoopsFormHidden('op', 'delete');
+		echo $hidden->render();
+		$hidden = new \XoopsFormHidden('item', $item);
+		echo $hidden->render() . '</form>';
 
-        echo '</table>';
-        echo '</td></tr></table>';
-        echo '<fieldset>';
-        echo '<legend>&nbsp;' . _AM_NEWBB_PREFERENCES . '&nbsp;-&nbsp;' . _MI_NEWBB_ADMENU_DIGEST . '&nbsp;</legend>';
-        echo _AM_NEWBB_DIGEST_HELP_AUTO_DIGEST;
-        echo '</fieldset>';
-        $nav = new \XoopsPageNav($digestHandler->getDigestCount(), $limit, $start, 'start');
-        echo $nav->renderNav(4);
+		echo '</table>';
+		echo '</td></tr></table>';
+		echo '<fieldset>';
+		echo '<legend>&nbsp;' . _AM_NEWBB_PREFERENCES . '&nbsp;-&nbsp;' . _MI_NEWBB_ADMENU_DIGEST . '&nbsp;</legend>';
+		echo _AM_NEWBB_DIGEST_HELP_AUTO_DIGEST;
+		echo '</fieldset>';
+		$nav = new \XoopsPageNav($digestHandler->getDigestCount(), $limit, $start, 'start');
+		echo $nav->renderNav(4);
 
-        break;
+		break;
 }
 require_once __DIR__ . '/admin_footer.php';

admin/admin_forum_reorder.php

Spacing +16 added lines, -16 removed lines

@@ -31,7 +31,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $cat_orders = Request::getArray('cat_orders', null, 'POST');
 $orders     = Request::getArray('orders', null, 'POST');
@@ -41,14 +41,14 @@ 
 if (Request::getString('submit', '', 'POST')) {
     $catOrdersCount = count($cat_orders);
     for ($i = 0; $i < $catOrdersCount; ++$i) {
-        $sql = 'update ' . $GLOBALS['xoopsDB']->prefix('newbb_categories') . ' set cat_order = ' . $cat_orders[$i] . " WHERE cat_id=$cat[$i]";
+        $sql = 'update '.$GLOBALS['xoopsDB']->prefix('newbb_categories').' set cat_order = '.$cat_orders[$i]." WHERE cat_id=$cat[$i]";
         if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
             redirect_header('admin_forum_reorder.php', 1, _AM_NEWBB_FORUM_ERROR);
         }
     }
     $ordersCount = count($orders);
     for ($i = 0; $i < $ordersCount; ++$i) {
-        $sql = 'update ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' set forum_order = ' . $orders[$i] . ' WHERE forum_id=' . $forum[$i];
+        $sql = 'update '.$GLOBALS['xoopsDB']->prefix('newbb_forums').' set forum_order = '.$orders[$i].' WHERE forum_id='.$forum[$i];
         if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
             redirect_header('admin_forum_reorder.php', 1, _AM_NEWBB_FORUM_ERROR);
         }
@@ -65,14 +65,14 @@ 
 
     $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'>";
     $tform = new \XoopsThemeForm(_AM_NEWBB_SETFORUMORDER, '', '');
     $tform->display();
     echo "<form name='reorder' method='post'>";
     echo "<table border='0' width='100%' cellpadding='2' cellspacing='1' class='outer'>";
     echo '<tr>';
-    echo "<td class='head' align='left' width='60%'><strong>" . _AM_NEWBB_REORDERTITLE . '</strong></td>';
-    echo "<td class='head' align='center'><strong>" . _AM_NEWBB_REORDERWEIGHT . '</strong></td>';
+    echo "<td class='head' align='left' width='60%'><strong>"._AM_NEWBB_REORDERTITLE.'</strong></td>';
+    echo "<td class='head' align='center'><strong>"._AM_NEWBB_REORDERWEIGHT.'</strong></td>';
     echo '</tr>';
 
     //    /** @var Newbb\ForumHandler $forumHandler */
@@ -85,10 +85,10 @@ 
     $forums     = $forumHandler->getTree(array_keys($categories), 0, 'all', '&nbsp;&nbsp;&nbsp;&nbsp;');
     foreach (array_keys($categories) as $c) {
         echo '<tr>';
-        echo "<td align='left' nowrap='nowrap' class='head' >" . $categories[$c]->getVar('cat_title') . '</td>';
+        echo "<td align='left' nowrap='nowrap' class='head' >".$categories[$c]->getVar('cat_title').'</td>';
         echo "<td align='right' class='head'>";
-        echo "<input type='text' name='cat_orders[]' value='" . $categories[$c]->getVar('cat_order') . "' size='5' maxlength='5' />";
-        echo "<input type='hidden' name='cat[]' value='" . $c . "' />";
+        echo "<input type='text' name='cat_orders[]' value='".$categories[$c]->getVar('cat_order')."' size='5' maxlength='5' />";
+        echo "<input type='hidden' name='cat[]' value='".$c."' />";
         echo '</td>';
         echo '</tr>';
 
@@ -99,24 +99,24 @@ 
         foreach ($forums[$c] as $key => $forum) {
             echo '<tr>';
             $class = ((++$i) % 2) ? 'odd' : 'even';
-            echo "<td align='left' nowrap='nowrap' class='" . $class . "'>" . $forum['prefix'] . $forum['forum_name'] . '</td>';
-            echo "<td align='left' class='" . $class . "'>";
-            echo $forum['prefix'] . "<input type='text' name='orders[]' value='" . $forum['forum_order'] . "' size='5' maxlength='5' />";
-            echo "<input type='hidden' name='forum[]' value='" . $key . "' />";
+            echo "<td align='left' nowrap='nowrap' class='".$class."'>".$forum['prefix'].$forum['forum_name'].'</td>';
+            echo "<td align='left' class='".$class."'>";
+            echo $forum['prefix']."<input type='text' name='orders[]' value='".$forum['forum_order']."' size='5' maxlength='5' />";
+            echo "<input type='hidden' name='forum[]' value='".$key."' />";
             echo '</td>';
             echo '</tr>';
         }
     }
     echo "<tr><td class='even' align='center' colspan='6'>";
 
-    echo "<input type='submit' name='submit' value='" . _SUBMIT . "' />";
+    echo "<input type='submit' name='submit' value='"._SUBMIT."' />";
     echo '</td></tr>';
     echo '</table>';
     echo '</form>';
     echo '</td></tr></table>';
     echo '<fieldset>';
-    echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_ORDER . '&nbsp;</legend>';
+    echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_ORDER.'&nbsp;</legend>';
     echo _AM_NEWBB_HELP_ORDER_TAB;
     echo '</fieldset>';
 }
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Indentation +72 added lines, -72 removed lines

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

admin/admin_groupmod.php

Spacing +13 added lines, -13 removed lines

@@ -31,7 +31,7 @@ 
 
 use Xmf\Request;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 $adminObject->displayNavigation(basename(__FILE__));
@@ -40,8 +40,8 @@ 
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 if (Request::getString('submit', '', 'POST')) {
-    $fgroups = Request::getArray('group', '', 'POST');// !empty($_POST['group']) ? $_POST['group'] : '';
-    $fforum  = Request::getInt('forenid', 0, 'POST');// (int)($_POST['forenid']);
+    $fgroups = Request::getArray('group', '', 'POST'); // !empty($_POST['group']) ? $_POST['group'] : '';
+    $fforum  = Request::getInt('forenid', 0, 'POST'); // (int)($_POST['forenid']);
     $fuser   = [];
     if (0 !== $fforum) {
         if ('' !== $fgroups) {
@@ -56,14 +56,14 @@ 
             }
         }
         if (-1 == $fforum) { // alle Foren
-            $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . " SET forum_moderator='" . serialize($fuser) . "'";
+            $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_forums')." SET forum_moderator='".serialize($fuser)."'";
         } else {
-            $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . " SET forum_moderator='" . serialize($fuser) . "' WHERE forum_id =" . $fforum;
+            $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('newbb_forums')." SET forum_moderator='".serialize($fuser)."' WHERE forum_id =".$fforum;
         }
         if (is_array($fuser) && $GLOBALS['xoopsDB']->queryF($sql)) {
             $mess = _AM_NEWBB_GROUPMOD_ADDMOD;
         } else {
-            $mess = _AM_NEWBB_GROUPMOD_ERRMOD . '<br><small>( ' . $sql . ' )</small>';
+            $mess = _AM_NEWBB_GROUPMOD_ERRMOD.'<br><small>( '.$sql.' )</small>';
         }
         redirect_header('admin_groupmod.php', 1, $mess);
         //        echo '<div class="confirmMsg">' . $mess . '</div><br><br>';
@@ -71,7 +71,7 @@ 
 }
 
 echo _AM_NEWBB_GROUPMOD_TITLEDESC;
-echo "<br><br><table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
+echo "<br><br><table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
 echo "<form name='reorder' method='post'>";
 ///** @var Newbb\CategoryHandler $categoryHandler */
 //$categoryHandler  = Newbb\Helper::getInstance()->getHandler('Category');
@@ -80,14 +80,14 @@ 
 $categories = $categoryHandler->getAll($criteriaCategory, ['cat_id', 'cat_order', 'cat_title']);
 $forums     = $forumHandler->getTree(array_keys($categories), 0, 'all', '&nbsp;&nbsp;&nbsp;&nbsp;');
 echo '<select name="forenid">';
-echo '<option value="-1">-- ' . _AM_NEWBB_GROUPMOD_ALLFORUMS . ' --</option>';
+echo '<option value="-1">-- '._AM_NEWBB_GROUPMOD_ALLFORUMS.' --</option>';
 foreach (array_keys($categories) as $c) {
     if (!isset($forums[$c])) {
         continue;
     }
     $i = 0;
     foreach ($forums[$c] as $key => $forum) {
-        echo '<option value="' . $forum['forum_id'] . '"> ' . $categories[$c]->getVar('cat_title') . '::' . $forum['forum_name'] . '</option>';
+        echo '<option value="'.$forum['forum_id'].'"> '.$categories[$c]->getVar('cat_title').'::'.$forum['forum_name'].'</option>';
     }
 }
 echo '</select>';
@@ -95,14 +95,14 @@ 
 
 $groups = $memberHandler->getGroups();
 foreach ($groups as $value) {
-    echo '<input type="checkbox" name="group[]" value="' . $value->getVar('groupid') . '" /> ' . $value->getVar('name') . '<br>';
+    echo '<input type="checkbox" name="group[]" value="'.$value->getVar('groupid').'" /> '.$value->getVar('name').'<br>';
 }
 echo "</td><tr><tr><td class='odd' style='text-align:center;'>";
-echo '<input type="submit" value="' . _SUBMIT . '" name="submit" />';
+echo '<input type="submit" value="'._SUBMIT.'" name="submit" />';
 echo '</td></tr></table>';
 echo '</form>';
 echo '<fieldset>';
-echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_GROUPMOD . '&nbsp;</legend>';
+echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_GROUPMOD.'&nbsp;</legend>';
 echo _AM_NEWBB_HELP_GROUPMOD_TAB;
 echo '</fieldset>';
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Indentation +36 added lines, -36 removed lines

@@ -40,34 +40,34 @@ 
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
 if (Request::getString('submit', '', 'POST')) {
-    $fgroups = Request::getArray('group', '', 'POST');// !empty($_POST['group']) ? $_POST['group'] : '';
-    $fforum  = Request::getInt('forenid', 0, 'POST');// (int)($_POST['forenid']);
-    $fuser   = [];
-    if (0 !== $fforum) {
-        if ('' !== $fgroups) {
-            $gg = [];
-            foreach ($fgroups as $k) {
-                $gg = $memberHandler->getUsersByGroup($k, false);
-                foreach ($gg as $f) {
-                    if (!in_array($f, $fuser)) {
-                        $fuser[] = $f;
-                    }
-                }
-            }
-        }
-        if (-1 == $fforum) { // alle Foren
-            $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . " SET forum_moderator='" . serialize($fuser) . "'";
-        } else {
-            $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . " SET forum_moderator='" . serialize($fuser) . "' WHERE forum_id =" . $fforum;
-        }
-        if (is_array($fuser) && $GLOBALS['xoopsDB']->queryF($sql)) {
-            $mess = _AM_NEWBB_GROUPMOD_ADDMOD;
-        } else {
-            $mess = _AM_NEWBB_GROUPMOD_ERRMOD . '<br><small>( ' . $sql . ' )</small>';
-        }
-        redirect_header('admin_groupmod.php', 1, $mess);
-        //        echo '<div class="confirmMsg">' . $mess . '</div><br><br>';
-    }
+	$fgroups = Request::getArray('group', '', 'POST');// !empty($_POST['group']) ? $_POST['group'] : '';
+	$fforum  = Request::getInt('forenid', 0, 'POST');// (int)($_POST['forenid']);
+	$fuser   = [];
+	if (0 !== $fforum) {
+		if ('' !== $fgroups) {
+			$gg = [];
+			foreach ($fgroups as $k) {
+				$gg = $memberHandler->getUsersByGroup($k, false);
+				foreach ($gg as $f) {
+					if (!in_array($f, $fuser)) {
+						$fuser[] = $f;
+					}
+				}
+			}
+		}
+		if (-1 == $fforum) { // alle Foren
+			$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . " SET forum_moderator='" . serialize($fuser) . "'";
+		} else {
+			$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . " SET forum_moderator='" . serialize($fuser) . "' WHERE forum_id =" . $fforum;
+		}
+		if (is_array($fuser) && $GLOBALS['xoopsDB']->queryF($sql)) {
+			$mess = _AM_NEWBB_GROUPMOD_ADDMOD;
+		} else {
+			$mess = _AM_NEWBB_GROUPMOD_ERRMOD . '<br><small>( ' . $sql . ' )</small>';
+		}
+		redirect_header('admin_groupmod.php', 1, $mess);
+		//        echo '<div class="confirmMsg">' . $mess . '</div><br><br>';
+	}
 }
 
 echo _AM_NEWBB_GROUPMOD_TITLEDESC;
@@ -82,20 +82,20 @@ 
 echo '<select name="forenid">';
 echo '<option value="-1">-- ' . _AM_NEWBB_GROUPMOD_ALLFORUMS . ' --</option>';
 foreach (array_keys($categories) as $c) {
-    if (!isset($forums[$c])) {
-        continue;
-    }
-    $i = 0;
-    foreach ($forums[$c] as $key => $forum) {
-        echo '<option value="' . $forum['forum_id'] . '"> ' . $categories[$c]->getVar('cat_title') . '::' . $forum['forum_name'] . '</option>';
-    }
+	if (!isset($forums[$c])) {
+		continue;
+	}
+	$i = 0;
+	foreach ($forums[$c] as $key => $forum) {
+		echo '<option value="' . $forum['forum_id'] . '"> ' . $categories[$c]->getVar('cat_title') . '::' . $forum['forum_name'] . '</option>';
+	}
 }
 echo '</select>';
 echo "</td><tr><tr><td class='even'>";
 
 $groups = $memberHandler->getGroups();
 foreach ($groups as $value) {
-    echo '<input type="checkbox" name="group[]" value="' . $value->getVar('groupid') . '" /> ' . $value->getVar('name') . '<br>';
+	echo '<input type="checkbox" name="group[]" value="' . $value->getVar('groupid') . '" /> ' . $value->getVar('name') . '<br>';
 }
 echo "</td><tr><tr><td class='odd' style='text-align:center;'>";
 echo '<input type="submit" value="' . _SUBMIT . '" name="submit" />';