@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace modules\rbac\models; |
4 | 4 | |
5 | -use Yii; |
|
5 | +use Yii; |
|
6 | +use modules\rbac\Module; |
|
6 | 7 | use yii\base\Model; |
7 | -use modules\rbac\Module; |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * Class Role |
@@ -1,10 +1,10 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | +use modules\rbac\Module; |
|
4 | +use yii\grid\GridView; |
|
5 | +use yii\helpers\ArrayHelper; |
|
3 | 6 | use yii\helpers\Html; |
4 | 7 | use yii\helpers\Url; |
5 | -use yii\helpers\ArrayHelper; |
|
6 | -use yii\grid\GridView; |
|
7 | -use modules\rbac\Module; |
|
8 | 8 | |
9 | 9 | /* @var $this yii\web\View */ |
10 | 10 | /* @var $dataProvider yii\data\ActiveDataProvider */ |
@@ -2,9 +2,9 @@ |
||
2 | 2 | |
3 | 3 | /* @var $this yii\web\View */ |
4 | 4 | |
5 | +use modules\rbac\Module; |
|
5 | 6 | use yii\helpers\Html; |
6 | 7 | use yii\helpers\Url; |
7 | -use modules\rbac\Module; |
|
8 | 8 | |
9 | 9 | $this->title = Module::t('module', 'Role Based Access Control'); |
10 | 10 | $this->params['breadcrumbs'][] = Module::t('module', 'RBAC'); |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | |
76 | 76 | /** |
77 | 77 | * Lists all User models. |
78 | - * @return mixed |
|
78 | + * @return string |
|
79 | 79 | */ |
80 | 80 | public function actionIndex() |
81 | 81 | { |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | * Deletes an existing User model. |
270 | 270 | * If deletion is successful, the browser will be redirected to the 'index' page. |
271 | 271 | * @param integer $id |
272 | - * @return mixed |
|
272 | + * @return \yii\web\Response |
|
273 | 273 | */ |
274 | 274 | public function actionDelete($id) |
275 | 275 | { |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | /** |
341 | 341 | * Logout action. |
342 | 342 | * |
343 | - * @return string |
|
343 | + * @return \yii\web\Response |
|
344 | 344 | */ |
345 | 345 | public function actionLogout() |
346 | 346 | { |
@@ -3,18 +3,18 @@ |
||
3 | 3 | namespace modules\users\controllers\backend; |
4 | 4 | |
5 | 5 | use Yii; |
6 | -use yii\helpers\Url; |
|
6 | +use modules\rbac\models\Permission; |
|
7 | +use modules\users\Module; |
|
7 | 8 | use modules\users\models\LoginForm; |
9 | +use modules\users\models\UploadForm; |
|
8 | 10 | use modules\users\models\backend\User; |
9 | 11 | use modules\users\models\backend\UserSearch; |
10 | -use modules\users\models\UploadForm; |
|
11 | -use yii\web\UploadedFile; |
|
12 | +use yii\filters\AccessControl; |
|
13 | +use yii\filters\VerbFilter; |
|
14 | +use yii\helpers\Url; |
|
12 | 15 | use yii\web\Controller; |
13 | 16 | use yii\web\NotFoundHttpException; |
14 | -use yii\filters\VerbFilter; |
|
15 | -use yii\filters\AccessControl; |
|
16 | -use modules\rbac\models\Permission; |
|
17 | -use modules\users\Module; |
|
17 | +use yii\web\UploadedFile; |
|
18 | 18 | |
19 | 19 | /** |
20 | 20 | * Class DefaultController |
@@ -150,7 +150,7 @@ |
||
150 | 150 | /** |
151 | 151 | * Deletes an existing User model. |
152 | 152 | * If deletion is successful, the browser will be redirected to the 'index' page. |
153 | - * @return mixed |
|
153 | + * @return \yii\web\Response |
|
154 | 154 | */ |
155 | 155 | public function actionDelete() |
156 | 156 | { |
@@ -3,15 +3,15 @@ |
||
3 | 3 | namespace modules\users\controllers\backend; |
4 | 4 | |
5 | 5 | use Yii; |
6 | -use yii\helpers\Url; |
|
7 | -use modules\users\models\backend\User; |
|
6 | +use modules\users\Module; |
|
8 | 7 | use modules\users\models\UploadForm; |
9 | -use yii\web\UploadedFile; |
|
8 | +use modules\users\models\backend\User; |
|
9 | +use yii\filters\AccessControl; |
|
10 | +use yii\filters\VerbFilter; |
|
11 | +use yii\helpers\Url; |
|
10 | 12 | use yii\web\Controller; |
11 | 13 | use yii\web\NotFoundHttpException; |
12 | -use yii\filters\VerbFilter; |
|
13 | -use yii\filters\AccessControl; |
|
14 | -use modules\users\Module; |
|
14 | +use yii\web\UploadedFile; |
|
15 | 15 | |
16 | 16 | /** |
17 | 17 | * Class ProfileController |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | /** |
151 | 151 | * Deletes an existing User model. |
152 | 152 | * This delete set status blocked, is successful, logout and the browser will be redirected to the 'home' page. |
153 | - * @return mixed |
|
153 | + * @return Response |
|
154 | 154 | */ |
155 | 155 | public function actionDelete() |
156 | 156 | { |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | /** |
187 | 187 | * Logs out the current user. |
188 | 188 | * |
189 | - * @return mixed |
|
189 | + * @return Response |
|
190 | 190 | */ |
191 | 191 | public function actionLogout() |
192 | 192 | { |
@@ -3,24 +3,23 @@ |
||
3 | 3 | namespace modules\users\controllers\frontend; |
4 | 4 | |
5 | 5 | use Yii; |
6 | -use yii\helpers\Url; |
|
7 | -use yii\web\Controller; |
|
8 | -use modules\users\models\frontend\User; |
|
9 | -use modules\users\models\UploadForm; |
|
10 | -use yii\web\UploadedFile; |
|
11 | -use modules\users\models\frontend\SignupForm; |
|
6 | +use modules\users\Module; |
|
12 | 7 | use modules\users\models\LoginForm; |
8 | +use modules\users\models\UploadForm; |
|
13 | 9 | use modules\users\models\frontend\EmailConfirmForm; |
14 | -use modules\users\models\frontend\ResetPasswordForm; |
|
15 | 10 | use modules\users\models\frontend\PasswordResetRequestForm; |
11 | +use modules\users\models\frontend\ResetPasswordForm; |
|
12 | +use modules\users\models\frontend\SignupForm; |
|
13 | +use modules\users\models\frontend\User; |
|
16 | 14 | use yii\base\InvalidParamException; |
17 | -use yii\web\BadRequestHttpException; |
|
15 | +use yii\bootstrap\ActiveForm; |
|
18 | 16 | use yii\filters\VerbFilter; |
19 | -use yii\filters\AccessControl; |
|
17 | +use yii\helpers\Url; |
|
18 | +use yii\web\BadRequestHttpException; |
|
19 | +use yii\web\Controller; |
|
20 | 20 | use yii\web\NotFoundHttpException; |
21 | -use yii\bootstrap\ActiveForm; |
|
22 | 21 | use yii\web\Response; |
23 | -use modules\users\Module; |
|
22 | +use yii\web\UploadedFile; |
|
24 | 23 | |
25 | 24 | /** |
26 | 25 | * Class ProfileController |
@@ -2,11 +2,11 @@ |
||
2 | 2 | |
3 | 3 | namespace modules\users\models\frontend; |
4 | 4 | |
5 | -use Yii; |
|
6 | -use yii\base\InvalidParamException; |
|
5 | +use Yii; |
|
6 | +use modules\users\Module; |
|
7 | +use modules\users\models\User; |
|
8 | +use yii\base\InvalidParamException; |
|
7 | 9 | use yii\base\Model; |
8 | -use modules\users\models\User; |
|
9 | -use modules\users\Module; |
|
10 | 10 | |
11 | 11 | /** |
12 | 12 | * Class EmailConfirmForm |
@@ -8,9 +8,9 @@ |
||
8 | 8 | |
9 | 9 | namespace modules\users\models\frontend; |
10 | 10 | |
11 | -use Yii; |
|
11 | +use Yii; |
|
12 | +use modules\users\Module; |
|
12 | 13 | use yii\helpers\ArrayHelper; |
13 | -use modules\users\Module; |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * Class User |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | /** |
42 | - * @param null $id |
|
42 | + * @param integer $id |
|
43 | 43 | * @return bool|string |
44 | 44 | */ |
45 | 45 | public function upload($id = null) |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | |
95 | 95 | /** |
96 | 96 | * @param $user_id |
97 | - * @return mixed |
|
97 | + * @return string |
|
98 | 98 | */ |
99 | 99 | public function getUserDirectory($user_id) |
100 | 100 | { |
@@ -2,12 +2,12 @@ |
||
2 | 2 | |
3 | 3 | namespace modules\users\models; |
4 | 4 | |
5 | -use Yii; |
|
6 | -use yii\base\Model; |
|
5 | +use Yii; |
|
6 | +use yii\base\Model; |
|
7 | +use yii\helpers\ArrayHelper; |
|
8 | +use yii\helpers\Url; |
|
9 | +use yii\imagine\Image; |
|
7 | 10 | use yii\web\UploadedFile; |
8 | -use yii\helpers\Url; |
|
9 | -use yii\helpers\ArrayHelper; |
|
10 | -use yii\imagine\Image; |
|
11 | 11 | |
12 | 12 | /** |
13 | 13 | * Class UploadForm |