@@ -7,8 +7,8 @@ |
||
7 | 7 | $numericRating = 0; |
8 | 8 | if ($rating > 0) { |
9 | 9 | $cssRatingClass = 'label-success'; |
10 | - $numericRating = '+' . $rating; |
|
11 | -} elseif($rating < 0) { |
|
10 | + $numericRating = '+'.$rating; |
|
11 | +} elseif ($rating < 0) { |
|
12 | 12 | $cssRatingClass = 'label-danger'; |
13 | 13 | $numericRating = $rating; |
14 | 14 | } |
@@ -30,9 +30,9 @@ |
||
30 | 30 | if (Obj::isArray($notify) && count($notify) > 0) { |
31 | 31 | foreach ($notify as $type => $messages) { |
32 | 32 | foreach ($messages as $message) { |
33 | - echo '<p class="alert ' . type2html($type) . '"> |
|
33 | + echo '<p class="alert '.type2html($type).'"> |
|
34 | 34 | <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>' |
35 | - . \Ffcms\Core\App::$Security->strip_tags($message) . '</p>'; |
|
35 | + . \Ffcms\Core\App::$Security->strip_tags($message).'</p>'; |
|
36 | 36 | } |
37 | 37 | } |
38 | 38 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | <?php |
17 | 17 | $customCssCode = \App::$View->showPlainCode('css'); |
18 | 18 | if ($customCssCode !== null) { |
19 | - echo '<style>' . $customCssCode . '</style>'; |
|
19 | + echo '<style>'.$customCssCode.'</style>'; |
|
20 | 20 | } ?> |
21 | 21 | <script> |
22 | 22 | window.jQ = []; |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | <?php |
63 | 63 | $customJsCode = \App::$View->showPlainCode('js'); |
64 | 64 | if ($customJsCode !== null) { |
65 | - echo '<script>' . $customJsCode . '</script>'; |
|
65 | + echo '<script>'.$customJsCode.'</script>'; |
|
66 | 66 | } |
67 | 67 | ?> |
68 | 68 | </body> |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $this->beginTime = time(); |
34 | 34 | |
35 | 35 | $this->signatures = new \DOMDocument(); |
36 | - $this->signatures->load(root . '/Private/Antivirus/Signatures.xml'); |
|
36 | + $this->signatures->load(root.'/Private/Antivirus/Signatures.xml'); |
|
37 | 37 | |
38 | 38 | // list of files is not prepared, 1st iteration |
39 | 39 | if (!File::exist('/Private/Antivirus/ScanFiles.json')) { |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | $this->scanFiles = json_decode(File::read('/Private/Antivirus/ScanFiles.json')); |
48 | 48 | if (File::exist('/Private/Antivirus/Infected.json')) { |
49 | - $this->infected = (array)json_decode(File::read('/Private/Antivirus/Infected.json')); |
|
49 | + $this->infected = (array) json_decode(File::read('/Private/Antivirus/Infected.json')); |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
@@ -108,13 +108,13 @@ discard block |
||
108 | 108 | |
109 | 109 | switch ($attrFormat) { |
110 | 110 | case 're': |
111 | - if ((preg_match('#(' . $sigContent . ')#smi', $content, $found, PREG_OFFSET_CAPTURE)) || |
|
112 | - (preg_match('#(' . $sigContent . ')#smi', $normalized, $found, PREG_OFFSET_CAPTURE)) |
|
111 | + if ((preg_match('#('.$sigContent.')#smi', $content, $found, PREG_OFFSET_CAPTURE)) || |
|
112 | + (preg_match('#('.$sigContent.')#smi', $normalized, $found, PREG_OFFSET_CAPTURE)) |
|
113 | 113 | ) { |
114 | 114 | $detected = true; |
115 | 115 | $pos = $found[0][1]; |
116 | 116 | $this->infected[$path][] = [ |
117 | - 'pos' => (int)$pos, |
|
117 | + 'pos' => (int) $pos, |
|
118 | 118 | 'sigId' => $attrId, |
119 | 119 | 'sigRule' => $sigContent, |
120 | 120 | 'sever' => $attrSever, |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | (($pos = strpos($normalized, $sigContent)) !== false) |
129 | 129 | ) { |
130 | 130 | $this->infected[$path][] = [ |
131 | - 'pos' => (int)$pos, |
|
131 | + 'pos' => (int) $pos, |
|
132 | 132 | 'sigId' => $attrId, |
133 | 133 | 'sigRule' => $sigContent, |
134 | 134 | 'sever' => $attrSever, |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | */ |
149 | 149 | private function prepareScanlist() |
150 | 150 | { |
151 | - $files = (object)File::listFiles(root, $this->affectedExt); |
|
151 | + $files = (object) File::listFiles(root, $this->affectedExt); |
|
152 | 152 | File::write('/Private/Antivirus/ScanFiles.json', json_encode($files)); |
153 | 153 | } |
154 | 154 |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | public function actionIndex() |
33 | 33 | { |
34 | 34 | // set current page and offset |
35 | - $page = (int)App::$Request->query->get('page'); |
|
35 | + $page = (int) App::$Request->query->get('page'); |
|
36 | 36 | $offset = $page * self::ITEM_PER_PAGE; |
37 | 37 | |
38 | 38 | // get feedback posts AR table |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | |
74 | 74 | // initialize model with answer add if thread is not closed |
75 | 75 | $model = null; |
76 | - if ((int)$record->closed !== 1) { |
|
76 | + if ((int) $record->closed !== 1) { |
|
77 | 77 | $model = new FormAnswerAdd($record, App::$User->identity()->getId()); |
78 | 78 | if ($model->send()) { |
79 | 79 | if ($model->validate()) { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | case 'answer': |
105 | 105 | $record = FeedbackAnswer::find($id); |
106 | 106 | if ($record !== null && $record !== false) { |
107 | - $postId = (int)$record->getFeedbackPost()->id; |
|
107 | + $postId = (int) $record->getFeedbackPost()->id; |
|
108 | 108 | } |
109 | 109 | break; |
110 | 110 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | if ($model->validate()) { |
121 | 121 | $model->make(); |
122 | 122 | App::$Session->getFlashBag()->add('success', __('Feedback item are successful changed')); |
123 | - App::$Response->redirect('feedback/read/' . $postId); |
|
123 | + App::$Response->redirect('feedback/read/'.$postId); |
|
124 | 124 | } else { |
125 | 125 | App::$Session->getFlashBag()->add('danger', __('Updating is failed')); |
126 | 126 | } |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | App::$Session->getFlashBag()->add('success', __('Feedback request is changed!')); |
171 | 171 | |
172 | 172 | // redirect to feedback post read |
173 | - App::$Response->redirect('feedback/read/' . $id); |
|
173 | + App::$Response->redirect('feedback/read/'.$id); |
|
174 | 174 | return null; |
175 | 175 | } |
176 | 176 | |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | // its a answer, lets remove it and redirect back in post |
215 | 215 | $postId = $record->feedback_id; |
216 | 216 | $record->delete(); |
217 | - App::$Response->redirect('feedback/read/' . $postId); |
|
217 | + App::$Response->redirect('feedback/read/'.$postId); |
|
218 | 218 | } |
219 | 219 | } |
220 | 220 |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $query = new ProfileRecords(); |
33 | 33 | |
34 | 34 | // set current page and offset |
35 | - $page = (int)App::$Request->query->get('page'); |
|
35 | + $page = (int) App::$Request->query->get('page'); |
|
36 | 36 | $offset = $page * self::ITEM_PER_PAGE; |
37 | 37 | |
38 | 38 | // build pagination |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | */ |
60 | 60 | public function actionDelete($id) |
61 | 61 | { |
62 | - App::$Response->redirect('user/delete/' . $id); |
|
62 | + App::$Response->redirect('user/delete/'.$id); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -40,19 +40,19 @@ discard block |
||
40 | 40 | { |
41 | 41 | // get configs |
42 | 42 | $configs = $this->getConfigs(); |
43 | - if (!App::$User->isAuth() && (int)$configs['guestAdd'] !== 1) { |
|
43 | + if (!App::$User->isAuth() && (int) $configs['guestAdd'] !== 1) { |
|
44 | 44 | throw new ForbiddenException(__('Feedback available only for authorized users')); |
45 | 45 | } |
46 | 46 | |
47 | 47 | // initialize model |
48 | - $model = new FormFeedbackAdd((int)$configs['useCaptcha'] === 1); |
|
48 | + $model = new FormFeedbackAdd((int) $configs['useCaptcha'] === 1); |
|
49 | 49 | if ($model->send()) { |
50 | 50 | if ($model->validate()) { |
51 | 51 | // if validation is passed save data to db and get row |
52 | 52 | $record = $model->make(); |
53 | 53 | App::$Session->getFlashBag()->add('success', __('Your message was added successful')); |
54 | 54 | // todo: add email notification |
55 | - App::$Response->redirect('feedback/read/' . $record->id . '/' . $record->hash); |
|
55 | + App::$Response->redirect('feedback/read/'.$record->id.'/'.$record->hash); |
|
56 | 56 | } else { |
57 | 57 | App::$Session->getFlashBag()->add('error', __('Message is not sended! Please, fix issues in form below')); |
58 | 58 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | // render output view |
62 | 62 | return App::$View->render('create', [ |
63 | 63 | 'model' => $model->export(), |
64 | - 'useCaptcha' => (int)$configs['useCaptcha'] === 1 |
|
64 | + 'useCaptcha' => (int) $configs['useCaptcha'] === 1 |
|
65 | 65 | ]); |
66 | 66 | } |
67 | 67 | |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $userId = App::$User->isAuth() ? App::$User->identity()->getId() : 0; |
93 | 93 | $model = null; |
94 | 94 | // check if feedback post is not closed for answers |
95 | - if ((int)$recordPost->closed === 0) { |
|
95 | + if ((int) $recordPost->closed === 0) { |
|
96 | 96 | // init new answer add model |
97 | 97 | $model = new FormAnswerAdd($recordPost, $userId); |
98 | 98 | // if answer is sender lets try to make it model |
@@ -127,10 +127,10 @@ discard block |
||
127 | 127 | // check if action is submited |
128 | 128 | if (App::$Request->request->get('closeRequest', false)) { |
129 | 129 | // if created by authorized user |
130 | - if ((int)$record->user_id !== 0) { |
|
130 | + if ((int) $record->user_id !== 0) { |
|
131 | 131 | $user = App::$User->identity(); |
132 | 132 | // button is pressed not by request creator |
133 | - if ($user === null || $user->getId() !== (int)$record->user_id) { |
|
133 | + if ($user === null || $user->getId() !== (int) $record->user_id) { |
|
134 | 134 | throw new ForbiddenException(__('This feedback request was created by another user')); |
135 | 135 | } |
136 | 136 | } |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | |
142 | 142 | // add notification and redirect |
143 | 143 | App::$Session->getFlashBag()->add('warning', __('Feedback request now is closed!')); |
144 | - App::$Response->redirect('feedback/read/' . $id . '/' . $hash); |
|
144 | + App::$Response->redirect('feedback/read/'.$id.'/'.$hash); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | return App::$View->render('close'); |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | public function actionList() |
157 | 157 | { |
158 | 158 | // set current page and offset |
159 | - $page = (int)App::$Request->query->get('page'); |
|
159 | + $page = (int) App::$Request->query->get('page'); |
|
160 | 160 | $offset = $page * self::ITEM_PER_PAGE; |
161 | 161 | |
162 | 162 | // check if user is authorized or throw exception |
@@ -36,9 +36,9 @@ discard block |
||
36 | 36 | $records = null; |
37 | 37 | |
38 | 38 | // set current page and offset |
39 | - $page = (int)App::$Request->query->get('page'); |
|
39 | + $page = (int) App::$Request->query->get('page'); |
|
40 | 40 | $cfgs = Serialize::decode($this->application->configs); |
41 | - $userPerPage = (int)$cfgs['usersOnPage']; |
|
41 | + $userPerPage = (int) $cfgs['usersOnPage']; |
|
42 | 42 | if ($userPerPage < 1) { |
43 | 43 | $userPerPage = 1; |
44 | 44 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | switch ($filter_name) { |
48 | 48 | case 'rating': // rating list, order by rating DESC |
49 | 49 | // check if rating is enabled |
50 | - if ((int)$cfgs['rating'] !== 1) { |
|
50 | + if ((int) $cfgs['rating'] !== 1) { |
|
51 | 51 | throw new NotFoundException(); |
52 | 52 | } |
53 | 53 | $records = (new ProfileRecords())->orderBy('rating', 'DESC'); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | if (Str::likeEmpty($filter_value)) { |
57 | 57 | throw new NotFoundException(); |
58 | 58 | } |
59 | - $records = (new ProfileRecords())->where('hobby', 'like', '%' . $filter_value . '%'); |
|
59 | + $records = (new ProfileRecords())->where('hobby', 'like', '%'.$filter_value.'%'); |
|
60 | 60 | break; |
61 | 61 | case 'city': |
62 | 62 | if (Str::likeEmpty($filter_value)) { |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | if ($filter_value === null || !Obj::isLikeInt($filter_value)) { |
69 | 69 | throw new NotFoundException(); |
70 | 70 | } |
71 | - $records = (new ProfileRecords())->where('birthday', 'like', $filter_value . '-%'); |
|
71 | + $records = (new ProfileRecords())->where('birthday', 'like', $filter_value.'-%'); |
|
72 | 72 | break; |
73 | 73 | case 'all': |
74 | 74 | $records = (new ProfileRecords())->orderBy('id', 'DESC'); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | 'pagination' => $pagination, |
92 | 92 | 'id' => $filter_name, |
93 | 93 | 'add' => $filter_value, |
94 | - 'ratingOn' => (int)$cfgs['rating'] |
|
94 | + 'ratingOn' => (int) $cfgs['rating'] |
|
95 | 95 | ]); |
96 | 96 | } |
97 | 97 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | public function actionShow($userId) |
105 | 105 | { |
106 | 106 | $cfg = Serialize::decode($this->application->configs); |
107 | - if ((int)$cfg['guestView'] !== 1 && !App::$User->isAuth()) { |
|
107 | + if ((int) $cfg['guestView'] !== 1 && !App::$User->isAuth()) { |
|
108 | 108 | throw new ForbiddenException('You must be registered user to view other profile'); |
109 | 109 | } |
110 | 110 | // check if target exists |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | App::$Session->getFlashBag()->add('error', __('This user are in your black list or you are in blacklist!')); |
127 | 127 | } else { |
128 | 128 | // check if message added |
129 | - if ($wallModel->makePost($targetPersone, $viewerPersone, (int)$cfg['delayBetweenPost'])) { |
|
129 | + if ($wallModel->makePost($targetPersone, $viewerPersone, (int) $cfg['delayBetweenPost'])) { |
|
130 | 130 | App::$Session->getFlashBag()->add('success', __('The message was successful posted!')); |
131 | 131 | } else { |
132 | 132 | App::$Session->getFlashBag()->add('warning', __('Posting message was failed! You need to wait some time...')); |
@@ -137,8 +137,8 @@ discard block |
||
137 | 137 | |
138 | 138 | $query = $targetPersone->getWall(); // relation hasMany from users to walls |
139 | 139 | // pagination and query params |
140 | - $wallPage = (int)App::$Request->query->get('page'); |
|
141 | - $wallItems = (int)$cfg['wallPostOnPage']; |
|
140 | + $wallPage = (int) App::$Request->query->get('page'); |
|
141 | + $wallItems = (int) $cfg['wallPostOnPage']; |
|
142 | 142 | $wallOffset = $wallPage * $wallItems; |
143 | 143 | |
144 | 144 | // build pagination |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | 'notify' => App::$Session->getFlashBag()->all(), |
161 | 161 | 'wallRecords' => $wallRecords, |
162 | 162 | 'pagination' => $wallPagination, |
163 | - 'ratingOn' => (int)$cfg['rating'] === 1 |
|
163 | + 'ratingOn' => (int) $cfg['rating'] === 1 |
|
164 | 164 | ]); |
165 | 165 | } |
166 | 166 | |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | $wallModel = new FormWallPostDelete($wallPost); |
228 | 228 | if ($wallModel->send() && $wallModel->validate()) { |
229 | 229 | $wallModel->make(); |
230 | - App::$Response->redirect('profile/show/' . $wallPost->target_id); |
|
230 | + App::$Response->redirect('profile/show/'.$wallPost->target_id); |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | return App::$View->render('wall_delete', [ |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | |
321 | 321 | // set user id from ?id= get param if form not sended |
322 | 322 | if (!$model->send()) { |
323 | - $uid = (int)App::$Request->query->get('id'); |
|
323 | + $uid = (int) App::$Request->query->get('id'); |
|
324 | 324 | if ($uid > 0) { |
325 | 325 | $model->id = $uid; |
326 | 326 | } |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | // get blocked users |
339 | 339 | $records = Blacklist::where('user_id', '=', $user->getId()); |
340 | 340 | |
341 | - $page = (int)App::$Request->query->get('page'); |
|
341 | + $page = (int) App::$Request->query->get('page'); |
|
342 | 342 | $offset = $page * self::BLOCK_PER_PAGE; |
343 | 343 | |
344 | 344 | // build pagination |
@@ -410,9 +410,9 @@ discard block |
||
410 | 410 | // check if request is sended |
411 | 411 | if ($model->send() && $model->validate()) { |
412 | 412 | // get records from db |
413 | - $records = ProfileRecords::where('nick', 'like', '%' . $model->query . '%'); |
|
414 | - $page = (int)App::$Request->query->get('page'); |
|
415 | - $userPerPage = (int)$cfgs['usersOnPage']; |
|
413 | + $records = ProfileRecords::where('nick', 'like', '%'.$model->query.'%'); |
|
414 | + $page = (int) App::$Request->query->get('page'); |
|
415 | + $userPerPage = (int) $cfgs['usersOnPage']; |
|
416 | 416 | if ($userPerPage < 1) { |
417 | 417 | $userPerPage = 1; |
418 | 418 | } |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | 'model' => $model->export(), |
435 | 435 | 'records' => $records, |
436 | 436 | 'pagination' => $pagination, |
437 | - 'ratingOn' => (int)$cfgs['rating'] |
|
437 | + 'ratingOn' => (int) $cfgs['rating'] |
|
438 | 438 | ]); |
439 | 439 | } |
440 | 440 | } |
441 | 441 | \ No newline at end of file |
@@ -41,16 +41,16 @@ discard block |
||
41 | 41 | public function actionInfo() |
42 | 42 | { |
43 | 43 | $text = "\nInformation about FFCMS package and environment: \n\n"; |
44 | - $text .= "\t PHP version: " . phpversion() . "\n"; |
|
45 | - $text .= "\t Dist path: " . root . "\n"; |
|
46 | - $text .= "\t Used version: " . App::$Properties->version['num'] . ' [build: ' . App::$Properties->version['date'] . "]\n\n"; |
|
44 | + $text .= "\t PHP version: ".phpversion()."\n"; |
|
45 | + $text .= "\t Dist path: ".root."\n"; |
|
46 | + $text .= "\t Used version: ".App::$Properties->version['num'].' [build: '.App::$Properties->version['date']."]\n\n"; |
|
47 | 47 | $text .= "Information about FFCMS cmf packages: \n\n"; |
48 | 48 | |
49 | 49 | $composerInfo = File::read('/composer.lock'); |
50 | 50 | if (false !== $composerInfo) { |
51 | 51 | $jsonInfo = json_decode($composerInfo); |
52 | 52 | foreach ($jsonInfo->packages as $item) { |
53 | - $text .= "\t Package: " . $item->name . ' => ' . $item->version . "\n"; |
|
53 | + $text .= "\t Package: ".$item->name.' => '.$item->version."\n"; |
|
54 | 54 | } |
55 | 55 | } else { |
56 | 56 | $text .= "\t Composer is never be used - no information available."; |
@@ -86,16 +86,16 @@ discard block |
||
86 | 86 | preg_match_all('/public function action(\w*?)\(/', $byte, $matches); // matches[0] contains all methods ;) |
87 | 87 | if (Obj::isArray($matches[1]) && count($matches[1]) > 0) { |
88 | 88 | foreach ($matches[1] as $perm) { |
89 | - $permissions[] = 'Admin/' . $className . '/' . $perm; |
|
89 | + $permissions[] = 'Admin/'.$className.'/'.$perm; |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | } |
93 | 93 | |
94 | 94 | // prepare save string |
95 | - $stringSave = "<?php \n\nreturn " . var_export($permissions, true) . ';'; |
|
95 | + $stringSave = "<?php \n\nreturn ".var_export($permissions, true).';'; |
|
96 | 96 | File::write('/Private/Config/Permissions.php', $stringSave); |
97 | 97 | |
98 | - return App::$Output->write('Permission mas is successful updated! Founded permissions: ' . count($permissions)); |
|
98 | + return App::$Output->write('Permission mas is successful updated! Founded permissions: '.count($permissions)); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -108,9 +108,9 @@ discard block |
||
108 | 108 | if (Directory::exist($obj)) { |
109 | 109 | Directory::recursiveChmod($obj, 0777); |
110 | 110 | } elseif (File::exist($obj)) { |
111 | - chmod(root . $obj, 0777); |
|
111 | + chmod(root.$obj, 0777); |
|
112 | 112 | } else { |
113 | - $errors .= App::$Output->write('Filesystem object is not founded: ' . $obj); |
|
113 | + $errors .= App::$Output->write('Filesystem object is not founded: '.$obj); |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | |
@@ -144,38 +144,38 @@ discard block |
||
144 | 144 | |
145 | 145 | // database config from input |
146 | 146 | echo App::$Output->writeHeader('Database connection configuration'); |
147 | - echo 'Driver(default:' . $config['driver'] . '):'; |
|
147 | + echo 'Driver(default:'.$config['driver'].'):'; |
|
148 | 148 | $dbDriver = App::$Input->read(); |
149 | 149 | if (Arr::in($dbDriver, ['mysql', 'pgsql', 'sqlite'])) { |
150 | 150 | $newConfig['driver'] = $dbDriver; |
151 | 151 | } |
152 | 152 | |
153 | 153 | // for sqlite its would be a path |
154 | - echo 'Host(default:' . $config['host'] . '):'; |
|
154 | + echo 'Host(default:'.$config['host'].'):'; |
|
155 | 155 | $dbHost = App::$Input->read(); |
156 | 156 | if (!Str::likeEmpty($dbHost)) { |
157 | 157 | $newConfig['host'] = $dbHost; |
158 | 158 | } |
159 | 159 | |
160 | - echo 'Database name(default:' . $config['database'] . '):'; |
|
160 | + echo 'Database name(default:'.$config['database'].'):'; |
|
161 | 161 | $dbName = App::$Input->read(); |
162 | 162 | if (!Str::likeEmpty($dbName)) { |
163 | 163 | $newConfig['database'] = $dbName; |
164 | 164 | } |
165 | 165 | |
166 | - echo 'User(default:' . $config['username'] . '):'; |
|
166 | + echo 'User(default:'.$config['username'].'):'; |
|
167 | 167 | $dbUser = App::$Input->read(); |
168 | 168 | if (!Str::likeEmpty($dbUser)) { |
169 | 169 | $newConfig['username'] = $dbUser; |
170 | 170 | } |
171 | 171 | |
172 | - echo 'Password(default:' . $config['password'] . '):'; |
|
172 | + echo 'Password(default:'.$config['password'].'):'; |
|
173 | 173 | $dbPwd = App::$Input->read(); |
174 | 174 | if (!Str::likeEmpty($dbPwd)) { |
175 | 175 | $newConfig['password'] = $dbPwd; |
176 | 176 | } |
177 | 177 | |
178 | - echo 'Table prefix(default:' . $config['prefix'] . '):'; |
|
178 | + echo 'Table prefix(default:'.$config['prefix'].'):'; |
|
179 | 179 | $dbPrefix = App::$Input->read(); |
180 | 180 | if (!Str::likeEmpty($dbPrefix)) { |
181 | 181 | $newConfig['prefix'] = $dbPrefix; |
@@ -188,11 +188,11 @@ discard block |
||
188 | 188 | try { |
189 | 189 | App::$Database->connection('install')->getDatabaseName(); |
190 | 190 | } catch (\Exception $e) { |
191 | - return 'Testing database connection is failed! Run installer again and pass tested connection data! Log: ' . $e->getMessage(); |
|
191 | + return 'Testing database connection is failed! Run installer again and pass tested connection data! Log: '.$e->getMessage(); |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | // autoload isn't work here |
195 | - include(root . '/Apps/Controller/Console/Db.php'); |
|
195 | + include(root.'/Apps/Controller/Console/Db.php'); |
|
196 | 196 | |
197 | 197 | // import db data |
198 | 198 | $dbController = new DbController(); |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | |
201 | 201 | // set website send from email from input |
202 | 202 | $emailConfig = App::$Properties->get('adminEmail'); |
203 | - echo 'Website sendFrom email(default: ' . $emailConfig . '):'; |
|
203 | + echo 'Website sendFrom email(default: '.$emailConfig.'):'; |
|
204 | 204 | $email = App::$Input->read(); |
205 | 205 | if (!Str::isEmail($email)) { |
206 | 206 | $email = $emailConfig; |
@@ -212,9 +212,9 @@ discard block |
||
212 | 212 | $allCfg['database'] = $dbConfigs; |
213 | 213 | $allCfg['adminEmail'] = $email; |
214 | 214 | echo App::$Output->write('Generate password salt for BLOWFISH crypt'); |
215 | - $allCfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$'; |
|
215 | + $allCfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$'; |
|
216 | 216 | echo App::$Output->write('Generate security cookies for debug panel'); |
217 | - $allCfg['debug']['cookie']['key'] = 'fdebug_' . Str::randomLatinNumeric(mt_rand(8, 32)); |
|
217 | + $allCfg['debug']['cookie']['key'] = 'fdebug_'.Str::randomLatinNumeric(mt_rand(8, 32)); |
|
218 | 218 | $allCfg['debug']['cookie']['value'] = Str::randomLatinNumeric(mt_rand(32, 128)); |
219 | 219 | |
220 | 220 | // write config data |