@@ -143,25 +143,33 @@ |
||
| 143 | 143 | |
| 144 | 144 | private function _base32Decode($secret) |
| 145 | 145 | { |
| 146 | - if (empty($secret)) return ''; |
|
| 146 | + if (empty($secret)) { |
|
| 147 | + return ''; |
|
| 148 | + } |
|
| 147 | 149 | |
| 148 | 150 | $base32chars = $this->_getBase32LookupTable(); |
| 149 | 151 | $base32charsFlipped = array_flip($base32chars); |
| 150 | 152 | |
| 151 | 153 | $paddingCharCount = substr_count($secret, $base32chars[32]); |
| 152 | 154 | $allowedValues = array(6, 4, 3, 1, 0); |
| 153 | - if (!in_array($paddingCharCount, $allowedValues)) return false; |
|
| 155 | + if (!in_array($paddingCharCount, $allowedValues)) { |
|
| 156 | + return false; |
|
| 157 | + } |
|
| 154 | 158 | for ($i = 0; $i < 4; $i++) { |
| 155 | 159 | if ($paddingCharCount == $allowedValues[$i] && |
| 156 | 160 | substr($secret, -($allowedValues[$i])) != str_repeat($base32chars[32], $allowedValues[$i]) |
| 157 | - ) return false; |
|
| 161 | + ) { |
|
| 162 | + return false; |
|
| 163 | + } |
|
| 158 | 164 | } |
| 159 | 165 | $secret = str_replace('=', '', $secret); |
| 160 | 166 | $secret = str_split($secret); |
| 161 | 167 | $binaryString = ""; |
| 162 | 168 | for ($i = 0; $i < count($secret); $i = $i + 8) { |
| 163 | 169 | $x = ""; |
| 164 | - if (!in_array($secret[$i], $base32chars)) return false; |
|
| 170 | + if (!in_array($secret[$i], $base32chars)) { |
|
| 171 | + return false; |
|
| 172 | + } |
|
| 165 | 173 | for ($j = 0; $j < 8; $j++) { |
| 166 | 174 | $x .= str_pad(base_convert(@$base32charsFlipped[@$secret[$i + $j]], 10, 2), 5, '0', STR_PAD_LEFT); |
| 167 | 175 | } |