mambax7 / newbb5

language/english/admin.php

Spacing +2 added lines, -2 removed lines

@@ -178,8 +178,8 @@
 define('_AM_NEWBB_CAN_ATTACH', 'Can use attachment');
 define('_AM_NEWBB_CAN_NOAPPROVE', 'Can post directly');
 define('_AM_NEWBB_CAN_TYPE', 'Can use topic type');
-define('_AM_NEWBB_CAN_HTML', 'Can use and disable/enable HTML in posts');//irmtfan revised
-define('_AM_NEWBB_CAN_SIGNATURE', 'Can use and disable/enable signature. Default is set in profile module.');//irmtfan revised
+define('_AM_NEWBB_CAN_HTML', 'Can use and disable/enable HTML in posts'); //irmtfan revised
+define('_AM_NEWBB_CAN_SIGNATURE', 'Can use and disable/enable signature. Default is set in profile module.'); //irmtfan revised
 define('_AM_NEWBB_ACTION', 'Action');
 define('_AM_NEWBB_PERM_TEMPLATE', 'Set default permission template');
 define('_AM_NEWBB_PERM_TEMPLATE_DESC', 'Edit the following permission template so that it can be applied to a forum or a couple of forums');

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/main.php

Spacing +5 added lines, -5 removed lines

@@ -35,7 +35,7 @@ 
 define('_MD_NEWBB_NEWPOSTS', 'New posts');
 define('_MD_NEWBB_NONEWPOSTS', 'No new posts');
 define('_MD_NEWBB_PRIVATEFORUM', 'Inactive Forum');
-define('_MD_NEWBB_BY', 'by');// Posted by
+define('_MD_NEWBB_BY', 'by'); // Posted by
 define('_MD_NEWBB_TOSTART', 'To start viewing messages, select the forum that you want to visit from the list below.');
 define('_MD_NEWBB_TOTALTOPICSC', 'Total Topics: ');
 define('_MD_NEWBB_TOTALPOSTSC', 'Total Posts: ');
@@ -274,8 +274,8 @@ 
 define('_MD_NEWBB_TIMEISUP', 'You\'ve reached the time limit for editing your post.');
 define('_MD_NEWBB_TIMEISUPDEL', 'You\'ve reached the time limit for deleting your post.');
 //reply.php
-define('_MD_NEWBB_ON', 'on');//Posted on
-define('_MD_NEWBB_USERWROTE', '%s wrote:');// %s is username
+define('_MD_NEWBB_ON', 'on'); //Posted on
+define('_MD_NEWBB_USERWROTE', '%s wrote:'); // %s is username
 define('_MD_NEWBB_RE', 'Re');
 //post.php
 define('_MD_NEWBB_EDITNOTALLOWED', 'You\'re not allowed to edit this post!');
@@ -284,7 +284,7 @@ 
 define('_MD_NEWBB_THANKSSUBMIT', 'Thanks for your submission!');
 define('_MD_NEWBB_REPLYPOSTED', 'A reply to your topic has been posted.');
 define('_MD_NEWBB_HELLO', 'Hello %s,');
-define('_MD_NEWBB_URRECEIVING', 'You are receiving this email because a message you posted on %s forums has been replied to.');// %s is your site name
+define('_MD_NEWBB_URRECEIVING', 'You are receiving this email because a message you posted on %s forums has been replied to.'); // %s is your site name
 define('_MD_NEWBB_CLICKBELOW', 'Click on the link below to view the thread:');
 define('_MD_NEWBB_WAITFORAPPROVAL', 'Thank you. Your post will be approved before publication.');
 define('_MD_NEWBB_POSTING_LIMITED', 'Why not take a break and come back in %d sec');
@@ -378,7 +378,7 @@ 
 define('_MD_NEWBB_CANTVOTEOWN', 'You cannot vote on the topic you submitted.<br>All votes are logged and reviewed.');
 define('_MD_NEWBB_VOTEONCE', 'Please do not vote for the same topic more than once.');
 define('_MD_NEWBB_VOTEAPPRE', 'Your vote is appreciated.');
-define('_MD_NEWBB_THANKYOU', 'Thank you for taking the time to vote here at %s');// %s is your site name
+define('_MD_NEWBB_THANKYOU', 'Thank you for taking the time to vote here at %s'); // %s is your site name
 define('_MD_NEWBB_VOTES', 'Votes');
 define('_MD_NEWBB_NOVOTERATE', 'You did not rate this Topic');
 // polls.php

seo_url.php

Spacing +30 added lines, -30 removed lines

@@ -3,8 +3,8 @@ 
 
 use XoopsModules\Newbb;
 
-define('REAL_MODULE_NAME', 'modules/newbb');  //this is the Real Module directory
-define('SEO_MODULE_NAME', 'modules/newbb');  //this is SEO Name for rewrite Hack
+define('REAL_MODULE_NAME', 'modules/newbb'); //this is the Real Module directory
+define('SEO_MODULE_NAME', 'modules/newbb'); //this is SEO Name for rewrite Hack
 
 //ob_start('seo_urls');
 
@@ -20,13 +20,13 @@ 
     $search = [
 
         // Search URLs of modules' directry.
-        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})' . $XPS_URL . '\/' . $module_name . '\/(index.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
-        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})' . $XPS_URL . '\/' . $module_name . '\/(viewpost.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
-        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})' . $XPS_URL . '\/' . $module_name . '\/(rss.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
-        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})' . $XPS_URL . '\/' . $module_name . '\/(viewforum.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
-        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})' . $XPS_URL . '\/' . $module_name . '\/(viewtopic.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
-        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})' . $XPS_URL . '\/' . $module_name . '\/(newtopic.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
-        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})' . $XPS_URL . '\/' . $module_name . '\/(.*)([^>\'\"]*)([\'\"]{1})([^>]*)>/i'
+        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})'.$XPS_URL.'\/'.$module_name.'\/(index.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
+        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})'.$XPS_URL.'\/'.$module_name.'\/(viewpost.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
+        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})'.$XPS_URL.'\/'.$module_name.'\/(rss.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
+        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})'.$XPS_URL.'\/'.$module_name.'\/(viewforum.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
+        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})'.$XPS_URL.'\/'.$module_name.'\/(viewtopic.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
+        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})'.$XPS_URL.'\/'.$module_name.'\/(newtopic.php)([^>\'\"]*)([\'\"]{1})([^>]*)>/i',
+        '/<(a|meta)([^>]*)(href|url)=([\'\"]{0,1})'.$XPS_URL.'\/'.$module_name.'\/(.*)([^>\'\"]*)([\'\"]{1})([^>]*)>/i'
     ];
 
     $s = preg_replace_callback($search, 'replace_links', $s);
@@ -47,7 +47,7 @@ 
             if (!empty($matches[6])) {
                 //                replacing cat=x
                 if (preg_match('/cat=(\d+)/', $matches[6], $mvars)) {
-                    $add_to_url = 'c-' . $mvars[1] . '/' . forum_seo_cat($mvars[1]) . '';
+                    $add_to_url = 'c-'.$mvars[1].'/'.forum_seo_cat($mvars[1]).'';
                     $req_string = preg_replace('/cat=\d+/', '', $matches[6]);
                 } else {
                     return $matches['0'];
@@ -60,13 +60,13 @@ 
             if (!empty($matches[6])) {
                 //                replacing status=x
                 if (preg_match('/status=([a-z]+)/', $matches[6], $mvars)) {
-                    $add_to_url = 'viewpost.php' . $matches[6];
+                    $add_to_url = 'viewpost.php'.$matches[6];
                     $req_string = preg_replace('/status=([a-z])+/', '', $matches[6]);
                 } else {
                     return $matches['0'];
                 }
             } else {
-                $add_to_url = 'viewpost.php' . $matches[6];
+                $add_to_url = 'viewpost.php'.$matches[6];
             }
             break;
         case 'rss.php':
@@ -77,17 +77,17 @@ 
                 if (preg_match('/c=(\d+)/', $matches[6], $mvars)) {
                     $add_to_url = 'rc-';
                     if ($mvars[1] > 0) {
-                        $add_to_url .= $mvars[1] . '/' . forum_seo_cat($mvars[1]) . '';
+                        $add_to_url .= $mvars[1].'/'.forum_seo_cat($mvars[1]).'';
                     } else {
-                        $add_to_url .= $mvars[1] . '/rss.html';
+                        $add_to_url .= $mvars[1].'/rss.html';
                     }
                     $req_string = preg_replace('/c=\d+/', '', $matches[6]);
                 } elseif (preg_match('/f=(\d+)/', $matches[6], $mvars)) {
                     $add_to_url = 'rf-';
                     if ($mvars[1] > 0) {
-                        $add_to_url .= $mvars[1] . '/' . forum_seo_forum($mvars[1]) . '';
+                        $add_to_url .= $mvars[1].'/'.forum_seo_forum($mvars[1]).'';
                     } else {
-                        $add_to_url .= $mvars[1] . '/rss.html';
+                        $add_to_url .= $mvars[1].'/rss.html';
                     }
                     $req_string = preg_replace('/f=\d+/', '', $matches[6]);
                 } else {
@@ -102,7 +102,7 @@ 
             if (!empty($matches[6])) {
                 //                replacing forum=x
                 if (preg_match('/forum=(\d+)/', $matches[6], $mvars)) {
-                    $add_to_url = 'f-' . $mvars[1] . '/' . forum_seo_forum($mvars[1]) . '';
+                    $add_to_url = 'f-'.$mvars[1].'/'.forum_seo_forum($mvars[1]).'';
                     $req_string = preg_replace('/forum=\d+/', '', $matches[6]);
                 } else {
                     return $matches['0'];
@@ -115,11 +115,11 @@ 
             if (!empty($matches[6])) {
                 //                replacing topic_id=x
                 if (preg_match('/topic_id=(\d+)/', $matches[6], $mvars)) {
-                    $add_to_url = 't-' . $mvars[1] . '/' . forum_seo_topic($mvars[1]) . '';
+                    $add_to_url = 't-'.$mvars[1].'/'.forum_seo_topic($mvars[1]).'';
                     $req_string = preg_replace('/topic_id=\d+/', '', $matches[6]);
                 } //replacing post_id=x
                 elseif (preg_match('/post_id=(\d+)/', $matches[6], $mvars)) {
-                    $add_to_url = 'p-' . $mvars[1] . '/' . forum_seo_post($mvars[1]) . '';
+                    $add_to_url = 'p-'.$mvars[1].'/'.forum_seo_post($mvars[1]).'';
                     $req_string = preg_replace('/post_id=\d+/', '', $matches[6]);
                 } else {
                     return $matches['0'];
@@ -132,11 +132,11 @@ 
             if (!empty($matches[6])) {
                 //                replacing topic_id=x
                 if (preg_match('/topic_id=(\d+)/', $matches[6], $mvars)) {
-                    $add_to_url = 'pr-' . $mvars[1] . '/' . forum_seo_topic($mvars[1]) . '';
+                    $add_to_url = 'pr-'.$mvars[1].'/'.forum_seo_topic($mvars[1]).'';
                     $req_string = preg_replace('/topic_id=\d+/', '', $matches[6]);
                 } //replacing post_id=x
                 elseif (preg_match('/post_id=(\d+)/', $matches[6], $mvars)) {
-                    $add_to_url = 'pr-' . $mvars[1] . '/' . forum_seo_post($mvars[1]) . '';
+                    $add_to_url = 'pr-'.$mvars[1].'/'.forum_seo_post($mvars[1]).'';
                     $req_string = preg_replace('/post_id=\d+/', '', $matches[6]);
                 } else {
                     return $matches['0'];
@@ -149,11 +149,11 @@ 
             if (!empty($matches[6])) {
                 //                replacing topic_id=x
                 if (preg_match('/topic_id=(\d+)/', $matches[6], $mvars)) {
-                    $add_to_url = 'pdf-' . $mvars[1] . '/' . forum_seo_topic($mvars[1]) . '';
+                    $add_to_url = 'pdf-'.$mvars[1].'/'.forum_seo_topic($mvars[1]).'';
                     $req_string = preg_replace('/topic_id=\d+/', '', $matches[6]);
                 } //replacing post_id=x
                 elseif (preg_match('/post_id=(\d+)/', $matches[6], $mvars)) {
-                    $add_to_url = 'pdf-' . $mvars[1] . '/' . forum_seo_post($mvars[1]) . '';
+                    $add_to_url = 'pdf-'.$mvars[1].'/'.forum_seo_post($mvars[1]).'';
                     $req_string = preg_replace('/post_id=\d+/', '', $matches[6]);
                 } else {
                     return $matches['0'];
@@ -169,7 +169,7 @@ 
     if ('?' === $req_string) {
         $req_string = '';
     }
-    $ret = '<' . $matches[1] . $matches[2] . $matches[3] . '=' . $matches[4] . XOOPS_URL . '/' . SEO_MODULE_NAME . '/' . $add_to_url . $req_string . $matches[7] . $matches[8] . '>';
+    $ret = '<'.$matches[1].$matches[2].$matches[3].'='.$matches[4].XOOPS_URL.'/'.SEO_MODULE_NAME.'/'.$add_to_url.$req_string.$matches[7].$matches[8].'>';
 
     //$ret = '<'.$matches[1].$matches[2].$matches[3].'='.$matches[4].XOOPS_URL.'/'.REAL_MODULE_NAME.'/'.$add_to_url.$req_string.$matches[7].$matches[8].'>';
     return $ret;
@@ -190,7 +190,7 @@ 
             return $ret;
         }
     }
-    $query  = 'SELECT cat_id, cat_title FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_categories');
+    $query  = 'SELECT cat_id, cat_title FROM '.$GLOBALS['xoopsDB']->prefix('newbb_categories');
     $result = $GLOBALS['xoopsDB']->query($query);
     $_ret   = [];
     while (false !== ($res = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -218,7 +218,7 @@ 
             return $ret;
         }
     }
-    $query  = 'SELECT forum_id, forum_name    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_forums');
+    $query  = 'SELECT forum_id, forum_name    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_forums');
     $result = $GLOBALS['xoopsDB']->query($query);
     $_ret   = [];
     while (false !== ($res = $GLOBALS['xoopsDB']->fetchArray($result))) {
@@ -237,7 +237,7 @@ 
  */
 function forum_seo_topic($_cat_id)
 {
-    $query  = 'SELECT    topic_title    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_topics') . ' WHERE topic_id = ' . $_cat_id;
+    $query  = 'SELECT    topic_title    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_topics').' WHERE topic_id = '.$_cat_id;
     $result = $GLOBALS['xoopsDB']->query($query);
     $res    = $GLOBALS['xoopsDB']->fetchArray($result);
     $ret    = forum_seo_title($res['topic_title']);
@@ -258,7 +258,7 @@ 
  */
 function forum_seo_post($_cat_id)
 {
-    $query  = 'SELECT    subject    FROM ' . $GLOBALS['xoopsDB']->prefix('newbb_posts') . ' WHERE post_id = ' . $_cat_id;
+    $query  = 'SELECT    subject    FROM '.$GLOBALS['xoopsDB']->prefix('newbb_posts').' WHERE post_id = '.$_cat_id;
     $result = $GLOBALS['xoopsDB']->query($query);
     $res    = $GLOBALS['xoopsDB']->fetchArray($result);
     $ret    = forum_seo_title($res['subject']);
@@ -349,7 +349,7 @@ 
         '',
         ''
     ];
-    $title   = preg_replace($pattern, $rep_pat, $title);
+    $title = preg_replace($pattern, $rep_pat, $title);
 
     // Transformation des caractères accentués
     //                  è         é        ê         ë         ç         à         â         ä        î         ï        ù         ü         û         ô        ö
@@ -405,7 +405,7 @@ 
         'ae',
         'ss'
     ];
-    $title   = preg_replace($pattern, $rep_pat, $title);
+    $title = preg_replace($pattern, $rep_pat, $title);
 
     /*$string = str_replace(' ', '-', $title);
     $string = iconv('utf-8', 'ascii//translit', $string);

include/onuninstall.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
     $xsitemapHelper = \Xmf\Module\Helper::getHelper($moduleDirName);
 
     /** @var Newbb\Utility $utilityClass */
-    $utilityClass = ucfirst($moduleDirName) . 'Utility';
+    $utilityClass = ucfirst($moduleDirName).'Utility';
     if (!class_exists($utilityClass)) {
         xoops_load('utility', $moduleDirName);
     }
@@ -56,7 +56,7 @@ 
         if ($dirInfo->isDir()) {
             // The directory exists so delete it
             if (false === $utilityClass::rrmdir($old_dir)) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $old_dir));
                 $success = false;
             }
         }

include/functions.render.php

Spacing +3 added lines, -3 removed lines

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

include/sitemap.plugin.php

Spacing +7 added lines, -7 removed lines

@@ -26,14 +26,14 @@ 
     if (!empty($forums_allowed)) {
         $crit_top = new \CriteriaCompo(new \Criteria('parent_forum', 0));
         //$crit_top->add(new \Criteria("cat_id", "(".implode(", ", array_keys($categories)).")", "IN"));
-        $crit_top->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+        $crit_top->add(new \Criteria('forum_id', '('.implode(', ', $forums_allowed).')', 'IN'));
         $forums_top_id = $forumHandler->getIds($crit_top);
     }
 
     $forums_sub_id = [];
     if ((bool)$forums_top_id && $sitemap_configs['show_subcategoris']) {
-        $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '(' . implode(', ', $forums_top_id) . ')', 'IN'));
-        $crit_sub->add(new \Criteria('forum_id', '(' . implode(', ', $forums_allowed) . ')', 'IN'));
+        $crit_sub = new \CriteriaCompo(new \Criteria('parent_forum', '('.implode(', ', $forums_top_id).')', 'IN'));
+        $crit_sub->add(new \Criteria('forum_id', '('.implode(', ', $forums_allowed).')', 'IN'));
         $forums_sub_id = $forumHandler->getIds($crit_sub);
     }
 
@@ -41,7 +41,7 @@ 
     $forums_available = array_merge($forums_top_id, $forums_sub_id);
     $forums_array     = [];
     if ((bool)$forums_available) {
-        $crit_forum = new \Criteria('forum_id', '(' . implode(', ', $forums_available) . ')', 'IN');
+        $crit_forum = new \Criteria('forum_id', '('.implode(', ', $forums_available).')', 'IN');
         $crit_forum->setSort('cat_id ASC, parent_forum ASC, forum_order');
         $crit_forum->setOrder('ASC');
         $forums_array = $forumHandler->getAll($crit_forum, ['forum_name', 'parent_forum', 'cat_id'], false);
@@ -52,14 +52,14 @@ 
         if ((bool)$forum['parent_forum']) {
             $forums[$forum['parent_forum']]['fchild'][$forumid] = [
                 'id'    => $forumid,
-                'url'   => 'viewforum.php?forum=' . $forumid,
+                'url'   => 'viewforum.php?forum='.$forumid,
                 'title' => $forum['forum_name']
             ];
         } else {
             $forums[$forumid] = [
                 'id'    => $forumid,
                 'cid'   => $forum['cat_id'],
-                'url'   => 'viewforum.php?forum=' . $forumid,
+                'url'   => 'viewforum.php?forum='.$forumid,
                 'title' => $forum['forum_name']
             ];
         }
@@ -76,7 +76,7 @@ 
             $i                              = $cat_id;
             $sitemap['parent'][$i]['id']    = $cat_id;
             $sitemap['parent'][$i]['title'] = $category['cat_title'];
-            $sitemap['parent'][$i]['url']   = XOOPS_URL . '/modules/newbb/index.php?cat=' . $cat_id;
+            $sitemap['parent'][$i]['url']   = XOOPS_URL.'/modules/newbb/index.php?cat='.$cat_id;
         }
         foreach ($forums as $id => $forum) {
             $cid                                            = $forum['cid'];

include/oninstall.php

Spacing +13 added lines, -13 removed lines

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

include/common.php

Spacing +27 added lines, -27 removed lines

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

include/search.inc.php

Spacing +9 added lines, -9 removed lines

@@ -55,11 +55,11 @@ 
     $criteriaPost = new \CriteriaCompo();
     $criteriaPost->add(new \Criteria('p.approved', 1), 'AND'); // only active posts
 
-    $forum_list = [];// get forum lists just for forum names
+    $forum_list = []; // get forum lists just for forum names
     if (count($validForums) > 0) {
         $criteriaPermissions = new \CriteriaCompo();
-        $criteriaPermissions->add(new \Criteria('p.forum_id', '(' . implode(',', $validForums) . ')', 'IN'), 'AND');
-        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '(' . implode(', ', $validForums) . ')', 'IN'), 'forum_name', false);
+        $criteriaPermissions->add(new \Criteria('p.forum_id', '('.implode(',', $validForums).')', 'IN'), 'AND');
+        $forum_list = $forumHandler->getAll(new \Criteria('forum_id', '('.implode(', ', $validForums).')', 'IN'), 'forum_name', false);
     }
 
     if (is_numeric($userid) && 0 !== $userid) {
@@ -68,7 +68,7 @@ 
     } elseif (is_array($userid) && count($userid) > 0) {
         $userid       = array_map('intval', $userid);
         $criteriaUser = new \CriteriaCompo();
-        $criteriaUser->add(new \Criteria('p.uid', '(' . implode(',', $userid) . ')', 'IN'), 'OR');
+        $criteriaUser->add(new \Criteria('p.uid', '('.implode(',', $userid).')', 'IN'), 'OR');
     }
 
     $count = 0;
@@ -80,7 +80,7 @@ 
         $criteriaKeywords = new \CriteriaCompo();
         foreach ($queryarray as $queryTerm) {
             $termCriteria  = new \CriteriaCompo();
-            $queryTermLike = '%' . $xoopsDB->escape($queryTerm) . '%';
+            $queryTermLike = '%'.$xoopsDB->escape($queryTerm).'%';
             if ('title' === $searchin || 'both' === $searchin) {
                 $termCriteria->add(new \Criteria('p.subject', $queryTermLike, 'LIKE'), 'OR');
             }
@@ -90,7 +90,7 @@ 
             $criteriaKeywords->add($termCriteria, $andor);
         }
         // add highlight keywords to post links
-        $highlightKey = '&keywords=' . implode(' ', $queryarray);
+        $highlightKey = '&keywords='.implode(' ', $queryarray);
         $highlightKey = str_replace(' ', '+', $highlightKey);
     }
     $criteria = new \CriteriaCompo();
@@ -131,14 +131,14 @@ 
         $post                  = $posts[$id];
         $post_data             = $post->getPostBody();
         $ret[$i]['topic_id']   = $post->getVar('topic_id');
-        $ret[$i]['link']       = XOOPS_URL . '/modules/newbb/viewtopic.php?post_id=' . $post->getVar('post_id') . $highlightKey; // add highlight key
+        $ret[$i]['link']       = XOOPS_URL.'/modules/newbb/viewtopic.php?post_id='.$post->getVar('post_id').$highlightKey; // add highlight key
         $ret[$i]['title']      = $post_data['subject'];
         $ret[$i]['time']       = $post_data['date'];
         $ret[$i]['forum_name'] = $myts->htmlSpecialChars($forum_list[$post->getVar('forum_id')]['forum_name']);
-        $ret[$i]['forum_link'] = XOOPS_URL . '/modules/newbb/viewforum.php?forum=' . $post->getVar('forum_id');
+        $ret[$i]['forum_link'] = XOOPS_URL.'/modules/newbb/viewforum.php?forum='.$post->getVar('forum_id');
         $ret[$i]['post_text']  = $post_data['text'];
         $ret[$i]['uid']        = $post->getVar('uid');
-        $ret[$i]['poster']     = $post->getVar('uid') ? '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $ret[$i]['uid'] . '">' . $post_data['author'] . '</a>' : $post_data['author'];
+        $ret[$i]['poster']     = $post->getVar('uid') ? '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$ret[$i]['uid'].'">'.$post_data['author'].'</a>' : $post_data['author'];
         ++$i;
     }