XoopsModules25x / tools

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