XoopsModules25x / songlist

language/english/feedback.php

Spacing +18 added lines, -18 removed lines

@@ -21,21 +21,21 @@
 $moduleDirName      = \basename(\dirname(__DIR__, 2));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_FORM_TITLE', 'Send a feedback');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_RECIPIENT', 'Recipient');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME', 'Name');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME_PLACEHOLER', 'Please enter your name');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE', 'Website');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE_PLACEHOLER', 'Please enter your website');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL', 'Email');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL_PLACEHOLER', 'Please enter your email');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE', 'Type of feedback');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION', 'Suggestions');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS', 'Bugs');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL', 'Testimonials');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES', 'Features');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS', 'Misc');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT', 'Feedback content');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_FOR', 'Feedback for module ');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_SUCCESS', 'Feedback successfully sent');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_ERROR', 'An errror occured when feedback was sent!');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_FORM_TITLE', 'Send a feedback');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_RECIPIENT', 'Recipient');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_NAME', 'Name');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_NAME_PLACEHOLER', 'Please enter your name');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SITE', 'Website');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SITE_PLACEHOLER', 'Please enter your website');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL', 'Email');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL_PLACEHOLER', 'Please enter your email');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE', 'Type of feedback');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_SUGGESTION', 'Suggestions');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_BUGS', 'Bugs');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_TESTIMONIAL', 'Testimonials');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_FEATURES', 'Features');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_OTHERS', 'Misc');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_CONTENT', 'Feedback content');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SEND_FOR', 'Feedback for module ');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SEND_SUCCESS', 'Feedback successfully sent');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SEND_ERROR', 'An errror occured when feedback was sent!');

language/english/modinfo.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 //1.14
 //Help
 define('_MI_SONGLIST_DIRNAME', basename(dirname(__DIR__, 2)));
-define('_MI_SONGLIST_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
+define('_MI_SONGLIST_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
 define('_MI_SONGLIST_BACK_2_ADMIN', 'Back to Administration of ');
 define('_MI_SONGLIST_OVERVIEW', 'Overview');
 

language/english/common.php

Spacing +155 added lines, -155 removed lines

@@ -16,138 +16,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 the 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 the 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>");
@@ -157,70 +157,70 @@ 
 //\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 . '_' . 'PERMSET', 'The permission has been set');
 //\define('CO_' . $moduleDirNameUpper . '_' . 'PERMNOTSET', 'The permission cannot be set');
 
 //image config
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_EXT_IMAGE', 'EXTERNAL Image configuration');
-
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_START', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">:: ');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_END', ' ::</span> ');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_DESC_START', '<span style="color: #FF0000; font-size: Small;">');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_DESC_END', '</span> ');
-
-\define('CO_' . $moduleDirNameUpper . '_' . 'PREFERENCE_BREAK_CONFIG_IMAGE', constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_START') . constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_EXT_IMAGE') . constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_END'));
-\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.'_'.'CONFIG_EXT_IMAGE', 'EXTERNAL Image configuration');
+
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_START', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">:: ');
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_END', ' ::</span> ');
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_DESC_START', '<span style="color: #FF0000; font-size: Small;">');
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_DESC_END', '</span> ');
+
+\define('CO_'.$moduleDirNameUpper.'_'.'PREFERENCE_BREAK_CONFIG_IMAGE', constant('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_START').constant('CO_'.$moduleDirNameUpper.'_'.'CONFIG_EXT_IMAGE').constant('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_END'));
+\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)');
 
 //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');
 
-\define('CO_' . $moduleDirNameUpper . '_' . 'ERROR403', 'You are not allowed to view this page!');
+\define('CO_'.$moduleDirNameUpper.'_'.'ERROR403', 'You are not allowed to view this page!');
 
 //Preferences
-\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');
 
-\define('CO_' . $moduleDirNameUpper . '_' . 'DELETE_BLOCK_CONFIRM', 'Are you sure to delete this Block?');
+\define('CO_'.$moduleDirNameUpper.'_'.'DELETE_BLOCK_CONFIRM', 'Are you sure to delete this Block?');
 
 //Cloning
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE', 'Clone');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_DSC', 'Cloning a module has never been this easy! Just type in the name you want for it and hit submit button!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_TITLE', 'Clone %s');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME', 'Choose a name for the new module');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME_DSC', 'Do not use special characters! <br>Do not choose an existing module dirname or database table name!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_INVALIDNAME', 'ERROR: Invalid module name, please try another one!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_EXISTS', 'ERROR: Module name already taken, please try another one!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_CONGRAT', 'Congratulations! %s was sucessfully created!<br>You may want to make changes in language files.');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_IMAGEFAIL', 'Attention, we failed creating the new module logo. Please consider modifying assets/images/logo_module.png manually!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_FAIL', "Sorry, we failed in creating the new clone. Maybe you need to temporally set write permissions (CHMOD 777) to 'modules' folder and try again.");
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE', 'Clone');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_DSC', 'Cloning a module has never been this easy! Just type in the name you want for it and hit submit button!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_TITLE', 'Clone %s');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_NAME', 'Choose a name for the new module');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_NAME_DSC', 'Do not use special characters! <br>Do not choose an existing module dirname or database table name!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_INVALIDNAME', 'ERROR: Invalid module name, please try another one!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_EXISTS', 'ERROR: Module name already taken, please try another one!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_CONGRAT', 'Congratulations! %s was sucessfully created!<br>You may want to make changes in language files.');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_IMAGEFAIL', 'Attention, we failed creating the new module logo. Please consider modifying assets/images/logo_module.png manually!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_FAIL', "Sorry, we failed in creating the new clone. Maybe you need to temporally set write permissions (CHMOD 777) to 'modules' folder and try again.");
 
 
 //JSON-LD generation of www.schema.org
-\define('CO_' . $moduleDirNameUpper . '_' . 'GENERATE_JSONLD', 'Generate Schema Markup through JSON LD');
-\define('CO_' . $moduleDirNameUpper . '_' . 'GENERATE_JSONLD_DESC', 'Mark up your module with structured data to help search engines better understand the content of your web page');
+\define('CO_'.$moduleDirNameUpper.'_'.'GENERATE_JSONLD', 'Generate Schema Markup through JSON LD');
+\define('CO_'.$moduleDirNameUpper.'_'.'GENERATE_JSONLD_DESC', 'Mark up your module with structured data to help search engines better understand the content of your web page');
 
 //Repository not found
-\define('CO_' . $moduleDirNameUpper . '_' . 'REPO_NOT_FOUND', 'Repository Not Found: ');
+\define('CO_'.$moduleDirNameUpper.'_'.'REPO_NOT_FOUND', 'Repository Not Found: ');
 //Release not found
-\define('CO_' . $moduleDirNameUpper . '_' . 'NO_REL_FOUND', 'Released Version Not Found: ');
+\define('CO_'.$moduleDirNameUpper.'_'.'NO_REL_FOUND', 'Released Version Not Found: ');
 //rename upload folder on uninstall
-\define('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED', 'Could not rename upload folder, please rename manually');
+\define('CO_'.$moduleDirNameUpper.'_'.'ERROR_FOLDER_RENAME_FAILED', 'Could not rename upload folder, please rename manually');

albums.php

Indentation +190 added lines, -190 removed lines

@@ -13,12 +13,12 @@ 
 $criteria_cat    = new \CriteriaCompo();
 $cids            = $categoryHandler->GetCatAndSubCat($_SESSION['cid']);
 if ($_SESSION['cid'] > 0) {
-    $cids[$_SESSION['cid']] = $_SESSION['cid'];
+	$cids[$_SESSION['cid']] = $_SESSION['cid'];
 }
 if (count($cids) > 0 && 0 != $_SESSION['cid']) {
-    $criteria_cat->add(new \Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'), 'OR');
+	$criteria_cat->add(new \Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'), 'OR');
 } else {
-    $criteria_cat->add(new \Criteria(''), 'OR');
+	$criteria_cat->add(new \Criteria(''), 'OR');
 }
 $criteria_cat->setSort('created');
 $criteria_cat->setOrder('ASC');
@@ -32,198 +32,198 @@ 
 $col = 1;
 $row = 1;
 foreach ($categories as $category) {
-    $cat[$row][$col]          = $category->toArray(true);
-    $cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-    ++$col;
-    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
-        ++$row;
-        $col = 1;
-    }
+	$cat[$row][$col]          = $category->toArray(true);
+	$cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+	++$col;
+	if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+		++$row;
+		$col = 1;
+	}
 }
 if (1 != $col) {
-    $col--;
-    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
-        $cat[$row][$j][$categoryHandler->keyName] = 0;
-        $cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-    }
+	$col--;
+	for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+		$cat[$row][$j][$categoryHandler->keyName] = 0;
+		$cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+	}
 }
 
 /** @var AlbumsHandler $albumsHandler */
 $albumsHandler = Helper::getInstance()->getHandler('Albums');
 switch ($op) {
-    default:
-    case 'item':
-        switch ($fct) {
-            default:
-            case 'list':
-                $pagenav = new \XoopsPageNav($albumsHandler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
-
-                $criteria_cat->setLimit($limit);
-                $criteria_cat->setStart($start);
-
-                $albums = $albumsHandler->getObjects($criteria_cat, false);
-
-                $ret = [];
-                $col = 1;
-                $row = 1;
-                foreach ($albums as $album) {
-                    $ret[$row][$col]          = $album->toArray(true);
-                    $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-                    ++$col;
-                    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
-                        ++$row;
-                        $col = 1;
-                    }
-                }
-                if (1 != $col) {
-                    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
-                        $ret[$row][$j][$albumsHandler->keyName] = 0;
-                        $ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-                    }
-                }
-
-                $url = $albumsHandler->getURL();
-                if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-                    header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
-                    exit(0);
-                }
-
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_index.tpl';
-                require_once $GLOBALS['xoops']->path('/header.php');
-                if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
-                    $GLOBALS['loaded_jquery'] = true;
-                }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->assign('results', $ret);
-                $GLOBALS['xoopsTpl']->assign('categories', $cat);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-                $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-                if (0 != $_SESSION['cid']) {
-                    $category = $categoryHandler->get($_SESSION['cid']);
-                    $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-                }
-                require_once $GLOBALS['xoops']->path('/footer.php');
-                break;
-            case 'item':
-                $album = $albumsHandler->get($id);
-
-                $url = $album->getURL(true);
-                if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-                    header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
-                    exit(0);
-                }
-
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_item.tpl';
-                require_once $GLOBALS['xoops']->path('/header.php');
-                if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
-                    $GLOBALS['loaded_jquery'] = true;
-                }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->assign('songs', false);
-                $GLOBALS['xoopsTpl']->assign('album', $album->toArray(true));
-                $GLOBALS['xoopsTpl']->assign('categories', $cat);
-                $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-                require_once $GLOBALS['xoops']->path('/footer.php');
-                break;
-        }
-        break;
-    case 'browseby':
-        switch ($fct) {
-            default:
-            case 'title':
-            case 'lyrics':
-            case 'artist':
-            case 'album':
-                $browse_criteria = new \CriteriaCompo();
-                switch ($value) {
-                    case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
-                        }
-                        break;
-                    default:
-                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
-                        break;
-                }
-                $criteria = new \CriteriaCompo($criteria_cat, 'AND');
-                $criteria->add($browse_criteria);
-        }
-
-        $pagenav = new \XoopsPageNav($albumsHandler->getCount($criteria), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
-
-        $criteria->setLimit($limit);
-        $criteria->setStart($start);
-
-        $albums = $albumsHandler->getObjects($criteria, false);
-
-        $ret = [];
-        $col = 1;
-        $row = 1;
-        foreach ($albums as $album) {
-            $ret[$row][$col]          = $album->toArray(true);
-            $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-            ++$col;
-            if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
-                ++$row;
-                $col = 1;
-            }
-        }
-        if (1 != $col) {
-            $col--;
-            for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
-                $ret[$row][$j][$albumsHandler->keyName] = 0;
-                $ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-            }
-        }
-
-        $url = $albumsHandler->getURL();
-        if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-            header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
-            exit(0);
-        }
-
-        $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_index.tpl';
-        require_once $GLOBALS['xoops']->path('/header.php');
-        if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-            $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
-            $GLOBALS['loaded_jquery'] = true;
-        }
-        $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-        $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-        $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-        $GLOBALS['xoopsTpl']->assign('results', $ret);
-        $GLOBALS['xoopsTpl']->assign('songs', false);
-        $GLOBALS['xoopsTpl']->assign('categories', $cat);
-        $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-        if (0 != $_SESSION['cid']) {
-            $category = $categoryHandler->get($_SESSION['cid']);
-            $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-        }
-        $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-        require_once $GLOBALS['xoops']->path('/footer.php');
-        break;
-        break;
-    case 'category':
-        switch ($fct) {
-            default:
-            case 'set':
-                $_SESSION['cid'] = $id;
-                break;
-            case 'home':
-                unset($_SESSION['cid']);
-                break;
-        }
-        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=0&value=%&start=$start&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+	default:
+	case 'item':
+		switch ($fct) {
+			default:
+			case 'list':
+				$pagenav = new \XoopsPageNav($albumsHandler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+
+				$criteria_cat->setLimit($limit);
+				$criteria_cat->setStart($start);
+
+				$albums = $albumsHandler->getObjects($criteria_cat, false);
+
+				$ret = [];
+				$col = 1;
+				$row = 1;
+				foreach ($albums as $album) {
+					$ret[$row][$col]          = $album->toArray(true);
+					$ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+					++$col;
+					if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+						++$row;
+						$col = 1;
+					}
+				}
+				if (1 != $col) {
+					for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+						$ret[$row][$j][$albumsHandler->keyName] = 0;
+						$ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+					}
+				}
+
+				$url = $albumsHandler->getURL();
+				if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+					header('HTTP/1.1 301 Moved Permanently');
+					header('Location: ' . $url);
+					exit(0);
+				}
+
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_index.tpl';
+				require_once $GLOBALS['xoops']->path('/header.php');
+				if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
+					$GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+					$GLOBALS['loaded_jquery'] = true;
+				}
+				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->assign('results', $ret);
+				$GLOBALS['xoopsTpl']->assign('categories', $cat);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+				if (0 != $_SESSION['cid']) {
+					$category = $categoryHandler->get($_SESSION['cid']);
+					$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+				}
+				require_once $GLOBALS['xoops']->path('/footer.php');
+				break;
+			case 'item':
+				$album = $albumsHandler->get($id);
+
+				$url = $album->getURL(true);
+				if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+					header('HTTP/1.1 301 Moved Permanently');
+					header('Location: ' . $url);
+					exit(0);
+				}
+
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_item.tpl';
+				require_once $GLOBALS['xoops']->path('/header.php');
+				if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
+					$GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+					$GLOBALS['loaded_jquery'] = true;
+				}
+				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->assign('songs', false);
+				$GLOBALS['xoopsTpl']->assign('album', $album->toArray(true));
+				$GLOBALS['xoopsTpl']->assign('categories', $cat);
+				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+				require_once $GLOBALS['xoops']->path('/footer.php');
+				break;
+		}
+		break;
+	case 'browseby':
+		switch ($fct) {
+			default:
+			case 'title':
+			case 'lyrics':
+			case 'artist':
+			case 'album':
+				$browse_criteria = new \CriteriaCompo();
+				switch ($value) {
+					case '0':
+						for ($u = 0; $u < 10; ++$u) {
+							$browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
+						}
+						break;
+					default:
+						$browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
+						$browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+						break;
+				}
+				$criteria = new \CriteriaCompo($criteria_cat, 'AND');
+				$criteria->add($browse_criteria);
+		}
+
+		$pagenav = new \XoopsPageNav($albumsHandler->getCount($criteria), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+
+		$criteria->setLimit($limit);
+		$criteria->setStart($start);
+
+		$albums = $albumsHandler->getObjects($criteria, false);
+
+		$ret = [];
+		$col = 1;
+		$row = 1;
+		foreach ($albums as $album) {
+			$ret[$row][$col]          = $album->toArray(true);
+			$ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+			++$col;
+			if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+				++$row;
+				$col = 1;
+			}
+		}
+		if (1 != $col) {
+			$col--;
+			for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+				$ret[$row][$j][$albumsHandler->keyName] = 0;
+				$ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+			}
+		}
+
+		$url = $albumsHandler->getURL();
+		if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+			header('HTTP/1.1 301 Moved Permanently');
+			header('Location: ' . $url);
+			exit(0);
+		}
+
+		$GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_index.tpl';
+		require_once $GLOBALS['xoops']->path('/header.php');
+		if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
+			$GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+			$GLOBALS['loaded_jquery'] = true;
+		}
+		$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+		$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+		$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+		$GLOBALS['xoopsTpl']->assign('results', $ret);
+		$GLOBALS['xoopsTpl']->assign('songs', false);
+		$GLOBALS['xoopsTpl']->assign('categories', $cat);
+		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+		if (0 != $_SESSION['cid']) {
+			$category = $categoryHandler->get($_SESSION['cid']);
+			$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+		}
+		$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+		require_once $GLOBALS['xoops']->path('/footer.php');
+		break;
+		break;
+	case 'category':
+		switch ($fct) {
+			default:
+			case 'set':
+				$_SESSION['cid'] = $id;
+				break;
+			case 'home':
+				unset($_SESSION['cid']);
+				break;
+		}
+		redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=0&value=%&start=$start&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }

Spacing +37 added lines, -37 removed lines

@@ -4,7 +4,7 @@ 
 use XoopsModules\Songlist\CategoryHandler;
 use XoopsModules\Songlist\AlbumsHandler;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
 
@@ -12,11 +12,11 @@ 
 $categoryHandler = Helper::getInstance()->getHandler('Category');
 $criteria_cat    = new \CriteriaCompo();
 $cids            = $categoryHandler->GetCatAndSubCat($_SESSION['cid']);
-if ($_SESSION['cid'] > 0) {
+if ($_SESSION['cid']>0) {
     $cids[$_SESSION['cid']] = $_SESSION['cid'];
 }
-if (count($cids) > 0 && 0 != $_SESSION['cid']) {
-    $criteria_cat->add(new \Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'), 'OR');
+if (count($cids)>0 && 0!=$_SESSION['cid']) {
+    $criteria_cat->add(new \Criteria('cid', '('.implode(',', $cids).')', 'IN'), 'OR');
 } else {
     $criteria_cat->add(new \Criteria(''), 'OR');
 }
@@ -33,18 +33,18 @@ 
 $row = 1;
 foreach ($categories as $category) {
     $cat[$row][$col]          = $category->toArray(true);
-    $cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+    $cat[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
     ++$col;
-    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+    if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
         ++$row;
         $col = 1;
     }
 }
-if (1 != $col) {
+if (1!=$col) {
     $col--;
-    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+    for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
         $cat[$row][$j][$categoryHandler->keyName] = 0;
-        $cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+        $cat[$row][$j]['width']                   = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
     }
 }
 
@@ -68,41 +68,41 @@ 
                 $row = 1;
                 foreach ($albums as $album) {
                     $ret[$row][$col]          = $album->toArray(true);
-                    $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                    $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
                     ++$col;
-                    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+                    if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
                         ++$row;
                         $col = 1;
                     }
                 }
-                if (1 != $col) {
-                    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+                if (1!=$col) {
+                    for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
                         $ret[$row][$j][$albumsHandler->keyName] = 0;
-                        $ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                        $ret[$row][$j]['width']                 = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
                     }
                 }
 
                 $url = $albumsHandler->getURL();
                 if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
                     header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
+                    header('Location: '.$url);
                     exit(0);
                 }
 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_index.tpl';
                 require_once $GLOBALS['xoops']->path('/header.php');
                 if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+                    $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
                     $GLOBALS['loaded_jquery'] = true;
                 }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
                 $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
                 $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
                 $GLOBALS['xoopsTpl']->assign('results', $ret);
                 $GLOBALS['xoopsTpl']->assign('categories', $cat);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
                 $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-                if (0 != $_SESSION['cid']) {
+                if (0!=$_SESSION['cid']) {
                     $category = $categoryHandler->get($_SESSION['cid']);
                     $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
                 }
@@ -114,19 +114,19 @@ 
                 $url = $album->getURL(true);
                 if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
                     header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
+                    header('Location: '.$url);
                     exit(0);
                 }
 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_item.tpl';
                 require_once $GLOBALS['xoops']->path('/header.php');
                 if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+                    $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
                     $GLOBALS['loaded_jquery'] = true;
                 }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
                 $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
                 $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
                 $GLOBALS['xoopsTpl']->assign('songs', false);
@@ -147,13 +147,13 @@ 
                 $browse_criteria = new \CriteriaCompo();
                 switch ($value) {
                     case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
+                        for ($u = 0; $u<10; ++$u) {
+                            $browse_criteria->add(new \Criteria('title', $u.'%', 'LIKE'), 'OR');
                         }
                         break;
                     default:
-                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value).'%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value).'%', 'LIKE'), 'OR');
                         break;
                 }
                 $criteria = new \CriteriaCompo($criteria_cat, 'AND');
@@ -172,42 +172,42 @@ 
         $row = 1;
         foreach ($albums as $album) {
             $ret[$row][$col]          = $album->toArray(true);
-            $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+            $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
             ++$col;
-            if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+            if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
                 ++$row;
                 $col = 1;
             }
         }
-        if (1 != $col) {
+        if (1!=$col) {
             $col--;
-            for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+            for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
                 $ret[$row][$j][$albumsHandler->keyName] = 0;
-                $ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                $ret[$row][$j]['width']                 = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
             }
         }
 
         $url = $albumsHandler->getURL();
         if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
             header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit(0);
         }
 
         $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_index.tpl';
         require_once $GLOBALS['xoops']->path('/header.php');
         if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-            $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+            $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
             $GLOBALS['loaded_jquery'] = true;
         }
-        $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+        $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
         $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
         $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
         $GLOBALS['xoopsTpl']->assign('results', $ret);
         $GLOBALS['xoopsTpl']->assign('songs', false);
         $GLOBALS['xoopsTpl']->assign('categories', $cat);
         $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-        if (0 != $_SESSION['cid']) {
+        if (0!=$_SESSION['cid']) {
             $category = $categoryHandler->get($_SESSION['cid']);
             $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
         }
@@ -225,5 +225,5 @@ 
                 unset($_SESSION['cid']);
                 break;
         }
-        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=0&value=%&start=$start&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=0&value=%&start=$start&limit=$limit&cid=".$_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }

class/Voice.php

Indentation +76 added lines, -76 removed lines

@@ -13,85 +13,85 @@
  */
 class Voice extends XoopsObject
 {
-    /**
-     * Voice constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('vcid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('albums', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
-        $this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
-    }
+	/**
+	 * Voice constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('vcid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('albums', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
+		$this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
+	}
 
-    /**
-     * @param bool $as_array
-     * @return array|string
-     */
-    public function getForm($as_array = false)
-    {
-        return FormController::getFormVoice($this, $as_array);
-    }
+	/**
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public function getForm($as_array = false)
+	{
+		return FormController::getFormVoice($this, $as_array);
+	}
 
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        $ret  = parent::toArray();
-        $form = $this->getForm(true);
-        foreach ($form as $key => $element) {
-            $ret['form'][$key] = $element->render();
-        }
-        foreach (['created', 'updated'] as $key) {
-            if ($this->getVar($key) > 0) {
-                $ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
-                $ret[$key]         = \date(_DATESTRING, $this->getVar($key));
-            }
-        }
-        $ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		$ret  = parent::toArray();
+		$form = $this->getForm(true);
+		foreach ($form as $key => $element) {
+			$ret['form'][$key] = $element->render();
+		}
+		foreach (['created', 'updated'] as $key) {
+			if ($this->getVar($key) > 0) {
+				$ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
+				$ret[$key]         = \date(_DATESTRING, $this->getVar($key));
+			}
+		}
+		$ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @return string
-     */
-    public function getURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL
-                   . '/'
-                   . $GLOBALS['songlistModuleConfig']['baseurl']
-                   . '/'
-                   . $file
-                   . '/'
-                   . \urlencode(\str_replace([' ', \chr(9)], '-', $this->getVar('name')))
-                   . '/'
-                   . $op
-                   . '-'
-                   . $fct
-                   . '-'
-                   . $this->getVar('gid')
-                   . '-'
-                   . \urlencode($value)
-                   . '-'
-                   . $gid
-                   . '-'
-                   . $vid
-                   . '-'
-                   . $cid
-                   . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
+	/**
+	 * @return string
+	 */
+	public function getURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL
+				   . '/'
+				   . $GLOBALS['songlistModuleConfig']['baseurl']
+				   . '/'
+				   . $file
+				   . '/'
+				   . \urlencode(\str_replace([' ', \chr(9)], '-', $this->getVar('name')))
+				   . '/'
+				   . $op
+				   . '-'
+				   . $fct
+				   . '-'
+				   . $this->getVar('gid')
+				   . '-'
+				   . \urlencode($value)
+				   . '-'
+				   . $gid
+				   . '-'
+				   . $vid
+				   . '-'
+				   . $cid
+				   . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $this->getVar('gid') . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid;
-    }
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $this->getVar('gid') . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid;
+	}
 }

Spacing +4 added lines, -4 removed lines

@@ -4,7 +4,7 @@ 
 
 use XoopsObject;
 
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
+require_once \dirname(__DIR__).'/include/songlist.object.php';
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
 use  XoopsModules\Songlist\Form\FormController;
 
@@ -51,12 +51,12 @@ 
             $ret['form'][$key] = $element->render();
         }
         foreach (['created', 'updated'] as $key) {
-            if ($this->getVar($key) > 0) {
+            if ($this->getVar($key)>0) {
                 $ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
                 $ret[$key]         = \date(_DATESTRING, $this->getVar($key));
             }
         }
-        $ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+        $ret['rank'] = \number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2).\_MI_SONGLIST_OFTEN;
 
         return $ret;
     }
@@ -92,6 +92,6 @@ 
                    . $GLOBALS['songlistModuleConfig']['endofurl'];
         }
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $this->getVar('gid') . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid;
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$this->getVar('gid').'&value='.\urlencode($value ?? '').'&gid='.$gid.'&vid='.$vid.'&cid='.$cid;
     }
 }

class/Utility.php

Indentation +789 added lines, -789 removed lines

@@ -4,11 +4,11 @@ 
 
 use Xmf\Request;
 use XoopsModules\Songlist\Form\{
-    SelectAlbumForm,
-    SelectCategoryForm,
-    SelectGenreForm,
-    SelectVoiceForm,
-    SelectSongForm
+	SelectAlbumForm,
+	SelectCategoryForm,
+	SelectGenreForm,
+	SelectVoiceForm,
+	SelectSongForm
 };
 
 
@@ -18,789 +18,789 @@ 
  */
 class Utility extends Common\SysUtility
 {
-    //--------------- Custom module methods -----------------------------
-    /**
-     * Function responsible for checking if a directory exists, we can also write in and create an index.html file
-     *
-     * @param string $folder The full path of the directory to check
-     */
-    public static function createFolder($folder): void
-    {
-        //        try {
-        //            if (!is_dir($folder) && !mkdir($folder) && !is_dir($folder)) {
-        //                throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
-        //            } else {
-        //                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
-        //            }
-        //        }
-        //        catch (\Exception $e) {
-        //            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        //        }
-        try {
-            if (!\is_dir($folder)) {
-                if (!\is_dir($folder) && !\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>');
-            }
-        } catch (\Throwable $e) {
-            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
-        }
-    }
-
-    /**
-     * @param string $file
-     * @param string $folder
-     * @return bool
-     */
-    public static function copyFile(string $file, string $folder): bool
-    {
-        return \copy($file, $folder);
-        //        try {
-        //            if (!is_dir($folder)) {
-        //                throw new \RuntimeException(sprintf('Unable to copy file as: %s ', $folder));
-        //            } else {
-        //                return copy($file, $folder);
-        //            }
-        //        } catch (\Exception $e) {
-        //            echo 'Caught exception: ', $e->getMessage(), "\n", "<br>";
-        //        }
-        //        return false;
-    }
-
-    /**
-     * @param $src
-     * @param $dst
-     */
-    public static function recurseCopy($src, $dst): void
-    {
-        $dir = \opendir($src);
-        //    @mkdir($dst);
-        while (false !== ($file = \readdir($dir))) {
-            if (('.' !== $file) && ('..' !== $file)) {
-                if (\is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
-                } else {
-                    \copy($src . '/' . $file, $dst . '/' . $file);
-                }
-            }
-        }
-        \closedir($dir);
-    }
-
-    /**
-     * Verifies XOOPS version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule|null $module
-     *
-     * @param null|string       $requiredVer
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null): bool
-    {
-        $moduleDirName = \basename(\dirname(__DIR__));
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        \xoops_loadLanguage('admin', $moduleDirName);
-        \xoops_loadLanguage('common', $moduleDirName);
-
-        //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
-        }
-        $success = true;
-
-        if (\version_compare($currentVer, $requiredVer, '<')) {
-            $success = false;
-            $module->setErrors(\sprintf(\_AM_SONGLIST_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
-        }
-
-        return $success;
-    }
-
-    /**
-     * Verifies PHP version meets minimum requirements for this module
-     * @static
-     * @param \XoopsModule|bool|null $module
-     *
-     * @return bool true if meets requirements, false if not
-     */
-    public static function checkVerPhp(\XoopsModule $module = null): bool
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
-            $module = \XoopsModule::getByDirname($moduleDirName);
-        }
-        \xoops_loadLanguage('admin', $moduleDirName);
-        \xoops_loadLanguage('common', $moduleDirName);
-
-        // check for minimum PHP version
-        $success = true;
-
-        $verNum = \PHP_VERSION;
-        $reqVer = &$module->getInfo('min_php');
-
-        if (false !== $reqVer && '' !== $reqVer) {
-            if (\version_compare($verNum, $reqVer, '<')) {
-                $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
-                $success = false;
-            }
-        }
-
-        return $success;
-    }
-
-    /**
-     * compares current module version with the latest GitHub release
-     * @static
-     *
-     * @return string|array info about the latest module version, if newer
-     */
-    public static function checkVerModule(\Xmf\Module\Helper $helper, ?string $source = 'github', ?string $default = 'master'): ?array
-    {
-        $moduleDirName      = \basename(\dirname(__DIR__, 2));
-        $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        $update             = '';
-        $repository         = 'XoopsModules25x/' . $moduleDirName;
-        //        $repository         = 'XoopsModules25x/publisher'; //for testing only
-        $ret             = null;
-        $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
-        if ('github' === $source) {
-            if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) {
-                \curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl);
-                \curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
-                \curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, true); //TODO: how to avoid an error when 'Peer's Certificate issuer is not recognized'
-                \curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]);
-                $curlReturn = \curl_exec($curlHandle);
-                if (false === $curlReturn) {
-                    \trigger_error(\curl_error($curlHandle));
-                } elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
-                    \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;
-                    }
-                    //"PHP-standardized" version
-                    $latestVersion = \mb_strtolower($latestVersion);
-                    if (false !== mb_strpos($latestVersion, 'final')) {
-                        $latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion));
-                        $latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion));
-                    }
-                    $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
-                    //                    $moduleDirName = 'publisher'; //for testing only
-                    if (!$prerelease && \version_compare($moduleVersion, $latestVersion, '<')) {
-                        $ret   = [];
-                        $ret[] = $update;
-                        $ret[] = $latestVersionLink;
-                    }
-                }
-                \curl_close($curlHandle);
-            }
-        }
-
-        return $ret;
-    }
-
-    //=========================================================
-
-    /**
-     * @return mixed
-     */
-    public static function getToken()
-    {
-        $sql    = 'SELECT md5(rand()/rand()*rand()/rand()*rand()*rand()/rand()*rand()) as `salt`';
-        $result = $GLOBALS['xoopsDB']->queryF($sql);
-        [$salt] = $GLOBALS['xoopsDB']->fetchRow($result);
-
-        return $salt;
-    }
-
-    /**
-     * @param $string
-     * @return string
-     */
-    public static function ucword($string): string
-    {
-        $ret = [];
-        foreach (explode(' ', \mb_strtolower($string)) as $part) {
-            $ret[] = ucfirst($part);
-        }
-
-        return implode(' ', $ret);
-    }
-
-    /**
-     * @param bool|string $ip
-     * @return array
-     */
-    public static function getIPData($ip = false): array
-    {
-        $ret = [];
-        if (is_object($GLOBALS['xoopsUser'])) {
-            $ret['uid']   = $GLOBALS['xoopsUser']->getVar('uid');
-            $ret['uname'] = $GLOBALS['xoopsUser']->getVar('uname');
-            $ret['email'] = $GLOBALS['xoopsUser']->getVar('email');
-        } else {
-            $ret['uid']   = 0;
-            $ret['uname'] = ($_REQUEST['uname'] ?? '');
-            $ret['email'] = ($_REQUEST['email'] ?? '');
-        }
-        $ret['agent'] = $_SERVER['HTTP_USER_AGENT'];
-        if ($ip) {
-            $ret['is_proxied']   = false;
-            $ret['network-addy'] = @gethostbyaddr($ip);
-            $ret['long']         = @ip2long($ip);
-            if (isIpv6($ip)) {
-                $ret['ip6'] = true;
-                $ret['ip4'] = false;
-            } else {
-                $ret['ip4'] = true;
-                $ret['ip6'] = false;
-            }
-            $ret['ip'] = $ip;
-        } elseif (Request::hasVar('HTTP_X_FORWARDED_FOR', 'SERVER')) {
-            $ip                  = $_SERVER['HTTP_X_FORWARDED_FOR'];
-            $ret['is_proxied']   = true;
-            $proxy_ip            = $_SERVER['REMOTE_ADDR'];
-            $ret['network-addy'] = @gethostbyaddr($ip);
-            $ret['long']         = @ip2long($ip);
-            if (isIpv6($ip)) {
-                $ret['ip6']       = true;
-                $ret['proxy-ip6'] = true;
-                $ret['ip4']       = false;
-                $ret['proxy-ip4'] = false;
-            } else {
-                $ret['ip4']       = true;
-                $ret['proxy-ip4'] = true;
-                $ret['ip6']       = false;
-                $ret['proxy-ip6'] = false;
-            }
-            $ret['ip']       = $ip;
-            $ret['proxy-ip'] = $proxy_ip;
-        } else {
-            $ret['is_proxied']   = false;
-            $ip                  = $_SERVER['REMOTE_ADDR'];
-            $ret['network-addy'] = @gethostbyaddr($ip);
-            $ret['long']         = @ip2long($ip);
-            if (isIpv6($ip)) {
-                $ret['ip6'] = true;
-                $ret['ip4'] = false;
-            } else {
-                $ret['ip4'] = true;
-                $ret['ip6'] = false;
-            }
-            $ret['ip'] = $ip;
-        }
-        $ret['made'] = time();
-
-        return $ret;
-    }
-
-    /**
-     * @param string $ip
-     * @return bool
-     */
-    public static function isIpv6($ip = ''): bool
-    {
-        if ('' == $ip) {
-            return false;
-        }
-
-        if (mb_substr_count($ip, ':') > 0) {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * @param        $filter
-     * @param        $field
-     * @param string $sort
-     * @param string $op
-     * @param string $fct
-     * @return bool|\XoopsModules\Songlist\Form\SelectAlbumForm|\XoopsModules\Songlist\Form\SelectArtistForm|\XoopsModules\Songlist\Form\SelectCategoryForm|\XoopsModules\Songlist\Form\SelectGenreForm|\XoopsModules\Songlist\Form\SelectVoiceForm
-     */
-    public static function getFilterElement($filter, $field, $sort = 'created', $op = '', $fct = '')
-    {
-        $components = static::getFilterURLComponents($filter, $field, $sort);
-        $ele        = false;
-        require_once dirname(__DIR__) . '/include/songlist.object.php';
-        switch ($field) {
-            case 'gid':
-                if ('genre' !== $op) {
-                    $ele = new SelectGenreForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'vcid':
-                if ('voice' !== $op) {
-                    $ele = new SelectVoiceForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'cid':
-                if ('category' !== $op) {
-                    $ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'pid':
-                $ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                $ele->setExtra(
-                    'onchange="window.open(\''
-                    . $_SERVER['SCRIPT_NAME']
-                    . '?'
-                    . $components['extra']
-                    . '&filter='
-                    . $components['filter']
-                    . (!empty($components['filter']) ? '|' : '')
-                    . $field
-                    . ',\'+this.options[this.selectedIndex].value'
-                    . (!empty($components['operator']) ? '+\','
-                                                         . $components['operator']
-                                                         . '\'' : '')
-                    . ',\'_self\')"'
-                );
-                break;
-            case 'abid':
-                if ('albums' !== $op) {
-                    $ele = new SelectAlbumForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'aid':
-                if ('artists' !== $op) {
-                    $ele = new SelectArtistForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'sid':
-                if ('songs' !== $op) {
-                    $ele = new SelectSongForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'name':
-            case 'title':
-            case 'artists':
-            case 'albums':
-            case 'songs':
-            case 'hits':
-            case 'rank':
-            case 'votes':
-            case 'description':
-            case 'lyrics':
-            case 'songid':
-            case 'tags':
-                $ele = new \XoopsFormElementTray('');
-                $ele->addElement(new \XoopsFormText('', 'filter_' . $field . '', 11, 40, $components['value']));
-                $button = new \XoopsFormButton('', 'button_' . $field . '', '[+]');
-                $button->setExtra(
-                    'onclick="window.open(\''
-                    . $_SERVER['SCRIPT_NAME']
-                    . '?'
-                    . $components['extra']
-                    . '&filter='
-                    . $components['filter']
-                    . (!empty($components['filter']) ? '|' : '')
-                    . $field
-                    . ',\'+$(\'#filter_'
-                    . $field
-                    . '\').val()'
-                    . (!empty($components['operator']) ? '+\','
-                                                         . $components['operator']
-                                                         . '\'' : '')
-                    . ',\'_self\')"'
-                );
-                $ele->addElement($button);
-                break;
-        }
-
-        return $ele;
-    }
-
-    /**
-     * @param        $filter
-     * @param        $field
-     * @param string $sort
-     * @return array
-     */
-    public static function getFilterURLComponents($filter, $field, $sort = 'created'): array
-    {
-        $parts     = explode('|', $filter);
-        $ret       = [];
-        $value     = '';
-        $ele_value = '';
-        $operator  = '';
-        foreach ($parts as $part) {
-            $var = explode(',', $part);
-            if (count($var) > 1) {
-                if ($var[0] == $field) {
-                    $ele_value = $var[1];
-                    if (isset($var[2])) {
-                        $operator = $var[2];
-                    }
-                } elseif (1 != $var[0]) {
-                    $ret[] = implode(',', $var);
-                }
-            }
-        }
-        $pagenav          = [];
-        $pagenav['op']    = $_REQUEST['op'] ?? 'videos';
-        $pagenav['fct']   = $_REQUEST['fct'] ?? 'list';
-        $pagenav['limit'] = Request::getInt('limit', 30, 'REQUEST');
-        $pagenav['start'] = 0;
-        $pagenav['order'] = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-        $pagenav['sort']  = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : $sort;
-        $retb             = [];
-        foreach ($pagenav as $key => $value) {
-            $retb[] = "$key=$value";
-        }
-
-        return ['value' => $ele_value, 'field' => $field, 'operator' => $operator, 'filter' => implode('|', $ret), 'extra' => implode('&', $retb)];
-    }
-
-    /**
-     * @param $objects
-     * @return array
-     */
-    public static function obj2array($objects): array
-    {
-        $ret = [];
-        foreach ((array)$objects as $key => $value) {
-            if (is_a($value, 'stdClass')) {
-                $ret[$key] = static::obj2array($value);
-            } elseif (is_array($value)) {
-                $ret[$key] = static::obj2array($value);
-            } else {
-                $ret[$key] = $value;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $url
-     * @return mixed
-     */
-    public static function shortenUrl($url)
-    {
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        /** @var \XoopsConfigHandler $configHandler */
-        $configHandler                   = xoops_getHandler('config');
-        $GLOBALS['songlistModule']       = $moduleHandler->getByDirname('songlist');
-        $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
-
-        if (!empty($GLOBALS['songlistModuleConfig']['bitly_username']) && !empty($GLOBALS['songlistModuleConfig']['bitly_apikey'])) {
-            $source_url = $GLOBALS['songlistModuleConfig']['bitly_apiurl'] . '/shorten?login=' . $GLOBALS['songlistModuleConfig']['bitly_username'] . '&apiKey=' . $GLOBALS['songlistModuleConfig']['bitly_apikey'] . '&format=json&longUrl=' . urlencode($url);
-            $cookies    = XOOPS_ROOT_PATH . '/uploads/songlist_' . md5($GLOBALS['songlistModuleConfig']['bitly_apikey']) . '.cookie';
-            if (!$ch = curl_init($source_url)) {
-                return $url;
-            }
-            curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($ch, CURLOPT_USERAGENT, $GLOBALS['songlistModuleConfig']['user_agent']);
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['songlistModuleConfig']['curl_connect_timeout']);
-            curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['songlistModuleConfig']['curl_timeout']);
-            $data = curl_exec($ch);
-            curl_close($ch);
-            $result                = songlist_object2array(json_decode($data));
-            $result['status_code'] = 200;
-            if ($result['status_code']) {
-                if (!empty($result['data']['url'])) {
-                    return $result['data']['url'];
-                }
-
-                return $url;
-            }
-
-            return $url;
-        }
-
-        return $url;
-    }
-
-    /**
-     * @param        $contents
-     * @param int    $get_attributes
-     * @param string $priority
-     * @return array|void
-     */
-    public static function xml2array($contents, $get_attributes = 1, $priority = 'tag')
-    {
-        if (!$contents) {
-            return [];
-        }
-
-        if (!function_exists('xml_parser_create')) {
-            return [];
-        }
-
-        //Get the XML parser of PHP - PHP must have this module for the parser to work
-        $parser = xml_parser_create('');
-        xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8'); # https://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
-        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-        xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-        xml_parse_into_struct($parser, trim($contents), $xml_values);
-        xml_parser_free($parser);
-
-        if (!$xml_values) {
-            return;
-        }//Hmm...
-
-        //Initializations
-        $xml_array   = [];
-        $parents     = [];
-        $opened_tags = [];
-        $arr         = [];
-
-        $current = &$xml_array; //Refference
-
-        //Go through the tags.
-        $repeated_tag_index = []; //Multiple tags with same name will be turned into an array
-        foreach ($xml_values as $data) {
-            unset($attributes, $value); //Remove existing values, or there will be trouble
-
-            //This command will extract these variables into the foreach scope
-            // tag(string), type(string), level(int), attributes(array).
-            extract($data); //We could use the array by itself, but this cooler.
-
-            $result          = [];
-            $attributes_data = [];
-
-            if (isset($value)) {
-                if ('tag' === $priority) {
-                    $result = $value;
-                } else {
-                    $result['value'] = $value;
-                } //Put the value in a assoc array if we are in the 'Attribute' mode
-            }
-
-            //Set the attributes too.
-            if (isset($attributes) and $get_attributes) {
-                foreach ($attributes as $attr => $val) {
-                    if ('tag' === $priority) {
-                        $attributes_data[$attr] = $val;
-                    } else {
-                        $result['attr'][$attr] = $val;
-                    } //Set all the attributes in a array called 'attr'
-                }
-            }
-
-            //See tag status and do the needed.
-            if ('open' === $type) {//The starting of the tag '<tag>'
-                $parent[$level - 1] = &$current;
-                if (!is_array($current) or (!array_key_exists($tag, $current))) { //Insert New tag
-                    $current[$tag] = $result;
-                    if ($attributes_data) {
-                        $current[$tag . '_attr'] = $attributes_data;
-                    }
-                    $repeated_tag_index[$tag . '_' . $level] = 1;
-
-                    $current = &$current[$tag];
-                } else { //There was another element with the same tag name
-                    if (isset($current[$tag][0])) {//If there is a 0th element it is already an array
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
-                        $repeated_tag_index[$tag . '_' . $level]++;
-                    } else {//This section will make the value an array if multiple tags with the same name appear together
-                        $current[$tag]                           = [$current[$tag], $result]; //This will combine the existing item and the new item together to make an array
-                        $repeated_tag_index[$tag . '_' . $level] = 2;
-
-                        if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
-                            $current[$tag]['0_attr'] = $current[$tag . '_attr'];
-                            unset($current[$tag . '_attr']);
-                        }
-                    }
-                    $last_item_index = $repeated_tag_index[$tag . '_' . $level] - 1;
-                    $current         = &$current[$tag][$last_item_index];
-                }
-            } elseif ('complete' === $type) { //Tags that ends in 1 line '<tag>'
-                //See if the key is already taken.
-                if (isset($current[$tag])) { //If taken, put all things inside a list(array)
-                    if (isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
-                        // ...push the new element into that array.
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
-
-                        if ('tag' === $priority and $get_attributes and $attributes_data) {
-                            $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
-                        }
-                        $repeated_tag_index[$tag . '_' . $level]++;
-                    } else { //If it is not an array...
-                        $current[$tag]                           = [$current[$tag], $result]; //...Make it an array using using the existing value and the new value
-                        $repeated_tag_index[$tag . '_' . $level] = 1;
-                        if ('tag' === $priority and $get_attributes) {
-                            if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
-                                $current[$tag]['0_attr'] = $current[$tag . '_attr'];
-                                unset($current[$tag . '_attr']);
-                            }
-
-                            if ($attributes_data) {
-                                $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
-                            }
-                        }
-                        $repeated_tag_index[$tag . '_' . $level]++; //0 and 1 index is already taken
-                    }
-                } else { //New Key
-                    $current[$tag]                           = $result;
-                    $repeated_tag_index[$tag . '_' . $level] = 1;
-                    if ('tag' === $priority and $attributes_data) {
-                        $current[$tag . '_attr'] = $attributes_data;
-                    }
-                }
-            } elseif ('close' === $type) { //End of tag '</tag>'
-                $current = &$parent[$level - 1];
-            }
-        }
-
-        return $xml_array;
-    }
-
-    /**
-     * @param $array
-     * @param $name
-     * @param $standalone
-     * @param $beginning
-     * @param $nested
-     * @return string
-     */
-    public static function toXml($array, $name, $standalone, $beginning, $nested): string
-    {
-        $output = '';
-        if ($beginning) {
-            if ($standalone) {
-                header('content-type:text/xml;charset=' . _CHARSET);
-            }
-            $output .= '<' . '?' . 'xml version="1.0" encoding="' . _CHARSET . '"' . '?' . '>' . "\n";
-            $output .= '<' . $name . '>' . "\n";
-            $nested = 0;
-        }
-
-        if (is_array($array)) {
-            foreach ($array as $key => $value) {
-                ++$nested;
-                if (is_array($value)) {
-                    $output .= str_repeat("\t", (int)$nested) . '<' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
-                    ++$nested;
-                    $output .= static::toXml($value, $name, false, false, $nested);
-                    $nested--;
-                    $output .= str_repeat("\t", (int)$nested) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
-                } elseif ('' != $value) {
-                    ++$nested;
-                    $output .= str_repeat("\t", (int)$nested) . '  <' . (is_string($key) ? $key : $name . '_' . $key) . '>' . trim($value) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
-                    $nested--;
-                }
-                $nested--;
-            }
-        } elseif ('' != $array) {
-            ++$nested;
-            $output .= str_repeat("\t", (int)$nested) . trim($array) . "\n";
-            $nested--;
-        }
-
-        if ($beginning) {
-            $output .= '</' . $name . '>';
-
-            return $output;
-        }
-
-        return $output;
-    }
+	//--------------- Custom module methods -----------------------------
+	/**
+	 * Function responsible for checking if a directory exists, we can also write in and create an index.html file
+	 *
+	 * @param string $folder The full path of the directory to check
+	 */
+	public static function createFolder($folder): void
+	{
+		//        try {
+		//            if (!is_dir($folder) && !mkdir($folder) && !is_dir($folder)) {
+		//                throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
+		//            } else {
+		//                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+		//            }
+		//        }
+		//        catch (\Exception $e) {
+		//            echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		//        }
+		try {
+			if (!\is_dir($folder)) {
+				if (!\is_dir($folder) && !\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>');
+			}
+		} catch (\Throwable $e) {
+			echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
+		}
+	}
+
+	/**
+	 * @param string $file
+	 * @param string $folder
+	 * @return bool
+	 */
+	public static function copyFile(string $file, string $folder): bool
+	{
+		return \copy($file, $folder);
+		//        try {
+		//            if (!is_dir($folder)) {
+		//                throw new \RuntimeException(sprintf('Unable to copy file as: %s ', $folder));
+		//            } else {
+		//                return copy($file, $folder);
+		//            }
+		//        } catch (\Exception $e) {
+		//            echo 'Caught exception: ', $e->getMessage(), "\n", "<br>";
+		//        }
+		//        return false;
+	}
+
+	/**
+	 * @param $src
+	 * @param $dst
+	 */
+	public static function recurseCopy($src, $dst): void
+	{
+		$dir = \opendir($src);
+		//    @mkdir($dst);
+		while (false !== ($file = \readdir($dir))) {
+			if (('.' !== $file) && ('..' !== $file)) {
+				if (\is_dir($src . '/' . $file)) {
+					self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+				} else {
+					\copy($src . '/' . $file, $dst . '/' . $file);
+				}
+			}
+		}
+		\closedir($dir);
+	}
+
+	/**
+	 * Verifies XOOPS version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule|null $module
+	 *
+	 * @param null|string       $requiredVer
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null): bool
+	{
+		$moduleDirName = \basename(\dirname(__DIR__));
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		\xoops_loadLanguage('admin', $moduleDirName);
+		\xoops_loadLanguage('common', $moduleDirName);
+
+		//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
+		}
+		$success = true;
+
+		if (\version_compare($currentVer, $requiredVer, '<')) {
+			$success = false;
+			$module->setErrors(\sprintf(\_AM_SONGLIST_ERROR_BAD_XOOPS, $requiredVer, $currentVer));
+		}
+
+		return $success;
+	}
+
+	/**
+	 * Verifies PHP version meets minimum requirements for this module
+	 * @static
+	 * @param \XoopsModule|bool|null $module
+	 *
+	 * @return bool true if meets requirements, false if not
+	 */
+	public static function checkVerPhp(\XoopsModule $module = null): bool
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		if (null === $module) {
+			$module = \XoopsModule::getByDirname($moduleDirName);
+		}
+		\xoops_loadLanguage('admin', $moduleDirName);
+		\xoops_loadLanguage('common', $moduleDirName);
+
+		// check for minimum PHP version
+		$success = true;
+
+		$verNum = \PHP_VERSION;
+		$reqVer = &$module->getInfo('min_php');
+
+		if (false !== $reqVer && '' !== $reqVer) {
+			if (\version_compare($verNum, $reqVer, '<')) {
+				$module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
+				$success = false;
+			}
+		}
+
+		return $success;
+	}
+
+	/**
+	 * compares current module version with the latest GitHub release
+	 * @static
+	 *
+	 * @return string|array info about the latest module version, if newer
+	 */
+	public static function checkVerModule(\Xmf\Module\Helper $helper, ?string $source = 'github', ?string $default = 'master'): ?array
+	{
+		$moduleDirName      = \basename(\dirname(__DIR__, 2));
+		$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+		$update             = '';
+		$repository         = 'XoopsModules25x/' . $moduleDirName;
+		//        $repository         = 'XoopsModules25x/publisher'; //for testing only
+		$ret             = null;
+		$infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
+		if ('github' === $source) {
+			if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) {
+				\curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl);
+				\curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
+				\curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, true); //TODO: how to avoid an error when 'Peer's Certificate issuer is not recognized'
+				\curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]);
+				$curlReturn = \curl_exec($curlHandle);
+				if (false === $curlReturn) {
+					\trigger_error(\curl_error($curlHandle));
+				} elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
+					\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;
+					}
+					//"PHP-standardized" version
+					$latestVersion = \mb_strtolower($latestVersion);
+					if (false !== mb_strpos($latestVersion, 'final')) {
+						$latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion));
+						$latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion));
+					}
+					$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
+					//                    $moduleDirName = 'publisher'; //for testing only
+					if (!$prerelease && \version_compare($moduleVersion, $latestVersion, '<')) {
+						$ret   = [];
+						$ret[] = $update;
+						$ret[] = $latestVersionLink;
+					}
+				}
+				\curl_close($curlHandle);
+			}
+		}
+
+		return $ret;
+	}
+
+	//=========================================================
+
+	/**
+	 * @return mixed
+	 */
+	public static function getToken()
+	{
+		$sql    = 'SELECT md5(rand()/rand()*rand()/rand()*rand()*rand()/rand()*rand()) as `salt`';
+		$result = $GLOBALS['xoopsDB']->queryF($sql);
+		[$salt] = $GLOBALS['xoopsDB']->fetchRow($result);
+
+		return $salt;
+	}
+
+	/**
+	 * @param $string
+	 * @return string
+	 */
+	public static function ucword($string): string
+	{
+		$ret = [];
+		foreach (explode(' ', \mb_strtolower($string)) as $part) {
+			$ret[] = ucfirst($part);
+		}
+
+		return implode(' ', $ret);
+	}
+
+	/**
+	 * @param bool|string $ip
+	 * @return array
+	 */
+	public static function getIPData($ip = false): array
+	{
+		$ret = [];
+		if (is_object($GLOBALS['xoopsUser'])) {
+			$ret['uid']   = $GLOBALS['xoopsUser']->getVar('uid');
+			$ret['uname'] = $GLOBALS['xoopsUser']->getVar('uname');
+			$ret['email'] = $GLOBALS['xoopsUser']->getVar('email');
+		} else {
+			$ret['uid']   = 0;
+			$ret['uname'] = ($_REQUEST['uname'] ?? '');
+			$ret['email'] = ($_REQUEST['email'] ?? '');
+		}
+		$ret['agent'] = $_SERVER['HTTP_USER_AGENT'];
+		if ($ip) {
+			$ret['is_proxied']   = false;
+			$ret['network-addy'] = @gethostbyaddr($ip);
+			$ret['long']         = @ip2long($ip);
+			if (isIpv6($ip)) {
+				$ret['ip6'] = true;
+				$ret['ip4'] = false;
+			} else {
+				$ret['ip4'] = true;
+				$ret['ip6'] = false;
+			}
+			$ret['ip'] = $ip;
+		} elseif (Request::hasVar('HTTP_X_FORWARDED_FOR', 'SERVER')) {
+			$ip                  = $_SERVER['HTTP_X_FORWARDED_FOR'];
+			$ret['is_proxied']   = true;
+			$proxy_ip            = $_SERVER['REMOTE_ADDR'];
+			$ret['network-addy'] = @gethostbyaddr($ip);
+			$ret['long']         = @ip2long($ip);
+			if (isIpv6($ip)) {
+				$ret['ip6']       = true;
+				$ret['proxy-ip6'] = true;
+				$ret['ip4']       = false;
+				$ret['proxy-ip4'] = false;
+			} else {
+				$ret['ip4']       = true;
+				$ret['proxy-ip4'] = true;
+				$ret['ip6']       = false;
+				$ret['proxy-ip6'] = false;
+			}
+			$ret['ip']       = $ip;
+			$ret['proxy-ip'] = $proxy_ip;
+		} else {
+			$ret['is_proxied']   = false;
+			$ip                  = $_SERVER['REMOTE_ADDR'];
+			$ret['network-addy'] = @gethostbyaddr($ip);
+			$ret['long']         = @ip2long($ip);
+			if (isIpv6($ip)) {
+				$ret['ip6'] = true;
+				$ret['ip4'] = false;
+			} else {
+				$ret['ip4'] = true;
+				$ret['ip6'] = false;
+			}
+			$ret['ip'] = $ip;
+		}
+		$ret['made'] = time();
+
+		return $ret;
+	}
+
+	/**
+	 * @param string $ip
+	 * @return bool
+	 */
+	public static function isIpv6($ip = ''): bool
+	{
+		if ('' == $ip) {
+			return false;
+		}
+
+		if (mb_substr_count($ip, ':') > 0) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param        $filter
+	 * @param        $field
+	 * @param string $sort
+	 * @param string $op
+	 * @param string $fct
+	 * @return bool|\XoopsModules\Songlist\Form\SelectAlbumForm|\XoopsModules\Songlist\Form\SelectArtistForm|\XoopsModules\Songlist\Form\SelectCategoryForm|\XoopsModules\Songlist\Form\SelectGenreForm|\XoopsModules\Songlist\Form\SelectVoiceForm
+	 */
+	public static function getFilterElement($filter, $field, $sort = 'created', $op = '', $fct = '')
+	{
+		$components = static::getFilterURLComponents($filter, $field, $sort);
+		$ele        = false;
+		require_once dirname(__DIR__) . '/include/songlist.object.php';
+		switch ($field) {
+			case 'gid':
+				if ('genre' !== $op) {
+					$ele = new SelectGenreForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'vcid':
+				if ('voice' !== $op) {
+					$ele = new SelectVoiceForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'cid':
+				if ('category' !== $op) {
+					$ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'pid':
+				$ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
+				$ele->setExtra(
+					'onchange="window.open(\''
+					. $_SERVER['SCRIPT_NAME']
+					. '?'
+					. $components['extra']
+					. '&filter='
+					. $components['filter']
+					. (!empty($components['filter']) ? '|' : '')
+					. $field
+					. ',\'+this.options[this.selectedIndex].value'
+					. (!empty($components['operator']) ? '+\','
+														 . $components['operator']
+														 . '\'' : '')
+					. ',\'_self\')"'
+				);
+				break;
+			case 'abid':
+				if ('albums' !== $op) {
+					$ele = new SelectAlbumForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'aid':
+				if ('artists' !== $op) {
+					$ele = new SelectArtistForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'sid':
+				if ('songs' !== $op) {
+					$ele = new SelectSongForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'name':
+			case 'title':
+			case 'artists':
+			case 'albums':
+			case 'songs':
+			case 'hits':
+			case 'rank':
+			case 'votes':
+			case 'description':
+			case 'lyrics':
+			case 'songid':
+			case 'tags':
+				$ele = new \XoopsFormElementTray('');
+				$ele->addElement(new \XoopsFormText('', 'filter_' . $field . '', 11, 40, $components['value']));
+				$button = new \XoopsFormButton('', 'button_' . $field . '', '[+]');
+				$button->setExtra(
+					'onclick="window.open(\''
+					. $_SERVER['SCRIPT_NAME']
+					. '?'
+					. $components['extra']
+					. '&filter='
+					. $components['filter']
+					. (!empty($components['filter']) ? '|' : '')
+					. $field
+					. ',\'+$(\'#filter_'
+					. $field
+					. '\').val()'
+					. (!empty($components['operator']) ? '+\','
+														 . $components['operator']
+														 . '\'' : '')
+					. ',\'_self\')"'
+				);
+				$ele->addElement($button);
+				break;
+		}
+
+		return $ele;
+	}
+
+	/**
+	 * @param        $filter
+	 * @param        $field
+	 * @param string $sort
+	 * @return array
+	 */
+	public static function getFilterURLComponents($filter, $field, $sort = 'created'): array
+	{
+		$parts     = explode('|', $filter);
+		$ret       = [];
+		$value     = '';
+		$ele_value = '';
+		$operator  = '';
+		foreach ($parts as $part) {
+			$var = explode(',', $part);
+			if (count($var) > 1) {
+				if ($var[0] == $field) {
+					$ele_value = $var[1];
+					if (isset($var[2])) {
+						$operator = $var[2];
+					}
+				} elseif (1 != $var[0]) {
+					$ret[] = implode(',', $var);
+				}
+			}
+		}
+		$pagenav          = [];
+		$pagenav['op']    = $_REQUEST['op'] ?? 'videos';
+		$pagenav['fct']   = $_REQUEST['fct'] ?? 'list';
+		$pagenav['limit'] = Request::getInt('limit', 30, 'REQUEST');
+		$pagenav['start'] = 0;
+		$pagenav['order'] = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
+		$pagenav['sort']  = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : $sort;
+		$retb             = [];
+		foreach ($pagenav as $key => $value) {
+			$retb[] = "$key=$value";
+		}
+
+		return ['value' => $ele_value, 'field' => $field, 'operator' => $operator, 'filter' => implode('|', $ret), 'extra' => implode('&', $retb)];
+	}
+
+	/**
+	 * @param $objects
+	 * @return array
+	 */
+	public static function obj2array($objects): array
+	{
+		$ret = [];
+		foreach ((array)$objects as $key => $value) {
+			if (is_a($value, 'stdClass')) {
+				$ret[$key] = static::obj2array($value);
+			} elseif (is_array($value)) {
+				$ret[$key] = static::obj2array($value);
+			} else {
+				$ret[$key] = $value;
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $url
+	 * @return mixed
+	 */
+	public static function shortenUrl($url)
+	{
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		/** @var \XoopsConfigHandler $configHandler */
+		$configHandler                   = xoops_getHandler('config');
+		$GLOBALS['songlistModule']       = $moduleHandler->getByDirname('songlist');
+		$GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
+
+		if (!empty($GLOBALS['songlistModuleConfig']['bitly_username']) && !empty($GLOBALS['songlistModuleConfig']['bitly_apikey'])) {
+			$source_url = $GLOBALS['songlistModuleConfig']['bitly_apiurl'] . '/shorten?login=' . $GLOBALS['songlistModuleConfig']['bitly_username'] . '&apiKey=' . $GLOBALS['songlistModuleConfig']['bitly_apikey'] . '&format=json&longUrl=' . urlencode($url);
+			$cookies    = XOOPS_ROOT_PATH . '/uploads/songlist_' . md5($GLOBALS['songlistModuleConfig']['bitly_apikey']) . '.cookie';
+			if (!$ch = curl_init($source_url)) {
+				return $url;
+			}
+			curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_USERAGENT, $GLOBALS['songlistModuleConfig']['user_agent']);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['songlistModuleConfig']['curl_connect_timeout']);
+			curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['songlistModuleConfig']['curl_timeout']);
+			$data = curl_exec($ch);
+			curl_close($ch);
+			$result                = songlist_object2array(json_decode($data));
+			$result['status_code'] = 200;
+			if ($result['status_code']) {
+				if (!empty($result['data']['url'])) {
+					return $result['data']['url'];
+				}
+
+				return $url;
+			}
+
+			return $url;
+		}
+
+		return $url;
+	}
+
+	/**
+	 * @param        $contents
+	 * @param int    $get_attributes
+	 * @param string $priority
+	 * @return array|void
+	 */
+	public static function xml2array($contents, $get_attributes = 1, $priority = 'tag')
+	{
+		if (!$contents) {
+			return [];
+		}
+
+		if (!function_exists('xml_parser_create')) {
+			return [];
+		}
+
+		//Get the XML parser of PHP - PHP must have this module for the parser to work
+		$parser = xml_parser_create('');
+		xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8'); # https://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+		xml_parse_into_struct($parser, trim($contents), $xml_values);
+		xml_parser_free($parser);
+
+		if (!$xml_values) {
+			return;
+		}//Hmm...
+
+		//Initializations
+		$xml_array   = [];
+		$parents     = [];
+		$opened_tags = [];
+		$arr         = [];
+
+		$current = &$xml_array; //Refference
+
+		//Go through the tags.
+		$repeated_tag_index = []; //Multiple tags with same name will be turned into an array
+		foreach ($xml_values as $data) {
+			unset($attributes, $value); //Remove existing values, or there will be trouble
+
+			//This command will extract these variables into the foreach scope
+			// tag(string), type(string), level(int), attributes(array).
+			extract($data); //We could use the array by itself, but this cooler.
+
+			$result          = [];
+			$attributes_data = [];
+
+			if (isset($value)) {
+				if ('tag' === $priority) {
+					$result = $value;
+				} else {
+					$result['value'] = $value;
+				} //Put the value in a assoc array if we are in the 'Attribute' mode
+			}
+
+			//Set the attributes too.
+			if (isset($attributes) and $get_attributes) {
+				foreach ($attributes as $attr => $val) {
+					if ('tag' === $priority) {
+						$attributes_data[$attr] = $val;
+					} else {
+						$result['attr'][$attr] = $val;
+					} //Set all the attributes in a array called 'attr'
+				}
+			}
+
+			//See tag status and do the needed.
+			if ('open' === $type) {//The starting of the tag '<tag>'
+				$parent[$level - 1] = &$current;
+				if (!is_array($current) or (!array_key_exists($tag, $current))) { //Insert New tag
+					$current[$tag] = $result;
+					if ($attributes_data) {
+						$current[$tag . '_attr'] = $attributes_data;
+					}
+					$repeated_tag_index[$tag . '_' . $level] = 1;
+
+					$current = &$current[$tag];
+				} else { //There was another element with the same tag name
+					if (isset($current[$tag][0])) {//If there is a 0th element it is already an array
+						$current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
+						$repeated_tag_index[$tag . '_' . $level]++;
+					} else {//This section will make the value an array if multiple tags with the same name appear together
+						$current[$tag]                           = [$current[$tag], $result]; //This will combine the existing item and the new item together to make an array
+						$repeated_tag_index[$tag . '_' . $level] = 2;
+
+						if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
+							$current[$tag]['0_attr'] = $current[$tag . '_attr'];
+							unset($current[$tag . '_attr']);
+						}
+					}
+					$last_item_index = $repeated_tag_index[$tag . '_' . $level] - 1;
+					$current         = &$current[$tag][$last_item_index];
+				}
+			} elseif ('complete' === $type) { //Tags that ends in 1 line '<tag>'
+				//See if the key is already taken.
+				if (isset($current[$tag])) { //If taken, put all things inside a list(array)
+					if (isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
+						// ...push the new element into that array.
+						$current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
+
+						if ('tag' === $priority and $get_attributes and $attributes_data) {
+							$current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+						}
+						$repeated_tag_index[$tag . '_' . $level]++;
+					} else { //If it is not an array...
+						$current[$tag]                           = [$current[$tag], $result]; //...Make it an array using using the existing value and the new value
+						$repeated_tag_index[$tag . '_' . $level] = 1;
+						if ('tag' === $priority and $get_attributes) {
+							if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
+								$current[$tag]['0_attr'] = $current[$tag . '_attr'];
+								unset($current[$tag . '_attr']);
+							}
+
+							if ($attributes_data) {
+								$current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+							}
+						}
+						$repeated_tag_index[$tag . '_' . $level]++; //0 and 1 index is already taken
+					}
+				} else { //New Key
+					$current[$tag]                           = $result;
+					$repeated_tag_index[$tag . '_' . $level] = 1;
+					if ('tag' === $priority and $attributes_data) {
+						$current[$tag . '_attr'] = $attributes_data;
+					}
+				}
+			} elseif ('close' === $type) { //End of tag '</tag>'
+				$current = &$parent[$level - 1];
+			}
+		}
+
+		return $xml_array;
+	}
+
+	/**
+	 * @param $array
+	 * @param $name
+	 * @param $standalone
+	 * @param $beginning
+	 * @param $nested
+	 * @return string
+	 */
+	public static function toXml($array, $name, $standalone, $beginning, $nested): string
+	{
+		$output = '';
+		if ($beginning) {
+			if ($standalone) {
+				header('content-type:text/xml;charset=' . _CHARSET);
+			}
+			$output .= '<' . '?' . 'xml version="1.0" encoding="' . _CHARSET . '"' . '?' . '>' . "\n";
+			$output .= '<' . $name . '>' . "\n";
+			$nested = 0;
+		}
+
+		if (is_array($array)) {
+			foreach ($array as $key => $value) {
+				++$nested;
+				if (is_array($value)) {
+					$output .= str_repeat("\t", (int)$nested) . '<' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+					++$nested;
+					$output .= static::toXml($value, $name, false, false, $nested);
+					$nested--;
+					$output .= str_repeat("\t", (int)$nested) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+				} elseif ('' != $value) {
+					++$nested;
+					$output .= str_repeat("\t", (int)$nested) . '  <' . (is_string($key) ? $key : $name . '_' . $key) . '>' . trim($value) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+					$nested--;
+				}
+				$nested--;
+			}
+		} elseif ('' != $array) {
+			++$nested;
+			$output .= str_repeat("\t", (int)$nested) . trim($array) . "\n";
+			$nested--;
+		}
+
+		if ($beginning) {
+			$output .= '</' . $name . '>';
+
+			return $output;
+		}
+
+		return $output;
+	}
     
 }

Spacing +87 added lines, -87 removed lines

@@ -41,7 +41,7 @@ 
                 if (!\is_dir($folder) && !\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 (\Throwable $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -76,12 +76,12 @@ 
     {
         $dir = \opendir($src);
         //    @mkdir($dst);
-        while (false !== ($file = \readdir($dir))) {
-            if (('.' !== $file) && ('..' !== $file)) {
-                if (\is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+        while (false!==($file = \readdir($dir))) {
+            if (('.'!==$file) && ('..'!==$file)) {
+                if (\is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    \copy($src . '/' . $file, $dst . '/' . $file);
+                    \copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -99,7 +99,7 @@ 
     public static function checkVerXoops(\XoopsModule $module = null, $requiredVer = null): bool
     {
         $moduleDirName = \basename(\dirname(__DIR__));
-        if (null === $module) {
+        if (null===$module) {
             $module = \XoopsModule::getByDirname($moduleDirName);
         }
         \xoops_loadLanguage('admin', $moduleDirName);
@@ -107,8 +107,8 @@ 
 
         //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
+        if (null===$requiredVer) {
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $success = true;
 
@@ -131,7 +131,7 @@ 
     {
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-        if (null === $module) {
+        if (null===$module) {
             $module = \XoopsModule::getByDirname($moduleDirName);
         }
         \xoops_loadLanguage('admin', $moduleDirName);
@@ -143,9 +143,9 @@ 
         $verNum = \PHP_VERSION;
         $reqVer = &$module->getInfo('min_php');
 
-        if (false !== $reqVer && '' !== $reqVer) {
+        if (false!==$reqVer && ''!==$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;
             }
         }
@@ -164,36 +164,36 @@ 
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
         $update             = '';
-        $repository         = 'XoopsModules25x/' . $moduleDirName;
+        $repository         = 'XoopsModules25x/'.$moduleDirName;
         //        $repository         = 'XoopsModules25x/publisher'; //for testing only
         $ret             = null;
         $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
-        if ('github' === $source) {
-            if (\function_exists('curl_init') && false !== ($curlHandle = \curl_init())) {
+        if ('github'===$source) {
+            if (\function_exists('curl_init') && false!==($curlHandle = \curl_init())) {
                 \curl_setopt($curlHandle, \CURLOPT_URL, $infoReleasesUrl);
                 \curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
                 \curl_setopt($curlHandle, \CURLOPT_SSL_VERIFYPEER, true); //TODO: how to avoid an error when 'Peer's Certificate issuer is not recognized'
                 \curl_setopt($curlHandle, \CURLOPT_HTTPHEADER, ["User-Agent:Publisher\r\n"]);
                 $curlReturn = \curl_exec($curlHandle);
-                if (false === $curlReturn) {
+                if (false===$curlReturn) {
                     \trigger_error(\curl_error($curlHandle));
-                } elseif (false !== \mb_strpos($curlReturn, 'Not Found')) {
-                    \trigger_error('Repository Not Found: ' . $infoReleasesUrl);
+                } elseif (false!==\mb_strpos($curlReturn, 'Not Found')) {
+                    \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;
+                    if ('master'!==$latestVersionLink) {
+                        $update = \constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;
                     }
                     //"PHP-standardized" version
                     $latestVersion = \mb_strtolower($latestVersion);
-                    if (false !== mb_strpos($latestVersion, 'final')) {
+                    if (false!==mb_strpos($latestVersion, 'final')) {
                         $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
@@ -312,11 +312,11 @@ 
      */
     public static function isIpv6($ip = ''): bool
     {
-        if ('' == $ip) {
+        if (''==$ip) {
             return false;
         }
 
-        if (mb_substr_count($ip, ':') > 0) {
+        if (mb_substr_count($ip, ':')>0) {
             return true;
         }
 
@@ -335,11 +335,11 @@ 
     {
         $components = static::getFilterURLComponents($filter, $field, $sort);
         $ele        = false;
-        require_once dirname(__DIR__) . '/include/songlist.object.php';
+        require_once dirname(__DIR__).'/include/songlist.object.php';
         switch ($field) {
             case 'gid':
-                if ('genre' !== $op) {
-                    $ele = new SelectGenreForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('genre'!==$op) {
+                    $ele = new SelectGenreForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -358,8 +358,8 @@ 
                 }
                 break;
             case 'vcid':
-                if ('voice' !== $op) {
-                    $ele = new SelectVoiceForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('voice'!==$op) {
+                    $ele = new SelectVoiceForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -378,8 +378,8 @@ 
                 }
                 break;
             case 'cid':
-                if ('category' !== $op) {
-                    $ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('category'!==$op) {
+                    $ele = new SelectCategoryForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -398,7 +398,7 @@ 
                 }
                 break;
             case 'pid':
-                $ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                $ele = new SelectCategoryForm('', 'filter_'.$field.'', $components['value'], 1, false);
                 $ele->setExtra(
                     'onchange="window.open(\''
                     . $_SERVER['SCRIPT_NAME']
@@ -416,8 +416,8 @@ 
                 );
                 break;
             case 'abid':
-                if ('albums' !== $op) {
-                    $ele = new SelectAlbumForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('albums'!==$op) {
+                    $ele = new SelectAlbumForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -436,8 +436,8 @@ 
                 }
                 break;
             case 'aid':
-                if ('artists' !== $op) {
-                    $ele = new SelectArtistForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('artists'!==$op) {
+                    $ele = new SelectArtistForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -456,8 +456,8 @@ 
                 }
                 break;
             case 'sid':
-                if ('songs' !== $op) {
-                    $ele = new SelectSongForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('songs'!==$op) {
+                    $ele = new SelectSongForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -488,8 +488,8 @@ 
             case 'songid':
             case 'tags':
                 $ele = new \XoopsFormElementTray('');
-                $ele->addElement(new \XoopsFormText('', 'filter_' . $field . '', 11, 40, $components['value']));
-                $button = new \XoopsFormButton('', 'button_' . $field . '', '[+]');
+                $ele->addElement(new \XoopsFormText('', 'filter_'.$field.'', 11, 40, $components['value']));
+                $button = new \XoopsFormButton('', 'button_'.$field.'', '[+]');
                 $button->setExtra(
                     'onclick="window.open(\''
                     . $_SERVER['SCRIPT_NAME']
@@ -529,13 +529,13 @@ 
         $operator  = '';
         foreach ($parts as $part) {
             $var = explode(',', $part);
-            if (count($var) > 1) {
-                if ($var[0] == $field) {
+            if (count($var)>1) {
+                if ($var[0]==$field) {
                     $ele_value = $var[1];
                     if (isset($var[2])) {
                         $operator = $var[2];
                     }
-                } elseif (1 != $var[0]) {
+                } elseif (1!=$var[0]) {
                     $ret[] = implode(',', $var);
                 }
             }
@@ -546,7 +546,7 @@ 
         $pagenav['limit'] = Request::getInt('limit', 30, 'REQUEST');
         $pagenav['start'] = 0;
         $pagenav['order'] = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-        $pagenav['sort']  = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : $sort;
+        $pagenav['sort']  = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : $sort;
         $retb             = [];
         foreach ($pagenav as $key => $value) {
             $retb[] = "$key=$value";
@@ -562,7 +562,7 @@ 
     public static function obj2array($objects): array
     {
         $ret = [];
-        foreach ((array)$objects as $key => $value) {
+        foreach ((array) $objects as $key => $value) {
             if (is_a($value, 'stdClass')) {
                 $ret[$key] = static::obj2array($value);
             } elseif (is_array($value)) {
@@ -589,8 +589,8 @@ 
         $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
 
         if (!empty($GLOBALS['songlistModuleConfig']['bitly_username']) && !empty($GLOBALS['songlistModuleConfig']['bitly_apikey'])) {
-            $source_url = $GLOBALS['songlistModuleConfig']['bitly_apiurl'] . '/shorten?login=' . $GLOBALS['songlistModuleConfig']['bitly_username'] . '&apiKey=' . $GLOBALS['songlistModuleConfig']['bitly_apikey'] . '&format=json&longUrl=' . urlencode($url);
-            $cookies    = XOOPS_ROOT_PATH . '/uploads/songlist_' . md5($GLOBALS['songlistModuleConfig']['bitly_apikey']) . '.cookie';
+            $source_url = $GLOBALS['songlistModuleConfig']['bitly_apiurl'].'/shorten?login='.$GLOBALS['songlistModuleConfig']['bitly_username'].'&apiKey='.$GLOBALS['songlistModuleConfig']['bitly_apikey'].'&format=json&longUrl='.urlencode($url);
+            $cookies    = XOOPS_ROOT_PATH.'/uploads/songlist_'.md5($GLOBALS['songlistModuleConfig']['bitly_apikey']).'.cookie';
             if (!$ch = curl_init($source_url)) {
                 return $url;
             }
@@ -666,7 +666,7 @@ 
             $attributes_data = [];
 
             if (isset($value)) {
-                if ('tag' === $priority) {
+                if ('tag'===$priority) {
                     $result = $value;
                 } else {
                     $result['value'] = $value;
@@ -676,7 +676,7 @@ 
             //Set the attributes too.
             if (isset($attributes) and $get_attributes) {
                 foreach ($attributes as $attr => $val) {
-                    if ('tag' === $priority) {
+                    if ('tag'===$priority) {
                         $attributes_data[$attr] = $val;
                     } else {
                         $result['attr'][$attr] = $val;
@@ -685,67 +685,67 @@ 
             }
 
             //See tag status and do the needed.
-            if ('open' === $type) {//The starting of the tag '<tag>'
-                $parent[$level - 1] = &$current;
+            if ('open'===$type) {//The starting of the tag '<tag>'
+                $parent[$level-1] = &$current;
                 if (!is_array($current) or (!array_key_exists($tag, $current))) { //Insert New tag
                     $current[$tag] = $result;
                     if ($attributes_data) {
-                        $current[$tag . '_attr'] = $attributes_data;
+                        $current[$tag.'_attr'] = $attributes_data;
                     }
-                    $repeated_tag_index[$tag . '_' . $level] = 1;
+                    $repeated_tag_index[$tag.'_'.$level] = 1;
 
                     $current = &$current[$tag];
                 } else { //There was another element with the same tag name
                     if (isset($current[$tag][0])) {//If there is a 0th element it is already an array
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
-                        $repeated_tag_index[$tag . '_' . $level]++;
+                        $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
+                        $repeated_tag_index[$tag.'_'.$level]++;
                     } else {//This section will make the value an array if multiple tags with the same name appear together
                         $current[$tag]                           = [$current[$tag], $result]; //This will combine the existing item and the new item together to make an array
-                        $repeated_tag_index[$tag . '_' . $level] = 2;
+                        $repeated_tag_index[$tag.'_'.$level] = 2;
 
-                        if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
-                            $current[$tag]['0_attr'] = $current[$tag . '_attr'];
-                            unset($current[$tag . '_attr']);
+                        if (isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
+                            $current[$tag]['0_attr'] = $current[$tag.'_attr'];
+                            unset($current[$tag.'_attr']);
                         }
                     }
-                    $last_item_index = $repeated_tag_index[$tag . '_' . $level] - 1;
+                    $last_item_index = $repeated_tag_index[$tag.'_'.$level]-1;
                     $current         = &$current[$tag][$last_item_index];
                 }
-            } elseif ('complete' === $type) { //Tags that ends in 1 line '<tag>'
+            } elseif ('complete'===$type) { //Tags that ends in 1 line '<tag>'
                 //See if the key is already taken.
                 if (isset($current[$tag])) { //If taken, put all things inside a list(array)
                     if (isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
                         // ...push the new element into that array.
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
+                        $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
 
-                        if ('tag' === $priority and $get_attributes and $attributes_data) {
-                            $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+                        if ('tag'===$priority and $get_attributes and $attributes_data) {
+                            $current[$tag][$repeated_tag_index[$tag.'_'.$level].'_attr'] = $attributes_data;
                         }
-                        $repeated_tag_index[$tag . '_' . $level]++;
+                        $repeated_tag_index[$tag.'_'.$level]++;
                     } else { //If it is not an array...
                         $current[$tag]                           = [$current[$tag], $result]; //...Make it an array using using the existing value and the new value
-                        $repeated_tag_index[$tag . '_' . $level] = 1;
-                        if ('tag' === $priority and $get_attributes) {
-                            if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
-                                $current[$tag]['0_attr'] = $current[$tag . '_attr'];
-                                unset($current[$tag . '_attr']);
+                        $repeated_tag_index[$tag.'_'.$level] = 1;
+                        if ('tag'===$priority and $get_attributes) {
+                            if (isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
+                                $current[$tag]['0_attr'] = $current[$tag.'_attr'];
+                                unset($current[$tag.'_attr']);
                             }
 
                             if ($attributes_data) {
-                                $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+                                $current[$tag][$repeated_tag_index[$tag.'_'.$level].'_attr'] = $attributes_data;
                             }
                         }
-                        $repeated_tag_index[$tag . '_' . $level]++; //0 and 1 index is already taken
+                        $repeated_tag_index[$tag.'_'.$level]++; //0 and 1 index is already taken
                     }
                 } else { //New Key
                     $current[$tag]                           = $result;
-                    $repeated_tag_index[$tag . '_' . $level] = 1;
-                    if ('tag' === $priority and $attributes_data) {
-                        $current[$tag . '_attr'] = $attributes_data;
+                    $repeated_tag_index[$tag.'_'.$level] = 1;
+                    if ('tag'===$priority and $attributes_data) {
+                        $current[$tag.'_attr'] = $attributes_data;
                     }
                 }
-            } elseif ('close' === $type) { //End of tag '</tag>'
-                $current = &$parent[$level - 1];
+            } elseif ('close'===$type) { //End of tag '</tag>'
+                $current = &$parent[$level-1];
             }
         }
 
@@ -765,10 +765,10 @@ 
         $output = '';
         if ($beginning) {
             if ($standalone) {
-                header('content-type:text/xml;charset=' . _CHARSET);
+                header('content-type:text/xml;charset='._CHARSET);
             }
-            $output .= '<' . '?' . 'xml version="1.0" encoding="' . _CHARSET . '"' . '?' . '>' . "\n";
-            $output .= '<' . $name . '>' . "\n";
+            $output .= '<'.'?'.'xml version="1.0" encoding="'._CHARSET.'"'.'?'.'>'."\n";
+            $output .= '<'.$name.'>'."\n";
             $nested = 0;
         }
 
@@ -776,26 +776,26 @@ 
             foreach ($array as $key => $value) {
                 ++$nested;
                 if (is_array($value)) {
-                    $output .= str_repeat("\t", (int)$nested) . '<' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+                    $output .= str_repeat("\t", (int) $nested).'<'.(is_string($key) ? $key : $name.'_'.$key).'>'."\n";
                     ++$nested;
                     $output .= static::toXml($value, $name, false, false, $nested);
                     $nested--;
-                    $output .= str_repeat("\t", (int)$nested) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
-                } elseif ('' != $value) {
+                    $output .= str_repeat("\t", (int) $nested).'</'.(is_string($key) ? $key : $name.'_'.$key).'>'."\n";
+                } elseif (''!=$value) {
                     ++$nested;
-                    $output .= str_repeat("\t", (int)$nested) . '  <' . (is_string($key) ? $key : $name . '_' . $key) . '>' . trim($value) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+                    $output .= str_repeat("\t", (int) $nested).'  <'.(is_string($key) ? $key : $name.'_'.$key).'>'.trim($value).'</'.(is_string($key) ? $key : $name.'_'.$key).'>'."\n";
                     $nested--;
                 }
                 $nested--;
             }
-        } elseif ('' != $array) {
+        } elseif (''!=$array) {
             ++$nested;
-            $output .= str_repeat("\t", (int)$nested) . trim($array) . "\n";
+            $output .= str_repeat("\t", (int) $nested).trim($array)."\n";
             $nested--;
         }
 
         if ($beginning) {
-            $output .= '</' . $name . '>';
+            $output .= '</'.$name.'>';
 
             return $output;
         }

class/GenreHandler.php

Indentation +162 added lines, -162 removed lines

@@ -11,121 +11,121 @@ 
  */
 class GenreHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * GenreHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'songlist_genre', Genre::class, 'gid', 'name');
-    }
-
-    /**
-     * @return array
-     */
-    public function filterFields(): array
-    {
-        return ['gid', 'name', 'artists', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated'];
-    }
-
-    /**
-     * @param $filter
-     * @return \CriteriaCompo
-     */
-    public function getFilterCriteria($filter): \CriteriaCompo
-    {
-        $parts    = \explode('|', $filter);
-        $criteria = new \CriteriaCompo();
-        foreach ($parts as $part) {
-            $var = \explode(',', $part);
-            if (!empty($var[1]) && !\is_numeric($var[0])) {
-                $object = $this->create();
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
-                } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
-                }
-            } elseif (!empty($var[1]) && \is_numeric($var[0])) {
-                $criteria->add(new \Criteria($var[0], $var[1]));
-            }
-        }
-
-        return $criteria;
-    }
-
-    /**
-     * @param        $filter
-     * @param        $field
-     * @param string $sort
-     * @param string $op
-     * @param string $fct
-     * @return string
-     */
-    public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
-    {
-        $ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
-        if (\is_object($ele)) {
-            return $ele->render();
-        }
-
-        return ' ';
-    }
-
-    /**
-     * @param bool $force
-     * @return bool|mixed
-     */
-    public function insert(\XoopsObject $obj, $force = true)
-    {
-        if ($obj->isNew()) {
-            $obj->setVar('created', \time());
-        } else {
-            $obj->setVar('updated', \time());
-        }
-        if ('' == $obj->getVar('name')) {
-            return false;
-        }
-
-        return parent::insert($obj, $force);
-    }
-
-    public $_objects = ['object' => [], 'array' => []];
-
-    /**
-     * @param null $id
-     * @param null $fields
-     * @return \XoopsObject
-     */
-    public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
-    {
-        $fields = $fields ?: '*';
-        if (!isset($this->_objects['object'][$id])) {
-            $this->_objects['object'][$id] = parent::get($id, $fields);
-            if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
-                $GLOBALS['xoopsDB']->queryF($sql);
-            }
-        }
-
-        return $this->_objects['object'][$id];
-    }
-
-    /**
-     * @param \CriteriaElement|\CriteriaCompo $criteria
-     * @param bool $id_as_key
-     * @param bool $as_object
-     * @return array
-     */
-    public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
-    {
-        $ret = parent::getObjects($criteria, $id_as_key, $as_object);
-
-        /*if (!isset($GLOBALS['songlistAdmin'])) {
+	/**
+	 * GenreHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'songlist_genre', Genre::class, 'gid', 'name');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function filterFields(): array
+	{
+		return ['gid', 'name', 'artists', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated'];
+	}
+
+	/**
+	 * @param $filter
+	 * @return \CriteriaCompo
+	 */
+	public function getFilterCriteria($filter): \CriteriaCompo
+	{
+		$parts    = \explode('|', $filter);
+		$criteria = new \CriteriaCompo();
+		foreach ($parts as $part) {
+			$var = \explode(',', $part);
+			if (!empty($var[1]) && !\is_numeric($var[0])) {
+				$object = $this->create();
+				if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
+					|| \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
+				} elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
+				} elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
+				} elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
+				}
+			} elseif (!empty($var[1]) && \is_numeric($var[0])) {
+				$criteria->add(new \Criteria($var[0], $var[1]));
+			}
+		}
+
+		return $criteria;
+	}
+
+	/**
+	 * @param        $filter
+	 * @param        $field
+	 * @param string $sort
+	 * @param string $op
+	 * @param string $fct
+	 * @return string
+	 */
+	public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
+	{
+		$ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
+		if (\is_object($ele)) {
+			return $ele->render();
+		}
+
+		return ' ';
+	}
+
+	/**
+	 * @param bool $force
+	 * @return bool|mixed
+	 */
+	public function insert(\XoopsObject $obj, $force = true)
+	{
+		if ($obj->isNew()) {
+			$obj->setVar('created', \time());
+		} else {
+			$obj->setVar('updated', \time());
+		}
+		if ('' == $obj->getVar('name')) {
+			return false;
+		}
+
+		return parent::insert($obj, $force);
+	}
+
+	public $_objects = ['object' => [], 'array' => []];
+
+	/**
+	 * @param null $id
+	 * @param null $fields
+	 * @return \XoopsObject
+	 */
+	public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
+	{
+		$fields = $fields ?: '*';
+		if (!isset($this->_objects['object'][$id])) {
+			$this->_objects['object'][$id] = parent::get($id, $fields);
+			if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
+				$sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+
+		return $this->_objects['object'][$id];
+	}
+
+	/**
+	 * @param \CriteriaElement|\CriteriaCompo $criteria
+	 * @param bool $id_as_key
+	 * @param bool $as_object
+	 * @return array
+	 */
+	public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
+	{
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
+
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
             $id = [];
             foreach($ret as $data) {
                 if ($as_object==true) {
@@ -146,51 +146,51 @@ 
             $GLOBALS['xoopsDB']->queryF($sql);
         }*/
 
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $id . '-' . \urlencode($value) . '-' . $gid . '-' . $cid . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
-
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&cid=' . $cid . '&start=' . $start;
-    }
-
-    /**
-     * @param int $limit
-     * @return array
-     */
-    public function getTop($limit = 1): array
-    {
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
-        $results = $GLOBALS['xoopsDB']->queryF($sql);
-        $ret     = [];
-        $i       = 0;
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
-            $ret[$i] = $this->create();
-            $ret[$i]->assignVars($row);
-            ++$i;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param \XoopsObject $object
-     * @param bool         $force
-     * @return bool
-     */
-    public function delete(\XoopsObject $object, $force = true): bool
-    {
-        parent::delete($object, $force);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `gid` = 0 WHERE `gid` = ' . $object->getVar('gid');
-
-        return $GLOBALS['xoopsDB']->queryF($sql);
-    }
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $id . '-' . \urlencode($value) . '-' . $gid . '-' . $cid . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
+
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&cid=' . $cid . '&start=' . $start;
+	}
+
+	/**
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getTop($limit = 1): array
+	{
+		$sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
+		$ret     = [];
+		$i       = 0;
+		while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
+			$ret[$i] = $this->create();
+			$ret[$i]->assignVars($row);
+			++$i;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param \XoopsObject $object
+	 * @param bool         $force
+	 * @return bool
+	 */
+	public function delete(\XoopsObject $object, $force = true): bool
+	{
+		parent::delete($object, $force);
+		$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `gid` = 0 WHERE `gid` = ' . $object->getVar('gid');
+
+		return $GLOBALS['xoopsDB']->queryF($sql);
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace XoopsModules\Songlist;
 
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
+require_once \dirname(__DIR__).'/include/songlist.object.php';
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
 use  XoopsModules\Songlist\Form\FormController;
 
@@ -40,15 +40,15 @@ 
             $var = \explode(',', $part);
             if (!empty($var[1]) && !\is_numeric($var[0])) {
                 $object = $this->create();
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
+                if (\XOBJ_DTYPE_TXTBOX==$object->vars[$var[0]]['data_type']
+                    || \XOBJ_DTYPE_TXTAREA==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%'.$var[1].'%', ($var[2] ?? 'LIKE')));
                 } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
+                } elseif (\XOBJ_DTYPE_ENUM==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
+                } elseif (\XOBJ_DTYPE_ARRAY==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', ($var[2] ?? 'LIKE')));
                 }
             } elseif (!empty($var[1]) && \is_numeric($var[0])) {
                 $criteria->add(new \Criteria($var[0], $var[1]));
@@ -87,7 +87,7 @@ 
         } else {
             $obj->setVar('updated', \time());
         }
-        if ('' == $obj->getVar('name')) {
+        if (''==$obj->getVar('name')) {
             return false;
         }
 
@@ -107,7 +107,7 @@ 
         if (!isset($this->_objects['object'][$id])) {
             $this->_objects['object'][$id] = parent::get($id, $fields);
             if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
+                $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
                 $GLOBALS['xoopsDB']->queryF($sql);
             }
         }
@@ -156,10 +156,10 @@ 
     {
         global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $id . '-' . \urlencode($value) . '-' . $gid . '-' . $cid . $GLOBALS['songlistModuleConfig']['endofurl'];
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.\urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
         }
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&cid=' . $cid . '&start=' . $start;
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.\urlencode($value ?? '').'&gid='.$gid.'&cid='.$cid.'&start='.$start;
     }
 
     /**
@@ -168,11 +168,11 @@ 
      */
     public function getTop($limit = 1): array
     {
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
+        $sql     = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
         $results = $GLOBALS['xoopsDB']->queryF($sql);
         $ret     = [];
         $i       = 0;
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
+        while (false!==($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
             $ret[$i] = $this->create();
             $ret[$i]->assignVars($row);
             ++$i;
@@ -189,7 +189,7 @@ 
     public function delete(\XoopsObject $object, $force = true): bool
     {
         parent::delete($object, $force);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `gid` = 0 WHERE `gid` = ' . $object->getVar('gid');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('songlist_songs').' SET `gid` = 0 WHERE `gid` = '.$object->getVar('gid');
 
         return $GLOBALS['xoopsDB']->queryF($sql);
     }

class/Uploader.php

Indentation +381 added lines, -381 removed lines

@@ -11,39 +11,39 @@ 
  */

 class Uploader

 {

-    public $mediaName;

-    public $mediaType;

-    public $mediaSize;

-    public $mediaTmpName;

-    public $mediaError;

-    public $uploadDir         = '';

-    public $allowedMimeTypes  = [];

-    public $allowedExtensions = [];

-    public $maxFileSize       = 3299999999;

-    public $maxWidth;

-    public $maxHeight;

-    public $targetFileName;

-    public $prefix;

-    public $errors            = [];

-    public $savedDestination;

-    public $savedFileName;

-

-    /**

-     * Constructor

-     *

-     * @param string $uploadDir

-     * @param array  $allowedMimeTypes

-     * @param int    $maxFileSize

-     * @param int    $maxWidth

-     * @param int    $maxHeight

-     * @param array  $allowedExtensions

-     * @internal param int $cmodvalue

-     */

-    public function __construct($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth = null, $maxHeight = null, $allowedExtensions = null)

-    {

-        if (\is_array($allowedMimeTypes)) {

-            $this->allowedMimeTypes = &$allowedMimeTypes;

-        }

+	public $mediaName;

+	public $mediaType;

+	public $mediaSize;

+	public $mediaTmpName;

+	public $mediaError;

+	public $uploadDir         = '';

+	public $allowedMimeTypes  = [];

+	public $allowedExtensions = [];

+	public $maxFileSize       = 3299999999;

+	public $maxWidth;

+	public $maxHeight;

+	public $targetFileName;

+	public $prefix;

+	public $errors            = [];

+	public $savedDestination;

+	public $savedFileName;

+

+	/**

+	 * Constructor

+	 *

+	 * @param string $uploadDir

+	 * @param array  $allowedMimeTypes

+	 * @param int    $maxFileSize

+	 * @param int    $maxWidth

+	 * @param int    $maxHeight

+	 * @param array  $allowedExtensions

+	 * @internal param int $cmodvalue

+	 */

+	public function __construct($uploadDir, $allowedMimeTypes, $maxFileSize, $maxWidth = null, $maxHeight = null, $allowedExtensions = null)

+	{

+		if (\is_array($allowedMimeTypes)) {

+			$this->allowedMimeTypes = &$allowedMimeTypes;

+		}

 //        $this->uploadDir = $uploadDir . (DS != mb_substr($uploadDir, mb_strlen($uploadDir) - 1, 1) ? DS : '');

 //        if (\is_dir($uploadDir)) {

 //            foreach (\explode(DS, $uploadDir) as $folder) {

@@ -53,352 +53,352 @@ 
 //                }

 //            }

 //        }

-        $this->uploadDir = $uploadDir;

-        $this->maxFileSize = (int)$maxFileSize;

-        if (isset($maxWidth)) {

-            $this->maxWidth = (int)$maxWidth;

-        }

-        if (isset($maxHeight)) {

-            $this->maxHeight = (int)$maxHeight;

-        }

-        if (isset($allowedExtensions) && \is_array($allowedExtensions)) {

-            $this->allowedExtensions = &$allowedExtensions;

-        }

-    }

-

-    /**

-     * Fetch the uploaded file

-     *

-     * @param       $index_name

-     * @param int   $index Index of the file (if more than one uploaded under that name)

-     * @return bool

-     * @internal param string $media_name Name of the file field

-     */

-    public function fetchMedia($index_name, $index = null): bool

-    {

-        if (!isset($_FILES[$index_name])) {

-            $this->setErrors('File not found');

-

-            return false;

-        }

-

-        if (\is_array($_FILES[$index_name]['name'][$index]) && isset($index)) {

-            $this->mediaName    = $_FILES[$index_name]['name'][$index];

-            $this->mediaType    = $_FILES[$index_name]['type'][$index];

-            $this->mediaSize    = $_FILES[$index_name]['size'][$index];

-            $this->mediaTmpName = $_FILES[$index_name]['tmp_name'][$index];

-            $this->mediaError   = !empty($_FILES[$index_name]['error'][$index]) ? $_FILES[$index_name]['errir'][$index] : 0;

-        } else {

-            $this->mediaName    = $_FILES[$index_name]['name'];

-            $this->mediaType    = $_FILES[$index_name]['type'];

-            $this->mediaSize    = $_FILES[$index_name]['size'];

-            $this->mediaTmpName = $_FILES[$index_name]['tmp_name'];

-            $this->mediaError   = !empty($_FILES[$index_name]['error']) ? $_FILES[$index_name]['error'] : 0;

-        }

-        $this->errors = [];

-        if ((int)$this->mediaSize < 0) {

-            $this->setErrors('Invalid File Size');

-

-            return false;

-        }

-        if ('' == $this->mediaName) {

-            $this->setErrors('Filename Is Empty');

-

-            return false;

-        }

-        if ('none' === $this->mediaTmpName || !\is_uploaded_file($this->mediaTmpName) || 0 == $this->mediaSize) {

-            $this->setErrors('No file uploaded');

-

-            return false;

-        }

-        if ($this->mediaError > 0) {

-            $this->setErrors('Error occurred: Error #' . $this->mediaError);

-

-            return false;

-        }

-

-        return true;

-    }

-

-    /**

-     * Set the target filename

-     *

-     * @param string $value

-     **/

-    public function setTargetFileName(string $value): void

-    {

-        $this->targetFileName = \trim($value);

-    }

-

-    /**

-     * Set the prefix

-     *

-     * @param string $value

-     **/

-    public function setPrefix($value): void

-    {

-        $this->prefix = \trim($value);

-    }

-

-    /**

-     * Get the uploaded filename

-     *

-     * @return  string

-     **/

-    public function getMediaName(): string

-    {

-        return $this->mediaName;

-    }

-

-    /**

-     * Get the type of the uploaded file

-     *

-     * @return  string

-     **/

-    public function getMediaType(): string

-    {

-        return $this->mediaType;

-    }

-

-    /**

-     * Get the size of the uploaded file

-     *

-     * @return  int

-     **/

-    public function getMediaSize(): int

-    {

-        return $this->mediaSize;

-    }

-

-    /**

-     * Get the temporary name that the uploaded file was stored under

-     *

-     * @return  string

-     **/

-    public function getMediaTmpName(): string

-    {

-        return $this->mediaTmpName;

-    }

-

-    /**

-     * Get the saved filename

-     *

-     * @return  string

-     **/

-    public function getSavedFileName(): string

-    {

-        return $this->savedFileName;

-    }

-

-    /**

-     * Get the destination the file is saved to

-     *

-     * @return  string

-     **/

-    public function getSavedDestination(): string

-    {

-        return $this->savedDestination;

-    }

-

-    /**

-     * Check the file and copy it to the destination

-     *

-     * @param int $chmod

-     * @return bool

-     */

-    public function upload($chmod = 0644): bool

-    {

-        if ('' == $this->uploadDir) {

-            $this->setErrors('Upload directory not set');

-

-            return false;

-        }

-        if (!\is_dir($this->uploadDir)) {

-            $this->setErrors('Failed opening directory: ' . $this->uploadDir);

-

-            return false;

-        }

-        if (!\is_writable($this->uploadDir)) {

-            $this->setErrors('Failed opening directory with write permission: ' . $this->uploadDir);

-

-            return false;

-        }

-        if (!$this->checkMimeType()) {

-            $this->setErrors('MIME type not allowed: ' . $this->mediaType);

-

-            return false;

-        }

-        if (!$this->checkExtension()) {

-            $this->setErrors('Extension not allowed');

-

-            return false;

-        }

-        if (!$this->checkMaxFileSize()) {

-            $this->setErrors('File size too large: ' . $this->mediaSize);

-        }

-        if (!$this->checkMaxWidth()) {

-            $this->setErrors(\sprintf('File width must be smaller than %u', $this->maxWidth));

-        }

-        if (!$this->checkMaxHeight()) {

-            $this->setErrors(\sprintf('File height must be smaller than %u', $this->maxHeight));

-        }

-        if (\count($this->errors) > 0) {

-            return false;

-        }

-        if (!$this->_copyFile($chmod)) {

-            $this->setErrors('Failed uploading file: ' . $this->mediaName);

-

-            return false;

-        }

-

-        return true;

-    }

-

-    /**

-     * Copy the file to its destination

-     *

-     * @param $chmod

-     * @return bool

-     */

-    public function _copyFile($chmod): bool

-    {

-        $matched = [];

-        if (!\preg_match('/\.([a-zA-Z0-9]+)$/', $this->mediaName, $matched)) {

-            return false;

-        }

-        if (isset($this->targetFileName)) {

-            $this->savedFileName = $this->targetFileName;

-        } elseif (isset($this->prefix)) {

-            $this->savedFileName = \uniqid($this->prefix, true) . '.' . \mb_strtolower($matched[1]);

-        } else {

-            $this->savedFileName = \mb_strtolower($this->mediaName);

-        }

-        $this->savedDestination = $this->uploadDir . '/' . $this->savedFileName;

-        if (!\move_uploaded_file($this->mediaTmpName, $this->savedDestination)) {

-            return false;

-        }

-        @\chmod($this->savedDestination, $chmod);

-

-        return true;

-    }

-

-    /**

-     * Is the file the right size?

-     *

-     * @return  bool

-     **/

-    public function checkMaxFileSize(): bool

-    {

-        if ($this->mediaSize > $this->maxFileSize) {

-            return false;

-        }

-

-        return true;

-    }

-

-    /**

-     * Is the picture the right width?

-     *

-     * @return  bool

-     **/

-    public function checkMaxWidth(): bool

-    {

-        if (!isset($this->maxWidth) || $this->maxWidth < 1) {

-            return true;

-        }

-        if (false !== $dimension = \getimagesize($this->mediaTmpName)) {

-            if ($dimension[0] > $this->maxWidth) {

-                return false;

-            }

-        } else {

-            \trigger_error(\sprintf('Failed fetching image size of %s, skipping max width check..', $this->mediaTmpName), \E_USER_WARNING);

-        }

-

-        return true;

-    }

-

-    /**

-     * Is the picture the right height?

-     *

-     * @return  bool

-     **/

-    public function checkMaxHeight(): bool

-    {

-        if (!isset($this->maxHeight) || $this->maxHeight < 1) {

-            return true;

-        }

-        if (false !== $dimension = \getimagesize($this->mediaTmpName)) {

-            if ($dimension[1] > $this->maxHeight) {

-                return false;

-            }

-        } else {

-            \trigger_error(\sprintf('Failed fetching image size of %s, skipping max height check..', $this->mediaTmpName), \E_USER_WARNING);

-        }

-

-        return true;

-    }

-

-    /**

-     * Is the file the right Mime type

-     *

-     * (is there a right type of mime? ;-)

-     *

-     * @return  bool

-     **/

-    public function checkMimeType(): bool

-    {

-        if (\count($this->allowedMimeTypes) > 0 && !\in_array($this->mediaType, $this->allowedMimeTypes, true)) {

-            return false;

-        }

-

-        return true;

-    }

-

-    /**

-     * Is the file the right extension

-     *

-     * @return  bool

-     **/

-    public function checkExtension(): bool

-    {

-        $ext = mb_substr(mb_strrchr($this->mediaName, '.'), 1);

-        if (!empty($this->allowedExtensions) && !\in_array(mb_strtolower($ext), $this->allowedExtensions, true)) {

-            return false;

-        }

-

-        return true;

-    }

-

-    /**

-     * Add an error

-     *

-     * @param string $error

-     **/

-    public function setErrors($error): void

-    {

-        $this->errors[] = \trim($error);

-    }

-

-    /**

-     * Get generated errors

-     *

-     * @param bool $ashtml Format using HTML?

-     *

-     * @return  array|string    Array of array messages OR HTML string

-     */

-    public function &getErrors($ashtml = true)

-    {

-        if (!$ashtml) {

-            return $this->errors;

-        }

-        $ret = '';

-        if (\count($this->errors) > 0) {

-            $ret = '<h4>Errors Returned While Uploading</h4>';

-            foreach ($this->errors as $error) {

-                $ret .= $error . '<br>';

-            }

-        }

-

-        return $ret;

-    }

+		$this->uploadDir = $uploadDir;

+		$this->maxFileSize = (int)$maxFileSize;

+		if (isset($maxWidth)) {

+			$this->maxWidth = (int)$maxWidth;

+		}

+		if (isset($maxHeight)) {

+			$this->maxHeight = (int)$maxHeight;

+		}

+		if (isset($allowedExtensions) && \is_array($allowedExtensions)) {

+			$this->allowedExtensions = &$allowedExtensions;

+		}

+	}

+

+	/**

+	 * Fetch the uploaded file

+	 *

+	 * @param       $index_name

+	 * @param int   $index Index of the file (if more than one uploaded under that name)

+	 * @return bool

+	 * @internal param string $media_name Name of the file field

+	 */

+	public function fetchMedia($index_name, $index = null): bool

+	{

+		if (!isset($_FILES[$index_name])) {

+			$this->setErrors('File not found');

+

+			return false;

+		}

+

+		if (\is_array($_FILES[$index_name]['name'][$index]) && isset($index)) {

+			$this->mediaName    = $_FILES[$index_name]['name'][$index];

+			$this->mediaType    = $_FILES[$index_name]['type'][$index];

+			$this->mediaSize    = $_FILES[$index_name]['size'][$index];

+			$this->mediaTmpName = $_FILES[$index_name]['tmp_name'][$index];

+			$this->mediaError   = !empty($_FILES[$index_name]['error'][$index]) ? $_FILES[$index_name]['errir'][$index] : 0;

+		} else {

+			$this->mediaName    = $_FILES[$index_name]['name'];

+			$this->mediaType    = $_FILES[$index_name]['type'];

+			$this->mediaSize    = $_FILES[$index_name]['size'];

+			$this->mediaTmpName = $_FILES[$index_name]['tmp_name'];

+			$this->mediaError   = !empty($_FILES[$index_name]['error']) ? $_FILES[$index_name]['error'] : 0;

+		}

+		$this->errors = [];

+		if ((int)$this->mediaSize < 0) {

+			$this->setErrors('Invalid File Size');

+

+			return false;

+		}

+		if ('' == $this->mediaName) {

+			$this->setErrors('Filename Is Empty');

+

+			return false;

+		}

+		if ('none' === $this->mediaTmpName || !\is_uploaded_file($this->mediaTmpName) || 0 == $this->mediaSize) {

+			$this->setErrors('No file uploaded');

+

+			return false;

+		}

+		if ($this->mediaError > 0) {

+			$this->setErrors('Error occurred: Error #' . $this->mediaError);

+

+			return false;

+		}

+

+		return true;

+	}

+

+	/**

+	 * Set the target filename

+	 *

+	 * @param string $value

+	 **/

+	public function setTargetFileName(string $value): void

+	{

+		$this->targetFileName = \trim($value);

+	}

+

+	/**

+	 * Set the prefix

+	 *

+	 * @param string $value

+	 **/

+	public function setPrefix($value): void

+	{

+		$this->prefix = \trim($value);

+	}

+

+	/**

+	 * Get the uploaded filename

+	 *

+	 * @return  string

+	 **/

+	public function getMediaName(): string

+	{

+		return $this->mediaName;

+	}

+

+	/**

+	 * Get the type of the uploaded file

+	 *

+	 * @return  string

+	 **/

+	public function getMediaType(): string

+	{

+		return $this->mediaType;

+	}

+

+	/**

+	 * Get the size of the uploaded file

+	 *

+	 * @return  int

+	 **/

+	public function getMediaSize(): int

+	{

+		return $this->mediaSize;

+	}

+

+	/**

+	 * Get the temporary name that the uploaded file was stored under

+	 *

+	 * @return  string

+	 **/

+	public function getMediaTmpName(): string

+	{

+		return $this->mediaTmpName;

+	}

+

+	/**

+	 * Get the saved filename

+	 *

+	 * @return  string

+	 **/

+	public function getSavedFileName(): string

+	{

+		return $this->savedFileName;

+	}

+

+	/**

+	 * Get the destination the file is saved to

+	 *

+	 * @return  string

+	 **/

+	public function getSavedDestination(): string

+	{

+		return $this->savedDestination;

+	}

+

+	/**

+	 * Check the file and copy it to the destination

+	 *

+	 * @param int $chmod

+	 * @return bool

+	 */

+	public function upload($chmod = 0644): bool

+	{

+		if ('' == $this->uploadDir) {

+			$this->setErrors('Upload directory not set');

+

+			return false;

+		}

+		if (!\is_dir($this->uploadDir)) {

+			$this->setErrors('Failed opening directory: ' . $this->uploadDir);

+

+			return false;

+		}

+		if (!\is_writable($this->uploadDir)) {

+			$this->setErrors('Failed opening directory with write permission: ' . $this->uploadDir);

+

+			return false;

+		}

+		if (!$this->checkMimeType()) {

+			$this->setErrors('MIME type not allowed: ' . $this->mediaType);

+

+			return false;

+		}

+		if (!$this->checkExtension()) {

+			$this->setErrors('Extension not allowed');

+

+			return false;

+		}

+		if (!$this->checkMaxFileSize()) {

+			$this->setErrors('File size too large: ' . $this->mediaSize);

+		}

+		if (!$this->checkMaxWidth()) {

+			$this->setErrors(\sprintf('File width must be smaller than %u', $this->maxWidth));

+		}

+		if (!$this->checkMaxHeight()) {

+			$this->setErrors(\sprintf('File height must be smaller than %u', $this->maxHeight));

+		}

+		if (\count($this->errors) > 0) {

+			return false;

+		}

+		if (!$this->_copyFile($chmod)) {

+			$this->setErrors('Failed uploading file: ' . $this->mediaName);

+

+			return false;

+		}

+

+		return true;

+	}

+

+	/**

+	 * Copy the file to its destination

+	 *

+	 * @param $chmod

+	 * @return bool

+	 */

+	public function _copyFile($chmod): bool

+	{

+		$matched = [];

+		if (!\preg_match('/\.([a-zA-Z0-9]+)$/', $this->mediaName, $matched)) {

+			return false;

+		}

+		if (isset($this->targetFileName)) {

+			$this->savedFileName = $this->targetFileName;

+		} elseif (isset($this->prefix)) {

+			$this->savedFileName = \uniqid($this->prefix, true) . '.' . \mb_strtolower($matched[1]);

+		} else {

+			$this->savedFileName = \mb_strtolower($this->mediaName);

+		}

+		$this->savedDestination = $this->uploadDir . '/' . $this->savedFileName;

+		if (!\move_uploaded_file($this->mediaTmpName, $this->savedDestination)) {

+			return false;

+		}

+		@\chmod($this->savedDestination, $chmod);

+

+		return true;

+	}

+

+	/**

+	 * Is the file the right size?

+	 *

+	 * @return  bool

+	 **/

+	public function checkMaxFileSize(): bool

+	{

+		if ($this->mediaSize > $this->maxFileSize) {

+			return false;

+		}

+

+		return true;

+	}

+

+	/**

+	 * Is the picture the right width?

+	 *

+	 * @return  bool

+	 **/

+	public function checkMaxWidth(): bool

+	{

+		if (!isset($this->maxWidth) || $this->maxWidth < 1) {

+			return true;

+		}

+		if (false !== $dimension = \getimagesize($this->mediaTmpName)) {

+			if ($dimension[0] > $this->maxWidth) {

+				return false;

+			}

+		} else {

+			\trigger_error(\sprintf('Failed fetching image size of %s, skipping max width check..', $this->mediaTmpName), \E_USER_WARNING);

+		}

+

+		return true;

+	}

+

+	/**

+	 * Is the picture the right height?

+	 *

+	 * @return  bool

+	 **/

+	public function checkMaxHeight(): bool

+	{

+		if (!isset($this->maxHeight) || $this->maxHeight < 1) {

+			return true;

+		}

+		if (false !== $dimension = \getimagesize($this->mediaTmpName)) {

+			if ($dimension[1] > $this->maxHeight) {

+				return false;

+			}

+		} else {

+			\trigger_error(\sprintf('Failed fetching image size of %s, skipping max height check..', $this->mediaTmpName), \E_USER_WARNING);

+		}

+

+		return true;

+	}

+

+	/**

+	 * Is the file the right Mime type

+	 *

+	 * (is there a right type of mime? ;-)

+	 *

+	 * @return  bool

+	 **/

+	public function checkMimeType(): bool

+	{

+		if (\count($this->allowedMimeTypes) > 0 && !\in_array($this->mediaType, $this->allowedMimeTypes, true)) {

+			return false;

+		}

+

+		return true;

+	}

+

+	/**

+	 * Is the file the right extension

+	 *

+	 * @return  bool

+	 **/

+	public function checkExtension(): bool

+	{

+		$ext = mb_substr(mb_strrchr($this->mediaName, '.'), 1);

+		if (!empty($this->allowedExtensions) && !\in_array(mb_strtolower($ext), $this->allowedExtensions, true)) {

+			return false;

+		}

+

+		return true;

+	}

+

+	/**

+	 * Add an error

+	 *

+	 * @param string $error

+	 **/

+	public function setErrors($error): void

+	{

+		$this->errors[] = \trim($error);

+	}

+

+	/**

+	 * Get generated errors

+	 *

+	 * @param bool $ashtml Format using HTML?

+	 *

+	 * @return  array|string    Array of array messages OR HTML string

+	 */

+	public function &getErrors($ashtml = true)

+	{

+		if (!$ashtml) {

+			return $this->errors;

+		}

+		$ret = '';

+		if (\count($this->errors) > 0) {

+			$ret = '<h4>Errors Returned While Uploading</h4>';

+			foreach ($this->errors as $error) {

+				$ret .= $error . '<br>';

+			}

+		}

+

+		return $ret;

+	}

 }

Spacing +28 added lines, -28 removed lines

@@ -24,7 +24,7 @@ 
     public $maxHeight;

     public $targetFileName;

     public $prefix;

-    public $errors            = [];

+    public $errors = [];

     public $savedDestination;

     public $savedFileName;

 

@@ -54,12 +54,12 @@ 
 //            }

 //        }

         $this->uploadDir = $uploadDir;

-        $this->maxFileSize = (int)$maxFileSize;

+        $this->maxFileSize = (int) $maxFileSize;

         if (isset($maxWidth)) {

-            $this->maxWidth = (int)$maxWidth;

+            $this->maxWidth = (int) $maxWidth;

         }

         if (isset($maxHeight)) {

-            $this->maxHeight = (int)$maxHeight;

+            $this->maxHeight = (int) $maxHeight;

         }

         if (isset($allowedExtensions) && \is_array($allowedExtensions)) {

             $this->allowedExtensions = &$allowedExtensions;

@@ -96,23 +96,23 @@ 
             $this->mediaError   = !empty($_FILES[$index_name]['error']) ? $_FILES[$index_name]['error'] : 0;

         }

         $this->errors = [];

-        if ((int)$this->mediaSize < 0) {

+        if ((int) $this->mediaSize<0) {

             $this->setErrors('Invalid File Size');

 

             return false;

         }

-        if ('' == $this->mediaName) {

+        if (''==$this->mediaName) {

             $this->setErrors('Filename Is Empty');

 

             return false;

         }

-        if ('none' === $this->mediaTmpName || !\is_uploaded_file($this->mediaTmpName) || 0 == $this->mediaSize) {

+        if ('none'===$this->mediaTmpName || !\is_uploaded_file($this->mediaTmpName) || 0==$this->mediaSize) {

             $this->setErrors('No file uploaded');

 

             return false;

         }

-        if ($this->mediaError > 0) {

-            $this->setErrors('Error occurred: Error #' . $this->mediaError);

+        if ($this->mediaError>0) {

+            $this->setErrors('Error occurred: Error #'.$this->mediaError);

 

             return false;

         }

@@ -208,23 +208,23 @@ 
      */

     public function upload($chmod = 0644): bool

     {

-        if ('' == $this->uploadDir) {

+        if (''==$this->uploadDir) {

             $this->setErrors('Upload directory not set');

 

             return false;

         }

         if (!\is_dir($this->uploadDir)) {

-            $this->setErrors('Failed opening directory: ' . $this->uploadDir);

+            $this->setErrors('Failed opening directory: '.$this->uploadDir);

 

             return false;

         }

         if (!\is_writable($this->uploadDir)) {

-            $this->setErrors('Failed opening directory with write permission: ' . $this->uploadDir);

+            $this->setErrors('Failed opening directory with write permission: '.$this->uploadDir);

 

             return false;

         }

         if (!$this->checkMimeType()) {

-            $this->setErrors('MIME type not allowed: ' . $this->mediaType);

+            $this->setErrors('MIME type not allowed: '.$this->mediaType);

 

             return false;

         }

@@ -234,7 +234,7 @@ 
             return false;

         }

         if (!$this->checkMaxFileSize()) {

-            $this->setErrors('File size too large: ' . $this->mediaSize);

+            $this->setErrors('File size too large: '.$this->mediaSize);

         }

         if (!$this->checkMaxWidth()) {

             $this->setErrors(\sprintf('File width must be smaller than %u', $this->maxWidth));

@@ -242,11 +242,11 @@ 
         if (!$this->checkMaxHeight()) {

             $this->setErrors(\sprintf('File height must be smaller than %u', $this->maxHeight));

         }

-        if (\count($this->errors) > 0) {

+        if (\count($this->errors)>0) {

             return false;

         }

         if (!$this->_copyFile($chmod)) {

-            $this->setErrors('Failed uploading file: ' . $this->mediaName);

+            $this->setErrors('Failed uploading file: '.$this->mediaName);

 

             return false;

         }

@@ -269,11 +269,11 @@ 
         if (isset($this->targetFileName)) {

             $this->savedFileName = $this->targetFileName;

         } elseif (isset($this->prefix)) {

-            $this->savedFileName = \uniqid($this->prefix, true) . '.' . \mb_strtolower($matched[1]);

+            $this->savedFileName = \uniqid($this->prefix, true).'.'.\mb_strtolower($matched[1]);

         } else {

             $this->savedFileName = \mb_strtolower($this->mediaName);

         }

-        $this->savedDestination = $this->uploadDir . '/' . $this->savedFileName;

+        $this->savedDestination = $this->uploadDir.'/'.$this->savedFileName;

         if (!\move_uploaded_file($this->mediaTmpName, $this->savedDestination)) {

             return false;

         }

@@ -289,7 +289,7 @@ 
      **/

     public function checkMaxFileSize(): bool

     {

-        if ($this->mediaSize > $this->maxFileSize) {

+        if ($this->mediaSize>$this->maxFileSize) {

             return false;

         }

 

@@ -303,11 +303,11 @@ 
      **/

     public function checkMaxWidth(): bool

     {

-        if (!isset($this->maxWidth) || $this->maxWidth < 1) {

+        if (!isset($this->maxWidth) || $this->maxWidth<1) {

             return true;

         }

-        if (false !== $dimension = \getimagesize($this->mediaTmpName)) {

-            if ($dimension[0] > $this->maxWidth) {

+        if (false!==$dimension = \getimagesize($this->mediaTmpName)) {

+            if ($dimension[0]>$this->maxWidth) {

                 return false;

             }

         } else {

@@ -324,11 +324,11 @@ 
      **/

     public function checkMaxHeight(): bool

     {

-        if (!isset($this->maxHeight) || $this->maxHeight < 1) {

+        if (!isset($this->maxHeight) || $this->maxHeight<1) {

             return true;

         }

-        if (false !== $dimension = \getimagesize($this->mediaTmpName)) {

-            if ($dimension[1] > $this->maxHeight) {

+        if (false!==$dimension = \getimagesize($this->mediaTmpName)) {

+            if ($dimension[1]>$this->maxHeight) {

                 return false;

             }

         } else {

@@ -347,7 +347,7 @@ 
      **/

     public function checkMimeType(): bool

     {

-        if (\count($this->allowedMimeTypes) > 0 && !\in_array($this->mediaType, $this->allowedMimeTypes, true)) {

+        if (\count($this->allowedMimeTypes)>0 && !\in_array($this->mediaType, $this->allowedMimeTypes, true)) {

             return false;

         }

 

@@ -392,10 +392,10 @@ 
             return $this->errors;

         }

         $ret = '';

-        if (\count($this->errors) > 0) {

+        if (\count($this->errors)>0) {

             $ret = '<h4>Errors Returned While Uploading</h4>';

             foreach ($this->errors as $error) {

-                $ret .= $error . '<br>';

+                $ret .= $error.'<br>';

             }

         }

 

class/Helper.php

Indentation +46 added lines, -46 removed lines

@@ -23,57 +23,57 @@
  */
 class Helper extends \Xmf\Module\Helper
 {
-    public $debug;
+	public $debug;
 
-    /**
-     * @param bool $debug
-     */
-    public function __construct($debug = false)
-    {
-        $this->debug   = $debug;
-        $moduleDirName = \basename(\dirname(__DIR__));
-        parent::__construct($moduleDirName);
-    }
+	/**
+	 * @param bool $debug
+	 */
+	public function __construct($debug = false)
+	{
+		$this->debug   = $debug;
+		$moduleDirName = \basename(\dirname(__DIR__));
+		parent::__construct($moduleDirName);
+	}
 
-    public static function getInstance(bool $debug = false): self
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static($debug);
-        }
+	public static function getInstance(bool $debug = false): self
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static($debug);
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * @return string
-     */
-    public function getDirname(): string
-    {
-        return $this->dirname;
-    }
+	/**
+	 * @return string
+	 */
+	public function getDirname(): string
+	{
+		return $this->dirname;
+	}
 
-    /**
-     * Get an Object Handler
-     *
-     * @param string $name name of handler to load
-     *
-     * @return \XoopsPersistableObjectHandler
-     */
-    public function getHandler($name): ?\XoopsPersistableObjectHandler
-    {
-        $ret = null;
+	/**
+	 * Get an Object Handler
+	 *
+	 * @param string $name name of handler to load
+	 *
+	 * @return \XoopsPersistableObjectHandler
+	 */
+	public function getHandler($name): ?\XoopsPersistableObjectHandler
+	{
+		$ret = null;
 
-        $class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';
-        if (!\class_exists($class)) {
-            throw new \RuntimeException("Class '$class' not found");
-        }
-        /** @var \XoopsMySQLDatabase $db */
-        $db     = \XoopsDatabaseFactory::getDatabaseConnection();
-        $helper = self::getInstance();
-        $ret    = new $class($db, $helper);
-        $this->addLog("Getting handler '$name'");
-        return $ret;
-    }
+		$class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';
+		if (!\class_exists($class)) {
+			throw new \RuntimeException("Class '$class' not found");
+		}
+		/** @var \XoopsMySQLDatabase $db */
+		$db     = \XoopsDatabaseFactory::getDatabaseConnection();
+		$helper = self::getInstance();
+		$ret    = new $class($db, $helper);
+		$this->addLog("Getting handler '$name'");
+		return $ret;
+	}
 }
 

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
     public static function getInstance(bool $debug = false): self
     {
         static $instance;
-        if (null === $instance) {
+        if (null===$instance) {
             $instance = new static($debug);
         }
 
@@ -64,7 +64,7 @@ 
     {
         $ret = null;
 
-        $class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';
+        $class = __NAMESPACE__.'\\'.\ucfirst($name).'Handler';
         if (!\class_exists($class)) {
             throw new \RuntimeException("Class '$class' not found");
         }