XoopsModules25x / tools

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/class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -38,19 +38,19 @@ 
         //        $sql   .= " WHERE metakey='version' LIMIT 1";

         //        $query = $GLOBALS['xoopsDB']->query($sql);

         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);

-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";

+        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO')."</legend>\n";

         $html .= "<div style='padding: 8px;'>\n";

         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";

         //        $html .= "<br>\n";

         //        $html .= "<br>\n";

-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";

+        $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI')."</div>\n";

         $html .= "<ul>\n";

 

-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';

-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;

+        $gdlib = function_exists('gd_info') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;

         if (function_exists('gd_info')) {

             if (true === ($gdlib = gd_info())) {

-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';

+                $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';

             }

         }

         //

@@ -60,18 +60,18 @@ 
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';

         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;

         //

-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';

-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;

+        $downloads = ini_get('file_uploads') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;

 

-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";

-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";

-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: blue;">'.ini_get('upload_max_filesize')."</span></b>\n";

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: blue;">'.ini_get('post_max_size')."</span></b>\n";

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: blue;">'.ini_get('memory_limit')."</span></b>\n";

         $html .= "</ul>\n";

         $html .= "<ul>\n";

-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";

+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n";

         $html .= "</ul>\n";

         $html .= "<br>\n";

-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";

+        $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n";

         $html .= '</div>';

         $html .= '</fieldset><br>';

 

modules/tools/class/Common/FilesManagement.php

Spacing +11 added lines, -11 removed lines

@@ -32,7 +32,7 @@ 
                     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>';
@@ -58,14 +58,14 @@ 
         $dir = \opendir($src);
         //        @mkdir($dst);
         if (!@\mkdir($dst) && !\is_dir($dst)) {
-            throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
+            throw new \RuntimeException('The directory '.$dst.' could not be created.');
         }
         while (false !== ($file = \readdir($dir))) {
             if (('.' !== $file) && ('..' !== $file)) {
-                if (\is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (\is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    \copy($src . '/' . $file, $dst . '/' . $file);
+                    \copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -155,7 +155,7 @@ 
                 self::rrmdir($fObj->getPathname());
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return \rmdir($src); // remove the directory & return results
     }
 
@@ -188,14 +188,14 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                \rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                \rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
                 // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
                 //                rmdir($fObj->getPath()); // now delete the directory
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return \rmdir($src); // remove the directory & return results
     }
 
@@ -231,9 +231,9 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                \copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                \copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             }
         }
 

modules/tools/class/Common/Configurator.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         $moduleDirName      = \basename(\dirname(__DIR__, 2));

         $moduleDirNameUpper = mb_strtoupper($moduleDirName);

 

-        $config = require \dirname(__DIR__, 2) . '/config/config.php';

+        $config = require \dirname(__DIR__, 2).'/config/config.php';

 

         $this->name            = $config->name;

         $this->paths           = $config->paths;

modules/tools/class/Common/VersionChecks.php

Spacing +7 added lines, -7 removed lines

@@ -65,13 +65,13 @@ 
         //check for minimum XOOPS version

         $currentVer = mb_substr(XOOPS_VERSION, 6); // get the numeric part of string

         if (null === $requiredVer) {

-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string

+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string

         }

         $success = true;

 

         if (version_compare($currentVer, $requiredVer, '<')) {

             $success = false;

-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));

+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));

         }

 

         return $success;

@@ -102,7 +102,7 @@ 
 

         if (false !== $reqVer && '' !== $reqVer) {

             if (version_compare($verNum, $reqVer, '<')) {

-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));

+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));

                 $success = false;

             }

         }

@@ -126,7 +126,7 @@ 
         $moduleDirName      = \basename(\dirname(__DIR__, 2));

         $moduleDirNameUpper = mb_strtoupper($moduleDirName);

         $update             = '';

-        $repository         = 'XoopsModules25x/' . $moduleDirName;

+        $repository         = 'XoopsModules25x/'.$moduleDirName;

         //        $repository         = 'XoopsModules25x/publisher'; //for testing only

         $ret             = '';

         $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";

@@ -140,14 +140,14 @@ 
                 if (false === $curlReturn) {

                     trigger_error(curl_error($curlHandle));

                 } elseif (false !== strpos($curlReturn, 'Not Found')) {

-                    trigger_error('Repository Not Found: ' . $infoReleasesUrl);

+                    trigger_error('Repository Not Found: '.$infoReleasesUrl);

                 } else {

                     $file              = json_decode($curlReturn, false);

                     $latestVersionLink = sprintf("https://github.com/$repository/archive/%s.zip", $file ? reset($file)->tag_name : $default);

                     $latestVersion     = $file[0]->tag_name;

                     $prerelease        = $file[0]->prerelease;

                     if ('master' !== $latestVersionLink) {

-                        $update = constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;

+                        $update = constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;

                     }

                     //"PHP-standardized" version

                     $latestVersion = mb_strtolower($latestVersion);

@@ -155,7 +155,7 @@ 
                         $latestVersion = str_replace('_', '', mb_strtolower($latestVersion));

                         $latestVersion = str_replace('final', '', mb_strtolower($latestVersion));

                     }

-                    $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));

+                    $moduleVersion = ($helper->getModule()->getInfo('version').'_'.$helper->getModule()->getInfo('module_status'));

                     //"PHP-standardized" version

                     $moduleVersion = str_replace(' ', '', mb_strtolower($moduleVersion));

                     //                    $moduleVersion = '1.0'; //for testing only

modules/tools/class/Common/SysUtility.php

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

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

 }