mdmsoft / yii2-admin

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([

controllers/DefaultController.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function actionIndex($page = 'README.md')
     {
-        if (preg_match('/^docs\/images\/image\d+\.png$/',$page)) {
+        if (preg_match('/^docs\/images\/image\d+\.png$/', $page)) {
             $file = Yii::getAlias("@mdm/admin/{$page}");
             return Yii::$app->getResponse()->sendFile($file);
         }

views/default/index.php

Spacing +5 added lines, -5 removed lines

@@ -10,7 +10,7 @@ 
     $baseDir = '';
     $this->title = substr($page, 0, strrpos($page, '.'));
 } else {
-    $baseDir = substr($page, 0, $pos) . '/';
+    $baseDir = substr($page, 0, $pos).'/';
     $this->title = substr($page, $pos + 1, strrpos($page, '.') - $pos - 1);
 }
 
@@ -22,10 +22,10 @@ 
         $url = Url::to($menu['url'], true);
         $links[] = "[**{$menu['label']}**]({$url})";
     }
-    $body = str_replace(':smile:.', ".\n\n" . implode('  ', $links) . "\n", file_get_contents(Url::to('@mdm/admin/'.$page)));
-} elseif(preg_match('/^docs\/guide\/[\w-]+\.md$/', $page)) {
+    $body = str_replace(':smile:.', ".\n\n".implode('  ', $links)."\n", file_get_contents(Url::to('@mdm/admin/'.$page)));
+} elseif (preg_match('/^docs\/guide\/[\w-]+\.md$/', $page)) {
     $body = file_get_contents(Url::to("@mdm/admin/{$page}"));
-} else{
+} else {
     $body = '';
 }
 
@@ -35,7 +35,7 @@ 
         if ($link[0] == '/') {
             $link = Url::current(['page' => ltrim($link, '/')], true);
         } else {
-            $link = Url::current(['page' => $baseDir . $link], true);
+            $link = Url::current(['page' => $baseDir.$link], true);
         }
     }
     return "]($link)";