XoopsModules25x / tools

modules/tools/class/Common/FilesManagement.php

Spacing +11 added lines, -11 removed lines

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

@@ -61,14 +61,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);

                 }

             }

         }

@@ -204,7 +204,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

     }

 

@@ -237,14 +237,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

     }

 

@@ -280,9 +280,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/VersionChecks.php

Spacing +7 added lines, -7 removed lines

@@ -42,13 +42,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;

@@ -79,7 +79,7 @@ 
 

         if (false !== $reqVer && '' !== $reqVer && !is_array($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;

             }

         }

@@ -103,7 +103,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";

@@ -117,14 +117,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);

@@ -132,7 +132,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/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -38,19 +38,19 @@ 
         //        $query = $GLOBALS['xoopsDB']->query($sql);

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

         $html .= '<fieldset>';

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

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

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

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

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

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

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

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

         $html .= '<ul>';

 

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

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

+        $gdlib = function_exists('gd_info') ? '<span style="color: #008000;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: #ff0000;">'.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: #008000;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: #ff0000;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';

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

 

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

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

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

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

 

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

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

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

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

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

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

         $html .= '</ul>';

         $html .= '<ul>';

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

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

         $html .= '</ul>';

         $html .= '<br>';

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

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

         $html .= '</div>';

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

 

class/smarty/xoops_plugins/function.xoBlk.php

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