mambax7 / newbb5

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

index.php

Indentation +7 added lines, -7 removed lines

@@ -220,9 +220,9 @@ 
 $xoopsTpl->assign('notifyicon', $category_icon);
 
 $xoopsTpl->assign([
-                      'index_title' => sprintf(_MD_NEWBB_WELCOME, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
-                      'index_desc'  => _MD_NEWBB_TOSTART
-                  ]);
+                        'index_title' => sprintf(_MD_NEWBB_WELCOME, htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES)),
+                        'index_desc'  => _MD_NEWBB_TOSTART
+                    ]);
 
 /* display user stats */
 if (!empty($GLOBALS['xoopsModuleConfig']['statistik_enabled'])) {
@@ -280,10 +280,10 @@ 
     $xoopsTpl->assign('rss_button', newbbDisplayImage('rss', 'RSS feed'));
 }
 $xoopsTpl->assign([
-                      'img_forum_new' => newbbDisplayImage('forum_new', _MD_NEWBB_NEWPOSTS),
-                      'img_forum'     => newbbDisplayImage('forum', _MD_NEWBB_NONEWPOSTS),
-                      'img_subforum'  => newbbDisplayImage('subforum')
-                  ]);
+                        'img_forum_new' => newbbDisplayImage('forum_new', _MD_NEWBB_NEWPOSTS),
+                        'img_forum'     => newbbDisplayImage('forum', _MD_NEWBB_NONEWPOSTS),
+                        'img_subforum'  => newbbDisplayImage('subforum')
+                    ]);
 
 // irmtfan move to footer.php
 require_once __DIR__ . '/footer.php';

language/english/admin.php

Indentation +7 added lines, -7 removed lines

@@ -76,7 +76,7 @@ 
 define('_AM_NEWBB_DIGEST_HELP_4', 'After creating and sending, do not delete the created messages. Otherwise they will be generated again.');
 define(
     '_AM_NEWBB_DIGEST_HELP_AUTO_DIGEST',
-       'To configure the automatic creation and distribution of Digest topics, you need to create a cron task on your server.<br>For example: * NIX systems: <strong>0 6 * * * wget --post-data \'foo=bar\' https://example.com/modules/newbb/digest.php</strong><br>In this example, the script will run every day at 6.00 and check if there are any new Digest topics. If they are not found, mailing will not be done.<br>If for any reason you do not have the opportunity to create a task, then it is possible to create and make the dispatch on this page manually by clicking on the button above.<br>Please note that it is not recommended to delete created mailings, otherwise they will be created and sent again.'
+        'To configure the automatic creation and distribution of Digest topics, you need to create a cron task on your server.<br>For example: * NIX systems: <strong>0 6 * * * wget --post-data \'foo=bar\' https://example.com/modules/newbb/digest.php</strong><br>In this example, the script will run every day at 6.00 and check if there are any new Digest topics. If they are not found, mailing will not be done.<br>If for any reason you do not have the opportunity to create a task, then it is possible to create and make the dispatch on this page manually by clicking on the button above.<br>Please note that it is not recommended to delete created mailings, otherwise they will be created and sent again.'
 );
 //define('_AM_NEWBB_DIGEST_PAST', '<span style="color:red;">Should be sent out %d minutes ago</span>');
 //define('_AM_NEWBB_DIGEST_NEXT', 'Need to send out in %d minutes');
@@ -325,30 +325,30 @@ 
 // Help tab
 define(
     '_AM_NEWBB_HELP_CATEGORY_TAB',
-       'To create a category, use the button above and fill in all the fields on the form.<br>By default, category images are located: /modules/newbb/assets/images/category/<br>Sponsor link should be written in the following format: https://xoops.org/modules/newbb/ newBB Support. First the link, then the sponsor\'s name or other text.'
+        'To create a category, use the button above and fill in all the fields on the form.<br>By default, category images are located: /modules/newbb/assets/images/category/<br>Sponsor link should be written in the following format: https://xoops.org/modules/newbb/ newBB Support. First the link, then the sponsor\'s name or other text.'
 );
 define(
     '_AM_NEWBB_HELP_FORUM_TAB',
-       'To create and manage the forums use the buttons with the right<br>To create the forum, use the \'Create forum\' button. Then fill in all the fields of the form. You can also create a subforum.<br>To move the forum between categories, use the \'Move\' button. Follow the further instructions.<br>To merge forums, use the \'Merge\' button. Follow the further instructions.<br>If you have an access rights template, then you can apply it to the forum you are creating.'
+        'To create and manage the forums use the buttons with the right<br>To create the forum, use the \'Create forum\' button. Then fill in all the fields of the form. You can also create a subforum.<br>To move the forum between categories, use the \'Move\' button. Follow the further instructions.<br>To merge forums, use the \'Merge\' button. Follow the further instructions.<br>If you have an access rights template, then you can apply it to the forum you are creating.'
 );
 define(
     '_AM_NEWBB_HELP_PERMISSION_TAB',
-       '<strong>When setting permissions, be careful.</strong><br>After you install and apply the settings, you will automatically go to the next permissions tab.<br>Also here it is possible to create a default access rights template and apply it either to one forum or to all forums.'
+        '<strong>When setting permissions, be careful.</strong><br>After you install and apply the settings, you will automatically go to the next permissions tab.<br>Also here it is possible to create a default access rights template and apply it either to one forum or to all forums.'
 );
 define('_AM_NEWBB_HELP_ORDER_TAB', 'Allows you to set the order of categories and forums relative to each other.<br>The order (Weight) is set to 0 - top, 99 (and further) - bottom.');
 define('_AM_NEWBB_HELP_PRUNE_TAB', 'Allows you to clear forums from empty themes, obsolete themes, etc.<br>Also you can not delete topics that you want to clear, but transfer them to a specially created category \'Archive\' or any other.');
 define(
     '_AM_NEWBB_HELP_REPORT_TAB',
-       'Allows you to process reports that users send to you if they believe that the message on the forum does not comply with forum rules or ethical rules.<br>You can review the report and take action in relation to the message, the author, etc.<br>When a user sends a message, moderators and administrators are notified by e-mail.'
+        'Allows you to process reports that users send to you if they believe that the message on the forum does not comply with forum rules or ethical rules.<br>You can review the report and take action in relation to the message, the author, etc.<br>When a user sends a message, moderators and administrators are notified by e-mail.'
 );
 define('_AM_NEWBB_HELP_VOTE_TAB', 'If you have the voting function enabled, here you can see the results of the voting.<br>This vote is not associated with other XOOPS modules.');
 define(
     '_AM_NEWBB_HELP_TYPE_TAB',
-       'Allows you to create tags for highlighting themes. For example:<br><strong style="color:blue;">[Important]</strong> <strong>Topic Title</strong><br><strong style="color:red;">[ATTENTION]</strong> <strong>Topic Title</strong><br>You can set theme types when creating a theme on the user side.'
+        'Allows you to create tags for highlighting themes. For example:<br><strong style="color:blue;">[Important]</strong> <strong>Topic Title</strong><br><strong style="color:red;">[ATTENTION]</strong> <strong>Topic Title</strong><br>You can set theme types when creating a theme on the user side.'
 );
 define(
     '_AM_NEWBB_HELP_GROUPMOD_TAB',
-       'Allows you to install users of certain groups as moderators for the entire module, and for individual categories and forums.<br>It is recommended to create separate groups of moderators, for more convenient management of moderators.<br>You can also assign specific users to moderators when creating a forum.'
+        'Allows you to install users of certain groups as moderators for the entire module, and for individual categories and forums.<br>It is recommended to create separate groups of moderators, for more convenient management of moderators.<br>You can also assign specific users to moderators when creating a forum.'
 );
 define('_AM_NEWBB_HELP_SYNC_TAB', 'If you notice a problem with the message dates, the appearance of blank messages, etc. Here you can synchronize and correct forum data and topics');
 

language/english/modinfo.php

Indentation +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 define('_MI_NEWBB_DIR_ATTACHMENT', 'Attachments physical path.');
 define(
     '_MI_NEWBB_DIR_ATTACHMENT_DESC',
-       "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'"
+        "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'"
 );
 define('_MI_NEWBB_PATH_MAGICK', 'Path for ImageMagick');
 define('_MI_NEWBB_PATH_MAGICK_DESC', "Usually it is '/usr/bin/X11'. Leave it BLANK if you do not have ImageMagicK installed or for autodetecting.");
@@ -82,7 +82,7 @@ 
 define('_MI_NEWBB_USERLEVEL', 'HP/MP/EXP Level Mode');
 define(
     '_MI_NEWBB_USERLEVEL_DESC',
-       '<strong>HP</strong>  is determined by your average posts per day.<br><strong>MP</strong>  is determined by your join date related to your post count.<br><strong>EXP</strong> goes up each time you post, and when you get to 100%, you gain a level and the EXP drops to 0 again.'
+        '<strong>HP</strong>  is determined by your average posts per day.<br><strong>MP</strong>  is determined by your join date related to your post count.<br><strong>EXP</strong> goes up each time you post, and when you get to 100%, you gain a level and the EXP drops to 0 again.'
 );
 define('_MI_NEWBB_RSS_ENABLE', 'Enable RSS Feed');
 define('_MI_NEWBB_RSS_ENABLE_DESC', 'Enable RSS Feed, edit options below for maximum Items and Description length');