@@ -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) |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | static function uriParse($uri) |
39 | 39 | { |
40 | 40 | $answerPos = strpos($uri, '?'); |
41 | - $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1); |
|
41 | + $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri))), 1); |
|
42 | 42 | |
43 | 43 | foreach ($params as $key => $param) { |
44 | 44 | if ($param != '') { |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center') |
86 | 86 | { |
87 | 87 | ini_set("gd.jpeg_ignore_warning", 1); |
88 | - list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path); |
|
88 | + list($img_width, $img_height, $img_type, $img_tag) = getimagesize($img_path); |
|
89 | 89 | switch ($img_type) { |
90 | 90 | case 1: |
91 | 91 | $img_type = 'gif'; |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | |
109 | 109 | if ($crop === true || $crop == 'q') { |
110 | 110 | if ($img_width > $img_height) { |
111 | - $imgX = floor(( $img_width - $img_height ) / 2); |
|
111 | + $imgX = floor(($img_width - $img_height) / 2); |
|
112 | 112 | $imgY = 0; |
113 | 113 | $img_width = $img_height; |
114 | 114 | $new_width = $max_width; |
115 | 115 | $new_height = $max_height; |
116 | 116 | } else { |
117 | 117 | $imgX = 0; |
118 | - $imgY = floor(( $img_height - $img_width ) / 2); |
|
118 | + $imgY = floor(($img_height - $img_width) / 2); |
|
119 | 119 | $img_height = $img_width; |
120 | 120 | $new_width = $max_width; |
121 | 121 | $new_height = $max_height; |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | $new_width = $max_width; |
137 | 137 | $new_height = $max_height; |
138 | 138 | //Находим начальные координаты (центрируем новое изображение) |
139 | - $imgX = (int) (($ow / 2) - ($img_width / 2) ); |
|
139 | + $imgX = (int) (($ow / 2) - ($img_width / 2)); |
|
140 | 140 | if ($pos == 'center') { |
141 | 141 | $imgY = (int) (($oh / 2) - ($img_height / 2)); |
142 | 142 | } else { |
@@ -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'; |
@@ -288,7 +288,7 @@ |
||
288 | 288 | } |
289 | 289 | } |
290 | 290 | $update = implode(',', $updates); |
291 | - $query .=" SET {$update}"; |
|
291 | + $query .= " SET {$update}"; |
|
292 | 292 | case 'SELECT': |
293 | 293 | case 'DELETE': |
294 | 294 | $this->buildWhere($this->where); |
@@ -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 |
@@ -25,7 +25,7 @@ |
||
25 | 25 | |
26 | 26 | function parseColsForModel($cols = []) |
27 | 27 | { |
28 | - $modelCols = [ 'labels' => [], 'cols' => [], 'relations' => []]; |
|
28 | + $modelCols = ['labels' => [], 'cols' => [], 'relations' => []]; |
|
29 | 29 | foreach ($cols as $col) { |
30 | 30 | $modelCols['labels'][$col['code']] = $col['label']; |
31 | 31 | $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type']; |
@@ -280,7 +280,7 @@ |
||
280 | 280 | /** |
281 | 281 | * Draw error message |
282 | 282 | * |
283 | - * @param text $errorText |
|
283 | + * @param string $errorText |
|
284 | 284 | */ |
285 | 285 | function drawError($errorText) |
286 | 286 | { |
@@ -73,7 +73,7 @@ |
||
73 | 73 | $this->model->_params[$modelName::index()] = 0; |
74 | 74 | } |
75 | 75 | $relOptions['model']::fixPrefix($relOptions['col']); |
76 | - $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]); |
|
76 | + $inputs[$col] = new ActiveForm(new $relOptions['model']([$relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]); |
|
77 | 77 | } |
78 | 78 | $inputs[$col]->parent = $this; |
79 | 79 | } elseif (!empty($modelName::$cols[$col])) { |
@@ -319,6 +319,9 @@ discard block |
||
319 | 319 | return $rows; |
320 | 320 | } |
321 | 321 | |
322 | + /** |
|
323 | + * @param DataManager $dataManager |
|
324 | + */ |
|
322 | 325 | static function drawCol($item, $colName, $params = [], $dataManager = null, $originalCol = '', $originalItem = null) |
323 | 326 | { |
324 | 327 | $modelName = get_class($item); |
@@ -668,7 +671,7 @@ discard block |
||
668 | 671 | /** |
669 | 672 | * Draw error message |
670 | 673 | * |
671 | - * @param text $errorText |
|
674 | + * @param string $errorText |
|
672 | 675 | */ |
673 | 676 | function drawError($errorText) |
674 | 677 | { |
@@ -397,7 +397,7 @@ |
||
397 | 397 | return $item->$colName; |
398 | 398 | } |
399 | 399 | } elseif (!empty($modelName::$cols[$colName]['type'])) { |
400 | - if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) { |
|
400 | + if (\App::$cur->name == 'admin' && $originalCol == 'name' || ($dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) { |
|
401 | 401 | $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager'; |
402 | 402 | $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem)); |
403 | 403 | return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($originalItem)) . "/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>"; |
@@ -45,6 +45,10 @@ |
||
45 | 45 | \App::$cur->view->widget('Ui\\' . $this->options['widgetsDir'] . '/begin', $params); |
46 | 46 | } |
47 | 47 | |
48 | + /** |
|
49 | + * @param string $type |
|
50 | + * @param string $name |
|
51 | + */ |
|
48 | 52 | function input($type, $name, $label = '', $options = []) |
49 | 53 | { |
50 | 54 | switch ($type) { |
@@ -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); |
@@ -296,7 +296,7 @@ |
||
296 | 296 | $to = $user_mail; |
297 | 297 | $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME); |
298 | 298 | $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass; |
299 | - $text .='<br />'; |
|
299 | + $text .= '<br />'; |
|
300 | 300 | $text .= '<br />'; |
301 | 301 | $text .= 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>'; |
302 | 302 | Tools::sendMail($from, $to, $subject, $text); |