Inspection of "scrutinizer" - mambax7/newbb5 - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Branch — master (565d4a)

by Michael

created 2018-07-03 07:57 UTC

Status

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -42,17 +42,17 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
                      . 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 @@  discard block
 block discarded – undo
                     //                  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);
             }
         }
     }

Please login to merge, or discard this patch.

Indentation +63 added lines, -63 removed lines patch added patch discarded remove patch

@@ -22,68 +22,68 @@
 block discarded – undo
  */
 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);
+			}
+		}
+	}
 }

Please login to merge, or discard this patch.

include/form.post.php 2 patches

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -66,9 +66,9 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
 
 //$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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
     $delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]');
     $url_prefix             = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
     foreach ($attachments_tmp as $key => $attachment) {
-        $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>';
+        $attach = ' <a href="'.$url_prefix.'/'.$attachment[0].'" rel="external">'.$attachment[1].'</a><br>';
         $delete_attach_checkbox->addOption($key, $attach);
     }
     $forum_form->addElement($delete_attach_checkbox);
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
             }
             $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 @@  discard block
 block discarded – undo
 
 $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 @@  discard block
 block discarded – undo
 
 $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);

Please login to merge, or discard this patch.

Indentation +163 added lines, -163 removed lines patch added patch discarded remove patch

@@ -30,69 +30,69 @@  discard block
 block discarded – undo
 
 //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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 
 $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');

Please login to merge, or discard this patch.

admin/admin_permissions.php 2 patches

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
     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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
                 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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         }
         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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         }
 
         $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 @@  discard block
 block discarded – undo
             ]
         ];
         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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
         }
         $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 @@  discard block
 block discarded – undo
         $permissionHandler->createPermData();
         $cacheHelper = Newbb\Utility::cleanCache();
         //$cacheHelper->delete('permission');
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 }

Please login to merge, or discard this patch.

Indentation +225 added lines, -225 removed lines patch added patch discarded remove patch

@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 $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;
 }

Please login to merge, or discard this patch.

include/common.php 2 patches

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -50,19 +50,19 @@  discard block
 block discarded – undo
 //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 @@  discard block
 block discarded – undo
 //$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 @@  discard block
 block discarded – undo
 $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);
 }

Please login to merge, or discard this patch.

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -23,10 +23,10 @@  discard block
 block discarded – undo
 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 @@  discard block
 block discarded – undo
 //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 @@  discard block
 block discarded – undo
 //$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 @@  discard block
 block discarded – undo
     $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);
 }

Please login to merge, or discard this patch.

include/oninstall.php 2 patches

Indentation +52 added lines, -52 removed lines patch added patch discarded remove patch

@@ -30,20 +30,20 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
  */
 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;
 }

Please login to merge, or discard this patch.

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -30,16 +30,16 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
  */
 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 @@  discard block
 block discarded – undo
     $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 @@  discard block
 block discarded – undo
 
     //  ---  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;

Please login to merge, or discard this patch.

include/functions.render.php 2 patches

Indentation +133 added lines, -133 removed lines patch added patch discarded remove patch

@@ -17,146 +17,146 @@
 block discarded – undo
 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(['/&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 (isset($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 (isset($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;
+	}
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -13,7 +13,7 @@  discard block
 block discarded – undo
 
 // 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 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
     {
         $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;

Please login to merge, or discard this patch.

include/functions.welcome.php 2 patches

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

@@ -17,34 +17,34 @@
 block discarded – undo
 define('NEWBB_FUNCTIONS_WELCOME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_WELCOME')) {
-    define('NEWBB_FUNCTIONS_WELCOME', true);
-
-    /**
-     * @return bool
-     */
-    function newbbWelcome()
-    {
-        global $forumObject;
-        $ret = '';
-
-        $forumId = @$GLOBALS['xoopsModuleConfig']['welcome_forum'];
-        if (!$forumId) {
-            return false;
-        }
-        /** @var Newbb\ForumHandler $forumHandler */
-        $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
-        $forumObject  = $forumHandler->get($forumId);
-        if (!$forumObject || !$forumHandler->getPermission($forumObject)) {
-            unset($forumObject);
-
-            return false;
-        }
-
-        require_once __DIR__   . '/functions.welcome.inc.php';
-        unset($forumObject);
-
-        return $ret;
-    }
-
-    newbbWelcome();
+	define('NEWBB_FUNCTIONS_WELCOME', true);
+
+	/**
+	 * @return bool
+	 */
+	function newbbWelcome()
+	{
+		global $forumObject;
+		$ret = '';
+
+		$forumId = @$GLOBALS['xoopsModuleConfig']['welcome_forum'];
+		if (!$forumId) {
+			return false;
+		}
+		/** @var Newbb\ForumHandler $forumHandler */
+		$forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
+		$forumObject  = $forumHandler->get($forumId);
+		if (!$forumObject || !$forumHandler->getPermission($forumObject)) {
+			unset($forumObject);
+
+			return false;
+		}
+
+		require_once __DIR__   . '/functions.welcome.inc.php';
+		unset($forumObject);
+
+		return $ret;
+	}
+
+	newbbWelcome();
 }

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -13,7 +13,7 @@  discard block
 block discarded – undo
 
 // 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_WELCOME_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_WELCOME')) {
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
             return false;
         }
 
-        require_once __DIR__   . '/functions.welcome.inc.php';
+        require_once __DIR__.'/functions.welcome.inc.php';
         unset($forumObject);
 
         return $ret;

Please login to merge, or discard this patch.

include/onuninstall.php 2 patches

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

@@ -19,8 +19,8 @@  discard block
 block discarded – undo
 
 function xoops_module_pre_uninstall_newbb(\XoopsModule $module)
 {
-    // Do some synchronization
-    return true;
+	// Do some synchronization
+	return true;
 }
 
 /**
@@ -32,36 +32,36 @@  discard block
 block discarded – undo
  */
 function xoops_module_uninstall_newbb(\XoopsModule $module)
 {
-    //    return true;
+	//    return true;
 
-    $moduleDirName  = basename(dirname(__DIR__));
-    $moduleDirNameUpper   = strtoupper($moduleDirName);
-    /** @var \XoopsModules\Newbb\Helper $helper */
-    $helper = \XoopsModules\Newbb\Helper::getInstance();
+	$moduleDirName  = basename(dirname(__DIR__));
+	$moduleDirNameUpper   = strtoupper($moduleDirName);
+	/** @var \XoopsModules\Newbb\Helper $helper */
+	$helper = \XoopsModules\Newbb\Helper::getInstance();
 
-    /** @var Newbb\Utility $utility */
-    $utility = new \XoopsModules\Newbb\Utility();
+	/** @var Newbb\Utility $utility */
+	$utility = new \XoopsModules\Newbb\Utility();
 
-    $success = true;
-    $helper->loadLanguage('admin');
+	$success = true;
+	$helper->loadLanguage('admin');
 
-    //------------------------------------------------------------------
-    // Remove uploads folder (and all subfolders) if they exist
-    //------------------------------------------------------------------
+	//------------------------------------------------------------------
+	// Remove uploads folder (and all subfolders) if they exist
+	//------------------------------------------------------------------
 
-    $old_directories = [$GLOBALS['xoops']->path("uploads/{$moduleDirName}")];
-    foreach ($old_directories as $old_dir) {
-        $dirInfo = new \SplFileInfo($old_dir);
-        if ($dirInfo->isDir()) {
-            // The directory exists so delete it
-            if (false === $utility::rrmdir($old_dir)) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
-                $success = false;
-            }
-        }
-        unset($dirInfo);
-    }
-    /*
+	$old_directories = [$GLOBALS['xoops']->path("uploads/{$moduleDirName}")];
+	foreach ($old_directories as $old_dir) {
+		$dirInfo = new \SplFileInfo($old_dir);
+		if ($dirInfo->isDir()) {
+			// The directory exists so delete it
+			if (false === $utility::rrmdir($old_dir)) {
+				$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
+				$success = false;
+			}
+		}
+		unset($dirInfo);
+	}
+	/*
     //------------ START ----------------
     //------------------------------------------------------------------
     // Remove xsitemap.xml from XOOPS root folder if it exists
@@ -75,6 +75,6 @@  discard block
 block discarded – undo
 //    return $success && $delOk; // use this if you're using this routine
 */
 
-    return $success;
-    //------------ END  ----------------
+	return $success;
+	//------------ END  ----------------
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -34,8 +34,8 @@  discard block
 block discarded – undo
 {
     //    return true;
 
-    $moduleDirName  = basename(dirname(__DIR__));
-    $moduleDirNameUpper   = strtoupper($moduleDirName);
+    $moduleDirName = basename(dirname(__DIR__));
+    $moduleDirNameUpper = strtoupper($moduleDirName);
     /** @var \XoopsModules\Newbb\Helper $helper */
     $helper = \XoopsModules\Newbb\Helper::getInstance();
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
         if ($dirInfo->isDir()) {
             // The directory exists so delete it
             if (false === $utility::rrmdir($old_dir)) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $old_dir));
                 $success = false;
             }
         }

Please login to merge, or discard this patch.

include/functions.session.php 2 patches

Indentation +85 added lines, -85 removed lines patch added patch discarded remove patch

@@ -17,101 +17,101 @@
 block discarded – undo
 define('NEWBB_FUNCTIONS_SESSION_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_SESSION')) {
-    define('NEWBB_FUNCTIONS_SESSION', 1);
+	define('NEWBB_FUNCTIONS_SESSION', 1);
 
-    /*
+	/*
      * Currently the newbb session/cookie handlers are limited to:
      * -- one dimension
      * -- "," and "|" are preserved
      *
      */
-    /**
-     * @param        $name
-     * @param string|array $string
-     */
-    function newbbSetSession($name, $string = '')
-    {
-        if (is_array($string)) {
-            $value = [];
-            foreach ($string as $key => $val) {
-                $value[] = $key . '|' . $val;
-            }
-            $string = implode(',', $value);
-        }
-        $_SESSION['newbb_' . $name] = $string;
-    }
+	/**
+	 * @param        $name
+	 * @param string|array $string
+	 */
+	function newbbSetSession($name, $string = '')
+	{
+		if (is_array($string)) {
+			$value = [];
+			foreach ($string as $key => $val) {
+				$value[] = $key . '|' . $val;
+			}
+			$string = implode(',', $value);
+		}
+		$_SESSION['newbb_' . $name] = $string;
+	}
 
-    /**
-     * @param             $name
-     * @param  bool       $isArray
-     * @return array|bool
-     */
-    function newbbGetSession($name, $isArray = false)
-    {
-        $value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false;
-        if ($isArray) {
-            $_value = $value ? explode(',', $value) : [];
-            $value  = [];
-            if (count($_value) > 0) {
-                foreach ($_value as $string) {
-                    $key         = substr($string, 0, strpos($string, '|'));
-                    $val         = substr($string, strpos($string, '|') + 1);
-                    $value[$key] = $val;
-                }
-            }
-            unset($_value);
-        }
+	/**
+	 * @param             $name
+	 * @param  bool       $isArray
+	 * @return array|bool
+	 */
+	function newbbGetSession($name, $isArray = false)
+	{
+		$value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false;
+		if ($isArray) {
+			$_value = $value ? explode(',', $value) : [];
+			$value  = [];
+			if (count($_value) > 0) {
+				foreach ($_value as $string) {
+					$key         = substr($string, 0, strpos($string, '|'));
+					$val         = substr($string, strpos($string, '|') + 1);
+					$value[$key] = $val;
+				}
+			}
+			unset($_value);
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * @param        $name
-     * @param string|array $string
-     * @param int    $expire
-     */
-    function newbbSetCookie($name, $string = '', $expire = 0)
-    {
-        global $forumCookie;
-        if (is_array($string)) {
-            $value = [];
-            foreach ($string as $key => $val) {
-                $value[] = $key . '|' . $val;
-            }
-            $string = implode(',', $value);
-        }
-        setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
-    }
+	/**
+	 * @param        $name
+	 * @param string|array $string
+	 * @param int    $expire
+	 */
+	function newbbSetCookie($name, $string = '', $expire = 0)
+	{
+		global $forumCookie;
+		if (is_array($string)) {
+			$value = [];
+			foreach ($string as $key => $val) {
+				$value[] = $key . '|' . $val;
+			}
+			$string = implode(',', $value);
+		}
+		setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
+	}
 
-    /**
-     * @param             $name
-     * @param  bool       $isArray
-     * @return array|null
-     */
-    function newbbGetCookie($name, $isArray = false)
-    {
-        global $forumCookie;
-        //        $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null;
-        $value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE');
+	/**
+	 * @param             $name
+	 * @param  bool       $isArray
+	 * @return array|null
+	 */
+	function newbbGetCookie($name, $isArray = false)
+	{
+		global $forumCookie;
+		//        $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null;
+		$value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE');
 
-        if ($isArray) {
-            $_value = $value ? explode(',', $value) : [];
-            $value  = [];
-            if (count($_value) > 0) {
-                foreach ($_value as $string) {
-                    $sep = strpos($string, '|');
-                    if (false === $sep) {
-                        $value[] = $string;
-                    } else {
-                        $key         = substr($string, 0, $sep);
-                        $val         = substr($string, $sep + 1);
-                        $value[$key] = $val;
-                    }
-                }
-            }
-            unset($_value);
-        }
+		if ($isArray) {
+			$_value = $value ? explode(',', $value) : [];
+			$value  = [];
+			if (count($_value) > 0) {
+				foreach ($_value as $string) {
+					$sep = strpos($string, '|');
+					if (false === $sep) {
+						$value[] = $string;
+					} else {
+						$key         = substr($string, 0, $sep);
+						$val         = substr($string, $sep + 1);
+						$value[$key] = $val;
+					}
+				}
+			}
+			unset($_value);
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 }

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -13,7 +13,7 @@  discard block
 block discarded – undo
 
 // 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_SESSION_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_SESSION')) {
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
         if (is_array($string)) {
             $value = [];
             foreach ($string as $key => $val) {
-                $value[] = $key . '|' . $val;
+                $value[] = $key.'|'.$val;
             }
             $string = implode(',', $value);
         }
-        $_SESSION['newbb_' . $name] = $string;
+        $_SESSION['newbb_'.$name] = $string;
     }
 
     /**
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
      */
     function newbbGetSession($name, $isArray = false)
     {
-        $value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false;
+        $value = !empty($_SESSION['newbb_'.$name]) ? $_SESSION['newbb_'.$name] : false;
         if ($isArray) {
             $_value = $value ? explode(',', $value) : [];
             $value  = [];
@@ -76,11 +76,11 @@  discard block
 block discarded – undo
         if (is_array($string)) {
             $value = [];
             foreach ($string as $key => $val) {
-                $value[] = $key . '|' . $val;
+                $value[] = $key.'|'.$val;
             }
             $string = implode(',', $value);
         }
-        setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
+        setcookie($forumCookie['prefix'].$name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
     }
 
     /**
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
     {
         global $forumCookie;
         //        $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null;
-        $value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE');
+        $value = Request::getString($forumCookie['prefix'].$name, null, 'COOKIE');
 
         if ($isArray) {
             $_value = $value ? explode(',', $value) : [];

Please login to merge, or discard this patch.

		@@ -42,17 +42,17 @@ discard block
		block discarded – undo
42	42	public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
43	43	{
44	44	if ($option['id'] > 0) {
45		- $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
	45	+ $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
46	46	foreach ($parentIds as $pid) {
47	47	if ($pid <= 0) {
48	48	continue;
49	49	}
50		- $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
51		- $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
	50	+ $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
	51	+ $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if (ele.checked !== true) {ele.checked = this.checked;}";
52	52	}
53	53	foreach ($option['allchild'] as $cid) {
54		- $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
55		- $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
	54	+ $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
	55	+ $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if (this.checked !== true) {ele.checked = false;}";
56	56	}
57	57	$tree .= '" value="1"';
58	58	if (in_array($option['id'], $this->_value)) {
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	. htmlspecialchars($option['name'], ENT_QUOTES \| ENT_HTML5)
75	75	. "\" /><br>\n";
76	76	} else {
77		- $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
	77	+ $tree .= $prefix.$option['name'].'<input type="hidden" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" /><br>\n";
78	78	}
79	79	if (isset($option['children'])) {
80	80	foreach ($option['children'] as $child) {
		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82	// array_push($parentIds, $option['id']);
83	83	$parentIds[] = $option['id'];
84	84	}
85		- $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . ' -', $parentIds);
	85	+ $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix.' -', $parentIds);
86	86	}
87	87	}
88	88	}

		@@ -22,68 +22,68 @@
		block discarded – undo
22	22	*/
23	23	class GroupFormCheckBox extends \XoopsGroupFormCheckBox
24	24	{
25		- /**
26		- * @param $caption
27		- * @param $name
28		- * @param $groupId
29		- * @param null $values
30		- */
31		- public function __construct($caption, $name, $groupId, $values = null)
32		- {
33		- parent::__construct($caption, $name, $groupId, $values);
34		- }
	25	+ /**
	26	+ * @param $caption
	27	+ * @param $name
	28	+ * @param $groupId
	29	+ * @param null $values
	30	+ */
	31	+ public function __construct($caption, $name, $groupId, $values = null)
	32	+ {
	33	+ parent::__construct($caption, $name, $groupId, $values);
	34	+ }
35	35
36		- /**
37		- * @param string $tree
38		- * @param array $option
39		- * @param string $prefix
40		- * @param array $parentIds
41		- */
42		- public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
43		- {
44		- if ($option['id'] > 0) {
45		- $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
46		- foreach ($parentIds as $pid) {
47		- if ($pid <= 0) {
48		- continue;
49		- }
50		- $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
51		- $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
52		- }
53		- foreach ($option['allchild'] as $cid) {
54		- $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
55		- $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
56		- }
57		- $tree .= '" value="1"';
58		- if (in_array($option['id'], $this->_value)) {
59		- $tree .= ' checked';
60		- }
61		- $tree .= ' />'
62		- . $option['name']
63		- . '<input type="hidden" name="'
64		- . $this->getName()
65		- . '[parents]['
66		- . $option['id']
67		- . ']" value="'
68		- . implode(':', $parentIds)
69		- . '" /><input type="hidden" name="'
70		- . $this->getName()
71		- . '[itemname]['
72		- . $option['id']
73		- . ']" value="'
74		- . htmlspecialchars($option['name'], ENT_QUOTES \| ENT_HTML5)
75		- . "\" /><br>\n";
76		- } else {
77		- $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
78		- }
79		- if (isset($option['children'])) {
80		- foreach ($option['children'] as $child) {
81		- if ($option['id'] > 0) {
82		- // array_push($parentIds, $option['id']);
83		- $parentIds[] = $option['id'];
84		- }
85		- $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . ' -', $parentIds);
86		- }
87		- }
88		- }
	36	+ /**
	37	+ * @param string $tree
	38	+ * @param array $option
	39	+ * @param string $prefix
	40	+ * @param array $parentIds
	41	+ */
	42	+ public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
	43	+ {
	44	+ if ($option['id'] > 0) {
	45	+ $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
	46	+ foreach ($parentIds as $pid) {
	47	+ if ($pid <= 0) {
	48	+ continue;
	49	+ }
	50	+ $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
	51	+ $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
	52	+ }
	53	+ foreach ($option['allchild'] as $cid) {
	54	+ $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
	55	+ $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
	56	+ }
	57	+ $tree .= '" value="1"';
	58	+ if (in_array($option['id'], $this->_value)) {
	59	+ $tree .= ' checked';
	60	+ }
	61	+ $tree .= ' />'
	62	+ . $option['name']
	63	+ . '<input type="hidden" name="'
	64	+ . $this->getName()
	65	+ . '[parents]['
	66	+ . $option['id']
	67	+ . ']" value="'
	68	+ . implode(':', $parentIds)
	69	+ . '" /><input type="hidden" name="'
	70	+ . $this->getName()
	71	+ . '[itemname]['
	72	+ . $option['id']
	73	+ . ']" value="'
	74	+ . htmlspecialchars($option['name'], ENT_QUOTES \| ENT_HTML5)
	75	+ . "\" /><br>\n";
	76	+ } else {
	77	+ $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
	78	+ }
	79	+ if (isset($option['children'])) {
	80	+ foreach ($option['children'] as $child) {
	81	+ if ($option['id'] > 0) {
	82	+ // array_push($parentIds, $option['id']);
	83	+ $parentIds[] = $option['id'];
	84	+ }
	85	+ $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . ' -', $parentIds);
	86	+ }
	87	+ }
	88	+ }
89	89	}

		@@ -66,9 +66,9 @@ discard block
		block discarded – undo
66	66	if (empty($postParentObject)) {
67	67	$postParentObject = $postHandler->get($pid);
68	68	}
69		- $form_title = _MD_NEWBB_REPLY . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?topic_id={$topic_id}&post_id={$pid}\" rel=\"external\">" . $postParentObject->getVar('subject') . '</a>';
	69	+ $form_title = _MD_NEWBB_REPLY.': <a href="'.XOOPS_URL."/modules/newbb/viewtopic.php?topic_id={$topic_id}&post_id={$pid}\" rel=\"external\">".$postParentObject->getVar('subject').'</a>';
70	70	} else {
71		- $form_title = _EDIT . ': <a href="' . XOOPS_URL . "/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">" . $postObject->getVar('subject') . '</a>';
	71	+ $form_title = _EDIT.': <a href="'.XOOPS_URL."/modules/newbb/viewtopic.php?post_id={$post_id}\" rel=\"external\">".$postObject->getVar('subject').'</a>';
72	72	$editby = true;
73	73	}
74	74	$xoopsTpl->assign('form_title', $form_title);
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101
102	102	//$filname = XOOPS_URL.$_SERVER['REQUEST_URI'];
103	103
104		-$forum_form = new \XoopsThemeForm(htmlspecialchars(@$form_title, ENT_QUOTES \| ENT_HTML5), 'form_post', XOOPS_URL . '/modules/newbb/post.php', 'post', true);
	104	+$forum_form = new \XoopsThemeForm(htmlspecialchars(@$form_title, ENT_QUOTES \| ENT_HTML5), 'form_post', XOOPS_URL.'/modules/newbb/post.php', 'post', true);
105	105	$forum_form->setExtra('enctype="multipart/form-data"');
106	106
107	107	if ($editby) {
		@@ -143,7 +143,7 @@ discard block
		block discarded – undo
143	143	$icons_radio = new \XoopsFormRadio(_MD_NEWBB_MESSAGEICON, 'icon', $icon);
144	144	$subject_icons = \XoopsLists::getSubjectsList();
145	145	foreach ($subject_icons as $iconfile) {
146		- $icons_radio->addOption($iconfile, '<img src="' . XOOPS_URL . '/images/subject/' . $iconfile . '" alt="" />');
	146	+ $icons_radio->addOption($iconfile, '<img src="'.XOOPS_URL.'/images/subject/'.$iconfile.'" alt="" />');
147	147	}
148	148	$forum_form->addElement($icons_radio);
149	149
		@@ -251,18 +251,18 @@ discard block
		block discarded – undo
251	251	$upload_tray = new \XoopsFormElementTray(_MD_NEWBB_ATTACHMENT);
252	252	$upload_tray->addElement(new \XoopsFormFile('', 'userfile', $forumObject->getVar('attach_maxkb') * 1024));
253	253	$upload_tray->addElement(new \XoopsFormButton('', 'contents_upload', _MD_NEWBB_UPLOAD, 'submit'));
254		- $upload_tray->addElement(new \XoopsFormLabel('<br><br>' . _MD_NEWBB_MAX_FILESIZE . ':', $forumObject->getVar('attach_maxkb') . 'Kb; '));
	254	+ $upload_tray->addElement(new \XoopsFormLabel('<br><br>'._MD_NEWBB_MAX_FILESIZE.':', $forumObject->getVar('attach_maxkb').'Kb; '));
255	255	$extensions = trim(str_replace('\|', ' ', $forumObject->getVar('attach_ext')));
256	256	$extensions = (empty($extensions) \|\| '*' === $extensions) ? _ALL : $extensions;
257		- $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS . ':', $extensions));
258		- $upload_tray->addElement(new \XoopsFormLabel('<br>' . sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
	257	+ $upload_tray->addElement(new \XoopsFormLabel(_MD_NEWBB_ALLOWED_EXTENSIONS.':', $extensions));
	258	+ $upload_tray->addElement(new \XoopsFormLabel('<br>'.sprintf(_MD_NEWBB_MAXPIC, $GLOBALS['xoopsModuleConfig']['max_img_height'], $GLOBALS['xoopsModuleConfig']['max_img_width'])));
259	259	$forum_form->addElement($upload_tray);
260	260	}
261	261
262	262	if (!empty($attachments) && is_array($attachments) && count($attachments)) {
263	263	$delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_THIS_FILE_WAS_ATTACHED_TO_THIS_POST, 'delete_attach[]');
264	264	foreach ($attachments as $key => $attachment) {
265		- $attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['nameDisplay'] . '</a><br>';
	265	+ $attach = ' '._DELETE.' <a href='.XOOPS_URL.'/'.$GLOBALS['xoopsModuleConfig']['dir_attachments'].'/'.$attachment['name_saved'].' rel="external">'.$attachment['nameDisplay'].'</a><br>';
266	266	$delete_attach_checkbox->addOption($key, $attach);
267	267	}
268	268	$forum_form->addElement($delete_attach_checkbox);
		@@ -273,7 +273,7 @@ discard block
		block discarded – undo
273	273	$delete_attach_checkbox = new \XoopsFormCheckBox(_MD_NEWBB_REMOVE, 'delete_tmp[]');
274	274	$url_prefix = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
275	275	foreach ($attachments_tmp as $key => $attachment) {
276		- $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br>';
	276	+ $attach = ' <a href="'.$url_prefix.'/'.$attachment[0].'" rel="external">'.$attachment[1].'</a><br>';
277	277	$delete_attach_checkbox->addOption($key, $attach);
278	278	}
279	279	$forum_form->addElement($delete_attach_checkbox);
		@@ -296,7 +296,7 @@ discard block
		block discarded – undo
296	296	}
297	297	$karma_select = new \XoopsFormSelect('', 'post_karma', $post_karma);
298	298	$karma_select->addOptionArray($karma_array);
299		- $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA . $karma_select->render());
	299	+ $radiobox->addOption('require_karma', _MD_NEWBB_REQUIRE_KARMA.$karma_select->render());
300	300	}
301	301	}
302	302	$radiobox->addOption('require_null', _MD_NEWBB_REQUIRE_NULL);
		@@ -327,11 +327,11 @@ discard block
		block discarded – undo
327	327
328	328	$cancel_button = new \XoopsFormButton('', 'cancel', _CANCEL, 'button');
329	329	if (!empty($topic_id)) {
330		- $extra = XOOPS_URL . '/modules/newbb/viewtopic.php?topic_id=' . (int)$topic_id;
	330	+ $extra = XOOPS_URL.'/modules/newbb/viewtopic.php?topic_id='.(int)$topic_id;
331	331	} else {
332		- $extra = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $forumObject->getVar('forum_id');
	332	+ $extra = XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$forumObject->getVar('forum_id');
333	333	}
334		-$cancel_button->setExtra("onclick='location=\"" . $extra . "\"'");
	334	+$cancel_button->setExtra("onclick='location=\"".$extra."\"'");
335	335	$cancel_button->setExtra("tabindex='6'");
336	336
337	337	if (!empty($isreply) && !empty($hidden)) {
		@@ -345,7 +345,7 @@ discard block
		block discarded – undo
345	345
346	346	$preview_button = new \XoopsFormButton('', 'btn_preview', _PREVIEW, 'button');
347	347	$preview_button->setExtra("tabindex='5'");
348		-$preview_button->setExtra('onclick="window.document.forms.' . $forum_form->getName() . '.contents_preview.value=1; window.document.forms.' . $forum_form->getName() . '.submit() ;"');
	348	+$preview_button->setExtra('onclick="window.document.forms.'.$forum_form->getName().'.contents_preview.value=1; window.document.forms.'.$forum_form->getName().'.submit() ;"');
349	349	$forum_form->addElement(new \XoopsFormHidden('contents_preview', 0));
350	350
351	351	$button_tray->addElement($preview_button);

		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32	use Xmf\Request;
33	33	use XoopsModules\Newbb;
34	34
35		-require_once __DIR__ . '/admin_header.php';
	35	+require_once __DIR__.'/admin_header.php';
36	36	require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
37	37	if (!class_exists('XoopsGroupPermForm')) {
38	38	require_once $GLOBALS['xoops']->path('class/xoopsform/grouppermform.php');
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	case 'template':
64	64	xoops_cp_header();
65	65	$adminObject->displayNavigation(basename(__FILE__));
66		- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
	66	+ echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
67	67	$opform = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_TEMPLAT, 'actionform', 'admin_permissions.php', 'get');
68	68	$op_select = new \XoopsFormSelect('', 'action');
69	69	$op_select->setExtra('onchange="document.forms.actionform.submit()"');
		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82	$perm_template = $newbbpermHandler->getTemplate();
83	83	foreach (array_keys($glist) as $i) {
84	84	$selected = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : [];
85		- $ret_ele = '<tr align="left" valign="top"><td class="head">' . $glist[$i] . '</td>';
	85	+ $ret_ele = '<tr align="left" valign="top"><td class="head">'.$glist[$i].'</td>';
86	86	$ret_ele .= '<td class="even">';
87	87	$ret_ele .= '<table class="outer"><tr><td class="odd"><table><tr>';
88	88	$ii = 0;
		@@ -92,13 +92,13 @@ discard block
		block discarded – undo
92	92	if (0 == $ii % 5) {
93	93	$ret_ele .= '</tr><tr>';
94	94	}
95		- $checked = in_array('forum_' . $perm, $selected) ? ' checked' : '';
96		- $option_id = $perm . '_' . $i;
	95	+ $checked = in_array('forum_'.$perm, $selected) ? ' checked' : '';
	96	+ $option_id = $perm.'_'.$i;
97	97	$option_ids[] = $option_id;
98		- $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>';
	98	+ $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>';
99	99	}
100	100	$ret_ele .= '</tr></table></td><td class="even">';
101		- $ret_ele .= _ALL . ' <input id="checkall[' . $i . ']" type="checkbox" value="" onclick="var optionids = new Array(' . implode(', ', $option_ids) . '); xoopsCheckAllElements(optionids, \'checkall[' . $i . ']\')" />';
	101	+ $ret_ele .= _ALL.' <input id="checkall['.$i.']" type="checkbox" value="" onclick="var optionids = new Array('.implode(', ', $option_ids).'); xoopsCheckAllElements(optionids, \'checkall['.$i.']\')" />';
102	102	$ret_ele .= '</td></tr></table>';
103	103	$ret_ele .= '</td></tr>';
104	104	$elements[] = $ret_ele;
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	$tray->addElement(new \XoopsFormHidden('action', 'template_save'));
108	108	$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
109	109	$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
110		- $ret = '<br><strong>' . _AM_NEWBB_PERM_TEMPLATE . '</strong><br>' . _AM_NEWBB_PERM_TEMPLATE_DESC . '<br>';
	110	+ $ret = '<br><strong>'._AM_NEWBB_PERM_TEMPLATE.'</strong><br>'._AM_NEWBB_PERM_TEMPLATE_DESC.'<br>';
111	111	$ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
112	112	$ret .= implode("\n", $elements);
113	113	$ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even" style="text-align:center;">';
		@@ -115,7 +115,7 @@ discard block
		block discarded – undo
115	115	$ret .= '</td></tr>';
116	116	$ret .= '</table></form>';
117	117	echo $ret;
118		- require_once __DIR__ . '/admin_footer.php';
	118	+ require_once __DIR__.'/admin_footer.php';
119	119	break;
120	120
121	121	case 'template_save':
		@@ -136,7 +136,7 @@ discard block
		block discarded – undo
136	136	}
137	137	xoops_cp_header();
138	138	$adminObject->displayNavigation(basename(__FILE__));
139		- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
	139	+ echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
140	140	$opform = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_APPLY, 'actionform', 'admin_permissions.php', 'get');
141	141	$op_select = new \XoopsFormSelect('', 'action');
142	142	$op_select->setExtra('onchange="document.forms.actionform.submit()"');
		@@ -159,9 +159,9 @@ discard block
		block discarded – undo
159	159	$forums = $forumHandler->getTree(array_keys($categories), 0, 'all');
160	160	foreach (array_keys($forums) as $c) {
161	161	$fm_options[-1 * $c - 1000] = ' ';
162		- $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
	162	+ $fm_options[-1 * $c] = '['.$categories[$c].']';
163	163	foreach (array_keys($forums[$c]) as $f) {
164		- $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
	164	+ $fm_options[$f] = $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'];
165	165	}
166	166	}
167	167	unset($forums, $categories);
		@@ -176,7 +176,7 @@ discard block
		block discarded – undo
176	176	$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
177	177	$fmform->addElement($tray);
178	178	$fmform->display();
179		- require_once __DIR__ . '/admin_footer.php';
	179	+ require_once __DIR__.'/admin_footer.php';
180	180	break;
181	181
182	182	case 'apply_save':
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	}
215	215
216	216	$adminObject->displayNavigation(basename(__FILE__));
217		- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
	217	+ echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
218	218	$opform = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP, 'actionform', 'admin_permissions.php', 'get');
219	219	$op_select = new \XoopsFormSelect('', 'action');
220	220	$op_select->setExtra('onchange="document.forms.actionform.submit()"');
		@@ -237,10 +237,10 @@ discard block
		block discarded – undo
237	237	]
238	238	];
239	239	foreach ($perms as $perm) {
240		- $op_options[$perm] = constant('_AM_NEWBB_CAN_' . strtoupper($perm));
	240	+ $op_options[$perm] = constant('_AM_NEWBB_CAN_'.strtoupper($perm));
241	241	$fm_options[$perm] = [
242		- 'title' => constant('_AM_NEWBB_CAN_' . strtoupper($perm)),
243		- 'item' => 'forum_' . $perm,
	242	+ 'title' => constant('_AM_NEWBB_CAN_'.strtoupper($perm)),
	243	+ 'item' => 'forum_'.$perm,
244	244	'desc' => '',
245	245	'anonymous' => true
246	246	];
		@@ -281,10 +281,10 @@ discard block
		block discarded – undo
281	281	if (count($forums) > 0) {
282	282	foreach (array_keys($forums) as $c) {
283	283	$key_c = -1 * $c;
284		- $form->addItem($key_c, '<strong>[' . $categories[$c] . ']</strong>');
	284	+ $form->addItem($key_c, '<strong>['.$categories[$c].']</strong>');
285	285	foreach (array_keys($forums[$c]) as $f) {
286	286	$pid = $forums[$c][$f]['parent_forum'] ?: $key_c;
287		- $form->addItem($f, $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'], $pid);
	287	+ $form->addItem($f, $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'], $pid);
288	288	}
289	289	}
290	290	}
		@@ -292,7 +292,7 @@ discard block
		block discarded – undo
292	292	}
293	293	$form->display();
294	294	echo '<fieldset>';
295		- echo '<legend> ' . _MI_NEWBB_ADMENU_PERMISSION . ' </legend>';
	295	+ echo '<legend> '._MI_NEWBB_ADMENU_PERMISSION.' </legend>';
296	296	echo _AM_NEWBB_HELP_PERMISSION_TAB;
297	297	echo '</fieldset>';
298	298	// Since we can not control the permission update, a trick is used here
		@@ -301,6 +301,6 @@ discard block
		block discarded – undo
301	301	$permissionHandler->createPermData();
302	302	$cacheHelper = Newbb\Utility::cleanCache();
303	303	//$cacheHelper->delete('permission');
304		- require_once __DIR__ . '/admin_footer.php';
	304	+ require_once __DIR__.'/admin_footer.php';
305	305	break;
306	306	}

		@@ -50,19 +50,19 @@ discard block
		block discarded – undo
50	50	//define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
51	51
52	52	if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
53		- define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
54		- define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
55		- define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
56		- define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
57		- define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
58		- define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
59		- define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
60		- define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
61		- define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
62		- define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
63		- define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
64		- define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
65		- define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
	53	+ define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
	54	+ define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
	55	+ define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
	56	+ define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
	57	+ define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
	58	+ define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
	59	+ define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
	60	+ define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
	61	+ define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
	62	+ define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
	63	+ define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
	64	+ define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
	65	+ define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
66	66	}
67	67
68	68
		@@ -133,15 +133,15 @@ discard block
		block discarded – undo
133	133	//$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
134	134
135	135	$icons = [
136		- 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>",
137		- 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
138		- 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
139		- 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
140		- 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
141		- 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
142		- 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
143		- '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
144		- '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
	136	+ 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>",
	137	+ 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
	138	+ 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
	139	+ 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
	140	+ 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
	141	+ 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
	142	+ 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
	143	+ '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
	144	+ '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
145	145	];
146	146
147	147	$debug = false;
		@@ -150,16 +150,16 @@ discard block
		block discarded – undo
150	150	$myts = \MyTextSanitizer::getInstance();
151	151
152	152	if (!isset($GLOBALS['xoopsTpl']) \|\| !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
153		- require_once $GLOBALS['xoops']->path('class/template.php');
154		- $GLOBALS['xoopsTpl'] = new \XoopsTpl();
	153	+ require_once $GLOBALS['xoops']->path('class/template.php');
	154	+ $GLOBALS['xoopsTpl'] = new \XoopsTpl();
155	155	}
156	156
157	157	$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
158	158	// Local icons path
159	159	if (is_object($helper->getModule())) {
160		- $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
161		- $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
	160	+ $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
	161	+ $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
162	162
163		- $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
164		- $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
	163	+ $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
	164	+ $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
165	165	}

		@@ -23,10 +23,10 @@ discard block
		block discarded – undo
23	23	use XoopsModules\Newbb;
24	24
25	25	// defined('XOOPS_ROOT_PATH') \|\| die('Restricted access');
26		-require_once dirname(__DIR__) . '/preloads/autoloader.php';
	26	+require_once dirname(__DIR__).'/preloads/autoloader.php';
27	27
28	28	$moduleDirName = basename(dirname(__DIR__));
29		-$moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName
	29	+$moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName
30	30
31	31	/** @var \XoopsDatabase $db */
32	32	/** @var Newbb\Helper $helper */
		@@ -49,20 +49,20 @@ discard block
		block discarded – undo
49	49	//define('NEWBB_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
50	50	//define('NEWBB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . NEWBB_DIRNAME); // WITHOUT Trailing slash
51	51
52		-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
53		- define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
54		- define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
55		- define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
56		- define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
57		- define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
58		- define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
59		- define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
60		- define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
61		- define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
62		- define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
63		- define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
64		- define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
65		- define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
	52	+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
	53	+ define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
	54	+ define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
	55	+ define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
	56	+ define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
	57	+ define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
	58	+ define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
	59	+ define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
	60	+ define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
	61	+ define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
	62	+ define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
	63	+ define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
	64	+ define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
	65	+ define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
66	66	}
67	67
68	68
		@@ -133,15 +133,15 @@ discard block
		block discarded – undo
133	133	//$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
134	134
135	135	$icons = [
136		- 'edit' => "<img src='" . $pathIcon16 . "/edit.png' alt=" . _EDIT . "' align='middle'>",
137		- 'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
138		- 'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
139		- 'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
140		- 'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
141		- 'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
142		- 'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
143		- '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
144		- '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
	136	+ 'edit' => "<img src='".$pathIcon16."/edit.png' alt="._EDIT."' align='middle'>",
	137	+ 'delete' => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
	138	+ 'clone' => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
	139	+ 'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
	140	+ 'print' => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
	141	+ 'pdf' => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
	142	+ 'add' => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
	143	+ '0' => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
	144	+ '1' => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
145	145	];
146	146
147	147	$debug = false;
		@@ -154,12 +154,12 @@ discard block
		block discarded – undo
154	154	$GLOBALS['xoopsTpl'] = new \XoopsTpl();
155	155	}
156	156
157		-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
	157	+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);
158	158	// Local icons path
159	159	if (is_object($helper->getModule())) {
160	160	$pathModIcon16 = $helper->getModule()->getInfo('modicons16');
161	161	$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
162	162
163		- $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
	163	+ $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
164	164	$GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
165	165	}

		@@ -30,20 +30,20 @@ discard block
		block discarded – undo
30	30	*/
31	31	function xoops_module_pre_install_newbb(\XoopsModule $module)
32	32	{
33		- require_once dirname(__DIR__) . '/preloads/autoloader.php';
34		- /** @var Newbb\Utility $utility */
35		- $utility = new \XoopsModules\Newbb\Utility();
36		- $xoopsSuccess = $utility::checkVerXoops($module);
37		- $phpSuccess = $utility::checkVerPhp($module);
	33	+ require_once dirname(__DIR__) . '/preloads/autoloader.php';
	34	+ /** @var Newbb\Utility $utility */
	35	+ $utility = new \XoopsModules\Newbb\Utility();
	36	+ $xoopsSuccess = $utility::checkVerXoops($module);
	37	+ $phpSuccess = $utility::checkVerPhp($module);
38	38
39		- if (false !== $xoopsSuccess && false !== $phpSuccess) {
40		- $moduleTables =& $module->getInfo('tables');
41		- foreach ($moduleTables as $table) {
42		- $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
43		- }
44		- }
	39	+ if (false !== $xoopsSuccess && false !== $phpSuccess) {
	40	+ $moduleTables =& $module->getInfo('tables');
	41	+ foreach ($moduleTables as $table) {
	42	+ $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
	43	+ }
	44	+ }
45	45
46		- return $xoopsSuccess && $phpSuccess;
	46	+ return $xoopsSuccess && $phpSuccess;
47	47	}
48	48
49	49	/**
		@@ -55,50 +55,50 @@ discard block
		block discarded – undo
55	55	*/
56	56	function xoops_module_install_newbb(\XoopsModule $module)
57	57	{
58		- require_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
59		- require_once dirname(__DIR__) . '/include/config.php';
	58	+ require_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
	59	+ require_once dirname(__DIR__) . '/include/config.php';
60	60
61		- $moduleDirName = basename(dirname(__DIR__));
	61	+ $moduleDirName = basename(dirname(__DIR__));
62	62
63		- /** @var Newbb\Helper $helper */
64		- $helper = Newbb\Helper::getInstance();
65		- $utility = new Newbb\Utility();
66		- $configurator = new Newbb\Common\Configurator();
67		- // Load language files
68		- $helper->loadLanguage('admin');
69		- $helper->loadLanguage('modinfo');
	63	+ /** @var Newbb\Helper $helper */
	64	+ $helper = Newbb\Helper::getInstance();
	65	+ $utility = new Newbb\Utility();
	66	+ $configurator = new Newbb\Common\Configurator();
	67	+ // Load language files
	68	+ $helper->loadLanguage('admin');
	69	+ $helper->loadLanguage('modinfo');
70	70
71		- // default Permission Settings ----------------------
72		- global $xoopsModule, $xoopsDB;
73		- $moduleId = $xoopsModule->getVar('mid');
74		- $moduleId2 = $helper->getModule()->mid();
75		- $grouppermHandler = xoops_getHandler('groupperm');
76		- // access rights ------------------------------------------
77		- $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
78		- $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
79		- $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
80		- $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
81		- $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
	71	+ // default Permission Settings ----------------------
	72	+ global $xoopsModule, $xoopsDB;
	73	+ $moduleId = $xoopsModule->getVar('mid');
	74	+ $moduleId2 = $helper->getModule()->mid();
	75	+ $grouppermHandler = xoops_getHandler('groupperm');
	76	+ // access rights ------------------------------------------
	77	+ $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
	78	+ $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
	79	+ $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
	80	+ $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
	81	+ $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
82	82
83		- // --- CREATE FOLDERS ---------------
84		- if (count($configurator->uploadFolders) > 0) {
85		- // foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
86		- foreach (array_keys($configurator->uploadFolders) as $i) {
87		- $utility::createFolder($configurator->uploadFolders[$i]);
88		- }
89		- }
	83	+ // --- CREATE FOLDERS ---------------
	84	+ if (count($configurator->uploadFolders) > 0) {
	85	+ // foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
	86	+ foreach (array_keys($configurator->uploadFolders) as $i) {
	87	+ $utility::createFolder($configurator->uploadFolders[$i]);
	88	+ }
	89	+ }
90	90
91		- // --- COPY blank.png FILES ---------------
92		- if (count($configurator->copyBlankFiles) > 0) {
93		- $file = dirname(__DIR__) . '/assets/images/blank.png';
94		- foreach (array_keys($configurator->copyBlankFiles) as $i) {
95		- $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
96		- $utility::copyFile($file, $dest);
97		- }
98		- }
99		- //delete .html entries from the tpl table
100		- $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
101		- $xoopsDB->queryF($sql);
	91	+ // --- COPY blank.png FILES ---------------
	92	+ if (count($configurator->copyBlankFiles) > 0) {
	93	+ $file = dirname(__DIR__) . '/assets/images/blank.png';
	94	+ foreach (array_keys($configurator->copyBlankFiles) as $i) {
	95	+ $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
	96	+ $utility::copyFile($file, $dest);
	97	+ }
	98	+ }
	99	+ //delete .html entries from the tpl table
	100	+ $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
	101	+ $xoopsDB->queryF($sql);
102	102
103		- return true;
	103	+ return true;
104	104	}

		@@ -30,16 +30,16 @@ discard block
		block discarded – undo
30	30	*/
31	31	function xoops_module_pre_install_newbb(\XoopsModule $module)
32	32	{
33		- require_once dirname(__DIR__) . '/preloads/autoloader.php';
	33	+ require_once dirname(__DIR__).'/preloads/autoloader.php';
34	34	/** @var Newbb\Utility $utility */
35	35	$utility = new \XoopsModules\Newbb\Utility();
36	36	$xoopsSuccess = $utility::checkVerXoops($module);
37	37	$phpSuccess = $utility::checkVerPhp($module);
38	38
39	39	if (false !== $xoopsSuccess && false !== $phpSuccess) {
40		- $moduleTables =& $module->getInfo('tables');
	40	+ $moduleTables = & $module->getInfo('tables');
41	41	foreach ($moduleTables as $table) {
42		- $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
	42	+ $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
43	43	}
44	44	}
45	45
		@@ -55,8 +55,8 @@ discard block
		block discarded – undo
55	55	*/
56	56	function xoops_module_install_newbb(\XoopsModule $module)
57	57	{
58		- require_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
59		- require_once dirname(__DIR__) . '/include/config.php';
	58	+ require_once dirname(dirname(dirname(__DIR__))).'/mainfile.php';
	59	+ require_once dirname(__DIR__).'/include/config.php';
60	60
61	61	$moduleDirName = basename(dirname(__DIR__));
62	62
		@@ -74,11 +74,11 @@ discard block
		block discarded – undo
74	74	$moduleId2 = $helper->getModule()->mid();
75	75	$grouppermHandler = xoops_getHandler('groupperm');
76	76	// access rights ------------------------------------------
77		- $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
78		- $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
79		- $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
80		- $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
81		- $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
	77	+ $grouppermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
	78	+ $grouppermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
	79	+ $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
	80	+ $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId);
	81	+ $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
82	82
83	83	// --- CREATE FOLDERS ---------------
84	84	if (count($configurator->uploadFolders) > 0) {
		@@ -90,14 +90,14 @@ discard block
		block discarded – undo
90	90
91	91	// --- COPY blank.png FILES ---------------
92	92	if (count($configurator->copyBlankFiles) > 0) {
93		- $file = dirname(__DIR__) . '/assets/images/blank.png';
	93	+ $file = dirname(__DIR__).'/assets/images/blank.png';
94	94	foreach (array_keys($configurator->copyBlankFiles) as $i) {
95		- $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
	95	+ $dest = $configurator->copyBlankFiles[$i].'/blank.png';
96	96	$utility::copyFile($file, $dest);
97	97	}
98	98	}
99	99	//delete .html entries from the tpl table
100		- $sql = 'DELETE FROM ' . $xoopsDB->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.html%'";
	100	+ $sql = 'DELETE FROM '.$xoopsDB->prefix('tplfile')." WHERE `tpl_module` = '".$xoopsModule->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.html%'";
101	101	$xoopsDB->queryF($sql);
102	102
103	103	return true;

		@@ -17,146 +17,146 @@
		block discarded – undo
17	17	define('NEWBB_FUNCTIONS_RENDER_LOADED', true);
18	18
19	19	if (!defined('NEWBB_FUNCTIONS_RENDER')) {
20		- define('NEWBB_FUNCTIONS_RENDER', 1);
	20	+ define('NEWBB_FUNCTIONS_RENDER', 1);
21	21
22		- /*
	22	+ /*
23	23	* Sorry, we have to use the stupid solution unless there is an option in MyTextSanitizer:: htmlspecialchars();
24	24	*/
25		- /**
26		- * @param $text
27		- * @return mixed
28		- */
29		- function newbbHtmlspecialchars(&$text)
30		- {
31		- return preg_replace(['/&/i', '/ /i'], ['&', '&nbsp;'], htmlspecialchars($text, ENT_QUOTES \| ENT_HTML5));
32		- }
33		-
34		- /**
35		- * @param $text
36		- * @param int $html
37		- * @param int $smiley
38		- * @param int $xcode
39		- * @param int $image
40		- * @param int $br
41		- * @return mixed
42		- */
43		- function &newbbDisplayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
44		- {
45		- global $myts;
46		-
47		- if (1 !== $html) {
48		- // html not allowed
49		- $text = newbbHtmlspecialchars($text);
50		- }
51		- $text = $myts->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
52		- $text = $myts->makeClickable($text);
53		- if (0 !== $smiley) {
54		- // process smiley
55		- $text = $myts->smiley($text);
56		- }
57		- if (0 !== $xcode) {
58		- // decode xcode
59		- if (0 !== $image) {
60		- // image allowed
61		- $text = $myts->xoopsCodeDecode($text);
62		- } else {
63		- // image not allowed
64		- $text = $myts->xoopsCodeDecode($text, 0);
65		- }
66		- }
67		- if (0 !== $br) {
68		- $text = $myts->nl2Br($text);
69		- }
70		- $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
71		-
72		- return $text;
73		- }
74		-
75		- /**
76		- * @param $document
77		- * @return string
78		- */
79		- function newbbHtml2text($document)
80		- {
81		- $text = strip_tags($document);
82		-
83		- return $text;
84		- }
85		-
86		- /**
87		- * Display forrum button
88		- *
89		- * @param $link
90		- * @param $button
91		- * @param string $alt alt message
92		- * @param boolean $asImage true for image mode; false for text mode
93		- * @param string $extra extra attribute for the button
94		- * @return mixed
95		- * @internal param string $image image/button name, without extension
96		- */
97		- function newbbGetButton($link, $button, $alt = '', $asImage = true, $extra = "class='forum_button'")
98		- {
99		- $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
100		- if (empty($asImage)) {
101		- $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>';
102		- }
103		-
104		- return $button;
105		- }
106		-
107		- /**
108		- * Display forrum images
109		- *
110		- * @param string $image image name, without extension
111		- * @param string $alt alt message
112		- * @param boolean $display true for return image anchor; faulse for assign to $xoopsTpl
113		- * @param string $extra extra attribute for the image
114		- * @return mixed
115		- */
116		- function newbbDisplayImage($image, $alt = '', $display = true, $extra = "class='forum_icon'")
117		- {
118		- $iconHandler = newbbGetIconHandler();
119		- // START hacked by irmtfan
120		- // to show text links instead of buttons - func_num_args()==2 => only when $image, $alt is set and optional $display not set
121		-
122		- if (2 == func_num_args()) {
123		- // overall setting
124		- if (!empty($GLOBALS['xoopsModuleConfig']['display_text_links'])) {
125		- $display = false;
126		- }
127		- // if set for each link => overwrite $display
128		- if (isset($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image])) {
129		- $display = empty($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image]);
130		- }
131		- }
132		- // END hacked by irmtfan
133		- if (empty($display)) {
134		- return $iconHandler->assignImage($image, $alt, $extra);
135		- } else {
136		- return $iconHandler->getImage($image, $alt, $extra);
137		- }
138		- }
139		-
140		- /**
141		- * @return Newbb\IconHandler
142		- */
143		- function newbbGetIconHandler()
144		- {
145		- global $xoTheme;
146		- static $iconHandler;
147		-
148		- if (isset($iconHandler)) {
149		- return $iconHandler;
150		- }
	25	+ /**
	26	+ * @param $text
	27	+ * @return mixed
	28	+ */
	29	+ function newbbHtmlspecialchars(&$text)
	30	+ {
	31	+ return preg_replace(['/&/i', '/ /i'], ['&', '&nbsp;'], htmlspecialchars($text, ENT_QUOTES \| ENT_HTML5));
	32	+ }
	33	+
	34	+ /**
	35	+ * @param $text
	36	+ * @param int $html
	37	+ * @param int $smiley
	38	+ * @param int $xcode
	39	+ * @param int $image
	40	+ * @param int $br
	41	+ * @return mixed
	42	+ */
	43	+ function &newbbDisplayTarea(&$text, $html = 0, $smiley = 1, $xcode = 1, $image = 1, $br = 1)
	44	+ {
	45	+ global $myts;
	46	+
	47	+ if (1 !== $html) {
	48	+ // html not allowed
	49	+ $text = newbbHtmlspecialchars($text);
	50	+ }
	51	+ $text = $myts->codePreConv($text, $xcode); // Ryuji_edit(2003-11-18)
	52	+ $text = $myts->makeClickable($text);
	53	+ if (0 !== $smiley) {
	54	+ // process smiley
	55	+ $text = $myts->smiley($text);
	56	+ }
	57	+ if (0 !== $xcode) {
	58	+ // decode xcode
	59	+ if (0 !== $image) {
	60	+ // image allowed
	61	+ $text = $myts->xoopsCodeDecode($text);
	62	+ } else {
	63	+ // image not allowed
	64	+ $text = $myts->xoopsCodeDecode($text, 0);
	65	+ }
	66	+ }
	67	+ if (0 !== $br) {
	68	+ $text = $myts->nl2Br($text);
	69	+ }
	70	+ $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
	71	+
	72	+ return $text;
	73	+ }
	74	+
	75	+ /**
	76	+ * @param $document
	77	+ * @return string
	78	+ */
	79	+ function newbbHtml2text($document)
	80	+ {
	81	+ $text = strip_tags($document);
	82	+
	83	+ return $text;
	84	+ }
	85	+
	86	+ /**
	87	+ * Display forrum button
	88	+ *
	89	+ * @param $link
	90	+ * @param $button
	91	+ * @param string $alt alt message
	92	+ * @param boolean $asImage true for image mode; false for text mode
	93	+ * @param string $extra extra attribute for the button
	94	+ * @return mixed
	95	+ * @internal param string $image image/button name, without extension
	96	+ */
	97	+ function newbbGetButton($link, $button, $alt = '', $asImage = true, $extra = "class='forum_button'")
	98	+ {
	99	+ $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
	100	+ if (empty($asImage)) {
	101	+ $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>';
	102	+ }
	103	+
	104	+ return $button;
	105	+ }
	106	+
	107	+ /**
	108	+ * Display forrum images
	109	+ *
	110	+ * @param string $image image name, without extension
	111	+ * @param string $alt alt message
	112	+ * @param boolean $display true for return image anchor; faulse for assign to $xoopsTpl
	113	+ * @param string $extra extra attribute for the image
	114	+ * @return mixed
	115	+ */
	116	+ function newbbDisplayImage($image, $alt = '', $display = true, $extra = "class='forum_icon'")
	117	+ {
	118	+ $iconHandler = newbbGetIconHandler();
	119	+ // START hacked by irmtfan
	120	+ // to show text links instead of buttons - func_num_args()==2 => only when $image, $alt is set and optional $display not set
	121	+
	122	+ if (2 == func_num_args()) {
	123	+ // overall setting
	124	+ if (!empty($GLOBALS['xoopsModuleConfig']['display_text_links'])) {
	125	+ $display = false;
	126	+ }
	127	+ // if set for each link => overwrite $display
	128	+ if (isset($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image])) {
	129	+ $display = empty($GLOBALS['xoopsModuleConfig']['display_text_each_link'][$image]);
	130	+ }
	131	+ }
	132	+ // END hacked by irmtfan
	133	+ if (empty($display)) {
	134	+ return $iconHandler->assignImage($image, $alt, $extra);
	135	+ } else {
	136	+ return $iconHandler->getImage($image, $alt, $extra);
	137	+ }
	138	+ }
	139	+
	140	+ /**
	141	+ * @return Newbb\IconHandler
	142	+ */
	143	+ function newbbGetIconHandler()
	144	+ {
	145	+ global $xoTheme;
	146	+ static $iconHandler;
	147	+
	148	+ if (isset($iconHandler)) {
	149	+ return $iconHandler;
	150	+ }
151	151
152	152	// if (!class_exists('IconHandler')) {
153	153	// require_once dirname(__DIR__) . '/class/icon.php';
154	154	// }
155	155
156		- $iconHandler = Newbb\IconHandler::getInstance();
157		- $iconHandler->template = $xoTheme->template;
158		- $iconHandler->init($GLOBALS['xoopsConfig']['language']);
	156	+ $iconHandler = Newbb\IconHandler::getInstance();
	157	+ $iconHandler->template = $xoTheme->template;
	158	+ $iconHandler->init($GLOBALS['xoopsConfig']['language']);
159	159
160		- return $iconHandler;
161		- }
	160	+ return $iconHandler;
	161	+ }
162	162	}

		@@ -13,7 +13,7 @@ discard block
		block discarded – undo
13	13
14	14	// defined('XOOPS_ROOT_PATH') \|\| die('Restricted access');
15	15
16		-defined('NEWBB_FUNCTIONS_INI') \|\| require_once __DIR__ . '/functions.ini.php';
	16	+defined('NEWBB_FUNCTIONS_INI') \|\| require_once __DIR__.'/functions.ini.php';
17	17	define('NEWBB_FUNCTIONS_RENDER_LOADED', true);
18	18
19	19	if (!defined('NEWBB_FUNCTIONS_RENDER')) {
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	if (0 !== $br) {
68	68	$text = $myts->nl2Br($text);
69	69	}
70		- $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
	70	+ $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
71	71
72	72	return $text;
73	73	}
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	{
99	99	$button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
100	100	if (empty($asImage)) {
101		- $button = "<a href='{$link}' title='{$alt}' {$extra}>" . newbbDisplayImage($button, $alt, true) . '</a>';
	101	+ $button = "<a href='{$link}' title='{$alt}' {$extra}>".newbbDisplayImage($button, $alt, true).'</a>';
102	102	}
103	103
104	104	return $button;

		@@ -17,34 +17,34 @@
		block discarded – undo
17	17	define('NEWBB_FUNCTIONS_WELCOME_LOADED', true);
18	18
19	19	if (!defined('NEWBB_FUNCTIONS_WELCOME')) {
20		- define('NEWBB_FUNCTIONS_WELCOME', true);
21		-
22		- /**
23		- * @return bool
24		- */
25		- function newbbWelcome()
26		- {
27		- global $forumObject;
28		- $ret = '';
29		-
30		- $forumId = @$GLOBALS['xoopsModuleConfig']['welcome_forum'];
31		- if (!$forumId) {
32		- return false;
33		- }
34		- /** @var Newbb\ForumHandler $forumHandler */
35		- $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
36		- $forumObject = $forumHandler->get($forumId);
37		- if (!$forumObject \|\| !$forumHandler->getPermission($forumObject)) {
38		- unset($forumObject);
39		-
40		- return false;
41		- }
42		-
43		- require_once __DIR__ . '/functions.welcome.inc.php';
44		- unset($forumObject);
45		-
46		- return $ret;
47		- }
48		-
49		- newbbWelcome();
	20	+ define('NEWBB_FUNCTIONS_WELCOME', true);
	21	+
	22	+ /**
	23	+ * @return bool
	24	+ */
	25	+ function newbbWelcome()
	26	+ {
	27	+ global $forumObject;
	28	+ $ret = '';
	29	+
	30	+ $forumId = @$GLOBALS['xoopsModuleConfig']['welcome_forum'];
	31	+ if (!$forumId) {
	32	+ return false;
	33	+ }
	34	+ /** @var Newbb\ForumHandler $forumHandler */
	35	+ $forumHandler = Newbb\Helper::getInstance()->getHandler('Forum');
	36	+ $forumObject = $forumHandler->get($forumId);
	37	+ if (!$forumObject \|\| !$forumHandler->getPermission($forumObject)) {
	38	+ unset($forumObject);
	39	+
	40	+ return false;
	41	+ }
	42	+
	43	+ require_once __DIR__ . '/functions.welcome.inc.php';
	44	+ unset($forumObject);
	45	+
	46	+ return $ret;
	47	+ }
	48	+
	49	+ newbbWelcome();
50	50	}

		@@ -19,8 +19,8 @@ discard block
		block discarded – undo
19	19
20	20	function xoops_module_pre_uninstall_newbb(\XoopsModule $module)
21	21	{
22		- // Do some synchronization
23		- return true;
	22	+ // Do some synchronization
	23	+ return true;
24	24	}
25	25
26	26	/**
		@@ -32,36 +32,36 @@ discard block
		block discarded – undo
32	32	*/
33	33	function xoops_module_uninstall_newbb(\XoopsModule $module)
34	34	{
35		- // return true;
	35	+ // return true;
36	36
37		- $moduleDirName = basename(dirname(__DIR__));
38		- $moduleDirNameUpper = strtoupper($moduleDirName);
39		- /** @var \XoopsModules\Newbb\Helper $helper */
40		- $helper = \XoopsModules\Newbb\Helper::getInstance();
	37	+ $moduleDirName = basename(dirname(__DIR__));
	38	+ $moduleDirNameUpper = strtoupper($moduleDirName);
	39	+ /** @var \XoopsModules\Newbb\Helper $helper */
	40	+ $helper = \XoopsModules\Newbb\Helper::getInstance();
41	41
42		- /** @var Newbb\Utility $utility */
43		- $utility = new \XoopsModules\Newbb\Utility();
	42	+ /** @var Newbb\Utility $utility */
	43	+ $utility = new \XoopsModules\Newbb\Utility();
44	44
45		- $success = true;
46		- $helper->loadLanguage('admin');
	45	+ $success = true;
	46	+ $helper->loadLanguage('admin');
47	47
48		- //------------------------------------------------------------------
49		- // Remove uploads folder (and all subfolders) if they exist
50		- //------------------------------------------------------------------
	48	+ //------------------------------------------------------------------
	49	+ // Remove uploads folder (and all subfolders) if they exist
	50	+ //------------------------------------------------------------------
51	51
52		- $old_directories = [$GLOBALS['xoops']->path("uploads/{$moduleDirName}")];
53		- foreach ($old_directories as $old_dir) {
54		- $dirInfo = new \SplFileInfo($old_dir);
55		- if ($dirInfo->isDir()) {
56		- // The directory exists so delete it
57		- if (false === $utility::rrmdir($old_dir)) {
58		- $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
59		- $success = false;
60		- }
61		- }
62		- unset($dirInfo);
63		- }
64		- /*
	52	+ $old_directories = [$GLOBALS['xoops']->path("uploads/{$moduleDirName}")];
	53	+ foreach ($old_directories as $old_dir) {
	54	+ $dirInfo = new \SplFileInfo($old_dir);
	55	+ if ($dirInfo->isDir()) {
	56	+ // The directory exists so delete it
	57	+ if (false === $utility::rrmdir($old_dir)) {
	58	+ $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
	59	+ $success = false;
	60	+ }
	61	+ }
	62	+ unset($dirInfo);
	63	+ }
	64	+ /*
65	65	//------------ START ----------------
66	66	//------------------------------------------------------------------
67	67	// Remove xsitemap.xml from XOOPS root folder if it exists
		@@ -75,6 +75,6 @@ discard block
		block discarded – undo
75	75	// return $success && $delOk; // use this if you're using this routine
76	76	*/
77	77
78		- return $success;
79		- //------------ END ----------------
	78	+ return $success;
	79	+ //------------ END ----------------
80	80	}

		@@ -34,8 +34,8 @@ discard block
		block discarded – undo
34	34	{
35	35	// return true;
36	36
37		- $moduleDirName = basename(dirname(__DIR__));
38		- $moduleDirNameUpper = strtoupper($moduleDirName);
	37	+ $moduleDirName = basename(dirname(__DIR__));
	38	+ $moduleDirNameUpper = strtoupper($moduleDirName);
39	39	/** @var \XoopsModules\Newbb\Helper $helper */
40	40	$helper = \XoopsModules\Newbb\Helper::getInstance();
41	41
		@@ -55,7 +55,7 @@ discard block
		block discarded – undo
55	55	if ($dirInfo->isDir()) {
56	56	// The directory exists so delete it
57	57	if (false === $utility::rrmdir($old_dir)) {
58		- $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
	58	+ $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $old_dir));
59	59	$success = false;
60	60	}
61	61	}

		@@ -17,101 +17,101 @@
		block discarded – undo
17	17	define('NEWBB_FUNCTIONS_SESSION_LOADED', true);
18	18
19	19	if (!defined('NEWBB_FUNCTIONS_SESSION')) {
20		- define('NEWBB_FUNCTIONS_SESSION', 1);
	20	+ define('NEWBB_FUNCTIONS_SESSION', 1);
21	21
22		- /*
	22	+ /*
23	23	* Currently the newbb session/cookie handlers are limited to:
24	24	* -- one dimension
25	25	* -- "," and "\|" are preserved
26	26	*
27	27	*/
28		- /**
29		- * @param $name
30		- * @param string\|array $string
31		- */
32		- function newbbSetSession($name, $string = '')
33		- {
34		- if (is_array($string)) {
35		- $value = [];
36		- foreach ($string as $key => $val) {
37		- $value[] = $key . '\|' . $val;
38		- }
39		- $string = implode(',', $value);
40		- }
41		- $_SESSION['newbb_' . $name] = $string;
42		- }
	28	+ /**
	29	+ * @param $name
	30	+ * @param string\|array $string
	31	+ */
	32	+ function newbbSetSession($name, $string = '')
	33	+ {
	34	+ if (is_array($string)) {
	35	+ $value = [];
	36	+ foreach ($string as $key => $val) {
	37	+ $value[] = $key . '\|' . $val;
	38	+ }
	39	+ $string = implode(',', $value);
	40	+ }
	41	+ $_SESSION['newbb_' . $name] = $string;
	42	+ }
43	43
44		- /**
45		- * @param $name
46		- * @param bool $isArray
47		- * @return array\|bool
48		- */
49		- function newbbGetSession($name, $isArray = false)
50		- {
51		- $value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false;
52		- if ($isArray) {
53		- $_value = $value ? explode(',', $value) : [];
54		- $value = [];
55		- if (count($_value) > 0) {
56		- foreach ($_value as $string) {
57		- $key = substr($string, 0, strpos($string, '\|'));
58		- $val = substr($string, strpos($string, '\|') + 1);
59		- $value[$key] = $val;
60		- }
61		- }
62		- unset($_value);
63		- }
	44	+ /**
	45	+ * @param $name
	46	+ * @param bool $isArray
	47	+ * @return array\|bool
	48	+ */
	49	+ function newbbGetSession($name, $isArray = false)
	50	+ {
	51	+ $value = !empty($_SESSION['newbb_' . $name]) ? $_SESSION['newbb_' . $name] : false;
	52	+ if ($isArray) {
	53	+ $_value = $value ? explode(',', $value) : [];
	54	+ $value = [];
	55	+ if (count($_value) > 0) {
	56	+ foreach ($_value as $string) {
	57	+ $key = substr($string, 0, strpos($string, '\|'));
	58	+ $val = substr($string, strpos($string, '\|') + 1);
	59	+ $value[$key] = $val;
	60	+ }
	61	+ }
	62	+ unset($_value);
	63	+ }
64	64
65		- return $value;
66		- }
	65	+ return $value;
	66	+ }
67	67
68		- /**
69		- * @param $name
70		- * @param string\|array $string
71		- * @param int $expire
72		- */
73		- function newbbSetCookie($name, $string = '', $expire = 0)
74		- {
75		- global $forumCookie;
76		- if (is_array($string)) {
77		- $value = [];
78		- foreach ($string as $key => $val) {
79		- $value[] = $key . '\|' . $val;
80		- }
81		- $string = implode(',', $value);
82		- }
83		- setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
84		- }
	68	+ /**
	69	+ * @param $name
	70	+ * @param string\|array $string
	71	+ * @param int $expire
	72	+ */
	73	+ function newbbSetCookie($name, $string = '', $expire = 0)
	74	+ {
	75	+ global $forumCookie;
	76	+ if (is_array($string)) {
	77	+ $value = [];
	78	+ foreach ($string as $key => $val) {
	79	+ $value[] = $key . '\|' . $val;
	80	+ }
	81	+ $string = implode(',', $value);
	82	+ }
	83	+ setcookie($forumCookie['prefix'] . $name, $string, (int)$expire, $forumCookie['path'], $forumCookie['domain'], $forumCookie['secure']);
	84	+ }
85	85
86		- /**
87		- * @param $name
88		- * @param bool $isArray
89		- * @return array\|null
90		- */
91		- function newbbGetCookie($name, $isArray = false)
92		- {
93		- global $forumCookie;
94		- // $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null;
95		- $value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE');
	86	+ /**
	87	+ * @param $name
	88	+ * @param bool $isArray
	89	+ * @return array\|null
	90	+ */
	91	+ function newbbGetCookie($name, $isArray = false)
	92	+ {
	93	+ global $forumCookie;
	94	+ // $value = !empty($_COOKIE[$forumCookie['prefix'] . $name]) ? $_COOKIE[$forumCookie['prefix'] . $name] : null;
	95	+ $value = Request::getString($forumCookie['prefix'] . $name, null, 'COOKIE');
96	96
97		- if ($isArray) {
98		- $_value = $value ? explode(',', $value) : [];
99		- $value = [];
100		- if (count($_value) > 0) {
101		- foreach ($_value as $string) {
102		- $sep = strpos($string, '\|');
103		- if (false === $sep) {
104		- $value[] = $string;
105		- } else {
106		- $key = substr($string, 0, $sep);
107		- $val = substr($string, $sep + 1);
108		- $value[$key] = $val;
109		- }
110		- }
111		- }
112		- unset($_value);
113		- }
	97	+ if ($isArray) {
	98	+ $_value = $value ? explode(',', $value) : [];
	99	+ $value = [];
	100	+ if (count($_value) > 0) {
	101	+ foreach ($_value as $string) {
	102	+ $sep = strpos($string, '\|');
	103	+ if (false === $sep) {
	104	+ $value[] = $string;
	105	+ } else {
	106	+ $key = substr($string, 0, $sep);
	107	+ $val = substr($string, $sep + 1);
	108	+ $value[$key] = $val;
	109	+ }
	110	+ }
	111	+ }
	112	+ unset($_value);
	113	+ }
114	114
115		- return $value;
116		- }
	115	+ return $value;
	116	+ }
117	117	}

mambax7 / newbb5

Branch — master (565d4a)

Status

Category

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +63 added lines, -63 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

Indentation +163 added lines, -163 removed lines patch added patch discarded remove patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

Indentation +225 added lines, -225 removed lines patch added patch discarded remove patch

Indentation +28 added lines, -28 removed lines patch added patch discarded remove patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

Indentation +52 added lines, -52 removed lines patch added patch discarded remove patch

Spacing +13 added lines, -13 removed lines patch added patch discarded remove patch

Indentation +133 added lines, -133 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +30 added lines, -30 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +29 added lines, -29 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +85 added lines, -85 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch