ggoffy / wggithub

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 (\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;

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

class/Common/Breadcrumb.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         require $GLOBALS['xoops']->path('class/template.php');

         $breadcrumbTpl = new \XoopsTpl();

         $breadcrumbTpl->assign('breadcrumb', $this->bread);

-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');

+        $html = $breadcrumbTpl->fetch('db:'.$this->dirname.'_common_breadcrumb.tpl');

         unset($breadcrumbTpl);

 

         return $html;

class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

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

             }

         }

 

@@ -58,18 +58,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/SettingsHandler.php

Spacing +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
      */

     public function setPrimarySetting($setId)

     {

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

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

         $settingsObj = null;

         $settingsHandler = $helper->getHandler('Settings');

         if (isset($setId)) {

@@ -158,7 +158,7 @@ 
         }

 

         // reset all

-        $strSQL = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_settings') . ' SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_settings') . '.set_primary = 0';

+        $strSQL = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_settings').' SET '.$GLOBALS['xoopsDB']->prefix('wggithub_settings').'.set_primary = 0';

         $GLOBALS['xoopsDB']->queryF($strSQL);

         // Set Vars

         $settingsObj->setVar('set_primary', 1);

class/Releases.php

Spacing +3 added lines, -3 removed lines

@@ -136,9 +136,9 @@ 
      */

     public function getValuesReleases($keys = null, $format = null, $maxDepth = null)

     {

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

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

         $ret = $this->getValues($keys, $format, $maxDepth);

-        $ret['id']          = $this->getVar('rel_id');

+        $ret['id'] = $this->getVar('rel_id');

         $repositoriesHandler = $helper->getHandler('Repositories');

         $repositoriesObj = $repositoriesHandler->get($this->getVar('rel_repoid'));

         if (\is_object($repositoriesObj)) {

@@ -148,7 +148,7 @@ 
         }

         $ret['type']        = $this->getVar('rel_type');

         $ret['name']        = $this->getVar('rel_name');

-        $ret['prerelease']  = (int)$this->getVar('rel_prerelease') > 0 ? _YES : _NO;

+        $ret['prerelease']  = (int) $this->getVar('rel_prerelease') > 0 ? _YES : _NO;

         $ret['publishedat'] = \formatTimestamp($this->getVar('rel_publishedat'), 'm');

         $ret['tarballurl']  = $this->getVar('rel_tarballurl');

         $ret['zipballurl']  = $this->getVar('rel_zipballurl');

header.php

Spacing +4 added lines, -4 removed lines

@@ -20,12 +20,12 @@ 
  * @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__);

 // Breadcrumbs

 $xoBreadcrumbs = [];

-$xoBreadcrumbs[] = ['title' => \_MA_WGGITHUB_TITLE, 'link' => WGGITHUB_URL . '/'];

+$xoBreadcrumbs[] = ['title' => \_MA_WGGITHUB_TITLE, 'link' => WGGITHUB_URL.'/'];

 // Get instance of module

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

 $settingsHandler = $helper->getHandler('Settings');

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

blocks/repositories.php

Spacing +8 added lines, -8 removed lines

@@ -24,7 +24,7 @@ 
 use XoopsModules\Wggithub\Helper;

 use XoopsModules\Wggithub\Constants;

 

-include_once \XOOPS_ROOT_PATH . '/modules/wggithub/include/common.php';

+include_once \XOOPS_ROOT_PATH.'/modules/wggithub/include/common.php';

 

 /**

  * Function show block

@@ -33,7 +33,7 @@ 
  */

 function b_wggithub_repositories_show($options)

 {

-    include_once \XOOPS_ROOT_PATH . '/modules/wggithub/class/repositories.php';

+    include_once \XOOPS_ROOT_PATH.'/modules/wggithub/class/repositories.php';

     $myts = MyTextSanitizer::getInstance();

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

     $block       = [];

@@ -99,14 +99,14 @@ 
  */

 function b_wggithub_repositories_edit($options)

 {

-    include_once \XOOPS_ROOT_PATH . '/modules/wggithub/class/repositories.php';

+    include_once \XOOPS_ROOT_PATH.'/modules/wggithub/class/repositories.php';

     $helper = Helper::getInstance();

     $repositoriesHandler = $helper->getHandler('Repositories');

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

     $form = \_MB_WGGITHUB_DISPLAY;

     $form .= "<input type='hidden' name='options[0]' value='".$options[0]."' />";

-    $form .= "<input type='text' name='options[1]' size='5' maxlength='255' value='" . $options[1] . "' />&nbsp;<br>";

-    $form .= \_MB_WGGITHUB_TITLE_LENGTH . " : <input type='text' name='options[2]' size='5' maxlength='255' value='" . $options[2] . "' /><br><br>";

+    $form .= "<input type='text' name='options[1]' size='5' maxlength='255' value='".$options[1]."' />&nbsp;<br>";

+    $form .= \_MB_WGGITHUB_TITLE_LENGTH." : <input type='text' name='options[2]' size='5' maxlength='255' value='".$options[2]."' /><br><br>";

     \array_shift($options);

     \array_shift($options);

     \array_shift($options);

@@ -117,11 +117,11 @@ 
     $crRepositories->setOrder('ASC');

     $repositoriesAll = $repositoriesHandler->getAll($crRepositories);

     unset($crRepositories);

-    $form .= \_MB_WGGITHUB_REPOSITORIES_TO_DISPLAY . "<br><select name='options[]' multiple='multiple' size='5'>";

-    $form .= "<option value='0' " . (\in_array(0, $options) == false ? '' : "selected='selected'") . '>' . \_MB_WGGITHUB_ALL_REPOSITORIES . '</option>';

+    $form .= \_MB_WGGITHUB_REPOSITORIES_TO_DISPLAY."<br><select name='options[]' multiple='multiple' size='5'>";

+    $form .= "<option value='0' ".(\in_array(0, $options) == false ? '' : "selected='selected'").'>'.\_MB_WGGITHUB_ALL_REPOSITORIES.'</option>';

     foreach (\array_keys($repositoriesAll) as $i) {

         $repo_id = $repositoriesAll[$i]->getVar('repo_id');

-        $form .= "<option value='" . $repo_id . "' " . (\in_array($repo_id, $options) == false ? '' : "selected='selected'") . '>' . $repositoriesAll[$i]->getVar('repo_name') . '</option>';

+        $form .= "<option value='".$repo_id."' ".(\in_array($repo_id, $options) == false ? '' : "selected='selected'").'>'.$repositoriesAll[$i]->getVar('repo_name').'</option>';

     }

     $form .= '</select>';

 

class/Directories.php

Spacing +4 added lines, -4 removed lines

@@ -176,10 +176,10 @@
                 break;

         }

         $ret['content_shorttext'] = Utility::truncateHtml($content_text);

-        $ret['autoupdate']        = (int)$this->getVar('dir_autoupdate') > 0 ? _YES : _NO;

-        $ret['online']            = (int)$this->getVar('dir_online') > 0 ? _YES : _NO;

-        $ret['filterrelease']     = (int)$this->getVar('dir_filterrelease') > 0 ? _YES : _NO;

-        $ret['weight']            = (int)$this->getVar('dir_weight');

+        $ret['autoupdate']        = (int) $this->getVar('dir_autoupdate') > 0 ? _YES : _NO;

+        $ret['online']            = (int) $this->getVar('dir_online') > 0 ? _YES : _NO;

+        $ret['filterrelease']     = (int) $this->getVar('dir_filterrelease') > 0 ? _YES : _NO;

+        $ret['weight']            = (int) $this->getVar('dir_weight');

         $ret['datecreated']       = \formatTimestamp($this->getVar('dir_datecreated'), 's');

         $ret['submitter']         = \XoopsUser::getUnameFromId($this->getVar('dir_submitter'));

         return $ret;

class/Github/GithubClient.php

Spacing +17 added lines, -17 removed lines

@@ -81,7 +81,7 @@ 
 

     public function testApi1($url) {

         $api = new Github\Api;

-        $response = $api->get(static::BASE_URL . $url);

+        $response = $api->get(static::BASE_URL.$url);

         $data = $api->decode($response);

         

         return $data;

@@ -92,7 +92,7 @@ 
 

         $token = new Github\OAuth\Token('{myKey}', 'bearer', ['repo', 'user', 'public_repo']);

         $api->setToken($token);

-        $response = $api->get(static::BASE_URL . $url);

+        $response = $api->get(static::BASE_URL.$url);

 

         $data = $api->decode($response);

 

@@ -117,7 +117,7 @@ 
      */

     public function getUserRepositories($username, $per_page = 100, $page = 1)

     {

-        $url = static::BASE_URL . 'users/' . \rawurlencode($username) . '/repos?per_page=' . $per_page . '&page=' . $page;

+        $url = static::BASE_URL.'users/'.\rawurlencode($username).'/repos?per_page='.$per_page.'&page='.$page;

 

         return $this->_get($url);

     }

@@ -132,7 +132,7 @@ 
      */

     public function getOrgRepositories($org, $per_page = 100, $page = 1)

     {

-        $url = static::BASE_URL . 'orgs/' . \rawurlencode($org) . '/repos?per_page=' . $per_page . '&page=' . $page;

+        $url = static::BASE_URL.'orgs/'.\rawurlencode($org).'/repos?per_page='.$per_page.'&page='.$page;

 

         return $this->_get($url);

     }

@@ -146,7 +146,7 @@ 
      */

     public function getReadme($username, $repository)

     {

-        $url = static::BASE_URL . 'repos/' . \rawurlencode($username) . '/' . \rawurlencode($repository) . '/readme';

+        $url = static::BASE_URL.'repos/'.\rawurlencode($username).'/'.\rawurlencode($repository).'/readme';

 

         return $this->_get($url, true);

     }

@@ -160,7 +160,7 @@ 
      */

     public function getReleases($username, $repository)

     {

-        $url = static::BASE_URL . 'repos/' . $username . '/' . $repository . '/releases';

+        $url = static::BASE_URL.'repos/'.$username.'/'.$repository.'/releases';

 

         return $this->_get($url, true);

     }

@@ -176,9 +176,9 @@ 
     public function getLatestRelease($username, $repository, $prerelease = false)

     {

         if ($prerelease) {

-            $url = static::BASE_URL . 'repos/' . $username . '/' . $repository . '/releases';

+            $url = static::BASE_URL.'repos/'.$username.'/'.$repository.'/releases';

         } else {

-            $url = static::BASE_URL . 'repos/' . $username . '/' . $repository . '/releases/latest';

+            $url = static::BASE_URL.'repos/'.$username.'/'.$repository.'/releases/latest';

         }

         $result = $this->_get($url);

 

@@ -202,7 +202,7 @@ 
      */

     public function getRepositoryContent($username, $repository)

     {

-        $url = static::BASE_URL . 'repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/contents';

+        $url = static::BASE_URL.'repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/contents';

 

         return $this->_get($url);

     }

@@ -235,14 +235,14 @@ 
             } else {

                 $error = true;

                 $errMsg = $response->getContent();

-                $logsHandler->updateTableLogs(Constants::LOG_TYPE_ERROR, $errMsg, 'ERROR ' . $code);

+                $logsHandler->updateTableLogs(Constants::LOG_TYPE_ERROR, $errMsg, 'ERROR '.$code);

             }

         }

         if ($error) {

             //catch common errors

             switch ($code) {

                 case 401:

-                    throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API_401 . '"');

+                    throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API_401.'"');

                     break;

                 case 403:

                     /*

@@ -250,21 +250,21 @@ 
                         $GLOBALS['xoopsTpl']->assign('apiexceed', true);

                     }

                     */

-                    throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API_403 . '"');

+                    throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API_403.'"');

                     break;

                 case 404:

-                    throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API_404 . '"');

+                    throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API_404.'"');

                     break;

                 case 405:

-                    throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API_405 . '"');

+                    throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API_405.'"');

                     break;

                 case 0:

                 default:

-                    throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API . $errMsg . '"');

+                    throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API.$errMsg.'"');

                     break;

             }

         }

-        $data = (array)$api->decode($response);

+        $data = (array) $api->decode($response);

 

 

         return $data;

@@ -342,7 +342,7 @@ 
         $setting = $settingsHandler->getPrimarySetting();

 

         if (0 == \count($setting)) {

-            \redirect_header(\XOOPS_URL . '/index.php', 3, \_AM_WGGITHUB_THEREARENT_SETTINGS);

+            \redirect_header(\XOOPS_URL.'/index.php', 3, \_AM_WGGITHUB_THEREARENT_SETTINGS);

         }

         //$this->userAuth = $setting['user'];

         $this->tokenAuth = $setting['token'];