mambax7 / newbb5

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

admin/migrate.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
@@ -70,7 +70,7 @@ 
         if (!empty($queue)) {
             echo "<pre>\n";
             foreach ($queue as $line) {
-                echo $line . ";\n";
+                echo $line.";\n";
             }
             echo "</pre>\n";
         }
@@ -92,4 +92,4 @@ 
 
 echo "<div>$message</div>";
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Indentation +23 added lines, -23 removed lines

@@ -65,29 +65,29 @@
 $message = '';
 
 switch ($op) {
-    case 'show':
-        $queue = $newbbMigrate->getSynchronizeDDL();
-        if (!empty($queue)) {
-            echo "<pre>\n";
-            foreach ($queue as $line) {
-                echo $line . ";\n";
-            }
-            echo "</pre>\n";
-        }
-        break;
-    case 'migrate':
-        $newbbMigrate->synchronizeSchema();
-        $message = 'Database migrated to current schema.';
-        break;
-    case 'schema':
-        xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', 'Warning! This is intended for developers only. Confirm write schema file from current database.', 'Confirm');
-        break;
-    case 'confirmwrite':
-        if ($GLOBALS['xoopsSecurity']->check()) {
-            $newbbMigrate->saveCurrentSchema();
-            $message = 'Current schema file written';
-        }
-        break;
+	case 'show':
+		$queue = $newbbMigrate->getSynchronizeDDL();
+		if (!empty($queue)) {
+			echo "<pre>\n";
+			foreach ($queue as $line) {
+				echo $line . ";\n";
+			}
+			echo "</pre>\n";
+		}
+		break;
+	case 'migrate':
+		$newbbMigrate->synchronizeSchema();
+		$message = 'Database migrated to current schema.';
+		break;
+	case 'schema':
+		xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', 'Warning! This is intended for developers only. Confirm write schema file from current database.', 'Confirm');
+		break;
+	case 'confirmwrite':
+		if ($GLOBALS['xoopsSecurity']->check()) {
+			$newbbMigrate->saveCurrentSchema();
+			$message = 'Current schema file written';
+		}
+		break;
 }
 
 echo "<div>$message</div>";

makepdf.php

Spacing +16 added lines, -16 removed lines

@@ -23,17 +23,17 @@ 
 
 // a complete rewrite by irmtfan to enhance: 1- RTL 2- Multilanguage (EMLH and Xlanguage)
 error_reporting(0);
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $attach_id = Request::getString('attachid', '', 'GET');
 $forum     = Request::getInt('forum', 0, 'GET');
 $topic_id  = Request::getInt('topic_id', 0, 'GET');
 $post_id   = Request::getInt('post_id', 0, 'GET');
 
-if (!is_file(XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $topic_id, 3, 'TCPDF for Xoops not installed');
+if (!is_file(XOOPS_ROOT_PATH.'/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')) {
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/viewtopic.php?topic_id='.$topic_id, 3, 'TCPDF for Xoops not installed');
 } else {
-    require_once XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php';
+    require_once XOOPS_ROOT_PATH.'/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php';
 }
 
 if (empty($post_id)) {
@@ -63,7 +63,7 @@ 
 $pf_title        = '';
 if ($parent_forums) {
     foreach ($parent_forums as $p_f) {
-        $pf_title .= $p_f['forum_name'] . ' - ';
+        $pf_title .= $p_f['forum_name'].' - ';
     }
 }
 if (!$forumHandler->getPermission($viewtopic_forum)) {
@@ -83,19 +83,19 @@ 
 $pdf_data['author']                  = $myts->undoHtmlSpecialChars($post_data['author']);
 $pdf_data['title']                   = $myts->undoHtmlSpecialChars($post_data['subject']);
 $content                             = '';
-$content                             .= '<b>' . $pdf_data['title'] . '</b><br><br>';
-$content                             .= _MD_NEWBB_AUTHORC . ' ' . $pdf_data['author'] . '<br>';
-$content                             .= _MD_NEWBB_POSTEDON . ' ' . formatTimestamp($post_data['date']) . '<br><br><br>';
-$content                             .= $myts->undoHtmlSpecialChars($post_data['text']) . '<br>';
+$content                             .= '<b>'.$pdf_data['title'].'</b><br><br>';
+$content                             .= _MD_NEWBB_AUTHORC.' '.$pdf_data['author'].'<br>';
+$content                             .= _MD_NEWBB_POSTEDON.' '.formatTimestamp($post_data['date']).'<br><br><br>';
+$content                             .= $myts->undoHtmlSpecialChars($post_data['text']).'<br>';
 //$content .= $post_edit . '<br>'; //reserve for future versions to display edit records
 $pdf_data['content']        = str_replace('[pagebreak]', '<br>', $content);
 $pdf_data['topic_title']    = $forumtopic->getVar('topic_title');
-$pdf_data['forum_title']    = $pf_title . $viewtopic_forum->getVar('forum_name');
+$pdf_data['forum_title']    = $pf_title.$viewtopic_forum->getVar('forum_name');
 $pdf_data['cat_title']      = $viewtopic_cat->getVar('cat_title');
-$pdf_data['subject']        = _MD_NEWBB_PDF_SUBJECT . ': ' . $pdf_data['topic_title'];
-$pdf_data['keywords']       = XOOPS_URL . ', ' . 'XOOPS Project, ' . $pdf_data['topic_title'];
-$pdf_data['HeadFirstLine']  = $GLOBALS['xoopsConfig']['sitename'] . ' - ' . $GLOBALS['xoopsConfig']['slogan'];
-$pdf_data['HeadSecondLine'] = _MD_NEWBB_FORUMHOME . ' - ' . $pdf_data['cat_title'] . ' - ' . $pdf_data['forum_title'] . ' - ' . $pdf_data['topic_title'];
+$pdf_data['subject']        = _MD_NEWBB_PDF_SUBJECT.': '.$pdf_data['topic_title'];
+$pdf_data['keywords']       = XOOPS_URL.', '.'XOOPS Project, '.$pdf_data['topic_title'];
+$pdf_data['HeadFirstLine']  = $GLOBALS['xoopsConfig']['sitename'].' - '.$GLOBALS['xoopsConfig']['slogan'];
+$pdf_data['HeadSecondLine'] = _MD_NEWBB_FORUMHOME.' - '.$pdf_data['cat_title'].' - '.$pdf_data['forum_title'].' - '.$pdf_data['topic_title'];
 // START irmtfan to implement EMLH by GIJ
 if (function_exists('easiestml')) {
     $pdf_data = easiestml($pdf_data);
@@ -137,7 +137,7 @@ 
 // set document information
 $pdf->SetCreator(PDF_CREATOR);
 $pdf->SetAuthor(PDF_AUTHOR);
-$pdf->SetTitle($pdf_data['forum_title'] . ' - ' . $pdf_data['subject']);
+$pdf->SetTitle($pdf_data['forum_title'].' - '.$pdf_data['subject']);
 $pdf->SetSubject($pdf_data['subject']);
 $pdf->SetKeywords($pdf_data['keywords']);
 
@@ -160,4 +160,4 @@ 
 //$pdf->SetFont(PDF_FONT_NAME_MAIN, PDF_FONT_STYLE_MAIN, PDF_FONT_SIZE_MAIN);
 $pdf->SetFont('dejavusans', '', 12);
 $pdf->writeHTML($pdf_data['content'], true, 0);
-$pdf->Output($pdf_data['topic_title'] . '_' . $post_id . '.pdf', 'I');
+$pdf->Output($pdf_data['topic_title'].'_'.$post_id.'.pdf', 'I');

Indentation +15 added lines, -15 removed lines

@@ -31,19 +31,19 @@ 
 $post_id   = Request::getInt('post_id', 0, 'GET');
 
 if (!is_file(XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php')) {
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $topic_id, 3, 'TCPDF for Xoops not installed');
+	redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/viewtopic.php?topic_id=' . $topic_id, 3, 'TCPDF for Xoops not installed');
 } else {
-    require_once XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php';
+	require_once XOOPS_ROOT_PATH . '/class/libraries/vendor/tecnickcom/tcpdf/tcpdf.php';
 }
 
 if (empty($post_id)) {
-    exit(_MD_NEWBB_ERRORTOPIC);
+	exit(_MD_NEWBB_ERRORTOPIC);
 }
 ///** @var Newbb\PostHandler $postHandler */
 //$postHandler = Newbb\Helper::getInstance()->getHandler('Post');
 $post = $postHandler->get($post_id);
 if (!$approved = $post->getVar('approved')) {
-    exit(_MD_NEWBB_NORIGHTTOVIEW);
+	exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
 $post_data = $postHandler->getPostForPDF($post);
 //$post_edit = $post->displayPostEdit();  //reserve for future versions to display edit records
@@ -52,7 +52,7 @@ 
 $forumtopic = $topicHandler->getByPost($post_id);
 $topic_id   = $forumtopic->getVar('topic_id');
 if (!$approved = $forumtopic->getVar('approved')) {
-    exit(_MD_NEWBB_NORIGHTTOVIEW);
+	exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
 ///** @var Newbb\ForumHandler $forumHandler */
 //$forumHandler    = Newbb\Helper::getInstance()->getHandler('Forum');
@@ -62,19 +62,19 @@ 
 $parent_forums   = $forumHandler->getParents($viewtopic_forum);
 $pf_title        = '';
 if ($parent_forums) {
-    foreach ($parent_forums as $p_f) {
-        $pf_title .= $p_f['forum_name'] . ' - ';
-    }
+	foreach ($parent_forums as $p_f) {
+		$pf_title .= $p_f['forum_name'] . ' - ';
+	}
 }
 if (!$forumHandler->getPermission($viewtopic_forum)) {
-    exit(_MD_NEWBB_NORIGHTTOACCESS);
+	exit(_MD_NEWBB_NORIGHTTOACCESS);
 }
 if (!$topicHandler->getPermission($viewtopic_forum, $forumtopic->getVar('topic_status'), 'view')) {
-    exit(_MD_NEWBB_NORIGHTTOVIEW);
+	exit(_MD_NEWBB_NORIGHTTOVIEW);
 }
 // irmtfan add pdf permission
 if (!$topicHandler->getPermission($viewtopic_forum, $forumtopic->getVar('topic_status'), 'pdf')) {
-    exit(_MD_NEWBB_NORIGHTTOPDF);
+	exit(_MD_NEWBB_NORIGHTTOPDF);
 }
 //$categoryHandler = Newbb\Helper::getInstance()->getHandler('Category');
 $cat                                 = $viewtopic_forum->getVar('cat_id');
@@ -98,11 +98,11 @@ 
 $pdf_data['HeadSecondLine'] = _MD_NEWBB_FORUMHOME . ' - ' . $pdf_data['cat_title'] . ' - ' . $pdf_data['forum_title'] . ' - ' . $pdf_data['topic_title'];
 // START irmtfan to implement EMLH by GIJ
 if (function_exists('easiestml')) {
-    $pdf_data = easiestml($pdf_data);
+	$pdf_data = easiestml($pdf_data);
 // END irmtfan to implement EMLH by GIJ
-    // START irmtfan to implement Xlanguage by phppp(DJ)
+	// START irmtfan to implement Xlanguage by phppp(DJ)
 } elseif (function_exists('xlanguage_ml')) {
-    $pdf_data = xlanguage_ml($pdf_data);
+	$pdf_data = xlanguage_ml($pdf_data);
 }
 // END irmtfan to implement Xlanguage by phppp(DJ)
 
@@ -129,7 +129,7 @@ 
 // START irmtfan hack to add RTL-LTR local
 // until _RTL added to core 2.6.0
 if (!defined('_RTL')) {
-    define('_RTL', false);
+	define('_RTL', false);
 }
 $pdf->setRTL(_RTL);
 // END irmtfan hack to add RTL-LTR local

class/GroupFormCheckBox.php

Spacing +7 added lines, -7 removed lines

@@ -42,17 +42,17 @@ 
     public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
     {
         if ($option['id'] > 0) {
-            $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
+            $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
             foreach ($parentIds as $pid) {
                 if ($pid <= 0) {
                     continue;
                 }
-                $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-                $tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
+                $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
+                $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if (ele.checked !== true) {ele.checked = this.checked;}";
             }
             foreach ($option['allchild'] as $cid) {
-                $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-                $tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
+                $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
+                $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if (this.checked !== true) {ele.checked = false;}";
             }
             $tree .= '" value="1"';
             if (in_array($option['id'], $this->_value)) {
@@ -74,7 +74,7 @@ 
                      . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5)
                      . "\" /><br>\n";
         } else {
-            $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
+            $tree .= $prefix.$option['name'].'<input type="hidden" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" /><br>\n";
         }
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
@@ -82,7 +82,7 @@ 
                     //                  array_push($parentIds, $option['id']);
                     $parentIds[] = $option['id'];
                 }
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
             }
         }
     }

Indentation +63 added lines, -63 removed lines

@@ -22,68 +22,68 @@
  */
 class GroupFormCheckBox extends \XoopsGroupFormCheckBox
 {
-    /**
-     * @param      $caption
-     * @param      $name
-     * @param      $groupId
-     * @param null $values
-     */
-    public function __construct($caption, $name, $groupId, $values = null)
-    {
-        parent::__construct($caption, $name, $groupId, $values);
-    }
+	/**
+	 * @param      $caption
+	 * @param      $name
+	 * @param      $groupId
+	 * @param null $values
+	 */
+	public function __construct($caption, $name, $groupId, $values = null)
+	{
+		parent::__construct($caption, $name, $groupId, $values);
+	}
 
-    /**
-     * @param string $tree
-     * @param array  $option
-     * @param string $prefix
-     * @param array  $parentIds
-     */
-    public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
-    {
-        if ($option['id'] > 0) {
-            $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
-            foreach ($parentIds as $pid) {
-                if ($pid <= 0) {
-                    continue;
-                }
-                $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-                $tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
-            }
-            foreach ($option['allchild'] as $cid) {
-                $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-                $tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
-            }
-            $tree .= '" value="1"';
-            if (in_array($option['id'], $this->_value)) {
-                $tree .= ' checked';
-            }
-            $tree .= ' />'
-                     . $option['name']
-                     . '<input type="hidden" name="'
-                     . $this->getName()
-                     . '[parents]['
-                     . $option['id']
-                     . ']" value="'
-                     . implode(':', $parentIds)
-                     . '" /><input type="hidden" name="'
-                     . $this->getName()
-                     . '[itemname]['
-                     . $option['id']
-                     . ']" value="'
-                     . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5)
-                     . "\" /><br>\n";
-        } else {
-            $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
-        }
-        if (isset($option['children'])) {
-            foreach ($option['children'] as $child) {
-                if ($option['id'] > 0) {
-                    //                  array_push($parentIds, $option['id']);
-                    $parentIds[] = $option['id'];
-                }
-                $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
-            }
-        }
-    }
+	/**
+	 * @param string $tree
+	 * @param array  $option
+	 * @param string $prefix
+	 * @param array  $parentIds
+	 */
+	public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
+	{
+		if ($option['id'] > 0) {
+			$tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
+			foreach ($parentIds as $pid) {
+				if ($pid <= 0) {
+					continue;
+				}
+				$parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
+				$tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
+			}
+			foreach ($option['allchild'] as $cid) {
+				$child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
+				$tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
+			}
+			$tree .= '" value="1"';
+			if (in_array($option['id'], $this->_value)) {
+				$tree .= ' checked';
+			}
+			$tree .= ' />'
+					 . $option['name']
+					 . '<input type="hidden" name="'
+					 . $this->getName()
+					 . '[parents]['
+					 . $option['id']
+					 . ']" value="'
+					 . implode(':', $parentIds)
+					 . '" /><input type="hidden" name="'
+					 . $this->getName()
+					 . '[itemname]['
+					 . $option['id']
+					 . ']" value="'
+					 . htmlspecialchars($option['name'], ENT_QUOTES | ENT_HTML5)
+					 . "\" /><br>\n";
+		} else {
+			$tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
+		}
+		if (isset($option['children'])) {
+			foreach ($option['children'] as $child) {
+				if ($option['id'] > 0) {
+					//                  array_push($parentIds, $option['id']);
+					$parentIds[] = $option['id'];
+				}
+				$this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+			}
+		}
+	}
 }

include/form.post.php

Spacing +14 added lines, -14 removed lines

@@ -66,9 +66,9 @@ 
     if (empty($postParentObject)) {
         $postParentObject = $postHandler->get($pid);
     }
-    $form_title = _MD_NEWBB_REPLY . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}&amp;post_id={$pid}\" rel=\"external\">" . $postParentObject->getVar('subject') . '</a>';
+    $form_title = _MD_NEWBB_REPLY.': <a href="'.XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}&amp;post_id={$pid}\" rel=\"external\">".$postParentObject->getVar('subject').'</a>';
 } else {
-    $form_title = _EDIT . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $postObject->getVar('subject') . '</a>';
+    $form_title = _EDIT.': <a href="'.XOOPS_URL."/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">".$postObject->getVar('subject').'</a>';
     $editby     = true;
 }
 $xoopsTpl->assign('form_title', $form_title);
@@ -101,7 +101,7 @@ 
 
 //$filname = XOOPS_URL.$_SERVER['REQUEST_URI'];
 
-$forum_form = new \XoopsThemeForm(htmlspecialchars(@$form_title, ENT_QUOTES | ENT_HTML5), 'form_post', XOOPS_URL . '/modules/newbb/post.php', 'post', true);
+$forum_form = new \XoopsThemeForm(htmlspecialchars(@$form_title, ENT_QUOTES | ENT_HTML5), 'form_post', XOOPS_URL.'/modules/newbb/post.php', 'post', true);
 $forum_form->setExtra('enctype="multipart/form-data"');
 
 if ($editby) {
@@ -143,7 +143,7 @@ 
 $icons_radio   = new \XoopsFormRadio(_MD_NEWBB_MESSAGEICON, 'icon', $icon);
 $subject_icons = \XoopsLists::getSubjectsList();
 foreach ($subject_icons as $iconfile) {
-    $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
+    $icons_radio->addOption($iconfile, '<img src="'.XOOPS_URL.'/images/subject/'.$iconfile.'" alt="" />');
 }
 $forum_form->addElement($icons_radio);
 
@@ -251,18 +251,18 @@ 
     $upload_tray = new \XoopsFormElementTray(_MD_NEWBB_ATTACHMENT);
     $upload_tray->addElement(new \XoopsFormFile('', 'userfile', $forumObject->getVar('attach_maxkb') * 1024));
     $upload_tray->addElement(new \XoopsFormButton('', 'contents_upload', _MD_NEWBB_UPLOAD, 'submit'));
-    $upload_tray->addElement(new \XoopsFormLabel('<br><br>' . _MD_NEWBB_MAX_FILESIZE . ':', $forumObject->getVar('attach_maxkb') . 'Kb; '));
+    $upload_tray->addElement(new \XoopsFormLabel('<br><br>'._MD_NEWBB_MAX_FILESIZE.':', $forumObject->getVar('attach_maxkb').'Kb; '));
     $extensions = trim(str_replace('|', ' ', $forumObject->getVar('attach_ext')));
     $extensions = (empty($extensions) || '*' === $extensions) ? _ALL : $extensions;
-    $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS . ':', $extensions));
-    $upload_tray->addElement(new \XoopsFormLabel('<br>' . sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
+    $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS.':', $extensions));
+    $upload_tray->addElement(new \XoopsFormLabel('<br>'.sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
     $forum_form->addElement($upload_tray);
 }
 
 if (!empty($attachments) && is_array($attachments) && count($attachments)) {
     $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_THIS_FILE_WAS_ATTACHED_TO_THIS_POST, 'delete_attach[]');
     foreach ($attachments as $key => $attachment) {
-        $attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['nameDisplay'] . '</a><br>';
+        $attach = ' '._DELETE.' <a href='.XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attachment['name_saved'].' rel="external">'.$attachment['nameDisplay'].'</a><br>';
         $delete_attach_checkbox->addOption($key, $attach);
     }
     $forum_form->addElement($delete_attach_checkbox);
@@ -273,7 +273,7 @@ 
     $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]');
     $url_prefix             = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
     foreach ($attachments_tmp as $key => $attachment) {
-        $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>';
+        $attach = ' <a href="'.$url_prefix.'/'.$attachment[0].'" rel="external">'.$attachment[1].'</a><br>';
         $delete_attach_checkbox->addOption($key, $attach);
     }
     $forum_form->addElement($delete_attach_checkbox);
@@ -296,7 +296,7 @@ 
             }
             $karma_select = new \XoopsFormSelect('', 'post_karma', $post_karma);
             $karma_select->addOptionArray($karma_array);
-            $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA . $karma_select->render());
+            $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA.$karma_select->render());
         }
     }
     $radiobox->addOption('require_null', _MD_NEWBB_REQUIRE_NULL);
@@ -327,11 +327,11 @@ 
 
 $cancel_button = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
 if (!empty($topic_id)) {
-    $extra = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . (int)$topic_id;
+    $extra = XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.(int)$topic_id;
 } else {
-    $extra = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $forumObject->getVar('forum_id');
+    $extra = XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$forumObject->getVar('forum_id');
 }
-$cancel_button->setExtra("onclick='location=\"" . $extra . "\"'");
+$cancel_button->setExtra("onclick='location=\"".$extra."\"'");
 $cancel_button->setExtra("tabindex='6'");
 
 if (!empty($isreply) && !empty($hidden)) {
@@ -345,7 +345,7 @@ 
 
 $preview_button = new \XoopsFormButton('', 'btn_preview', _PREVIEW, 'button');
 $preview_button->setExtra("tabindex='5'");
-$preview_button->setExtra('onclick="window.document.forms.' . $forum_form->getName() . '.contents_preview.value=1; window.document.forms.' . $forum_form->getName() . '.submit() ;"');
+$preview_button->setExtra('onclick="window.document.forms.'.$forum_form->getName().'.contents_preview.value=1; window.document.forms.'.$forum_form->getName().'.submit() ;"');
 $forum_form->addElement(new \XoopsFormHidden('contents_preview', 0));
 
 $button_tray->addElement($preview_button);

Indentation +163 added lines, -163 removed lines

@@ -30,69 +30,69 @@ 
 
 //check banning
 $moderated_id    = (is_object($GLOBALS['xoopsUser'])
-                    && $GLOBALS['xoopsUser']->uid() > 0) ? $GLOBALS['xoopsUser']->uid() : 0;
+					&& $GLOBALS['xoopsUser']->uid() > 0) ? $GLOBALS['xoopsUser']->uid() : 0;
 $moderated_ip    = Request::getString('REMOTE_ADDR', '', 'SERVER');
 $moderated_forum = $forumObject->getVar('forum_id');
 /** @var Newbb\ModerateHandler $moderateHandler */
 $moderateHandler = Newbb\Helper::getInstance()->getHandler('Moderate');
 if (!$moderateHandler->verifyUser($moderated_id, '', $moderated_forum)) {
-    $criteria = new \CriteriaCompo();
-    $criteria->add(new \Criteria('uid', $moderated_id, '='));
-    $criteria->setSort('mod_end');
-    $criteria->setOrder('DESC');
-    $mod  = $moderateHandler->getObjects($criteria, false, false);
-    $tage = ($mod[0]['mod_end'] - $mod[0]['mod_start']) / 60 / 60 / 24;
-    $msg  = $myts->displayTarea(sprintf(_MD_NEWBB_SUSPEND_TEXT, newbbGetUnameFromId($moderated_id), (int)$tage, $mod[0]['mod_desc'], formatTimestamp($mod[0]['mod_end'])), 1);
-    xoops_error($msg, _MD_NEWBB_SUSPEND_NOACCESS);
-    require_once $GLOBALS['xoops']->path('footer.php');
-    exit();
+	$criteria = new \CriteriaCompo();
+	$criteria->add(new \Criteria('uid', $moderated_id, '='));
+	$criteria->setSort('mod_end');
+	$criteria->setOrder('DESC');
+	$mod  = $moderateHandler->getObjects($criteria, false, false);
+	$tage = ($mod[0]['mod_end'] - $mod[0]['mod_start']) / 60 / 60 / 24;
+	$msg  = $myts->displayTarea(sprintf(_MD_NEWBB_SUSPEND_TEXT, newbbGetUnameFromId($moderated_id), (int)$tage, $mod[0]['mod_desc'], formatTimestamp($mod[0]['mod_end'])), 1);
+	xoops_error($msg, _MD_NEWBB_SUSPEND_NOACCESS);
+	require_once $GLOBALS['xoops']->path('footer.php');
+	exit();
 }
 
 $xoopsTpl->assign('category', ['id' => $forumObject->getVar('cat_id'), 'title' => $categoryObject->getVar('cat_title')]);
 $xoopsTpl->assign('parentforum', $forumHandler->getParents($forumObject));
 $xoopsTpl->assign([
-                      'forum_id'   => $forumObject->getVar('forum_id'),
-                      'forum_name' => $forumObject->getVar('forum_name')
-                  ]);
+					  'forum_id'   => $forumObject->getVar('forum_id'),
+					  'forum_name' => $forumObject->getVar('forum_name')
+				  ]);
 
 if (!is_object($topicObject)) {
-    $topicObject = $topicHandler->create();
+	$topicObject = $topicHandler->create();
 }
 
 $editby = false;
 if ($topicObject->isNew()) {
-    $form_title = _MD_NEWBB_POSTNEW;
+	$form_title = _MD_NEWBB_POSTNEW;
 } elseif ($postObject->isNew()) {
-    if (empty($postParentObject)) {
-        $postParentObject = $postHandler->get($pid);
-    }
-    $form_title = _MD_NEWBB_REPLY . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}&amp;post_id={$pid}\" rel=\"external\">" . $postParentObject->getVar('subject') . '</a>';
+	if (empty($postParentObject)) {
+		$postParentObject = $postHandler->get($pid);
+	}
+	$form_title = _MD_NEWBB_REPLY . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}&amp;post_id={$pid}\" rel=\"external\">" . $postParentObject->getVar('subject') . '</a>';
 } else {
-    $form_title = _EDIT . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $postObject->getVar('subject') . '</a>';
-    $editby     = true;
+	$form_title = _EDIT . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $postObject->getVar('subject') . '</a>';
+	$editby     = true;
 }
 $xoopsTpl->assign('form_title', $form_title);
 
 foreach ([
-             'start',
-             'topic_id',
-             'post_id',
-             'pid',
-             'isreply',
-             'isedit',
-             'contents_preview'
-         ] as $getint) {
-    ${$getint} = Request::getInt($getint, (!empty(${$getint}) ? ${$getint} : 0), 'GET'); // isset($_GET[$getint]) ? (int)($_GET[$getint]) : ((!empty(${$getint})) ? ${$getint} : 0);
+			 'start',
+			 'topic_id',
+			 'post_id',
+			 'pid',
+			 'isreply',
+			 'isedit',
+			 'contents_preview'
+		 ] as $getint) {
+	${$getint} = Request::getInt($getint, (!empty(${$getint}) ? ${$getint} : 0), 'GET'); // isset($_GET[$getint]) ? (int)($_GET[$getint]) : ((!empty(${$getint})) ? ${$getint} : 0);
 }
 foreach ([
-             'order',
-             'viewmode',
-             'hidden',
-             'newbb_form',
-             'icon',
-             'op'
-         ] as $getstr) {
-    ${$getstr} = Request::getString($getstr, (!empty(${$getstr}) ? ${$getstr} : ''), 'GET'); //isset($_GET[$getstr]) ? $_GET[$getstr] : ((!empty(${$getstr})) ? ${$getstr} : '');
+			 'order',
+			 'viewmode',
+			 'hidden',
+			 'newbb_form',
+			 'icon',
+			 'op'
+		 ] as $getstr) {
+	${$getstr} = Request::getString($getstr, (!empty(${$getstr}) ? ${$getstr} : ''), 'GET'); //isset($_GET[$getstr]) ? $_GET[$getstr] : ((!empty(${$getstr})) ? ${$getstr} : '');
 }
 
 /** @var Newbb\TopicHandler $topicHandler */
@@ -105,30 +105,30 @@ 
 $forum_form->setExtra('enctype="multipart/form-data"');
 
 if ($editby) {
-    $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_EDITEDMSG, 'editwhy', 60, 100, ''));
+	$forum_form->addElement(new \XoopsFormText(_MD_NEWBB_EDITEDMSG, 'editwhy', 60, 100, ''));
 }
 
 $uid = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;
 if (newbbIsAdmin($forumObject)
-    || ($topicHandler->getPermission($forumObject, $topic_status, 'type')
-        && (0 == $topic_id
-            || $uid == $topicHandler->get(@$topic_id, 'topic_poster')))) {
-    $type_id = $topicHandler->get(@$topic_id, 'type_id');
-    /** @var Newbb\TypeHandler $typeHandler */
-    $typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
-    $types       = $typeHandler->getByForum($forumObject->getVar('forum_id'));
-    if (!empty($types)) {
-        $type_element = new \XoopsFormSelect(_MD_NEWBB_TYPE, 'type_id', $type_id);
-        //$type_element = new \XoopsFormRadio(_MD_NEWBB_TYPE, 'type_id', $type_id);
-        $type_element->addOption(0, _NONE);
-        foreach ($types as $key => $type) {
-            //$value = empty($type["type_color"]) ? $type["type_name"] : "<em style=\"font-style: normal; color: " . $type["type_color"] . ";\">" . $type["type_name"] . "</em>";
-            $type_element->addOption($key, $type['type_name']);
-        }
-        $forum_form->addElement($type_element);
-    } else {
-        $forum_form->addElement(new \XoopsFormHidden('type_id', 0));
-    }
+	|| ($topicHandler->getPermission($forumObject, $topic_status, 'type')
+		&& (0 == $topic_id
+			|| $uid == $topicHandler->get(@$topic_id, 'topic_poster')))) {
+	$type_id = $topicHandler->get(@$topic_id, 'type_id');
+	/** @var Newbb\TypeHandler $typeHandler */
+	$typeHandler = Newbb\Helper::getInstance()->getHandler('Type');
+	$types       = $typeHandler->getByForum($forumObject->getVar('forum_id'));
+	if (!empty($types)) {
+		$type_element = new \XoopsFormSelect(_MD_NEWBB_TYPE, 'type_id', $type_id);
+		//$type_element = new \XoopsFormRadio(_MD_NEWBB_TYPE, 'type_id', $type_id);
+		$type_element->addOption(0, _NONE);
+		foreach ($types as $key => $type) {
+			//$value = empty($type["type_color"]) ? $type["type_name"] : "<em style=\"font-style: normal; color: " . $type["type_color"] . ";\">" . $type["type_name"] . "</em>";
+			$type_element->addOption($key, $type['type_name']);
+		}
+		$forum_form->addElement($type_element);
+	} else {
+		$forum_form->addElement(new \XoopsFormHidden('type_id', 0));
+	}
 }
 
 $subject_form = new \XoopsFormText(_MD_NEWBB_SUBJECTC, 'subject', 60, 100, $subject);
@@ -136,32 +136,32 @@ 
 $forum_form->addElement($subject_form, true);
 
 if (!is_object($GLOBALS['xoopsUser'])) {
-    $required = !empty($GLOBALS['xoopsModuleConfig']['require_name']);
-    $forum_form->addElement(new \XoopsFormText(_MD_NEWBB_NAMEMAIL, 'poster_name', 60, 255, (!empty($isedit) && !empty($poster_name)) ? $poster_name : ''), $required);
+	$required = !empty($GLOBALS['xoopsModuleConfig']['require_name']);
+	$forum_form->addElement(new \XoopsFormText(_MD_NEWBB_NAMEMAIL, 'poster_name', 60, 255, (!empty($isedit) && !empty($poster_name)) ? $poster_name : ''), $required);
 }
 
 $icons_radio   = new \XoopsFormRadio(_MD_NEWBB_MESSAGEICON, 'icon', $icon);
 $subject_icons = \XoopsLists::getSubjectsList();
 foreach ($subject_icons as $iconfile) {
-    $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
+	$icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
 }
 $forum_form->addElement($icons_radio);
 
 $nohtml = !$topicHandler->getPermission($forumObject, $topic_status, 'html');
 
 if (Request::getString('editor', '', 'POST')) {
-    $editor = trim(Request::getString('editor', '', 'POST'));
-    newbbSetCookie('editor', $editor);
+	$editor = trim(Request::getString('editor', '', 'POST'));
+	newbbSetCookie('editor', $editor);
 } elseif (!$editor = newbbGetCookie('editor')) {
-    if (empty($editor)) {
-        $editor = @ $GLOBALS['xoopsModuleConfig']['editor_default'];
-    }
+	if (empty($editor)) {
+		$editor = @ $GLOBALS['xoopsModuleConfig']['editor_default'];
+	}
 }
 if (count(@$GLOBALS['xoopsModuleConfig']['editor_allowed']) > 0) {
-    if (!in_array($editor, $GLOBALS['xoopsModuleConfig']['editor_allowed'])) {
-        $editor = $GLOBALS['xoopsModuleConfig']['editor_allowed'][0];
-        newbbSetCookie('editor', $editor);
-    }
+	if (!in_array($editor, $GLOBALS['xoopsModuleConfig']['editor_allowed'])) {
+		$editor = $GLOBALS['xoopsModuleConfig']['editor_allowed'][0];
+		newbbSetCookie('editor', $editor);
+	}
 }
 
 $forum_form->addElement(new \XoopsFormSelectEditor($forum_form, 'editor', $editor, $nohtml, @$GLOBALS['xoopsModuleConfig']['editor_allowed'][0]));
@@ -178,31 +178,31 @@ 
 $forum_form->addElement($_editor, true);
 
 if (!empty($GLOBALS['xoopsModuleConfig']['do_tag']) && (empty($postObject) || $postObject->isTopic())) {
-    $topic_tags = '';
-    if (Request::getString('topic_tags', '', 'POST')) {
-        $topic_tags = $myts->htmlSpecialChars(Request::getString('topic_tags', '', 'POST'));
-    } elseif (!empty($topic_id)) {
-        $topic_tags = $topicHandler->get($topic_id, 'topic_tags');
-    }
-    if (xoops_load('formtag', 'tag') && class_exists('TagFormTag')) {
-        $forum_form->addElement(new TagFormTag('topic_tags', 60, 255, $topic_tags));
-    }
+	$topic_tags = '';
+	if (Request::getString('topic_tags', '', 'POST')) {
+		$topic_tags = $myts->htmlSpecialChars(Request::getString('topic_tags', '', 'POST'));
+	} elseif (!empty($topic_id)) {
+		$topic_tags = $topicHandler->get($topic_id, 'topic_tags');
+	}
+	if (xoops_load('formtag', 'tag') && class_exists('TagFormTag')) {
+		$forum_form->addElement(new TagFormTag('topic_tags', 60, 255, $topic_tags));
+	}
 }
 
 $options_tray = new \XoopsFormElementTray(_MD_NEWBB_OPTIONS, '<br>');
 if (is_object($GLOBALS['xoopsUser']) && 1 == $GLOBALS['xoopsModuleConfig']['allow_user_anonymous']) {
-    $noname          = (!empty($isedit) && is_object($postObject) && 0 == $postObject->getVar('uid')) ? 1 : 0;
-    $noname_checkbox = new \XoopsFormCheckBox('', 'noname', $noname);
-    $noname_checkbox->addOption(1, _MD_NEWBB_POSTANONLY);
-    $options_tray->addElement($noname_checkbox);
+	$noname          = (!empty($isedit) && is_object($postObject) && 0 == $postObject->getVar('uid')) ? 1 : 0;
+	$noname_checkbox = new \XoopsFormCheckBox('', 'noname', $noname);
+	$noname_checkbox->addOption(1, _MD_NEWBB_POSTANONLY);
+	$options_tray->addElement($noname_checkbox);
 }
 
 if (!$nohtml) {
-    $html_checkbox = new \XoopsFormCheckBox('', 'dohtml', $dohtml);
-    $html_checkbox->addOption(1, _MD_NEWBB_DOHTML);
-    $options_tray->addElement($html_checkbox);
+	$html_checkbox = new \XoopsFormCheckBox('', 'dohtml', $dohtml);
+	$html_checkbox->addOption(1, _MD_NEWBB_DOHTML);
+	$options_tray->addElement($html_checkbox);
 } else {
-    $forum_form->addElement(new \XoopsFormHidden('dohtml', 0));
+	$forum_form->addElement(new \XoopsFormHidden('dohtml', 0));
 }
 
 $smiley_checkbox = new \XoopsFormCheckBox('', 'dosmiley', $dosmiley);
@@ -214,99 +214,99 @@ 
 $options_tray->addElement($xcode_checkbox);
 
 if (!$nohtml) {
-    $br_checkbox = new \XoopsFormCheckBox('', 'dobr', $dobr);
-    $br_checkbox->addOption(1, _MD_NEWBB_DOBR);
-    $options_tray->addElement($br_checkbox);
+	$br_checkbox = new \XoopsFormCheckBox('', 'dobr', $dobr);
+	$br_checkbox->addOption(1, _MD_NEWBB_DOBR);
+	$options_tray->addElement($br_checkbox);
 } else {
-    $forum_form->addElement(new \XoopsFormHidden('dobr', 1));
+	$forum_form->addElement(new \XoopsFormHidden('dobr', 1));
 }
 
 if (is_object($GLOBALS['xoopsUser']) && $topicHandler->getPermission($forumObject, $topic_status, 'signature')) {
-    $attachsig_checkbox = new \XoopsFormCheckBox('', 'attachsig', $attachsig);
-    $attachsig_checkbox->addOption(1, _MD_NEWBB_ATTACHSIG);
-    $options_tray->addElement($attachsig_checkbox);
+	$attachsig_checkbox = new \XoopsFormCheckBox('', 'attachsig', $attachsig);
+	$attachsig_checkbox->addOption(1, _MD_NEWBB_ATTACHSIG);
+	$options_tray->addElement($attachsig_checkbox);
 }
 $notify = 0;
 if (is_object($GLOBALS['xoopsUser']) && $GLOBALS['xoopsModuleConfig']['notification_enabled']) {
-    if (!empty($notify)) {
-        // If 'notify' set, use that value (e.g. preview or upload)
-        //$notify = 1;
-    } else {
-        // Otherwise, check previous subscribed status...
-        /** @var \XoopsNotificationHandler $notificationHandler */
-        $notificationHandler = xoops_getHandler('notification');
-        if (!empty($topic_id)
-            && $notificationHandler->isSubscribed('thread', $topic_id, 'new_post', $xoopsModule->getVar('mid'), $GLOBALS['xoopsUser']->getVar('uid'))) {
-            $notify = 1;
-        }
-    }
-
-    $notify_checkbox = new \XoopsFormCheckBox('', 'notify', $notify);
-    $notify_checkbox->addOption(1, _MD_NEWBB_NEWPOSTNOTIFY);
-    $options_tray->addElement($notify_checkbox);
+	if (!empty($notify)) {
+		// If 'notify' set, use that value (e.g. preview or upload)
+		//$notify = 1;
+	} else {
+		// Otherwise, check previous subscribed status...
+		/** @var \XoopsNotificationHandler $notificationHandler */
+		$notificationHandler = xoops_getHandler('notification');
+		if (!empty($topic_id)
+			&& $notificationHandler->isSubscribed('thread', $topic_id, 'new_post', $xoopsModule->getVar('mid'), $GLOBALS['xoopsUser']->getVar('uid'))) {
+			$notify = 1;
+		}
+	}
+
+	$notify_checkbox = new \XoopsFormCheckBox('', 'notify', $notify);
+	$notify_checkbox->addOption(1, _MD_NEWBB_NEWPOSTNOTIFY);
+	$options_tray->addElement($notify_checkbox);
 }
 $forum_form->addElement($options_tray);
 
 if ($topicHandler->getPermission($forumObject, $topic_status, 'attach')) {
-    $upload_tray = new \XoopsFormElementTray(_MD_NEWBB_ATTACHMENT);
-    $upload_tray->addElement(new \XoopsFormFile('', 'userfile', $forumObject->getVar('attach_maxkb') * 1024));
-    $upload_tray->addElement(new \XoopsFormButton('', 'contents_upload', _MD_NEWBB_UPLOAD, 'submit'));
-    $upload_tray->addElement(new \XoopsFormLabel('<br><br>' . _MD_NEWBB_MAX_FILESIZE . ':', $forumObject->getVar('attach_maxkb') . 'Kb; '));
-    $extensions = trim(str_replace('|', ' ', $forumObject->getVar('attach_ext')));
-    $extensions = (empty($extensions) || '*' === $extensions) ? _ALL : $extensions;
-    $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS . ':', $extensions));
-    $upload_tray->addElement(new \XoopsFormLabel('<br>' . sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
-    $forum_form->addElement($upload_tray);
+	$upload_tray = new \XoopsFormElementTray(_MD_NEWBB_ATTACHMENT);
+	$upload_tray->addElement(new \XoopsFormFile('', 'userfile', $forumObject->getVar('attach_maxkb') * 1024));
+	$upload_tray->addElement(new \XoopsFormButton('', 'contents_upload', _MD_NEWBB_UPLOAD, 'submit'));
+	$upload_tray->addElement(new \XoopsFormLabel('<br><br>' . _MD_NEWBB_MAX_FILESIZE . ':', $forumObject->getVar('attach_maxkb') . 'Kb; '));
+	$extensions = trim(str_replace('|', ' ', $forumObject->getVar('attach_ext')));
+	$extensions = (empty($extensions) || '*' === $extensions) ? _ALL : $extensions;
+	$upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS . ':', $extensions));
+	$upload_tray->addElement(new \XoopsFormLabel('<br>' . sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
+	$forum_form->addElement($upload_tray);
 }
 
 if (!empty($attachments) && is_array($attachments) && count($attachments)) {
-    $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_THIS_FILE_WAS_ATTACHED_TO_THIS_POST, 'delete_attach[]');
-    foreach ($attachments as $key => $attachment) {
-        $attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['nameDisplay'] . '</a><br>';
-        $delete_attach_checkbox->addOption($key, $attach);
-    }
-    $forum_form->addElement($delete_attach_checkbox);
-    unset($delete_attach_checkbox);
+	$delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_THIS_FILE_WAS_ATTACHED_TO_THIS_POST, 'delete_attach[]');
+	foreach ($attachments as $key => $attachment) {
+		$attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['nameDisplay'] . '</a><br>';
+		$delete_attach_checkbox->addOption($key, $attach);
+	}
+	$forum_form->addElement($delete_attach_checkbox);
+	unset($delete_attach_checkbox);
 }
 
 if (!empty($attachments_tmp) && is_array($attachments_tmp) && count($attachments_tmp)) {
-    $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]');
-    $url_prefix             = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
-    foreach ($attachments_tmp as $key => $attachment) {
-        $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>';
-        $delete_attach_checkbox->addOption($key, $attach);
-    }
-    $forum_form->addElement($delete_attach_checkbox);
-    unset($delete_attach_checkbox);
-    $attachments_tmp = base64_encode(serialize($attachments_tmp));
-    $forum_form->addElement(new \XoopsFormHidden('attachments_tmp', $attachments_tmp));
+	$delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]');
+	$url_prefix             = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
+	foreach ($attachments_tmp as $key => $attachment) {
+		$attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>';
+		$delete_attach_checkbox->addOption($key, $attach);
+	}
+	$forum_form->addElement($delete_attach_checkbox);
+	unset($delete_attach_checkbox);
+	$attachments_tmp = base64_encode(serialize($attachments_tmp));
+	$forum_form->addElement(new \XoopsFormHidden('attachments_tmp', $attachments_tmp));
 }
 $radiobox = null;
 if ($GLOBALS['xoopsModuleConfig']['enable_karma'] || $GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
-    $view_require = $require_reply ? 'require_reply' : ($post_karma ? 'require_karma' : 'require_null');
-    $radiobox     = new \XoopsFormRadio(_MD_NEWBB_VIEW_REQUIRE, 'view_require', $view_require);
-    if ($GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
-        $radiobox->addOption('require_reply', _MD_NEWBB_REQUIRE_REPLY);
-    }
-    if ($GLOBALS['xoopsModuleConfig']['enable_karma']) {
-        $karmas = array_map('trim', explode(',', $GLOBALS['xoopsModuleConfig']['karma_options']));
-        if (count($karmas) > 1) {
-            foreach ($karmas as $karma) {
-                $karma_array[(string)$karma] = (int)$karma;
-            }
-            $karma_select = new \XoopsFormSelect('', 'post_karma', $post_karma);
-            $karma_select->addOptionArray($karma_array);
-            $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA . $karma_select->render());
-        }
-    }
-    $radiobox->addOption('require_null', _MD_NEWBB_REQUIRE_NULL);
+	$view_require = $require_reply ? 'require_reply' : ($post_karma ? 'require_karma' : 'require_null');
+	$radiobox     = new \XoopsFormRadio(_MD_NEWBB_VIEW_REQUIRE, 'view_require', $view_require);
+	if ($GLOBALS['xoopsModuleConfig']['allow_require_reply']) {
+		$radiobox->addOption('require_reply', _MD_NEWBB_REQUIRE_REPLY);
+	}
+	if ($GLOBALS['xoopsModuleConfig']['enable_karma']) {
+		$karmas = array_map('trim', explode(',', $GLOBALS['xoopsModuleConfig']['karma_options']));
+		if (count($karmas) > 1) {
+			foreach ($karmas as $karma) {
+				$karma_array[(string)$karma] = (int)$karma;
+			}
+			$karma_select = new \XoopsFormSelect('', 'post_karma', $post_karma);
+			$karma_select->addOptionArray($karma_array);
+			$radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA . $karma_select->render());
+		}
+	}
+	$radiobox->addOption('require_null', _MD_NEWBB_REQUIRE_NULL);
 }
 if (null !== $radiobox) {
-    $forum_form->addElement($radiobox);
+	$forum_form->addElement($radiobox);
 }
 
 if (empty($uid)) {
-    $forum_form->addElement(new \XoopsFormCaptcha());
+	$forum_form->addElement(new \XoopsFormCaptcha());
 }
 
 $forum_form->addElement(new \XoopsFormHidden('pid', @$pid));
@@ -327,20 +327,20 @@ 
 
 $cancel_button = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
 if (!empty($topic_id)) {
-    $extra = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . (int)$topic_id;
+	$extra = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . (int)$topic_id;
 } else {
-    $extra = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $forumObject->getVar('forum_id');
+	$extra = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $forumObject->getVar('forum_id');
 }
 $cancel_button->setExtra("onclick='location=\"" . $extra . "\"'");
 $cancel_button->setExtra("tabindex='6'");
 
 if (!empty($isreply) && !empty($hidden)) {
-    $forum_form->addElement(new \XoopsFormHidden('hidden', $hidden));
+	$forum_form->addElement(new \XoopsFormHidden('hidden', $hidden));
 
-    $quote_button = new \XoopsFormButton('', 'quote', _MD_NEWBB_QUOTE, 'button');
-    $quote_button->setExtra("onclick='xoopsGetElementById(\"message\").value=xoopsGetElementById(\"message\").value+ xoopsGetElementById(\"hidden\").value;xoopsGetElementById(\"hidden\").value=\"\";'");
-    $quote_button->setExtra("tabindex='4'");
-    $button_tray->addElement($quote_button);
+	$quote_button = new \XoopsFormButton('', 'quote', _MD_NEWBB_QUOTE, 'button');
+	$quote_button->setExtra("onclick='xoopsGetElementById(\"message\").value=xoopsGetElementById(\"message\").value+ xoopsGetElementById(\"hidden\").value;xoopsGetElementById(\"hidden\").value=\"\";'");
+	$quote_button->setExtra("tabindex='4'");
+	$button_tray->addElement($quote_button);
 }
 
 $preview_button = new \XoopsFormButton('', 'btn_preview', _PREVIEW, 'button');