ggoffy / wggithub

index.php

Spacing +17 added lines, -17 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);
@@ -120,13 +120,13 @@ 
             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();
                 $crRepositories->add(new \Criteria('repo_user', $dirName));
                 $repositoriesCountTotal = $repositoriesHandler->getCount($crRepositories);
                 if ('any' === $filterRelease && $dirFilterRelease) {
-                    $crRepositories->add(new \Criteria('repo_prerelease', 1) );
+                    $crRepositories->add(new \Criteria('repo_prerelease', 1));
                     $crRepositories->add(new \Criteria('repo_release', 1), 'OR');
                 }
                 if ('final' === $filterRelease && $dirFilterRelease) {
@@ -181,9 +181,9 @@ 
                 }
                 $directories[$i]['repos'] = $repos;
                 $directories[$i]['previousRepos'] = $start > 0;
-                $directories[$i]['previousOp'] = '&start=' . ($start - $limit) . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+                $directories[$i]['previousOp'] = '&start='.($start - $limit).'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
                 $directories[$i]['nextRepos'] = ($repositoriesCount - $start) > $limit;
-                $directories[$i]['nextOp'] = '&start=' . ($start + $limit) . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+                $directories[$i]['nextOp'] = '&start='.($start + $limit).'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
                 $GLOBALS['xoopsTpl']->assign('start', $start);
                 $GLOBALS['xoopsTpl']->assign('limit', $limit);
                 $GLOBALS['xoopsTpl']->assign('menu', $menu);
@@ -194,8 +194,8 @@ 
             unset($crDirectories, $directories);
             // Display Navigation
             if ($directoriesCount > $limit) {
-                require_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
-                $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+                require_once \XOOPS_ROOT_PATH.'/class/pagenav.php';
+                $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit='.$limit);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
             }
             $GLOBALS['xoopsTpl']->assign('lang_thereare', \sprintf(\_MA_WGGITHUB_INDEX_THEREARE, $directoriesCount));
@@ -208,11 +208,11 @@ 
         // Permissions
         if (!$permGlobalRead) {
             $GLOBALS['xoopsTpl']->assign('error', \_NOPERM);
-            require __DIR__ . '/footer.php';
+            require __DIR__.'/footer.php';
         }
         $dirName = Request::getString('dir_name', '');
         $result = executeUpdate($dirName);
-        $redir = 'index.php?op=list_afterupdate&start=' . $start . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+        $redir = 'index.php?op=list_afterupdate&start='.$start.'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
         if ($result) {
             \redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);
         } else {
@@ -224,13 +224,13 @@ 
         // 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');
         $result = $helper->getHandler('Readmes')->updateReadmes($repoId, $repoUser, $repoName);
-        $redir = 'index.php?op=list_afterupdate&start=' . $start . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+        $redir = 'index.php?op=list_afterupdate&start='.$start.'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
         if ($result) {
             \redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);
         } else {
@@ -243,14 +243,14 @@ 
 // 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';
 
 
 /**
@@ -258,7 +258,7 @@ 
  * @param string $dirName
  * @return bool
  */
-function executeUpdate($dirName = ''){
+function executeUpdate($dirName = '') {
 
     $githubClient = GithubClient::getInstance();
     $helper = Helper::getInstance();

admin/github-api.php

Spacing +25 added lines, -25 removed lines

@@ -30,52 +30,52 @@ 
 use XoopsModules\Wggithub;
 use XoopsModules\Wggithub\Github;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 // It recovered the value of argument op in URL$
 
 
 $data = [];
 $url = '/orgs/XoopsModules25x/repos?per_page=100&page=1';
-echo "<br>Test read org repo:" . $url;
+echo "<br>Test read org repo:".$url;
 $api = new XoopsModules\Wggithub\Github\GithubClient();
 $data = $api->testMilo($url);
 $count = 0;
 foreach ($data as $key => $repo) {
-    echo "<br>key:" . $key . ' repo:' . $repo['name'];
+    echo "<br>key:".$key.' repo:'.$repo['name'];
     $count++;
-    if ($count>5) {break;}
+    if ($count > 5) {break; }
 }
 
 
 $data = [];
 $url = '/users/ggoffy/repos?per_page=100&page=1';
-echo "<br><br>Test read user repo:" . $url;
+echo "<br><br>Test read user repo:".$url;
 $api = new XoopsModules\Wggithub\Github\GithubClient();
 $data = $api->testMilo($url);
 $count = 0;
 foreach ($data as $key => $repo) {
-    echo "<br>key:" . $key . ' repo:' . $repo['name'];
+    echo "<br>key:".$key.' repo:'.$repo['name'];
     $count++;
-    if ($count>5) {break;}
+    if ($count > 5) {break; }
 }
 
 
 $data = [];
 $url = '/repos/XoopsModules25x/smallworld/readme';
-echo "<br><br>test read readme orgs:" . $url;
+echo "<br><br>test read readme orgs:".$url;
 $api = new XoopsModules\Wggithub\Github\GithubClient();
 $data = $api->testMilo($url);
-echo '<br>name:' . $data['name'];
-echo '<br>download_url:' . $data['download_url'];
+echo '<br>name:'.$data['name'];
+echo '<br>download_url:'.$data['download_url'];
 
 
 $data = [];
 $url = '/repos/ggoffy/wggithub/readme';
-echo "<br><br>test read readme user:" . $url;
+echo "<br><br>test read readme user:".$url;
 $api = new XoopsModules\Wggithub\Github\GithubClient();
 $data = $api->testMilo($url);
-echo '<br>name:' . $data['name'];
-echo '<br>download_url:' . $data['download_url'];
+echo '<br>name:'.$data['name'];
+echo '<br>download_url:'.$data['download_url'];
 
 
 echo "<br><br><br>-----------------------------------";
@@ -84,45 +84,45 @@ 
 
 $data = [];
 $url = '/orgs/XoopsModules25x/repos?per_page=100&page=1';
-echo "<br>Test read org repo:" . $url;
+echo "<br>Test read org repo:".$url;
 $api = new XoopsModules\Wggithub\Github\GithubClient();
 $data = $api->testMilo2($url);
 $count = 0;
 foreach ($data as $key => $repo) {
-    echo "<br>key:" . $key . ' repo:' . $repo['name'];
+    echo "<br>key:".$key.' repo:'.$repo['name'];
     $count++;
-    if ($count>5) {break;}
+    if ($count > 5) {break; }
 }
 
 
 $data = [];
 $url = '/users/ggoffy/repos?per_page=100&page=1';
-echo "<br><br>Test read user repo:" . $url;
+echo "<br><br>Test read user repo:".$url;
 $api = new XoopsModules\Wggithub\Github\GithubClient();
 $data = $api->testMilo2($url);
 $count = 0;
 foreach ($data as $key => $repo) {
-    echo "<br>key:" . $key . ' repo:' . $repo['name'];
+    echo "<br>key:".$key.' repo:'.$repo['name'];
     $count++;
-    if ($count>5) {break;}
+    if ($count > 5) {break; }
 }
 
 
 $data = [];
 $url = '/repos/XoopsModules25x/smallworld/readme';
-echo "<br><br>test read readme orgs:" . $url;
+echo "<br><br>test read readme orgs:".$url;
 $api = new XoopsModules\Wggithub\Github\GithubClient();
 $data = $api->testMilo2($url);
-echo '<br>name:' . $data['name'];
-echo '<br>download_url:' . $data['download_url'];
+echo '<br>name:'.$data['name'];
+echo '<br>download_url:'.$data['download_url'];
 
 
 $data = [];
 $url = '/repos/ggoffy/wggithub/readme';
-echo "<br><br>test read readme user:" . $url;
+echo "<br><br>test read readme user:".$url;
 $api = new XoopsModules\Wggithub\Github\GithubClient();
 $data = $api->testMilo2($url);
-echo '<br>name:' . $data['name'];
-echo '<br>download_url:' . $data['download_url'];
+echo '<br>name:'.$data['name'];
+echo '<br>download_url:'.$data['download_url'];
 
 

class/Github/GithubClient.php

Spacing +16 added lines, -16 removed lines

@@ -81,7 +81,7 @@ 
 
     public function testMilo($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);
     }
@@ -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);
     }
@@ -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);
 
@@ -216,13 +216,13 @@ 
         } 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:
                     /*
@@ -230,21 +230,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;
     }
@@ -260,7 +260,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'];

test.php

Spacing +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@ 
     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';
 // Define Stylesheet
 $GLOBALS['xoTheme']->addStylesheet($style, null);
 $keywords = [];
@@ -166,4 +166,4 @@ 
 var_dump($result);
 */
 
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';