@@ -58,6 +58,10 @@ |
||
| 58 | 58 | self::command('install', false, $path); |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | + /** |
|
| 62 | + * @param string $command |
|
| 63 | + * @param string $path |
|
| 64 | + */ |
|
| 61 | 65 | static function command($command, $needOutput = true, $path = null) |
| 62 | 66 | { |
| 63 | 67 | include_once 'composer/vendor/autoload.php'; |
@@ -216,6 +216,7 @@ |
||
| 216 | 216 | * @param $number Integer Число на основе которого нужно сформировать окончание |
| 217 | 217 | * @param $endingsArray Array Массив слов или окончаний для чисел (1, 4, 5), |
| 218 | 218 | * например array('яблоко', 'яблока', 'яблок') |
| 219 | + * @param string[] $endingArray |
|
| 219 | 220 | * @return String |
| 220 | 221 | */ |
| 221 | 222 | static function getNumEnding($number, $endingArray) |
@@ -58,8 +58,9 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | static function createDir($path) |
| 60 | 60 | { |
| 61 | - if (file_exists($path)) |
|
| 62 | - return true; |
|
| 61 | + if (file_exists($path)) { |
|
| 62 | + return true; |
|
| 63 | + } |
|
| 63 | 64 | |
| 64 | 65 | $path = explode('/', $path); |
| 65 | 66 | $cur = ''; |
@@ -101,10 +102,11 @@ discard block |
||
| 101 | 102 | $imagecreatefromX = "imagecreatefrom{$img_type}"; |
| 102 | 103 | $src_res = $imagecreatefromX($img_path); |
| 103 | 104 | |
| 104 | - if ($img_width / $max_width > $img_height / $max_height) |
|
| 105 | - $separator = $img_width / $max_width; |
|
| 106 | - else |
|
| 107 | - $separator = $img_height / $max_height; |
|
| 105 | + if ($img_width / $max_width > $img_height / $max_height) { |
|
| 106 | + $separator = $img_width / $max_width; |
|
| 107 | + } else { |
|
| 108 | + $separator = $img_height / $max_height; |
|
| 109 | + } |
|
| 108 | 110 | |
| 109 | 111 | if ($crop === true || $crop == 'q') { |
| 110 | 112 | if ($img_width > $img_height) { |
@@ -29,6 +29,9 @@ discard block |
||
| 29 | 29 | public $params = []; |
| 30 | 30 | public $distinct = false; |
| 31 | 31 | |
| 32 | + /** |
|
| 33 | + * @param $instance |
|
| 34 | + */ |
|
| 32 | 35 | function __construct($instance = null) |
| 33 | 36 | { |
| 34 | 37 | if (!$instance) { |
@@ -47,6 +50,9 @@ discard block |
||
| 47 | 50 | return $this->curInstance->pdo->lastInsertId(); |
| 48 | 51 | } |
| 49 | 52 | |
| 53 | + /** |
|
| 54 | + * @param string $table |
|
| 55 | + */ |
|
| 50 | 56 | public function select($table) |
| 51 | 57 | { |
| 52 | 58 | $this->operation = 'SELECT'; |
@@ -126,12 +126,14 @@ discard block |
||
| 126 | 126 | if (!is_array($order)) { |
| 127 | 127 | $this->order[] = "{$order} {$type}"; |
| 128 | 128 | } else { |
| 129 | - foreach ($order as $item) |
|
| 130 | - if (!is_array($item)) { |
|
| 129 | + foreach ($order as $item) { |
|
| 130 | + if (!is_array($item)) { |
|
| 131 | 131 | call_user_func_array(array($this, 'order'), $order); |
| 132 | + } |
|
| 132 | 133 | break; |
| 133 | - } else |
|
| 134 | - $this->order($item); |
|
| 134 | + } else { |
|
| 135 | + $this->order($item); |
|
| 136 | + } |
|
| 135 | 137 | } |
| 136 | 138 | } |
| 137 | 139 | |
@@ -140,8 +142,9 @@ discard block |
||
| 140 | 142 | $start = intval($start); |
| 141 | 143 | $len = intval($len); |
| 142 | 144 | $this->limit = "LIMIT {$start}"; |
| 143 | - if ($len !== 0) |
|
| 144 | - $this->limit .= ",{$len}"; |
|
| 145 | + if ($len !== 0) { |
|
| 146 | + $this->limit .= ",{$len}"; |
|
| 147 | + } |
|
| 145 | 148 | } |
| 146 | 149 | |
| 147 | 150 | public function buildJoin($table, $where = false, $type = 'LEFT', $alias = '') |
@@ -154,10 +157,12 @@ discard block |
||
| 154 | 157 | } |
| 155 | 158 | } else { |
| 156 | 159 | $join .= " {$type} JOIN {$this->curInstance->table_prefix}{$table}"; |
| 157 | - if ($alias) |
|
| 158 | - $join .= " AS `{$alias}`"; |
|
| 159 | - if ($where) |
|
| 160 | - $join .= " ON {$where}"; |
|
| 160 | + if ($alias) { |
|
| 161 | + $join .= " AS `{$alias}`"; |
|
| 162 | + } |
|
| 163 | + if ($where) { |
|
| 164 | + $join .= " ON {$where}"; |
|
| 165 | + } |
|
| 161 | 166 | } |
| 162 | 167 | return $join; |
| 163 | 168 | } |
@@ -177,31 +182,33 @@ discard block |
||
| 177 | 182 | $operation = '='; |
| 178 | 183 | } |
| 179 | 184 | |
| 180 | - if ($concatenation === false) |
|
| 181 | - $concatenation = 'AND'; |
|
| 182 | - elseif ($concatenation === true) |
|
| 183 | - $concatenation = ''; |
|
| 185 | + if ($concatenation === false) { |
|
| 186 | + $concatenation = 'AND'; |
|
| 187 | + } elseif ($concatenation === true) { |
|
| 188 | + $concatenation = ''; |
|
| 189 | + } |
|
| 184 | 190 | |
| 185 | - if ($this->whereString == NULL) |
|
| 186 | - $this->whereString = ' WHERE '; |
|
| 191 | + if ($this->whereString == NULL) { |
|
| 192 | + $this->whereString = ' WHERE '; |
|
| 193 | + } |
|
| 187 | 194 | |
| 188 | 195 | if (stristr($operation, 'IN') || stristr($operation, 'NOT IN')) { |
| 189 | - if (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) |
|
| 190 | - $value = "({$value})"; |
|
| 191 | - elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) |
|
| 192 | - $value = "\"{$value}\""; |
|
| 193 | - } |
|
| 194 | - elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) { |
|
| 196 | + if (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value)) { |
|
| 197 | + $value = "({$value})"; |
|
| 198 | + } elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value)) { |
|
| 199 | + $value = "\"{$value}\""; |
|
| 200 | + } |
|
| 201 | + } elseif (!in_array($value, array('CURRENT_TIMESTAMP'))) { |
|
| 195 | 202 | $this->params[] = $value; |
| 196 | 203 | $value = "?"; |
| 197 | 204 | } |
| 198 | 205 | |
| 199 | - if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ') |
|
| 200 | - $this->whereString .= " {$where} {$operation} {$value} "; |
|
| 201 | - else |
|
| 202 | - $this->whereString .= "{$concatenation} {$where} {$operation} {$value} "; |
|
| 203 | - } |
|
| 204 | - else { |
|
| 206 | + if (substr($this->whereString, -1, 1) == '(' || substr($this->whereString, -2, 2) == 'E ') { |
|
| 207 | + $this->whereString .= " {$where} {$operation} {$value} "; |
|
| 208 | + } else { |
|
| 209 | + $this->whereString .= "{$concatenation} {$where} {$operation} {$value} "; |
|
| 210 | + } |
|
| 211 | + } else { |
|
| 205 | 212 | $i = -1; |
| 206 | 213 | while (isset($where[++$i])) { |
| 207 | 214 | $item = $where[$i]; |
@@ -216,28 +223,32 @@ discard block |
||
| 216 | 223 | $this->whereString .= "{$concatenation} "; |
| 217 | 224 | } |
| 218 | 225 | |
| 219 | - if ($this->whereString != NULL) |
|
| 220 | - $this->whereString .= '('; |
|
| 221 | - else |
|
| 222 | - $this->whereString = 'WHERE ('; |
|
| 226 | + if ($this->whereString != NULL) { |
|
| 227 | + $this->whereString .= '('; |
|
| 228 | + } else { |
|
| 229 | + $this->whereString = 'WHERE ('; |
|
| 230 | + } |
|
| 223 | 231 | } |
| 224 | 232 | |
| 225 | 233 | if (!is_array($item)) { |
| 226 | 234 | call_user_func_array(array($this, 'buildWhere'), $where); |
| 227 | 235 | break; |
| 228 | 236 | } else { |
| 229 | - if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(') |
|
| 230 | - if (!isset($item[3])) |
|
| 237 | + if ($this->whereString != NULL && substr($this->whereString, -1, 1) != '(') { |
|
| 238 | + if (!isset($item[3])) |
|
| 231 | 239 | $concatenation = 'AND'; |
| 232 | - else |
|
| 233 | - $concatenation = $item[3]; |
|
| 234 | - elseif (substr($this->whereString, -1, 1) != '(') |
|
| 235 | - $this->whereString = 'WHERE '; |
|
| 240 | + } else { |
|
| 241 | + $concatenation = $item[3]; |
|
| 242 | + } |
|
| 243 | + elseif (substr($this->whereString, -1, 1) != '(') { |
|
| 244 | + $this->whereString = 'WHERE '; |
|
| 245 | + } |
|
| 236 | 246 | |
| 237 | 247 | $this->buildWhere($item); |
| 238 | 248 | } |
| 239 | - if (!isset($where[$i + 1]) && isset($where[$i - 1])) |
|
| 240 | - $this->whereString .= ') '; |
|
| 249 | + if (!isset($where[$i + 1]) && isset($where[$i - 1])) { |
|
| 250 | + $this->whereString .= ') '; |
|
| 251 | + } |
|
| 241 | 252 | } |
| 242 | 253 | } |
| 243 | 254 | } |
@@ -45,6 +45,10 @@ |
||
| 45 | 45 | return $modelCols; |
| 46 | 46 | } |
| 47 | 47 | |
| 48 | + /** |
|
| 49 | + * @param string $colPrefix |
|
| 50 | + * @param string $tableName |
|
| 51 | + */ |
|
| 48 | 52 | function parseColsForTable($cols, $colPrefix, $tableName) |
| 49 | 53 | { |
| 50 | 54 | |
@@ -23,6 +23,9 @@ |
||
| 23 | 23 | public $attributes = []; |
| 24 | 24 | public $indexCol = null; |
| 25 | 25 | |
| 26 | + /** |
|
| 27 | + * @param string[] $cols |
|
| 28 | + */ |
|
| 26 | 29 | function setCols($cols) |
| 27 | 30 | { |
| 28 | 31 | $this->cols = $cols; |
@@ -92,6 +92,9 @@ discard block |
||
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | + /** |
|
| 96 | + * @param string $user_mail |
|
| 97 | + */ |
|
| 95 | 98 | function passre($user_mail) |
| 96 | 99 | { |
| 97 | 100 | $user = $this->get($user_mail, 'mail'); |
@@ -312,6 +315,9 @@ discard block |
||
| 312 | 315 | return $user->id; |
| 313 | 316 | } |
| 314 | 317 | |
| 318 | + /** |
|
| 319 | + * @param string $pass |
|
| 320 | + */ |
|
| 315 | 321 | function hashpass($pass) |
| 316 | 322 | { |
| 317 | 323 | return password_hash($pass, PASSWORD_DEFAULT); |
@@ -189,17 +189,20 @@ |
||
| 189 | 189 | |
| 190 | 190 | public function get($idn = false, $ltype = 'id') |
| 191 | 191 | { |
| 192 | - if (!$idn) |
|
| 193 | - return false; |
|
| 192 | + if (!$idn) { |
|
| 193 | + return false; |
|
| 194 | + } |
|
| 194 | 195 | |
| 195 | - if (is_numeric($idn) && $ltype != 'login') |
|
| 196 | - $user = Users\User::get($idn, 'id'); |
|
| 197 | - elseif ($ltype == 'login') |
|
| 198 | - $user = Users\User::get($idn, 'login'); |
|
| 199 | - else |
|
| 200 | - $user = Users\User::get($idn, 'mail'); |
|
| 201 | - if (!$user) |
|
| 202 | - return []; |
|
| 196 | + if (is_numeric($idn) && $ltype != 'login') { |
|
| 197 | + $user = Users\User::get($idn, 'id'); |
|
| 198 | + } elseif ($ltype == 'login') { |
|
| 199 | + $user = Users\User::get($idn, 'login'); |
|
| 200 | + } else { |
|
| 201 | + $user = Users\User::get($idn, 'mail'); |
|
| 202 | + } |
|
| 203 | + if (!$user) { |
|
| 204 | + return []; |
|
| 205 | + } |
|
| 203 | 206 | |
| 204 | 207 | return $user; |
| 205 | 208 | } |
@@ -147,6 +147,9 @@ discard block |
||
| 147 | 147 | return $result[1]; |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | + /** |
|
| 151 | + * @param string $source |
|
| 152 | + */ |
|
| 150 | 153 | function parseSource($source) |
| 151 | 154 | { |
| 152 | 155 | $tags = $this->parseRaw($source); |
@@ -190,6 +193,9 @@ discard block |
||
| 190 | 193 | return substr($source, ( $pos + strlen($rawTag) + 2)); |
| 191 | 194 | } |
| 192 | 195 | |
| 196 | + /** |
|
| 197 | + * @param string $type |
|
| 198 | + */ |
|
| 193 | 199 | function getHref($type, $params) |
| 194 | 200 | { |
| 195 | 201 | $href = ''; |
@@ -531,6 +537,9 @@ discard block |
||
| 531 | 537 | echo round(( microtime(true) - INJI_TIME_START), 4); |
| 532 | 538 | } |
| 533 | 539 | |
| 540 | + /** |
|
| 541 | + * @param string $type |
|
| 542 | + */ |
|
| 534 | 543 | function customAsset($type, $asset, $lib = false) |
| 535 | 544 | { |
| 536 | 545 | if (!$lib) { |
@@ -549,6 +558,9 @@ discard block |
||
| 549 | 558 | } |
| 550 | 559 | } |
| 551 | 560 | |
| 561 | + /** |
|
| 562 | + * @param string $lineParams |
|
| 563 | + */ |
|
| 552 | 564 | function widget($_widgetName, $_params = [], $lineParams = null) |
| 553 | 565 | { |
| 554 | 566 | $_paths = $this->getWidgetPaths($_widgetName); |
@@ -140,8 +140,9 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | private function parseRaw($source) |
| 142 | 142 | { |
| 143 | - if (!$source) |
|
| 144 | - return []; |
|
| 143 | + if (!$source) { |
|
| 144 | + return []; |
|
| 145 | + } |
|
| 145 | 146 | |
| 146 | 147 | preg_match_all("|{([^}]+)}|", $source, $result); |
| 147 | 148 | return $result[1]; |
@@ -327,10 +328,11 @@ discard block |
||
| 327 | 328 | $this->ResolveCssHref($css, $type, $hrefs); |
| 328 | 329 | continue; |
| 329 | 330 | } |
| 330 | - if (strpos($css, '//') !== false) |
|
| 331 | - $href = $css; |
|
| 332 | - else |
|
| 333 | - $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
| 331 | + if (strpos($css, '//') !== false) { |
|
| 332 | + $href = $css; |
|
| 333 | + } else { |
|
| 334 | + $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
| 335 | + } |
|
| 334 | 336 | $hrefs[$href] = $href; |
| 335 | 337 | } |
| 336 | 338 | break; |
@@ -340,10 +342,11 @@ discard block |
||
| 340 | 342 | $this->ResolveCssHref($css, $type, $hrefs); |
| 341 | 343 | continue; |
| 342 | 344 | } |
| 343 | - if (strpos($css, '://') !== false) |
|
| 344 | - $href = $css; |
|
| 345 | - else |
|
| 346 | - $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}"; |
|
| 345 | + if (strpos($css, '://') !== false) { |
|
| 346 | + $href = $css; |
|
| 347 | + } else { |
|
| 348 | + $href = $this->app->templatesPath . "/{$this->template->name}/css/{$css}"; |
|
| 349 | + } |
|
| 347 | 350 | $hrefs[$href] = $href; |
| 348 | 351 | } |
| 349 | 352 | break; |
@@ -353,10 +356,11 @@ discard block |
||
| 353 | 356 | $this->ResolveCssHref($css, $type, $hrefs); |
| 354 | 357 | continue; |
| 355 | 358 | } |
| 356 | - if (strpos($css, '//') !== false) |
|
| 357 | - $href = $css; |
|
| 358 | - else |
|
| 359 | - $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
| 359 | + if (strpos($css, '//') !== false) { |
|
| 360 | + $href = $css; |
|
| 361 | + } else { |
|
| 362 | + $href = ($this->app->type != 'app' ? '/' . $this->app->name : '' ) . $css; |
|
| 363 | + } |
|
| 360 | 364 | $hrefs[$href] = $href; |
| 361 | 365 | } |
| 362 | 366 | break; |
@@ -410,8 +414,9 @@ discard block |
||
| 410 | 414 | $noParsedScripts = []; |
| 411 | 415 | foreach ($scripts as $script) { |
| 412 | 416 | if (is_string($script)) { |
| 413 | - if (!empty($urls[$script])) |
|
| 414 | - continue; |
|
| 417 | + if (!empty($urls[$script])) { |
|
| 418 | + continue; |
|
| 419 | + } |
|
| 415 | 420 | |
| 416 | 421 | $path = $this->app->staticLoader->parsePath($script); |
| 417 | 422 | if (file_exists($path)) { |
@@ -422,8 +427,9 @@ discard block |
||
| 422 | 427 | $noParsedScripts[$script] = $script; |
| 423 | 428 | } |
| 424 | 429 | } elseif (!empty($script['file'])) { |
| 425 | - if (!empty($urls[$script['file']])) |
|
| 426 | - continue; |
|
| 430 | + if (!empty($urls[$script['file']])) { |
|
| 431 | + continue; |
|
| 432 | + } |
|
| 427 | 433 | |
| 428 | 434 | $path = $this->app->staticLoader->parsePath($script['file']); |
| 429 | 435 | if (file_exists($path)) { |
@@ -482,12 +488,14 @@ discard block |
||
| 482 | 488 | $this->genScriptArray($js, $type, $resultArray); |
| 483 | 489 | continue; |
| 484 | 490 | } |
| 485 | - if (strpos($js, '//') !== false) |
|
| 486 | - $href = $js; |
|
| 487 | - else |
|
| 488 | - $href = $this->getHref('js', $js); |
|
| 489 | - if (!$href) |
|
| 490 | - continue; |
|
| 491 | + if (strpos($js, '//') !== false) { |
|
| 492 | + $href = $js; |
|
| 493 | + } else { |
|
| 494 | + $href = $this->getHref('js', $js); |
|
| 495 | + } |
|
| 496 | + if (!$href) { |
|
| 497 | + continue; |
|
| 498 | + } |
|
| 491 | 499 | |
| 492 | 500 | $resultArray[] = $href; |
| 493 | 501 | } |
@@ -498,10 +506,11 @@ discard block |
||
| 498 | 506 | $this->genScriptArray($js, $type, $resultArray); |
| 499 | 507 | continue; |
| 500 | 508 | } |
| 501 | - if (strpos($js, '//') !== false) |
|
| 502 | - $href = $js; |
|
| 503 | - else |
|
| 504 | - $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}"; |
|
| 509 | + if (strpos($js, '//') !== false) { |
|
| 510 | + $href = $js; |
|
| 511 | + } else { |
|
| 512 | + $href = $this->app->templatesPath . "/{$this->template->name}/js/{$js}"; |
|
| 513 | + } |
|
| 505 | 514 | $resultArray[] = $href; |
| 506 | 515 | } |
| 507 | 516 | break; |
@@ -517,8 +526,9 @@ discard block |
||
| 517 | 526 | $asset = []; |
| 518 | 527 | } |
| 519 | 528 | $asset['file'] = $this->getHref('js', $js); |
| 520 | - if (!$asset['file']) |
|
| 521 | - continue; |
|
| 529 | + if (!$asset['file']) { |
|
| 530 | + continue; |
|
| 531 | + } |
|
| 522 | 532 | $resultArray[] = $asset; |
| 523 | 533 | } |
| 524 | 534 | break; |
@@ -568,8 +578,9 @@ discard block |
||
| 568 | 578 | $paramArray = true; |
| 569 | 579 | } |
| 570 | 580 | } |
| 571 | - if (!$paramArray) |
|
| 572 | - $lineParams = ':' . implode(':', $_params); |
|
| 581 | + if (!$paramArray) { |
|
| 582 | + $lineParams = ':' . implode(':', $_params); |
|
| 583 | + } |
|
| 573 | 584 | } |
| 574 | 585 | } |
| 575 | 586 | echo "<!--start:{WIDGET:{$_widgetName}{$lineParams}}-->\n"; |
@@ -31,6 +31,9 @@ |
||
| 31 | 31 | return $return; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | + /** |
|
| 35 | + * @param string $path |
|
| 36 | + */ |
|
| 34 | 37 | static function parseClass($path) |
| 35 | 38 | { |
| 36 | 39 | $code = file_get_contents($path); |
@@ -13,20 +13,22 @@ |
||
| 13 | 13 | static function genArray($data, $level = 0) |
| 14 | 14 | { |
| 15 | 15 | $return = ''; |
| 16 | - if ($level == 0) |
|
| 17 | - $return = "["; |
|
| 16 | + if ($level == 0) { |
|
| 17 | + $return = "["; |
|
| 18 | + } |
|
| 18 | 19 | foreach ($data as $key => $item) { |
| 19 | 20 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => "; |
| 20 | - if (!is_array($item)) |
|
| 21 | - $return .= "'{$item}',"; |
|
| 22 | - else { |
|
| 21 | + if (!is_array($item)) { |
|
| 22 | + $return .= "'{$item}',"; |
|
| 23 | + } else { |
|
| 23 | 24 | $return .= "["; |
| 24 | 25 | $return .= rtrim(self::genArray($item, $level + 1), ','); |
| 25 | 26 | $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],"; |
| 26 | 27 | } |
| 27 | 28 | } |
| 28 | - if ($level == 0) |
|
| 29 | - $return = rtrim($return, ',') . "\n];"; |
|
| 29 | + if ($level == 0) { |
|
| 30 | + $return = rtrim($return, ',') . "\n];"; |
|
| 31 | + } |
|
| 30 | 32 | |
| 31 | 33 | return $return; |
| 32 | 34 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | * the constructor |
| 90 | 90 | * |
| 91 | 91 | * @param array $options |
| 92 | - * @return boolean |
|
| 92 | + * @return boolean|null |
|
| 93 | 93 | * @since 0.5.2 |
| 94 | 94 | */ |
| 95 | 95 | public function __construct($options = false) |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | /** |
| 389 | 389 | * Use this method to get the last error ocurred |
| 390 | 390 | * @param void |
| 391 | - * @return string The last error, that occured |
|
| 391 | + * @return boolean The last error, that occured |
|
| 392 | 392 | */ |
| 393 | 393 | public function get_last_error() |
| 394 | 394 | { |
@@ -398,7 +398,7 @@ discard block |
||
| 398 | 398 | /** |
| 399 | 399 | * The actual decoding algorithm |
| 400 | 400 | * @param string |
| 401 | - * @return mixed |
|
| 401 | + * @return false|string |
|
| 402 | 402 | */ |
| 403 | 403 | protected function _decode($encoded) |
| 404 | 404 | { |
@@ -455,7 +455,7 @@ discard block |
||
| 455 | 455 | /** |
| 456 | 456 | * The actual encoding algorithm |
| 457 | 457 | * @param string |
| 458 | - * @return mixed |
|
| 458 | + * @return false|string |
|
| 459 | 459 | */ |
| 460 | 460 | protected function _encode($decoded) |
| 461 | 461 | { |
@@ -675,7 +675,7 @@ discard block |
||
| 675 | 675 | * Decomposes a Hangul syllable |
| 676 | 676 | * (see http://www.unicode.org/unicode/reports/tr15/#Hangul |
| 677 | 677 | * @param integer 32bit UCS4 code point |
| 678 | - * @return array Either Hangul Syllable decomposed or original 32bit value as one value array |
|
| 678 | + * @return integer[] Either Hangul Syllable decomposed or original 32bit value as one value array |
|
| 679 | 679 | */ |
| 680 | 680 | protected function _hangul_decompose($char) |
| 681 | 681 | { |
@@ -205,7 +205,9 @@ discard block |
||
| 205 | 205 | foreach ($arr as $k => $v) { |
| 206 | 206 | if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) { |
| 207 | 207 | $conv = $this->_decode($v); |
| 208 | - if ($conv) $arr[$k] = $conv; |
|
| 208 | + if ($conv) { |
|
| 209 | + $arr[$k] = $conv; |
|
| 210 | + } |
|
| 209 | 211 | } |
| 210 | 212 | } |
| 211 | 213 | $input = join('.', $arr); |
@@ -213,7 +215,9 @@ discard block |
||
| 213 | 215 | foreach ($arr as $k => $v) { |
| 214 | 216 | if (preg_match('!^'.preg_quote($this->_punycode_prefix, '!').'!', $v)) { |
| 215 | 217 | $conv = $this->_decode($v); |
| 216 | - if ($conv) $arr[$k] = $conv; |
|
| 218 | + if ($conv) { |
|
| 219 | + $arr[$k] = $conv; |
|
| 220 | + } |
|
| 217 | 221 | } |
| 218 | 222 | } |
| 219 | 223 | $email_pref = join('.', $arr); |
@@ -229,7 +233,9 @@ discard block |
||
| 229 | 233 | $arr = explode('.', $parsed['host']); |
| 230 | 234 | foreach ($arr as $k => $v) { |
| 231 | 235 | $conv = $this->_decode($v); |
| 232 | - if ($conv) $arr[$k] = $conv; |
|
| 236 | + if ($conv) { |
|
| 237 | + $arr[$k] = $conv; |
|
| 238 | + } |
|
| 233 | 239 | } |
| 234 | 240 | $parsed['host'] = join('.', $arr); |
| 235 | 241 | $return = |
@@ -250,7 +256,9 @@ discard block |
||
| 250 | 256 | } |
| 251 | 257 | } else { // Otherwise we consider it being a pure domain name string |
| 252 | 258 | $return = $this->_decode($input); |
| 253 | - if (!$return) $return = $input; |
|
| 259 | + if (!$return) { |
|
| 260 | + $return = $input; |
|
| 261 | + } |
|
| 254 | 262 | } |
| 255 | 263 | // The output is UTF-8 by default, other output formats need conversion here |
| 256 | 264 | // If one time encoding is given, use this, else the objects property |
@@ -294,7 +302,9 @@ discard block |
||
| 294 | 302 | } |
| 295 | 303 | |
| 296 | 304 | // No input, no output, what else did you expect? |
| 297 | - if (empty($decoded)) return ''; |
|
| 305 | + if (empty($decoded)) { |
|
| 306 | + return ''; |
|
| 307 | + } |
|
| 298 | 308 | |
| 299 | 309 | // Anchors for iteration |
| 300 | 310 | $last_begin = 0; |
@@ -371,7 +381,9 @@ discard block |
||
| 371 | 381 | $arr = explode('.', $parsed['host']); |
| 372 | 382 | foreach ($arr as $k => $v) { |
| 373 | 383 | $conv = $this->encode($v, 'utf8'); |
| 374 | - if ($conv) $arr[$k] = $conv; |
|
| 384 | + if ($conv) { |
|
| 385 | + $arr[$k] = $conv; |
|
| 386 | + } |
|
| 375 | 387 | } |
| 376 | 388 | $parsed['host'] = join('.', $arr); |
| 377 | 389 | $return = |
@@ -436,7 +448,9 @@ discard block |
||
| 436 | 448 | $idx += $digit * $w; |
| 437 | 449 | $t = ($k <= $bias) ? $this->_tmin : |
| 438 | 450 | (($k >= $bias + $this->_tmax) ? $this->_tmax : ($k - $bias)); |
| 439 | - if ($digit < $t) break; |
|
| 451 | + if ($digit < $t) { |
|
| 452 | + break; |
|
| 453 | + } |
|
| 440 | 454 | $w = (int) ($w * ($this->_base - $t)); |
| 441 | 455 | } |
| 442 | 456 | $bias = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first); |
@@ -445,7 +459,9 @@ discard block |
||
| 445 | 459 | $idx %= ($deco_len + 1); |
| 446 | 460 | if ($deco_len > 0) { |
| 447 | 461 | // Make room for the decoded char |
| 448 | - for ($i = $deco_len; $i > $idx; $i--) $decoded[$i] = $decoded[($i - 1)]; |
|
| 462 | + for ($i = $deco_len; $i > $idx; $i--) { |
|
| 463 | + $decoded[$i] = $decoded[($i - 1)]; |
|
| 464 | + } |
|
| 449 | 465 | } |
| 450 | 466 | $decoded[$idx++] = $char; |
| 451 | 467 | } |
@@ -482,9 +498,15 @@ discard block |
||
| 482 | 498 | } |
| 483 | 499 | // Do NAMEPREP |
| 484 | 500 | $decoded = $this->_nameprep($decoded); |
| 485 | - if (!$decoded || !is_array($decoded)) return false; // NAMEPREP failed |
|
| 501 | + if (!$decoded || !is_array($decoded)) { |
|
| 502 | + return false; |
|
| 503 | + } |
|
| 504 | + // NAMEPREP failed |
|
| 486 | 505 | $deco_len = count($decoded); |
| 487 | - if (!$deco_len) return false; // Empty array |
|
| 506 | + if (!$deco_len) { |
|
| 507 | + return false; |
|
| 508 | + } |
|
| 509 | + // Empty array |
|
| 488 | 510 | $codecount = 0; // How many chars have been consumed |
| 489 | 511 | $encoded = ''; |
| 490 | 512 | // Copy all basic code points to output |
@@ -497,12 +519,17 @@ discard block |
||
| 497 | 519 | $codecount++; |
| 498 | 520 | } |
| 499 | 521 | } |
| 500 | - if ($codecount == $deco_len) return $encoded; // All codepoints were basic ones |
|
| 522 | + if ($codecount == $deco_len) { |
|
| 523 | + return $encoded; |
|
| 524 | + } |
|
| 525 | + // All codepoints were basic ones |
|
| 501 | 526 | |
| 502 | 527 | // Start with the prefix; copy it to output |
| 503 | 528 | $encoded = $this->_punycode_prefix.$encoded; |
| 504 | 529 | // If we have basic code points in output, add an hyphen to the end |
| 505 | - if ($codecount) $encoded .= '-'; |
|
| 530 | + if ($codecount) { |
|
| 531 | + $encoded .= '-'; |
|
| 532 | + } |
|
| 506 | 533 | // Now find and encode all non-basic code points |
| 507 | 534 | $is_first = true; |
| 508 | 535 | $cur_code = $this->_initial_n; |
@@ -527,7 +554,9 @@ discard block |
||
| 527 | 554 | for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) { |
| 528 | 555 | $t = ($k <= $bias) ? $this->_tmin : |
| 529 | 556 | (($k >= $bias + $this->_tmax) ? $this->_tmax : $k - $bias); |
| 530 | - if ($q < $t) break; |
|
| 557 | + if ($q < $t) { |
|
| 558 | + break; |
|
| 559 | + } |
|
| 531 | 560 | $encoded .= $this->_encode_digit(intval($t + (($q - $t) % ($this->_base - $t)))); //v0.4.5 Changed from ceil() to intval() |
| 532 | 561 | $q = (int) (($q - $t) / ($this->_base - $t)); |
| 533 | 562 | } |
@@ -607,7 +636,9 @@ discard block |
||
| 607 | 636 | // While mapping required chars we apply the cannonical ordering |
| 608 | 637 | foreach ($input as $v) { |
| 609 | 638 | // Map to nothing == skip that code point |
| 610 | - if (in_array($v, self::$NP['map_nothing'])) continue; |
|
| 639 | + if (in_array($v, self::$NP['map_nothing'])) { |
|
| 640 | + continue; |
|
| 641 | + } |
|
| 611 | 642 | // Try to find prohibited input |
| 612 | 643 | if (in_array($v, self::$NP['prohibit']) || in_array($v, self::$NP['general_prohibited'])) { |
| 613 | 644 | $this->_error('NAMEPREP: Prohibited input U+'.sprintf('%08X', $v)); |
@@ -654,7 +685,9 @@ discard block |
||
| 654 | 685 | if ($out) { |
| 655 | 686 | $output[$last_starter] = $out; |
| 656 | 687 | if (count($out) != $seq_len) { |
| 657 | - for ($j = $i+1; $j < $out_len; ++$j) $output[$j-1] = $output[$j]; |
|
| 688 | + for ($j = $i+1; $j < $out_len; ++$j) { |
|
| 689 | + $output[$j-1] = $output[$j]; |
|
| 690 | + } |
|
| 658 | 691 | unset($output[$out_len]); |
| 659 | 692 | } |
| 660 | 693 | // Rewind the for loop by one, since there can be more possible compositions |
@@ -665,7 +698,9 @@ discard block |
||
| 665 | 698 | } |
| 666 | 699 | } |
| 667 | 700 | // The current class is 0 |
| 668 | - if (!$class) $last_starter = $i; |
|
| 701 | + if (!$class) { |
|
| 702 | + $last_starter = $i; |
|
| 703 | + } |
|
| 669 | 704 | $last_class = $class; |
| 670 | 705 | } |
| 671 | 706 | return $output; |
@@ -680,12 +715,16 @@ discard block |
||
| 680 | 715 | protected function _hangul_decompose($char) |
| 681 | 716 | { |
| 682 | 717 | $sindex = (int) $char - $this->_sbase; |
| 683 | - if ($sindex < 0 || $sindex >= $this->_scount) return array($char); |
|
| 718 | + if ($sindex < 0 || $sindex >= $this->_scount) { |
|
| 719 | + return array($char); |
|
| 720 | + } |
|
| 684 | 721 | $result = array(); |
| 685 | 722 | $result[] = (int) $this->_lbase + $sindex / $this->_ncount; |
| 686 | 723 | $result[] = (int) $this->_vbase + ($sindex % $this->_ncount) / $this->_tcount; |
| 687 | 724 | $T = intval($this->_tbase + $sindex % $this->_tcount); |
| 688 | - if ($T != $this->_tbase) $result[] = $T; |
|
| 725 | + if ($T != $this->_tbase) { |
|
| 726 | + $result[] = $T; |
|
| 727 | + } |
|
| 689 | 728 | return $result; |
| 690 | 729 | } |
| 691 | 730 | /** |
@@ -697,7 +736,9 @@ discard block |
||
| 697 | 736 | protected function _hangul_compose($input) |
| 698 | 737 | { |
| 699 | 738 | $inp_len = count($input); |
| 700 | - if (!$inp_len) return array(); |
|
| 739 | + if (!$inp_len) { |
|
| 740 | + return array(); |
|
| 741 | + } |
|
| 701 | 742 | $result = array(); |
| 702 | 743 | $last = (int) $input[0]; |
| 703 | 744 | $result[] = $last; // copy first char from input to output |
@@ -757,7 +798,9 @@ discard block |
||
| 757 | 798 | if ($next != 0 && $last > $next) { |
| 758 | 799 | // Move item leftward until it fits |
| 759 | 800 | for ($j = $i + 1; $j > 0; --$j) { |
| 760 | - if ($this->_get_combining_class(intval($input[$j-1])) <= $next) break; |
|
| 801 | + if ($this->_get_combining_class(intval($input[$j-1])) <= $next) { |
|
| 802 | + break; |
|
| 803 | + } |
|
| 761 | 804 | $t = intval($input[$j]); |
| 762 | 805 | $input[$j] = intval($input[$j-1]); |
| 763 | 806 | $input[$j-1] = $t; |
@@ -784,8 +827,12 @@ discard block |
||
| 784 | 827 | return false; |
| 785 | 828 | } |
| 786 | 829 | foreach (self::$NP['replacemaps'] as $np_src => $np_target) { |
| 787 | - if ($np_target[0] != $input[0]) continue; |
|
| 788 | - if (count($np_target) != $inp_len) continue; |
|
| 830 | + if ($np_target[0] != $input[0]) { |
|
| 831 | + continue; |
|
| 832 | + } |
|
| 833 | + if (count($np_target) != $inp_len) { |
|
| 834 | + continue; |
|
| 835 | + } |
|
| 789 | 836 | $hit = false; |
| 790 | 837 | foreach ($input as $k2 => $v2) { |
| 791 | 838 | if ($v2 == $np_target[$k2]) { |
@@ -795,7 +842,9 @@ discard block |
||
| 795 | 842 | break; |
| 796 | 843 | } |
| 797 | 844 | } |
| 798 | - if ($hit) return $np_src; |
|
| 845 | + if ($hit) { |
|
| 846 | + return $np_src; |
|
| 847 | + } |
|
| 799 | 848 | } |
| 800 | 849 | return false; |
| 801 | 850 | } |
@@ -948,7 +997,9 @@ discard block |
||
| 948 | 997 | return false; |
| 949 | 998 | } |
| 950 | 999 | // Empty input - return empty output |
| 951 | - if (!$inp_len) return $output; |
|
| 1000 | + if (!$inp_len) { |
|
| 1001 | + return $output; |
|
| 1002 | + } |
|
| 952 | 1003 | for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) { |
| 953 | 1004 | // Increment output position every 4 input bytes |
| 954 | 1005 | if (!($i % 4)) { |