mdmsoft / yii2-admin

components/Helper.php

Spacing +7 added lines, -7 removed lines

@@ -120,7 +120,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if ($user->can($r . '/*', $params)) {
+                if ($user->can($r.'/*', $params)) {
                     return true;
                 }
             }
@@ -132,7 +132,7 @@ 
             }
             while (($pos = strrpos($r, '/')) > 0) {
                 $r = substr($r, 0, $pos);
-                if (isset($routes[$r . '/*'])) {
+                if (isset($routes[$r.'/*'])) {
                     return true;
                 }
             }
@@ -143,15 +143,15 @@ 
     protected static function normalizeRoute($route)
     {
         if ($route === '') {
-            return '/' . Yii::$app->controller->getRoute();
+            return '/'.Yii::$app->controller->getRoute();
         } elseif (strncmp($route, '/', 1) === 0) {
             return $route;
         } elseif (strpos($route, '/') === false) {
-            return '/' . Yii::$app->controller->getUniqueId() . '/' . $route;
+            return '/'.Yii::$app->controller->getUniqueId().'/'.$route;
         } elseif (($mid = Yii::$app->controller->module->getUniqueId()) !== '') {
-            return '/' . $mid . '/' . $route;
+            return '/'.$mid.'/'.$route;
         }
-        return '/' . $route;
+        return '/'.$route;
     }
 
     /**
@@ -220,7 +220,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);
     }

components/AccessControl.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
     {
         $actionId = $action->getUniqueId();
         $user = $this->getUser();
-        if (Helper::checkRoute('/' . $actionId, Yii::$app->getRequest()->get(), $user)) {
+        if (Helper::checkRoute('/'.$actionId, Yii::$app->getRequest()->get(), $user)) {
             return true;
         }
         $this->denyAccess($user);
@@ -108,7 +108,7 @@ 
             // convert action uniqueId into an ID relative to the module
             $mid = $this->owner->getUniqueId();
             $id = $uniqueId;
-            if ($mid !== '' && strpos($id, $mid . '/') === 0) {
+            if ($mid !== '' && strpos($id, $mid.'/') === 0) {
                 $id = substr($id, strlen($mid) + 1);
             }
         } else {

views/user/view.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', 'Users'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 
-$controllerId = $this->context->uniqueId . '/';
+$controllerId = $this->context->uniqueId.'/';
 ?>
 <div class="user-view">
 
@@ -19,7 +19,7 @@ 
 
     <p>
         <?php
-        if ($model->status == 0 && Helper::checkRoute($controllerId . 'activate')) {
+        if ($model->status == 0 && Helper::checkRoute($controllerId.'activate')) {
             echo Html::a(Yii::t('rbac-admin', 'Activate'), ['activate', 'id' => $model->id], [
                 'class' => 'btn btn-primary',
                 'data' => [
@@ -30,7 +30,7 @@ 
         }
         ?>
         <?php
-        if (Helper::checkRoute($controllerId . 'delete')) {
+        if (Helper::checkRoute($controllerId.'delete')) {
             echo Html::a(Yii::t('rbac-admin', 'Delete'), ['delete', 'id' => $model->id], [
                 'class' => 'btn btn-danger',
                 'data' => [

views/assignment/view.php

Spacing +4 added lines, -4 removed lines

@@ -12,11 +12,11 @@ 
 
 $userName = $model->{$usernameField};
 if (!empty($fullnameField)) {
-    $userName .= ' (' . ArrayHelper::getValue($model, $fullnameField) . ')';
+    $userName .= ' ('.ArrayHelper::getValue($model, $fullnameField).')';
 }
 $userName = Html::encode($userName);
 
-$this->title = Yii::t('rbac-admin', 'Assignment') . ' : ' . $userName;
+$this->title = Yii::t('rbac-admin', 'Assignment').' : '.$userName;
 
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', 'Assignments'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $userName;
@@ -42,12 +42,12 @@ 
         </div>
         <div class="col-sm-1">
             <br><br>
-            <?= Html::a('&gt;&gt;' . $animateIcon, ['assign', 'id' => (string)$model->id], [
+            <?= Html::a('&gt;&gt;'.$animateIcon, ['assign', 'id' => (string)$model->id], [
                 'class' => 'btn btn-success btn-assign',
                 'data-target' => 'avaliable',
                 'title' => Yii::t('rbac-admin', 'Assign')
             ]) ?><br><br>
-            <?= Html::a('&lt;&lt;' . $animateIcon, ['revoke', 'id' => (string)$model->id], [
+            <?= Html::a('&lt;&lt;'.$animateIcon, ['revoke', 'id' => (string)$model->id], [
                 'class' => 'btn btn-danger btn-assign',
                 'data-target' => 'assigned',
                 'title' => Yii::t('rbac-admin', 'Remove')

views/rule/update.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 /* @var $this  yii\web\View */
 /* @var $model mdm\admin\models\BizRule */
 
-$this->title = Yii::t('rbac-admin', 'Update Rule') . ': ' . $model->name;
+$this->title = Yii::t('rbac-admin', 'Update Rule').': '.$model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', 'Rules'), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
 $this->params['breadcrumbs'][] = Yii::t('rbac-admin', 'Update');

views/item/index.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
 <div class="role-index">
     <h1><?= Html::encode($this->title) ?></h1>
     <p>
-        <?= Html::a(Yii::t('rbac-admin', 'Create ' . $labels['Item']), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a(Yii::t('rbac-admin', 'Create '.$labels['Item']), ['create'], ['class' => 'btn btn-success']) ?>
     </p>
     <?=
     GridView::widget([
@@ -42,7 +42,7 @@ 
                 'attribute' => 'description',
                 'label' => Yii::t('rbac-admin', 'Description'),
             ],
-            ['class' => 'yii\grid\ActionColumn',],
+            ['class' => 'yii\grid\ActionColumn', ],
         ],
     ])
     ?>

views/item/update.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 $context = $this->context;
 $labels = $context->labels();
-$this->title = Yii::t('rbac-admin', 'Update ' . $labels['Item']) . ': ' . $model->name;
+$this->title = Yii::t('rbac-admin', 'Update '.$labels['Item']).': '.$model->name;
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', $labels['Items']), 'url' => ['index']];
 $this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->name]];
 $this->params['breadcrumbs'][] = Yii::t('rbac-admin', 'Update');

views/item/view.php

Spacing +2 added lines, -2 removed lines

@@ -60,12 +60,12 @@
         </div>
         <div class="col-sm-1">
             <br><br>
-            <?= Html::a('&gt;&gt;' . $animateIcon, ['assign', 'id' => $model->name], [
+            <?= Html::a('&gt;&gt;'.$animateIcon, ['assign', 'id' => $model->name], [
                 'class' => 'btn btn-success btn-assign',
                 'data-target' => 'avaliable',
                 'title' => Yii::t('rbac-admin', 'Assign')
             ]) ?><br><br>
-            <?= Html::a('&lt;&lt;' . $animateIcon, ['remove', 'id' => $model->name], [
+            <?= Html::a('&lt;&lt;'.$animateIcon, ['remove', 'id' => $model->name], [
                 'class' => 'btn btn-danger btn-assign',
                 'data-target' => 'assigned',
                 'title' => Yii::t('rbac-admin', 'Remove')

views/item/create.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 $context = $this->context;
 $labels = $context->labels();
-$this->title = Yii::t('rbac-admin', 'Create ' . $labels['Item']);
+$this->title = Yii::t('rbac-admin', 'Create '.$labels['Item']);
 $this->params['breadcrumbs'][] = ['label' => Yii::t('rbac-admin', $labels['Items']), 'url' => ['index']];
 $this->params['breadcrumbs'][] = $this->title;
 ?>