@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | $platform = trim(Config::getInstance()->get('platform.name')); |
35 | 35 | header('HTTP/1.1 401 Unauthorized'); |
36 | - header('WWW-Authenticate: Basic Realm="' . $platform . '"'); |
|
36 | + header('WWW-Authenticate: Basic Realm="'.$platform.'"'); |
|
37 | 37 | echo t('Zona restringida'); |
38 | 38 | exit(); |
39 | 39 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $admin['class'] = 'primary'; |
76 | 76 | break; |
77 | 77 | } |
78 | - } else { |
|
78 | + }else { |
|
79 | 79 | $admin['class'] = 'primary'; |
80 | 80 | } |
81 | 81 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $logs = array(); |
94 | 94 | /** @var \SplFileInfo $file */ |
95 | 95 | foreach ($files as $file) { |
96 | - $size = $file->getSize() / 8 / 1024; |
|
96 | + $size = $file->getSize()/8/1024; |
|
97 | 97 | $time = date('c', $file->getMTime()); |
98 | 98 | $dateTime = new \DateTime($time); |
99 | 99 | if (!isset($logs[$dateTime->format('Y')])) { |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | $files->files()->in(LOG_DIR)->name($selectedLog); |
123 | 123 | $file = $match = null; |
124 | 124 | $log = array(); |
125 | - foreach($files as $item) { |
|
125 | + foreach ($files as $item) { |
|
126 | 126 | $file = $item; |
127 | 127 | $match = $item; |
128 | 128 | break; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $time = date('c', $file->getMTime()); |
133 | 133 | $dateTime = new \DateTime($time); |
134 | 134 | $monthOpen = $dateTime->format('m'); |
135 | - $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename()); |
|
135 | + $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename()); |
|
136 | 136 | krsort($content); |
137 | 137 | $detailLog = array(); |
138 | 138 | foreach ($content as &$line) { |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | break; |
191 | 191 | } |
192 | 192 | |
193 | - } catch (\Exception $e) { |
|
193 | + }catch (\Exception $e) { |
|
194 | 194 | $detail = [ |
195 | 195 | 'type' => 'danger', |
196 | 196 | ]; |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | protected function getTmpAttribute($node = null) |
115 | 115 | { |
116 | 116 | $tmp = []; |
117 | - if(null !== $node) { |
|
117 | + if (null !== $node) { |
|
118 | 118 | $tmp = $node->getAttribute('value'); |
119 | 119 | if (!is_array($tmp)) { |
120 | 120 | $tmp = [$tmp]; |
@@ -136,10 +136,10 @@ discard block |
||
136 | 136 | $tmp = []; |
137 | 137 | if (null === $node) { |
138 | 138 | $node = $value; |
139 | - } else { |
|
139 | + }else { |
|
140 | 140 | $tmp = $this->getTmpAttribute($node); |
141 | 141 | } |
142 | - if(null !== $node) { |
|
142 | + if (null !== $node) { |
|
143 | 143 | $tmp[] = $value->getAttribute('value'); |
144 | 144 | } |
145 | 145 | return [$tmp, $node]; |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | { |
32 | 32 | $routes = []; |
33 | 33 | foreach ($systemRoutes as $params) { |
34 | - if(isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) { |
|
34 | + if (isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) { |
|
35 | 35 | $module = strtoupper($params['module']); |
36 | 36 | $mode = $params['visible'] ? 'visible' : 'hidden'; |
37 | 37 | $routes[$module][$mode][] = [ |
@@ -41,11 +41,11 @@ discard block |
||
41 | 41 | ]; |
42 | 42 | } |
43 | 43 | } |
44 | - foreach($routes as $module => &$route) { |
|
45 | - if(array_key_exists('visible', $route)) { |
|
44 | + foreach ($routes as $module => &$route) { |
|
45 | + if (array_key_exists('visible', $route)) { |
|
46 | 46 | uasort($route['visible'], '\PSFS\base\types\helpers\AdminHelper::sortByLabel'); |
47 | 47 | } |
48 | - if(array_key_exists('hidden', $route)) { |
|
48 | + if (array_key_exists('hidden', $route)) { |
|
49 | 49 | uasort($route['hidden'], '\PSFS\base\types\helpers\AdminHelper::sortByLabel'); |
50 | 50 | } |
51 | 51 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | */ |
35 | 35 | public function generateModule() |
36 | 36 | { |
37 | - Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri()); |
|
37 | + Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri()); |
|
38 | 38 | /* @var $form \PSFS\base\config\ConfigForm */ |
39 | 39 | $form = new ModuleForm(); |
40 | 40 | $form->build(); |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | $this->gen->createStructureModule($module, false, $type, $apiClass); |
66 | 66 | Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente"))); |
67 | 67 | // Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
68 | - } catch (\Exception $e) { |
|
69 | - Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]"); |
|
68 | + }catch (\Exception $e) { |
|
69 | + Logger::log($e->getMessage()." [".$e->getFile().":".$e->getLine()."]"); |
|
70 | 70 | Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage())); |
71 | 71 | } |
72 | 72 | } |
@@ -77,14 +77,14 @@ discard block |
||
77 | 77 | |
78 | 78 | public static function createRoot($path = WEB_DIR, OutputInterface $output = null) { |
79 | 79 | |
80 | - if(null === $output) { |
|
80 | + if (null === $output) { |
|
81 | 81 | $output = new ConsoleOutput(); |
82 | 82 | } |
83 | 83 | |
84 | 84 | GeneratorHelper::createDir($path); |
85 | 85 | $paths = array("js", "css", "img", "media", "font"); |
86 | 86 | foreach ($paths as $htmlPath) { |
87 | - GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath); |
|
87 | + GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath); |
|
88 | 88 | } |
89 | 89 | |
90 | 90 | // Generates the root needed files |
@@ -96,18 +96,18 @@ discard block |
||
96 | 96 | 'robots' => 'robots.txt', |
97 | 97 | ]; |
98 | 98 | foreach ($files as $templates => $filename) { |
99 | - $text = Template::getInstance()->dump("generator/html/" . $templates . '.html.twig'); |
|
100 | - if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) { |
|
101 | - $output->writeln('Can\t create the file ' . $filename); |
|
102 | - } else { |
|
103 | - $output->writeln($filename . ' created successfully'); |
|
99 | + $text = Template::getInstance()->dump("generator/html/".$templates.'.html.twig'); |
|
100 | + if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) { |
|
101 | + $output->writeln('Can\t create the file '.$filename); |
|
102 | + }else { |
|
103 | + $output->writeln($filename.' created successfully'); |
|
104 | 104 | } |
105 | 105 | } |
106 | 106 | |
107 | 107 | //Export base locale translations |
108 | - if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) { |
|
109 | - GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
110 | - GeneratorService::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
108 | + if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) { |
|
109 | + GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
110 | + GeneratorService::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
111 | 111 | } |
112 | 112 | } |
113 | 113 | } |
114 | 114 | \ No newline at end of file |
@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public static function staticAdminLogon($route = null) |
40 | 40 | { |
41 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) { |
|
41 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) { |
|
42 | 42 | if ('login' !== Config::getParam('admin.login')) { |
43 | 43 | return AdminServices::getInstance()->setAdminHeaders(); |
44 | - } else { |
|
44 | + }else { |
|
45 | 45 | $form = new LoginForm(); |
46 | 46 | $form->setData(array("route" => $route)); |
47 | 47 | $form->build(); |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | 'form' => $form, |
52 | 52 | )); |
53 | 53 | } |
54 | - } else { |
|
54 | + }else { |
|
55 | 55 | return UserController::showAdminManager(); |
56 | 56 | } |
57 | 57 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $download = $this->getRequest()->get('download') ?: false; |
34 | 34 | |
35 | 35 | $module = $this->srv->getModules($domain); |
36 | - if(empty($module)) { |
|
36 | + if (empty($module)) { |
|
37 | 37 | return Router::getInstance()->httpNotFound(null, true); |
38 | 38 | } |
39 | 39 | switch (strtolower($type)) { |
@@ -53,10 +53,10 @@ discard block |
||
53 | 53 | ini_restore('max_execution_time'); |
54 | 54 | ini_restore('memory_limit'); |
55 | 55 | |
56 | - if($download && $type === ApiController::SWAGGER_DOC) { |
|
56 | + if ($download && $type === ApiController::SWAGGER_DOC) { |
|
57 | 57 | return $this->download(json_encode($doc), 'application/json', 'swagger.json'); |
58 | 58 | } |
59 | - if($type === ApiController::HTML_DOC) { |
|
59 | + if ($type === ApiController::HTML_DOC) { |
|
60 | 60 | return $this->render('documentation.html.twig', ["data" => json_encode($doc)]); |
61 | 61 | } |
62 | 62 | return $this->json($doc, 200); |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | unset($_SERVER["PHP_AUTH_USER"]); |
41 | 41 | unset($_SERVER["PHP_AUTH_PW"]); |
42 | 42 | header_remove("Authorization"); |
43 | - } elseif(!self::isTest()) { |
|
43 | + } elseif (!self::isTest()) { |
|
44 | 44 | header('Authorization:'); |
45 | 45 | } |
46 | 46 | } |
@@ -68,9 +68,9 @@ discard block |
||
68 | 68 | Logger::log('Adding debug headers to render response'); |
69 | 69 | $vars["__DEBUG__"]["includes"] = get_included_files(); |
70 | 70 | $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
71 | - header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s'); |
|
72 | - header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes'); |
|
73 | - header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened'); |
|
71 | + header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s'); |
|
72 | + header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes'); |
|
73 | + header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened'); |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | return $vars; |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | |
17 | 17 | |
18 | 18 | if (!defined('LOG_DIR')) { |
19 | - GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs'); |
|
20 | - define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs'); |
|
19 | + GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs'); |
|
20 | + define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs'); |
|
21 | 21 | } |
22 | 22 | |
23 | 23 | /** |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | { |
55 | 55 | $args = func_get_args(); |
56 | 56 | list($logger, $debug, $path) = $this->setup($args); |
57 | - $this->stream = fopen($path . DIRECTORY_SEPARATOR . date('Ymd') . '.log', 'a+'); |
|
57 | + $this->stream = fopen($path.DIRECTORY_SEPARATOR.date('Ymd').'.log', 'a+'); |
|
58 | 58 | $this->addPushLogger($logger, $debug); |
59 | 59 | $this->logLevel = Config::getParam('log.level', 'NOTICE'); |
60 | 60 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | private function createLoggerPath() |
137 | 137 | { |
138 | 138 | $logger = $this->setLoggerName(); |
139 | - $path = LOG_DIR . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m'); |
|
139 | + $path = LOG_DIR.DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m'); |
|
140 | 140 | GeneratorHelper::createDir($path); |
141 | 141 | |
142 | 142 | return $path; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | * @return bool |
159 | 159 | */ |
160 | 160 | private function checkLogLevel($level = \Monolog\Logger::NOTICE) { |
161 | - switch($this->logLevel) { |
|
161 | + switch ($this->logLevel) { |
|
162 | 162 | case 'DEBUG': $logPass = Monolog::DEBUG; break; |
163 | 163 | case 'INFO': $logPass = Monolog::INFO; break; |
164 | 164 | default: |
@@ -178,10 +178,10 @@ discard block |
||
178 | 178 | */ |
179 | 179 | public static function log($msg, $type = LOG_DEBUG, array $context = null, $force = false) |
180 | 180 | { |
181 | - if(null === $context) { |
|
181 | + if (null === $context) { |
|
182 | 182 | $context = []; |
183 | 183 | } |
184 | - if(Config::getParam('profiling.enable') && 'DEBUG' === Config::getParam('log.level', 'NOTICE')) { |
|
184 | + if (Config::getParam('profiling.enable') && 'DEBUG' === Config::getParam('log.level', 'NOTICE')) { |
|
185 | 185 | Inspector::stats($msg); |
186 | 186 | } |
187 | 187 | switch ($type) { |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | self::getInstance()->addLog($msg, \Monolog\Logger::WARNING, $context, $force); |
193 | 193 | break; |
194 | 194 | case LOG_CRIT: |
195 | - if(Config::getParam('log.slack.hook')) { |
|
195 | + if (Config::getParam('log.slack.hook')) { |
|
196 | 196 | SlackHelper::getInstance()->trace($msg, '', '', $context, $force); |
197 | 197 | } |
198 | 198 | self::getInstance()->addLog($msg, \Monolog\Logger::CRITICAL, $context, $force); |
@@ -235,7 +235,7 @@ discard block |
||
235 | 235 | { |
236 | 236 | $context['uri'] = null !== $_SERVER && array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : 'Unknow'; |
237 | 237 | $context['method'] = null !== $_SERVER && array_key_exists('REQUEST_METHOD', $_SERVER) ? $_SERVER['REQUEST_METHOD'] : 'Unknow'; |
238 | - if(null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) { |
|
238 | + if (null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) { |
|
239 | 239 | $context['uid'] = $_SERVER['HTTP_X_PSFS_UID']; |
240 | 240 | } |
241 | 241 | return $context; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false)) |
34 | 34 | ) { |
35 | 35 | if (!self::isTest() && |
36 | - null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) { |
|
36 | + null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) { |
|
37 | 37 | throw new AdminCredentialsException(); |
38 | 38 | } |
39 | 39 | if (!Security::getInstance()->checkAdmin()) { |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | $token = ''; |
54 | 54 | $ct = strlen($ts); |
55 | 55 | for ($i = 0; $i < $ct; $i++) { |
56 | - $token = substr($hash, $i, 1) . |
|
57 | - substr($ts, $i, 1) . |
|
56 | + $token = substr($hash, $i, 1). |
|
57 | + substr($ts, $i, 1). |
|
58 | 58 | $token; |
59 | 59 | } |
60 | 60 | return $token; |
@@ -72,16 +72,16 @@ discard block |
||
72 | 72 | $charsLength = strlen(self::RAND_SEP) - 1; |
73 | 73 | $tsLength = strlen($ts); |
74 | 74 | $i = 0; |
75 | - $ct = ceil($hashRest / 4); |
|
76 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
77 | - while(false !== $part) { |
|
78 | - $mixedToken .= $part . |
|
79 | - substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) . |
|
75 | + $ct = ceil($hashRest/4); |
|
76 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
77 | + while (false !== $part) { |
|
78 | + $mixedToken .= $part. |
|
79 | + substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1). |
|
80 | 80 | substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1); |
81 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
81 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
82 | 82 | $i++; |
83 | 83 | } |
84 | - return $mixedToken . $token; |
|
84 | + return $mixedToken.$token; |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -90,10 +90,10 @@ discard block |
||
90 | 90 | */ |
91 | 91 | private static function getTs($isOdd = null) { |
92 | 92 | $ts = time(); |
93 | - $tsIsOdd = (bool)((int)substr($ts, -1) % 2); |
|
94 | - if(false === $isOdd && !$tsIsOdd) { |
|
93 | + $tsIsOdd = (bool)((int)substr($ts, -1)%2); |
|
94 | + if (false === $isOdd && !$tsIsOdd) { |
|
95 | 95 | $ts--; |
96 | - } elseif(true === $isOdd && !$tsIsOdd) { |
|
96 | + } elseif (true === $isOdd && !$tsIsOdd) { |
|
97 | 97 | $ts--; |
98 | 98 | } |
99 | 99 | return $ts; |
@@ -125,10 +125,10 @@ discard block |
||
125 | 125 | $partToken = ''; |
126 | 126 | $ts = ''; |
127 | 127 | $part = strrev($part); |
128 | - for($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
129 | - if($i % 2 == 0) { |
|
128 | + for ($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
129 | + if ($i%2 == 0) { |
|
130 | 130 | $ts .= substr($part, $i, 1); |
131 | - } else { |
|
131 | + }else { |
|
132 | 132 | $partToken .= substr($part, $i, 1); |
133 | 133 | } |
134 | 134 | } |
@@ -143,11 +143,11 @@ discard block |
||
143 | 143 | private static function parseTokenParts(array $parts) { |
144 | 144 | $token = ''; |
145 | 145 | list($partToken, $ts) = self::extractTs(array_pop($parts)); |
146 | - if($ts > 0) { |
|
147 | - foreach($parts as $part) { |
|
146 | + if ($ts > 0) { |
|
147 | + foreach ($parts as $part) { |
|
148 | 148 | $token .= $part; |
149 | 149 | } |
150 | - $token = $partToken . $token; |
|
150 | + $token = $partToken.$token; |
|
151 | 151 | } |
152 | 152 | return [$token, $ts]; |
153 | 153 | } |
@@ -175,8 +175,8 @@ discard block |
||
175 | 175 | * @return array |
176 | 176 | */ |
177 | 177 | private static function extractTokenParts($token) { |
178 | - for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
179 | - $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token); |
|
178 | + for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
179 | + $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token); |
|
180 | 180 | } |
181 | 181 | return array_unique(explode('||', $token)); |
182 | 182 | } |