@@ -27,7 +27,7 @@ |
||
27 | 27 | */ |
28 | 28 | public static function dropServerValue(string $key): void |
29 | 29 | { |
30 | - if(array_key_exists($key, $_SERVER)) { |
|
30 | + if (array_key_exists($key, $_SERVER)) { |
|
31 | 31 | unset($_SERVER[$key]); |
32 | 32 | } |
33 | 33 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | $use /= 1024; |
41 | 41 | break; |
42 | 42 | case "MBytes": |
43 | - $use /= (1024 * 1024); |
|
43 | + $use /= (1024*1024); |
|
44 | 44 | break; |
45 | 45 | case "Bytes": |
46 | 46 | default: |
@@ -70,12 +70,12 @@ discard block |
||
70 | 70 | ini_set('display_errors', 1); |
71 | 71 | } |
72 | 72 | //Warning & Notice handler |
73 | - set_error_handler(function ($errno, $errstr, $errfile, $errline) { |
|
73 | + set_error_handler(function($errno, $errstr, $errfile, $errline) { |
|
74 | 74 | Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]); |
75 | 75 | return true; |
76 | 76 | }, E_ALL | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR); |
77 | 77 | |
78 | - register_shutdown_function(function () { |
|
78 | + register_shutdown_function(function() { |
|
79 | 79 | $error = error_get_last() or json_last_error() or preg_last_error() or \DateTime::getLastErrors(); |
80 | 80 | if ($error !== NULL) { |
81 | 81 | $errno = $error["type"]; |
@@ -90,8 +90,8 @@ discard block |
||
90 | 90 | |
91 | 91 | if (self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) { |
92 | 92 | SlackHelper::getInstance()->trace('Slow service endpoint', '', '', [ |
93 | - 'time' => round(self::getTs(), 3) . ' secs', |
|
94 | - 'memory' => round(self::getMem('MBytes'), 3) . ' Mb', |
|
93 | + 'time' => round(self::getTs(), 3).' secs', |
|
94 | + 'memory' => round(self::getMem('MBytes'), 3).' Mb', |
|
95 | 95 | ]); |
96 | 96 | } |
97 | 97 | return false; |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | Inspector::stats('[SystemTrait] Initializing stats (mem + ts)'); |
107 | 107 | if (ServerHelper::hasServerValue('REQUEST_TIME_FLOAT')) { |
108 | 108 | $this->ts = (float)ServerHelper::getServerValue('REQUEST_TIME_FLOAT'); |
109 | - } else { |
|
109 | + }else { |
|
110 | 110 | $this->ts = PSFS_START_TS; |
111 | 111 | } |
112 | 112 | $this->mem = PSFS_START_MEM; |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | */ |
98 | 98 | protected function init() |
99 | 99 | { |
100 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) { |
|
100 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) { |
|
101 | 101 | $this->loadConfigData(); |
102 | 102 | } |
103 | 103 | return $this; |
@@ -212,13 +212,13 @@ discard block |
||
212 | 212 | $finalData = self::saveExtraParams($data); |
213 | 213 | $saved = false; |
214 | 214 | try { |
215 | - $finalData = array_filter($finalData, function ($key, $value) { |
|
215 | + $finalData = array_filter($finalData, function($key, $value) { |
|
216 | 216 | return in_array($key, self::$required, true) || !empty($value); |
217 | 217 | }, ARRAY_FILTER_USE_BOTH); |
218 | - $saved = (false !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, json_encode($finalData, JSON_PRETTY_PRINT))); |
|
218 | + $saved = (false !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, json_encode($finalData, JSON_PRETTY_PRINT))); |
|
219 | 219 | self::getInstance()->loadConfigData(); |
220 | 220 | $saved = true; |
221 | - } catch (ConfigException $e) { |
|
221 | + }catch (ConfigException $e) { |
|
222 | 222 | Logger::log($e->getMessage(), LOG_ERR); |
223 | 223 | } |
224 | 224 | return $saved; |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | */ |
251 | 251 | public function loadConfigData(): void |
252 | 252 | { |
253 | - $this->config = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE), true) ?: []; |
|
253 | + $this->config = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE), true) ?: []; |
|
254 | 254 | $this->debug = array_key_exists('debug', $this->config) ? (bool)$this->config['debug'] : FALSE; |
255 | 255 | if (array_key_exists('cache.var', $this->config)) { |
256 | 256 | Security::getInstance()->setSessionKey('config.cache.var', $this->config['cache.var']); |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | public static function getParam($key, $defaultValue = null, $module = null) |
276 | 276 | { |
277 | 277 | if (null !== $module) { |
278 | - return self::getParam(strtolower($module) . '.' . $key, self::getParam($key, $defaultValue)); |
|
278 | + return self::getParam(strtolower($module).'.'.$key, self::getParam($key, $defaultValue)); |
|
279 | 279 | } |
280 | 280 | $param = self::getInstance()->get($key); |
281 | 281 | return (null !== $param) ? $param : $defaultValue; |
@@ -291,8 +291,8 @@ discard block |
||
291 | 291 | { |
292 | 292 | $done = true; |
293 | 293 | foreach (self::$cleanable_config_files as $configFile) { |
294 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . $configFile)) { |
|
295 | - if (!unlink(CONFIG_DIR . DIRECTORY_SEPARATOR . $configFile)) { |
|
294 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.$configFile)) { |
|
295 | + if (!unlink(CONFIG_DIR.DIRECTORY_SEPARATOR.$configFile)) { |
|
296 | 296 | $done = false; |
297 | 297 | } |
298 | 298 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | public static function setHeader(string $header): void { |
23 | 23 | list($key, $value) = explode(':', $header); |
24 | 24 | if (!in_array($key, self::$headers_sent)) { |
25 | - if(!self::isTest()) { |
|
25 | + if (!self::isTest()) { |
|
26 | 26 | header($header); |
27 | 27 | } |
28 | 28 | self::$headers_sent[$key] = $value; |
@@ -94,9 +94,9 @@ discard block |
||
94 | 94 | Logger::log('Adding debug headers to render response'); |
95 | 95 | $vars["__DEBUG__"]["includes"] = get_included_files(); |
96 | 96 | $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
97 | - self::setHeader('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s'); |
|
98 | - self::setHeader('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes'); |
|
99 | - self::setHeader('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened'); |
|
97 | + self::setHeader('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s'); |
|
98 | + self::setHeader('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes'); |
|
99 | + self::setHeader('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened'); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | return $vars; |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | * @return int|string |
109 | 109 | * @throws GeneratorException |
110 | 110 | */ |
111 | - public static function httpNotFound(Exception $exception = NULL, bool $isJson = false): int|string |
|
111 | + public static function httpNotFound(Exception $exception = NULL, bool $isJson = false): int | string |
|
112 | 112 | { |
113 | 113 | if (self::isTest()) { |
114 | 114 | return 404; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | $notFoundRoute = Config::getParam('route.404'); |
128 | 128 | if (null !== $notFoundRoute) { |
129 | 129 | Request::getInstance()->redirect(Router::getInstance()->getRoute($notFoundRoute, true)); |
130 | - } else { |
|
130 | + }else { |
|
131 | 131 | return $template->render('error.html.twig', array( |
132 | 132 | 'exception' => $exception, |
133 | 133 | 'trace' => $exception->getTraceAsString(), |
@@ -12,10 +12,10 @@ |
||
12 | 12 | { |
13 | 13 | $uri = Request::requestUri(); |
14 | 14 | Security::getInstance()->setSessionKey('lastRequest', array( |
15 | - 'url' => Request::getInstance()->getRootUrl() . $uri, |
|
15 | + 'url' => Request::getInstance()->getRootUrl().$uri, |
|
16 | 16 | 'ts' => microtime(true), |
17 | 17 | 'eta' => microtime(true) - PSFS_START_TS, |
18 | - 'mem' => memory_get_usage() / 1024 / 1024, |
|
18 | + 'mem' => memory_get_usage()/1024/1024, |
|
19 | 19 | )); |
20 | 20 | Security::getInstance()->updateSession(); |
21 | 21 | return EventInterface::EVENT_SUCCESS; |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | { |
37 | 37 | $platform = trim(Config::getInstance()->get('platform.name', 'PSFS')); |
38 | 38 | ResponseHelper::setHeader('HTTP/1.1 401 Unauthorized'); |
39 | - ResponseHelper::setHeader('WWW-Authenticate: Basic Realm="' . $platform . '"'); |
|
39 | + ResponseHelper::setHeader('WWW-Authenticate: Basic Realm="'.$platform.'"'); |
|
40 | 40 | echo t('Zona restringida'); |
41 | 41 | exit(); |
42 | 42 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | $admin['class'] = 'primary'; |
79 | 79 | break; |
80 | 80 | } |
81 | - } else { |
|
81 | + }else { |
|
82 | 82 | $admin['class'] = 'primary'; |
83 | 83 | } |
84 | 84 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | $this->setStatusCode(Template::STATUS_OK); |
128 | 128 | break; |
129 | 129 | default: |
130 | - $this->setStatusCode('HTTP/1.0 ' . ($status ?: 200)); |
|
130 | + $this->setStatusCode('HTTP/1.0 '.($status ?: 200)); |
|
131 | 131 | break; |
132 | 132 | } |
133 | 133 | return $this; |
@@ -140,11 +140,11 @@ discard block |
||
140 | 140 | */ |
141 | 141 | private function setResponseHeaders($contentType = 'text/html', array $cookies = array()): void |
142 | 142 | { |
143 | - ResponseHelper::setHeader('X-Powered-By: ' . Config::getParam('poweredBy', 'PSFS')); |
|
143 | + ResponseHelper::setHeader('X-Powered-By: '.Config::getParam('poweredBy', 'PSFS')); |
|
144 | 144 | ResponseHelper::setStatusHeader($this->getStatusCode()); |
145 | 145 | ResponseHelper::setAuthHeaders($this->isPublicZone()); |
146 | 146 | ResponseHelper::setCookieHeaders($cookies); |
147 | - ResponseHelper::setHeader('Content-type: ' . $contentType); |
|
147 | + ResponseHelper::setHeader('Content-type: '.$contentType); |
|
148 | 148 | |
149 | 149 | } |
150 | 150 | |
@@ -162,16 +162,16 @@ discard block |
||
162 | 162 | Logger::log('Start output response'); |
163 | 163 | ob_start(); |
164 | 164 | $this->setResponseHeaders($contentType, $cookies); |
165 | - ResponseHelper::setHeader('Content-length: ' . strlen($output)); |
|
166 | - ResponseHelper::setHeader('CRC: ' . crc32($output)); |
|
165 | + ResponseHelper::setHeader('Content-length: '.strlen($output)); |
|
166 | + ResponseHelper::setHeader('CRC: '.crc32($output)); |
|
167 | 167 | |
168 | 168 | $needCache = Cache::needCache(); |
169 | 169 | $cache = Cache::getInstance(); |
170 | 170 | list($path, $cacheDataName) = $cache->getRequestCacheHash(); |
171 | 171 | if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) { |
172 | 172 | Logger::log('Saving output response into cache'); |
173 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output); |
|
174 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON); |
|
173 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output); |
|
174 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON); |
|
175 | 175 | } elseif (Request::getInstance()->getMethod() !== 'GET') { |
176 | 176 | $cache->flushCache(); |
177 | 177 | } |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | ob_end_clean(); |
182 | 182 | Logger::log('End output response'); |
183 | 183 | $this->closeRender(); |
184 | - } else { |
|
184 | + }else { |
|
185 | 185 | return $output; |
186 | 186 | } |
187 | 187 | } |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | { |
194 | 194 | Logger::log('Close template render'); |
195 | 195 | EventHelper::handleEvents(EventHelper::EVENT_END_REQUEST); |
196 | - Logger::log('End request: ' . Request::requestUri(), LOG_INFO); |
|
196 | + Logger::log('End request: '.Request::requestUri(), LOG_INFO); |
|
197 | 197 | exit; |
198 | 198 | } |
199 | 199 | |
@@ -231,17 +231,17 @@ discard block |
||
231 | 231 | ///////////////////////////////////////////////////////////// |
232 | 232 | // Date in the past sets the value to already have been expired. |
233 | 233 | ResponseHelper::setHeader('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); |
234 | - ResponseHelper::setHeader('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
234 | + ResponseHelper::setHeader('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
235 | 235 | ResponseHelper::setHeader('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1 |
236 | 236 | ResponseHelper::setHeader('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 |
237 | 237 | ResponseHelper::setHeader('Pragma: no-cache'); |
238 | 238 | ResponseHelper::setHeader('Expires: 0'); |
239 | 239 | ResponseHelper::setHeader('Content-Transfer-Encoding: binary'); |
240 | - ResponseHelper::setHeader('Content-type: ' . $content); |
|
241 | - ResponseHelper::setHeader('Content-length: ' . strlen($data)); |
|
242 | - ResponseHelper::setHeader('Content-Disposition: attachment; filename="' . $filename . '"'); |
|
240 | + ResponseHelper::setHeader('Content-type: '.$content); |
|
241 | + ResponseHelper::setHeader('Content-length: '.strlen($data)); |
|
242 | + ResponseHelper::setHeader('Content-Disposition: attachment; filename="'.$filename.'"'); |
|
243 | 243 | ResponseHelper::setHeader('Access-Control-Expose-Headers: Filename'); |
244 | - ResponseHelper::setHeader('Filename: ' . $filename); |
|
244 | + ResponseHelper::setHeader('Filename: '.$filename); |
|
245 | 245 | echo $data; |
246 | 246 | ob_flush(); |
247 | 247 | ob_end_clean(); |
@@ -13,13 +13,13 @@ discard block |
||
13 | 13 | |
14 | 14 | public static function handleEvents(string $eventName, mixed $context = null): void |
15 | 15 | { |
16 | - if(array_key_exists($eventName, self::$events)) { |
|
17 | - foreach(self::$events[$eventName] as $eventClass) { |
|
16 | + if (array_key_exists($eventName, self::$events)) { |
|
17 | + foreach (self::$events[$eventName] as $eventClass) { |
|
18 | 18 | try { |
19 | 19 | $return = (new $eventClass)($context); |
20 | 20 | Logger::log("$eventClass event handled with return $return"); |
21 | - } catch (\Exception $exception) { |
|
22 | - Logger::log("$eventClass event handled with exception:" . $exception->getMessage(), LOG_CRIT); |
|
21 | + }catch (\Exception $exception) { |
|
22 | + Logger::log("$eventClass event handled with exception:".$exception->getMessage(), LOG_CRIT); |
|
23 | 23 | } |
24 | 24 | } |
25 | 25 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | |
28 | 28 | public static function addEvent(string $eventName, string $eventClass): void |
29 | 29 | { |
30 | - if(!array_key_exists($eventName, self::$events)) { |
|
30 | + if (!array_key_exists($eventName, self::$events)) { |
|
31 | 31 | self::$events[$eventName] = []; |
32 | 32 | } |
33 | 33 | self::$events[$eventName][] = $eventClass; |
@@ -50,10 +50,10 @@ discard block |
||
50 | 50 | if (!headers_sent()) { |
51 | 51 | // TODO include this headers in Template class output method |
52 | 52 | ResponseHelper::setHeader('Access-Control-Allow-Credentials: true'); |
53 | - ResponseHelper::setHeader('Access-Control-Allow-Origin: ' . Request::getInstance()->getServer('HTTP_ORIGIN', '*')); |
|
53 | + ResponseHelper::setHeader('Access-Control-Allow-Origin: '.Request::getInstance()->getServer('HTTP_ORIGIN', '*')); |
|
54 | 54 | ResponseHelper::setHeader('Vary: Origin'); |
55 | 55 | ResponseHelper::setHeader('Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS, HEAD'); |
56 | - ResponseHelper::setHeader('Access-Control-Allow-Headers: ' . implode(', ', self::getCorsHeaders())); |
|
56 | + ResponseHelper::setHeader('Access-Control-Allow-Headers: '.implode(', ', self::getCorsHeaders())); |
|
57 | 57 | } |
58 | 58 | if (Request::getInstance()->getMethod() === Request::VERB_OPTIONS) { |
59 | 59 | Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests', LOG_DEBUG); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | return $ip; |
87 | 87 | } |
88 | 88 | } |
89 | - } else { |
|
89 | + }else { |
|
90 | 90 | if (self::validateIpAddress($xForwardedFor)) { |
91 | 91 | return $xForwardedFor; |
92 | 92 | } |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | // Verifica si la IP está en el rango válido |
127 | 127 | if ($ipNum >= $rangoInicioNum && $ipNum <= $rangoFinNum) { |
128 | 128 | return true; // La IP está en el rango válido |
129 | - } else { |
|
129 | + }else { |
|
130 | 130 | return false; // La IP está fuera del rango válido |
131 | 131 | } |
132 | 132 | } |