XoopsModules25x / tools

modules/tools/class/Common/SysUtility.php

Unused Use Statements -2 removed lines

@@ -23,10 +23,8 @@
  * @author       Mamba <mambax7@gmail.com>
  */
 
-use MyTextSanitizer;
 use XoopsFormDhtmlTextArea;
 use XoopsFormEditor;
-use XoopsFormTextArea;
 use XoopsModules\Tools;
 use XoopsModules\Tools\Helper;
 

Spacing +5 added lines, -5 removed lines

@@ -66,11 +66,11 @@ 
     {
         if ($considerHtml) {
             // if the plain text is shorter than the maximum length, return the whole text
-            if (mb_strlen(preg_replace('/<.*?' . '>/', '', $text)) <= $length) {
+            if (mb_strlen(preg_replace('/<.*?'.'>/', '', $text)) <= $length) {
                 return $text;
             }
             // splits all html-tags to scanable lines
-            preg_match_all('/(<.+?' . '>)?([^<>]*)/s', $text, $lines, PREG_SET_ORDER);
+            preg_match_all('/(<.+?'.'>)?([^<>]*)/s', $text, $lines, PREG_SET_ORDER);
             $total_length = mb_strlen($ending);
             $open_tags    = [];
             $truncate     = '';
@@ -88,7 +88,7 @@ 
                             unset($open_tags[$pos]);
                         }
                         // if tag is an opening tag
-                    } elseif (preg_match('/^<\s*([^\s>!]+).*?' . '>$/s', $line_matchings[1], $tag_matchings)) {
+                    } elseif (preg_match('/^<\s*([^\s>!]+).*?'.'>$/s', $line_matchings[1], $tag_matchings)) {
                         // add tag to the beginning of $open_tags list
                         array_unshift($open_tags, mb_strtolower($tag_matchings[1]));
                     }
@@ -146,7 +146,7 @@ 
         if ($considerHtml) {
             // close all unclosed html-tags
             foreach ($open_tags as $tag) {
-                $truncate .= '</' . $tag . '>';
+                $truncate .= '</'.$tag.'>';
             }
         }
 
@@ -226,7 +226,7 @@ 
         // set the auto-incremented id's value to blank.
         unset($tempTable[$id_field]);
         // insert cloned copy of the original  record
-        $sql    = "INSERT INTO $table (" . implode(', ', array_keys($tempTable)) . ") VALUES ('" . implode("', '", array_values($tempTable)) . "')";
+        $sql    = "INSERT INTO $table (".implode(', ', array_keys($tempTable)).") VALUES ('".implode("', '", array_values($tempTable))."')";
         $result = $GLOBALS['xoopsDB']->queryF($sql);
         if (!$result) {
             exit($GLOBALS['xoopsDB']->error());

modules/tools/include/common.php

Unused Use Statements +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  * @author      XOOPS Development Team

  */

 

-use Xmf\Module\Admin;

+use Xmf\Module\Admin;
 use XoopsModules\Tools;

 

 require_once dirname(__DIR__) . '/preloads/autoloader.php';

Spacing +26 added lines, -26 removed lines

@@ -18,7 +18,7 @@ 
 use Xmf\Module\Admin;

 use XoopsModules\Tools;

 

-require_once dirname(__DIR__) . '/preloads/autoloader.php';

+require_once dirname(__DIR__).'/preloads/autoloader.php';

 

 $moduleDirName      = \basename(\dirname(__DIR__));

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

@@ -37,20 +37,20 @@ 
 //$categoryHandler     = new Tools\CategoryHandler($db);

 //$downloadHandler     = new Tools\DownloadHandler($db);

 

-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {

-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));

-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');

-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');

-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');

-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');

-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');

-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');

-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');

-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');

-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');

-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash

-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash

-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);

+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {

+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));

+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');

+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');

+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');

+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');

+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');

+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');

+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');

+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');

+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');

+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash

+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash

+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);

 }

 

 $pathIcon16 = Admin::iconUrl('', 16);

@@ -59,15 +59,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');

 

 $icons = [

-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",

-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",

-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",

-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",

-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",

-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",

-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",

-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",

-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",

+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",

+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",

+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",

+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",

+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",

+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",

+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",

+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",

+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",

 ];

 

 $debug = false;

@@ -80,12 +80,12 @@ 
     $GLOBALS['xoopsTpl'] = new \XoopsTpl();

 }

 

-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);

+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);

 // Local icons path

 if (is_object($helper->getModule())) {

     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');

     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');

 

-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);

+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);

     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);

 }

modules/tools/testdata/index.php

Unused Use Statements +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
  * @author          Michael Beck (aka Mamba)

  */

 

-use Xmf\Database\TableLoad;

-use Xmf\Request;

+use Xmf\Database\TableLoad;
+use Xmf\Request;
 use Xmf\Yaml;

 use XoopsModules\Tools\{

     Helper,

Switch Indentation +17 added lines, -17 removed lines

@@ -38,24 +38,24 @@
 $helper->loadLanguage('common');

 

 switch ($op) {

-    case 'load':

-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {

-            if (!$GLOBALS['xoopsSecurity']->check()) {

-                redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));

-            }

-            loadSampleData();

-        } else {

-            xoops_cp_header();

-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);

-            xoops_cp_footer();

+case 'load':

+    if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {

+        if (!$GLOBALS['xoopsSecurity']->check()) {

+            redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));

         }

-        break;

-    case 'save':

-        saveSampleData();

-        break;

-    case 'clear':

-        clearSampleData();

-        break;

+        loadSampleData();

+    } else {

+        xoops_cp_header();

+        xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);

+        xoops_cp_footer();

+    }

+    break;

+case 'save':

+    saveSampleData();

+    break;

+case 'clear':

+    clearSampleData();

+    break;

 }

 

 // XMF TableLoad for SAMPLE data

Spacing +21 added lines, -21 removed lines

@@ -25,8 +25,8 @@ 
 /** @var Utility $utility */

 /** @var Configurator $configurator */

 

-require dirname(__DIR__, 3) . '/include/cp_header.php';

-require dirname(__DIR__) . '/preloads/autoloader.php';

+require dirname(__DIR__, 3).'/include/cp_header.php';

+require dirname(__DIR__).'/preloads/autoloader.php';

 

 $op = Request::getCmd('op', '');

 

@@ -46,7 +46,7 @@ 
             loadSampleData();

         } else {

             xoops_cp_header();

-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);

+            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_CONFIRM')), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);

             xoops_cp_footer();

         }

         break;

@@ -72,20 +72,20 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');

 

     $language = 'english/';

-    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {

-        $language = $xoopsConfig['language'] . '/';

+    if (is_dir(__DIR__.'/'.$xoopsConfig['language'])) {

+        $language = $xoopsConfig['language'].'/';

     }

 

     // load module tables

     foreach ($tables as $table) {

-        $tabledata = Yaml::readWrapped($language . $table . '.yml');

+        $tabledata = Yaml::readWrapped($language.$table.'.yml');

         TableLoad::truncateTable($table);

         TableLoad::loadTableFromArray($table, $tabledata);

     }

 

     // load permissions

     $table     = 'group_permission';

-    $tabledata = Yaml::readWrapped($language . $table . '.yml');

+    $tabledata = Yaml::readWrapped($language.$table.'.yml');

     $mid       = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');

     loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);

 

@@ -98,7 +98,7 @@ 
             $utility::rcopy($src, $dest);

         }

     }

-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));

+    \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_SUCCESS'));

 }

 

 function saveSampleData()

@@ -109,26 +109,26 @@ 
     $helper             = Helper::getInstance();

     $tables             = $helper->getModule()->getInfo('tables');

 

-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];

-    if (!file_exists($languageFolder . '/')) {

-        Utility::createFolder($languageFolder . '/');

+    $languageFolder = __DIR__.'/'.$xoopsConfig['language'];

+    if (!file_exists($languageFolder.'/')) {

+        Utility::createFolder($languageFolder.'/');

     }

-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';

+    $exportFolder = $languageFolder.'/Exports-'.date('Y-m-d-H-i-s').'/';

     Utility::createFolder($exportFolder);

 

     // save module tables

     foreach ($tables as $table) {

-        TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');

+        TableLoad::saveTableToYamlFile($table, $exportFolder.$table.'.yml');

     }

 

     // save permissions

     $criteria = new \CriteriaCompo();

     $criteria->add(new \Criteria('gperm_modid', $helper->getModule()->getVar('mid')));

     $skipColumns[] = 'gperm_id';

-    TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);

+    TableLoad::saveTableToYamlFile('group_permission', $exportFolder.'group_permission.yml', $criteria, $skipColumns);

     unset($criteria);

 

-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));

+    \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA_SUCCESS'));

 }

 

 function exportSchema()

@@ -143,7 +143,7 @@ 
         //

         //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));

     } catch (\Throwable $e) {

-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));

+        exit(constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR'));

     }

 }

 

@@ -167,12 +167,12 @@ 
     $prefixedTable = $db->prefix($table);

     $count         = 0;

 

-    $sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);

+    $sql = 'DELETE FROM '.$prefixedTable.' WHERE `'.$search.'`='.$db->quote($replace);

 

     $result = $db->queryF($sql);

 

     foreach ($data as $row) {

-        $insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';

+        $insertInto  = 'INSERT INTO '.$prefixedTable.' (';

         $valueClause = ' VALUES (';

         $first       = true;

         foreach ($row as $column => $value) {

@@ -191,7 +191,7 @@ 
             }

         }

 

-        $sql = $insertInto . ') ' . $valueClause . ')';

+        $sql = $insertInto.') '.$valueClause.')';

 

         $result = $db->queryF($sql);

         if (false !== $result) {

@@ -202,7 +202,7 @@ 
     return $count;

 }

 

-function clearSampleData(){

+function clearSampleData() {

     $moduleDirName      = \basename(\dirname(__DIR__));

     $moduleDirNameUpper = mb_strtoupper($moduleDirName);

     $helper             = Helper::getInstance();

@@ -213,5 +213,5 @@ 
     foreach ($tables as $table) {

         \Xmf\Database\TableLoad::truncateTable($table);

     }

-    redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));

+    redirect_header($helper->url('admin/index.php'), 1, constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_OK'));

 }

modules/tools/language/english/common.php

Spacing +129 added lines, -129 removed lines

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

 $moduleDirNameUpper = mb_strtoupper($moduleDirName);

 

-\define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');

-\define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');

-\define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");

-\define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");

-\define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');

-\define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');

-\define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');

-\define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');

-\define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");

-\define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");

-\define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");

-\define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');

-\define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');

-\define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");

-\define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');

-

-\define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");

-\define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");

-

-\define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");

-\define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");

-\define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");

-\define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');

-\define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');

-\define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');

-\define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');

-

-\define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');

+\define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');

+\define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');

+\define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");

+\define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");

+\define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');

+\define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');

+\define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');

+\define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');

+\define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");

+\define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");

+\define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");

+\define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');

+\define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');

+\define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");

+\define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');

+

+\define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");

+\define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");

+

+\define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");

+\define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");

+\define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");

+\define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');

+\define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');

+\define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');

+\define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');

+

+\define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');

 

 // Error Msgs

-\define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');

-\define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');

-\define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');

+\define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');

+\define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');

+\define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');

 

 //Help

-\define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__, 2)));

-\define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');

-\define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');

-\define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');

+\define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__, 2)));

+\define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');

+\define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');

+\define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');

 

 //\define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);

 

 //help multi-page

-\define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');

-\define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');

-\define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');

+\define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');

+\define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');

+\define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');

 

 //Sample Data

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+

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

 

 //letter choice

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

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

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

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

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

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

 

 // block defines

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-

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

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

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

-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+

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

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

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

+

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

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

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

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

 

 //myblocksadmin

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

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

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

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

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

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

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

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

 

 //Template Admin

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

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

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

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

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

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

 

 //Menu

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

 //Latest Version Check

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

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

 

 //DirectoryChecker

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

 //FileChecker

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

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

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

 

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

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

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

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

 

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

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

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

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

 

 //image config

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

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

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

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

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

 

 

 //Module Stats

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

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

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

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

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

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

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

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

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

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

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

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

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

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

modules/tools/language/english/modinfo.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
 //Help
 define('_MI_TOOLS_DIRNAME', basename(dirname(__DIR__, 2)));
-define('_MI_TOOLS_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
+define('_MI_TOOLS_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
 define('_MI_TOOLS_BACK_2_ADMIN', 'Back to Administration of ');
 define('_MI_TOOLS_OVERVIEW', 'Overview');
 

modules/tools/xoops_version.php

Spacing +4 added lines, -4 removed lines

@@ -48,7 +48,7 @@ 
 // database tables, not applicable for this module

 $modversion['sqlfile']['mysql'] = 'sql/sql.sql';

 $modversion['tables']           = [

-    $moduleDirName . '_' . 'blocks',

+    $moduleDirName.'_'.'blocks',

 ];

 

 // Admin things, not applicable for this module

@@ -74,9 +74,9 @@ 
 

 // ------------------- Templates ------------------- //

 $modversion['templates'] = [

-    ['file' => 'tools_admin_blockscall.tpl', 'description' => '',],

-    ['file' => 'tools_admin_blockscall_new.tpl', 'description' => '',],

-    ['file' => 'tools_admin_blockscall_edit.tpl', 'description' => '',],

+    ['file' => 'tools_admin_blockscall.tpl', 'description' => '', ],

+    ['file' => 'tools_admin_blockscall_new.tpl', 'description' => '', ],

+    ['file' => 'tools_admin_blockscall_edit.tpl', 'description' => '', ],

 ];

 

 // ------------------- Blocks ------------------- //

modules/tools/admin/main.php

Switch Indentation +46 added lines, -46 removed lines

@@ -29,30 +29,30 @@ 
 
 $op = $_REQUEST['op'] ?? 'main';
 switch ($op) {
-    default:
-    case 'main':
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-        $form = new \XoopsThemeForm(_AM_TOOLS_INDEX, 'updatecache', 'main.php', 'post', true);
-        $form->addElement(new \XoopsFormLabel(_AM_TOOLS_TIP, _AM_TOOLS_TIPS));
-        $checkbox_options = [
-            'updatexoopscache'    => _AM_TOOLS_UPDATEXOOPSCACHE,
-            'updatesmartycache'   => _AM_TOOLS_UPDATESMARTYCACHE,
-            'updatesmartycompile' => _AM_TOOLS_UPDATESMARTYCOMPILE,
-        ];
-        $checkbox         = new \XoopsFormCheckBox(_AM_TOOLS_OPTIONS, 'options', array_keys($checkbox_options));
-        $checkbox->addOptionArray($checkbox_options);
-        $form->addElement($checkbox);
-        $form->addElement(new \XoopsFormHidden('op', 'updatecache'));
-        $form->addElement(new \XoopsFormHidden('step', '1'));
-        $form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-        $form->display();
-        break;
-    case 'updatecache':
-        if (1 == $_REQUEST['step']) {
-            $options  = implode('_', $_REQUEST['options']);
-            $url      = XOOPS_URL . "/modules/tools/admin/main.php?op=updatecache&step=2&options={$options}";
-            $updating = _AM_TOOLS_UPDATING;
-            $msg      = <<<EOF
+default:
+case 'main':
+    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    $form = new \XoopsThemeForm(_AM_TOOLS_INDEX, 'updatecache', 'main.php', 'post', true);
+    $form->addElement(new \XoopsFormLabel(_AM_TOOLS_TIP, _AM_TOOLS_TIPS));
+    $checkbox_options = [
+        'updatexoopscache'    => _AM_TOOLS_UPDATEXOOPSCACHE,
+        'updatesmartycache'   => _AM_TOOLS_UPDATESMARTYCACHE,
+        'updatesmartycompile' => _AM_TOOLS_UPDATESMARTYCOMPILE,
+    ];
+    $checkbox         = new \XoopsFormCheckBox(_AM_TOOLS_OPTIONS, 'options', array_keys($checkbox_options));
+    $checkbox->addOptionArray($checkbox_options);
+    $form->addElement($checkbox);
+    $form->addElement(new \XoopsFormHidden('op', 'updatecache'));
+    $form->addElement(new \XoopsFormHidden('step', '1'));
+    $form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+    $form->display();
+    break;
+case 'updatecache':
+    if (1 == $_REQUEST['step']) {
+        $options  = implode('_', $_REQUEST['options']);
+        $url      = XOOPS_URL . "/modules/tools/admin/main.php?op=updatecache&step=2&options={$options}";
+        $updating = _AM_TOOLS_UPDATING;
+        $msg      = <<<EOF
     <div class="loading" style="text-align:center">
     <img src="../assets/images/loader.gif">
     <p>{$updating}</P>
@@ -66,31 +66,31 @@ 
     <script type="text/JavaScript">setTimeout("redirect('{$url}');", 2000);</script>
 EOF;
 
-            echo $msg;
-        } elseif (2 == $_REQUEST['step']) {
-            $options = explode('_', $_REQUEST['options']);
-            foreach ($options as $k) {
-                if ('updatexoopscache' === $k) {
-                    $d = XOOPS_VAR_PATH . '/caches/xoops_cache';
-                    updatecache($d, 'php');
-                    updatecache($d, 'html');
-                    updatecache($d, 'tmp');
-                }
-                if ('updatesmartycache' === $k) {
-                    $d = XOOPS_VAR_PATH . '/caches/smarty_cache';
-                    updatecache($d, 'html');
-                    updatecache($d, 'tmp');
-                }
-                if ('updatesmartycompile' === $k) {
-                    $d = XOOPS_VAR_PATH . '/caches/smarty_compile';
-                    updatecache($d, 'php');
-                }
+        echo $msg;
+    } elseif (2 == $_REQUEST['step']) {
+        $options = explode('_', $_REQUEST['options']);
+        foreach ($options as $k) {
+            if ('updatexoopscache' === $k) {
+                $d = XOOPS_VAR_PATH . '/caches/xoops_cache';
+                updatecache($d, 'php');
+                updatecache($d, 'html');
+                updatecache($d, 'tmp');
+            }
+            if ('updatesmartycache' === $k) {
+                $d = XOOPS_VAR_PATH . '/caches/smarty_cache';
+                updatecache($d, 'html');
+                updatecache($d, 'tmp');
+            }
+            if ('updatesmartycompile' === $k) {
+                $d = XOOPS_VAR_PATH . '/caches/smarty_compile';
+                updatecache($d, 'php');
             }
-
-            redirect_header('main.php', 3, _AM_TOOLS_UPDATECACHESUCCESS);
         }
 
-        break;
+        redirect_header('main.php', 3, _AM_TOOLS_UPDATECACHESUCCESS);
+    }
+
+    break;
 }
 
 function updatecache($cacheDir, $type)

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 use Xmf\Module\Admin;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 //loadModuleAdminMenu(1, '');
@@ -31,7 +31,7 @@ 
 switch ($op) {
     default:
     case 'main':
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $form = new \XoopsThemeForm(_AM_TOOLS_INDEX, 'updatecache', 'main.php', 'post', true);
         $form->addElement(new \XoopsFormLabel(_AM_TOOLS_TIP, _AM_TOOLS_TIPS));
         $checkbox_options = [
@@ -39,7 +39,7 @@ 
             'updatesmartycache'   => _AM_TOOLS_UPDATESMARTYCACHE,
             'updatesmartycompile' => _AM_TOOLS_UPDATESMARTYCOMPILE,
         ];
-        $checkbox         = new \XoopsFormCheckBox(_AM_TOOLS_OPTIONS, 'options', array_keys($checkbox_options));
+        $checkbox = new \XoopsFormCheckBox(_AM_TOOLS_OPTIONS, 'options', array_keys($checkbox_options));
         $checkbox->addOptionArray($checkbox_options);
         $form->addElement($checkbox);
         $form->addElement(new \XoopsFormHidden('op', 'updatecache'));
@@ -50,7 +50,7 @@ 
     case 'updatecache':
         if (1 == $_REQUEST['step']) {
             $options  = implode('_', $_REQUEST['options']);
-            $url      = XOOPS_URL . "/modules/tools/admin/main.php?op=updatecache&step=2&options={$options}";
+            $url      = XOOPS_URL."/modules/tools/admin/main.php?op=updatecache&step=2&options={$options}";
             $updating = _AM_TOOLS_UPDATING;
             $msg      = <<<EOF
     <div class="loading" style="text-align:center">
@@ -71,18 +71,18 @@ 
             $options = explode('_', $_REQUEST['options']);
             foreach ($options as $k) {
                 if ('updatexoopscache' === $k) {
-                    $d = XOOPS_VAR_PATH . '/caches/xoops_cache';
+                    $d = XOOPS_VAR_PATH.'/caches/xoops_cache';
                     updatecache($d, 'php');
                     updatecache($d, 'html');
                     updatecache($d, 'tmp');
                 }
                 if ('updatesmartycache' === $k) {
-                    $d = XOOPS_VAR_PATH . '/caches/smarty_cache';
+                    $d = XOOPS_VAR_PATH.'/caches/smarty_cache';
                     updatecache($d, 'html');
                     updatecache($d, 'tmp');
                 }
                 if ('updatesmartycompile' === $k) {
-                    $d = XOOPS_VAR_PATH . '/caches/smarty_compile';
+                    $d = XOOPS_VAR_PATH.'/caches/smarty_compile';
                     updatecache($d, 'php');
                 }
             }
@@ -98,10 +98,10 @@ 
     $d = dir($cacheDir);
     while (false !== ($entry = $d->read())) {
         if (preg_match("/.*\.{$type}$/", $entry)) {
-            unlink($cacheDir . '/' . $entry);
+            unlink($cacheDir.'/'.$entry);
         }
     }
     $d->close();
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

modules/tools/admin/admin_footer.php

Indentation +5 added lines, -5 removed lines

@@ -23,11 +23,11 @@
 $pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);

 

 echo "<div class='adminfooter'>\n"

-     . "  <div style='text-align: center;'>\n"

-     . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"

-     . "  </div>\n"

-     . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"

-     . '</div>';

+        . "  <div style='text-align: center;'>\n"

+        . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"

+        . "  </div>\n"

+        . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"

+        . '</div>';

 

 

 xoops_cp_footer();

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
      . "  <div style='text-align: center;'>\n"

      . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"

      . "  </div>\n"

-     . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"

+     . '  '._AM_MODULEADMIN_ADMIN_FOOTER."\n"

      . '</div>';

 

 

modules/tools/admin/index.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     Utility

 };

 

-require_once __DIR__ . '/admin_header.php';

+require_once __DIR__.'/admin_header.php';

 // Display Admin header

 xoops_cp_header();

 $adminObject = Admin::getInstance();

@@ -39,4 +39,4 @@ 
 /** @var Utility $utility */

 echo $utility::getServerStats();

 

-require_once __DIR__ . '/admin_footer.php';

+require_once __DIR__.'/admin_footer.php';