mambax7 / newbb5

include/functions.user.php

Indentation +12 added lines, -12 removed lines

@@ -184,18 +184,18 @@
     $mid = $xoopsModule->getVar('mid');
 
     $sql = 'SELECT COUNT(l.groupid) AS count, l.uid FROM '
-           . $xoopsMembershipTable
-           . ' AS l'
-           . ' LEFT JOIN '
-           . $xoopsGroupPermTable
-           . ' AS p ON p.gperm_groupid=l.groupid'
-           . ' WHERE l.uid IN ('
-           . implode(', ', array_map('intval', $uid))
-           . ')'
-           . "    AND p.gperm_modid = '1' AND p.gperm_name = 'module_admin' AND p.gperm_itemid = '"
-           . (int)$mid
-           . "'"
-           . ' GROUP BY l.uid';
+            . $xoopsMembershipTable
+            . ' AS l'
+            . ' LEFT JOIN '
+            . $xoopsGroupPermTable
+            . ' AS p ON p.gperm_groupid=l.groupid'
+            . ' WHERE l.uid IN ('
+            . implode(', ', array_map('intval', $uid))
+            . ')'
+            . "    AND p.gperm_modid = '1' AND p.gperm_name = 'module_admin' AND p.gperm_itemid = '"
+            . (int)$mid
+            . "'"
+            . ' GROUP BY l.uid';
 
     if ($result = $GLOBALS['xoopsDB']->query($sql)) {
         while (false !== ($myrow = $GLOBALS['xoopsDB']->fetchArray($result))) {

topicmanager.php

Indentation +61 added lines, -61 removed lines

@@ -148,23 +148,23 @@ 
         $restoretopic_id = $topicObject->getVar('topic_id');
         // irmtfan / missing in URL
         echo $action[$mode]['msg']
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$restoretopic_id'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNTOTHEFORUM
-             . '</a></p>'
-             . "<p><a href='index.php'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewtopic.php?topic_id=$restoretopic_id'>"
+                . _MD_NEWBB_VIEWTHETOPIC
+                . '</a></p>'
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewforum.php?forum=$forum'>"
+                . _MD_NEWBB_RETURNTOTHEFORUM
+                . '</a></p>'
+                . "<p><a href='index.php'>"
+                . _MD_NEWBB_RETURNFORUMINDEX
+                . '</a></p>';
     } elseif ('merge' === $mode) {
         //        /** @var PostHandler $postHandler */
         //        $postHandler = Newbb\Helper::getInstance()->getHandler('Post');
@@ -222,28 +222,28 @@ 
             // END irmtfan poll_module and rewrite the method
         }
         echo $action[$mode]['msg']
-             . // irmtfan full URL
-             "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$newtopic'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNTOTHEFORUM
-             . '</a></p>'
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/index.php'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
+                . // irmtfan full URL
+                "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewtopic.php?topic_id=$newtopic'>"
+                . _MD_NEWBB_VIEWTHETOPIC
+                . '</a></p>'
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewforum.php?forum=$forum'>"
+                . _MD_NEWBB_RETURNTOTHEFORUM
+                . '</a></p>'
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/index.php'>"
+                . _MD_NEWBB_RETURNFORUMINDEX
+                . '</a></p>';
     } elseif ('move' === $mode) {
         if ($newforum > 0) {
             $topic_id    = $topic_id[0];
@@ -261,17 +261,17 @@ 
             $forumHandler->synchronization($newforum);
             // irmtfan full URL
             echo $action[$mode]['msg']
-                 . "<p><a href='"
-                 . XOOPS_URL
-                 . '/modules/'
-                 . $xoopsModule->getVar('dirname')
-                 . "/viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"
-                 . _MD_NEWBB_GOTONEWFORUM
-                 . "</a></p><p><a href='"
-                 . XOOPS_URL
-                 . "/modules/newbb/index.php'>"
-                 . _MD_NEWBB_RETURNFORUMINDEX
-                 . '</a></p>';
+                    . "<p><a href='"
+                    . XOOPS_URL
+                    . '/modules/'
+                    . $xoopsModule->getVar('dirname')
+                    . "/viewtopic.php?topic_id=$topic_id&amp;forum=$newforum'>"
+                    . _MD_NEWBB_GOTONEWFORUM
+                    . "</a></p><p><a href='"
+                    . XOOPS_URL
+                    . "/modules/newbb/index.php'>"
+                    . _MD_NEWBB_RETURNFORUMINDEX
+                    . '</a></p>';
         } else {
             // irmtfan - issue with javascript:history.go(-1)
             redirect_header(Request::getString('HTTP_REFERER', '', 'SERVER'), 2, _MD_NEWBB_ERRORFORUM);
@@ -312,17 +312,17 @@ 
         }
         // irmtfan full URL
         echo $action[$mode]['msg']
-             . "<p><a href='"
-             . XOOPS_URL
-             . '/modules/'
-             . $xoopsModule->getVar('dirname')
-             . "/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"
-             . _MD_NEWBB_VIEWTHETOPIC
-             . "</a></p><p><a href='"
-             . XOOPS_URL
-             . "/modules/newbb/viewforum.php?forum=$forum'>"
-             . _MD_NEWBB_RETURNFORUMINDEX
-             . '</a></p>';
+                . "<p><a href='"
+                . XOOPS_URL
+                . '/modules/'
+                . $xoopsModule->getVar('dirname')
+                . "/viewtopic.php?topic_id=$topic_id&amp;forum=$forum'>"
+                . _MD_NEWBB_VIEWTHETOPIC
+                . "</a></p><p><a href='"
+                . XOOPS_URL
+                . "/modules/newbb/viewforum.php?forum=$forum'>"
+                . _MD_NEWBB_RETURNFORUMINDEX
+                . '</a></p>';
     }
 } else {  // No submit
     $mode = Request::getString('mode', '', 'GET'); //$_GET['mode'];

admin/admin_report.php

Indentation +12 added lines, -12 removed lines

@@ -125,18 +125,18 @@
         $reports = $reportHandler->getAllReports('report_id', 'ASC', $limit, $start, $process_result);
         foreach ($reports as $report) {
             $post_link = '<a href="'
-                         . XOOPS_URL
-                         . '/modules/'
-                         . $xoopsModule->getVar('dirname')
-                         . '/viewtopic.php?post_id='
-                         . $report['post_id']
-                         . '&amp;topic_id='
-                         . $report['topic_id']
-                         . '&amp;forum='
-                         . $report['forum_id']
-                         . '&amp;viewmode=thread" target="checkreport">'
-                         . $myts->htmlSpecialChars($report['subject'])
-                         . '</a>';
+                            . XOOPS_URL
+                            . '/modules/'
+                            . $xoopsModule->getVar('dirname')
+                            . '/viewtopic.php?post_id='
+                            . $report['post_id']
+                            . '&amp;topic_id='
+                            . $report['topic_id']
+                            . '&amp;forum='
+                            . $report['forum_id']
+                            . '&amp;viewmode=thread" target="checkreport">'
+                            . $myts->htmlSpecialChars($report['subject'])
+                            . '</a>';
             $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" />';

class/PostHandler.php

Indentation +10 added lines, -10 removed lines

@@ -88,16 +88,16 @@
         $approved = 1
     ) {
         $sql    = 'SELECT p.*, t.*, tp.topic_status FROM '
-                  . $this->db->prefix('newbb_posts')
-                  . ' p LEFT JOIN '
-                  . $this->db->prefix('newbb_posts_text')
-                  . ' t ON p.post_id=t.post_id LEFT JOIN '
-                  . $this->db->prefix('newbb_topics')
-                  . ' tp ON tp.topic_id=p.topic_id WHERE p.topic_id='
-                  . $topic_id
-                  . ' AND p.approved ='
-                  . $approved
-                  . ' ORDER BY p.post_time DESC';
+                    . $this->db->prefix('newbb_posts')
+                    . ' p LEFT JOIN '
+                    . $this->db->prefix('newbb_posts_text')
+                    . ' t ON p.post_id=t.post_id LEFT JOIN '
+                    . $this->db->prefix('newbb_topics')
+                    . ' tp ON tp.topic_id=p.topic_id WHERE p.topic_id='
+                    . $topic_id
+                    . ' AND p.approved ='
+                    . $approved
+                    . ' ORDER BY p.post_time DESC';
         $result = $this->db->query($sql, $limit, 0);
         $ret    = [];
         while (false !== ($myrow = $this->db->fetchArray($result))) {

class/TypeHandler.php

Indentation +9 added lines, -9 removed lines

@@ -42,14 +42,14 @@ 
         $forums = (is_array($forums) ? array_filter(array_map('intval', array_map('trim', $forums))) : (empty($forums) ? 0 : [(int)$forums]));
 
         $sql = '    SELECT o.type_id, o.type_name, o.type_color, l.type_order'
-               . '     FROM '
-               . $this->db->prefix('newbb_type_forum')
-               . ' AS l '
-               . "         LEFT JOIN {$this->table} AS o ON o.{$this->keyName} = l.{$this->keyName} "
-               . '     WHERE '
-               . '        l.forum_id '
-               . (empty($forums) ? 'IS NOT NULL' : 'IN (' . implode(', ', $forums) . ')')
-               . '         ORDER BY l.type_order ASC';
+                . '     FROM '
+                . $this->db->prefix('newbb_type_forum')
+                . ' AS l '
+                . "         LEFT JOIN {$this->table} AS o ON o.{$this->keyName} = l.{$this->keyName} "
+                . '     WHERE '
+                . '        l.forum_id '
+                . (empty($forums) ? 'IS NOT NULL' : 'IN (' . implode(', ', $forums) . ')')
+                . '         ORDER BY l.type_order ASC';
         if (false === ($result = $this->db->query($sql))) {
             //xoops_error($this->db->error());
             return $ret;
@@ -105,7 +105,7 @@ 
 
         if (!empty($types_valid)) {
             $sql = 'DELETE FROM ' . $this->db->prefix('newbb_type_forum') . ' WHERE ' . ' forum_id = ' . $forum_id . ' AND ' . // irmtfan bug fix: delete other forums types when update the type for a specific forum
-                   "     {$this->keyName} NOT IN (" . implode(', ', $types_valid) . ')';
+                    "     {$this->keyName} NOT IN (" . implode(', ', $types_valid) . ')';
             if (false === ($result = $this->db->queryF($sql))) {
             }
         }

class/IconHandler.php

Indentation +2 added lines, -2 removed lines

@@ -110,8 +110,8 @@
             $path = is_dir($theme_path . "/{$rel_dir}/{$type}/") ? $theme_path . "/{$rel_dir}/{$type}" : (
                 is_dir($theme_path . "/{$rel_dir}/{$default}/") ? $theme_path . "/{$rel_dir}/{$default}" : (
                 is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$type}/") ? XOOPS_THEME_PATH
-                 . "/default/{$rel_dir}/{$type}" : (
-                     is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
+                    . "/default/{$rel_dir}/{$type}" : (
+                        is_dir(XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}/") ? XOOPS_THEME_PATH . "/default/{$rel_dir}/{$default}"
                     : (is_dir($GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}/")) ? $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$type}")
                     : $GLOBALS['xoops']->path("modules/{$dirname}/templates/{$endDir}/{$default}")) // XOOPS_ROOT_PATH
             ) // XOOPS_THEME_PATH {$default}

class/OnlineHandler.php

Indentation +12 added lines, -12 removed lines

@@ -252,18 +252,18 @@
         $xoopsOnlineTable    = $xoops_onlineHandler->table;
 
         $sql = 'DELETE FROM '
-               . $this->db->prefix('newbb_online')
-               . ' WHERE'
-               . ' ( online_uid > 0 AND online_uid NOT IN ( SELECT online_uid FROM '
-               . $xoopsOnlineTable
-               . ' WHERE online_module ='
-               . $xoopsModule->getVar('mid')
-               . ' ) )'
-               . ' OR ( online_uid = 0 AND online_ip NOT IN ( SELECT online_ip FROM '
-               . $xoopsOnlineTable
-               . ' WHERE online_module ='
-               . $xoopsModule->getVar('mid')
-               . ' AND online_uid = 0 ) )';
+                . $this->db->prefix('newbb_online')
+                . ' WHERE'
+                . ' ( online_uid > 0 AND online_uid NOT IN ( SELECT online_uid FROM '
+                . $xoopsOnlineTable
+                . ' WHERE online_module ='
+                . $xoopsModule->getVar('mid')
+                . ' ) )'
+                . ' OR ( online_uid = 0 AND online_ip NOT IN ( SELECT online_ip FROM '
+                . $xoopsOnlineTable
+                . ' WHERE online_module ='
+                . $xoopsModule->getVar('mid')
+                . ' AND online_uid = 0 ) )';
 
         if ($result = $this->db->queryF($sql)) {
             return true;

class/DigestHandler.php

Indentation +12 added lines, -12 removed lines

@@ -214,18 +214,18 @@
         $reply_criteria = $GLOBALS['xoopsModuleConfig']['allow_require_reply'] ? ' AND p.require_reply=0' : '';
 
         $query = 'SELECT t.topic_id, t.forum_id, t.topic_title, t.topic_time, t.digest_time, p.uid, p.poster_name, pt.post_text FROM '
-                 . $this->db->prefix('newbb_topics')
-                 . ' t, '
-                 . $this->db->prefix('newbb_posts_text')
-                 . ' pt, '
-                 . $this->db->prefix('newbb_posts')
-                 . ' p WHERE t.topic_digest = 1 AND p.topic_id=t.topic_id AND p.pid=0 '
-                 . $forumCriteria
-                 . $approveCriteria
-                 . $time_criteria
-                 . $karma_criteria
-                 . $reply_criteria
-                 . ' AND pt.post_id=p.post_id ORDER BY t.digest_time DESC';
+                    . $this->db->prefix('newbb_topics')
+                    . ' t, '
+                    . $this->db->prefix('newbb_posts_text')
+                    . ' pt, '
+                    . $this->db->prefix('newbb_posts')
+                    . ' p WHERE t.topic_digest = 1 AND p.topic_id=t.topic_id AND p.pid=0 '
+                    . $forumCriteria
+                    . $approveCriteria
+                    . $time_criteria
+                    . $karma_criteria
+                    . $reply_criteria
+                    . ' AND pt.post_id=p.post_id ORDER BY t.digest_time DESC';
         if (!$result = $this->db->query($query)) {
             //echo "<br>No result:<br>$query";
             return false;

polls.php

Indentation +18 added lines, -18 removed lines

@@ -119,12 +119,12 @@ 
             $classOption  = $classPoll . 'Option';
             $poll_form    = new \XoopsThemeForm(_MD_NEWBB_POLL_CREATNEWPOLL, 'poll_form', 'polls.php', 'post', true);
             $author_label = new \XoopsFormLabel(_MD_NEWBB_POLL_AUTHOR, is_object($GLOBALS['xoopsUser']) ? ("<a href='"
-                                                                                                          . XOOPS_URL
-                                                                                                          . '/userinfo.php?uid='
-                                                                                                          . $GLOBALS['xoopsUser']->getVar('uid')
-                                                                                                          . "'>"
-                                                                                                          . newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
-                                                                                                          . '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
+                                                                                                            . XOOPS_URL
+                                                                                                            . '/userinfo.php?uid='
+                                                                                                            . $GLOBALS['xoopsUser']->getVar('uid')
+                                                                                                            . "'>"
+                                                                                                            . newbbGetUnameFromId($GLOBALS['xoopsUser']->getVar('uid'), $GLOBALS['xoopsModuleConfig']['show_realname'])
+                                                                                                            . '</a>') : $GLOBALS['xoopsConfig']['anonymous']);
             $poll_form->addElement($author_label);
             $question_text = new \XoopsFormText(_MD_NEWBB_POLL_POLLQUESTION, 'question', 50, 255);
             $poll_form->addElement($question_text);
@@ -154,12 +154,12 @@ 
                 $color_select->addOptionArray($barcolor_array);
                 $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/" . $GLOBALS['xoopsModuleConfig']['poll_module'] . '/assets/images/colorbars", "", "' . XOOPS_URL . "\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . XOOPS_URL
-                                                      . '/modules/'
-                                                      . $GLOBALS['xoopsModuleConfig']['poll_module']
-                                                      . '/assets/images/colorbars/'
-                                                      . $current_bar
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
+                                                        . XOOPS_URL
+                                                        . '/modules/'
+                                                        . $GLOBALS['xoopsModuleConfig']['poll_module']
+                                                        . '/assets/images/colorbars/'
+                                                        . $current_bar
+                                                        . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' width='30' align='bottom' height='15' alt='' /><br>");
                 $option_tray->addElement($color_select);
                 $option_tray->addElement($color_label);
                 if (!next($barcolor_array)) {
@@ -228,8 +228,8 @@ 
                 $color_select->addOptionArray($barcolor_array);
                 $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[" . $i . "]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+                                                        . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/" . $option->getVar('option_color', 'E'))
+                                                        . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
                 $option_tray->addElement($color_select);
                 $option_tray->addElement($color_label);
                 unset($color_select, $color_label);
@@ -518,8 +518,8 @@ 
                 $color_select->addOptionArray($barcolor_array);
                 $color_select->setExtra("onchange='showImgSelected(\"option_color_image[{$i}]\", \"option_color[{$i}]\", \"modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars\", \"\", \"" . XOOPS_URL . "\")'");
                 $color_label = new \XoopsFormLabel('', "<img src='"
-                                                      . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
-                                                      . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
+                                                        . $GLOBALS['xoops']->url("modules/{$GLOBALS['xoopsModuleConfig']['poll_module']}/assets/images/colorbars/{$current_bar}")
+                                                        . "' name='option_color_image[{$i}]' id='option_color_image[{$i}]' class='alignbottom' width='30' height='15' alt='' /><br>");
                 $option_tray->addElement($color_select);
                 $option_tray->addElement($color_label);
                 unset($color_select, $color_label, $option_text);
@@ -652,9 +652,9 @@ 
         $expire_text = new \XoopsFormText(
             _MD_NEWBB_POLL_EXPIRATION . '<br><small>' . _MD_NEWBB_POLL_FORMAT . '<br>' . sprintf(_MD_NEWBB_POLL_CURRENTTIME, formatTimestamp(time(), 'Y-m-d H:i:s')) . '<br>' . sprintf(
             _MD_NEWBB_POLL_EXPIREDAT,
-                                                                                                                                                                                                                     formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
+                                                                                                                                                                                                                        formatTimestamp($pollObject->getVar('end_time'), 'Y-m-d H:i:s')
         ) . '</small>',
-                                         'end_time',
+                                            'end_time',
             20,
             19,
             formatTimestamp(time() + $default_poll_duration, 'Y-m-d H:i:s')