@@ -63,7 +63,7 @@ |
||
63 | 63 | { |
64 | 64 | if (preg_match('/^asc$/i', $direction)) { |
65 | 65 | return self::ASC; |
66 | - } else { |
|
66 | + }else { |
|
67 | 67 | return self::DESC; |
68 | 68 | } |
69 | 69 | } |
@@ -61,8 +61,8 @@ discard block |
||
61 | 61 | */ |
62 | 62 | public function init() |
63 | 63 | { |
64 | - list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', $this->cacheType, TRUE); |
|
65 | - $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->cacheType, TRUE); |
|
64 | + list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', $this->cacheType, TRUE); |
|
65 | + $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->cacheType, TRUE); |
|
66 | 66 | if (empty($this->routing) || Config::getParam('debug', true)) { |
67 | 67 | $this->debugLoad(); |
68 | 68 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $this->hydrateRouting(); |
84 | 84 | $this->simpatize(); |
85 | 85 | Logger::log('End routes load'); |
86 | - } else { |
|
86 | + }else { |
|
87 | 87 | Logger::log('Routes generation skipped'); |
88 | 88 | } |
89 | 89 | } |
@@ -100,13 +100,13 @@ discard block |
||
100 | 100 | try { |
101 | 101 | //Search action and execute |
102 | 102 | return $this->searchAction($route); |
103 | - } catch (AccessDeniedException $e) { |
|
104 | - Logger::log(t('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile() . '[' . $e->getLine() . ']']); |
|
103 | + }catch (AccessDeniedException $e) { |
|
104 | + Logger::log(t('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile().'['.$e->getLine().']']); |
|
105 | 105 | return Admin::staticAdminLogon(); |
106 | - } catch (RouterException $r) { |
|
106 | + }catch (RouterException $r) { |
|
107 | 107 | Logger::log($r->getMessage(), LOG_WARNING); |
108 | 108 | $code = $r->getCode(); |
109 | - } catch (Exception $e) { |
|
109 | + }catch (Exception $e) { |
|
110 | 110 | Logger::log($e->getMessage(), LOG_ERR); |
111 | 111 | throw $e; |
112 | 112 | } |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | */ |
125 | 125 | protected function searchAction($route) |
126 | 126 | { |
127 | - Inspector::stats('[Router] Searching action to execute: ' . $route, Inspector::SCOPE_DEBUG); |
|
127 | + Inspector::stats('[Router] Searching action to execute: '.$route, Inspector::SCOPE_DEBUG); |
|
128 | 128 | //Revisamos si tenemos la ruta registrada |
129 | 129 | $parts = parse_url($route); |
130 | 130 | $path = array_key_exists('path', $parts) ? $parts['path'] : $route; |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | } |
145 | 145 | |
146 | 146 | throw new RouterException(t('Preconditions failed'), 412); |
147 | - } catch (Exception $e) { |
|
147 | + }catch (Exception $e) { |
|
148 | 148 | Logger::log($e->getMessage(), LOG_ERR); |
149 | 149 | throw $e; |
150 | 150 | } |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | } |
170 | 170 | } |
171 | 171 | $valid = count($action['requirements']) === $checked; |
172 | - } else { |
|
172 | + }else { |
|
173 | 173 | $valid = true; |
174 | 174 | } |
175 | 175 | return $valid; |
@@ -192,11 +192,11 @@ discard block |
||
192 | 192 | if ($modules->hasResults()) { |
193 | 193 | foreach ($modules->getIterator() as $modulePath) { |
194 | 194 | $module = $modulePath->getBasename(); |
195 | - $this->routing = $this->inspectDir($modulesPath . DIRECTORY_SEPARATOR . $module, $module, $this->routing); |
|
195 | + $this->routing = $this->inspectDir($modulesPath.DIRECTORY_SEPARATOR.$module, $module, $this->routing); |
|
196 | 196 | } |
197 | 197 | } |
198 | 198 | } |
199 | - $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->domains, Cache::JSON, TRUE); |
|
199 | + $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->domains, Cache::JSON, TRUE); |
|
200 | 200 | } |
201 | 201 | |
202 | 202 | /** |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | $homeParams = NULL; |
214 | 214 | foreach ($this->routing as $pattern => $params) { |
215 | 215 | list($method, $route) = RouterHelper::extractHttpRoute($pattern); |
216 | - if (preg_match('/' . preg_quote($route, '/') . '$/i', '/' . $home)) { |
|
216 | + if (preg_match('/'.preg_quote($route, '/').'$/i', '/'.$home)) { |
|
217 | 217 | $homeParams = $params; |
218 | 218 | } |
219 | 219 | unset($method); |
@@ -245,18 +245,18 @@ discard block |
||
245 | 245 | { |
246 | 246 | $baseUrl = $absolute ? Request::getInstance()->getRootUrl() : ''; |
247 | 247 | if ('' === $slug) { |
248 | - return $baseUrl . '/'; |
|
248 | + return $baseUrl.'/'; |
|
249 | 249 | } |
250 | 250 | if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) { |
251 | 251 | throw new RouterException(t('No existe la ruta especificada')); |
252 | 252 | } |
253 | - $url = $baseUrl . $this->slugs[$slug]; |
|
253 | + $url = $baseUrl.$this->slugs[$slug]; |
|
254 | 254 | if (!empty($params)) { |
255 | 255 | foreach ($params as $key => $value) { |
256 | - $url = str_replace('{' . $key . '}', $value, $url); |
|
256 | + $url = str_replace('{'.$key.'}', $value, $url); |
|
257 | 257 | } |
258 | 258 | } elseif (!empty($this->routing[$this->slugs[$slug]]['default'])) { |
259 | - $url = $baseUrl . $this->routing[$this->slugs[$slug]]['default']; |
|
259 | + $url = $baseUrl.$this->routing[$this->slugs[$slug]]['default']; |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | return preg_replace('/(GET|POST|PUT|DELETE|ALL|HEAD|PATCH)\#\|\#/', '', $url); |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | */ |
269 | 269 | private function checkPreActions($class, $method) |
270 | 270 | { |
271 | - $preAction = 'pre' . ucfirst($method); |
|
271 | + $preAction = 'pre'.ucfirst($method); |
|
272 | 272 | if (method_exists($class, $preAction)) { |
273 | 273 | Inspector::stats('[Router] Pre action invoked', Inspector::SCOPE_DEBUG); |
274 | 274 | try { |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | Logger::log(t('Pre action failed'), LOG_ERR, [error_get_last()]); |
277 | 277 | error_clear_last(); |
278 | 278 | } |
279 | - } catch (Exception $e) { |
|
279 | + }catch (Exception $e) { |
|
280 | 280 | Logger::log($e->getMessage(), LOG_ERR, [$class, $method]); |
281 | 281 | } |
282 | 282 | } |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | */ |
294 | 294 | protected function executeCachedRoute($route, $action, $class, $params = NULL) |
295 | 295 | { |
296 | - Inspector::stats('[Router] Executing route ' . $route, Inspector::SCOPE_DEBUG); |
|
296 | + Inspector::stats('[Router] Executing route '.$route, Inspector::SCOPE_DEBUG); |
|
297 | 297 | $action['params'] = array_merge($action['params'], $params, Request::getInstance()->getQueryParams()); |
298 | 298 | Security::getInstance()->setSessionKey(Cache::CACHE_SESSION_VAR, $action); |
299 | 299 | $cache = Cache::needCache(); |
@@ -301,15 +301,15 @@ discard block |
||
301 | 301 | $return = null; |
302 | 302 | if (FALSE !== $cache && $action['http'] === 'GET' && Config::getParam('debug') === FALSE) { |
303 | 303 | list($path, $cacheDataName) = $this->cache->getRequestCacheHash(); |
304 | - $cachedData = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $cache); |
|
304 | + $cachedData = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $cache); |
|
305 | 305 | if (NULL !== $cachedData) { |
306 | - $headers = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', $cache, null, Cache::JSON); |
|
306 | + $headers = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', $cache, null, Cache::JSON); |
|
307 | 307 | Template::getInstance()->renderCache($cachedData, $headers); |
308 | 308 | $execute = FALSE; |
309 | 309 | } |
310 | 310 | } |
311 | 311 | if ($execute) { |
312 | - Inspector::stats('[Router] Start executing action ' . $route, Inspector::SCOPE_DEBUG); |
|
312 | + Inspector::stats('[Router] Start executing action '.$route, Inspector::SCOPE_DEBUG); |
|
313 | 313 | $this->checkPreActions($class, $action['method']); |
314 | 314 | $return = call_user_func_array([$class, $action['method']], $params); |
315 | 315 | if (false === $return) { |
@@ -79,18 +79,18 @@ |
||
79 | 79 | if (!Request::getInstance()->isFile()) { |
80 | 80 | return $this->router->execute($uri ?: $this->actualUri); |
81 | 81 | } |
82 | - } else { |
|
82 | + }else { |
|
83 | 83 | return ConfigController::getInstance()->config(); |
84 | 84 | } |
85 | - } catch (AdminCredentialsException $a) { |
|
85 | + }catch (AdminCredentialsException $a) { |
|
86 | 86 | return UserController::showAdminManager(); |
87 | - } catch (SecurityException $s) { |
|
87 | + }catch (SecurityException $s) { |
|
88 | 88 | return $this->security->notAuthorized($this->actualUri); |
89 | - } catch (RouterException $r) { |
|
89 | + }catch (RouterException $r) { |
|
90 | 90 | return $this->router->httpNotFound($r); |
91 | - } catch (ApiException $a) { |
|
91 | + }catch (ApiException $a) { |
|
92 | 92 | return $this->router->httpNotFound($a, true); |
93 | - } catch (\Exception $e) { |
|
93 | + }catch (\Exception $e) { |
|
94 | 94 | return $this->dumpException($e); |
95 | 95 | } |
96 | 96 | } |