mdmsoft / yii2-admin

views/route/index.php

Spacing +11 added lines, -11 removed lines

@@ -20,17 +20,17 @@ 
 $this->registerJs($this->render('_script.js'));
 $animateIcon = ' <i class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></i>';
 ?>
-<h1><?=Html::encode($this->title);?></h1>
+<h1><?=Html::encode($this->title); ?></h1>
 <div class="row">
     <div class="col-sm-11">
         <div class="input-group">
             <input id="inp-route" type="text" class="form-control"
-                   placeholder="<?=Yii::t('rbac-admin', 'New route(s)');?>">
+                   placeholder="<?=Yii::t('rbac-admin', 'New route(s)'); ?>">
             <span class="input-group-btn">
-                <?=Html::a(Yii::t('rbac-admin', 'Add') . $animateIcon, ['create'], [
+                <?=Html::a(Yii::t('rbac-admin', 'Add').$animateIcon, ['create'], [
     'class' => 'btn btn-success',
     'id' => 'btn-new',
-]);?>
+]); ?>
             </span>
         </div>
     </div>
@@ -40,32 +40,32 @@ 
     <div class="col-sm-5">
         <div class="input-group">
             <input class="form-control search" data-target="available"
-                   placeholder="<?=Yii::t('rbac-admin', 'Search for available');?>">
+                   placeholder="<?=Yii::t('rbac-admin', 'Search for available'); ?>">
             <span class="input-group-btn">
                 <?=Html::a('<span class="glyphicon glyphicon-refresh"></span>', ['refresh'], [
     'class' => 'btn btn-default',
     'id' => 'btn-refresh',
-]);?>
+]); ?>
             </span>
         </div>
         <select multiple size="20" class="form-control list" data-target="available"></select>
     </div>
     <div class="col-sm-1">
         <br><br>
-        <?=Html::a('&gt;&gt;' . $animateIcon, ['assign'], [
+        <?=Html::a('&gt;&gt;'.$animateIcon, ['assign'], [
     'class' => 'btn btn-success btn-assign',
     'data-target' => 'available',
     'title' => Yii::t('rbac-admin', 'Assign'),
-]);?><br><br>
-        <?=Html::a('&lt;&lt;' . $animateIcon, ['remove'], [
+]); ?><br><br>
+        <?=Html::a('&lt;&lt;'.$animateIcon, ['remove'], [
     'class' => 'btn btn-danger btn-assign',
     'data-target' => 'assigned',
     'title' => Yii::t('rbac-admin', 'Remove'),
-]);?>
+]); ?>
     </div>
     <div class="col-sm-5">
         <input class="form-control search" data-target="assigned"
-               placeholder="<?=Yii::t('rbac-admin', 'Search for assigned');?>">
+               placeholder="<?=Yii::t('rbac-admin', 'Search for assigned'); ?>">
         <select multiple size="20" class="form-control list" data-target="assigned"></select>
     </div>
 </div>

components/Helper.php

Spacing +8 added lines, -8 removed lines

@@ -121,7 +121,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if ($user->can($r . '/*', $params)) {
+                if ($user->can($r.'/*', $params)) {
                     return true;
                 }
             }
@@ -133,7 +133,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if (isset($routes[$r . '/*'])) {
+                if (isset($routes[$r.'/*'])) {
                     return true;
                 }
             }
@@ -150,19 +150,19 @@ 
     protected static function normalizeRoute($route, $advanced = false)
     {
         if ($route === '') {
-            $normalized = '/' . Yii::$app->controller->getRoute();
+            $normalized = '/'.Yii::$app->controller->getRoute();
         } elseif (strncmp($route, '/', 1) === 0) {
             $normalized = $route;
         } elseif (strpos($route, '/') === false) {
-            $normalized = '/' . Yii::$app->controller->getUniqueId() . '/' . $route;
+            $normalized = '/'.Yii::$app->controller->getUniqueId().'/'.$route;
         } elseif (($mid = Yii::$app->controller->module->getUniqueId()) !== '') {
-            $normalized = '/' . $mid . '/' . $route;
+            $normalized = '/'.$mid.'/'.$route;
         } else {
-            $normalized = '/' . $route;
+            $normalized = '/'.$route;
         }
         // Prefix @app-id to route.
         if ($advanced) {
-            $normalized = Route::PREFIX_ADVANCED . Yii::$app->id . $normalized;
+            $normalized = Route::PREFIX_ADVANCED.Yii::$app->id.$normalized;
         }
         return $normalized;
     }
@@ -233,7 +233,7 @@ 
             }
             return implode(' ', $result);
         }
-        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function ($matches) use ($user) {
+        return preg_replace_callback('/\\{([\w\-\/]+)\\}/', function($matches) use ($user) {
             return static::checkRoute($matches[1], [], $user) ? "{{$matches[1]}}" : '';
         }, $buttons);
     }

BaseObject.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 namespace mdm\admin;
 
-if(!class_exists('yii\base\BaseObject')){
+if (!class_exists('yii\base\BaseObject')) {
     class_alias('yii\base\Object', 'yii\base\BaseObject');
 }
 

models/searchs/AuthItem.php

Indentation +5 added lines, -5 removed lines

@@ -64,13 +64,13 @@
             $items = $authManager->getRoles();
         } else {
             $items = array_filter($authManager->getPermissions(), function($item) use ($advanced){
-              $isPermission = $this->type == Item::TYPE_PERMISSION;
-              if ($advanced) {
+                $isPermission = $this->type == Item::TYPE_PERMISSION;
+                if ($advanced) {
                 return $isPermission xor (strncmp($item->name, '/', 1) === 0 or strncmp($item->name, '@', 1) === 0);
-              }
-              else {
+                }
+                else {
                 return $isPermission xor strncmp($item->name, '/', 1) === 0;
-              }
+                }
             });
         }
         $this->load($params);

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
               $isPermission = $this->type == Item::TYPE_PERMISSION;
               if ($advanced) {
                 return $isPermission xor (strncmp($item->name, '/', 1) === 0 or strncmp($item->name, '@', 1) === 0);
-              }
-              else {
+              } else {
                 return $isPermission xor strncmp($item->name, '/', 1) === 0;
               }
             });

models/form/Login.php

Spacing +1 added lines, -1 removed lines

@@ -71,7 +71,7 @@
     public function getUser()
     {
         if ($this->_user === false) {
-            $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+            $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
             $this->_user = $class::findByUsername($this->username);
         }
 

models/form/ResetPassword.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
         }
         $expire = ArrayHelper::getValue(Yii::$app->params, 'user.passwordResetTokenExpire', 24 * 3600);
         $parts = explode('_', $token);
-        $timestamp = (int) end($parts);
+        $timestamp = (int)end($parts);
         return $timestamp + $expire >= time();
     }
 }

models/form/Signup.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function rules()
     {
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         return [
             ['username', 'filter', 'filter' => 'trim'],
             ['username', 'required'],
@@ -50,7 +50,7 @@ 
     public function signup()
     {
         if ($this->validate()) {
-            $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+            $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
             $user = new $class();
             $user->username = $this->username;
             $user->email = $this->email;

models/form/PasswordResetRequest.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
      */
     public function rules()
     {
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         return [
             ['email', 'filter', 'filter' => 'trim'],
             ['email', 'required'],
@@ -39,7 +39,7 @@ 
     public function sendEmail()
     {
         /* @var $user User */
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         $user = $class::findOne([
             'status' => UserStatus::ACTIVE,
             'email' => $this->email,
@@ -47,14 +47,14 @@ 
 
         if ($user) {
             if (!ResetPassword::isPasswordResetTokenValid($user->password_reset_token)) {
-                $user->password_reset_token = Yii::$app->security->generateRandomString() . '_' . time();
+                $user->password_reset_token = Yii::$app->security->generateRandomString().'_'.time();
             }
 
             if ($user->save()) {
                 return Yii::$app->mailer->compose(['html' => 'passwordResetToken-html', 'text' => 'passwordResetToken-text'], ['user' => $user])
-                    ->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name . ' robot'])
+                    ->setFrom([Yii::$app->params['supportEmail'] => Yii::$app->name.' robot'])
                     ->setTo($this->email)
-                    ->setSubject('Password reset for ' . Yii::$app->name)
+                    ->setSubject('Password reset for '.Yii::$app->name)
                     ->send();
             }
         }

models/searchs/User.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function rules()
     {
         return [
-            [['id', 'status',], 'integer'],
+            [['id', 'status', ], 'integer'],
             [['username', 'email'], 'safe'],
         ];
     }
@@ -37,7 +37,7 @@ 
     public function search($params)
     {
         /* @var $query \yii\db\ActiveQuery */
-        $class = Yii::$app->getUser()->identityClass ? : 'mdm\admin\models\User';
+        $class = Yii::$app->getUser()->identityClass ?: 'mdm\admin\models\User';
         $query = $class::find();
 
         $dataProvider = new ActiveDataProvider([