@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | } |
122 | 122 | while (($pos = strrpos($r, '/')) > 0) { |
123 | 123 | $r = substr($r, 0, $pos); |
124 | - if ($user->can($r . '/*', $params)) { |
|
124 | + if ($user->can($r.'/*', $params)) { |
|
125 | 125 | return true; |
126 | 126 | } |
127 | 127 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | while (($pos = strrpos($r, '/')) > 0) { |
135 | 135 | $r = substr($r, 0, $pos); |
136 | - if (isset($routes[$r . '/*'])) { |
|
136 | + if (isset($routes[$r.'/*'])) { |
|
137 | 137 | return true; |
138 | 138 | } |
139 | 139 | } |
@@ -150,19 +150,19 @@ discard block |
||
150 | 150 | protected static function normalizeRoute($route, $advanced = false) |
151 | 151 | { |
152 | 152 | if ($route === '') { |
153 | - $normalized = '/' . Yii::$app->controller->getRoute(); |
|
153 | + $normalized = '/'.Yii::$app->controller->getRoute(); |
|
154 | 154 | } elseif (strncmp($route, '/', 1) === 0) { |
155 | 155 | $normalized = $route; |
156 | 156 | } elseif (strpos($route, '/') === false) { |
157 | - $normalized = '/' . Yii::$app->controller->getUniqueId() . '/' . $route; |
|
157 | + $normalized = '/'.Yii::$app->controller->getUniqueId().'/'.$route; |
|
158 | 158 | } elseif (($mid = Yii::$app->controller->module->getUniqueId()) !== '') { |
159 | - $normalized = '/' . $mid . '/' . $route; |
|
159 | + $normalized = '/'.$mid.'/'.$route; |
|
160 | 160 | } else { |
161 | - $normalized = '/' . $route; |
|
161 | + $normalized = '/'.$route; |
|
162 | 162 | } |
163 | 163 | // Prefix @app-id to route. |
164 | 164 | if ($advanced) { |
165 | - $normalized = Route::PREFIX_ADVANCED . Yii::$app->id . $normalized; |
|
165 | + $normalized = Route::PREFIX_ADVANCED.Yii::$app->id.$normalized; |
|
166 | 166 | } |
167 | 167 | return $normalized; |
168 | 168 | } |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | } |
234 | 234 | return implode(' ', $result); |
235 | 235 | } |
236 | - return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function ($matches) use ($user) { |
|
236 | + return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function($matches) use ($user) { |
|
237 | 237 | return static::checkRoute($matches[1], [], $user) ? "{{$matches[1]}}" : ''; |
238 | 238 | }, $buttons); |
239 | 239 | } |
@@ -2,7 +2,7 @@ |
||
2 | 2 | |
3 | 3 | namespace mdm\admin; |
4 | 4 | |
5 | -if(!class_exists('yii\base\BaseObject')){ |
|
5 | +if (!class_exists('yii\base\BaseObject')) { |
|
6 | 6 | class_alias('yii\base\Object', 'yii\base\BaseObject'); |
7 | 7 | } |
8 | 8 |
@@ -71,7 +71,7 @@ |
||
71 | 71 | public function getUser() |
72 | 72 | { |
73 | 73 | if ($this->_user === false) { |
74 | - $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User'; |
|
74 | + $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User'; |
|
75 | 75 | $this->_user = $class::findByUsername($this->username); |
76 | 76 | } |
77 | 77 |
@@ -86,7 +86,7 @@ |
||
86 | 86 | } |
87 | 87 | $expire = ArrayHelper::getValue(Yii::$app->params, 'user.passwordResetTokenExpire', 24 * 3600); |
88 | 88 | $parts = explode('_', $token); |
89 | - $timestamp = (int) end($parts); |
|
89 | + $timestamp = (int)end($parts); |
|
90 | 90 | return $timestamp + $expire >= time(); |
91 | 91 | } |
92 | 92 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function rules() |
24 | 24 | { |
25 | - $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User'; |
|
25 | + $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User'; |
|
26 | 26 | return [ |
27 | 27 | ['username', 'filter', 'filter' => 'trim'], |
28 | 28 | ['username', 'required'], |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | public function signup() |
51 | 51 | { |
52 | 52 | if ($this->validate()) { |
53 | - $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User'; |
|
53 | + $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User'; |
|
54 | 54 | $user = new $class(); |
55 | 55 | $user->username = $this->username; |
56 | 56 | $user->email = $this->email; |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | */ |
19 | 19 | public function rules() |
20 | 20 | { |
21 | - $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User'; |
|
21 | + $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User'; |
|
22 | 22 | return [ |
23 | 23 | ['email', 'filter', 'filter' => 'trim'], |
24 | 24 | ['email', 'required'], |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | public function sendEmail() |
40 | 40 | { |
41 | 41 | /* @var $user User */ |
42 | - $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User'; |
|
42 | + $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User'; |
|
43 | 43 | $user = $class::findOne([ |
44 | 44 | 'status' => UserStatus::ACTIVE, |
45 | 45 | 'email' => $this->email, |
@@ -47,14 +47,14 @@ discard block |
||
47 | 47 | |
48 | 48 | if ($user) { |
49 | 49 | if (!ResetPassword::isPasswordResetTokenValid($user->password_reset_token)) { |
50 | - $user->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time(); |
|
50 | + $user->password_reset_token = Yii::$app->security->generateRandomString().'_'.time(); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | if ($user->save()) { |
54 | 54 | return Yii::$app->mailer->compose(['html' => 'passwordResetToken-html', 'text' => 'passwordResetToken-text'], ['user' => $user]) |
55 | - ->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name . ' robot']) |
|
55 | + ->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name.' robot']) |
|
56 | 56 | ->setTo($this->email) |
57 | - ->setSubject('Password reset for ' . Yii::$app->name) |
|
57 | + ->setSubject('Password reset for '.Yii::$app->name) |
|
58 | 58 | ->send(); |
59 | 59 | } |
60 | 60 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | public function rules() |
23 | 23 | { |
24 | 24 | return [ |
25 | - [['id', 'status',], 'integer'], |
|
25 | + [['id', 'status', ], 'integer'], |
|
26 | 26 | [['username', 'email'], 'safe'], |
27 | 27 | ]; |
28 | 28 | } |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | public function search($params) |
38 | 38 | { |
39 | 39 | /* @var $query \yii\db\ActiveQuery */ |
40 | - $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User'; |
|
40 | + $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User'; |
|
41 | 41 | $query = $class::find(); |
42 | 42 | |
43 | 43 | $dataProvider = new ActiveDataProvider([ |
@@ -18,7 +18,7 @@ |
||
18 | 18 | */ |
19 | 19 | public function actionIndex($page = 'README.md') |
20 | 20 | { |
21 | - if (preg_match('/^docs\/images\/image\d+\.png$/',$page)) { |
|
21 | + if (preg_match('/^docs\/images\/image\d+\.png$/', $page)) { |
|
22 | 22 | $file = Yii::getAlias("@mdm/admin/{$page}"); |
23 | 23 | return Yii::$app->getResponse()->sendFile($file); |
24 | 24 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | return [ |
67 | 67 | [['ruleName'], 'checkRule'], |
68 | 68 | [['name', 'type'], 'required'], |
69 | - [['name'], 'checkUnique', 'when' => function () { |
|
69 | + [['name'], 'checkUnique', 'when' => function() { |
|
70 | 70 | return $this->isNewRecord || ($this->_item->name != $this->name); |
71 | 71 | }], |
72 | 72 | [['type'], 'integer'], |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | ->where([$idField => $provider->getModels()]) |
306 | 306 | ->asArray()->all(); |
307 | 307 | |
308 | - $route = '/' . $ctrl->uniqueId . '/view'; |
|
308 | + $route = '/'.$ctrl->uniqueId.'/view'; |
|
309 | 309 | foreach ($users as &$row) { |
310 | 310 | $row['link'] = Url::to([$route, 'id' => $row['id']]); |
311 | 311 | } |