mambax7 / extcal

testdata/index.php

Spacing +9 added lines, -9 removed lines

@@ -18,8 +18,8 @@ 
 use XoopsModules\Extcal;
 use XoopsModules\Extcal\Common;
 
-require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-include dirname(__DIR__) . '/preloads/autoloader.php';
+require dirname(dirname(dirname(__DIR__))).'/mainfile.php';
+include dirname(__DIR__).'/preloads/autoloader.php';
 $op = \Xmf\Request::getCmd('op', '');
 
 switch ($op) {
@@ -51,14 +51,14 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     foreach ($tables as $table) {
-        $tabledata = \Xmf\Yaml::readWrapped($table . '.yml');
+        $tabledata = \Xmf\Yaml::readWrapped($table.'.yml');
         \Xmf\Database\TableLoad::truncateTable($table);
         \Xmf\Database\TableLoad::loadTableFromArray($table, $tabledata);
     }
 
 
     //  ---  COPY test folder files ---------------
-    if (is_array ($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
+    if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
         //        $file = __DIR__ . '/../testdata/images/';
         foreach (array_keys($configurator->copyTestFolders) as $i) {
             $src  = $configurator->copyTestFolders[$i][0];
@@ -67,7 +67,7 @@ 
         }
     }
 
-    redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+    redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS'));
 }
 
 function saveSampleData()
@@ -78,10 +78,10 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     foreach ($tables as $table) {
-        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $table . '_' . date("Y-m-d H-i-s") . '.yml');
+        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $table.'_'.date("Y-m-d H-i-s").'.yml');
     }
 
-    redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+    redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS'));
 }
 
 function exportSchema()
@@ -93,8 +93,8 @@ 
         $migrate = new  \Xmf\Database\Migrate($moduleDirName);
         $migrate->saveCurrentSchema();
 
-        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
+        redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_SUCCESS'));
     } catch (\Exception $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+        exit(constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR'));
     }
 }

language/english/common.php

Spacing +76 added lines, -76 removed lines

@@ -21,63 +21,63 @@ 
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
-
-define('CO_' . $moduleDirNameUpper . '_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(dirname(__DIR__))));
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');
 
 
 //Sample Data
-define('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
-define('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS', 'Sample Date uploaded successfully');
-define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA', 'Export Tables to YAML');
-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 . '_' . '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.'_'.'ADD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
+define('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS', 'Sample Date uploaded successfully');
+define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA', 'Export Tables to YAML');
+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.'_'.'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');
 
 //letter choice
 define('CO_'.$moduleDirNameUpper.'_'.'BROWSETOTOPIC', "<span style='font-weight: bold;'>Browse items alphabetically</span>");
@@ -85,39 +85,39 @@ 
 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.'_'.'AGDS', 'Admin Groups');
+define('CO_'.$moduleDirNameUpper.'_'.'BCACHETIME', 'Cache Time');
 
 //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.'_'.'ADMENU_MIGRATE', 'Migrate');

admin/blockform.php

Indentation +26 added lines, -26 removed lines

@@ -27,15 +27,15 @@ 
 }
 $side_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_TYPE, 'bside', $block['side']);
 $side_select->addOptionArray([
-                                 0 => _AM_SYSTEM_BLOCKS_SBLEFT,
-                                 1 => _AM_SYSTEM_BLOCKS_SBRIGHT,
-                                 3 => _AM_SYSTEM_BLOCKS_CBLEFT,
-                                 4 => _AM_SYSTEM_BLOCKS_CBRIGHT,
-                                 5 => _AM_SYSTEM_BLOCKS_CBCENTER,
-                                 7 => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
-                                 8 => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
-                                 9 => _AM_SYSTEM_BLOCKS_CBBOTTOM
-                             ]);
+                                    0 => _AM_SYSTEM_BLOCKS_SBLEFT,
+                                    1 => _AM_SYSTEM_BLOCKS_SBRIGHT,
+                                    3 => _AM_SYSTEM_BLOCKS_CBLEFT,
+                                    4 => _AM_SYSTEM_BLOCKS_CBRIGHT,
+                                    5 => _AM_SYSTEM_BLOCKS_CBCENTER,
+                                    7 => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
+                                    8 => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
+                                    9 => _AM_SYSTEM_BLOCKS_CBBOTTOM
+                                ]);
 $form->addElement($side_select);
 $form->addElement(new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
 $form->addElement(new \XoopsFormRadioYN(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
@@ -57,11 +57,11 @@ 
     $form->addElement($textarea, true);
     $ctype_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
     $ctype_select->addOptionArray([
-                                      'H' => _AM_SYSTEM_BLOCKS_HTML,
-                                      'P' => _AM_SYSTEM_BLOCKS_PHP,
-                                      'S' => _AM_SYSTEM_BLOCKS_AFWSMILE,
-                                      'T' => _AM_SYSTEM_BLOCKS_AFNOSMILE
-                                  ]);
+                                        'H' => _AM_SYSTEM_BLOCKS_HTML,
+                                        'P' => _AM_SYSTEM_BLOCKS_PHP,
+                                        'S' => _AM_SYSTEM_BLOCKS_AFWSMILE,
+                                        'T' => _AM_SYSTEM_BLOCKS_AFNOSMILE
+                                    ]);
     $form->addElement($ctype_select);
 } else {
     if ('' !== $block['template']) {
@@ -82,18 +82,18 @@ 
 }
 $cache_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $block['bcachetime']);
 $cache_select->addOptionArray([
-                                  '0'       => _NOCACHE,
-                                  '30'      => sprintf(_SECONDS, 30),
-                                  '60'      => _MINUTE,
-                                  '300'     => sprintf(_MINUTES, 5),
-                                  '1800'    => sprintf(_MINUTES, 30),
-                                  '3600'    => _HOUR,
-                                  '18000'   => sprintf(_HOURS, 5),
-                                  '86400'   => _DAY,
-                                  '259200'  => sprintf(_DAYS, 3),
-                                  '604800'  => _WEEK,
-                                  '2592000' => _MONTH
-                              ]);
+                                    '0'       => _NOCACHE,
+                                    '30'      => sprintf(_SECONDS, 30),
+                                    '60'      => _MINUTE,
+                                    '300'     => sprintf(_MINUTES, 5),
+                                    '1800'    => sprintf(_MINUTES, 30),
+                                    '3600'    => _HOUR,
+                                    '18000'   => sprintf(_HOURS, 5),
+                                    '86400'   => _DAY,
+                                    '259200'  => sprintf(_DAYS, 3),
+                                    '604800'  => _WEEK,
+                                    '2592000' => _MONTH
+                                ]);
 $form->addElement($cache_select);
 
 $grouppermHandler = xoops_getHandler('groupperm');

Spacing +9 added lines, -9 removed lines

@@ -16,10 +16,10 @@ 
 
 
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
-$moduleDirNameUpper   = strtoupper($moduleDirName); //$capsDirName
+$moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName
 
 $form = new \XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', 'post', true);
 if (isset($block['name'])) {
@@ -37,9 +37,9 @@ 
                                  9 => _AM_SYSTEM_BLOCKS_CBBOTTOM
                              ]);
 $form->addElement($side_select);
-$form->addElement(new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
-$form->addElement(new \XoopsFormRadioYN(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
-$mod_select = new \XoopsFormSelect(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
+$form->addElement(new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'WEIGHT'), 'bweight', 2, 5, $block['weight']));
+$form->addElement(new \XoopsFormRadioYN(constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLE'), 'bvisible', $block['visible']));
+$mod_select = new \XoopsFormSelect(constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
 /** @var XoopsModuleHandler $moduleHandler */
 $moduleHandler = xoops_getHandler('module');
 $criteria      = new \CriteriaCompo(new \Criteria('hasmain', 1));
@@ -53,7 +53,7 @@ 
 $form->addElement(new \XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), false);
 if ($block['is_custom']) {
     $textarea = new \XoopsFormDhtmlTextArea(_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
-    $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . _AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
+    $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">'._AM_SYSTEM_BLOCKS_USEFULTAGS.'</span><br><span style="font-size:x-small;font-weight:normal;">'.sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>');
     $form->addElement($textarea, true);
     $ctype_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
     $ctype_select->addOptionArray([
@@ -68,11 +68,11 @@ 
         $tplfileHandler = xoops_getHandler('tplfile');
         $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
         if (count($btemplate) > 0) {
-            $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+            $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate[0]->getVar('tpl_id').'">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
         } else {
             $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
             if (count($btemplate2) > 0) {
-                $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate2[0]->getVar('tpl_id').'" target="_blank">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
             }
         }
     }
@@ -97,7 +97,7 @@ 
 $form->addElement($cache_select);
 
 $grouppermHandler = xoops_getHandler('groupperm');
-$groups          = $grouppermHandler->getGroupIds('block_read', $block['bid']);
+$groups = $grouppermHandler->getGroupIds('block_read', $block['bid']);
 
 $form->addElement(new \XoopsFormSelectGroup(_AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true));
 

admin/migrate.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 use XoopsModules\Extcal;
 use XoopsModules\Extcal\Common;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
@@ -76,7 +76,7 @@ 
         if (!empty($queue)) {
             echo "<pre>\n";
             foreach ($queue as $line) {
-                echo $line . ";\n";
+                echo $line.";\n";
             }
             echo "</pre>\n";
         }
@@ -98,4 +98,4 @@ 
 
 echo "<div>$message</div>";
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/blocksadmin.php

Indentation +70 added lines, -70 removed lines

@@ -83,28 +83,28 @@ 
         echo $GLOBALS['xoopsSecurity']->getTokenHTML();
         echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
         <tr valign='middle'><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE')
-             . "</th><th align='center' nowrap='nowrap'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'SIDE')
-             . '<br>'
-             . _LEFT
-             . '-'
-             . _CENTER
-             . '-'
-             . _RIGHT
-             . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT')
-             . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE')
-             . "</th><th align='center'>"
-             . _AM_SYSTEM_BLOCKS_VISIBLEIN
-             . "</th><th align='center'>"
-             . _AM_SYSTEM_ADGS
-             . "</th><th align='center'>"
-             . _AM_SYSTEM_BLOCKS_BCACHETIME
-             . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'ACTION')
-             . '</th></tr>
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE')
+                . "</th><th align='center' nowrap='nowrap'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'SIDE')
+                . '<br>'
+                . _LEFT
+                . '-'
+                . _CENTER
+                . '-'
+                . _RIGHT
+                . "</th><th align='center'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT')
+                . "</th><th align='center'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE')
+                . "</th><th align='center'>"
+                . _AM_SYSTEM_BLOCKS_VISIBLEIN
+                . "</th><th align='center'>"
+                . _AM_SYSTEM_ADGS
+                . "</th><th align='center'>"
+                . _AM_SYSTEM_BLOCKS_BCACHETIME
+                . "</th><th align='center'>"
+                . constant('CO_' . $moduleDirNameUpper . '_' . 'ACTION')
+                . '</th></tr>
         ';
         $block_arr   = \XoopsBlock::getByModule($xoopsModule->mid());
         $block_count = count($block_arr);
@@ -170,69 +170,69 @@ 
             }
             $name = $i->getVar('name');
             echo "<tr valign='top'><td class='$class' align='center'><input type='text' name='title["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . $title
-                 . "'></td><td class='$class' align='center' nowrap='nowrap'>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . $title
+                    . "'></td><td class='$class' align='center' nowrap='nowrap'>
                     <div align='center' >
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_LEFT
-                 . "'$ssel2>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_LEFT
+                    . "'$ssel2>
                         <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_CENTER
-                 . "'$ssel3>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_CENTER
+                    . "'$ssel3>
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_RIGHT
-                 . "'$ssel4>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_RIGHT
+                    . "'$ssel4>
                     </div>
                     <div>
                         <span style='float:right;'><input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_SIDEBLOCK_RIGHT
-                 . "'$ssel1></span>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_SIDEBLOCK_RIGHT
+                    . "'$ssel1></span>
                     <div align='left'><input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_SIDEBLOCK_LEFT
-                 . "'$ssel0></div>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_SIDEBLOCK_LEFT
+                    . "'$ssel0></div>
                     </div>
                     <div align='center'>
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_BOTTOMLEFT
-                 . "'$ssel5>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_BOTTOMLEFT
+                    . "'$ssel5>
                         <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_BOTTOM
-                 . "'$ssel7>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_BOTTOM
+                    . "'$ssel7>
                     <input type='radio' name='side["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . XOOPS_CENTERBLOCK_BOTTOMRIGHT
-                 . "'$ssel6>
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . XOOPS_CENTERBLOCK_BOTTOMRIGHT
+                    . "'$ssel6>
                     </div>
                 </td><td class='$class' align='center'><input type='text' name='weight["
-                 . $i->getVar('bid')
-                 . "]' value='"
-                 . $i->getVar('weight')
-                 . "' size='5' maxlength='5'></td><td class='$class' align='center' nowrap><input type='radio' name='visible["
-                 . $i->getVar('bid')
-                 . "]' value='1'$sel1>"
-                 . _YES
-                 . "&nbsp;<input type='radio' name='visible["
-                 . $i->getVar('bid')
-                 . "]' value='0'$sel0>"
-                 . _NO
-                 . '</td>';
+                    . $i->getVar('bid')
+                    . "]' value='"
+                    . $i->getVar('weight')
+                    . "' size='5' maxlength='5'></td><td class='$class' align='center' nowrap><input type='radio' name='visible["
+                    . $i->getVar('bid')
+                    . "]' value='1'$sel1>"
+                    . _YES
+                    . "&nbsp;<input type='radio' name='visible["
+                    . $i->getVar('bid')
+                    . "]' value='0'$sel0>"
+                    . _NO
+                    . '</td>';
 
             echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
             foreach ($module_list as $k => $v) {

Spacing +56 added lines, -56 removed lines

@@ -16,21 +16,21 @@ 
 
 use Xmf\Request;
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 
 $moduleDirName = basename(dirname(__DIR__));
-$moduleDirNameUpper   = strtoupper($moduleDirName); //$capsDirName
+$moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName
 
 if (!is_object($GLOBALS['xoopsUser']) || !is_object($xoopsModule)
     || !$GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    exit(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403'));
+    exit(constant('CO_'.$moduleDirNameUpper.'_'.'ERROR403'));
 }
 if ($GLOBALS['xoopsUser']->isAdmin($xoopsModule->mid())) {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
     $op = 'list';
     if (isset($_POST)) {
         foreach ($_POST as $k => $v) {
-            ${$k} =$v;
+            ${$k} = $v;
         }
     }
     /*
@@ -55,9 +55,9 @@ 
     function listBlocks()
     {
         global $xoopsModule, $pathIcon16;
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
         $moduleDirName = basename(dirname(__DIR__));
-        $moduleDirNameUpper   = strtoupper($moduleDirName); //$capsDirName
+        $moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
         xoops_loadLanguage('admin', 'system');
         xoops_loadLanguage('admin/blocksadmin', 'system');
@@ -77,15 +77,15 @@ 
         $module_list[0]  = _AM_SYSTEM_BLOCKS_ALLPAGES;
         ksort($module_list);
         echo "
-        <h4 style='text-align:left;'>" . constant('CO_' . $moduleDirNameUpper . '_' . 'BADMIN') . '</h4>';
+        <h4 style='text-align:left;'>" . constant('CO_'.$moduleDirNameUpper.'_'.'BADMIN').'</h4>';
         $moduleHandler = xoops_getHandler('module');
-        echo "<form action='" . $_SERVER['PHP_SELF'] . "' name='blockadmin' method='post'>";
+        echo "<form action='".$_SERVER['PHP_SELF']."' name='blockadmin' method='post'>";
         echo $GLOBALS['xoopsSecurity']->getTokenHTML();
         echo "<table width='100%' class='outer' cellpadding='4' cellspacing='1'>
         <tr valign='middle'><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'TITLE')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'TITLE')
              . "</th><th align='center' nowrap='nowrap'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'SIDE')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'SIDE')
              . '<br>'
              . _LEFT
              . '-'
@@ -93,9 +93,9 @@ 
              . '-'
              . _RIGHT
              . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'WEIGHT')
              . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLE')
              . "</th><th align='center'>"
              . _AM_SYSTEM_BLOCKS_VISIBLEIN
              . "</th><th align='center'>"
@@ -103,7 +103,7 @@ 
              . "</th><th align='center'>"
              . _AM_SYSTEM_BLOCKS_BCACHETIME
              . "</th><th align='center'>"
-             . constant('CO_' . $moduleDirNameUpper . '_' . 'ACTION')
+             . constant('CO_'.$moduleDirNameUpper.'_'.'ACTION')
              . '</th></tr>
         ';
         $block_arr   = \XoopsBlock::getByModule($xoopsModule->mid());
@@ -124,11 +124,11 @@ 
         ];
         foreach ($block_arr as $i) {
             $groups_perms = $grouppermHandler->getGroupIds('block_read', $i->getVar('bid'));
-            $sql          = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . $i->getVar('bid');
+            $sql          = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.$i->getVar('bid');
             $result       = $db->query($sql);
             $modules      = [];
             while (false !== ($row = $db->fetchArray($result))) {
-                $modules[] = (int)$row['module_id'];
+                $modules[] = (int) $row['module_id'];
             }
 
             $cachetime_options = '';
@@ -234,47 +234,47 @@ 
                  . _NO
                  . '</td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='bmodule[" . $i->getVar('bid') . "][]' id='bmodule[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+            echo "<td class='$class' align='center'><select size='5' name='bmodule[".$i->getVar('bid')."][]' id='bmodule[".$i->getVar('bid')."][]' multiple='multiple'>";
             foreach ($module_list as $k => $v) {
-                echo "<option value='$k'" . (in_array($k, $modules) ? " selected='selected'" : '') . ">$v</option>";
+                echo "<option value='$k'".(in_array($k, $modules) ? " selected='selected'" : '').">$v</option>";
             }
             echo '</select></td>';
 
-            echo "<td class='$class' align='center'><select size='5' name='groups[" . $i->getVar('bid') . "][]' id='groups[" . $i->getVar('bid') . "][]' multiple='multiple'>";
+            echo "<td class='$class' align='center'><select size='5' name='groups[".$i->getVar('bid')."][]' id='groups[".$i->getVar('bid')."][]' multiple='multiple'>";
             foreach ($groups as $grp) {
-                echo "<option value='" . $grp->getVar('groupid') . "' " . (in_array($grp->getVar('groupid'), $groups_perms) ? " selected='selected'" : '') . '>' . $grp->getVar('name') . '</option>';
+                echo "<option value='".$grp->getVar('groupid')."' ".(in_array($grp->getVar('groupid'), $groups_perms) ? " selected='selected'" : '').'>'.$grp->getVar('name').'</option>';
             }
             echo '</select></td>';
 
             // Cache lifetime
-            echo '<td class="' . $class . '" align="center"> <select name="bcachetime[' . $i->getVar('bid') . ']" size="1">' . $cachetime_options . '</select>
+            echo '<td class="'.$class.'" align="center"> <select name="bcachetime['.$i->getVar('bid').']" size="1">'.$cachetime_options.'</select>
                                     </td>';
 
             // Actions
 
-            echo "<td class='$class' align='center'><a href='blocksadmin.php?op=edit&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/edit.png' . " alt='" . _EDIT . "' title='" . _EDIT . "'>
-                 </a> <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/editcopy.png' . " alt='" . _CLONE . "' title='" . _CLONE . "'>
+            echo "<td class='$class' align='center'><a href='blocksadmin.php?op=edit&amp;bid=".$i->getVar('bid')."'><img src=".$pathIcon16.'/edit.png'." alt='"._EDIT."' title='"._EDIT."'>
+                 </a> <a href='blocksadmin.php?op=clone&amp;bid=" . $i->getVar('bid')."'><img src=".$pathIcon16.'/editcopy.png'." alt='"._CLONE."' title='"._CLONE."'>
                  </a>";
             if ('S' !== $i->getVar('block_type') && 'M' !== $i->getVar('block_type')) {
-                echo "&nbsp;<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid=' . $i->getVar('bid') . "'><img src=" . $pathIcon16 . '/delete.png' . " alt='" . _DELETE . "' title='" . _DELETE . "'>
+                echo "&nbsp;<a href='".XOOPS_URL.'/modules/system/admin.php?fct=blocksadmin&amp;op=delete&amp;bid='.$i->getVar('bid')."'><img src=".$pathIcon16.'/delete.png'." alt='"._DELETE."' title='"._DELETE."'>
                      </a>";
             }
             echo "
-            <input type='hidden' name='oldtitle[" . $i->getVar('bid') . "]' value='" . $i->getVar('title') . "'>
-            <input type='hidden' name='oldside[" . $i->getVar('bid') . "]' value='" . $i->getVar('side') . "'>
-            <input type='hidden' name='oldweight[" . $i->getVar('bid') . "]' value='" . $i->getVar('weight') . "'>
-            <input type='hidden' name='oldvisible[" . $i->getVar('bid') . "]' value='" . $i->getVar('visible') . "'>
-            <input type='hidden' name='oldgroups[" . $i->getVar('groups') . "]' value='" . $i->getVar('groups') . "'>
-            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid') . "]' value='" . $i->getVar('bcachetime') . "'>
-            <input type='hidden' name='bid[" . $i->getVar('bid') . "]' value='" . $i->getVar('bid') . "'>
+            <input type='hidden' name='oldtitle[" . $i->getVar('bid')."]' value='".$i->getVar('title')."'>
+            <input type='hidden' name='oldside[" . $i->getVar('bid')."]' value='".$i->getVar('side')."'>
+            <input type='hidden' name='oldweight[" . $i->getVar('bid')."]' value='".$i->getVar('weight')."'>
+            <input type='hidden' name='oldvisible[" . $i->getVar('bid')."]' value='".$i->getVar('visible')."'>
+            <input type='hidden' name='oldgroups[" . $i->getVar('groups')."]' value='".$i->getVar('groups')."'>
+            <input type='hidden' name='oldbcachetime[" . $i->getVar('bid')."]' value='".$i->getVar('bcachetime')."'>
+            <input type='hidden' name='bid[" . $i->getVar('bid')."]' value='".$i->getVar('bid')."'>
             </td></tr>
             ";
             $class = ('even' === $class) ? 'odd' : 'even';
         }
         echo "<tr><td class='foot' align='center' colspan='8'>
         <input type='hidden' name='op' value='order'>
-        " . $GLOBALS['xoopsSecurity']->getTokenHTML() . "
-        <input type='submit' name='submit' value='" . _SUBMIT . "'>
+        " . $GLOBALS['xoopsSecurity']->getTokenHTML()."
+        <input type='submit' name='submit' value='" . _SUBMIT."'>
         </td></tr></table>
         </form>
         <br><br>";
@@ -285,7 +285,7 @@ 
      */
     function cloneBlock($bid)
     {
-        require_once __DIR__ . '/admin_header.php';
+        require_once __DIR__.'/admin_header.php';
         //require_once __DIR__ . '/admin_header.php';
         xoops_cp_header();
 
@@ -296,16 +296,16 @@ 
         //        mpu_adm_menu();
         $myblock = new \XoopsBlock($bid);
         $db      = \XoopsDatabaseFactory::getDatabaseConnection();
-        $sql     = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . (int)$bid;
+        $sql     = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.(int) $bid;
         $result  = $db->query($sql);
         $modules = [];
         while (false !== ($row = $db->fetchArray($result))) {
-            $modules[] = (int)$row['module_id'];
+            $modules[] = (int) $row['module_id'];
         }
         $is_custom = ('C' === $myblock->getVar('block_type') || 'E' === $myblock->getVar('block_type'));
         $block     = [
-            'title'      => $myblock->getVar('title') . ' Clone',
-            'form_title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK'),
+            'title'      => $myblock->getVar('title').' Clone',
+            'form_title' => constant('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_CLONEBLOCK'),
             'name'       => $myblock->getVar('name'),
             'side'       => $myblock->getVar('side'),
             'weight'     => $myblock->getVar('weight'),
@@ -321,11 +321,11 @@ 
             'template'   => $myblock->getVar('template'),
             'options'    => $myblock->getVar('options')
         ];
-        echo '<a href="blocksadmin.php">' . _AM_BADMIN . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . _AM_SYSTEM_BLOCKS_CLONEBLOCK . '<br><br>';
-        require_once __DIR__   . '/blockform.php';
+        echo '<a href="blocksadmin.php">'._AM_BADMIN.'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'._AM_SYSTEM_BLOCKS_CLONEBLOCK.'<br><br>';
+        require_once __DIR__.'/blockform.php';
         $form->display();
         //        xoops_cp_footer();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -389,13 +389,13 @@ 
         }
         $db = \XoopsDatabaseFactory::getDatabaseConnection();
         foreach ($bmodule as $bmid) {
-            $sql = 'INSERT INTO ' . $db->prefix('block_module_link') . ' (block_id, module_id) VALUES (' . $newid . ', ' . $bmid . ')';
+            $sql = 'INSERT INTO '.$db->prefix('block_module_link').' (block_id, module_id) VALUES ('.$newid.', '.$bmid.')';
             $db->query($sql);
         }
-        $groups =& $GLOBALS['xoopsUser']->getGroups();
+        $groups = & $GLOBALS['xoopsUser']->getGroups();
         $count  = count($groups);
         for ($i = 0; $i < $count; ++$i) {
-            $sql = 'INSERT INTO ' . $db->prefix('group_permission') . ' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES (' . $groups[$i] . ', ' . $newid . ", 1, 'block_read')";
+            $sql = 'INSERT INTO '.$db->prefix('group_permission').' (gperm_groupid, gperm_itemid, gperm_modid, gperm_name) VALUES ('.$groups[$i].', '.$newid.", 1, 'block_read')";
             $db->query($sql);
         }
         redirect_header('blocksadmin.php?op=listar', 1, _AM_DBUPDATED);
@@ -425,7 +425,7 @@ 
      */
     function xtubeEditBlock($bid)
     {
-        require_once __DIR__ . '/admin_header.php';
+        require_once __DIR__.'/admin_header.php';
         //require_once __DIR__ . '/admin_header.php';
         xoops_cp_header();
 
@@ -435,11 +435,11 @@ 
         //        mpu_adm_menu();
         $myblock = new \XoopsBlock($bid);
         $db      = \XoopsDatabaseFactory::getDatabaseConnection();
-        $sql     = 'SELECT module_id FROM ' . $db->prefix('block_module_link') . ' WHERE block_id=' . (int)$bid;
+        $sql     = 'SELECT module_id FROM '.$db->prefix('block_module_link').' WHERE block_id='.(int) $bid;
         $result  = $db->query($sql);
         $modules = [];
         while (false !== ($row = $db->fetchArray($result))) {
-            $modules[] = (int)$row['module_id'];
+            $modules[] = (int) $row['module_id'];
         }
         $is_custom = ('C' === $myblock->getVar('block_type') || 'E' === $myblock->getVar('block_type'));
         $block     = [
@@ -460,11 +460,11 @@ 
             'template'   => $myblock->getVar('template'),
             'options'    => $myblock->getVar('options')
         ];
-        echo '<a href="blocksadmin.php">' . _AM_BADMIN . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . _AM_SYSTEM_BLOCKS_EDITBLOCK . '<br><br>';
-        require_once __DIR__   . '/blockform.php';
+        echo '<a href="blocksadmin.php">'._AM_BADMIN.'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'._AM_SYSTEM_BLOCKS_EDITBLOCK.'<br><br>';
+        require_once __DIR__.'/blockform.php';
         $form->display();
         //        xoops_cp_footer();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -497,7 +497,7 @@ 
                 $GLOBALS['xoopsDB']->query($sql);
             } else {
                 foreach ($bmodule as $bmid) {
-                    $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $GLOBALS['xoopsDB']->prefix('block_module_link'), $bid, (int)$bmid);
+                    $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $GLOBALS['xoopsDB']->prefix('block_module_link'), $bid, (int) $bmid);
                     $GLOBALS['xoopsDB']->query($sql);
                 }
             }
@@ -510,14 +510,14 @@ 
                 $GLOBALS['xoopsDB']->query($sql);
             }
         }
-        redirect_header($_SERVER['PHP_SELF'], 1, constant('CO_' . $moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        redirect_header($_SERVER['PHP_SELF'], 1, constant('CO_'.$moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
 
     if ('list' === $op) {
         xoops_cp_header();
         //        mpu_adm_menu();
         listBlocks();
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         exit();
     }
 
@@ -539,7 +539,7 @@ 
                     $GLOBALS['xoopsDB']->query($sql);
                 } else {
                     foreach ($bmodule[$i] as $bmid) {
-                        $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $GLOBALS['xoopsDB']->prefix('block_module_link'), $bid[$i], (int)$bmid);
+                        $sql = sprintf('INSERT INTO `%s` (block_id, module_id) VALUES (%u, %d)', $GLOBALS['xoopsDB']->prefix('block_module_link'), $bid[$i], (int) $bmid);
                         $GLOBALS['xoopsDB']->query($sql);
                     }
                 }
@@ -553,7 +553,7 @@ 
                 }
             }
         }
-        redirect_header($_SERVER['PHP_SELF'], 1, constant('CO_' . $moduleDirNameUpper . '_' . 'UPDATE_SUCCESS'));
+        redirect_header($_SERVER['PHP_SELF'], 1, constant('CO_'.$moduleDirNameUpper.'_'.'UPDATE_SUCCESS'));
     }
     if ('clone' === $op) {
         cloneBlock($bid);
@@ -571,5 +571,5 @@ 
         isBlockCloned($bid, $bside, $bweight, $bvisible, $bcachetime, $bmodule, $options);
     }
 } else {
-    echo constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR403');
+    echo constant('CO_'.$moduleDirNameUpper.'_'.'ERROR403');
 }

admin/menu.php

Spacing +10 added lines, -10 removed lines

@@ -22,14 +22,14 @@ 
 // require_once  dirname(__DIR__) . '/class/Helper.php';
 //require_once  dirname(__DIR__) . '/include/common.php';
 
-require_once dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = basename(dirname(__DIR__));
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
 $helper = Extcal\Helper::getInstance();
 
-$pathIcon32    = \Xmf\Module\Admin::menuIconPath('');
+$pathIcon32 = \Xmf\Module\Admin::menuIconPath('');
 if (is_object($helper->getModule())) {
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 }
@@ -37,29 +37,29 @@ 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_INDEX,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png'
+    'icon'  => $pathIcon32.'/home.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_CATEGORY,
     'link'  => 'admin/cat.php',
-    'icon'  => $pathIcon32 . '/category.png'
+    'icon'  => $pathIcon32.'/category.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_EVENT,
     'link'  => 'admin/event.php',
-    'icon'  => $pathIcon32 . '/event.png'
+    'icon'  => $pathIcon32.'/event.png'
 ];
 $adminmenu[] = [
     'title' => _MI_EXTCAL_LOCATIONS,
     'link'  => 'admin/location.php',
-    'icon'  => $pathModIcon32 . '/location.png'
+    'icon'  => $pathModIcon32.'/location.png'
 ];
 $adminmenu[] = [
     'title' => _MI_EXTCAL_PERMISSIONS,
     'link'  => 'admin/permissions.php',
-    'icon'  => $pathIcon32 . '/permissions.png'
+    'icon'  => $pathIcon32.'/permissions.png'
 ];
 
 // Blocks Admin
@@ -67,17 +67,17 @@ 
             'title' => _MI_EXTCAL_BLOCKS_ADMIN, //'Block/Group Admin'
 //    'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS'),
     'link'  => 'admin/blocksadmin.php',
-    'icon'  => $pathIcon32 . '/block.png',
+    'icon'  => $pathIcon32.'/block.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_ADMENU_MIGRATE,
     'link'  => 'admin/migrate.php',
-    'icon'  => $pathIcon32 . '/database_go.png'
+    'icon'  => $pathIcon32.'/database_go.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png'
+    'icon'  => $pathIcon32.'/about.png'
 ];

include/config.php

Spacing +17 added lines, -17 removed lines

@@ -23,34 +23,34 @@ 
     $moduleDirName      = basename(dirname(__DIR__));
     $moduleDirNameUpper = strtoupper($moduleDirName);
 
-    return (object)[
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+    return (object) [
+        'name'           => strtoupper($moduleDirName).' Module Configurator',
         'paths'          => [
             'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
         ],
         'uploadFolders'  => [
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/thumbnails'
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/thumbnails'
         ],
         'copyBlankFiles' => [
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images/thumbnails'
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images/thumbnails'
         ],
 
         'copyTestFolders' => [
             [
-                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/images',
-                XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
+                XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/images',
+                XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/images',
             ],
             [
-                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
-                XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
+                XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/thumbs',
+                XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/thumbs',
             ]
         ],
 
@@ -75,7 +75,7 @@ 
             //         'XX_archive'     => 'ZZZZ_archive',
         ],
         'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . XOOPS_URL . '/modules/' . $moduleDirName . '_AUTHOR_LOGOIMG' . '\' alt=\'XOOPS Project\' /></a>',
+                     <img src='" . XOOPS_URL.'/modules/'.$moduleDirName.'_AUTHOR_LOGOIMG'.'\' alt=\'XOOPS Project\' /></a>',
 
     ];
 }

class/Common/Configurator.php

Spacing +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
     public function __construct()
     {
         $moduleDirName = basename(dirname(dirname(__DIR__)));
-        $moduleDirNameUpper   = strtoupper($moduleDirName);
+        $moduleDirNameUpper = strtoupper($moduleDirName);
 
-        require dirname(dirname(__DIR__)) . '/include/config.php';
+        require dirname(dirname(__DIR__)).'/include/config.php';
         $config = getConfig();
 
         $this->name            = $config->name;

class/Common/Migrate.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@ 
      * @throws \InvalidArgumentException
      */
     public function __construct(Extcal\Common\Configurator  $configurator)
-    {   require_once  dirname(dirname(__DIR__)) . '/include/config.php';
+    {   require_once  dirname(dirname(__DIR__)).'/include/config.php';
 //        $config = getConfig();
-        $this->renameTables            = $configurator->renameTables;
+        $this->renameTables = $configurator->renameTables;
 
         $moduleDirName = basename(dirname(dirname(__DIR__)));
         parent::__construct($moduleDirName);
@@ -90,7 +90,7 @@ 
                 $this->synchronizeTable($tableName);
                 $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
                 $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);
-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
+                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n"."SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n".'  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';
                 $this->tableHandler->addToQueue($sql);
             }
         }