ggoffy / wggithub

include/notification.inc.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     global $xoopsDB;

 

     if (!\defined('WGGITHUB_URL')) {

-        \define('WGGITHUB_URL', \XOOPS_URL . '/modules/wggithub');

+        \define('WGGITHUB_URL', \XOOPS_URL.'/modules/wggithub');

     }

 

     switch ($category) {

@@ -42,11 +42,11 @@ 
             return $item;

             break;

         case 'repositories':

-            $sql          = 'SELECT repo_name FROM ' . $xoopsDB->prefix('wggithub_repositories') . ' WHERE repo_id = '. $item_id;

+            $sql          = 'SELECT repo_name FROM '.$xoopsDB->prefix('wggithub_repositories').' WHERE repo_id = '.$item_id;

             $result       = $xoopsDB->query($sql);

             $result_array = $xoopsDB->fetchArray($result);

             $item['name'] = $result_array['repo_name'];

-            $item['url']  = \WGGITHUB_URL . '/repositories.php?repo_id=' . $item_id;

+            $item['url']  = \WGGITHUB_URL.'/repositories.php?repo_id='.$item_id;

             return $item;

             break;

     }

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 . '/wedega_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.'/wedega_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/search.inc.php

Spacing +6 added lines, -6 removed lines

@@ -59,15 +59,15 @@ 
     }

     if ($elementCount > 0) {

         $crKeywords = new \CriteriaCompo();

-        for ($i = 0; $i  <  $elementCount; $i++) {

-            $crKeywords->add(new \Criteria('repo_name', '%' . $queryarray[$i] . '%', 'LIKE'), 'OR');

+        for ($i = 0; $i < $elementCount; $i++) {

+            $crKeywords->add(new \Criteria('repo_name', '%'.$queryarray[$i].'%', 'LIKE'), 'OR');

         }

     }

     // search user(s)

     if ($userid && \is_array($userid)) {

         $userid = array_map('intval', $userid);

         $crUser = new \CriteriaCompo();

-        $crUser->add(new \Criteria('repo_submitter', '(' . \implode(',', $userid) . ')', 'IN'), 'OR');

+        $crUser->add(new \Criteria('repo_submitter', '('.\implode(',', $userid).')', 'IN'), 'OR');

     } elseif (is_numeric($userid) && $userid > 0) {

         $crUser = new \CriteriaCompo();

         $crUser->add(new \Criteria('repo_submitter', $userid), 'OR');

@@ -79,7 +79,7 @@ 
     if (isset($crUser)) {

         $crSearch->add($crUser, 'AND');

     }

-    if (0 === (int)$helper->getConfig('autoapproved')) {

+    if (0 === (int) $helper->getConfig('autoapproved')) {

         $crSearch->add(new \Criteria('repo_approved', 1));

     }

     $crSearch->add(new \Criteria('repo_status', Constants::STATUS_UPTODATE));

@@ -91,8 +91,8 @@ 
     foreach (\array_keys($repositoriesAll) as $i) {

         $ret[] = [

             'image'  => 'assets/icons/16/github.png',

-            'link'   => 'index.php?op=show&amp;dir_id=' . $directories[$repositoriesAll[$i]->getVar('repo_user')] . '&amp;repo_id=' . $i,

-            'title'  => $repositoriesAll[$i]->getVar('repo_name') . ' (' . $repositoriesAll[$i]->getVar('repo_user') . ')',

+            'link'   => 'index.php?op=show&amp;dir_id='.$directories[$repositoriesAll[$i]->getVar('repo_user')].'&amp;repo_id='.$i,

+            'title'  => $repositoriesAll[$i]->getVar('repo_name').' ('.$repositoriesAll[$i]->getVar('repo_user').')',

             'time'   => $repositoriesAll[$i]->getVar('repo_datecreated')

         ];

     }

class/Github/OAuth/Login.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 

         $this->storage->set('auth.state', $state);

 

-        $url = $this->authUrl . '?' . \http_build_query($params);

+        $url = $this->authUrl.'?'.\http_build_query($params);

         if ($redirectCb === NULL) {

             header("Location: $url");

             die();

class/Github/GithubClient.php

Spacing +15 added lines, -15 removed lines

@@ -84,7 +84,7 @@ 
         $logsHandler = $this->helper->getHandler('Logs');

         $logsHandler->updateTableLogs(Constants::LOG_TYPE_REQUEST, '', 'START Test API1');

 

-        $url = static::BASE_URL . $url;

+        $url = static::BASE_URL.$url;

         $logsHandler->updateTableLogs(Constants::LOG_TYPE_REQUEST, $url, 'URL');

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

 

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

 

@@ -124,7 +124,7 @@ 
         $logsHandler = $this->helper->getHandler('Logs');

         $logsHandler->updateTableLogs(Constants::LOG_TYPE_REQUEST, '', 'START Test UserRepositories');

 

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

+        $url = static::BASE_URL.'users/'.\rawurlencode($this->userAuth).'/repos?per_page=1&page=1';

         $logsHandler->updateTableLogs(Constants::LOG_TYPE_REQUEST, $url, 'URL');

 

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

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

     }

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

     }

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

     }

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

     }

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

 

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

     }

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

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

@@ -369,7 +369,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/Github/Api.php

Spacing +19 added lines, -19 removed lines

@@ -254,7 +254,7 @@ 
             $urlPath = $this->expandUriTemplate($urlPath, $parameters, $this->defaultParameters);

         }

 

-        $url = \rtrim($baseUrl, '/') . '/' . \ltrim($urlPath, '/');

+        $url = \rtrim($baseUrl, '/').'/'.\ltrim($urlPath, '/');

 

         if ($content !== NULL && (\is_array($content) || \is_object($content))) {

             $headers['Content-Type'] = 'application/json; charset=utf-8';

@@ -394,13 +394,13 @@ 
             }

             $parameter = $parameters[$m[2]];

             unset($parameters[$m[2]]);

-            return $m[1] . rawurlencode($parameter);

+            return $m[1].rawurlencode($parameter);

         }, $url);

 

         $url = \rtrim($url, '/');

 

         if (\count($parameters)) {

-            $url .= '?' . \http_build_query($parameters);

+            $url .= '?'.\http_build_query($parameters);

         }

 

         return $url;

@@ -421,14 +421,14 @@ 
         $parameters += $defaultParameters;

 

         static $operatorFlags = [

-            ''  => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],

-            '+' => ['prefix' => '',  'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],

-            '#' => ['prefix' => '#', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => TRUE],

-            '.' => ['prefix' => '.', 'separator' => '.', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],

-            '/' => ['prefix' => '/', 'separator' => '/', 'named' => FALSE, 'ifEmpty' => '',  'reserved' => FALSE],

-            ';' => ['prefix' => ';', 'separator' => ';', 'named' => TRUE,  'ifEmpty' => '',  'reserved' => FALSE],

-            '?' => ['prefix' => '?', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],

-            '&' => ['prefix' => '&', 'separator' => '&', 'named' => TRUE,  'ifEmpty' => '=', 'reserved' => FALSE],

+            ''  => ['prefix' => '', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => FALSE],

+            '+' => ['prefix' => '', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => TRUE],

+            '#' => ['prefix' => '#', 'separator' => ',', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => TRUE],

+            '.' => ['prefix' => '.', 'separator' => '.', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => FALSE],

+            '/' => ['prefix' => '/', 'separator' => '/', 'named' => FALSE, 'ifEmpty' => '', 'reserved' => FALSE],

+            ';' => ['prefix' => ';', 'separator' => ';', 'named' => TRUE, 'ifEmpty' => '', 'reserved' => FALSE],

+            '?' => ['prefix' => '?', 'separator' => '&', 'named' => TRUE, 'ifEmpty' => '=', 'reserved' => FALSE],

+            '&' => ['prefix' => '&', 'separator' => '&', 'named' => TRUE, 'ifEmpty' => '=', 'reserved' => FALSE],

         ];

 

         return preg_replace_callback('~{([+#./;?&])?([^}]+?)}~', function($m) use ($url, & $parameters, $operatorFlags) {

@@ -463,17 +463,17 @@ 
                     if ($explode) {

                         $parts = [];

                         if ($isAssoc) {

-                            $this->walk($value, function ($v, $k) use (& $parts, $flags, $maxLength) {

+                            $this->walk($value, function($v, $k) use (& $parts, $flags, $maxLength) {

                                 $parts[] = $this->prefix(['named' => TRUE] + $flags, $k, $this->escape($flags, $v, $maxLength));

                             });

 

                         } elseif ($flags['named']) {

-                            $this->walk($value, function ($v) use (& $parts, $flags, $name, $maxLength) {

+                            $this->walk($value, function($v) use (& $parts, $flags, $name, $maxLength) {

                                 $parts[] = $this->prefix($flags, $name, $this->escape($flags, $v, $maxLength));

                             });

 

                         } else {

-                            $this->walk($value, function ($v) use (& $parts, $flags, $maxLength) {

+                            $this->walk($value, function($v) use (& $parts, $flags, $maxLength) {

                                 $parts[] = $this->escape($flags, $v, $maxLength);

                             });

                         }

@@ -504,7 +504,7 @@ 
             }

 

             if (isset($translated[0])) {

-                return $flags['prefix'] . \implode($flags['separator'], $translated);

+                return $flags['prefix'].\implode($flags['separator'], $translated);

             }

 

             return '';

@@ -530,7 +530,7 @@ 
             }

         }

 

-        return $prefix . $value;

+        return $prefix.$value;

     }

 

 

@@ -545,7 +545,7 @@ 
         $value = (string) $value;

 

         if ($maxLength !== NULL) {

-            if (\preg_match('~^(.{' . $maxLength . '}).~u', $value, $m)) {

+            if (\preg_match('~^(.{'.$maxLength.'}).~u', $value, $m)) {

                 $value = $m[1];

             } elseif (\strlen($value) > $maxLength) {  # when malformed UTF-8

                 $value = \substr($value, 0, $maxLength);

@@ -558,7 +558,7 @@ 
 

             $escaped = '';

             for ($i = 0, $count = \count($parts); $i < $count; $i += 2) {

-                $escaped .= rawurlencode($parts[$i]) . $parts[$i + 1];

+                $escaped .= rawurlencode($parts[$i]).$parts[$i + 1];

             }

 

             return $escaped;

@@ -596,7 +596,7 @@ 
 

         if (isset($content->errors)) {

             $message .= \implode(', ', array_map(function($error) {

-                return '[' . \implode(':', (array) $error) . ']';

+                return '['.\implode(':', (array) $error).']';

             }, $content->errors));

         }

 

class/Github/Releases.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
      */

     public function getReleases($user, $repository)

     {

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

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

 

         return $this->_get($url);

     }

@@ -50,9 +50,9 @@ 
     public function getLatestRelease($user, $repository, $prerelease = false)

     {

         if ($prerelease) {

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

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

         } else {

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

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

         }

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

 

class/Github/Github.php

Indentation +2 added lines, -2 removed lines

@@ -80,7 +80,7 @@ 
 

         return $repos;

     }

-    */

+     */

 

     /**

      * Get data of all repositories of given organisation

@@ -95,7 +95,7 @@ 
 

         return $repos;

     }

-    */

+     */

 

     /**

      * Get primary setting

class/Github/Repositories.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
      */

     public function getUserRepositories($username)

     {

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

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

 

         return $this->_get($url);

     }

@@ -47,7 +47,7 @@ 
      */

     public function getOrgRepositories($org)

     {

-        $url = static::BASE_URL . 'orgs/' . $org . '/repos';

+        $url = static::BASE_URL.'orgs/'.$org.'/repos';

         //$ret = $this->extractData($this->_get($url));

         //return $ret;

         return $this->_get($url);

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

     }