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

Passed

Push — master ( 4990f6...882d2a )

by Michael

created 2018-03-20 07:04 UTC

Status

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

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

Please login to merge, or discard this patch.

admin/admin_permissions.php 1 patch

Spacing +34 added lines, -34 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');
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
         foreach (array_keys($glist) as $i) {
             // get selected item id(s) for each group
             $selected = $gpermHandler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele      = new NewbbXoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+            $ele      = new NewbbXoopsGroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
             $ele->setOptionTree($this->_itemTree);
             $this->addElement($ele);
             unset($ele);
@@ -108,19 +108,19 @@  discard block
 block discarded – undo
         $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
         $this->addElement($tray);
-        $ret      = '<br><strong>' . $this->getTitle() . '</strong><br>' . $this->_permDesc . '<br>';
-        $ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
+        $ret      = '<br><strong>'.$this->getTitle().'</strong><br>'.$this->_permDesc.'<br>';
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
         $elements = $this->getElements();
         $hidden   = '';
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
             } elseif (!$elements[$i]->isHidden()) {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
+                $ret .= "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption();
                 if ('' !== $elements[$i]->getDescription()) {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+                    $ret .= '<br><br><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
                 }
-                $ret .= "</td>\n<td class='even' style='text-align:center;'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+                $ret .= "</td>\n<td class='even' style='text-align:center;'>\n".$elements[$i]->render()."\n</td></tr>\n";
             } else {
                 $hidden .= $elements[$i]->render();
             }
@@ -157,17 +157,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)) {
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
                      . htmlspecialchars($option['name'])
                      . "\" /><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) {
@@ -197,7 +197,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);
             }
         }
     }
@@ -214,7 +214,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()"');
@@ -233,7 +233,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;
@@ -243,13 +243,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;
@@ -258,7 +258,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;">';
@@ -266,7 +266,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':
@@ -287,7 +287,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()"');
@@ -310,9 +310,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);
@@ -327,7 +327,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':
@@ -365,7 +365,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()"');
@@ -388,10 +388,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
             ];
@@ -432,10 +432,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);
                     }
                 }
             }
@@ -443,7 +443,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
@@ -452,6 +452,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.

admin/admin_votedata.php 1 patch

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

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

Please login to merge, or discard this patch.

admin/about.php 1 patch

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

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

Please login to merge, or discard this patch.

admin/admin_digest.php 1 patch

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

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

Please login to merge, or discard this patch.

admin/admin_forum_reorder.php 1 patch

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

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

Please login to merge, or discard this patch.

admin/admin_groupmod.php 1 patch

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

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

Please login to merge, or discard this patch.

admin/migrate.php 1 patch

Spacing +3 added lines, -3 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';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
         if (!empty($queue)) {
             echo "<pre>\n";
             foreach ($queue as $line) {
-                echo $line . ";\n";
+                echo $line.";\n";
             }
             echo "</pre>\n";
         }
@@ -92,4 +92,4 @@  discard block
 block discarded – undo
 
 echo "<div>$message</div>";
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Please login to merge, or discard this patch.

admin/index.php 1 patch

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

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

Please login to merge, or discard this patch.

		@@ -31,7 +31,7 @@ discard block
		block discarded – undo
31	31
32	32	use Xmf\Request;
33	33
34		-require_once __DIR__ . '/admin_header.php';
	34	+require_once __DIR__.'/admin_header.php';
35	35	require_once $GLOBALS['xoops']->path('class/pagenav.php');
36	36
37	37	$op = Request::getCmd('op', 'default');
		@@ -52,7 +52,7 @@ discard block
		block discarded – undo
52	52	// $report_ids = Request::getInt('report_id', 0, 'POST'); //$_POST['report_id'];
53	53	// irmtfan add error redirect header
54	54	if (0 === count($report_ids)) {
55		- redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
	55	+ redirect_header("admin_report.php?item={$item}".(empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
56	56	}
57	57	$report_memos = Request::getArray('report_memo', [], 'POST'); // isset($_POST['report_memo']) ? $_POST['report_memo'] : array();
58	58	foreach ($report_ids as $rid => $value) {
		@@ -65,15 +65,15 @@ discard block
		block discarded – undo
65	65	$reportHandler->insert($reportObject);
66	66	}
67	67	// irmtfan add message
68		- redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTSAVE);
	68	+ redirect_header("admin_report.php?item={$item}".(empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTSAVE);
69	69
70	70	break;
71	71
72	72	case 'delete':
73		- $report_ids = Request::getArray('report_id', [], 'POST');// $_POST['report_id'];
	73	+ $report_ids = Request::getArray('report_id', [], 'POST'); // $_POST['report_id'];
74	74	// irmtfan add error redirect header
75	75	if (0 === count($report_ids)) {
76		- redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
	76	+ redirect_header("admin_report.php?item={$item}".(empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTNOTSELECT);
77	77	}
78	78	foreach ($report_ids as $rid => $value) {
79	79	if (!$value) {
		@@ -84,14 +84,14 @@ discard block
		block discarded – undo
84	84	}
85	85	}
86	86	// irmtfan add message
87		- redirect_header("admin_report.php?item={$item}" . (empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTDELETE);
	87	+ redirect_header("admin_report.php?item={$item}".(empty($start) ? '' : "&start={$start}"), 1, _AM_NEWBB_REPORTDELETE);
88	88
89	89	break;
90	90
91	91	case 'default':
92	92	default:
93	93	require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
94		- require_once __DIR__ . '/../include/functions.user.php';
	94	+ require_once __DIR__.'/../include/functions.user.php';
95	95
96	96	if ('processed' !== $item) {
97	97	$process_result = 0;
		@@ -114,12 +114,12 @@ discard block
		block discarded – undo
114	114	$adminObject->addItemButton($title_other, $item_other, $icon = 'add');
115	115	$adminObject->displayButton('left');
116	116	echo _AM_NEWBB_REPORTADMIN_HELP;
117		- echo "<table width='100%' border='0' cellspacing='1' class='outer'>" . "<tr><td class='odd'>";
118		- echo '<form action="' . xoops_getenv('PHP_SELF') . '" method="post">';
	117	+ echo "<table width='100%' border='0' cellspacing='1' class='outer'>"."<tr><td class='odd'>";
	118	+ echo '<form action="'.xoops_getenv('PHP_SELF').'" method="post">';
119	119	echo "<table border='0' cellpadding='4' cellspacing='1' width='100%' class='outer'>";
120	120	echo "<tr align='center'>";
121		- echo "<th class='bg3' width='80%'>" . _AM_NEWBB_REPORTTITLE . '</th>';
122		- echo "<th class='bg3' width='10%'>" . $extra . '</th>';
	121	+ echo "<th class='bg3' width='80%'>"._AM_NEWBB_REPORTTITLE.'</th>';
	122	+ echo "<th class='bg3' width='10%'>".$extra.'</th>';
123	123	echo '</tr>';
124	124
125	125	$reports = $reportHandler->getAllReports('report_id', 'ASC', $limit, $start, $process_result);
		@@ -137,52 +137,52 @@ discard block
		block discarded – undo
137	137	. '&viewmode=thread" target="checkreport">'
138	138	. $myts->htmlSpecialChars($report['subject'])
139	139	. '</a>';
140		- $checkbox = '<input type="checkbox" name="report_id[' . $report['report_id'] . ']" value="1" checked />';
	140	+ $checkbox = '<input type="checkbox" name="report_id['.$report['report_id'].']" value="1" checked />';
141	141	if ('processed' !== $item) {
142		- $memo = '<input type="text" name="report_memo[' . $report['report_id'] . ']" maxlength="255" size="80" />';
	142	+ $memo = '<input type="text" name="report_memo['.$report['report_id'].']" maxlength="255" size="80" />';
143	143	} else {
144	144	$memo = $myts->htmlSpecialChars($report['report_memo']);
145	145	}
146	146	echo "<tr class='odd' align='left'>";
147		- echo '<td>' . _AM_NEWBB_REPORTPOST . ': ' . $post_link . '</td>';
148		- echo "<td align='center'>" . $report['report_id'] . '</td>';
	147	+ echo '<td>'._AM_NEWBB_REPORTPOST.': '.$post_link.'</td>';
	148	+ echo "<td align='center'>".$report['report_id'].'</td>';
149	149	echo '</tr>';
150	150	echo "<tr class='odd' align='left'>";
151		- echo '<td>' . _AM_NEWBB_REPORTTEXT . ': ' . $myts->htmlSpecialChars($report['report_text']) . '</td>';
	151	+ echo '<td>'._AM_NEWBB_REPORTTEXT.': '.$myts->htmlSpecialChars($report['report_text']).'</td>';
152	152	$uid = (int)$report['reporter_uid'];
153	153	$reporter_name = newbbGetUnameFromId($uid, $GLOBALS['xoopsModuleConfig']['show_realname']);
154		- $reporter = !empty($uid) ? "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $uid . "'>" . $reporter_name . '</a><br>' : '';
155		- echo "<td align='center'>" . $reporter . $report['reporter_ip'] . '</td>';
	154	+ $reporter = !empty($uid) ? "<a href='".XOOPS_URL.'/userinfo.php?uid='.$uid."'>".$reporter_name.'</a><br>' : '';
	155	+ echo "<td align='center'>".$reporter.$report['reporter_ip'].'</td>';
156	156	echo '</tr>';
157	157	echo "<tr class='odd' align='left'>";
158		- echo '<td>' . _AM_NEWBB_REPORTMEMO . ': ' . $memo . '</td>';
159		- echo "<td align='center' >" . $checkbox . '</td>';
	158	+ echo '<td>'._AM_NEWBB_REPORTMEMO.': '.$memo.'</td>';
	159	+ echo "<td align='center' >".$checkbox.'</td>';
160	160	echo '</tr>';
161	161	echo "<tr colspan='2'><td height='2'></td></tr>";
162	162	}
163	163	$buttons = '';
164	164	if ('processed' !== $item) {
165		- $submit = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
166		- $buttons .= $submit->render() . ' ';
	165	+ $submit = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
	166	+ $buttons .= $submit->render().' ';
167	167	}
168	168	$delete = new \XoopsFormButton('', 'delete', _DELETE, 'submit');
169		- $buttons .= $delete->render() . ' ';
	169	+ $buttons .= $delete->render().' ';
170	170	$cancel = new \XoopsFormButton('', 'cancel', _CANCEL, 'reset');
171	171	$buttons .= $cancel->render();
172	172	echo "<tr colspan='2'><td align='center'>{$buttons}</td></tr>";
173	173	$hidden = new \XoopsFormHidden('start', $start);
174	174	echo $hidden->render();
175	175	$hidden = new \XoopsFormHidden('item', $item);
176		- echo $hidden->render() . '</form>';
	176	+ echo $hidden->render().'</form>';
177	177
178	178	echo '</table>';
179	179	echo '</td></tr></table>';
180		- $nav = new \XoopsPageNav($reportHandler->getCount(new \Criteria('report_result', $process_result)), $limit, $start, 'start', 'item=' . $item);
	180	+ $nav = new \XoopsPageNav($reportHandler->getCount(new \Criteria('report_result', $process_result)), $limit, $start, 'start', 'item='.$item);
181	181	echo $nav->renderNav(4);
182	182	echo '<fieldset>';
183		- echo '<legend> ' . _MI_NEWBB_ADMENU_REPORT . ' </legend>';
	183	+ echo '<legend> '._MI_NEWBB_ADMENU_REPORT.' </legend>';
184	184	echo _AM_NEWBB_HELP_REPORT_TAB;
185	185	echo '</fieldset>';
186	186	break;
187	187	}
188		-require_once __DIR__ . '/admin_footer.php';
	188	+require_once __DIR__.'/admin_footer.php';

		@@ -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');
		@@ -99,7 +99,7 @@ discard block
		block discarded – undo
99	99	foreach (array_keys($glist) as $i) {
100	100	// get selected item id(s) for each group
101	101	$selected = $gpermHandler->getItemIds($this->_permName, $i, $this->_modid);
102		- $ele = new NewbbXoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
	102	+ $ele = new NewbbXoopsGroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
103	103	$ele->setOptionTree($this->_itemTree);
104	104	$this->addElement($ele);
105	105	unset($ele);
		@@ -108,19 +108,19 @@ discard block
		block discarded – undo
108	108	$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
109	109	$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
110	110	$this->addElement($tray);
111		- $ret = '<br><strong>' . $this->getTitle() . '</strong><br>' . $this->_permDesc . '<br>';
112		- $ret .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
	111	+ $ret = '<br><strong>'.$this->getTitle().'</strong><br>'.$this->_permDesc.'<br>';
	112	+ $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1' valign='top'>\n";
113	113	$elements = $this->getElements();
114	114	$hidden = '';
115	115	foreach (array_keys($elements) as $i) {
116	116	if (!is_object($elements[$i])) {
117	117	$ret .= $elements[$i];
118	118	} elseif (!$elements[$i]->isHidden()) {
119		- $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
	119	+ $ret .= "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption();
120	120	if ('' !== $elements[$i]->getDescription()) {
121		- $ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
	121	+ $ret .= '<br><br><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
122	122	}
123		- $ret .= "</td>\n<td class='even' style='text-align:center;'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
	123	+ $ret .= "</td>\n<td class='even' style='text-align:center;'>\n".$elements[$i]->render()."\n</td></tr>\n";
124	124	} else {
125	125	$hidden .= $elements[$i]->render();
126	126	}
		@@ -157,17 +157,17 @@ discard block
		block discarded – undo
157	157	public function _renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
158	158	{
159	159	if ($option['id'] > 0) {
160		- $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
	160	+ $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
161	161	foreach ($parentIds as $pid) {
162	162	if ($pid <= 0) {
163	163	continue;
164	164	}
165		- $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
166		- $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
	165	+ $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
	166	+ $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if (ele.checked !== true) {ele.checked = this.checked;}";
167	167	}
168	168	foreach ($option['allchild'] as $cid) {
169		- $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
170		- $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
	169	+ $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
	170	+ $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if (this.checked !== true) {ele.checked = false;}";
171	171	}
172	172	$tree .= '" value="1"';
173	173	if (in_array($option['id'], $this->_value)) {
		@@ -189,7 +189,7 @@ discard block
		block discarded – undo
189	189	. htmlspecialchars($option['name'])
190	190	. "\" /><br>\n";
191	191	} else {
192		- $tree .= $prefix . $option['name'] . '<input type="hidden" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" /><br>\n";
	192	+ $tree .= $prefix.$option['name'].'<input type="hidden" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" /><br>\n";
193	193	}
194	194	if (isset($option['children'])) {
195	195	foreach ($option['children'] as $child) {
		@@ -197,7 +197,7 @@ discard block
		block discarded – undo
197	197	// array_push($parentIds, $option['id']);
198	198	$parentIds[] = $option['id'];
199	199	}
200		- $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix . ' -', $parentIds);
	200	+ $this->_renderOptionTree($tree, $this->_optionTree[$child], $prefix.' -', $parentIds);
201	201	}
202	202	}
203	203	}
		@@ -214,7 +214,7 @@ discard block
		block discarded – undo
214	214	case 'template':
215	215	xoops_cp_header();
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_TEMPLAT, 'actionform', 'admin_permissions.php', 'get');
219	219	$op_select = new \XoopsFormSelect('', 'action');
220	220	$op_select->setExtra('onchange="document.forms.actionform.submit()"');
		@@ -233,7 +233,7 @@ discard block
		block discarded – undo
233	233	$perm_template = $newbbpermHandler->getTemplate();
234	234	foreach (array_keys($glist) as $i) {
235	235	$selected = !empty($perm_template[$i]) ? array_keys($perm_template[$i]) : [];
236		- $ret_ele = '<tr align="left" valign="top"><td class="head">' . $glist[$i] . '</td>';
	236	+ $ret_ele = '<tr align="left" valign="top"><td class="head">'.$glist[$i].'</td>';
237	237	$ret_ele .= '<td class="even">';
238	238	$ret_ele .= '<table class="outer"><tr><td class="odd"><table><tr>';
239	239	$ii = 0;
		@@ -243,13 +243,13 @@ discard block
		block discarded – undo
243	243	if (0 == $ii % 5) {
244	244	$ret_ele .= '</tr><tr>';
245	245	}
246		- $checked = in_array('forum_' . $perm, $selected) ? ' checked' : '';
247		- $option_id = $perm . '_' . $i;
	246	+ $checked = in_array('forum_'.$perm, $selected) ? ' checked' : '';
	247	+ $option_id = $perm.'_'.$i;
248	248	$option_ids[] = $option_id;
249		- $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>';
	249	+ $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>';
250	250	}
251	251	$ret_ele .= '</tr></table></td><td class="even">';
252		- $ret_ele .= _ALL . ' <input id="checkall[' . $i . ']" type="checkbox" value="" onclick="var optionids = new Array(' . implode(', ', $option_ids) . '); xoopsCheckAllElements(optionids, \'checkall[' . $i . ']\')" />';
	252	+ $ret_ele .= _ALL.' <input id="checkall['.$i.']" type="checkbox" value="" onclick="var optionids = new Array('.implode(', ', $option_ids).'); xoopsCheckAllElements(optionids, \'checkall['.$i.']\')" />';
253	253	$ret_ele .= '</td></tr></table>';
254	254	$ret_ele .= '</td></tr>';
255	255	$elements[] = $ret_ele;
		@@ -258,7 +258,7 @@ discard block
		block discarded – undo
258	258	$tray->addElement(new \XoopsFormHidden('action', 'template_save'));
259	259	$tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
260	260	$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
261		- $ret = '<br><strong>' . _AM_NEWBB_PERM_TEMPLATE . '</strong><br>' . _AM_NEWBB_PERM_TEMPLATE_DESC . '<br>';
	261	+ $ret = '<br><strong>'._AM_NEWBB_PERM_TEMPLATE.'</strong><br>'._AM_NEWBB_PERM_TEMPLATE_DESC.'<br>';
262	262	$ret .= "<form name='template' id='template' method='post'>\n<table width='100%' class='outer' cellspacing='1'>\n";
263	263	$ret .= implode("\n", $elements);
264	264	$ret .= '<tr align="left" valign="top"><td class="head"></td><td class="even" style="text-align:center;">';
		@@ -266,7 +266,7 @@ discard block
		block discarded – undo
266	266	$ret .= '</td></tr>';
267	267	$ret .= '</table></form>';
268	268	echo $ret;
269		- require_once __DIR__ . '/admin_footer.php';
	269	+ require_once __DIR__.'/admin_footer.php';
270	270	break;
271	271
272	272	case 'template_save':
		@@ -287,7 +287,7 @@ discard block
		block discarded – undo
287	287	}
288	288	xoops_cp_header();
289	289	$adminObject->displayNavigation(basename(__FILE__));
290		- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
	290	+ echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
291	291	$opform = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP_APPLY, 'actionform', 'admin_permissions.php', 'get');
292	292	$op_select = new \XoopsFormSelect('', 'action');
293	293	$op_select->setExtra('onchange="document.forms.actionform.submit()"');
		@@ -310,9 +310,9 @@ discard block
		block discarded – undo
310	310	$forums = $forumHandler->getTree(array_keys($categories), 0, 'all');
311	311	foreach (array_keys($forums) as $c) {
312	312	$fm_options[-1 * $c - 1000] = ' ';
313		- $fm_options[-1 * $c] = '[' . $categories[$c] . ']';
	313	+ $fm_options[-1 * $c] = '['.$categories[$c].']';
314	314	foreach (array_keys($forums[$c]) as $f) {
315		- $fm_options[$f] = $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'];
	315	+ $fm_options[$f] = $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'];
316	316	}
317	317	}
318	318	unset($forums, $categories);
		@@ -327,7 +327,7 @@ discard block
		block discarded – undo
327	327	$tray->addElement(new \XoopsFormButton('', 'reset', _CANCEL, 'reset'));
328	328	$fmform->addElement($tray);
329	329	$fmform->display();
330		- require_once __DIR__ . '/admin_footer.php';
	330	+ require_once __DIR__.'/admin_footer.php';
331	331	break;
332	332
333	333	case 'apply_save':
		@@ -365,7 +365,7 @@ discard block
		block discarded – undo
365	365	}
366	366
367	367	$adminObject->displayNavigation(basename(__FILE__));
368		- echo "<legend style='font-weight: bold; color: #900;'>" . _AM_NEWBB_PERM_ACTION . '</legend>';
	368	+ echo "<legend style='font-weight: bold; color: #900;'>"._AM_NEWBB_PERM_ACTION.'</legend>';
369	369	$opform = new \XoopsSimpleForm(_AM_NEWBB_PERM_ACTION_HELP, 'actionform', 'admin_permissions.php', 'get');
370	370	$op_select = new \XoopsFormSelect('', 'action');
371	371	$op_select->setExtra('onchange="document.forms.actionform.submit()"');
		@@ -388,10 +388,10 @@ discard block
		block discarded – undo
388	388	]
389	389	];
390	390	foreach ($perms as $perm) {
391		- $op_options[$perm] = constant('_AM_NEWBB_CAN_' . strtoupper($perm));
	391	+ $op_options[$perm] = constant('_AM_NEWBB_CAN_'.strtoupper($perm));
392	392	$fm_options[$perm] = [
393		- 'title' => constant('_AM_NEWBB_CAN_' . strtoupper($perm)),
394		- 'item' => 'forum_' . $perm,
	393	+ 'title' => constant('_AM_NEWBB_CAN_'.strtoupper($perm)),
	394	+ 'item' => 'forum_'.$perm,
395	395	'desc' => '',
396	396	'anonymous' => true
397	397	];
		@@ -432,10 +432,10 @@ discard block
		block discarded – undo
432	432	if (count($forums) > 0) {
433	433	foreach (array_keys($forums) as $c) {
434	434	$key_c = -1 * $c;
435		- $form->addItem($key_c, '<strong>[' . $categories[$c] . ']</strong>');
	435	+ $form->addItem($key_c, '<strong>['.$categories[$c].']</strong>');
436	436	foreach (array_keys($forums[$c]) as $f) {
437	437	$pid = $forums[$c][$f]['parent_forum'] ?: $key_c;
438		- $form->addItem($f, $forums[$c][$f]['prefix'] . $forums[$c][$f]['forum_name'], $pid);
	438	+ $form->addItem($f, $forums[$c][$f]['prefix'].$forums[$c][$f]['forum_name'], $pid);
439	439	}
440	440	}
441	441	}
		@@ -443,7 +443,7 @@ discard block
		block discarded – undo
443	443	}
444	444	$form->display();
445	445	echo '<fieldset>';
446		- echo '<legend> ' . _MI_NEWBB_ADMENU_PERMISSION . ' </legend>';
	446	+ echo '<legend> '._MI_NEWBB_ADMENU_PERMISSION.' </legend>';
447	447	echo _AM_NEWBB_HELP_PERMISSION_TAB;
448	448	echo '</fieldset>';
449	449	// Since we can not control the permission update, a trick is used here
		@@ -452,6 +452,6 @@ discard block
		block discarded – undo
452	452	$permissionHandler->createPermData();
453	453	$cacheHelper = Newbb\Utility::cleanCache();
454	454	//$cacheHelper->delete('permission');
455		- require_once __DIR__ . '/admin_footer.php';
	455	+ require_once __DIR__.'/admin_footer.php';
456	456	break;
457	457	}

		@@ -29,11 +29,11 @@
		block discarded – undo
29	29	// Project: XOOPS Project //
30	30	// ------------------------------------------------------------------------- //
31	31
32		-require_once __DIR__ . '/admin_header.php';
	32	+require_once __DIR__.'/admin_header.php';
33	33	xoops_cp_header();
34	34
35	35	$adminObject->displayNavigation(basename(__FILE__));
36	36	\Xmf\Module\Admin::setPaypal('PBQZ7D6LT6UBC');
37	37	$adminObject->displayAbout(false);
38	38
39		-require_once __DIR__ . '/admin_footer.php';
	39	+require_once __DIR__.'/admin_footer.php';

		@@ -31,12 +31,12 @@ discard block
		block discarded – undo
31	31
32	32	use XoopsModules\Newbb;
33	33
34		-require_once __DIR__ . '/admin_header.php';
	34	+require_once __DIR__.'/admin_header.php';
35	35	//require_once __DIR__ . '/../class/Utility.php';
36		-require_once __DIR__ . '/../include/functions.stats.php';
	36	+require_once __DIR__.'/../include/functions.stats.php';
37	37
38		-$attach_path = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'] . '/');
39		-$thumb_path = $attach_path . 'thumbs/';
	38	+$attach_path = $GLOBALS['xoops']->path($GLOBALS['xoopsModuleConfig']['dir_attachments'].'/');
	39	+$thumb_path = $attach_path.'thumbs/';
40	40	$folder = [$attach_path, $thumb_path];
41	41
42	42	/** @var Xmf\Module\Admin $adminObject */
		@@ -75,8 +75,8 @@ discard block
		block discarded – undo
75	75	$imageLibs = [];
76	76	unset($output, $status);
77	77	if (1 == $GLOBALS['xoopsModuleConfig']['image_lib'] \|\| 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
78		- $path = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'] . '/';
79		- @exec($path . 'convert -version', $output, $status);
	78	+ $path = empty($GLOBALS['xoopsModuleConfig']['path_magick']) ? '' : $GLOBALS['xoopsModuleConfig']['path_magick'].'/';
	79	+ @exec($path.'convert -version', $output, $status);
80	80	if (empty($status) && !empty($output) && preg_match("/imagemagick[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
81	81	$imageLibs['imagemagick'] = $matches[0];
82	82	}
		@@ -84,8 +84,8 @@ discard block
		block discarded – undo
84	84	unset($output, $status);
85	85	}
86	86	if (2 == $GLOBALS['xoopsModuleConfig']['image_lib'] \|\| 0 == $GLOBALS['xoopsModuleConfig']['image_lib']) {
87		- $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'] . '/';
88		- @exec($path . 'jpegtopnm -version 2>&1', $output, $status);
	87	+ $path = empty($GLOBALS['xoopsModuleConfig']['path_netpbm']) ? '' : $GLOBALS['xoopsModuleConfig']['path_netpbm'].'/';
	88	+ @exec($path.'jpegtopnm -version 2>&1', $output, $status);
89	89	if (empty($status) && !empty($output) && preg_match("/netpbm[ \t]+([0-9\.]+)/i", $output[0], $matches)) {
90	90	$imageLibs['netpbm'] = $matches[0];
91	91	}
		@@ -127,30 +127,30 @@ discard block
		block discarded – undo
127	127	$adminObject->addInfoBox(_AM_NEWBB_PREFERENCES);
128	128	// START irmtfan better poll module display link and version - check if xoops poll module is available
129	129	if ($isOK) {
130		- $pollLink = _AM_NEWBB_AVAILABLE . ': ';
131		- $pollLink .= '<a href="' . XOOPS_URL . '/modules/' . $xoopspoll->getVar('dirname') . '/admin/index.php"';
132		- $pollLink .= ' alt="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
133		- $pollLink .= ' title="' . $xoopspoll->getVar('name') . ' ' . _VERSION . ' (' . $xoopspoll->getInfo('version') . ') "';
134		- $pollLink .= '>' . '(' . $xoopspoll->getVar('name') . ')</a>';
	130	+ $pollLink = _AM_NEWBB_AVAILABLE.': ';
	131	+ $pollLink .= '<a href="'.XOOPS_URL.'/modules/'.$xoopspoll->getVar('dirname').'/admin/index.php"';
	132	+ $pollLink .= ' alt="'.$xoopspoll->getVar('name').' '._VERSION.' ('.$xoopspoll->getInfo('version').') "';
	133	+ $pollLink .= ' title="'.$xoopspoll->getVar('name').' '._VERSION.' ('.$xoopspoll->getInfo('version').') "';
	134	+ $pollLink .= '>'.'('.$xoopspoll->getVar('name').')</a>';
135	135	} else {
136	136	$pollLink = _AM_NEWBB_NOTAVAILABLE;
137	137	}
138		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_POLLMODULE . ': %s', $pollLink));
	138	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_POLLMODULE.': %s', $pollLink));
139	139	// END irmtfan better poll module display link and version - check if xoops poll module is available
140		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_IMAGEMAGICK . ' %s', array_key_exists('imagemagick', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['imagemagick'] : _AM_NEWBB_NOTAVAILABLE));
141		-$adminObject->addInfoBoxLine(sprintf('NetPBM' . ': %s', array_key_exists('netpbm', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['netpbm'] : _AM_NEWBB_NOTAVAILABLE));
142		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_GDLIB . ' %s', array_key_exists('gd', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['gd'] : _AM_NEWBB_NOTAVAILABLE));
143		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_UPLOAD . ' %s', $uploadlimit));
144		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_INDEX_PDF_PAGE . '', ''));
	140	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_IMAGEMAGICK.' %s', array_key_exists('imagemagick', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['imagemagick'] : _AM_NEWBB_NOTAVAILABLE));
	141	+$adminObject->addInfoBoxLine(sprintf('NetPBM'.': %s', array_key_exists('netpbm', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['netpbm'] : _AM_NEWBB_NOTAVAILABLE));
	142	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_GDLIB.' %s', array_key_exists('gd', $imageLibs) ? _AM_NEWBB_AUTODETECTED . $imageLibs['gd'] : _AM_NEWBB_NOTAVAILABLE));
	143	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_UPLOAD.' %s', $uploadlimit));
	144	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_INDEX_PDF_PAGE.'', ''));
145	145
146	146	$adminObject->addInfoBox(_AM_NEWBB_BOARDSUMMARY);
147		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALTOPICS . ': %s', getTotalTopics()));
148		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALPOSTS . ': %s', getTotalPosts()));
149		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALVIEWS . ': %s', getTotalViews()));
	147	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALTOPICS.': %s', getTotalTopics()));
	148	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALPOSTS.': %s', getTotalPosts()));
	149	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_TOTALVIEWS.': %s', getTotalViews()));
150	150
151	151	$adminObject->addInfoBox(_AM_NEWBB_REPORT);
152		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PENDING . ': %s', $reportHandler->getCount(new \Criteria('report_result', 0))));
153		-$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PROCESSED . ': %s', $reportHandler->getCount(new \Criteria('report_result', 1))));
	152	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PENDING.': %s', $reportHandler->getCount(new \Criteria('report_result', 0))));
	153	+$adminObject->addInfoBoxLine(sprintf(_AM_NEWBB_REPORT_PROCESSED.': %s', $reportHandler->getCount(new \Criteria('report_result', 1))));
154	154
155	155	foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
156	156	Newbb\Utility::prepareFolder($uploadFolders[$i]);
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	$adminObject->displayNavigation(basename(__FILE__));
161	161	$adminObject->displayIndex();
162	162
163		-require_once __DIR__ . '/admin_footer.php';
	163	+require_once __DIR__.'/admin_footer.php';
164	164
165	165	$cacheHelper = Newbb\Utility::cleanCache();
166	166	//$cacheHelper = new \Xmf\Module\Helper\Cache('newbb');
		@@ -192,6 +192,6 @@ discard block
		block discarded – undo
192	192	$base = log($sizeAsString) / log(1024);
193	193	$suffix = ['', 'KB', 'MB', 'GB', 'TB'];
194	194
195		- return round(pow(1024, $base - floor($base))) . ' ' . $suffix[(int)floor($base)];
	195	+ return round(pow(1024, $base - floor($base))).' '.$suffix[(int)floor($base)];
196	196	}
197	197	}

mambax7 / newbb5

Push — master ( 4990f6...882d2a )

Status

Category

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

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

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

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

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

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

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

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

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