ggoffy / wggithub

class/Common/MigrateHelper.php

Spacing +23 added lines, -23 removed lines

@@ -94,7 +94,7 @@ 
                 $skip = false;
                 $options = '';
                 // start table definition
-                $tableName = $this->getTableName ($line);
+                $tableName = $this->getTableName($line);
                 $tables[$tableName] = [];
                 $tables[$tableName]['options'] = '';
                 $tables[$tableName]['columns'] = [];
@@ -140,22 +140,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";
                         }
                     }
                 }
@@ -183,10 +183,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];
         }
@@ -201,12 +201,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 {
@@ -217,11 +217,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;
 
@@ -234,7 +234,7 @@ 
      * @param string $options
      * @return void
      */
-    private function getOptions (string $line, string &$options): void
+    private function getOptions(string $line, string &$options): void
     {
 
         $lineText = \trim(\str_replace([')', ';'], '', $line));
@@ -243,7 +243,7 @@ 
         if ('' != $options) {
             $options .= ' ';
         }
-        $options = "'" . $options . $lineText . "'";
+        $options = "'".$options.$lineText."'";
 
     }
 
@@ -253,7 +253,7 @@ 
      * @param string $line
      * @return array
      */
-    private function getKey (string $line)
+    private function getKey(string $line)
     {
 
         $key = [];
@@ -276,12 +276,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;

class/Common/Confirm.php

Spacing +5 added lines, -5 removed lines

@@ -72,9 +72,9 @@ 
         $moduleDirName      = \basename(__DIR__);
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
         //in order to be accessable from user and admin area this should be place in language common.php
-        if (!\defined('CO_' . $moduleDirNameUpper . '_DELETE_CONFIRM')) {
-            \define('CO_' . $moduleDirNameUpper . '_DELETE_CONFIRM', 'Confirm delete');
-            \define('CO_' . $moduleDirNameUpper . '_DELETE_LABEL', 'Do you really want to delete:');
+        if (!\defined('CO_'.$moduleDirNameUpper.'_DELETE_CONFIRM')) {
+            \define('CO_'.$moduleDirNameUpper.'_DELETE_CONFIRM', 'Confirm delete');
+            \define('CO_'.$moduleDirNameUpper.'_DELETE_LABEL', 'Do you really want to delete:');
         }
 
         // Get Theme Form
@@ -82,11 +82,11 @@ 
             $this->action = \Xmf\Request::getString('REQUEST_URI', '', 'SERVER');
         }
         if ('' === $this->title) {
-            $this->title = \constant('CO_' . $moduleDirNameUpper . '_DELETE_CONFIRM');
+            $this->title = \constant('CO_'.$moduleDirNameUpper.'_DELETE_CONFIRM');
         }
         if ('' === $this->label) {
 
-            $this->label = \constant('CO_' . $moduleDirNameUpper . '_DELETE_LABEL');
+            $this->label = \constant('CO_'.$moduleDirNameUpper.'_DELETE_LABEL');
         }
 
         \xoops_load('XoopsFormLoader');

admin/releases.php

Spacing +6 added lines, -6 removed lines

@@ -25,7 +25,7 @@ 
 use XoopsModules\Wggithub\Constants;

 use XoopsModules\Wggithub\Common;

 

-require __DIR__ . '/header.php';

+require __DIR__.'/header.php';

 // It recovered the value of argument op in URL$

 $op    = Request::getCmd('op', 'list');

 $relId = Request::getInt('rel_id');

@@ -70,8 +70,8 @@ 
             }

             // Display Navigation

             if ($releasesCount > $limit) {

-                include_once \XOOPS_ROOT_PATH . '/class/pagenav.php';

-                $pagenav = new \XoopsPageNav($releasesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);

+                include_once \XOOPS_ROOT_PATH.'/class/pagenav.php';

+                $pagenav = new \XoopsPageNav($releasesCount, $limit, $start, 'start', 'op=list&limit='.$limit);

                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));

             }

         } else {

@@ -107,7 +107,7 @@ 
         $releasesObj->setVar('rel_submitter', Request::getInt('rel_submitter', 0));

         // Insert Data

         if ($releasesHandler->insert($releasesObj)) {

-            \redirect_header('releases.php?op=list&start=' . $start . '&limit=' . $limit, 2, \_AM_WGGITHUB_FORM_OK);

+            \redirect_header('releases.php?op=list&start='.$start.'&limit='.$limit, 2, \_AM_WGGITHUB_FORM_OK);

         }

         // Get Form

         $GLOBALS['xoopsTpl']->assign('error', $releasesObj->getHtmlErrors());

@@ -142,10 +142,10 @@ 
             $customConfirm = new Common\Confirm(

                 ['ok' => 1, 'rel_id' => $relId, 'op' => 'delete'],

                 $_SERVER['REQUEST_URI'],

-                \sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $repositoriesObj->getVar('repo_name') . ' - ' . $releasesObj->getVar('rel_name')));

+                \sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $repositoriesObj->getVar('repo_name').' - '.$releasesObj->getVar('rel_name')));

             $form = $customConfirm->getFormConfirm();

             $GLOBALS['xoopsTpl']->assign('form', $form->render());

         }

         break;

 }

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

admin/logs.php

Spacing +6 added lines, -6 removed lines

@@ -25,7 +25,7 @@ 
 use XoopsModules\Wggithub\Constants;

 use XoopsModules\Wggithub\Common;

 

-require __DIR__ . '/header.php';

+require __DIR__.'/header.php';

 // It recovered the value of argument op in URL$

 $op    = Request::getCmd('op', 'list');

 $logId = Request::getInt('log_id');

@@ -57,8 +57,8 @@ 
             }

             // Display Navigation

             if ($logsCount > $limit) {

-                include_once \XOOPS_ROOT_PATH . '/class/pagenav.php';

-                $pagenav = new \XoopsPageNav($logsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);

+                include_once \XOOPS_ROOT_PATH.'/class/pagenav.php';

+                $pagenav = new \XoopsPageNav($logsCount, $limit, $start, 'start', 'op=list&limit='.$limit);

                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));

             }

         } else {

@@ -84,7 +84,7 @@ 
         $logsObj->setVar('log_submitter', Request::getInt('log_submitter', 0));

         // Insert Data

         if ($logsHandler->insert($logsObj)) {

-            \redirect_header('logs.php?op=list&start=' . $start . '&limit=' . $limit, 2, \_AM_WGGITHUB_FORM_OK);

+            \redirect_header('logs.php?op=list&start='.$start.'&limit='.$limit, 2, \_AM_WGGITHUB_FORM_OK);

         }

         // Get Form

         $GLOBALS['xoopsTpl']->assign('error', $logsObj->getHtmlErrors());

@@ -118,7 +118,7 @@ 
             $customConfirm = new Common\Confirm(

                 ['ok' => 1, 'log_id' => $logId, 'op' => 'delete'],

                 $_SERVER['REQUEST_URI'],

-                \sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $logsObj->getVar('log_id') . ': ' . $logsObj->getVar('log_details')));

+                \sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $logsObj->getVar('log_id').': '.$logsObj->getVar('log_details')));

             $form = $customConfirm->getFormConfirm();

             $GLOBALS['xoopsTpl']->assign('form', $form->render());

         }

@@ -144,4 +144,4 @@ 
         }

         break;

 }

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

admin/readmes.php

Spacing +7 added lines, -7 removed lines

@@ -25,7 +25,7 @@ 
 use XoopsModules\Wggithub\Constants;

 use XoopsModules\Wggithub\Common;

 

-require __DIR__ . '/header.php';

+require __DIR__.'/header.php';

 // It recovered the value of argument op in URL$

 $op    = Request::getCmd('op', 'list');

 $rmId  = Request::getInt('rm_id');

@@ -63,7 +63,7 @@ 
                     $in[] = $i;

                 }

             }

-            $crReadmes->add(new \Criteria('rm_repoid', '(' . \implode(',', $in) . ')', 'IN'));

+            $crReadmes->add(new \Criteria('rm_repoid', '('.\implode(',', $in).')', 'IN'));

         }

         $crReadmes->setStart($start);

         $crReadmes->setLimit($limit);

@@ -81,8 +81,8 @@ 
             }

             // Display Navigation

             if ($readmesCount > $limit) {

-                include_once \XOOPS_ROOT_PATH . '/class/pagenav.php';

-                $pagenav = new \XoopsPageNav($readmesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);

+                include_once \XOOPS_ROOT_PATH.'/class/pagenav.php';

+                $pagenav = new \XoopsPageNav($readmesCount, $limit, $start, 'start', 'op=list&limit='.$limit);

                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));

             }

         } else {

@@ -118,7 +118,7 @@ 
         $readmesObj->setVar('rm_submitter', Request::getInt('rm_submitter', 0));

         // Insert Data

         if ($readmesHandler->insert($readmesObj)) {

-            \redirect_header('readmes.php?op=list&start=' . $start . '&limit=' . $limit, 2, \_AM_WGGITHUB_FORM_OK);

+            \redirect_header('readmes.php?op=list&start='.$start.'&limit='.$limit, 2, \_AM_WGGITHUB_FORM_OK);

         }

         // Get Form

         $GLOBALS['xoopsTpl']->assign('error', $readmesObj->getHtmlErrors());

@@ -153,10 +153,10 @@ 
             $customConfirm = new Common\Confirm(

                 ['ok' => 1, 'rm_id' => $rmId, 'op' => 'delete'],

                 $_SERVER['REQUEST_URI'],

-                \sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $repositoriesObj->getVar('repo_name') . ' - ' . $readmesObj->getVar('rm_name')));

+                \sprintf(\_AM_WGGITHUB_FORM_SURE_DELETE, $repositoriesObj->getVar('repo_name').' - '.$readmesObj->getVar('rm_name')));

             $form = $customConfirm->getFormConfirm();

             $GLOBALS['xoopsTpl']->assign('form', $form->render());

         }

         break;

 }

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

include/uninstall.php

Spacing +2 added lines, -2 removed lines

@@ -48,8 +48,8 @@
     if ($dirInfo->isDir()) {

         // The directory exists so rename it

         $date = date('Y-m-d');

-        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {

-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $uploadDirectory));

+        if (!rename($uploadDirectory, $uploadDirectory."_bak_$date")) {

+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $uploadDirectory));

             $success = false;

         }

     }

include/update.php

Spacing +5 added lines, -5 removed lines

@@ -54,21 +54,21 @@ 
  */

 function xoops_module_update_wggithub($module, $prev_version = null)

 {

-    require \dirname(__DIR__) . '/preloads/autoloader.php';

+    require \dirname(__DIR__).'/preloads/autoloader.php';

 

     $moduleDirName = $module->dirname();

 

     //wggithub_check_db($module);

 

     //check upload directory

-    include_once __DIR__ . '/install.php';

+    include_once __DIR__.'/install.php';

     xoops_module_install_wggithub($module);

 

     // update DB corresponding to sql/mysql.sql

     $configurator = new Configurator();

     $migrate = new Migrate($configurator);

 

-    $fileSql = \XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/sql/mysql.sql';

+    $fileSql = \XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/sql/mysql.sql';

     // ToDo: add function setDefinitionFile to .\class\libraries\vendor\xoops\xmf\src\Database\Migrate.php

     // Todo: once we are using setDefinitionFile this part has to be adapted

     //$fileYaml = \XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/sql/update_' . $moduleDirName . '_migrate.yml';

@@ -78,7 +78,7 @@ 
     // as long as this is not done default file has to be created

     $moduleVersionOld = $module->getInfo('version');

     $moduleVersionNew = \str_replace(['.', '-'], '_', $moduleVersionOld);

-    $fileYaml = \XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/sql/{$moduleDirName}_{$moduleVersionNew}_migrate.yml";

+    $fileYaml = \XOOPS_ROOT_PATH.'/modules/'.$moduleDirName."/sql/{$moduleDirName}_{$moduleVersionNew}_migrate.yml";

     //}

 

     // create a schema file based on sql/mysql.sql

@@ -89,7 +89,7 @@ 
     }

 

     //create copy for XOOPS 2.5.11 Beta 1 and older versions

-    $fileYaml2 = \XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/sql/{$moduleDirName}_{$moduleVersionOld}_migrate.yml";

+    $fileYaml2 = \XOOPS_ROOT_PATH.'/modules/'.$moduleDirName."/sql/{$moduleDirName}_{$moduleVersionOld}_migrate.yml";

     \copy($fileYaml, $fileYaml2);

 

     // run standard procedure for db migration

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'        => '2022/08/08',

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

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

class/Common/VersionChecks.php

Spacing +7 added lines, -7 removed lines

@@ -49,13 +49,13 @@ 
             $currentVer = $versionText;

         }

         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 ($module->versionCompare($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;

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

             }

         }

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

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

                     \trigger_error(\curl_error($curlHandle));

                 } elseif (\mb_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);

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