@@ -86,11 +86,11 @@ |
||
86 | 86 | public static function save($user) |
87 | 87 | { |
88 | 88 | $saved = true; |
89 | - $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true) ?: []; |
|
90 | - $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']); |
|
89 | + $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true) ?: []; |
|
90 | + $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']); |
|
91 | 91 | $admins[$user['username']]['profile'] = $user['profile']; |
92 | 92 | |
93 | - Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', $admins, Cache::JSONGZ, true); |
|
93 | + Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true); |
|
94 | 94 | return $saved; |
95 | 95 | } |
96 | 96 |
@@ -69,21 +69,21 @@ discard block |
||
69 | 69 | { |
70 | 70 | $path = explode("/", $string); |
71 | 71 | $originalFilename = end($path); |
72 | - $base = WEB_DIR . DIRECTORY_SEPARATOR; |
|
72 | + $base = WEB_DIR.DIRECTORY_SEPARATOR; |
|
73 | 73 | $debug = Config::getParam('debug'); |
74 | 74 | $cache = Config::getParam('cache.var'); |
75 | - $cache = $cache ? '.' . $cache : ''; |
|
75 | + $cache = $cache ? '.'.$cache : ''; |
|
76 | 76 | $finfo = finfo_open(FILEINFO_MIME_TYPE); // devuelve el tipo mime de su extensión |
77 | 77 | $mime = finfo_file($finfo, $filenamePath); |
78 | 78 | $extension = explode(".", $string); |
79 | 79 | $extension = end($extension); |
80 | - $file = "/" . substr(md5($string), 0, 8) . "." . $extension; |
|
80 | + $file = "/".substr(md5($string), 0, 8).".".$extension; |
|
81 | 81 | finfo_close($finfo); |
82 | 82 | if (preg_match('/\.css$/i', $string)) { |
83 | - $file = "/" . substr(md5($string), 0, 8) . "$cache.css"; |
|
83 | + $file = "/".substr(md5($string), 0, 8)."$cache.css"; |
|
84 | 84 | $htmlBase = "css"; |
85 | 85 | } elseif (preg_match('/\.js$/i', $string)) { |
86 | - $file = "/" . substr(md5($string), 0, 8) . "$cache.js"; |
|
86 | + $file = "/".substr(md5($string), 0, 8)."$cache.js"; |
|
87 | 87 | $htmlBase = "js"; |
88 | 88 | } elseif (preg_match("/image/i", $mime)) { |
89 | 89 | $htmlBase = "img"; |
@@ -98,9 +98,9 @@ discard block |
||
98 | 98 | $file = $name; |
99 | 99 | } |
100 | 100 | if ($debug) { |
101 | - $file = str_replace("." . $extension, "_" . $originalFilename, $file); |
|
101 | + $file = str_replace(".".$extension, "_".$originalFilename, $file); |
|
102 | 102 | } |
103 | - $filePath = $htmlBase . $file; |
|
103 | + $filePath = $htmlBase.$file; |
|
104 | 104 | |
105 | 105 | return array($base, $htmlBase, $filePath); |
106 | 106 | } |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | { |
116 | 116 | GeneratorHelper::createDir(dirname($path)); |
117 | 117 | if ("" !== $content && false === file_put_contents($path, $content)) { |
118 | - throw new ConfigException(t('No se tienen permisos para escribir en ' . $path)); |
|
118 | + throw new ConfigException(t('No se tienen permisos para escribir en '.$path)); |
|
119 | 119 | } |
120 | 120 | } |
121 | 121 | } |
@@ -69,7 +69,7 @@ |
||
69 | 69 | */ |
70 | 70 | public function swaggerUi($domain) |
71 | 71 | { |
72 | - if(!Router::getInstance()->domainExists($domain)) { |
|
72 | + if (!Router::getInstance()->domainExists($domain)) { |
|
73 | 73 | throw new RouterException('Domains is empty'); |
74 | 74 | } |
75 | 75 | return $this->render('swagger.html.twig', [ |
@@ -38,9 +38,9 @@ |
||
38 | 38 | if (self::isTest()) { |
39 | 39 | throw new UserAuthException(); |
40 | 40 | } |
41 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) { |
|
41 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) { |
|
42 | 42 | return AdminServices::getInstance()->setAdminHeaders(); |
43 | - } else { |
|
43 | + }else { |
|
44 | 44 | return UserController::showAdminManager(); |
45 | 45 | } |
46 | 46 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | Logger::log('Configuration saved successful'); |
66 | 66 | Security::getInstance()->setFlash("callback_message", t("Usuario agregado correctamente")); |
67 | 67 | Security::getInstance()->setFlash("callback_route", Router::getInstance()->getRoute("admin", true)); |
68 | - } else { |
|
68 | + }else { |
|
69 | 69 | throw new ConfigException(t('Error al guardar los administradores, prueba a cambiar los permisos')); |
70 | 70 | } |
71 | 71 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | { |
100 | 100 | if ($this->isAdmin()) { |
101 | 101 | $this->redirect('admin'); |
102 | - } else { |
|
102 | + }else { |
|
103 | 103 | return Admin::staticAdminLogon(); |
104 | 104 | } |
105 | 105 | } |
@@ -76,9 +76,9 @@ discard block |
||
76 | 76 | Logger::log('Adding debug headers to render response'); |
77 | 77 | $vars["__DEBUG__"]["includes"] = get_included_files(); |
78 | 78 | $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); |
79 | - header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s'); |
|
80 | - header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes'); |
|
81 | - header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened'); |
|
79 | + header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s'); |
|
80 | + header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes'); |
|
81 | + header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened'); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | return $vars; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | */ |
94 | 94 | public static function httpNotFound(Exception $exception = NULL, $isJson = false) |
95 | 95 | { |
96 | - if(self::isTest()) { |
|
96 | + if (self::isTest()) { |
|
97 | 97 | return 404; |
98 | 98 | } |
99 | 99 | Inspector::stats('[Router] Throw not found exception', Inspector::SCOPE_DEBUG); |
@@ -108,9 +108,9 @@ discard block |
||
108 | 108 | } |
109 | 109 | |
110 | 110 | $notFoundRoute = Config::getParam('route.404'); |
111 | - if(null !== $notFoundRoute) { |
|
111 | + if (null !== $notFoundRoute) { |
|
112 | 112 | Request::getInstance()->redirect(Router::getInstance()->getRoute($notFoundRoute, true)); |
113 | - } else { |
|
113 | + }else { |
|
114 | 114 | return $template->render('error.html.twig', array( |
115 | 115 | 'exception' => $exception, |
116 | 116 | 'trace' => $exception->getTraceAsString(), |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false)) |
35 | 35 | ) { |
36 | 36 | if (!self::isTest() && |
37 | - null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) { |
|
37 | + null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) { |
|
38 | 38 | throw new AdminCredentialsException(); |
39 | 39 | } |
40 | 40 | if (!Security::getInstance()->checkAdmin()) { |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | $token = ''; |
55 | 55 | $length = strlen($timestamp); |
56 | 56 | for ($i = 0; $i < $length; $i++) { |
57 | - $token = substr($hash, $i, 1) . |
|
58 | - substr($timestamp, $i, 1) . |
|
57 | + $token = substr($hash, $i, 1). |
|
58 | + substr($timestamp, $i, 1). |
|
59 | 59 | $token; |
60 | 60 | } |
61 | 61 | return $token; |
@@ -74,16 +74,16 @@ discard block |
||
74 | 74 | $charsLength = strlen(self::RAND_SEP) - 1; |
75 | 75 | $tsLength = strlen($timestamp); |
76 | 76 | $i = 0; |
77 | - $partCount = ceil($hashRest / 4); |
|
78 | - $part = substr($hash, $tsLength + $partCount * $i, $partCount); |
|
77 | + $partCount = ceil($hashRest/4); |
|
78 | + $part = substr($hash, $tsLength + $partCount*$i, $partCount); |
|
79 | 79 | while (false !== $part) { |
80 | - $mixedToken .= $part . |
|
81 | - substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) . |
|
80 | + $mixedToken .= $part. |
|
81 | + substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1). |
|
82 | 82 | substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1); |
83 | - $part = substr($hash, $tsLength + $partCount * $i, $partCount); |
|
83 | + $part = substr($hash, $tsLength + $partCount*$i, $partCount); |
|
84 | 84 | $i++; |
85 | 85 | } |
86 | - return $mixedToken . $token; |
|
86 | + return $mixedToken.$token; |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | /** |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | private static function getTs($isOdd = null) |
94 | 94 | { |
95 | 95 | $timestamp = time(); |
96 | - $tsIsOdd = (bool)((int)substr($timestamp, -1) % 2); |
|
96 | + $tsIsOdd = (bool)((int)substr($timestamp, -1)%2); |
|
97 | 97 | if (false === $isOdd && !$tsIsOdd) { |
98 | 98 | $timestamp--; |
99 | 99 | } elseif (true === $isOdd && !$tsIsOdd) { |
@@ -130,9 +130,9 @@ discard block |
||
130 | 130 | $timestamp = ''; |
131 | 131 | $part = strrev($part); |
132 | 132 | for ($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
133 | - if ($i % 2 == 0) { |
|
133 | + if ($i%2 == 0) { |
|
134 | 134 | $timestamp .= substr($part, $i, 1); |
135 | - } else { |
|
135 | + }else { |
|
136 | 136 | $partToken .= substr($part, $i, 1); |
137 | 137 | } |
138 | 138 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | foreach ($parts as $part) { |
153 | 153 | $token .= $part; |
154 | 154 | } |
155 | - $token = $partToken . $token; |
|
155 | + $token = $partToken.$token; |
|
156 | 156 | } |
157 | 157 | return [$token, $timestamp]; |
158 | 158 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | { |
51 | 51 | $this->generateSlugs(); |
52 | 52 | GeneratorHelper::createDir(CONFIG_DIR); |
53 | - Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', [$this->routing, $this->getSlugs()], Cache::JSON, TRUE); |
|
53 | + Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', [$this->routing, $this->getSlugs()], Cache::JSON, TRUE); |
|
54 | 54 | |
55 | 55 | return $this; |
56 | 56 | } |
@@ -54,11 +54,11 @@ discard block |
||
54 | 54 | if ($files->hasResults()) { |
55 | 55 | foreach ($files->getIterator() as $file) { |
56 | 56 | if ($namespace !== Router::PSFS_BASE_NAMESPACE && method_exists($file, 'getRelativePathname')) { |
57 | - $filename = '\\' . str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname())); |
|
58 | - } else { |
|
57 | + $filename = '\\'.str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname())); |
|
58 | + }else { |
|
59 | 59 | $filename = str_replace('/', '\\', str_replace($origen, '', $file->getPathname())); |
60 | 60 | } |
61 | - $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace); |
|
61 | + $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | $this->initializeFinder(); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | if (!is_array($this->domains)) { |
112 | 112 | $this->domains = []; |
113 | 113 | } |
114 | - $domain = '@' . $class->getConstant('DOMAIN') . '/'; |
|
114 | + $domain = '@'.$class->getConstant('DOMAIN').'/'; |
|
115 | 115 | if (!array_key_exists($domain, $this->domains)) { |
116 | 116 | $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain); |
117 | 117 | } |
@@ -138,11 +138,11 @@ discard block |
||
138 | 138 | private function loadExternalAutoloader($hydrateRoute, SplFileInfo $modulePath, $externalModulePath, &$routing = []) |
139 | 139 | { |
140 | 140 | $extModule = $modulePath->getBasename(); |
141 | - $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php'); |
|
141 | + $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php'); |
|
142 | 142 | if (file_exists($moduleAutoloader)) { |
143 | 143 | include_once $moduleAutoloader; |
144 | 144 | if ($hydrateRoute) { |
145 | - $routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $routing); |
|
145 | + $routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $routing); |
|
146 | 146 | } |
147 | 147 | } |
148 | 148 | } |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | { |
158 | 158 | try { |
159 | 159 | $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module); |
160 | - $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src'; |
|
160 | + $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src'; |
|
161 | 161 | if (file_exists($externalModulePath)) { |
162 | 162 | $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0); |
163 | 163 | if ($externalModule->hasResults()) { |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | } |
167 | 167 | } |
168 | 168 | } |
169 | - } catch (Exception $e) { |
|
169 | + }catch (Exception $e) { |
|
170 | 170 | Logger::log($e->getMessage(), LOG_WARNING); |
171 | 171 | } |
172 | 172 | } |
@@ -178,9 +178,9 @@ discard block |
||
178 | 178 | public function domainExists($domainToCheck) { |
179 | 179 | $exists = false; |
180 | 180 | $domains = array_keys($this->getDomains()); |
181 | - foreach($domains as $domain) { |
|
181 | + foreach ($domains as $domain) { |
|
182 | 182 | $cleanDomain = strtolower(str_replace(['@', '/', '\\'], '', $domain)); |
183 | - if($cleanDomain === strtolower($domainToCheck)) { |
|
183 | + if ($cleanDomain === strtolower($domainToCheck)) { |
|
184 | 184 | $exists = true; |
185 | 185 | break; |
186 | 186 | } |