phpffcms /
ffcms
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Apps\ActiveRecord\Profile; |
| 6 | 6 | use Apps\ActiveRecord\User; |
| 7 | -use Apps\Controller\Console\Db; |
|
| 8 | 7 | use Ffcms\Core\App; |
| 9 | 8 | use Ffcms\Core\Arch\Model; |
| 10 | 9 | use Ffcms\Core\Helper\FileSystem\File; |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /** |
| 28 | - * Labels for installation form |
|
| 29 | - */ |
|
| 28 | + * Labels for installation form |
|
| 29 | + */ |
|
| 30 | 30 | public function labels() |
| 31 | 31 | { |
| 32 | 32 | return [ |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | - * Installation post data validation |
|
| 50 | - */ |
|
| 49 | + * Installation post data validation |
|
| 50 | + */ |
|
| 51 | 51 | public function rules() |
| 52 | 52 | { |
| 53 | 53 | return [ |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | $cfg['database'] = $this->db; |
| 71 | 71 | $cfg['adminEmail'] = $this->email; |
| 72 | 72 | $cfg['singleLanguage'] = $this->singleLanguage; |
| 73 | - $cfg['multiLanguage'] = (bool)$this->multiLanguage; |
|
| 73 | + $cfg['multiLanguage'] = (bool) $this->multiLanguage; |
|
| 74 | 74 | $cfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$'; |
| 75 | 75 | $cfg['debug']['cookie']['key'] = 'fdebug_' . Str::randomLatinNumeric(mt_rand(4, 16)); |
| 76 | 76 | $cfg['debug']['cookie']['value'] = Str::randomLatinNumeric(mt_rand(32, 128)); |
@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** @var $body string */ |
| 3 | -use Ffcms\Core\Helper\HTML\Listing; |
|
| 4 | 3 | use Ffcms\Core\Helper\Type\Obj; |
| 5 | 4 | ?> |
| 6 | 5 | <!DOCTYPE html> |
@@ -20,8 +20,8 @@ |
||
| 20 | 20 | public $chmodCheck = []; |
| 21 | 21 | |
| 22 | 22 | /** |
| 23 | - * Get default server information and prepare chmod info |
|
| 24 | - */ |
|
| 23 | + * Get default server information and prepare chmod info |
|
| 24 | + */ |
|
| 25 | 25 | public function before() |
| 26 | 26 | { |
| 27 | 27 | $this->phpVersion = phpversion(); |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | ]); |
| 55 | 55 | ?> |
| 56 | 56 | |
| 57 | -<?php if($model->checkAll()): ?> |
|
| 57 | +<?php if ($model->checkAll()): ?> |
|
| 58 | 58 | <?= \Ffcms\Core\Helper\Url::link('main/install', __('Start install'), ['class' => 'btn btn-success btn-block']) ?> |
| 59 | 59 | <?php else: ?> |
| 60 | 60 | <?= \Ffcms\Core\Helper\Url::link('main/index', __('Check again'), ['class' => 'btn btn-warning btn-block']) ?> |
@@ -56,7 +56,10 @@ |
||
| 56 | 56 | |
| 57 | 57 | <?php if($model->checkAll()): ?> |
| 58 | 58 | <?= \Ffcms\Core\Helper\Url::link('main/install', __('Start install'), ['class' => 'btn btn-success btn-block']) ?> |
| 59 | -<?php else: ?> |
|
| 59 | +<?php else { |
|
| 60 | + : ?> |
|
| 60 | 61 | <?= \Ffcms\Core\Helper\Url::link('main/index', __('Check again'), ['class' => 'btn btn-warning btn-block']) ?> |
| 61 | -<?php endif; ?> |
|
| 62 | +<?php endif; |
|
| 63 | +} |
|
| 64 | +?> |
|
| 62 | 65 | |
@@ -52,8 +52,8 @@ |
||
| 52 | 52 | throw new NativeException('Password is bad'); |
| 53 | 53 | } |
| 54 | 54 | echo "RoleId (1 = user, 3 = admin):"; |
| 55 | - $role = (int)App::$Input->read(); |
|
| 56 | - if (!Arr::in($role, [1,2,3])) { |
|
| 55 | + $role = (int) App::$Input->read(); |
|
| 56 | + if (!Arr::in($role, [1, 2, 3])) { |
|
| 57 | 57 | $role = 1; |
| 58 | 58 | } |
| 59 | 59 | |
