ggoffy / wggithub

index.php

Spacing +16 added lines, -16 removed lines

@@ -28,15 +28,15 @@ 
     Github\GithubClient

 };

 

-require __DIR__ . '/header.php';

+require __DIR__.'/header.php';

 $GLOBALS['xoopsOption']['template_main'] = 'wggithub_index.tpl';

-include_once \XOOPS_ROOT_PATH . '/header.php';

+include_once \XOOPS_ROOT_PATH.'/header.php';

 

 // Permissions

 $permGlobalView = $permissionsHandler->getPermGlobalView();

 if (!$permGlobalView) {

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

-    require __DIR__ . '/footer.php';

+    require __DIR__.'/footer.php';

 }

 $permGlobalRead   = $permissionsHandler->getPermGlobalRead();

 $permReadmeUpdate = $permissionsHandler->getPermReadmeUpdate();

@@ -51,7 +51,7 @@ 
 

 // Define Stylesheet

 $GLOBALS['xoTheme']->addStylesheet($style, null);

-$GLOBALS['xoTheme']->addStylesheet(\WGGITHUB_URL . '/assets/css/tabs.css', null);

+$GLOBALS['xoTheme']->addStylesheet(\WGGITHUB_URL.'/assets/css/tabs.css', null);

 $keywords = [];

 // 

 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);

@@ -144,7 +144,7 @@ 
         }

         unset($crLogs);

 

-        $menu  = Request::getInt('menu', 0);

+        $menu = Request::getInt('menu', 0);

 

         $crDirectories = new \CriteriaCompo();

         $crDirectories->add(new \Criteria('dir_online', 1));

@@ -159,7 +159,7 @@ 
             foreach (\array_keys($directoriesAll) as $i) {

                 $directories[$i] = $directoriesAll[$i]->getValuesDirectories();

                 $dirName = $directoriesAll[$i]->getVar('dir_name');

-                $dirFilterRelease = (bool)$directoriesAll[$i]->getVar('dir_filterrelease');

+                $dirFilterRelease = (bool) $directoriesAll[$i]->getVar('dir_filterrelease');

                 $repos = [];

                 $crRepositories = new \CriteriaCompo();

                 //first block/parentheses

@@ -172,7 +172,7 @@ 
                 $crRepo2->add(new \Criteria('repo_status', Constants::STATUS_UPTODATE), 'OR');

                 $crRepositories->add($crRepo2);

                 //third

-                $autoApproved = (int)$helper->getConfig('autoapproved');

+                $autoApproved = (int) $helper->getConfig('autoapproved');

                 if (!$autoApproved) {

                     //third

                     $crRepo3 = new \CriteriaCompo();

@@ -251,9 +251,9 @@ 
                 }

                 $directories[$i]['repos'] = $repos;

                 $directories[$i]['previousRepos'] = $dirStart[$i] > 0;

-                $directories[$i]['previousOp'] = '&dirId=' . $i . '&start=' . ($dirStart[$i] - $dirLimit[$i]) . '&limit=' . $dirLimit[$i] . '&frelease=' . $filterRelease . '&fsortby=' . $filterSortby;

+                $directories[$i]['previousOp'] = '&dirId='.$i.'&start='.($dirStart[$i] - $dirLimit[$i]).'&limit='.$dirLimit[$i].'&frelease='.$filterRelease.'&fsortby='.$filterSortby;

                 $directories[$i]['nextRepos'] = ($repositoriesCount - $dirStart[$i]) > $dirLimit[$i];

-                $directories[$i]['nextOp'] = '&dirId=' . $i . '&start=' . ($dirStart[$i] + $dirLimit[$i]) . '&limit=' . $dirLimit[$i] . '&frelease=' . $filterRelease . '&fsortby=' . $filterSortby;

+                $directories[$i]['nextOp'] = '&dirId='.$i.'&start='.($dirStart[$i] + $dirLimit[$i]).'&limit='.$dirLimit[$i].'&frelease='.$filterRelease.'&fsortby='.$filterSortby;

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

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

             }

@@ -271,10 +271,10 @@ 
         // Permissions

         if (!$permGlobalRead) {

             $GLOBALS['xoopsTpl']->assign('error', \_NOPERM);

-            require __DIR__ . '/footer.php';

+            require __DIR__.'/footer.php';

         }

         $dirName = Request::getString('dir_name', '');

-        $redir   = 'index.php?op=list_afterupdate&frelease=' . $filterRelease . '&fsortby=' . $filterSortby;

+        $redir   = 'index.php?op=list_afterupdate&frelease='.$filterRelease.'&fsortby='.$filterSortby;

         $githubClient = GithubClient::getInstance();

         $result = $githubClient->executeUpdate($dirName);

         if ($result) {

@@ -288,12 +288,12 @@ 
         // Permissions

         if (!$permReadmeUpdate) {

             $GLOBALS['xoopsTpl']->assign('error', \_NOPERM);

-            require __DIR__ . '/footer.php';

+            require __DIR__.'/footer.php';

         }

         $repoId   = Request::getInt('repo_id', 0);

         $repoUser = Request::getString('repo_user', 'none');

         $repoName = Request::getString('repo_name', 'none');

-        $redir    = 'index.php?op=list_afterupdate&frelease=' . $filterRelease . '&fsortby=' . $filterSortby;

+        $redir    = 'index.php?op=list_afterupdate&frelease='.$filterRelease.'&fsortby='.$filterSortby;

         $result = $helper->getHandler('Readmes')->updateReadmes($repoId, $repoUser, $repoName);

         if ($result) {

             \redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);

@@ -302,7 +302,7 @@ 
         }

         break;

     case 'api_error':

-        $error = Request::getString('message') . '<br>' . Request::getString('url');

+        $error = Request::getString('message').'<br>'.Request::getString('url');

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

         break;

 }

@@ -311,11 +311,11 @@ 
 // Breadcrumbs

 $xoBreadcrumbs[] = ['title' => \_MA_WGGITHUB_INDEX];

 // Keywords

-wggithubMetaKeywords($helper->getConfig('keywords') . ', ' . \implode(',', $keywords));

+wggithubMetaKeywords($helper->getConfig('keywords').', '.\implode(',', $keywords));

 unset($keywords);

 // Description

 wggithubMetaDescription(\_MA_WGGITHUB_INDEX_DESC);

 $GLOBALS['xoopsTpl']->assign('xoops_mpageurl', \WGGITHUB_URL.'/index.php');

 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);

 $GLOBALS['xoopsTpl']->assign('wggithub_upload_url', \WGGITHUB_UPLOAD_URL);

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

header.php

Spacing +4 added lines, -4 removed lines

@@ -20,8 +20,8 @@ 
  * @author         Goffy - XOOPS Development Team - Email:<goffy@wedega.com> - Website:<https://wedega.com>

  */

 

-include \dirname(__DIR__, 2) . '/mainfile.php';

-include __DIR__ . '/include/common.php';

+include \dirname(__DIR__, 2).'/mainfile.php';

+include __DIR__.'/include/common.php';

 $moduleDirName = \basename(__DIR__);

 

 $helper = \XoopsModules\Wggithub\Helper::getInstance();

@@ -30,7 +30,7 @@ 
 $xoBreadcrumbs = [];

 if ($helper->getConfig('show_breadcrumbs')) {

     if (isset($GLOBALS['xoopsModule']) && \is_object($GLOBALS['xoopsModule'])) {

-        $xoBreadcrumbs[] = ['title' => $GLOBALS['xoopsModule']->getVar('name'), 'link' => \WGGITHUB_URL . '/'];

+        $xoBreadcrumbs[] = ['title' => $GLOBALS['xoopsModule']->getVar('name'), 'link' => \WGGITHUB_URL.'/'];

     }

 }

 // Get instance of module

@@ -44,7 +44,7 @@ 
 // 

 $myts = MyTextSanitizer::getInstance();

 // Default Css Style

-$style = \WGGITHUB_URL . '/assets/css/style.css';

+$style = \WGGITHUB_URL.'/assets/css/style.css';

 // Smarty Default

 $sysPathIcon16 = $GLOBALS['xoopsModule']->getInfo('sysicons16');

 $sysPathIcon32 = $GLOBALS['xoopsModule']->getInfo('sysicons32');

admin/broken.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 use XoopsModules\Wggithub;
 use XoopsModules\Wggithub\Constants;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 // Define Stylesheet
 $GLOBALS['xoTheme']->addStylesheet($style, null);
@@ -52,8 +52,8 @@ 
     }
     // Display Navigation
     if ($repositoriesCount > $limit) {
-        include_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
-        $pagenav = new \XoopsPageNav($repositoriesCount, $limit, $start, 'startRepositories', 'op=list&limitRepositories=' . $limit);
+        include_once \XOOPS_ROOT_PATH.'/class/pagenav.php';
+        $pagenav = new \XoopsPageNav($repositoriesCount, $limit, $start, 'startRepositories', 'op=list&limitRepositories='.$limit);
         $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
     }
 } else {
@@ -61,4 +61,4 @@ 
 }
 unset($crRepositories);
 
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

admin/requests.php

Spacing +4 added lines, -4 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');
 // Request req_id
@@ -55,8 +55,8 @@ 
             }
             // Display Navigation
             if ($requestsCount > $limit) {
-                include_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
-                $pagenav = new \XoopsPageNav($requestsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+                include_once \XOOPS_ROOT_PATH.'/class/pagenav.php';
+                $pagenav = new \XoopsPageNav($requestsCount, $limit, $start, 'start', 'op=list&limit='.$limit);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
             }
         } else {
@@ -133,4 +133,4 @@ 
         }
         break;
 }
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

include/functions.php

Spacing +21 added lines, -21 removed lines

@@ -33,7 +33,7 @@ 
         $cat_sql .= current($cats);

         \array_shift($cats);

         foreach ($cats as $cat) {

-            $cat_sql .= ',' . $cat;

+            $cat_sql .= ','.$cat;

         }

     }

     $cat_sql .= ')';

@@ -72,9 +72,9 @@ 
 {

     global $xoopsTpl, $xoTheme;

     $myts = MyTextSanitizer::getInstance();

-    $content= $myts->undoHtmlSpecialChars($myts->displayTarea($content));

-    if(isset($xoTheme) && \is_object($xoTheme)) {

-        $xoTheme->addMeta( 'meta', 'keywords', \strip_tags($content));

+    $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content));

+    if (isset($xoTheme) && \is_object($xoTheme)) {

+        $xoTheme->addMeta('meta', 'keywords', \strip_tags($content));

     } else {    // Compatibility for old Xoops versions

         $xoopsTpl->assign('xoops_meta_keywords', \strip_tags($content));

     }

@@ -91,8 +91,8 @@ 
     global $xoopsTpl, $xoTheme;

     $myts = MyTextSanitizer::getInstance();

     $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content));

-    if(isset($xoTheme) && \is_object($xoTheme)) {

-        $xoTheme->addMeta( 'meta', 'description', \strip_tags($content));

+    if (isset($xoTheme) && \is_object($xoTheme)) {

+        $xoTheme->addMeta('meta', 'description', \strip_tags($content));

     } else {    // Compatibility for old Xoops versions

         $xoopsTpl->assign('xoops_meta_description', \strip_tags($content));

     }

@@ -117,7 +117,7 @@ 
     if (0 != $lenght_id) {

         $id = $array['content_id'];

         while (\strlen($id) < $lenght_id) {

-            $id = '0' . $id;

+            $id = '0'.$id;

         }

     } else {

         $id = $array['content_id'];

@@ -132,23 +132,23 @@ 
     switch ($rewrite_url) {

 

         case 'none':

-            if($topic_name) {

-                 $topic_name = 'topic=' . $topic_name . '&amp;';

+            if ($topic_name) {

+                 $topic_name = 'topic='.$topic_name.'&amp;';

             }

             $rewrite_base = '/modules/';

-            $page = 'page=' . $array['content_alias'];

-            return \XOOPS_URL . $rewrite_base . $module . '/' . $type . '.php?' . $topic_name . 'id=' . $id . '&amp;' . $page . $comment;

+            $page = 'page='.$array['content_alias'];

+            return \XOOPS_URL.$rewrite_base.$module.'/'.$type.'.php?'.$topic_name.'id='.$id.'&amp;'.$page.$comment;

             break;

 

         case 'rewrite':

-            if($topic_name) {

+            if ($topic_name) {

                 $topic_name .= '/';

             }

             $rewrite_base = xoops_getModuleOption('rewrite_mode', $module);

             $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module);

             $module_name = '';

-            if(xoops_getModuleOption('rewrite_name', $module)) {

-                $module_name = xoops_getModuleOption('rewrite_name', $module) . '/';

+            if (xoops_getModuleOption('rewrite_name', $module)) {

+                $module_name = xoops_getModuleOption('rewrite_name', $module).'/';

             }

             $page = $array['content_alias'];

             $type .= '/';

@@ -157,21 +157,21 @@ 
                 $type = '';

             }

             if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) {

-                return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/';

+                return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/';

             }

 

-            return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name  . $id . $page . $rewrite_ext;

+            return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$id.$page.$rewrite_ext;

             break;

 

          case 'short':

-            if($topic_name) {

+            if ($topic_name) {

                 $topic_name .= '/';

             }

             $rewrite_base = xoops_getModuleOption('rewrite_mode', $module);

             $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module);

             $module_name = '';

-            if(xoops_getModuleOption('rewrite_name', $module)) {

-                $module_name = xoops_getModuleOption('rewrite_name', $module) . '/';

+            if (xoops_getModuleOption('rewrite_name', $module)) {

+                $module_name = xoops_getModuleOption('rewrite_name', $module).'/';

             }

             $page = $array['content_alias'];

             $type .= '/';

@@ -179,10 +179,10 @@ 
                 $type = '';

             }

             if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) {

-                return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/';

+                return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/';

             }

 

-            return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $page . $rewrite_ext;

+            return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$page.$rewrite_ext;

             break;

     }

     return null;

class/Github/Http/StreamClient.php

Spacing +5 added lines, -5 removed lines

@@ -47,15 +47,15 @@ 
         $options = [

             'http' => [

                 'method' => $request->getMethod(),

-                'header' => \implode("\r\n", $headerStr) . "\r\n",

-                'follow_location' => 0,  # Github sets the Location header for 201 code too and redirection is not required for us

+                'header' => \implode("\r\n", $headerStr)."\r\n",

+                'follow_location' => 0, # Github sets the Location header for 201 code too and redirection is not required for us

                 'protocol_version' => 1.1,

                 'ignore_errors' => TRUE,

             ],

             'ssl' => [

                 'verify_peer' => TRUE,

-                'cafile' => realpath(__DIR__ . '/../../ca-chain.crt'),

-                'disable_compression' => TRUE,  # Effective since PHP 5.4.13

+                'cafile' => realpath(__DIR__.'/../../ca-chain.crt'),

+                'disable_compression' => TRUE, # Effective since PHP 5.4.13

             ],

         ];

 

@@ -105,7 +105,7 @@ 
         $last = '';

         foreach ($http_response_header as $header) {

             if (\in_array(\substr($header, 0, 1), [' ', "\t"], TRUE)) {

-                $headers[$last] .= ' ' . \trim($header);  # RFC2616, 2.2

+                $headers[$last] .= ' '.\trim($header); # RFC2616, 2.2

             } else {

                 list($name, $value) = \explode(':', $header, 2) + [NULL, NULL];

                 $headers[$last = \trim($name)] = \trim($value);

include/update.php

Spacing +4 added lines, -4 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';

@@ -77,7 +77,7 @@ 
     //} catch (\Exception $e) {

     // as long as this is not done default file has to be created

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

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

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

     //}

 

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

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;