mambax7 / newbb5

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

admin/admin_permissions.php

Spacing +21 added lines, -21 removed lines

@@ -32,7 +32,7 @@ 
 use Xmf\Request;
 use XoopsModules\Newbb;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
 if (!class_exists('XoopsGroupPermForm')) {
     require_once $GLOBALS['xoops']->path('class/xoopsform/grouppermform.php');
@@ -63,7 +63,7 @@ 
     case 'template':
         xoops_cp_header();
         $adminObject->displayNavigation(basename(__FILE__));
-        echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
+        echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
         $opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_TEMPLAT, 'actionform', 'admin_permissions.php', 'get');
         $op_select = new \XoopsFormSelect('', 'action');
         $op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -82,7 +82,7 @@ 
         $perm_template = $newbbpermHandler->getTemplate();
         foreach (array_keys($glist) as $i) {
             $selected   = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : [];
-            $ret_ele    = '<tr align="left" valign="top"><td class="head">' . $glist[$i] . '</td>';
+            $ret_ele    = '<tr align="left" valign="top"><td class="head">'.$glist[$i].'</td>';
             $ret_ele    .= '<td class="even">';
             $ret_ele    .= '<table class="outer"><tr><td class="odd"><table><tr>';
             $ii         = 0;
@@ -92,13 +92,13 @@ 
                 if (0 == $ii % 5) {
                     $ret_ele .= '</tr><tr>';
                 }
-                $checked      = in_array('forum_' . $perm, $selected) ? ' checked' : '';
-                $option_id    = $perm . '_' . $i;
+                $checked      = in_array('forum_'.$perm, $selected) ? ' checked' : '';
+                $option_id    = $perm.'_'.$i;
                 $option_ids[] = $option_id;
-                $ret_ele      .= '<td><input name="perms[' . $i . '][' . 'forum_' . $perm . ']" id="' . $option_id . '" onclick="" value="1" type="checkbox"' . $checked . '>' . constant('_AM_NEWBB_CAN_' . strtoupper($perm)) . '<br></td>';
+                $ret_ele .= '<td><input name="perms['.$i.']['.'forum_'.$perm.']" id="'.$option_id.'" onclick="" value="1" type="checkbox"'.$checked.'>'.constant('_AM_NEWBB_CAN_'.strtoupper($perm)).'<br></td>';
             }
             $ret_ele    .= '</tr></table></td><td class="even">';
-            $ret_ele    .= _ALL . ' <input id="checkall[' . $i . ']" type="checkbox" value="" onclick="var optionids = new Array(' . implode(', ', $option_ids) . '); xoopsCheckAllElements(optionids, \'checkall[' . $i . ']\')" />';
+            $ret_ele    .= _ALL.' <input id="checkall['.$i.']" type="checkbox" value="" onclick="var optionids = new Array('.implode(', ', $option_ids).'); xoopsCheckAllElements(optionids, \'checkall['.$i.']\')" />';
             $ret_ele    .= '</td></tr></table>';
             $ret_ele    .= '</td></tr>';
             $elements[] = $ret_ele;
@@ -107,7 +107,7 @@ 
         $tray->addElement(new \XoopsFormHidden('action', 'template_save'));
         $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
-        $ret = '<br><strong>' . _AM_NEWBB_PERM_TEMPLATE . '</strong><br>' . _AM_NEWBB_PERM_TEMPLATE_DESC . '<br>';
+        $ret = '<br><strong>'._AM_NEWBB_PERM_TEMPLATE.'</strong><br>'._AM_NEWBB_PERM_TEMPLATE_DESC.'<br>';
         $ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
         $ret .= implode("\n", $elements);
         $ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even" style="text-align:center;">';
@@ -115,7 +115,7 @@ 
         $ret .= '</td></tr>';
         $ret .= '</table></form>';
         echo $ret;
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 
     case 'template_save':
@@ -136,7 +136,7 @@ 
         }
         xoops_cp_header();
         $adminObject->displayNavigation(basename(__FILE__));
-        echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
+        echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
         $opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_APPLY, 'actionform', 'admin_permissions.php', 'get');
         $op_select = new \XoopsFormSelect('', 'action');
         $op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -159,9 +159,9 @@ 
         $forums       = $forumHandler->getTree(array_keys($categories), 0, 'all');
         foreach (array_keys($forums) as $c) {
             $fm_options[-1 * $c - 1000] = ' ';
-            $fm_options[-1 * $c]        = '[' . $categories[$c] . ']';
+            $fm_options[-1 * $c]        = '['.$categories[$c].']';
             foreach (array_keys($forums[$c]) as $f) {
-                $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
+                $fm_options[$f] = $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'];
             }
         }
         unset($forums, $categories);
@@ -176,7 +176,7 @@ 
         $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
         $fmform->addElement($tray);
         $fmform->display();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 
     case 'apply_save':
@@ -214,7 +214,7 @@ 
         }
 
         $adminObject->displayNavigation(basename(__FILE__));
-        echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
+        echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
         $opform    = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP, 'actionform', 'admin_permissions.php', 'get');
         $op_select = new \XoopsFormSelect('', 'action');
         $op_select->setExtra('onchange="document.forms.actionform.submit()"');
@@ -237,10 +237,10 @@ 
             ]
         ];
         foreach ($perms as $perm) {
-            $op_options[$perm] = constant('_AM_NEWBB_CAN_' . strtoupper($perm));
+            $op_options[$perm] = constant('_AM_NEWBB_CAN_'.strtoupper($perm));
             $fm_options[$perm] = [
-                'title'     => constant('_AM_NEWBB_CAN_' . strtoupper($perm)),
-                'item'      => 'forum_' . $perm,
+                'title'     => constant('_AM_NEWBB_CAN_'.strtoupper($perm)),
+                'item'      => 'forum_'.$perm,
                 'desc'      => '',
                 'anonymous' => true
             ];
@@ -281,10 +281,10 @@ 
             if (count($forums) > 0) {
                 foreach (array_keys($forums) as $c) {
                     $key_c = -1 * $c;
-                    $form->addItem($key_c, '<strong>[' . $categories[$c] . ']</strong>');
+                    $form->addItem($key_c, '<strong>['.$categories[$c].']</strong>');
                     foreach (array_keys($forums[$c]) as $f) {
                         $pid = $forums[$c][$f]['parent_forum'] ?: $key_c;
-                        $form->addItem($f, $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'], $pid);
+                        $form->addItem($f, $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'], $pid);
                     }
                 }
             }
@@ -292,7 +292,7 @@ 
         }
         $form->display();
         echo '<fieldset>';
-        echo '<legend>&nbsp;' . _MI_NEWBB_ADMENU_PERMISSION . '&nbsp;</legend>';
+        echo '<legend>&nbsp;'._MI_NEWBB_ADMENU_PERMISSION.'&nbsp;</legend>';
         echo _AM_NEWBB_HELP_PERMISSION_TAB;
         echo '</fieldset>';
         // Since we can not control the permission update, a trick is used here
@@ -301,6 +301,6 @@ 
         $permissionHandler->createPermData();
         $cacheHelper = Newbb\Utility::cleanCache();
         //$cacheHelper->delete('permission');
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 }

Indentation +225 added lines, -225 removed lines

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

include/common.php

Indentation +28 added lines, -28 removed lines

@@ -50,19 +50,19 @@ 
 //define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
 
 if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+	define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
+	define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
+	define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
+	define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
+	define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
+	define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
 }
 
 
@@ -133,15 +133,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+	'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
+	'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
+	'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
+	'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
+	'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
+	'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
+	'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
+	'0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
+	'1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
 ];
 
 $debug = false;
@@ -150,16 +150,16 @@ 
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $GLOBALS['xoopsTpl'] = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
 $GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
 // Local icons path
 if (is_object($helper->getModule())) {
-    $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
-    $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
+	$pathModIcon16 = $helper->getModule()->getInfo('modicons16');
+	$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
-    $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

Spacing +27 added lines, -27 removed lines

@@ -23,10 +23,10 @@ 
 use XoopsModules\Newbb;
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
-require_once dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
-$moduleDirNameUpper   = strtoupper($moduleDirName); //$capsDirName
+$moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName
 
 /** @var \XoopsDatabase $db */
 /** @var Newbb\Helper $helper */
@@ -49,20 +49,20 @@ 
 //define('NEWBB_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
 //define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 
@@ -133,15 +133,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -154,12 +154,12 @@ 
     $GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);
 // Local icons path
 if (is_object($helper->getModule())) {
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

include/oninstall.php

Indentation +52 added lines, -52 removed lines

@@ -30,20 +30,20 @@ 
  */
 function xoops_module_pre_install_newbb(\XoopsModule $module)
 {
-    require_once dirname(__DIR__) . '/preloads/autoloader.php';
-    /** @var Newbb\Utility $utility */
-    $utility      = new \XoopsModules\Newbb\Utility();
-    $xoopsSuccess = $utility::checkVerXoops($module);
-    $phpSuccess   = $utility::checkVerPhp($module);
+	require_once dirname(__DIR__) . '/preloads/autoloader.php';
+	/** @var Newbb\Utility $utility */
+	$utility      = new \XoopsModules\Newbb\Utility();
+	$xoopsSuccess = $utility::checkVerXoops($module);
+	$phpSuccess   = $utility::checkVerPhp($module);
 
-    if (false !== $xoopsSuccess && false !== $phpSuccess) {
-        $moduleTables =& $module->getInfo('tables');
-        foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
-        }
-    }
+	if (false !== $xoopsSuccess && false !== $phpSuccess) {
+		$moduleTables =& $module->getInfo('tables');
+		foreach ($moduleTables as $table) {
+			$GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+		}
+	}
 
-    return $xoopsSuccess && $phpSuccess;
+	return $xoopsSuccess && $phpSuccess;
 }
 
 /**
@@ -55,50 +55,50 @@ 
  */
 function xoops_module_install_newbb(\XoopsModule $module)
 {
-    require_once  dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-    require_once  dirname(__DIR__) . '/include/config.php';
+	require_once  dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+	require_once  dirname(__DIR__) . '/include/config.php';
 
-    $moduleDirName = basename(dirname(__DIR__));
+	$moduleDirName = basename(dirname(__DIR__));
 
-    /** @var Newbb\Helper $helper */
-    $helper = Newbb\Helper::getInstance();
-    $utility      = new Newbb\Utility();
-    $configurator = new Newbb\Common\Configurator();
-    // Load language files
-    $helper->loadLanguage('admin');
-    $helper->loadLanguage('modinfo');
+	/** @var Newbb\Helper $helper */
+	$helper = Newbb\Helper::getInstance();
+	$utility      = new Newbb\Utility();
+	$configurator = new Newbb\Common\Configurator();
+	// Load language files
+	$helper->loadLanguage('admin');
+	$helper->loadLanguage('modinfo');
 
-    // default Permission Settings ----------------------
-    global $xoopsModule, $xoopsDB;
-    $moduleId     = $xoopsModule->getVar('mid');
-    $moduleId2    = $helper->getModule()->mid();
-    $grouppermHandler = xoops_getHandler('groupperm');
-    // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+	// default Permission Settings ----------------------
+	global $xoopsModule, $xoopsDB;
+	$moduleId     = $xoopsModule->getVar('mid');
+	$moduleId2    = $helper->getModule()->mid();
+	$grouppermHandler = xoops_getHandler('groupperm');
+	// access rights ------------------------------------------
+	$grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
-    //  ---  CREATE FOLDERS ---------------
-    if (count($configurator->uploadFolders) > 0) {
-        //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-        foreach (array_keys($configurator->uploadFolders) as $i) {
-            $utility::createFolder($configurator->uploadFolders[$i]);
-        }
-    }
+	//  ---  CREATE FOLDERS ---------------
+	if (count($configurator->uploadFolders) > 0) {
+		//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+		foreach (array_keys($configurator->uploadFolders) as $i) {
+			$utility::createFolder($configurator->uploadFolders[$i]);
+		}
+	}
 
-    //  ---  COPY blank.png FILES ---------------
-    if (count($configurator->copyBlankFiles) > 0) {
-        $file =  dirname(__DIR__) . '/assets/images/blank.png';
-        foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
-            $utility::copyFile($file, $dest);
-        }
-    }
-    //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
-    $xoopsDB->queryF($sql);
+	//  ---  COPY blank.png FILES ---------------
+	if (count($configurator->copyBlankFiles) > 0) {
+		$file =  dirname(__DIR__) . '/assets/images/blank.png';
+		foreach (array_keys($configurator->copyBlankFiles) as $i) {
+			$dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+			$utility::copyFile($file, $dest);
+		}
+	}
+	//delete .html entries from the tpl table
+	$sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+	$xoopsDB->queryF($sql);
 
-    return true;
+	return true;
 }

Spacing +13 added lines, -13 removed lines

@@ -30,16 +30,16 @@ 
  */
 function xoops_module_pre_install_newbb(\XoopsModule $module)
 {
-    require_once dirname(__DIR__) . '/preloads/autoloader.php';
+    require_once dirname(__DIR__).'/preloads/autoloader.php';
     /** @var Newbb\Utility $utility */
     $utility      = new \XoopsModules\Newbb\Utility();
     $xoopsSuccess = $utility::checkVerXoops($module);
     $phpSuccess   = $utility::checkVerPhp($module);
 
     if (false !== $xoopsSuccess && false !== $phpSuccess) {
-        $moduleTables =& $module->getInfo('tables');
+        $moduleTables = & $module->getInfo('tables');
         foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
         }
     }
 
@@ -55,8 +55,8 @@ 
  */
 function xoops_module_install_newbb(\XoopsModule $module)
 {
-    require_once  dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-    require_once  dirname(__DIR__) . '/include/config.php';
+    require_once  dirname(dirname(dirname(__DIR__))).'/mainfile.php';
+    require_once  dirname(__DIR__).'/include/config.php';
 
     $moduleDirName = basename(dirname(__DIR__));
 
@@ -74,11 +74,11 @@ 
     $moduleId2    = $helper->getModule()->mid();
     $grouppermHandler = xoops_getHandler('groupperm');
     // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
     //  ---  CREATE FOLDERS ---------------
     if (count($configurator->uploadFolders) > 0) {
@@ -90,14 +90,14 @@ 
 
     //  ---  COPY blank.png FILES ---------------
     if (count($configurator->copyBlankFiles) > 0) {
-        $file =  dirname(__DIR__) . '/assets/images/blank.png';
+        $file = dirname(__DIR__).'/assets/images/blank.png';
         foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+            $dest = $configurator->copyBlankFiles[$i].'/blank.png';
             $utility::copyFile($file, $dest);
         }
     }
     //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
+    $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$xoopsModule->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.html%'";
     $xoopsDB->queryF($sql);
 
     return true;

include/functions.time.php

Indentation +95 added lines, -95 removed lines

@@ -15,106 +15,106 @@
 define('NEWBB_FUNCTIONS_TIME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_TIME')) {
-    define('NEWBB_FUNCTIONS_TIME', 1);
+	define('NEWBB_FUNCTIONS_TIME', 1);
 
-    /**
-     * Function to convert UNIX time to formatted time string
-     * @param         $time
-     * @param  string $format
-     * @param  string $timeoffset
-     * @return string
-     */
-    function newbbFormatTimestamp($time, $format = 'c', $timeoffset = '')
-    {
-        xoops_loadLanguage('locale');
-        $newbbConfig = newbbLoadConfig();
+	/**
+	 * Function to convert UNIX time to formatted time string
+	 * @param         $time
+	 * @param  string $format
+	 * @param  string $timeoffset
+	 * @return string
+	 */
+	function newbbFormatTimestamp($time, $format = 'c', $timeoffset = '')
+	{
+		xoops_loadLanguage('locale');
+		$newbbConfig = newbbLoadConfig();
 
-        $format = strtolower($format);
-        if ('reg' === $format || '' === $format) {
-            $format = 'c';
-        }
-        if (('custom' === $format || 'c' === $format) && !empty($newbbConfig['formatTimestamp_custom'])) {
-            $format = $newbbConfig['formatTimestamp_custom'];
-        }
+		$format = strtolower($format);
+		if ('reg' === $format || '' === $format) {
+			$format = 'c';
+		}
+		if (('custom' === $format || 'c' === $format) && !empty($newbbConfig['formatTimestamp_custom'])) {
+			$format = $newbbConfig['formatTimestamp_custom'];
+		}
 
-        return XoopsLocal::formatTimestamp($time, $format, $timeoffset);
-    }
+		return XoopsLocal::formatTimestamp($time, $format, $timeoffset);
+	}
 
-    /**
-     * @param  int $selected
-     * @return string
-     */
-    function newbbSinceSelectBox($selected = 100)
-    {
-        $newbbConfig = newbbLoadConfig();
-        // irmtfan - new method to get user inputs
-        preg_match_all('/-?\d+/', $newbbConfig['since_options'], $match);
-        $select_array = array_unique($match[0]);
-        //$select_array = explode(',', $newbbConfig['since_options']);
-        //$select_array = array_map('trim', $select_array);
-        // irmtfan - if the array is empty do not show selection box
-        if (!(bool)$select_array) {
-            $since = $newbbConfig['since_default'];
-            switch ($since) {
-                case 0:
-                    $forum_since = _MD_NEWBB_BEGINNING;
-                    break;
-                case 365:
-                    $forum_since = _MD_NEWBB_THELASTYEAR;
-                    break;
-                default:
-                    if ($since > 0) {
-                        $forum_since = sprintf(_MD_NEWBB_FROMLASTDAYS, $since);
-                    } else {
-                        $forum_since = sprintf(_MD_NEWBB_FROMLASTHOURS, abs($since));
-                    }
-            }
+	/**
+	 * @param  int $selected
+	 * @return string
+	 */
+	function newbbSinceSelectBox($selected = 100)
+	{
+		$newbbConfig = newbbLoadConfig();
+		// irmtfan - new method to get user inputs
+		preg_match_all('/-?\d+/', $newbbConfig['since_options'], $match);
+		$select_array = array_unique($match[0]);
+		//$select_array = explode(',', $newbbConfig['since_options']);
+		//$select_array = array_map('trim', $select_array);
+		// irmtfan - if the array is empty do not show selection box
+		if (!(bool)$select_array) {
+			$since = $newbbConfig['since_default'];
+			switch ($since) {
+				case 0:
+					$forum_since = _MD_NEWBB_BEGINNING;
+					break;
+				case 365:
+					$forum_since = _MD_NEWBB_THELASTYEAR;
+					break;
+				default:
+					if ($since > 0) {
+						$forum_since = sprintf(_MD_NEWBB_FROMLASTDAYS, $since);
+					} else {
+						$forum_since = sprintf(_MD_NEWBB_FROMLASTHOURS, abs($since));
+					}
+			}
 
-            return $forum_since;
-        }
-        $forum_selection_since = '<select class="form-control" name="since" id="since">';
-        // irmtfan no option when no selected value
-        $forum_selection_since .= '<option value="">--------</option>';
-        foreach ($select_array as $since) {
-            $forum_selection_since .= '<option value="' . $since . '"' . (($selected == $since) ? ' selected="selected"' : '') . '>';
-            // START irmtfan functional since 0 and 365
-            switch ($since) {
-                case 0:
-                    $forum_selection_since .= _MD_NEWBB_BEGINNING;
-                    break;
-                case 365:
-                    $forum_selection_since .= _MD_NEWBB_THELASTYEAR;
-                    break;
-                default:
-                    if ($since > 0) {
-                        $forum_selection_since .= sprintf(_MD_NEWBB_FROMLASTDAYS, $since);
-                    } else {
-                        $forum_selection_since .= sprintf(_MD_NEWBB_FROMLASTHOURS, abs($since));
-                    }
-            }
-            // END irmtfan functional since 0 and 365
-            $forum_selection_since .= '</option>';
-        }
-        // irmtfan remove hardcodes
-        //$forum_selection_since .= '<option value="365"'.(($selected === 365) ? ' selected="selected"' : '').'>'._MD_NEWBB_THELASTYEAR.'</option>';
-        //$forum_selection_since .= '<option value="0"'.(($selected === 0) ? ' selected="selected"' : '').'>'._MD_NEWBB_BEGINNING.'</option>';
-        $forum_selection_since .= '</select>';
+			return $forum_since;
+		}
+		$forum_selection_since = '<select class="form-control" name="since" id="since">';
+		// irmtfan no option when no selected value
+		$forum_selection_since .= '<option value="">--------</option>';
+		foreach ($select_array as $since) {
+			$forum_selection_since .= '<option value="' . $since . '"' . (($selected == $since) ? ' selected="selected"' : '') . '>';
+			// START irmtfan functional since 0 and 365
+			switch ($since) {
+				case 0:
+					$forum_selection_since .= _MD_NEWBB_BEGINNING;
+					break;
+				case 365:
+					$forum_selection_since .= _MD_NEWBB_THELASTYEAR;
+					break;
+				default:
+					if ($since > 0) {
+						$forum_selection_since .= sprintf(_MD_NEWBB_FROMLASTDAYS, $since);
+					} else {
+						$forum_selection_since .= sprintf(_MD_NEWBB_FROMLASTHOURS, abs($since));
+					}
+			}
+			// END irmtfan functional since 0 and 365
+			$forum_selection_since .= '</option>';
+		}
+		// irmtfan remove hardcodes
+		//$forum_selection_since .= '<option value="365"'.(($selected === 365) ? ' selected="selected"' : '').'>'._MD_NEWBB_THELASTYEAR.'</option>';
+		//$forum_selection_since .= '<option value="0"'.(($selected === 0) ? ' selected="selected"' : '').'>'._MD_NEWBB_BEGINNING.'</option>';
+		$forum_selection_since .= '</select>';
 
-        return $forum_selection_since;
-    }
+		return $forum_selection_since;
+	}
 
-    /**
-     * @param  int $since
-     * @return int
-     */
-    function newbbGetSinceTime($since = 100)
-    {
-        // irmtfan bad coding
-        //if ($since==1000) return 0;
-        if ($since > 0) {
-            return (int)$since * 24 * 3600;
-        } else {
-            return (int)abs($since) * 3600;
-        }
-    }
+	/**
+	 * @param  int $since
+	 * @return int
+	 */
+	function newbbGetSinceTime($since = 100)
+	{
+		// irmtfan bad coding
+		//if ($since==1000) return 0;
+		if ($since > 0) {
+			return (int)$since * 24 * 3600;
+		} else {
+			return (int)abs($since) * 3600;
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_TIME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_TIME')) {
@@ -53,7 +53,7 @@ 
         //$select_array = explode(',', $newbbConfig['since_options']);
         //$select_array = array_map('trim', $select_array);
         // irmtfan - if the array is empty do not show selection box
-        if (!(bool)$select_array) {
+        if (!(bool) $select_array) {
             $since = $newbbConfig['since_default'];
             switch ($since) {
                 case 0:
@@ -76,7 +76,7 @@ 
         // irmtfan no option when no selected value
         $forum_selection_since .= '<option value="">--------</option>';
         foreach ($select_array as $since) {
-            $forum_selection_since .= '<option value="' . $since . '"' . (($selected == $since) ? ' selected="selected"' : '') . '>';
+            $forum_selection_since .= '<option value="'.$since.'"'.(($selected == $since) ? ' selected="selected"' : '').'>';
             // START irmtfan functional since 0 and 365
             switch ($since) {
                 case 0:
@@ -112,9 +112,9 @@ 
         // irmtfan bad coding
         //if ($since==1000) return 0;
         if ($since > 0) {
-            return (int)$since * 24 * 3600;
+            return (int) $since * 24 * 3600;
         } else {
-            return (int)abs($since) * 3600;
+            return (int) abs($since) * 3600;
         }
     }
 }

include/form.post.php

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

Spacing +16 added lines, -16 removed lines

@@ -42,7 +42,7 @@ 
     $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);
+    $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();
@@ -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);
@@ -292,11 +292,11 @@ 
         $karmas = array_map('trim', explode(',', $GLOBALS['xoopsModuleConfig']['karma_options']));
         if (count($karmas) > 1) {
             foreach ($karmas as $karma) {
-                $karma_array[(string)$karma] = (int)$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_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);

include/notification.inc.php

Indentation +54 added lines, -54 removed lines

@@ -31,67 +31,67 @@
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 require_once $GLOBALS['xoops']->path('modules/newbb/include/functions.php');
 if (!defined('NEWBB_NOTIFY_ITEMINFO')) {
-    define('NEWBB_NOTIFY_ITEMINFO', 1);
+	define('NEWBB_NOTIFY_ITEMINFO', 1);
 
-    /**
-     * @param $category
-     * @param $item_id
-     * @return mixed
-     */
-    function newbb_notify_iteminfo($category, $item_id)
-    {
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        $module        = $moduleHandler->getByDirname('newbb');
+	/**
+	 * @param $category
+	 * @param $item_id
+	 * @return mixed
+	 */
+	function newbb_notify_iteminfo($category, $item_id)
+	{
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		$module        = $moduleHandler->getByDirname('newbb');
 
-        if ('global' === $category) {
-            $item['name'] = '';
-            $item['url']  = '';
+		if ('global' === $category) {
+			$item['name'] = '';
+			$item['url']  = '';
 
-            return $item;
-        }
-        $item_id = (int)$item_id;
+			return $item;
+		}
+		$item_id = (int)$item_id;
 
-        if ('forum' === $category) {
-            // Assume we have a valid forum id
-            $sql = 'SELECT forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' WHERE forum_id = ' . $item_id;
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERRORFORUM);
-            }
-            $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
-            $item['name'] = $result_array['forum_name'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewforum.php?forum=' . $item_id;
+		if ('forum' === $category) {
+			// Assume we have a valid forum id
+			$sql = 'SELECT forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' WHERE forum_id = ' . $item_id;
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				// irmtfan full URL
+				redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERRORFORUM);
+			}
+			$result_array = $GLOBALS['xoopsDB']->fetchArray($result);
+			$item['name'] = $result_array['forum_name'];
+			$item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewforum.php?forum=' . $item_id;
 
-            return $item;
-        }
+			return $item;
+		}
 
-        if ('thread' === $category) {
-            // Assume we have a valid topid id
-            $sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' f WHERE t.forum_id = f.forum_id AND t.topic_id = ' . $item_id . ' LIMIT 1';
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
-            }
-            $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
-            $item['name'] = $result_array['topic_title'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum=' . $result_array['forum_id'] . '&topic_id=' . $item_id;
+		if ('thread' === $category) {
+			// Assume we have a valid topid id
+			$sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' f WHERE t.forum_id = f.forum_id AND t.topic_id = ' . $item_id . ' LIMIT 1';
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				// irmtfan full URL
+				redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+			}
+			$result_array = $GLOBALS['xoopsDB']->fetchArray($result);
+			$item['name'] = $result_array['topic_title'];
+			$item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum=' . $result_array['forum_id'] . '&topic_id=' . $item_id;
 
-            return $item;
-        }
+			return $item;
+		}
 
-        if ('post' === $category) {
-            // Assume we have a valid post id
-            $sql = 'SELECT subject,topic_id,forum_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE post_id = ' . $item_id . ' LIMIT 1';
-            if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
-                // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
-            }
-            $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
-            $item['name'] = $result_array['subject'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum= ' . $result_array['forum_id'] . '&topic_id=' . $result_array['topic_id'] . '#forumpost' . $item_id;
+		if ('post' === $category) {
+			// Assume we have a valid post id
+			$sql = 'SELECT subject,topic_id,forum_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE post_id = ' . $item_id . ' LIMIT 1';
+			if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
+				// irmtfan full URL
+				redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+			}
+			$result_array = $GLOBALS['xoopsDB']->fetchArray($result);
+			$item['name'] = $result_array['subject'];
+			$item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum= ' . $result_array['forum_id'] . '&topic_id=' . $result_array['topic_id'] . '#forumpost' . $item_id;
 
-            return $item;
-        }
-    }
+			return $item;
+		}
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -50,46 +50,46 @@
 
             return $item;
         }
-        $item_id = (int)$item_id;
+        $item_id = (int) $item_id;
 
         if ('forum' === $category) {
             // Assume we have a valid forum id
-            $sql = 'SELECT forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' WHERE forum_id = ' . $item_id;
+            $sql = 'SELECT forum_name FROM '.$GLOBALS['xoopsDB']->prefix('newbb_forums').' WHERE forum_id = '.$item_id;
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERRORFORUM);
+                redirect_header(XOOPS_URL.'/modules/'.$module->getVar('dirname').'index.php', 2, _MD_NEWBB_ERRORFORUM);
             }
             $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
             $item['name'] = $result_array['forum_name'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewforum.php?forum=' . $item_id;
+            $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/viewforum.php?forum='.$item_id;
 
             return $item;
         }
 
         if ('thread' === $category) {
             // Assume we have a valid topid id
-            $sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' t, ' . $GLOBALS['xoopsDB']->prefix('newbb_forums') . ' f WHERE t.forum_id = f.forum_id AND t.topic_id = ' . $item_id . ' LIMIT 1';
+            $sql = 'SELECT t.topic_title,f.forum_id,f.forum_name FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' t, '.$GLOBALS['xoopsDB']->prefix('newbb_forums').' f WHERE t.forum_id = f.forum_id AND t.topic_id = '.$item_id.' LIMIT 1';
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+                redirect_header(XOOPS_URL.'/modules/'.$module->getVar('dirname').'index.php', 2, _MD_NEWBB_ERROROCCURED);
             }
             $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
             $item['name'] = $result_array['topic_title'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum=' . $result_array['forum_id'] . '&topic_id=' . $item_id;
+            $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/viewtopic.php?forum='.$result_array['forum_id'].'&topic_id='.$item_id;
 
             return $item;
         }
 
         if ('post' === $category) {
             // Assume we have a valid post id
-            $sql = 'SELECT subject,topic_id,forum_id FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE post_id = ' . $item_id . ' LIMIT 1';
+            $sql = 'SELECT subject,topic_id,forum_id FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' WHERE post_id = '.$item_id.' LIMIT 1';
             if (!$result = $GLOBALS['xoopsDB']->query($sql)) {
                 // irmtfan full URL
-                redirect_header(XOOPS_URL . '/modules/' . $module->getVar('dirname') . 'index.php', 2, _MD_NEWBB_ERROROCCURED);
+                redirect_header(XOOPS_URL.'/modules/'.$module->getVar('dirname').'index.php', 2, _MD_NEWBB_ERROROCCURED);
             }
             $result_array = $GLOBALS['xoopsDB']->fetchArray($result);
             $item['name'] = $result_array['subject'];
-            $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/viewtopic.php?forum= ' . $result_array['forum_id'] . '&topic_id=' . $result_array['topic_id'] . '#forumpost' . $item_id;
+            $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/viewtopic.php?forum= '.$result_array['forum_id'].'&topic_id='.$result_array['topic_id'].'#forumpost'.$item_id;
 
             return $item;
         }

include/functions.render.php

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__   . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || require_once __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_RENDER_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RENDER')) {
@@ -67,7 +67,7 @@ 
         if (0 !== $br) {
             $text = $myts->nl2Br($text);
         }
-        $text = $myts->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+        $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
 
         return $text;
     }
@@ -98,7 +98,7 @@ 
     {
         $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
         if (empty($asImage)) {
-            $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>';
+            $button = "<a href='{$link}' title='{$alt}' {$extra}>".newbbDisplayImage($button, $alt, true).'</a>';
         }
 
         return $button;

Indentation +133 added lines, -133 removed lines

@@ -17,146 +17,146 @@
 define('NEWBB_FUNCTIONS_RENDER_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RENDER')) {
-    define('NEWBB_FUNCTIONS_RENDER', 1);
+	define('NEWBB_FUNCTIONS_RENDER', 1);
 
-    /*
+	/*
      * Sorry, we have to use the stupid solution unless there is an option in MyTextSanitizer:: htmlspecialchars();
      */
-    /**
-     * @param $text
-     * @return mixed
-     */
-    function newbbHtmlspecialchars(&$text)
-    {
-        return preg_replace(['/&/i', '/ /i'], ['&', ' '], htmlspecialchars($text, ENT_QUOTES | ENT_HTML5));
-    }
-
-    /**
-     * @param        $text
-     * @param  int   $html
-     * @param  int   $smiley
-     * @param  int   $xcode
-     * @param  int   $image
-     * @param  int   $br
-     * @return mixed
-     */
-    function &newbbDisplayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
-    {
-        global $myts;
-
-        if (1 !== $html) {
-            // html not allowed
-            $text = newbbHtmlspecialchars($text);
-        }
-        $text = $myts->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
-        $text = $myts->makeClickable($text);
-        if (0 !== $smiley) {
-            // process smiley
-            $text = $myts->smiley($text);
-        }
-        if (0 !== $xcode) {
-            // decode xcode
-            if (0 !== $image) {
-                // image allowed
-                $text = $myts->xoopsCodeDecode($text);
-            } else {
-                // image not allowed
-                $text = $myts->xoopsCodeDecode($text, 0);
-            }
-        }
-        if (0 !== $br) {
-            $text = $myts->nl2Br($text);
-        }
-        $text = $myts->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
-
-        return $text;
-    }
-
-    /**
-     * @param $document
-     * @return string
-     */
-    function newbbHtml2text($document)
-    {
-        $text = strip_tags($document);
-
-        return $text;
-    }
-
-    /**
-     * Display forrum button
-     *
-     * @param          $link
-     * @param          $button
-     * @param  string  $alt     alt message
-     * @param  boolean $asImage true for image mode; false for text mode
-     * @param  string  $extra   extra attribute for the button
-     * @return mixed
-     * @internal param string $image image/button name, without extension
-     */
-    function newbbGetButton($link, $button, $alt = '', $asImage = true, $extra = "class='forum_button'")
-    {
-        $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
-        if (empty($asImage)) {
-            $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>';
-        }
-
-        return $button;
-    }
-
-    /**
-     * Display forrum images
-     *
-     * @param  string  $image   image name, without extension
-     * @param  string  $alt     alt message
-     * @param  boolean $display true for return image anchor; faulse for assign to $xoopsTpl
-     * @param  string  $extra   extra attribute for the image
-     * @return mixed
-     */
-    function newbbDisplayImage($image, $alt = '', $display = true, $extra = "class='forum_icon'")
-    {
-        $iconHandler = newbbGetIconHandler();
-        // START hacked by irmtfan
-        // to show text links instead of buttons - func_num_args()==2 => only when $image, $alt is set and optional $display not set
-
-        if (2 == func_num_args()) {
-            // overall setting
-            if (!empty($GLOBALS['xoopsModuleConfig']['display_text_links'])) {
-                $display = false;
-            }
-            // if set for each link => overwrite $display
-            if (isset($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image])) {
-                $display = empty($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image]);
-            }
-        }
-        // END hacked by irmtfan
-        if (empty($display)) {
-            return $iconHandler->assignImage($image, $alt, $extra);
-        } else {
-            return $iconHandler->getImage($image, $alt, $extra);
-        }
-    }
-
-    /**
-     * @return Newbb\IconHandler
-     */
-    function newbbGetIconHandler()
-    {
-        global $xoTheme;
-        static $iconHandler;
-
-        if (null !== $iconHandler) {
-            return $iconHandler;
-        }
+	/**
+	 * @param $text
+	 * @return mixed
+	 */
+	function newbbHtmlspecialchars(&$text)
+	{
+		return preg_replace(['/&amp;/i', '/&nbsp;/i'], ['&', '&amp;nbsp;'], htmlspecialchars($text, ENT_QUOTES | ENT_HTML5));
+	}
+
+	/**
+	 * @param        $text
+	 * @param  int   $html
+	 * @param  int   $smiley
+	 * @param  int   $xcode
+	 * @param  int   $image
+	 * @param  int   $br
+	 * @return mixed
+	 */
+	function &newbbDisplayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
+	{
+		global $myts;
+
+		if (1 !== $html) {
+			// html not allowed
+			$text = newbbHtmlspecialchars($text);
+		}
+		$text = $myts->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
+		$text = $myts->makeClickable($text);
+		if (0 !== $smiley) {
+			// process smiley
+			$text = $myts->smiley($text);
+		}
+		if (0 !== $xcode) {
+			// decode xcode
+			if (0 !== $image) {
+				// image allowed
+				$text = $myts->xoopsCodeDecode($text);
+			} else {
+				// image not allowed
+				$text = $myts->xoopsCodeDecode($text, 0);
+			}
+		}
+		if (0 !== $br) {
+			$text = $myts->nl2Br($text);
+		}
+		$text = $myts->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+
+		return $text;
+	}
+
+	/**
+	 * @param $document
+	 * @return string
+	 */
+	function newbbHtml2text($document)
+	{
+		$text = strip_tags($document);
+
+		return $text;
+	}
+
+	/**
+	 * Display forrum button
+	 *
+	 * @param          $link
+	 * @param          $button
+	 * @param  string  $alt     alt message
+	 * @param  boolean $asImage true for image mode; false for text mode
+	 * @param  string  $extra   extra attribute for the button
+	 * @return mixed
+	 * @internal param string $image image/button name, without extension
+	 */
+	function newbbGetButton($link, $button, $alt = '', $asImage = true, $extra = "class='forum_button'")
+	{
+		$button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
+		if (empty($asImage)) {
+			$button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>';
+		}
+
+		return $button;
+	}
+
+	/**
+	 * Display forrum images
+	 *
+	 * @param  string  $image   image name, without extension
+	 * @param  string  $alt     alt message
+	 * @param  boolean $display true for return image anchor; faulse for assign to $xoopsTpl
+	 * @param  string  $extra   extra attribute for the image
+	 * @return mixed
+	 */
+	function newbbDisplayImage($image, $alt = '', $display = true, $extra = "class='forum_icon'")
+	{
+		$iconHandler = newbbGetIconHandler();
+		// START hacked by irmtfan
+		// to show text links instead of buttons - func_num_args()==2 => only when $image, $alt is set and optional $display not set
+
+		if (2 == func_num_args()) {
+			// overall setting
+			if (!empty($GLOBALS['xoopsModuleConfig']['display_text_links'])) {
+				$display = false;
+			}
+			// if set for each link => overwrite $display
+			if (isset($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image])) {
+				$display = empty($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image]);
+			}
+		}
+		// END hacked by irmtfan
+		if (empty($display)) {
+			return $iconHandler->assignImage($image, $alt, $extra);
+		} else {
+			return $iconHandler->getImage($image, $alt, $extra);
+		}
+	}
+
+	/**
+	 * @return Newbb\IconHandler
+	 */
+	function newbbGetIconHandler()
+	{
+		global $xoTheme;
+		static $iconHandler;
+
+		if (null !== $iconHandler) {
+			return $iconHandler;
+		}
 
 //        if (!class_exists('IconHandler')) {
 //            require_once dirname(__DIR__) . '/class/icon.php';
 //        }
 
-        $iconHandler           = Newbb\IconHandler::getInstance();
-        $iconHandler->template = $xoTheme->template;
-        $iconHandler->init($GLOBALS['xoopsConfig']['language']);
+		$iconHandler           = Newbb\IconHandler::getInstance();
+		$iconHandler->template = $xoTheme->template;
+		$iconHandler->init($GLOBALS['xoopsConfig']['language']);
 
-        return $iconHandler;
-    }
+		return $iconHandler;
+	}
 }