XoopsModules25x / tools

class/smarty/xoops_plugins/block.xoBlkTpl.php

Doc Comments -17 removed lines

@@ -9,23 +9,6 @@
  * how to use
  * The following code inserted in the template
  *  
- * @param string $module module dirname
- * @param string $file  block function file
- * @param string $show_func show block function
- * @param string $options show block function's option
- * @param int $cachetime cachetime Unit for seconds
- * @param mixed $user Generate cache solution
-
-<{xoBlkTpl module="ilog" file="ilog_block_tag.php" show_func="ilog_tag_block_cloud_show" options="100|0|100|80" cachetime=5 userid=$xoops_userid}>
-    <link rel="stylesheet" href="<{$xoops_url}>/modules/tag/templates/style.css" />
-    <div class="tag-cloud" style="line-height: 150%; padding: 5px;">
-    <{foreach item=tag from=$block.tags}>
-    	<span class="tag-level-<{$tag.level}>" style="font-size: <{$tag.font}>%; display: inline; padding-right: 5px;">
-    		<a href="<{$xoops_url}>/modules/<{$block.tag_dirname}>/view.tag.php<{$smarty.const.URL_DELIMITER}><{$tag.id}>/" title="<{$tag.term}>"><{$tag.term}></a>
-    	</span>
-    <{/foreach}>
-    </div>
-<{/xoBlkTpl}>
 */
 function smarty_block_xoBlkTpl ($params, $content, $smarty, &$repeat) {
     static $old_block;

class/smarty/xoops_plugins/function.xoBlk.php

Doc Comments -16 removed lines

@@ -9,22 +9,6 @@
  * how to use
  * The following code inserted in the template
  *  
- * @param string $module module dirname
- * @param string $file  block function file
- * @param string $show_func show block function
- * @param string $options show block function's option
- * @param int $cachetime cachetime Unit for seconds
- * @param mixed $user Generate cache solution
-
-<{xoBlk 
-    module="ilog" 
-    file="ilog_block_tag.php" 
-    show_func="ilog_tag_block_cloud_show" 
-    options="100|0|150|80" 
-    template="ilog_tag_block_cloud.html" 
-    cachetime=10 
-    user=admin
-}>
 */
 function smarty_function_xoBlk( $params, $smarty )
 {

Spacing +4 added lines, -4 removed lines

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

modules/tools/class/Common/SysUtility.php

Unused Use Statements -1 removed lines

@@ -30,7 +30,6 @@
 use MyTextSanitizer;
 use XoopsFormDhtmlTextArea;
 use XoopsFormEditor;
-use XoopsFormTextArea;
 use XoopsModules\Tools\{
     Helper
 };

Indentation +1 added lines, -1 removed lines

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

Spacing +17 added lines, -17 removed lines

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

modules/tools/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/testdata/index.php

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

 }

modules/tools/config/icons.php

Spacing +11 added lines, -11 removed lines

@@ -5,17 +5,17 @@
 $pathIcon16    = Admin::iconUrl('', 16);

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

 

-return (object)[

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

+return (object) [

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

     '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'>",

     ],

 ];

modules/tools/config/config.php

Spacing +16 added lines, -16 removed lines

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

 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);

 

-return (object)[

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

+return (object) [

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

     'paths'          => [

         'dirname'    => $moduleDirName,

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

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

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

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

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

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

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

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

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

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

     ],

     'uploadFolders'  => [

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

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

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

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

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

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

         //XOOPS_UPLOAD_PATH . '/flags'

     ],

     'copyBlankFiles' => [

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

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

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

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

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

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

         //XOOPS_UPLOAD_PATH . '/flags'

     ],

 

     'copyTestFolders' => [

         [

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

-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

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

+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

         ],

         //            [

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

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

     ],

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

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

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

 ];