ggoffy / wggithub

class/Common/FileChecker.php

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
 
 //\defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
 
-require_once \dirname(__DIR__, 4) . '/mainfile.php';
+require_once \dirname(__DIR__, 4).'/mainfile.php';
 $moduleDirName      = \basename(\dirname(__DIR__, 2));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 \xoops_loadLanguage('filechecker', $moduleDirName);
@@ -57,24 +57,24 @@ 
         if (null === $original_file_path) {
             if (self::fileExists($file_path)) {
                 $path_status = "<img src='$pathIcon16/1.png' >";
-                $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') ';
+                $path_status .= "$file_path (".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_AVAILABLE').') ';
             } else {
                 $path_status = "<img src='$pathIcon16/0.png' >";
-                $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') ';
+                $path_status .= "$file_path (".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_NOTAVAILABLE').') ';
             }
         } else {
             if (self::compareFiles($file_path, $original_file_path)) {
                 $path_status = "<img src='$pathIcon16/1.png' >";
-                $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE') . ') ';
+                $path_status .= "$file_path (".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_AVAILABLE').') ';
             } else {
                 $path_status = "<img src='$pathIcon16/0.png' >";
-                $path_status .= "$file_path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE') . ') ';
-                $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
+                $path_status .= "$file_path (".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_NOTAVAILABLE').') ';
+                $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
                 $path_status .= "<input type='hidden' name='op' value='copyfile'>";
                 $path_status .= "<input type='hidden' name='file_path' value='$file_path'>";
                 $path_status .= "<input type='hidden' name='original_file_path' value='$original_file_path'>";
                 $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
-                $path_status .= "<button class='submit' onClick='this.form.submit();'>" . \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_CREATETHEFILE') . '</button>';
+                $path_status .= "<button class='submit' onClick='this.form.submit();'>".\constant('CO_'.$moduleDirNameUpper.'_'.'FC_CREATETHEFILE').'</button>';
                 $path_status .= '</form>';
             }
         }
@@ -139,7 +139,7 @@ 
     {
         $target = \str_replace('..', '', $target);
 
-        return @\chmod($target, (int)$mode);
+        return @\chmod($target, (int) $mode);
     }
 }
 
@@ -155,7 +155,7 @@ 
         if (\Xmf\Request::hasVar('redirect', 'POST')) {
             $redirect = $_POST['redirect'];
         }
-        $msg = FileChecker::copyFile($original_file_path, $file_path) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILECOPIED') : \constant('CO_' . $moduleDirNameUpper . '_' . 'FC_FILENOTCOPIED');
-        \redirect_header($redirect, 2, $msg . ': ' . $file_path);
+        $msg = FileChecker::copyFile($original_file_path, $file_path) ? \constant('CO_'.$moduleDirNameUpper.'_'.'FC_FILECOPIED') : \constant('CO_'.$moduleDirNameUpper.'_'.'FC_FILENOTCOPIED');
+        \redirect_header($redirect, 2, $msg.': '.$file_path);
         break;
 }

class/Common/DirectoryChecker.php

Spacing +16 added lines, -16 removed lines

@@ -24,7 +24,7 @@ 
 use XoopsModules\Wggithub;
 
 
-require_once \dirname(__DIR__, 4) . '/mainfile.php';
+require_once \dirname(__DIR__, 4).'/mainfile.php';
 $moduleDirName      = \basename(\dirname(__DIR__, 2));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 \xoops_loadLanguage('directorychecker', $moduleDirName);
@@ -56,38 +56,38 @@ 
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
         if (!@\is_dir($path)) {
             $path_status = "<img src='$pathIcon16/0.png' >";
-            $path_status .= "$path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTAVAILABLE') . ') ';
-            $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
+            $path_status .= "$path (".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTAVAILABLE').') ';
+            $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
             $path_status .= "<input type='hidden' name='op' value='createdir'>";
             $path_status .= "<input type='hidden' name='path' value='$path'>";
             $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
-            $path_status .= "<button class='submit' onClick='this.form.submit();'>" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_CREATETHEDIR') . '</button>';
+            $path_status .= "<button class='submit' onClick='this.form.submit();'>".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_CREATETHEDIR').'</button>';
             $path_status .= '</form>';
         } elseif (@\is_writable($path)) {
             $path_status = "<img src='$pathIcon16/1.png' >";
-            $path_status .= "$path (" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_AVAILABLE') . ') ';
+            $path_status .= "$path (".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_AVAILABLE').') ';
             $currentMode = \mb_substr(\decoct(\fileperms($path)), 2);
             if ($currentMode != \decoct($mode)) {
                 $path_status = "<img src='$pathIcon16/0.png' >";
-                $path_status .= $path . \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), \decoct($mode), $currentMode);
-                $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
+                $path_status .= $path.\sprintf(\constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTWRITABLE'), \decoct($mode), $currentMode);
+                $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
                 $path_status .= "<input type='hidden' name='op' value='setdirperm'>";
                 $path_status .= "<input type='hidden' name='mode' value='$mode'>";
                 $path_status .= "<input type='hidden' name='path' value='$path'>";
                 $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
-                $path_status .= "<button class='submit' onClick='this.form.submit();'>" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_SETMPERM') . '</button>';
+                $path_status .= "<button class='submit' onClick='this.form.submit();'>".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_SETMPERM').'</button>';
                 $path_status .= '</form>';
             }
         } else {
             $currentMode = \mb_substr(\decoct(\fileperms($path)), 2);
             $path_status = "<img src='$pathIcon16/0.png' >";
-            $path_status .= $path . \sprintf(\constant('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE'), \decoct($mode), $currentMode);
-            $path_status .= "<form action='" . $_SERVER['SCRIPT_NAME'] . "' method='post'>";
+            $path_status .= $path.\sprintf(\constant('CO_'.$moduleDirNameUpper.'_'.'DC_NOTWRITABLE'), \decoct($mode), $currentMode);
+            $path_status .= "<form action='".$_SERVER['SCRIPT_NAME']."' method='post'>";
             $path_status .= "<input type='hidden' name='op' value='setdirperm'>";
             $path_status .= "<input type='hidden' name='mode' value='$mode'>";
             $path_status .= "<input type='hidden' name='path' value='$path'>";
             $path_status .= "<input type='hidden' name='redirect' value='$redirectFile'>";
-            $path_status .= "<button class='submit' onClick='this.form.submit();'>" . \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_SETMPERM') . '</button>';
+            $path_status .= "<button class='submit' onClick='this.form.submit();'>".\constant('CO_'.$moduleDirNameUpper.'_'.'DC_SETMPERM').'</button>';
             $path_status .= '</form>';
         }
 
@@ -118,7 +118,7 @@ 
     {
         $target = \str_replace('..', '', $target);
 
-        return @\chmod($target, (int)$mode);
+        return @\chmod($target, (int) $mode);
     }
 
     /**
@@ -141,8 +141,8 @@ 
         if (\Xmf\Request::hasVar('redirect', 'POST')) {
             $redirect = $_POST['redirect'];
         }
-        $msg = DirectoryChecker::createDirectory($path) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRCREATED') : \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRNOTCREATED');
-        \redirect_header($redirect, 2, $msg . ': ' . $path);
+        $msg = DirectoryChecker::createDirectory($path) ? \constant('CO_'.$moduleDirNameUpper.'_'.'DC_DIRCREATED') : \constant('CO_'.$moduleDirNameUpper.'_'.'DC_DIRNOTCREATED');
+        \redirect_header($redirect, 2, $msg.': '.$path);
         break;
     case 'setdirperm':
         if (\Xmf\Request::hasVar('path', 'POST')) {
@@ -154,7 +154,7 @@ 
         if (\Xmf\Request::hasVar('mode', 'POST')) {
             $mode = $_POST['mode'];
         }
-        $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMSET') : \constant('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMNOTSET');
-        \redirect_header($redirect, 2, $msg . ': ' . $path);
+        $msg = DirectoryChecker::setDirectoryPermissions($path, $mode) ? \constant('CO_'.$moduleDirNameUpper.'_'.'DC_PERMSET') : \constant('CO_'.$moduleDirNameUpper.'_'.'DC_PERMNOTSET');
+        \redirect_header($redirect, 2, $msg.': '.$path);
         break;
 }

class/Common/MigrateHelper.php

Spacing +23 added lines, -23 removed lines

@@ -84,7 +84,7 @@ 
             $line = \trim($value);
             if ('CREATE TABLE' === \mb_strtoupper(\substr($line, 0, 12))) {
                 // start table definition
-                $tableName = $this->getTableName ($line);
+                $tableName = $this->getTableName($line);
                 $tables[$tableName] = [];
                 $tables[$tableName]['options'] = '';
                 $tables[$tableName]['columns'] = [];
@@ -121,22 +121,22 @@ 
             $schema[] = "{$tkey}:\n";
             foreach ($table as $lkey => $line) {
                 if ('keys' == $lkey) {
-                    $schema[] = $level1 . "keys:\n";
+                    $schema[] = $level1."keys:\n";
                     foreach ($line as $kkey => $kvalue) {
                         foreach ($kvalue as $kkey2 => $kvalue2) {
-                            $schema[] = $level2 . $kkey2 . ":\n";
-                            $schema[] = $level3 . 'columns: ' . $kvalue2['columns'] . "\n";
-                            $schema[] = $level3 . 'unique: ' . $kvalue2['unique'] . "\n";
+                            $schema[] = $level2.$kkey2.":\n";
+                            $schema[] = $level3.'columns: '.$kvalue2['columns']."\n";
+                            $schema[] = $level3.'unique: '.$kvalue2['unique']."\n";
                         }
                     }
                 } elseif ('options' == $lkey) {
-                    $schema[] = $level1 . 'options: ' . $line . "\n";
+                    $schema[] = $level1.'options: '.$line."\n";
                 } else {
-                    $schema[] = $level1 . 'columns: ' . "\n";
+                    $schema[] = $level1.'columns: '."\n";
                     foreach ($line as $kkey => $kvalue) {
-                        $schema[] = $level2 . '-' . "\n";
+                        $schema[] = $level2.'-'."\n";
                         foreach ($kvalue as $kkey2 => $kvalue2) {
-                            $schema[] = $level3 . $kkey2 . ": " . $kvalue2 . "\n";
+                            $schema[] = $level3.$kkey2.": ".$kvalue2."\n";
                         }
                     }
                 }
@@ -164,10 +164,10 @@ 
      * @param  string $line
      * @return string|bool
      */
-    private function getTableName (string $line)
+    private function getTableName(string $line)
     {
 
-        $arrLine = \explode( '`', $line);
+        $arrLine = \explode('`', $line);
         if (\count($arrLine) > 0) {
             return $arrLine[1];
         }
@@ -182,12 +182,12 @@ 
      * @param string $line
      * @return array|bool
      */
-    private function getColumns (string $line)
+    private function getColumns(string $line)
     {
 
         $columns = [];
 
-        $arrCol = \explode( ' ', \trim($line));
+        $arrCol = \explode(' ', \trim($line));
         if (\count($arrCol) > 0) {
             $name = \str_replace(['`'], '', $arrCol[0]);
         } else {
@@ -198,11 +198,11 @@ 
         $columns['name'] = $name;
         // update quotes
         if (\strpos($attributes, "''") > 0) {
-            $attributes = \trim(\str_replace("''", "''''''''" , $attributes));
+            $attributes = \trim(\str_replace("''", "''''''''", $attributes));
         } elseif (\strpos($attributes, "'") > 0) {
-            $attributes = \trim(\str_replace("'", "''" , $attributes));
+            $attributes = \trim(\str_replace("'", "''", $attributes));
         }
-        $columns['attributes'] = "' " . $attributes . " '";
+        $columns['attributes'] = "' ".$attributes." '";
 
         return $columns;
 
@@ -214,12 +214,12 @@ 
      * @param string $line
      * @return string
      */
-    private function getOptions (string $line): string
+    private function getOptions(string $line): string
     {
 
         $options = \str_replace([')', ';'], '', $line);
         $options = \trim($options);
-        $options = "'" . $options . "'";
+        $options = "'".$options."'";
 
         return $options;
 
@@ -231,7 +231,7 @@ 
      * @param string $line
      * @return array|bool
      */
-    private function getKey (string $line)
+    private function getKey(string $line)
     {
 
         $key = [];
@@ -254,12 +254,12 @@ 
                 if ('' == $name) {
                     $name = $columns;
                 }
-                if (\strpos($name,' ') > 0) {
-                    $name = "'" . $name . "'";
+                if (\strpos($name, ' ') > 0) {
+                    $name = "'".$name."'";
                 }
                 $key[$name] = [];
-                if (\strpos($columns,' ') > 0) {
-                    $columns = "'" . $columns . "'";
+                if (\strpos($columns, ' ') > 0) {
+                    $columns = "'".$columns."'";
                 }
                 $key[$name]['columns'] = $columns;
                 $key[$name]['unique'] = $unique;

xoops_version.php

Spacing +4 added lines, -4 removed lines

@@ -39,10 +39,10 @@ 
     'license_url'         => 'http://www.gnu.org/licenses/gpl-3.0.en.html',

     'help'                => 'page=help',

     'release_info'        => 'release_info',

-    'release_file'        => \XOOPS_URL . '/modules/wggithub/docs/release_info file',

+    'release_file'        => \XOOPS_URL.'/modules/wggithub/docs/release_info file',

     'release_date'        => '2021/03/31',

     'manual'              => 'link to manual file',

-    'manual_file'         => \XOOPS_URL . '/modules/wggithub/docs/install.txt',

+    'manual_file'         => \XOOPS_URL.'/modules/wggithub/docs/install.txt',

     'min_php'             => '7.4',

     'min_xoops'           => '2.5.11 Beta1',

     'min_admin'           => '1.2',

@@ -299,8 +299,8 @@ 
 // Make Sample button visible?

 $modversion['config'][] = [

     'name'        => 'displaySampleButton',

-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',

-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',

+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON',

+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC',

     'formtype'    => 'yesno',

     'valuetype'   => 'int',

     'default'     => 1,