ggoffy / wggithub

class/ReleasesHandler.php

Spacing +16 added lines, -16 removed lines

@@ -149,7 +149,7 @@ 
                 if (Constants::STATUS_NEW === $repoStatus || Constants::STATUS_UPDATED === $repoStatus || 0 == $releasesCount) {
                     $ghReleases = $githubClient->getReleases($repositoriesAll[$i]->getVar('repo_user'), $repositoriesAll[$i]->getVar('repo_name'));
                     if ($releasesCount > 0) {
-                        $sql = 'DELETE FROM `' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '` WHERE `rel_repoid` = ' . $repoId;
+                        $sql = 'DELETE FROM `'.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'` WHERE `rel_repoid` = '.$repoId;
                         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
                             return false;
                         }
@@ -159,13 +159,13 @@ 
                 $first = true;
                 $final = false;
                 foreach ($ghReleases as $ghRelease) {
-                    if ($first || (!$final && !(bool)$ghRelease['prerelease'])) {
+                    if ($first || (!$final && !(bool) $ghRelease['prerelease'])) {
                         // save first in any case and save first final version
                         $releasesObj = $releasesHandler->create();
                         $releasesObj->setVar('rel_repoid', $repoId);
                         $releasesObj->setVar('rel_type', $ghRelease['type']);
                         $releasesObj->setVar('rel_name', $ghRelease['name']);
-                        $releasesObj->setVar('rel_prerelease', (true == (bool)$ghRelease['prerelease']));
+                        $releasesObj->setVar('rel_prerelease', (true == (bool) $ghRelease['prerelease']));
                         $releasesObj->setVar('rel_publishedat', \strtotime($ghRelease['published_at']));
                         $releasesObj->setVar('rel_tarballurl', $ghRelease['tarball_url']);
                         $releasesObj->setVar('rel_zipballurl', $ghRelease['zipball_url']);
@@ -177,7 +177,7 @@ 
                         }
                     }
                     $first = false;
-                    if (false === (bool)$ghRelease['prerelease']) {
+                    if (false === (bool) $ghRelease['prerelease']) {
                         $final = true;
                     }
                 }
@@ -215,7 +215,7 @@ 
                 // must return true otherwise releases will not be loaded
                 return true;
             }
-            $sql = 'DELETE FROM `' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '` WHERE `rel_repoid` = ' . $repoId;
+            $sql = 'DELETE FROM `'.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'` WHERE `rel_repoid` = '.$repoId;
             if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
                 return false;
             }
@@ -224,13 +224,13 @@ 
             $first = true;
             $final = false;
             foreach ($ghReleases as $ghRelease) {
-                if ($first || (!$final && !(bool)$ghRelease['prerelease'])) {
+                if ($first || (!$final && !(bool) $ghRelease['prerelease'])) {
                     // save first in any case and save first final version
                     $releasesObj = $releasesHandler->create();
                     $releasesObj->setVar('rel_repoid', $repoId);
                     $releasesObj->setVar('rel_type', $ghRelease['type']);
                     $releasesObj->setVar('rel_name', $ghRelease['name']);
-                    $releasesObj->setVar('rel_prerelease', (true == (bool)$ghRelease['prerelease']));
+                    $releasesObj->setVar('rel_prerelease', (true == (bool) $ghRelease['prerelease']));
                     $releasesObj->setVar('rel_publishedat', \strtotime($ghRelease['published_at']));
                     $releasesObj->setVar('rel_tarballurl', $ghRelease['tarball_url']);
                     $releasesObj->setVar('rel_zipballurl', $ghRelease['zipball_url']);
@@ -242,7 +242,7 @@ 
                     }
                 }
                 $first = false;
-                if (false === (bool)$ghRelease['prerelease']) {
+                if (false === (bool) $ghRelease['prerelease']) {
                     $final = true;
                 }
             }
@@ -259,17 +259,17 @@ 
     public function updateRepoReleases()
     {
         // update repo_prerelease
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . ' INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases');
-        $sql .= ' ON ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_id = ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_repoid ';
-        $sql .= 'SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_prerelease = 1 ';
-        $sql .= 'WHERE (((' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_prerelease)=1));';
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').' INNER JOIN '.$GLOBALS['xoopsDB']->prefix('wggithub_releases');
+        $sql .= ' ON '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_id = '.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_repoid ';
+        $sql .= 'SET '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_prerelease = 1 ';
+        $sql .= 'WHERE ((('.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_prerelease)=1));';
         $GLOBALS['xoopsDB']->queryF($sql);
 
         // update repo_release
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . ' INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases');
-        $sql .= ' ON ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_id = ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_repoid ';
-        $sql .= 'SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_release = 1 ';
-        $sql .= 'WHERE (((' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_prerelease)=0));';
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').' INNER JOIN '.$GLOBALS['xoopsDB']->prefix('wggithub_releases');
+        $sql .= ' ON '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_id = '.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_repoid ';
+        $sql .= 'SET '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_release = 1 ';
+        $sql .= 'WHERE ((('.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_prerelease)=0));';
         $GLOBALS['xoopsDB']->queryF($sql);
 
         return true;

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

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

admin/github-api.php

Spacing +25 added lines, -25 removed lines

@@ -30,7 +30,7 @@ 
 use XoopsModules\Wggithub;
 use XoopsModules\Wggithub\Github;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 // It recovered the value of argument op in URL$
 
 /*
@@ -45,46 +45,46 @@ 
 
 $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>-----------------------------------";
@@ -93,45 +93,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'];
 
 

xoops_version.php

Spacing +8 added lines, -8 removed lines

@@ -37,10 +37,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'        => '2020/11/21',
     '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.2',
     'min_xoops'           => '2.5.10',
     'min_admin'           => '1.2',
@@ -203,10 +203,10 @@ 
 ];
 // Get groups
 $memberHandler = \xoops_getHandler('member');
-$xoopsGroups  = $memberHandler->getGroupList();
+$xoopsGroups = $memberHandler->getGroupList();
 $groups = [];
 foreach ($xoopsGroups as $key => $group) {
-    $groups[$group]  = $key;
+    $groups[$group] = $key;
 }
 // General access groups
 $modversion['config'][] = [
@@ -232,10 +232,10 @@ 
 $crGroups = new \CriteriaCompo();
 $crGroups->add(new \Criteria('group_type', 'Admin'));
 $memberHandler = \xoops_getHandler('member');
-$adminXoopsGroups  = $memberHandler->getGroupList($crGroups);
+$adminXoopsGroups = $memberHandler->getGroupList($crGroups);
 $adminGroups = [];
 foreach ($adminXoopsGroups as $key => $adminGroup) {
-    $adminGroups[$adminGroup]  = $key;
+    $adminGroups[$adminGroup] = $key;
 }
 $modversion['config'][] = [
     'name'        => 'admin_groups',
@@ -335,8 +335,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,

include/functions.php

Indentation +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
 
         case 'none':
             if($topic_name) {
-                 $topic_name = 'topic=' . $topic_name . '&';
+                    $topic_name = 'topic=' . $topic_name . '&';
             }
             $rewrite_base = '/modules/';
             $page = 'page=' . $array['content_alias'];
@@ -163,7 +163,7 @@ 
             return XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name  . $id . $page . $rewrite_ext;
             break;
 
-         case 'short':
+            case 'short':
             if($topic_name) {
                 $topic_name .= '/';
             }

Spacing +22 added lines, -22 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;
@@ -207,6 +207,6 @@ 
     $url .= htmlentities($url, ENT_COMPAT, 'utf-8');
     $url .= \preg_replace('`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i', "\1", $url);
     $url .= \preg_replace(array($regular_expression, '`[-]+`'), '-', $url);
-    $url = ($url == '') ? $type : strtolower(    rim($url, '-'));
+    $url = ($url == '') ? $type : strtolower(rim($url, '-'));
     return $url;
 }
\ No newline at end of file

include/common.php

Spacing +21 added lines, -21 removed lines

@@ -20,29 +20,29 @@
  * @author         Goffy - XOOPS Development Team - Email:<goffy@wedega.com> - Website:<https://wedega.com>
  */
 if (!\defined('XOOPS_ICONS32_PATH')) {
-    \define('XOOPS_ICONS32_PATH', XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32');
+    \define('XOOPS_ICONS32_PATH', XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/icons/32');
 }
 if (!\defined('XOOPS_ICONS32_URL')) {
-    \define('XOOPS_ICONS32_URL', XOOPS_URL . '/Frameworks/moduleclasses/icons/32');
+    \define('XOOPS_ICONS32_URL', XOOPS_URL.'/Frameworks/moduleclasses/icons/32');
 }
 \define('WGGITHUB_DIRNAME', 'wggithub');
-\define('WGGITHUB_PATH', XOOPS_ROOT_PATH . '/modules/' . WGGITHUB_DIRNAME);
-\define('WGGITHUB_URL', XOOPS_URL . '/modules/' . WGGITHUB_DIRNAME);
-\define('WGGITHUB_ICONS_PATH', WGGITHUB_PATH . '/assets/icons');
-\define('WGGITHUB_ICONS_URL', WGGITHUB_URL . '/assets/icons');
-\define('WGGITHUB_IMAGE_PATH', WGGITHUB_PATH . '/assets/images');
-\define('WGGITHUB_IMAGE_URL', WGGITHUB_URL . '/assets/images');
-\define('WGGITHUB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . WGGITHUB_DIRNAME);
-\define('WGGITHUB_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . WGGITHUB_DIRNAME);
-\define('WGGITHUB_UPLOAD_FILES_PATH', WGGITHUB_UPLOAD_PATH . '/files');
-\define('WGGITHUB_UPLOAD_FILES_URL', WGGITHUB_UPLOAD_URL . '/files');
-\define('WGGITHUB_UPLOAD_IMAGE_PATH', WGGITHUB_UPLOAD_PATH . '/images');
-\define('WGGITHUB_UPLOAD_IMAGE_URL', WGGITHUB_UPLOAD_URL . '/images');
-\define('WGGITHUB_UPLOAD_SHOTS_PATH', WGGITHUB_UPLOAD_PATH . '/images/shots');
-\define('WGGITHUB_UPLOAD_SHOTS_URL', WGGITHUB_UPLOAD_URL . '/images/shots');
-\define('WGGITHUB_ADMIN', WGGITHUB_URL . '/admin/index.php');
-$localLogo = WGGITHUB_IMAGE_URL . '/tdmxoops_logo.png';
+\define('WGGITHUB_PATH', XOOPS_ROOT_PATH.'/modules/'.WGGITHUB_DIRNAME);
+\define('WGGITHUB_URL', XOOPS_URL.'/modules/'.WGGITHUB_DIRNAME);
+\define('WGGITHUB_ICONS_PATH', WGGITHUB_PATH.'/assets/icons');
+\define('WGGITHUB_ICONS_URL', WGGITHUB_URL.'/assets/icons');
+\define('WGGITHUB_IMAGE_PATH', WGGITHUB_PATH.'/assets/images');
+\define('WGGITHUB_IMAGE_URL', WGGITHUB_URL.'/assets/images');
+\define('WGGITHUB_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.WGGITHUB_DIRNAME);
+\define('WGGITHUB_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.WGGITHUB_DIRNAME);
+\define('WGGITHUB_UPLOAD_FILES_PATH', WGGITHUB_UPLOAD_PATH.'/files');
+\define('WGGITHUB_UPLOAD_FILES_URL', WGGITHUB_UPLOAD_URL.'/files');
+\define('WGGITHUB_UPLOAD_IMAGE_PATH', WGGITHUB_UPLOAD_PATH.'/images');
+\define('WGGITHUB_UPLOAD_IMAGE_URL', WGGITHUB_UPLOAD_URL.'/images');
+\define('WGGITHUB_UPLOAD_SHOTS_PATH', WGGITHUB_UPLOAD_PATH.'/images/shots');
+\define('WGGITHUB_UPLOAD_SHOTS_URL', WGGITHUB_UPLOAD_URL.'/images/shots');
+\define('WGGITHUB_ADMIN', WGGITHUB_URL.'/admin/index.php');
+$localLogo = WGGITHUB_IMAGE_URL.'/tdmxoops_logo.png';
 // Module Information
-$copyright = "<a href='https://wedega.com' title='XOOPS on Wedega' target='_blank'><img src='" . $localLogo . "' alt='XOOPS on Wedega' /></a>";
-include_once XOOPS_ROOT_PATH . '/class/xoopsrequest.php';
-include_once WGGITHUB_PATH . '/include/functions.php';
+$copyright = "<a href='https://wedega.com' title='XOOPS on Wedega' target='_blank'><img src='".$localLogo."' alt='XOOPS on Wedega' /></a>";
+include_once XOOPS_ROOT_PATH.'/class/xoopsrequest.php';
+include_once WGGITHUB_PATH.'/include/functions.php';

include/update.php

Spacing +16 added lines, -16 removed lines

@@ -39,7 +39,7 @@ 
     $ret = wggithub_check_db($module);
 
     //check upload directory
-    include_once __DIR__ . '/install.php';
+    include_once __DIR__.'/install.php';
     $ret = xoops_module_install_wggithub($module);
 
     $errors = $module->getErrors();
@@ -61,7 +61,7 @@ 
 {
     global $xoopsDB;
     $result = $xoopsDB->query(
-        'SELECT t1.tpl_id FROM ' . $xoopsDB->prefix('tplfile') . ' t1, ' . $xoopsDB->prefix('tplfile') . ' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
+        'SELECT t1.tpl_id FROM '.$xoopsDB->prefix('tplfile').' t1, '.$xoopsDB->prefix('tplfile').' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
     );
     $tplids = [];
     while (false !== (list($tplid) = $xoopsDB->fetchRow($result))) {
@@ -69,7 +69,7 @@ 
     }
     if (\count($tplids) > 0) {
         $tplfileHandler  = \xoops_getHandler('tplfile');
-        $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '(' . \implode(',', $tplids) . ')', 'IN'));
+        $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '('.\implode(',', $tplids).')', 'IN'));
 
         if (\count($duplicate_files) > 0) {
             foreach (\array_keys($duplicate_files) as $i) {
@@ -77,9 +77,9 @@ 
             }
         }
     }
-    $sql = 'SHOW INDEX FROM ' . $xoopsDB->prefix('tplfile') . " WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
+    $sql = 'SHOW INDEX FROM '.$xoopsDB->prefix('tplfile')." WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br>' . $sql);
+        xoops_error($xoopsDB->error().'<br>'.$sql);
 
         return false;
     }
@@ -92,9 +92,9 @@ 
 
         return true;
     }
-    $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile') . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
+    $sql = 'ALTER TABLE '.$xoopsDB->prefix('tplfile').' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br>' . $sql);
+        xoops_error($xoopsDB->error().'<br>'.$sql);
         $module->setErrors("'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index.");
 
         return false;
@@ -118,12 +118,12 @@ 
     // Example: update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_release';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -132,12 +132,12 @@ 
     // Example: update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_prerelease';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -145,12 +145,12 @@ 
     // Example: update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_readme';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -159,12 +159,12 @@ 
 // Example: update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_directories');
     $field   = 'dir_filterrelease';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `dir_online`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -186,7 +186,7 @@ 
               PRIMARY KEY (`log_id`)
                 ) ENGINE=InnoDB;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when creating table '$table'.");
             $ret = false;
         }