@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | public function testApi1($url) {
|
| 83 | 83 | $api = new Github\Api; |
| 84 | - $response = $api->get(static::BASE_URL . $url); |
|
| 84 | + $response = $api->get(static::BASE_URL.$url); |
|
| 85 | 85 | $data = $api->decode($response); |
| 86 | 86 | |
| 87 | 87 | return $data; |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | $token = new Github\OAuth\Token('{myKey}', 'bearer', ['repo', 'user', 'public_repo']);
|
| 94 | 94 | $api->setToken($token); |
| 95 | - $response = $api->get(static::BASE_URL . $url); |
|
| 95 | + $response = $api->get(static::BASE_URL.$url); |
|
| 96 | 96 | |
| 97 | 97 | $data = $api->decode($response); |
| 98 | 98 | |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | */ |
| 118 | 118 | public function getUserRepositories($username, $per_page = 100, $page = 1) |
| 119 | 119 | {
|
| 120 | - $url = static::BASE_URL . 'users/' . \rawurlencode($username) . '/repos?per_page=' . $per_page . '&page=' . $page; |
|
| 120 | + $url = static::BASE_URL.'users/'.\rawurlencode($username).'/repos?per_page='.$per_page.'&page='.$page; |
|
| 121 | 121 | |
| 122 | 122 | return $this->_get($url); |
| 123 | 123 | } |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | */ |
| 133 | 133 | public function getOrgRepositories($org, $per_page = 100, $page = 1) |
| 134 | 134 | {
|
| 135 | - $url = static::BASE_URL . 'orgs/' . \rawurlencode($org) . '/repos?per_page=' . $per_page . '&page=' . $page; |
|
| 135 | + $url = static::BASE_URL.'orgs/'.\rawurlencode($org).'/repos?per_page='.$per_page.'&page='.$page; |
|
| 136 | 136 | |
| 137 | 137 | return $this->_get($url); |
| 138 | 138 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function getReadme($username, $repository) |
| 148 | 148 | {
|
| 149 | - $url = static::BASE_URL . 'repos/' . \rawurlencode($username) . '/' . \rawurlencode($repository) . '/readme'; |
|
| 149 | + $url = static::BASE_URL.'repos/'.\rawurlencode($username).'/'.\rawurlencode($repository).'/readme'; |
|
| 150 | 150 | |
| 151 | 151 | return $this->_get($url, true); |
| 152 | 152 | } |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | */ |
| 161 | 161 | public function getReleases($username, $repository) |
| 162 | 162 | {
|
| 163 | - $url = static::BASE_URL . 'repos/' . $username . '/' . $repository . '/releases'; |
|
| 163 | + $url = static::BASE_URL.'repos/'.$username.'/'.$repository.'/releases'; |
|
| 164 | 164 | |
| 165 | 165 | return $this->_get($url, true); |
| 166 | 166 | } |
@@ -176,9 +176,9 @@ discard block |
||
| 176 | 176 | public function getLatestRelease($username, $repository, $prerelease = false) |
| 177 | 177 | {
|
| 178 | 178 | if ($prerelease) {
|
| 179 | - $url = static::BASE_URL . 'repos/' . $username . '/' . $repository . '/releases'; |
|
| 179 | + $url = static::BASE_URL.'repos/'.$username.'/'.$repository.'/releases'; |
|
| 180 | 180 | } else {
|
| 181 | - $url = static::BASE_URL . 'repos/' . $username . '/' . $repository . '/releases/latest'; |
|
| 181 | + $url = static::BASE_URL.'repos/'.$username.'/'.$repository.'/releases/latest'; |
|
| 182 | 182 | } |
| 183 | 183 | $result = $this->_get($url); |
| 184 | 184 | |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | */ |
| 203 | 203 | public function getRepositoryContent($username, $repository) |
| 204 | 204 | {
|
| 205 | - $url = static::BASE_URL . 'repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/contents'; |
|
| 205 | + $url = static::BASE_URL.'repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/contents'; |
|
| 206 | 206 | |
| 207 | 207 | return $this->_get($url); |
| 208 | 208 | } |
@@ -235,14 +235,14 @@ discard block |
||
| 235 | 235 | } else {
|
| 236 | 236 | $error = true; |
| 237 | 237 | $errMsg = $response->getContent(); |
| 238 | - $logsHandler->updateTableLogs(Constants::LOG_TYPE_ERROR, $errMsg, 'ERROR ' . $code); |
|
| 238 | + $logsHandler->updateTableLogs(Constants::LOG_TYPE_ERROR, $errMsg, 'ERROR '.$code); |
|
| 239 | 239 | } |
| 240 | 240 | } |
| 241 | 241 | if ($error) {
|
| 242 | 242 | //catch common errors |
| 243 | 243 | switch ($code) {
|
| 244 | 244 | case 401: |
| 245 | - throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API_401 . '"');
|
|
| 245 | + throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API_401.'"');
|
|
| 246 | 246 | break; |
| 247 | 247 | case 403: |
| 248 | 248 | /* |
@@ -250,21 +250,21 @@ discard block |
||
| 250 | 250 | $GLOBALS['xoopsTpl']->assign('apiexceed', true);
|
| 251 | 251 | } |
| 252 | 252 | */ |
| 253 | - throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API_403 . '"');
|
|
| 253 | + throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API_403.'"');
|
|
| 254 | 254 | break; |
| 255 | 255 | case 404: |
| 256 | - throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API_404 . '"');
|
|
| 256 | + throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API_404.'"');
|
|
| 257 | 257 | break; |
| 258 | 258 | case 405: |
| 259 | - throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API_405 . '"');
|
|
| 259 | + throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API_405.'"');
|
|
| 260 | 260 | break; |
| 261 | 261 | case 0: |
| 262 | 262 | default: |
| 263 | - throw new \RuntimeException('"' . \_MA_WGGITHUB_READGH_ERROR_API . $errMsg . '"');
|
|
| 263 | + throw new \RuntimeException('"'.\_MA_WGGITHUB_READGH_ERROR_API.$errMsg.'"');
|
|
| 264 | 264 | break; |
| 265 | 265 | } |
| 266 | 266 | } |
| 267 | - $data = (array)$api->decode($response); |
|
| 267 | + $data = (array) $api->decode($response); |
|
| 268 | 268 | |
| 269 | 269 | return $data; |
| 270 | 270 | } |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | $setting = $settingsHandler->getPrimarySetting(); |
| 342 | 342 | |
| 343 | 343 | if (0 == \count($setting)) {
|
| 344 | - \redirect_header(\XOOPS_URL . '/index.php', 3, \_AM_WGGITHUB_THEREARENT_SETTINGS); |
|
| 344 | + \redirect_header(\XOOPS_URL.'/index.php', 3, \_AM_WGGITHUB_THEREARENT_SETTINGS); |
|
| 345 | 345 | } |
| 346 | 346 | //$this->userAuth = $setting['user']; |
| 347 | 347 | $this->tokenAuth = $setting['token']; |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | |
| 65 | 65 | $this->storage->set('auth.state', $state);
|
| 66 | 66 | |
| 67 | - $url = $this->authUrl . '?' . http_build_query($params); |
|
| 67 | + $url = $this->authUrl.'?'.http_build_query($params); |
|
| 68 | 68 | if ($redirectCb === NULL) {
|
| 69 | 69 | header("Location: $url");
|
| 70 | 70 | die(); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | if (Constants::STATUS_NEW === $repoStatus || Constants::STATUS_UPDATED === $repoStatus || 0 == $releasesCount) {
|
| 150 | 150 | $ghReleases = $githubClient->getReleases($repositoriesAll[$i]->getVar('repo_user'), $repositoriesAll[$i]->getVar('repo_name'));
|
| 151 | 151 | if ($releasesCount > 0) {
|
| 152 | - $sql = 'DELETE FROM `' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '` WHERE `rel_repoid` = ' . $repoId;
|
|
| 152 | + $sql = 'DELETE FROM `'.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'` WHERE `rel_repoid` = '.$repoId;
|
|
| 153 | 153 | if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
|
| 154 | 154 | return false; |
| 155 | 155 | } |
@@ -159,13 +159,13 @@ discard block |
||
| 159 | 159 | $first = true; |
| 160 | 160 | $final = false; |
| 161 | 161 | foreach ($ghReleases as $ghRelease) {
|
| 162 | - if ($first || (!$final && !(bool)$ghRelease['prerelease'])) {
|
|
| 162 | + if ($first || (!$final && !(bool) $ghRelease['prerelease'])) {
|
|
| 163 | 163 | // save first in any case and save first final version |
| 164 | 164 | $releasesObj = $releasesHandler->create(); |
| 165 | 165 | $releasesObj->setVar('rel_repoid', $repoId);
|
| 166 | 166 | $releasesObj->setVar('rel_type', $ghRelease['type']);
|
| 167 | 167 | $releasesObj->setVar('rel_name', $ghRelease['name']);
|
| 168 | - $releasesObj->setVar('rel_prerelease', (true == (bool)$ghRelease['prerelease']));
|
|
| 168 | + $releasesObj->setVar('rel_prerelease', (true == (bool) $ghRelease['prerelease']));
|
|
| 169 | 169 | $releasesObj->setVar('rel_publishedat', \strtotime($ghRelease['published_at']));
|
| 170 | 170 | $releasesObj->setVar('rel_tarballurl', $ghRelease['tarball_url']);
|
| 171 | 171 | $releasesObj->setVar('rel_zipballurl', $ghRelease['zipball_url']);
|
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | } |
| 178 | 178 | } |
| 179 | 179 | $first = false; |
| 180 | - if (false === (bool)$ghRelease['prerelease']) {
|
|
| 180 | + if (false === (bool) $ghRelease['prerelease']) {
|
|
| 181 | 181 | $final = true; |
| 182 | 182 | } |
| 183 | 183 | } |
@@ -215,7 +215,7 @@ discard block |
||
| 215 | 215 | // must return true otherwise releases will not be loaded |
| 216 | 216 | return true; |
| 217 | 217 | } |
| 218 | - $sql = 'DELETE FROM `' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '` WHERE `rel_repoid` = ' . $repoId;
|
|
| 218 | + $sql = 'DELETE FROM `'.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'` WHERE `rel_repoid` = '.$repoId;
|
|
| 219 | 219 | if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
|
| 220 | 220 | return false; |
| 221 | 221 | } |
@@ -224,13 +224,13 @@ discard block |
||
| 224 | 224 | $first = true; |
| 225 | 225 | $final = false; |
| 226 | 226 | foreach ($ghReleases as $ghRelease) {
|
| 227 | - if ($first || (!$final && !(bool)$ghRelease['prerelease'])) {
|
|
| 227 | + if ($first || (!$final && !(bool) $ghRelease['prerelease'])) {
|
|
| 228 | 228 | // save first in any case and save first final version |
| 229 | 229 | $releasesObj = $releasesHandler->create(); |
| 230 | 230 | $releasesObj->setVar('rel_repoid', $repoId);
|
| 231 | 231 | //$releasesObj->setVar('rel_type', $ghRelease['type']);
|
| 232 | 232 | $releasesObj->setVar('rel_name', $ghRelease['name']);
|
| 233 | - $releasesObj->setVar('rel_prerelease', (true == (bool)$ghRelease['prerelease']));
|
|
| 233 | + $releasesObj->setVar('rel_prerelease', (true == (bool) $ghRelease['prerelease']));
|
|
| 234 | 234 | $releasesObj->setVar('rel_publishedat', \strtotime($ghRelease['published_at']));
|
| 235 | 235 | $releasesObj->setVar('rel_tarballurl', $ghRelease['tarball_url']);
|
| 236 | 236 | $releasesObj->setVar('rel_zipballurl', $ghRelease['zipball_url']);
|
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | } |
| 243 | 243 | } |
| 244 | 244 | $first = false; |
| 245 | - if (false === (bool)$ghRelease['prerelease']) {
|
|
| 245 | + if (false === (bool) $ghRelease['prerelease']) {
|
|
| 246 | 246 | $final = true; |
| 247 | 247 | } |
| 248 | 248 | } |
@@ -259,17 +259,17 @@ discard block |
||
| 259 | 259 | public function updateRepoReleases() |
| 260 | 260 | {
|
| 261 | 261 | // update repo_prerelease |
| 262 | - $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . ' INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases');
|
|
| 263 | - $sql .= ' ON ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_id = ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_repoid ';
|
|
| 264 | - $sql .= 'SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_prerelease = 1 ';
|
|
| 265 | - $sql .= 'WHERE (((' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_prerelease)=1));';
|
|
| 262 | + $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').' INNER JOIN '.$GLOBALS['xoopsDB']->prefix('wggithub_releases');
|
|
| 263 | + $sql .= ' ON '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_id = '.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_repoid ';
|
|
| 264 | + $sql .= 'SET '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_prerelease = 1 ';
|
|
| 265 | + $sql .= 'WHERE ((('.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_prerelease)=1));';
|
|
| 266 | 266 | $GLOBALS['xoopsDB']->queryF($sql); |
| 267 | 267 | |
| 268 | 268 | // update repo_release |
| 269 | - $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . ' INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases');
|
|
| 270 | - $sql .= ' ON ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_id = ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_repoid ';
|
|
| 271 | - $sql .= 'SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_release = 1 ';
|
|
| 272 | - $sql .= 'WHERE (((' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_prerelease)=0));';
|
|
| 269 | + $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').' INNER JOIN '.$GLOBALS['xoopsDB']->prefix('wggithub_releases');
|
|
| 270 | + $sql .= ' ON '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_id = '.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_repoid ';
|
|
| 271 | + $sql .= 'SET '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_release = 1 ';
|
|
| 272 | + $sql .= 'WHERE ((('.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_prerelease)=0));';
|
|
| 273 | 273 | $GLOBALS['xoopsDB']->queryF($sql); |
| 274 | 274 | |
| 275 | 275 | return true; |
@@ -37,10 +37,10 @@ discard block |
||
| 37 | 37 | 'license_url' => 'http://www.gnu.org/licenses/gpl-3.0.en.html', |
| 38 | 38 | 'help' => 'page=help', |
| 39 | 39 | 'release_info' => 'release_info', |
| 40 | - 'release_file' => \XOOPS_URL . '/modules/wggithub/docs/release_info file', |
|
| 40 | + 'release_file' => \XOOPS_URL.'/modules/wggithub/docs/release_info file', |
|
| 41 | 41 | 'release_date' => '2021/01/13', |
| 42 | 42 | 'manual' => 'link to manual file', |
| 43 | - 'manual_file' => \XOOPS_URL . '/modules/wggithub/docs/install.txt', |
|
| 43 | + 'manual_file' => \XOOPS_URL.'/modules/wggithub/docs/install.txt', |
|
| 44 | 44 | 'min_php' => '7.2', |
| 45 | 45 | 'min_xoops' => '2.5.11', |
| 46 | 46 | 'min_admin' => '1.2', |
@@ -279,8 +279,8 @@ discard block |
||
| 279 | 279 | // Make Sample button visible? |
| 280 | 280 | $modversion['config'][] = [ |
| 281 | 281 | 'name' => 'displaySampleButton', |
| 282 | - 'title' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON', |
|
| 283 | - 'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC', |
|
| 282 | + 'title' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON', |
|
| 283 | + 'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC', |
|
| 284 | 284 | 'formtype' => 'yesno', |
| 285 | 285 | 'valuetype' => 'int', |
| 286 | 286 | 'default' => 1, |
@@ -27,13 +27,13 @@ |
||
| 27 | 27 | switch (mb_substr($val, -1)) {
|
| 28 | 28 | case 'K': |
| 29 | 29 | case 'k': |
| 30 | - return (int)$val * 1024; |
|
| 30 | + return (int) $val * 1024; |
|
| 31 | 31 | case 'M': |
| 32 | 32 | case 'm': |
| 33 | - return (int)$val * 1048576; |
|
| 33 | + return (int) $val * 1048576; |
|
| 34 | 34 | case 'G': |
| 35 | 35 | case 'g': |
| 36 | - return (int)$val * 1073741824; |
|
| 36 | + return (int) $val * 1073741824; |
|
| 37 | 37 | default: |
| 38 | 38 | return $val; |
| 39 | 39 | } |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | |
| 134 | 134 | case 'none': |
| 135 | 135 | if($topic_name) {
|
| 136 | - $topic_name = 'topic=' . $topic_name . '&'; |
|
| 136 | + $topic_name = 'topic=' . $topic_name . '&'; |
|
| 137 | 137 | } |
| 138 | 138 | $rewrite_base = '/modules/'; |
| 139 | 139 | $page = 'page=' . $array['content_alias']; |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $id . $page . $rewrite_ext; |
| 164 | 164 | break; |
| 165 | 165 | |
| 166 | - case 'short': |
|
| 166 | + case 'short': |
|
| 167 | 167 | if($topic_name) {
|
| 168 | 168 | $topic_name .= '/'; |
| 169 | 169 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | $cat_sql .= current($cats); |
| 34 | 34 | array_shift($cats); |
| 35 | 35 | foreach ($cats as $cat) {
|
| 36 | - $cat_sql .= ',' . $cat; |
|
| 36 | + $cat_sql .= ','.$cat; |
|
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | $cat_sql .= ')'; |
@@ -72,9 +72,9 @@ discard block |
||
| 72 | 72 | {
|
| 73 | 73 | global $xoopsTpl, $xoTheme; |
| 74 | 74 | $myts = MyTextSanitizer::getInstance(); |
| 75 | - $content= $myts->undoHtmlSpecialChars($myts->displayTarea($content)); |
|
| 76 | - if(isset($xoTheme) && \is_object($xoTheme)) {
|
|
| 77 | - $xoTheme->addMeta( 'meta', 'keywords', \strip_tags($content)); |
|
| 75 | + $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content)); |
|
| 76 | + if (isset($xoTheme) && \is_object($xoTheme)) {
|
|
| 77 | + $xoTheme->addMeta('meta', 'keywords', \strip_tags($content));
|
|
| 78 | 78 | } else { // Compatibility for old Xoops versions
|
| 79 | 79 | $xoopsTpl->assign('xoops_meta_keywords', \strip_tags($content));
|
| 80 | 80 | } |
@@ -91,8 +91,8 @@ discard block |
||
| 91 | 91 | global $xoopsTpl, $xoTheme; |
| 92 | 92 | $myts = MyTextSanitizer::getInstance(); |
| 93 | 93 | $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content)); |
| 94 | - if(isset($xoTheme) && \is_object($xoTheme)) {
|
|
| 95 | - $xoTheme->addMeta( 'meta', 'description', \strip_tags($content)); |
|
| 94 | + if (isset($xoTheme) && \is_object($xoTheme)) {
|
|
| 95 | + $xoTheme->addMeta('meta', 'description', \strip_tags($content));
|
|
| 96 | 96 | } else { // Compatibility for old Xoops versions
|
| 97 | 97 | $xoopsTpl->assign('xoops_meta_description', \strip_tags($content));
|
| 98 | 98 | } |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | if (0 != $lenght_id) {
|
| 118 | 118 | $id = $array['content_id']; |
| 119 | 119 | while (\strlen($id) < $lenght_id) {
|
| 120 | - $id = '0' . $id; |
|
| 120 | + $id = '0'.$id; |
|
| 121 | 121 | } |
| 122 | 122 | } else {
|
| 123 | 123 | $id = $array['content_id']; |
@@ -132,23 +132,23 @@ discard block |
||
| 132 | 132 | switch ($rewrite_url) {
|
| 133 | 133 | |
| 134 | 134 | case 'none': |
| 135 | - if($topic_name) {
|
|
| 136 | - $topic_name = 'topic=' . $topic_name . '&'; |
|
| 135 | + if ($topic_name) {
|
|
| 136 | + $topic_name = 'topic='.$topic_name.'&'; |
|
| 137 | 137 | } |
| 138 | 138 | $rewrite_base = '/modules/'; |
| 139 | - $page = 'page=' . $array['content_alias']; |
|
| 140 | - return \XOOPS_URL . $rewrite_base . $module . '/' . $type . '.php?' . $topic_name . 'id=' . $id . '&' . $page . $comment; |
|
| 139 | + $page = 'page='.$array['content_alias']; |
|
| 140 | + return \XOOPS_URL.$rewrite_base.$module.'/'.$type.'.php?'.$topic_name.'id='.$id.'&'.$page.$comment; |
|
| 141 | 141 | break; |
| 142 | 142 | |
| 143 | 143 | case 'rewrite': |
| 144 | - if($topic_name) {
|
|
| 144 | + if ($topic_name) {
|
|
| 145 | 145 | $topic_name .= '/'; |
| 146 | 146 | } |
| 147 | 147 | $rewrite_base = xoops_getModuleOption('rewrite_mode', $module);
|
| 148 | 148 | $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module);
|
| 149 | 149 | $module_name = ''; |
| 150 | - if(xoops_getModuleOption('rewrite_name', $module)) {
|
|
| 151 | - $module_name = xoops_getModuleOption('rewrite_name', $module) . '/';
|
|
| 150 | + if (xoops_getModuleOption('rewrite_name', $module)) {
|
|
| 151 | + $module_name = xoops_getModuleOption('rewrite_name', $module).'/';
|
|
| 152 | 152 | } |
| 153 | 153 | $page = $array['content_alias']; |
| 154 | 154 | $type .= '/'; |
@@ -157,21 +157,21 @@ discard block |
||
| 157 | 157 | $type = ''; |
| 158 | 158 | } |
| 159 | 159 | if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) {
|
| 160 | - return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/'; |
|
| 160 | + return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/'; |
|
| 161 | 161 | } |
| 162 | 162 | |
| 163 | - return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $id . $page . $rewrite_ext; |
|
| 163 | + return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$id.$page.$rewrite_ext; |
|
| 164 | 164 | break; |
| 165 | 165 | |
| 166 | 166 | case 'short': |
| 167 | - if($topic_name) {
|
|
| 167 | + if ($topic_name) {
|
|
| 168 | 168 | $topic_name .= '/'; |
| 169 | 169 | } |
| 170 | 170 | $rewrite_base = xoops_getModuleOption('rewrite_mode', $module);
|
| 171 | 171 | $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module);
|
| 172 | 172 | $module_name = ''; |
| 173 | - if(xoops_getModuleOption('rewrite_name', $module)) {
|
|
| 174 | - $module_name = xoops_getModuleOption('rewrite_name', $module) . '/';
|
|
| 173 | + if (xoops_getModuleOption('rewrite_name', $module)) {
|
|
| 174 | + $module_name = xoops_getModuleOption('rewrite_name', $module).'/';
|
|
| 175 | 175 | } |
| 176 | 176 | $page = $array['content_alias']; |
| 177 | 177 | $type .= '/'; |
@@ -179,10 +179,10 @@ discard block |
||
| 179 | 179 | $type = ''; |
| 180 | 180 | } |
| 181 | 181 | if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) {
|
| 182 | - return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/'; |
|
| 182 | + return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/'; |
|
| 183 | 183 | } |
| 184 | 184 | |
| 185 | - return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $page . $rewrite_ext; |
|
| 185 | + return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$page.$rewrite_ext; |
|
| 186 | 186 | break; |
| 187 | 187 | } |
| 188 | 188 | return null; |
@@ -207,6 +207,6 @@ discard block |
||
| 207 | 207 | $url .= htmlentities($url, ENT_COMPAT, 'utf-8'); |
| 208 | 208 | $url .= \preg_replace('`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i', "\1", $url);
|
| 209 | 209 | $url .= \preg_replace(array($regular_expression, '`[-]+`'), '-', $url); |
| 210 | - $url = ($url == '') ? $type : strtolower( rim($url, '-')); |
|
| 210 | + $url = ($url == '') ? $type : strtolower(rim($url, '-')); |
|
| 211 | 211 | return $url; |
| 212 | 212 | } |
| 213 | 213 | \ No newline at end of file |
@@ -20,29 +20,29 @@ |
||
| 20 | 20 | * @author Goffy - XOOPS Development Team - Email:<[email protected]> - Website:<https://wedega.com> |
| 21 | 21 | */ |
| 22 | 22 | if (!\defined('XOOPS_ICONS32_PATH')) {
|
| 23 | - \define('XOOPS_ICONS32_PATH', \XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32');
|
|
| 23 | + \define('XOOPS_ICONS32_PATH', \XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/icons/32');
|
|
| 24 | 24 | } |
| 25 | 25 | if (!\defined('XOOPS_ICONS32_URL')) {
|
| 26 | - \define('XOOPS_ICONS32_URL', \XOOPS_URL . '/Frameworks/moduleclasses/icons/32');
|
|
| 26 | + \define('XOOPS_ICONS32_URL', \XOOPS_URL.'/Frameworks/moduleclasses/icons/32');
|
|
| 27 | 27 | } |
| 28 | 28 | \define('WGGITHUB_DIRNAME', 'wggithub');
|
| 29 | -\define('WGGITHUB_PATH', \XOOPS_ROOT_PATH . '/modules/' . WGGITHUB_DIRNAME);
|
|
| 30 | -\define('WGGITHUB_URL', \XOOPS_URL . '/modules/' . WGGITHUB_DIRNAME);
|
|
| 31 | -\define('WGGITHUB_ICONS_PATH', WGGITHUB_PATH . '/assets/icons');
|
|
| 32 | -\define('WGGITHUB_ICONS_URL', WGGITHUB_URL . '/assets/icons');
|
|
| 33 | -\define('WGGITHUB_IMAGE_PATH', WGGITHUB_PATH . '/assets/images');
|
|
| 34 | -\define('WGGITHUB_IMAGE_URL', WGGITHUB_URL . '/assets/images');
|
|
| 35 | -\define('WGGITHUB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . WGGITHUB_DIRNAME);
|
|
| 36 | -\define('WGGITHUB_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . WGGITHUB_DIRNAME);
|
|
| 37 | -\define('WGGITHUB_UPLOAD_FILES_PATH', WGGITHUB_UPLOAD_PATH . '/files');
|
|
| 38 | -\define('WGGITHUB_UPLOAD_FILES_URL', WGGITHUB_UPLOAD_URL . '/files');
|
|
| 39 | -\define('WGGITHUB_UPLOAD_IMAGE_PATH', WGGITHUB_UPLOAD_PATH . '/images');
|
|
| 40 | -\define('WGGITHUB_UPLOAD_IMAGE_URL', WGGITHUB_UPLOAD_URL . '/images');
|
|
| 41 | -\define('WGGITHUB_UPLOAD_SHOTS_PATH', WGGITHUB_UPLOAD_PATH . '/images/shots');
|
|
| 42 | -\define('WGGITHUB_UPLOAD_SHOTS_URL', WGGITHUB_UPLOAD_URL . '/images/shots');
|
|
| 43 | -\define('WGGITHUB_ADMIN', WGGITHUB_URL . '/admin/index.php');
|
|
| 44 | -$localLogo = WGGITHUB_IMAGE_URL . '/tdmxoops_logo.png'; |
|
| 29 | +\define('WGGITHUB_PATH', \XOOPS_ROOT_PATH.'/modules/'.WGGITHUB_DIRNAME);
|
|
| 30 | +\define('WGGITHUB_URL', \XOOPS_URL.'/modules/'.WGGITHUB_DIRNAME);
|
|
| 31 | +\define('WGGITHUB_ICONS_PATH', WGGITHUB_PATH.'/assets/icons');
|
|
| 32 | +\define('WGGITHUB_ICONS_URL', WGGITHUB_URL.'/assets/icons');
|
|
| 33 | +\define('WGGITHUB_IMAGE_PATH', WGGITHUB_PATH.'/assets/images');
|
|
| 34 | +\define('WGGITHUB_IMAGE_URL', WGGITHUB_URL.'/assets/images');
|
|
| 35 | +\define('WGGITHUB_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.WGGITHUB_DIRNAME);
|
|
| 36 | +\define('WGGITHUB_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.WGGITHUB_DIRNAME);
|
|
| 37 | +\define('WGGITHUB_UPLOAD_FILES_PATH', WGGITHUB_UPLOAD_PATH.'/files');
|
|
| 38 | +\define('WGGITHUB_UPLOAD_FILES_URL', WGGITHUB_UPLOAD_URL.'/files');
|
|
| 39 | +\define('WGGITHUB_UPLOAD_IMAGE_PATH', WGGITHUB_UPLOAD_PATH.'/images');
|
|
| 40 | +\define('WGGITHUB_UPLOAD_IMAGE_URL', WGGITHUB_UPLOAD_URL.'/images');
|
|
| 41 | +\define('WGGITHUB_UPLOAD_SHOTS_PATH', WGGITHUB_UPLOAD_PATH.'/images/shots');
|
|
| 42 | +\define('WGGITHUB_UPLOAD_SHOTS_URL', WGGITHUB_UPLOAD_URL.'/images/shots');
|
|
| 43 | +\define('WGGITHUB_ADMIN', WGGITHUB_URL.'/admin/index.php');
|
|
| 44 | +$localLogo = WGGITHUB_IMAGE_URL.'/tdmxoops_logo.png'; |
|
| 45 | 45 | // Module Information |
| 46 | -$copyright = "<a href='https://wedega.com' title='XOOPS on Wedega' target='_blank'><img src='" . $localLogo . "' alt='XOOPS on Wedega' /></a>"; |
|
| 47 | -include_once \XOOPS_ROOT_PATH . '/class/xoopsrequest.php'; |
|
| 48 | -include_once WGGITHUB_PATH . '/include/functions.php'; |
|
| 46 | +$copyright = "<a href='https://wedega.com' title='XOOPS on Wedega' target='_blank'><img src='".$localLogo."' alt='XOOPS on Wedega' /></a>"; |
|
| 47 | +include_once \XOOPS_ROOT_PATH.'/class/xoopsrequest.php'; |
|
| 48 | +include_once WGGITHUB_PATH.'/include/functions.php'; |
|
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | */ |
| 30 | 30 | function xoops_module_pre_install_wggithub(\XoopsModule $module) |
| 31 | 31 | {
|
| 32 | - require \dirname(__DIR__) . '/preloads/autoloader.php'; |
|
| 32 | + require \dirname(__DIR__).'/preloads/autoloader.php'; |
|
| 33 | 33 | |
| 34 | 34 | $utility = new Wggithub\Utility(); |
| 35 | 35 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | if ($xoopsSuccess && $phpSuccess) {
|
| 43 | 43 | $moduleTables = &$module->getInfo('tables');
|
| 44 | 44 | foreach ($moduleTables as $table) {
|
| 45 | - $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
|
|
| 45 | + $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
|
|
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | */ |
| 56 | 56 | function xoops_module_install_wggithub(\XoopsModule $module) |
| 57 | 57 | {
|
| 58 | - require \dirname(__DIR__) . '/preloads/autoloader.php'; |
|
| 58 | + require \dirname(__DIR__).'/preloads/autoloader.php'; |
|
| 59 | 59 | |
| 60 | 60 | /** @var Wggithub\Helper $helper */ |
| 61 | 61 | /** @var Wggithub\Utility $utility */ |
@@ -80,14 +80,14 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | // --- COPY blank.gif FILES --------------- |
| 82 | 82 | if ($configurator->copyBlankFiles && \is_array($configurator->copyBlankFiles)) {
|
| 83 | - $file = \dirname(__DIR__) . '/assets/images/blank.gif'; |
|
| 83 | + $file = \dirname(__DIR__).'/assets/images/blank.gif'; |
|
| 84 | 84 | foreach (\array_keys($configurator->copyBlankFiles) as $i) {
|
| 85 | - $dest = $configurator->copyBlankFiles[$i] . '/blank.gif'; |
|
| 85 | + $dest = $configurator->copyBlankFiles[$i].'/blank.gif'; |
|
| 86 | 86 | $utility::copyFile($file, $dest); |
| 87 | 87 | } |
| 88 | - $file = \dirname(__DIR__) . '/assets/images/blank.png'; |
|
| 88 | + $file = \dirname(__DIR__).'/assets/images/blank.png'; |
|
| 89 | 89 | foreach (\array_keys($configurator->copyBlankFiles) as $i) {
|
| 90 | - $dest = $configurator->copyBlankFiles[$i] . '/blank.png'; |
|
| 90 | + $dest = $configurator->copyBlankFiles[$i].'/blank.png'; |
|
| 91 | 91 | $utility::copyFile($file, $dest); |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | if ($dirInfo->isDir()) {
|
| 53 | 53 | // The directory exists so delete it |
| 54 | 54 | if (!$utility::rrmdir($old_dir)) {
|
| 55 | - $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
|
|
| 55 | + $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $old_dir));
|
|
| 56 | 56 | $success = false; |
| 57 | 57 | } |
| 58 | 58 | } |