@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | if (!Config::getInstance()->checkTryToSaveConfig() |
30 | 30 | && (preg_match('/^\/(admin|setup\-admin)/i', $route) || NULL !== Config::getInstance()->get('restricted')) |
31 | 31 | ) { |
32 | - if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) { |
|
32 | + if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) { |
|
33 | 33 | throw new AdminCredentialsException(); |
34 | 34 | } |
35 | 35 | if (!Security::getInstance()->checkAdmin()) { |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | $token = ''; |
50 | 50 | $ct = strlen($ts); |
51 | 51 | for ($i = 0; $i < $ct; $i++) { |
52 | - $token = substr($hash, $i, 1) . |
|
53 | - substr($ts, $i, 1) . |
|
52 | + $token = substr($hash, $i, 1). |
|
53 | + substr($ts, $i, 1). |
|
54 | 54 | $token; |
55 | 55 | } |
56 | 56 | return $token; |
@@ -68,16 +68,16 @@ discard block |
||
68 | 68 | $charsLength = strlen(self::RAND_SEP) - 1; |
69 | 69 | $tsLength = strlen($ts); |
70 | 70 | $i = 0; |
71 | - $ct = ceil($hashRest / 4); |
|
72 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
73 | - while(false !== $part) { |
|
74 | - $mixedToken .= $part . |
|
75 | - substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) . |
|
71 | + $ct = ceil($hashRest/4); |
|
72 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
73 | + while (false !== $part) { |
|
74 | + $mixedToken .= $part. |
|
75 | + substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1). |
|
76 | 76 | substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1); |
77 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
77 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
78 | 78 | $i++; |
79 | 79 | } |
80 | - return $mixedToken . $token; |
|
80 | + return $mixedToken.$token; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -86,10 +86,10 @@ discard block |
||
86 | 86 | */ |
87 | 87 | private static function getTs($isOdd = null) { |
88 | 88 | $ts = time(); |
89 | - $tsIsOdd = (bool)((int)substr($ts, -1) % 2); |
|
90 | - if(false === $isOdd && !$tsIsOdd) { |
|
89 | + $tsIsOdd = (bool)((int)substr($ts, -1)%2); |
|
90 | + if (false === $isOdd && !$tsIsOdd) { |
|
91 | 91 | $ts--; |
92 | - } elseif(true === $isOdd && !$tsIsOdd) { |
|
92 | + } elseif (true === $isOdd && !$tsIsOdd) { |
|
93 | 93 | $ts--; |
94 | 94 | } |
95 | 95 | return $ts; |
@@ -121,10 +121,10 @@ discard block |
||
121 | 121 | $partToken = ''; |
122 | 122 | $ts = ''; |
123 | 123 | $part = strrev($part); |
124 | - for($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
125 | - if($i % 2 == 0) { |
|
124 | + for ($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
125 | + if ($i%2 == 0) { |
|
126 | 126 | $ts .= substr($part, $i, 1); |
127 | - } else { |
|
127 | + }else { |
|
128 | 128 | $partToken .= substr($part, $i, 1); |
129 | 129 | } |
130 | 130 | } |
@@ -139,11 +139,11 @@ discard block |
||
139 | 139 | private static function parseTokenParts(array $parts) { |
140 | 140 | $token = ''; |
141 | 141 | list($partToken, $ts) = self::extractTs(array_pop($parts)); |
142 | - if($ts > 0) { |
|
143 | - foreach($parts as $part) { |
|
142 | + if ($ts > 0) { |
|
143 | + foreach ($parts as $part) { |
|
144 | 144 | $token .= $part; |
145 | 145 | } |
146 | - $token = $partToken . $token; |
|
146 | + $token = $partToken.$token; |
|
147 | 147 | } |
148 | 148 | return [$token, $ts]; |
149 | 149 | } |
@@ -171,8 +171,8 @@ discard block |
||
171 | 171 | * @return array |
172 | 172 | */ |
173 | 173 | private static function extractTokenParts($token) { |
174 | - for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
175 | - $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token); |
|
174 | + for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
175 | + $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token); |
|
176 | 176 | } |
177 | 177 | return array_unique(explode('||', $token)); |
178 | 178 | } |