XoopsModules25x / tools

modules/tools/config/config.php

Spacing +16 added lines, -16 removed lines

@@ -20,33 +20,33 @@ 
 $moduleDirName      = \basename(\dirname(__DIR__));

 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);

 

-return (object)[

-    'name'           => $moduleDirNameUpper . ' Module Configurator',

+return (object) [

+    'name'           => $moduleDirNameUpper.' Module Configurator',

     'paths'          => [

         'dirname'    => $moduleDirName,

-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',

-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,

-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,

-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,

+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',

+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,

+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,

+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,

     ],

     'uploadFolders'  => [

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',

         //XOOPS_UPLOAD_PATH . '/flags'

     ],

     'copyBlankFiles' => [

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',

         //XOOPS_UPLOAD_PATH . '/flags'

     ],

 

     'copyTestFolders' => [

         [

-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',

-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

+            XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',

+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

         ],

         //            [

         //                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',

@@ -83,6 +83,6 @@ 
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),

     ],

     'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>

-                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",

+                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif')."' alt='XOOPS Project'></a>",

 ];

 

modules/tools/config/paths.php

Spacing +10 added lines, -10 removed lines

@@ -6,20 +6,20 @@
 $moduleDirName      = \basename(\dirname(__DIR__));

 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);

 

-return (object)[

-    'name'          => \mb_strtoupper($moduleDirName) . ' PathConfigurator',

+return (object) [

+    'name'          => \mb_strtoupper($moduleDirName).' PathConfigurator',

     'paths'         => [

         'dirname'    => $moduleDirName,

-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',

-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,

-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,

-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,

+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',

+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,

+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,

+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,

     ],

     'uploadFolders' => [

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',

         //XOOPS_UPLOAD_PATH . '/flags'

     ],

 ];

modules/tools/language/english/common.php

Spacing +129 added lines, -129 removed lines

@@ -17,138 +17,138 @@ 
 $moduleDirName = \basename(\dirname(__DIR__, 2));

 $moduleDirNameUpper = \mb_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 . '_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 . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');

+\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.'_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');

 

 // 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(__DIR__, 2)));

-\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(__DIR__, 2)));

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

 

 //Sample Data

-\define('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');

-\define('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM', 'Are you sure to Import Sample Data? (It will delete ALL current data)');

-\define('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS', 'Sample Date imported  successfully');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA', 'Export Tables to YAML');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS', 'Export Tables to YAML successfully');

-\define('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA', 'Clear Sample Data');

-\define('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK', 'The Sample Data has been cleared');

-\define('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_CONFIRM', 'Are you sure to Clear Sample Data? (It will delete ALL current data)');

-\define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA', 'Export DB Schema to YAML');

-\define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS', 'Export DB Schema to YAML was a success');

-\define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR', 'ERROR: Export of DB Schema to YAML failed');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');

-\define('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS', 'Hide the Import buttons)');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS', 'Show the Import buttons)');

-

-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM', 'Confirm');

+\define('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');

+\define('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_CONFIRM', 'Are you sure to Import Sample Data? (It will delete ALL current data)');

+\define('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_SUCCESS', 'Sample Date imported  successfully');

+\define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA', 'Export Tables to YAML');

+\define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA_SUCCESS', 'Export Tables to YAML successfully');

+\define('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA', 'Clear Sample Data');

+\define('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_OK', 'The Sample Data has been cleared');

+\define('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_CONFIRM', 'Are you sure to Clear Sample Data? (It will delete ALL current data)');

+\define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA', 'Export DB Schema to YAML');

+\define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_SUCCESS', 'Export DB Schema to YAML was a success');

+\define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR', 'ERROR: Export of DB Schema to YAML failed');

+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');

+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');

+\define('CO_'.$moduleDirNameUpper.'_'.'HIDE_SAMPLEDATA_BUTTONS', 'Hide the Import buttons)');

+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLEDATA_BUTTONS', 'Show the Import buttons)');

+

+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIRM', 'Confirm');

 

 //letter choice

-\define('CO_' . $moduleDirNameUpper . '_' . 'BROWSETOTOPIC', "<span style='font-weight: bold;'>Browse items alphabetically</span>");

-\define('CO_' . $moduleDirNameUpper . '_' . 'OTHER', 'Other');

-\define('CO_' . $moduleDirNameUpper . '_' . 'ALL', 'All');

+\define('CO_'.$moduleDirNameUpper.'_'.'BROWSETOTOPIC', "<span style='font-weight: bold;'>Browse items alphabetically</span>");

+\define('CO_'.$moduleDirNameUpper.'_'.'OTHER', 'Other');

+\define('CO_'.$moduleDirNameUpper.'_'.'ALL', 'All');

 

 // block defines

-\define('CO_' . $moduleDirNameUpper . '_' . 'ACCESSRIGHTS', 'Access Rights');

-\define('CO_' . $moduleDirNameUpper . '_' . 'ACTION', 'Action');

-\define('CO_' . $moduleDirNameUpper . '_' . 'ACTIVERIGHTS', 'Active Rights');

-\define('CO_' . $moduleDirNameUpper . '_' . 'BADMIN', 'Block Administration');

-\define('CO_' . $moduleDirNameUpper . '_' . 'BLKDESC', 'Description');

-\define('CO_' . $moduleDirNameUpper . '_' . 'CBCENTER', 'Center Middle');

-\define('CO_' . $moduleDirNameUpper . '_' . 'CBLEFT', 'Center Left');

-\define('CO_' . $moduleDirNameUpper . '_' . 'CBRIGHT', 'Center Right');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SBLEFT', 'Left');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SBRIGHT', 'Right');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SIDE', 'Alignment');

-\define('CO_' . $moduleDirNameUpper . '_' . 'TITLE', 'Title');

-\define('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE', 'Visible');

-\define('CO_' . $moduleDirNameUpper . '_' . 'VISIBLEIN', 'Visible In');

-\define('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT', 'Weight');

-

-\define('CO_' . $moduleDirNameUpper . '_' . 'PERMISSIONS', 'Permissions');

-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS', 'Blocks Admin');

-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_DESC', 'Blocks/Group Admin');

-

-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_MANAGMENT', 'Manage');

-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_ADDBLOCK', 'Add a new block');

-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_EDITBLOCK', 'Edit a block');

-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK', 'Clone a block');

+\define('CO_'.$moduleDirNameUpper.'_'.'ACCESSRIGHTS', 'Access Rights');

+\define('CO_'.$moduleDirNameUpper.'_'.'ACTION', 'Action');

+\define('CO_'.$moduleDirNameUpper.'_'.'ACTIVERIGHTS', 'Active Rights');

+\define('CO_'.$moduleDirNameUpper.'_'.'BADMIN', 'Block Administration');

+\define('CO_'.$moduleDirNameUpper.'_'.'BLKDESC', 'Description');

+\define('CO_'.$moduleDirNameUpper.'_'.'CBCENTER', 'Center Middle');

+\define('CO_'.$moduleDirNameUpper.'_'.'CBLEFT', 'Center Left');

+\define('CO_'.$moduleDirNameUpper.'_'.'CBRIGHT', 'Center Right');

+\define('CO_'.$moduleDirNameUpper.'_'.'SBLEFT', 'Left');

+\define('CO_'.$moduleDirNameUpper.'_'.'SBRIGHT', 'Right');

+\define('CO_'.$moduleDirNameUpper.'_'.'SIDE', 'Alignment');

+\define('CO_'.$moduleDirNameUpper.'_'.'TITLE', 'Title');

+\define('CO_'.$moduleDirNameUpper.'_'.'VISIBLE', 'Visible');

+\define('CO_'.$moduleDirNameUpper.'_'.'VISIBLEIN', 'Visible In');

+\define('CO_'.$moduleDirNameUpper.'_'.'WEIGHT', 'Weight');

+

+\define('CO_'.$moduleDirNameUpper.'_'.'PERMISSIONS', 'Permissions');

+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS', 'Blocks Admin');

+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_DESC', 'Blocks/Group Admin');

+

+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_MANAGMENT', 'Manage');

+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_ADDBLOCK', 'Add a new block');

+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_EDITBLOCK', 'Edit a block');

+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_CLONEBLOCK', 'Clone a block');

 

 //myblocksadmin

-\define('CO_' . $moduleDirNameUpper . '_' . 'AGDS', 'Admin Groups');

-\define('CO_' . $moduleDirNameUpper . '_' . 'BCACHETIME', 'Cache Time');

-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_ADMIN', 'Blocks Admin');

-\define('CO_' . $moduleDirNameUpper . '_' . 'UPDATE_SUCCESS', 'Update successful');

+\define('CO_'.$moduleDirNameUpper.'_'.'AGDS', 'Admin Groups');

+\define('CO_'.$moduleDirNameUpper.'_'.'BCACHETIME', 'Cache Time');

+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_ADMIN', 'Blocks Admin');

+\define('CO_'.$moduleDirNameUpper.'_'.'UPDATE_SUCCESS', 'Update successful');

 

 //Template Admin

-\define('CO_' . $moduleDirNameUpper . '_' . 'TPLSETS', 'Template Management');

-\define('CO_' . $moduleDirNameUpper . '_' . 'GENERATE', 'Generate');

-\define('CO_' . $moduleDirNameUpper . '_' . 'FILENAME', 'File Name');

+\define('CO_'.$moduleDirNameUpper.'_'.'TPLSETS', 'Template Management');

+\define('CO_'.$moduleDirNameUpper.'_'.'GENERATE', 'Generate');

+\define('CO_'.$moduleDirNameUpper.'_'.'FILENAME', 'File Name');

 

 //Menu

-\define('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE', 'Migrate');

-\define('CO_' . $moduleDirNameUpper . '_' . 'FOLDER_YES', 'Folder "%s" exist');

-\define('CO_' . $moduleDirNameUpper . '_' . 'FOLDER_NO', 'Folder "%s" does not exist. Create the specified folder with CHMOD 777.');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS', 'Show Development Tools Button?');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS_DESC', 'If yes, the "Migrate" Tab and other Development tools will be visible to the Admin.');

-\define('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_FEEDBACK', 'Feedback');

-\define('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_OK', 'Database migrated to current schema.');

-\define('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_WARNING', 'Warning! This is intended for developers only. Confirm write schema file from current database.');

-\define('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_SCHEMA_OK', 'Current schema file written');

+\define('CO_'.$moduleDirNameUpper.'_'.'ADMENU_MIGRATE', 'Migrate');

+\define('CO_'.$moduleDirNameUpper.'_'.'FOLDER_YES', 'Folder "%s" exist');

+\define('CO_'.$moduleDirNameUpper.'_'.'FOLDER_NO', 'Folder "%s" does not exist. Create the specified folder with CHMOD 777.');

+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS', 'Show Development Tools Button?');

+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS_DESC', 'If yes, the "Migrate" Tab and other Development tools will be visible to the Admin.');

+\define('CO_'.$moduleDirNameUpper.'_'.'ADMENU_FEEDBACK', 'Feedback');

+\define('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_OK', 'Database migrated to current schema.');

+\define('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_WARNING', 'Warning! This is intended for developers only. Confirm write schema file from current database.');

+\define('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_SCHEMA_OK', 'Current schema file written');

 

 //Latest Version Check

-\define('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION', 'New Version: ');

+\define('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION', 'New Version: ');

 

 //DirectoryChecker

-\define('CO_' . $moduleDirNameUpper . '_' . 'AVAILABLE', "<span style='color: green;'>Available</span>");

-\define('CO_' . $moduleDirNameUpper . '_' . 'NOTAVAILABLE', "<span style='color: red;'>Not available</span>");

-\define('CO_' . $moduleDirNameUpper . '_' . 'NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");

-\define('CO_' . $moduleDirNameUpper . '_' . 'CREATETHEDIR', 'Create it');

-\define('CO_' . $moduleDirNameUpper . '_' . 'SETMPERM', 'Set the permission');

-\define('CO_' . $moduleDirNameUpper . '_' . 'DIRCREATED', 'The directory has been created');

-\define('CO_' . $moduleDirNameUpper . '_' . 'DIRNOTCREATED', 'The directory cannot be created');

-\define('CO_' . $moduleDirNameUpper . '_' . 'PERMSET', 'The permission has been set');

-\define('CO_' . $moduleDirNameUpper . '_' . 'PERMNOTSET', 'The permission cannot be set');

+\define('CO_'.$moduleDirNameUpper.'_'.'AVAILABLE', "<span style='color: green;'>Available</span>");

+\define('CO_'.$moduleDirNameUpper.'_'.'NOTAVAILABLE', "<span style='color: red;'>Not available</span>");

+\define('CO_'.$moduleDirNameUpper.'_'.'NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");

+\define('CO_'.$moduleDirNameUpper.'_'.'CREATETHEDIR', 'Create it');

+\define('CO_'.$moduleDirNameUpper.'_'.'SETMPERM', 'Set the permission');

+\define('CO_'.$moduleDirNameUpper.'_'.'DIRCREATED', 'The directory has been created');

+\define('CO_'.$moduleDirNameUpper.'_'.'DIRNOTCREATED', 'The directory cannot be created');

+\define('CO_'.$moduleDirNameUpper.'_'.'PERMSET', 'The permission has been set');

+\define('CO_'.$moduleDirNameUpper.'_'.'PERMNOTSET', 'The permission cannot be set');

 

 //FileChecker

 //\define('CO_' . $moduleDirNameUpper . '_' . 'AVAILABLE', "<span style='color: green;'>Available</span>");

@@ -158,31 +158,31 @@ 
 //\define('CO_' . $moduleDirNameUpper . '_' . 'CREATETHEFILE', 'Create it');

 //\define('CO_' . $moduleDirNameUpper . '_' . 'SETMPERM', 'Set the permission');

 

-\define('CO_' . $moduleDirNameUpper . '_' . 'FILECOPIED', 'The file has been copied');

-\define('CO_' . $moduleDirNameUpper . '_' . 'FILENOTCOPIED', 'The file cannot be copied');

+\define('CO_'.$moduleDirNameUpper.'_'.'FILECOPIED', 'The file has been copied');

+\define('CO_'.$moduleDirNameUpper.'_'.'FILENOTCOPIED', 'The file cannot be copied');

 

-\define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH', 'Number of Characters to truncate to the long text field');

-\define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH_DESC', 'Set the maximum number of characters to truncate the long text fields');

+\define('CO_'.$moduleDirNameUpper.'_'.'TRUNCATE_LENGTH', 'Number of Characters to truncate to the long text field');

+\define('CO_'.$moduleDirNameUpper.'_'.'TRUNCATE_LENGTH_DESC', 'Set the maximum number of characters to truncate the long text fields');

 

 //image config

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH', 'Image Display Width');

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC', 'Display width for image');

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT', 'Image Display Height');

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC', 'Display height for image');

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">--- EXTERNAL Image configuration ---</span> ');

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC', '');

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH', 'Image Upload path');

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC', 'Path for uploading images');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH', 'Image Display Width');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH_DSC', 'Display width for image');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT', 'Image Display Height');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT_DSC', 'Display height for image');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">--- EXTERNAL Image configuration ---</span> ');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG_DSC', '');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH', 'Image Upload path');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH_DSC', 'Path for uploading images');

 

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_FILE_SIZE', 'Image File Size (in Bytes)');

-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_FILE_SIZE_DSC','The maximum file size of the image file (in Bytes)');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_FILE_SIZE', 'Image File Size (in Bytes)');

+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_FILE_SIZE_DSC', 'The maximum file size of the image file (in Bytes)');

 

 

 //Module Stats

-\define('CO_' . $moduleDirNameUpper . '_' . 'STATS_SUMMARY', 'Module Statistics');

-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_CATEGORIES', 'Categories:');

-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_ITEMS', 'Items');

-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_OFFLINE', 'Offline');

-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_PUBLISHED', 'Published');

-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_REJECTED', 'Rejected');

-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_SUBMITTED', 'Submitted');

+\define('CO_'.$moduleDirNameUpper.'_'.'STATS_SUMMARY', 'Module Statistics');

+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_CATEGORIES', 'Categories:');

+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_ITEMS', 'Items');

+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_OFFLINE', 'Offline');

+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_PUBLISHED', 'Published');

+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_REJECTED', 'Rejected');

+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_SUBMITTED', 'Submitted');

modules/tools/class/Common/Configurator.php

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
 //        $moduleDirName      = \basename(\dirname(__DIR__, 2));

 //        $moduleDirNameUpper =  \mb_strtoupper($moduleDirName);

 

-        $config = require \dirname(__DIR__, 2) . '/config/config.php';

+        $config = require \dirname(__DIR__, 2).'/config/config.php';

 

         $this->name            = $config->name;

         $this->paths           = $config->paths;

@@ -59,8 +59,8 @@ 
         $this->moduleStats     = $config->moduleStats;

         $this->modCopyright    = $config->modCopyright;

 

-        $this->icons = include \dirname(__DIR__, 2) . '/config/icons.php';

-        $this->paths = include \dirname(__DIR__, 2) . '/config/paths.php';

+        $this->icons = include \dirname(__DIR__, 2).'/config/icons.php';

+        $this->paths = include \dirname(__DIR__, 2).'/config/paths.php';

 

     }

 }

modules/tools/class/Common/SysUtility.php

Indentation +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 
     /**
      * Access the only instance of this class
- *
+     *
      * @return SysUtility
 *
      */

Spacing +17 added lines, -17 removed lines

@@ -80,7 +80,7 @@ 
         //$pathModIcon16 = XOOPS_URL . '/modules/' . $moduleDirName . '/' . $helper->getConfig('modicons16');
         $pathModIcon16 = $helper->url($helper->getModule()->getInfo('modicons16'));
 
-        $select_view = '<form name="form_switch" id="form_switch" action="' . Request::getString('REQUEST_URI', '', 'SERVER') . '" method="post"><span style="font-weight: bold;">' . $text . '</span>';
+        $select_view = '<form name="form_switch" id="form_switch" action="'.Request::getString('REQUEST_URI', '', 'SERVER').'" method="post"><span style="font-weight: bold;">'.$text.'</span>';
         //$sorts =  $sort ==  'asc' ? 'desc' : 'asc';
         if ($form_sort == $sort) {
             $sel1 = 'asc' === $order ? 'selasc.png' : 'asc.png';
@@ -89,8 +89,8 @@ 
             $sel1 = 'asc.png';
             $sel2 = 'desc.png';
         }
-        $select_view .= '  <a href="' . Request::getString('SCRIPT_NAME', '', 'SERVER') . '?start=' . $start . '&sort=' . $form_sort . '&order=asc"><img src="' . $pathModIcon16 . '/' . $sel1 . '" title="ASC" alt="ASC"></a>';
-        $select_view .= '<a href="' . Request::getString('SCRIPT_NAME', '', 'SERVER') . '?start=' . $start . '&sort=' . $form_sort . '&order=desc"><img src="' . $pathModIcon16 . '/' . $sel2 . '" title="DESC" alt="DESC"></a>';
+        $select_view .= '  <a href="'.Request::getString('SCRIPT_NAME', '', 'SERVER').'?start='.$start.'&sort='.$form_sort.'&order=asc"><img src="'.$pathModIcon16.'/'.$sel1.'" title="ASC" alt="ASC"></a>';
+        $select_view .= '<a href="'.Request::getString('SCRIPT_NAME', '', 'SERVER').'?start='.$start.'&sort='.$form_sort.'&order=desc"><img src="'.$pathModIcon16.'/'.$sel2.'" title="DESC" alt="DESC"></a>';
         $select_view .= '</form>';
 
         return $select_view;
@@ -105,10 +105,10 @@ 
     {
         $cat_sql = '';
         if (\is_array($cats) && !empty($cats)) {
-            $cat_sql = '(' . \current($cats);
+            $cat_sql = '('.\current($cats);
             \array_shift($cats);
             foreach ($cats as $cat) {
-                $cat_sql .= ',' . $cat;
+                $cat_sql .= ','.$cat;
             }
             $cat_sql .= ')';
         }
@@ -160,11 +160,11 @@ 
         //        WHERE TABLE_NAME = '" . $table . "' AND COLUMN_NAME = '" . $columnName . "'")
         //    || exit ($GLOBALS['xoopsDB']->error());
 
-        $sql    = 'SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = "' . $table . '" AND COLUMN_NAME = "' . $columnName . '"';
+        $sql    = 'SELECT COLUMN_TYPE FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = "'.$table.'" AND COLUMN_NAME = "'.$columnName.'"';
         $result = $GLOBALS['xoopsDB']->query($sql);
         if (!$result) {
 //            exit($GLOBALS['xoopsDB']->error());
-            $logger     = \XoopsLogger::getInstance();
+            $logger = \XoopsLogger::getInstance();
             $logger->handleError(\E_USER_WARNING, $sql, __FILE__, __LINE__);
             return false;
         }
@@ -185,7 +185,7 @@ 
     public static function cloneRecord($tableName, int $id_field, int $id)
     {
         $new_id = false;
-        $logger     = \XoopsLogger::getInstance();
+        $logger = \XoopsLogger::getInstance();
         $table  = $GLOBALS['xoopsDB']->prefix($tableName);
         // copy content of the record you wish to clone
         $sql       = "SELECT * FROM $table WHERE $id_field='$id' ";
@@ -198,7 +198,7 @@ 
         // set the auto-incremented id's value to blank.
         unset($tempTable[$id_field]);
         // insert cloned copy of the original  record
-        $sql    = "INSERT INTO $table (" . \implode(', ', \array_keys($tempTable)) . ") VALUES ('" . \implode("', '", \array_values($tempTable)) . "')";
+        $sql    = "INSERT INTO $table (".\implode(', ', \array_keys($tempTable)).") VALUES ('".\implode("', '", \array_values($tempTable))."')";
         $result = $GLOBALS['xoopsDB']->queryF($sql);
         if (!$result) {
 //            exit($GLOBALS['xoopsDB']->error());
@@ -229,11 +229,11 @@ 
         $openTags = [];
         if ($considerHtml) {
             // if the plain text is shorter than the maximum length, return the whole text
-            if (\mb_strlen(\preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
+            if (\mb_strlen(\preg_replace('/<.*?'.'>/', '', $text)) <= $length) {
                 return $text;
             }
             // splits all html-tags to scanable lines
-            \preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
+            \preg_match_all('/(<.+?'.'>)?([^<>]*)/s', $text, $lines, \PREG_SET_ORDER);
             $total_length = \mb_strlen($ending);
             //$openTags    = [];
             $truncate     = '';
@@ -251,7 +251,7 @@ 
                             unset($openTags[$pos]);
                         }
                         // if tag is an opening tag
-                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
+                    } elseif (\preg_match('/^<\s*([^\s>!]+).*?'.'>$/s', $line_matchings[1], $tag_matchings)) {
                         // add tag to the beginning of $openTags list
                         \array_unshift($openTags, \mb_strtolower($tag_matchings[1]));
                     }
@@ -309,7 +309,7 @@ 
         if ($considerHtml) {
             // close all unclosed html-tags
             foreach ($openTags as $tag) {
-                $truncate .= '</' . $tag . '>';
+                $truncate .= '</'.$tag.'>';
             }
         }
 
@@ -380,7 +380,7 @@ 
             if (!@\mkdir($folder) && !\is_dir($folder)) {
                 throw new \RuntimeException(\sprintf('Unable to create the %s directory', $folder));
             }
-            file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+            file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
         } catch (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
         }
@@ -394,9 +394,9 @@ 
     public static function tableExists(string $tablename): bool
     {
         $trace = \debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS, 1);
-        \trigger_error(__FUNCTION__ . " is deprecated, called from {$trace[0]['file']} line {$trace[0]['line']}");
+        \trigger_error(__FUNCTION__." is deprecated, called from {$trace[0]['file']} line {$trace[0]['line']}");
         $GLOBALS['xoopsLogger']->addDeprecated(
-            \basename(\dirname(__DIR__, 2)) . ' Module: ' . __FUNCTION__ . ' function is deprecated, please use Xmf\Database\Tables method(s) instead.' . " Called from {$trace[0]['file']}line {$trace[0]['line']}"
+            \basename(\dirname(__DIR__, 2)).' Module: '.__FUNCTION__.' function is deprecated, please use Xmf\Database\Tables method(s) instead.'." Called from {$trace[0]['file']}line {$trace[0]['line']}"
         );
         $result = $GLOBALS['xoopsDB']->queryF("SHOW TABLES LIKE '$tablename'");
 
@@ -413,6 +413,6 @@ 
     public static function addField($field, $table)
     {
         global $xoopsDB;
-        return $xoopsDB->queryF('ALTER TABLE ' . $table . " ADD $field;");
+        return $xoopsDB->queryF('ALTER TABLE '.$table." ADD $field;");
     }
 }

modules/tools/class/Common/FilesManagement.php

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,7 @@ 
                     throw new \RuntimeException(\sprintf('Unable to create the %s directory', $folder));

                 }

 

-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');

+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');

             }

         } catch (\Exception $e) {

             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';

@@ -61,14 +61,14 @@ 
         $dir = \opendir($src);

         //        @mkdir($dst);

         if (!@\mkdir($dst) && !\is_dir($dst)) {

-            throw new \RuntimeException('The directory ' . $dst . ' could not be created.');

+            throw new \RuntimeException('The directory '.$dst.' could not be created.');

         }

         while (false !== ($file = \readdir($dir))) {

             if (('.' !== $file) && ('..' !== $file)) {

-                if (\is_dir($src . '/' . $file)) {

-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);

+                if (\is_dir($src.'/'.$file)) {

+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);

                 } else {

-                    \copy($src . '/' . $file, $dst . '/' . $file);

+                    \copy($src.'/'.$file, $dst.'/'.$file);

                 }

             }

         }

@@ -204,7 +204,7 @@ 
                 self::rrmdir($fObj->getPathname());

             }

         }

-        $iterator = null;   // clear iterator Obj to close file/directory

+        $iterator = null; // clear iterator Obj to close file/directory

         return \rmdir($src); // remove the directory & return results

     }

 

@@ -237,14 +237,14 @@ 
         $iterator = new \DirectoryIterator($src);

         foreach ($iterator as $fObj) {

             if ($fObj->isFile()) {

-                \rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());

+                \rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());

             } elseif (!$fObj->isDot() && $fObj->isDir()) {

                 // Try recursively on directory

-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());

+                self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());

                 //                rmdir($fObj->getPath()); // now delete the directory

             }

         }

-        $iterator = null;   // clear iterator Obj to close file/directory

+        $iterator = null; // clear iterator Obj to close file/directory

         return \rmdir($src); // remove the directory & return results

     }

 

@@ -280,9 +280,9 @@ 
         $iterator = new \DirectoryIterator($src);

         foreach ($iterator as $fObj) {

             if ($fObj->isFile()) {

-                \copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());

+                \copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());

             } elseif (!$fObj->isDot() && $fObj->isDir()) {

-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());

+                self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());

             }

         }

 

modules/tools/class/Common/VersionChecks.php

Spacing +7 added lines, -7 removed lines

@@ -42,13 +42,13 @@ 
         //check for minimum XOOPS version

         $currentVer = mb_substr(XOOPS_VERSION, 6); // get the numeric part of string

         if (null === $requiredVer) {

-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string

+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string

         }

         $success = true;

 

         if (version_compare($currentVer, $requiredVer, '<')) {

             $success = false;

-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));

+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));

         }

 

         return $success;

@@ -79,7 +79,7 @@ 
 

         if (false !== $reqVer && '' !== $reqVer && !is_array($reqVer)) {

             if (version_compare($verNum, $reqVer, '<')) {

-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));

+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));

                 $success = false;

             }

         }

@@ -103,7 +103,7 @@ 
         $moduleDirName      = \basename(\dirname(__DIR__, 2));

         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);

         $update             = '';

-        $repository         = 'XoopsModules25x/' . $moduleDirName;

+        $repository         = 'XoopsModules25x/'.$moduleDirName;

         //        $repository         = 'XoopsModules25x/publisher'; //for testing only

         $ret             = '';

         $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";

@@ -117,14 +117,14 @@ 
                 if (false === $curlReturn) {

                     trigger_error(curl_error($curlHandle));

                 } elseif (false !== strpos($curlReturn, 'Not Found')) {

-                    trigger_error('Repository Not Found: ' . $infoReleasesUrl);

+                    trigger_error('Repository Not Found: '.$infoReleasesUrl);

                 } else {

                     $file              = json_decode($curlReturn, false);

                     $latestVersionLink = sprintf("https://github.com/$repository/archive/%s.zip", $file ? reset($file)->tag_name : $default);

                     $latestVersion     = $file[0]->tag_name;

                     $prerelease        = $file[0]->prerelease;

                     if ('master' !== $latestVersionLink) {

-                        $update = constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;

+                        $update = constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;

                     }

                     //"PHP-standardized" version

                     $latestVersion = mb_strtolower($latestVersion);

@@ -132,7 +132,7 @@ 
                         $latestVersion = str_replace('_', '', mb_strtolower($latestVersion));

                         $latestVersion = str_replace('final', '', mb_strtolower($latestVersion));

                     }

-                    $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));

+                    $moduleVersion = ($helper->getModule()->getInfo('version').'_'.$helper->getModule()->getInfo('module_status'));

                     //"PHP-standardized" version

                     $moduleVersion = str_replace(' ', '', mb_strtolower($moduleVersion));

                     //                    $moduleVersion = '1.0'; //for testing only

modules/tools/class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -38,19 +38,19 @@ 
         //        $query = $GLOBALS['xoopsDB']->query($sql);

         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);

         $html .= '<fieldset>';

-        $html .= "<legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . '</legend>';

+        $html .= "<legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO').'</legend>';

         $html .= "<div style='padding: 8px;'>";

         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>";

         //        $html .= "<br>";

         //        $html .= "<br>";

-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . '</div>';

+        $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI').'</div>';

         $html .= '<ul>';

 

-        $gdlib = function_exists('gd_info') ? '<span style="color: #008000;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: #ff0000;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';

-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;

+        $gdlib = function_exists('gd_info') ? '<span style="color: #008000;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: #ff0000;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;

         if (function_exists('gd_info')) {

             if (true === ($gdlib = gd_info())) {

-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';

+                $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';

             }

         }

 

@@ -60,18 +60,18 @@ 
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: #008000;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: #ff0000;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';

         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;

 

-        $downloads = ini_get('file_uploads') ? '<span style="color: #008000;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: #ff0000;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';

-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;

+        $downloads = ini_get('file_uploads') ? '<span style="color: #008000;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: #ff0000;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;

 

-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: #0000ff;">' . ini_get('upload_max_filesize') . '</span></b>';

-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: #0000ff;">' . ini_get('post_max_size') . '</span></b>';

-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: #0000ff;">' . ini_get('memory_limit') . '</span></b>';

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: #0000ff;">'.ini_get('upload_max_filesize').'</span></b>';

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: #0000ff;">'.ini_get('post_max_size').'</span></b>';

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: #0000ff;">'.ini_get('memory_limit').'</span></b>';

         $html .= '</ul>';

         $html .= '<ul>';

-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . '</b>';

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH.'</b>';

         $html .= '</ul>';

         $html .= '<br>';

-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . '';

+        $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC').'';

         $html .= '</div>';

         $html .= '</fieldset><br>';

 

class/smarty/xoops_plugins/function.xoBlk.php

Spacing +4 added lines, -4 removed lines

@@ -26,19 +26,19 @@
     user=admin
 }>
 */
-function smarty_function_xoBlk( $params, $smarty )
+function smarty_function_xoBlk($params, $smarty)
 {
     /** @var Smarty $smarty */
     $old_caching = $smarty->caching;
     $old_cache_lifetime = $smarty->cache_lifetime;
     if (isset($params['cachetime'])) {
         $smarty->caching = 2;
-        $smarty->cache_lifetime = (int)$params['cachetime'];
+        $smarty->cache_lifetime = (int) $params['cachetime'];
     } else {
         $smarty->caching = 0;
     }
-    $tplName = 'db:' . $params['template'];
-    $params['cacheid'] = $params['cacheid'] ?? ('xoBlk_' . md5(var_export($params, true)));
+    $tplName = 'db:'.$params['template'];
+    $params['cacheid'] = $params['cacheid'] ?? ('xoBlk_'.md5(var_export($params, true)));
     if (!isset($params['cachetime']) || !$smarty->is_cached($tplName, $params['cacheid'])) {
         $myBlock = [
             'dirname' => $params['module'],