mambax7 / newbb5

language/english/common.php

Spacing +35 added lines, -35 removed lines

@@ -21,49 +21,49 @@
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
+define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
+define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
+define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
+define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
+define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
+define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
+define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
+define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
+define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
+define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
+define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
+define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
 
-define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
-define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
+define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
+define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
 
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
-define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
+define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
 
-define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
+define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
 
 // Error Msgs
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
 
 //Help
-define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');

language/english/modinfo.php

Spacing +2 added lines, -2 removed lines

@@ -212,7 +212,7 @@ 
 define('_MI_NEWBB_INSTALL_FORUM_DESC', 'Forum for test.');
 define('_MI_NEWBB_INSTALL_POST_SUBJECT', 'Congratulations! The forum is working.');
 define('_MI_NEWBB_INSTALL_POST_TEXT', '
-    Welcome to ' . htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES) . ' forum.
+    Welcome to ' . htmlspecialchars($GLOBALS['xoopsConfig']['sitename'], ENT_QUOTES).' forum.
     Feel free to register and login to start your topics.
 
     If you have any question concerning NewBB usage, please visit your local support site or [url=https://xoops.org/modules/newbb/]XOOPS Support Site[/url].
@@ -320,7 +320,7 @@ 
 
 //Help
 define('_MI_NEWBB_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('_MI_NEWBB_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
+define('_MI_NEWBB_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
 define('_MI_NEWBB_BACK_2_ADMIN', 'Back to Administration of ');
 define('_MI_NEWBB_OVERVIEW', 'Overview');
 

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

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;