XoopsModules25x / tools

modules/tools/include/blockform.php

Spacing +3 added lines, -3 removed lines

@@ -16,12 +16,12 @@
  * @since           2.00
  * @author          Susheng Yang <ezskyyoung@gmail.com>
  */
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-$form = new \XoopsForm(_EDIT . _AM_TOOLS_BC_BLOCK, 'form', 'blockscall.php', 'post', true);
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+$form = new \XoopsForm(_EDIT._AM_TOOLS_BC_BLOCK, 'form', 'blockscall.php', 'post', true);
 $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_NAME, $block_data['name']));
 $form->addElement(new \XoopsFormText(_AM_TOOLS_BC_DESCRIPTION, 'desc', 60, 255, $block_data['desciption']));
 if ('' != $block_data['template']) {
-    $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_CONTENT, '<a href="blockscall.php?op=edittpl&amp;bid=' . $block_data['bid'] . '">' . _AM_TOOLS_BC_EDITTPL . '</a>'));
+    $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_CONTENT, '<a href="blockscall.php?op=edittpl&amp;bid='.$block_data['bid'].'">'._AM_TOOLS_BC_EDITTPL.'</a>'));
 }
 if (false !== $block_data['edit_form']) {
     $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_OPTIONS, $block_data['edit_form']));

modules/tools/preloads/core.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
      */
     public static function eventCoreIncludeCommonEnd($args)
     {
-        require_once __DIR__ . '/autoloader.php';
+        require_once __DIR__.'/autoloader.php';
     }
 }

modules/tools/preloads/autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -4,12 +4,12 @@ 
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(
-    static function ($class) {
+    static function($class) {
         // project-specific namespace prefix
-        $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+        $prefix = 'XoopsModules\\'.ucfirst(basename(dirname(__DIR__)));
 
         // base directory for the namespace prefix
-        $baseDir = dirname(__DIR__) . '/class/';
+        $baseDir = dirname(__DIR__).'/class/';
 
         // does the class use the namespace prefix?
         $len = mb_strlen($prefix);
@@ -24,7 +24,7 @@ 
         // replace the namespace prefix with the base directory, replace namespace
         // separators with directory separators in the relative class name, append
         // with .php
-        $file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
+        $file = $baseDir.str_replace('\\', '/', $relativeClass).'.php';
 
         // if the file exists, require it
         if (is_file($file)) {

modules/tools/class/Helper.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
     {

         $ret = false;

 

-        $class = __NAMESPACE__ . '\\' . \ucfirst($name) . 'Handler';

+        $class = __NAMESPACE__.'\\'.\ucfirst($name).'Handler';

         if (!\class_exists($class)) {

             throw new \RuntimeException("Class '$class' not found");

         }

modules/tools/class/BlocksCall.php

Spacing +2 added lines, -2 removed lines

@@ -49,10 +49,10 @@
         if (!$edit_func) {

             return false;

         }

-        if (is_file(XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file'))) {

+        if (is_file(XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file'))) {

             xoops_loadLanguage('blocks', $this->getVar('dirname'));

 

-            require_once XOOPS_ROOT_PATH . '/modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file');

+            require_once XOOPS_ROOT_PATH.'/modules/'.$this->getVar('dirname').'/blocks/'.$this->getVar('func_file');

             $options   = explode('|', $this->getVar('options'));

             $edit_form = $edit_func($options);

             if (!$edit_form) {

modules/tools/testdata/index.php

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;

@@ -75,20 +75,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);

 

@@ -101,7 +101,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'));

 }

 

 /**

@@ -115,26 +115,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'));

 }

 

 /**

@@ -152,7 +152,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'));

     }

 }

 

@@ -176,12 +176,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) {

@@ -200,7 +200,7 @@ 
             }

         }

 

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

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

 

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

         if (false !== $result) {

@@ -214,7 +214,7 @@ 
 /**

  *

  */

-function clearSampleData(){

+function clearSampleData() {

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

     $moduleDirNameUpper = \mb_strtoupper($moduleDirName);

     $helper             = Helper::getInstance();

@@ -225,5 +225,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/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;

 }

 

 /**

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

                 }

             }

@@ -102,10 +102,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/include/config.php

Spacing +14 added lines, -14 removed lines

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

 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);

 

-return (object)[

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

+return (object) [

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

     'paths'          => [

         'dirname'    => $moduleDirName,

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

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

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

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

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

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

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

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

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

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

     ],

     'uploadFolders'  => [

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

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

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

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

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

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

         //XOOPS_UPLOAD_PATH . '/flags'

     ],

     'copyBlankFiles' => [

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

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

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

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

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

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

         //XOOPS_UPLOAD_PATH . '/flags'

     ],

 

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

     ],

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

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

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

 ];

modules/tools/include/common.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);

 }