@@ -49,8 +49,8 @@ |
||
| 49 | 49 | 'redirect_uri', |
| 50 | 50 | [ |
| 51 | 51 | 'label' => Yii::t('yuncms', 'Grant type'), |
| 52 | - 'value' => function ($model) { |
|
| 53 | - if(empty($model->grant_type)){ |
|
| 52 | + 'value' => function($model) { |
|
| 53 | + if (empty($model->grant_type)) { |
|
| 54 | 54 | return Yii::t('yuncms', 'All Type'); |
| 55 | 55 | } |
| 56 | 56 | return $model->grant_type; |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | 'columns' => [ |
| 30 | 30 | [ |
| 31 | 31 | 'label' => Yii::t('yuncms', 'App Name'), |
| 32 | - 'value' => function ($model) { |
|
| 32 | + 'value' => function($model) { |
|
| 33 | 33 | return Html::a(Html::encode($model->name), ['/oauth2/client/view', 'id' => $model->client_id]); |
| 34 | 34 | }, |
| 35 | 35 | 'format' => 'html' |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | public function execute($queue) |
| 33 | 33 | { |
| 34 | - if(self::getVolume()->has($this->path)){ |
|
| 34 | + if (self::getVolume()->has($this->path)) { |
|
| 35 | 35 | self::getVolume()->delete($this->path); |
| 36 | 36 | } |
| 37 | 37 | } |
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | <div class="modal-body"> |
| 43 | 43 | <div class="row"> |
| 44 | 44 | <div class="col-sm-12 col-md-8 col-lg-8 col-md-offset-2 col-lg-offset-2"> |
| 45 | - <?= $form->field($model, 'login', ['inputOptions' => ['autofocus' => 'autofocus',]]) ?> |
|
| 45 | + <?= $form->field($model, 'login', ['inputOptions' => ['autofocus' => 'autofocus', ]]) ?> |
|
| 46 | 46 | <?= $form->field($model, 'password')->passwordInput() ?> |
| 47 | 47 | <?= Html::submitButton(Yii::t('yuncms', 'Login'), ['class' => 'btn btn-primary btn-block mt-10']) ?> |
| 48 | 48 | </div> |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | use yii\helpers\Url; |
| 3 | 3 | use yuncms\helpers\Html; |
| 4 | - ?> |
|
| 4 | + ?> |
|
| 5 | 5 | <li class="nav-header"> |
| 6 | 6 | <div class="logo-element-main"> |
| 7 | 7 | YUNCMS |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | public function save() |
| 53 | 53 | { |
| 54 | 54 | if ($this->validate()) { |
| 55 | - if(AvatarHelper::save($this->getUser(), $this->_originalImage)){ |
|
| 55 | + if (AvatarHelper::save($this->getUser(), $this->_originalImage)) { |
|
| 56 | 56 | return true; |
| 57 | 57 | } else { |
| 58 | 58 | return false; |
@@ -161,8 +161,9 @@ |
||
| 161 | 161 | return ['url' => $attachment, 'path' => $attachment,]; |
| 162 | 162 | } else if (is_array($attachment)) { |
| 163 | 163 | return $attachment; |
| 164 | - } else if ($attachment instanceof Arrayable) |
|
| 165 | - return $attachment->toArray(); |
|
| 164 | + } else if ($attachment instanceof Arrayable) { |
|
| 165 | + return $attachment->toArray(); |
|
| 166 | + } |
|
| 166 | 167 | return []; |
| 167 | 168 | } |
| 168 | 169 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | if (empty($this->url)) { |
| 96 | 96 | if ($this->onlyImage === false) { |
| 97 | 97 | $this->url = $this->multiple ? ['/upload/files-upload'] : ['/upload/file-upload']; |
| 98 | - $fileAllowFiles = Yii::$app->getSettings()->get('fileAllowFiles','attachment'); |
|
| 98 | + $fileAllowFiles = Yii::$app->getSettings()->get('fileAllowFiles', 'attachment'); |
|
| 99 | 99 | $regExp = '/(\.|\/)('; |
| 100 | 100 | $extensions = explode(',', $fileAllowFiles); |
| 101 | 101 | foreach ($extensions as $extension) { |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | } |
| 131 | 131 | $this->fileInputName = md5($this->name); |
| 132 | 132 | if (!array_key_exists('file_param', $this->url)) { |
| 133 | - $this->url['file_param'] = $this->fileInputName;//服务器需要通过这个判断是哪一个input name上传的 |
|
| 133 | + $this->url['file_param'] = $this->fileInputName; //服务器需要通过这个判断是哪一个input name上传的 |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | $this->clientOptions = ArrayHelper::merge($this->clientOptions, [ |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | protected function formatAttachment($attachment) |
| 161 | 161 | { |
| 162 | 162 | if (!empty($attachment) && is_string($attachment)) { |
| 163 | - return ['url' => $attachment, 'path' => $attachment,]; |
|
| 163 | + return ['url' => $attachment, 'path' => $attachment, ]; |
|
| 164 | 164 | } else if (is_array($attachment)) { |
| 165 | 165 | return $attachment; |
| 166 | 166 | } else if ($attachment instanceof Arrayable) |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | public static function getImageMaxSizeByte() |
| 48 | 48 | { |
| 49 | - $imageMaxSize = Yii::$app->getSettings()->get('imageMaxSize','attachment'); |
|
| 49 | + $imageMaxSize = Yii::$app->getSettings()->get('imageMaxSize', 'attachment'); |
|
| 50 | 50 | return self::getMaxUploadByte($imageMaxSize); |
| 51 | 51 | } |
| 52 | 52 | |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public static function getVideoMaxSizeByte() |
| 58 | 58 | { |
| 59 | - $videoMaxSize = Yii::$app->getSettings()->get('videoMaxSize','attachment'); |
|
| 59 | + $videoMaxSize = Yii::$app->getSettings()->get('videoMaxSize', 'attachment'); |
|
| 60 | 60 | return self::getMaxUploadByte($videoMaxSize); |
| 61 | 61 | } |
| 62 | 62 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | */ |
| 67 | 67 | public static function getFileMaxSizeByte() |
| 68 | 68 | { |
| 69 | - $fileMaxSize = Yii::$app->getSettings()->get('fileMaxSize','attachment'); |
|
| 69 | + $fileMaxSize = Yii::$app->getSettings()->get('fileMaxSize', 'attachment'); |
|
| 70 | 70 | return self::getMaxUploadByte($fileMaxSize); |
| 71 | 71 | } |
| 72 | 72 | |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | */ |
| 77 | 77 | public static function getAcceptImageMimeTypes() |
| 78 | 78 | { |
| 79 | - $imageAllowFiles = Yii::$app->getSettings()->get('imageAllowFiles','attachment'); |
|
| 79 | + $imageAllowFiles = Yii::$app->getSettings()->get('imageAllowFiles', 'attachment'); |
|
| 80 | 80 | $extensions = explode(',', $imageAllowFiles); |
| 81 | - array_walk($extensions, function (&$value) { |
|
| 81 | + array_walk($extensions, function(&$value) { |
|
| 82 | 82 | $value = 'image/' . $value; |
| 83 | 83 | }); |
| 84 | 84 | return $extensions; |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | public static function normalizeExtension($extensions) |
| 94 | 94 | { |
| 95 | 95 | $extensions = explode(',', $extensions); |
| 96 | - array_walk($extensions, function (&$value) { |
|
| 96 | + array_walk($extensions, function(&$value) { |
|
| 97 | 97 | $value = '.' . $value; |
| 98 | 98 | }); |
| 99 | 99 | return $extensions; |
@@ -48,13 +48,13 @@ discard block |
||
| 48 | 48 | const AFTER_REGISTER = 'afterRegister'; |
| 49 | 49 | |
| 50 | 50 | //场景定义 |
| 51 | - const SCENARIO_CREATE = 'create';//后台或控制台创建用户 |
|
| 52 | - const SCENARIO_UPDATE = 'update';//后台或控制台修改用户 |
|
| 53 | - const SCENARIO_REGISTER = 'basic_create';//邮箱注册 |
|
| 54 | - const SCENARIO_EMAIL_REGISTER = 'email_create';//邮箱注册 |
|
| 55 | - const SCENARIO_MOBILE_REGISTER = 'mobile_create';//手机号注册 |
|
| 56 | - const SCENARIO_SETTINGS = 'settings';//更新 |
|
| 57 | - const SCENARIO_CONNECT = 'connect';//账户链接或自动注册新用户 |
|
| 51 | + const SCENARIO_CREATE = 'create'; //后台或控制台创建用户 |
|
| 52 | + const SCENARIO_UPDATE = 'update'; //后台或控制台修改用户 |
|
| 53 | + const SCENARIO_REGISTER = 'basic_create'; //邮箱注册 |
|
| 54 | + const SCENARIO_EMAIL_REGISTER = 'email_create'; //邮箱注册 |
|
| 55 | + const SCENARIO_MOBILE_REGISTER = 'mobile_create'; //手机号注册 |
|
| 56 | + const SCENARIO_SETTINGS = 'settings'; //更新 |
|
| 57 | + const SCENARIO_CONNECT = 'connect'; //账户链接或自动注册新用户 |
|
| 58 | 58 | const SCENARIO_PASSWORD = 'password'; |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -95,8 +95,8 @@ discard block |
||
| 95 | 95 | static::SCENARIO_EMAIL_REGISTER => ['nickname', 'email', 'password'], |
| 96 | 96 | static::SCENARIO_MOBILE_REGISTER => ['mobile', 'password'], |
| 97 | 97 | static::SCENARIO_SETTINGS => ['username', 'email', 'password'], |
| 98 | - static::SCENARIO_CONNECT => ['nickname', 'email', 'password'],//链接账户密码可以为空邮箱可以为空 |
|
| 99 | - static::SCENARIO_PASSWORD => ['password'],//只修改密码 |
|
| 98 | + static::SCENARIO_CONNECT => ['nickname', 'email', 'password'], //链接账户密码可以为空邮箱可以为空 |
|
| 99 | + static::SCENARIO_PASSWORD => ['password'], //只修改密码 |
|
| 100 | 100 | ]); |
| 101 | 101 | } |
| 102 | 102 | |