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

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

@@ -115,7 +115,7 @@ 
         }

         unset($crLogs);

 

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

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

 

         $crDirectories = new \CriteriaCompo();

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

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

@@ -143,7 +143,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();

@@ -222,9 +222,9 @@ 
                 }

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

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

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

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

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

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

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

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

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

             }

@@ -242,10 +242,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&release=' . $filterRelease . '&sortby=' . $filterSortby;

+        $redir   = 'index.php?op=list_afterupdate&release='.$filterRelease.'&sortby='.$filterSortby;

         $githubClient = GithubClient::getInstance();

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

         if ($result) {

@@ -259,12 +259,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&release=' . $filterRelease . '&sortby=' . $filterSortby;

+        $redir    = 'index.php?op=list_afterupdate&release='.$filterRelease.'&sortby='.$filterSortby;

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

         if ($result) {

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

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

 }

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

admin/index.php

Spacing +12 added lines, -12 removed lines

@@ -23,8 +23,8 @@ 
 use Xmf\Request;

 use XoopsModules\Wggithub\Common;

 

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

-require __DIR__ . '/header.php';

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

+require __DIR__.'/header.php';

 

 // Template Index

 $templateMain = 'wggithub_admin_index.tpl';

@@ -45,12 +45,12 @@ 
 // InfoBox Statistics

 $adminObject->addInfoBox(\_AM_WGGITHUB_STATISTICS);

 // Info elements

-$adminObject->addInfoBoxLine(\sprintf( '<label>' . \_AM_WGGITHUB_THEREARE_SETTINGS . '</label>', $countSettings));

-$adminObject->addInfoBoxLine(\sprintf( '<label>' . \_AM_WGGITHUB_THEREARE_DIRECTORIES . '</label>', $countDirectories));

-$adminObject->addInfoBoxLine(\sprintf( '<label>' . \_AM_WGGITHUB_THEREARE_LOGS . '</label>', $countLogs));

-$adminObject->addInfoBoxLine(\sprintf( '<label>' . \_AM_WGGITHUB_THEREARE_REPOSITORIES . '</label>', $countRepositories));

-$adminObject->addInfoBoxLine(\sprintf( '<label>' . \_AM_WGGITHUB_THEREARE_READMES . '</label>', $countReadmes));

-$adminObject->addInfoBoxLine(\sprintf( '<label>' . \_AM_WGGITHUB_THEREARE_RELEASES . '</label>', $countReleases));

+$adminObject->addInfoBoxLine(\sprintf('<label>'.\_AM_WGGITHUB_THEREARE_SETTINGS.'</label>', $countSettings));

+$adminObject->addInfoBoxLine(\sprintf('<label>'.\_AM_WGGITHUB_THEREARE_DIRECTORIES.'</label>', $countDirectories));

+$adminObject->addInfoBoxLine(\sprintf('<label>'.\_AM_WGGITHUB_THEREARE_LOGS.'</label>', $countLogs));

+$adminObject->addInfoBoxLine(\sprintf('<label>'.\_AM_WGGITHUB_THEREARE_REPOSITORIES.'</label>', $countRepositories));

+$adminObject->addInfoBoxLine(\sprintf('<label>'.\_AM_WGGITHUB_THEREARE_READMES.'</label>', $countReadmes));

+$adminObject->addInfoBoxLine(\sprintf('<label>'.\_AM_WGGITHUB_THEREARE_RELEASES.'</label>', $countReleases));

 

 // Upload Folders

 $configurator = new Common\Configurator();

@@ -70,12 +70,12 @@ 
 // Test Data

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

     \xoops_loadLanguage('admin/modulesadmin', 'system');

-    include_once \dirname(__DIR__) . '/testdata/index.php';

-    $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');

-    $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');

+    include_once \dirname(__DIR__).'/testdata/index.php';

+    $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');

+    $adminObject->addItemButton(\constant('CO_'.$moduleDirNameUpper.'_SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');

 //    $adminObject->addItemButton(\constant('CO_' . $moduleDirNameUpper . '_EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');

     $adminObject->displayButton('left');

 }

 $GLOBALS['xoopsTpl']->assign('index', $adminObject->displayIndex());

 // End Test Data

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

class/Github/GithubClient.php

Spacing +14 added lines, -14 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);

     }

@@ -177,9 +177,9 @@ 
     {

         //function currently not used

         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);

 

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

     }

@@ -241,7 +241,7 @@ 
             } 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) {

@@ -262,13 +262,13 @@ 
                     break;

                 case 0:

                 default:

-                    $message = \_MA_WGGITHUB_READGH_ERROR_API . '(' .$code . ' - ' .  $errMsg . ')';

+                    $message = \_MA_WGGITHUB_READGH_ERROR_API.'('.$code.' - '.$errMsg.')';

                     break;

             }

-            redirect_header('index.php?op=api_error&message='. $message . '&url='. $url, 5, $message);

+            redirect_header('index.php?op=api_error&message='.$message.'&url='.$url, 5, $message);

             //throw new \RuntimeException('"' . $message . '"');

         } else {

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

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

         }

 

         return $data;

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

class/Utility.php

Indentation +8 added lines, -8 removed lines

@@ -191,14 +191,14 @@
         $donationform = [

             0   => '<form name="donation" id="donation" action="http://www.txmodxoops.org/modules/xdonations/" method="post" onsubmit="return xoopsFormValidate_donation();">',

             1   => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'

-                   . \_AM_WGGITHUB_ABOUT_MAKE_DONATION

-                   . '</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">'

-                   . \_AM_WGGITHUB_DONATION_AMOUNT

-                   . '</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'

-                   . \_SUBMIT

-                   . '" title="'

-                   . \_SUBMIT

-                   . '" type="submit"></td></tr></tbody></table>',

+                    . \_AM_WGGITHUB_ABOUT_MAKE_DONATION

+                    . '</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">'

+                    . \_AM_WGGITHUB_DONATION_AMOUNT

+                    . '</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'

+                    . \_SUBMIT

+                    . '" title="'

+                    . \_SUBMIT

+                    . '" type="submit"></td></tr></tbody></table>',

             2   => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="EUR" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"></form>',

             'D' => '',

             3   => '',

class/Readmes.php

Spacing +14 added lines, -14 removed lines

@@ -137,7 +137,7 @@ 
         $helper  = \XoopsModules\Wggithub\Helper::getInstance();

         $utility = new \XoopsModules\Wggithub\Utility();

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

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

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

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

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

         $repoName = '*****missing repo_name*****';

@@ -169,7 +169,7 @@ 
         $ret['submitter']     = \XoopsUser::getUnameFromId($this->getVar('rm_submitter'));

         $ret['gitbook_link']  = '';

         if (\strpos($ret['downloadurl'], 'XoopsDoc') > 0) {

-            $ret['gitbook_link']  = 'https://xoops.gitbook.io/' . $repoName . '/';

+            $ret['gitbook_link'] = 'https://xoops.gitbook.io/'.$repoName.'/';

         }

         return $ret;

     }

@@ -214,22 +214,22 @@ 
         $arrReplace = [

             'src="https://xoops.org/images/logoXoopsPhp8.png',

             "src='https://xoops.org/images/logoXoopsPhp8.png",

-            'src="' . $baseUrl . '.gitbook/assets/',

-            "src='" . $baseUrl . '.gitbook/assets/',

-            'src="' . $baseUrl . 'en/assets/',

-            "src='" . $baseUrl . 'en/assets/',

-            'src="' . $baseUrl . 'assets/',

-            "src='" . $baseUrl . 'assets/'

+            'src="'.$baseUrl.'.gitbook/assets/',

+            "src='".$baseUrl.'.gitbook/assets/',

+            'src="'.$baseUrl.'en/assets/',

+            "src='".$baseUrl.'en/assets/',

+            'src="'.$baseUrl.'assets/',

+            "src='".$baseUrl.'assets/'

         ];

         $contentClean = \str_replace($arrSearch, $arrReplace, $contentClean);

 

         //replace known missing images

         $arrSearch = [

-            'src="' . \XOOPS_URL . '/screenshot.jpg',

-            'src="' . \XOOPS_URL . '/sd-099-theme-surprice.gif',

-            'src="' . \XOOPS_URL . '/shot.gif',

-            'src="' . \XOOPS_URL . '/shot.jpg',

-            'src="' . \XOOPS_URL . '/theme_preview.png',

+            'src="'.\XOOPS_URL.'/screenshot.jpg',

+            'src="'.\XOOPS_URL.'/sd-099-theme-surprice.gif',

+            'src="'.\XOOPS_URL.'/shot.gif',

+            'src="'.\XOOPS_URL.'/shot.jpg',

+            'src="'.\XOOPS_URL.'/theme_preview.png',

             'src="https://github.com/xoops/newbb-tutorial/tree/54ef6104e66b74e8c6dea683d3cce70ceafdd739/assets/image001.jpg',

             'src="https://github.com/xoops/repairshop-tutorial/tree/719d6d32dea221b3e980fd3d6222f179ac898394/en/assets/img_2.jpg',

             'src="https://github.com/xoops/xoops-mylinks-tutorial/tree/d30c30645d48c5ead51399ff711c25935cbd0495/en/assets/forkit.png',

@@ -300,7 +300,7 @@ 
             'src="https://insight.sensiolabs.com/projects/7ada0220-a68e-4369-aef0-950172630ff8/mini.png',

             'src="https://xoops.org/images/translations-github-blue.svg',

         ];

-        $contentClean = \str_replace($arrSearch, 'src="' . \WGGITHUB_IMAGE_URL . '/blank.gif', $contentClean);

+        $contentClean = \str_replace($arrSearch, 'src="'.\WGGITHUB_IMAGE_URL.'/blank.gif', $contentClean);

 

         return $contentClean;

     }