injitools / cms-Inji

system/modules/UserForms/models/Form.php

Spacing +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
     static $cols = [
         'name' => ['type' => 'text'],
         'description' => ['type' => 'html'],
-        'user_id' => [ 'type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-        'inputs' => [ 'type' => 'dataManager', 'relation' => 'inputs'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'inputs' => ['type' => 'dataManager', 'relation' => 'inputs'],
         'date_create' => ['type' => 'dateTime'],
     ];
     static $dataManagers = [

system/modules/Users/appAdminControllers/content/edit.php

Braces +5 added lines, -4 removed lines

@@ -42,10 +42,11 @@
                             <select class="form-control" name = 'user_role_id'>
                                 <?php
                                 foreach ($roles as $role) {
-                                    if ($role['role_id'] == $user->user_role_id)
-                                        $selected = 'selected = "selected"';
-                                    else
-                                        $selected = '';
+                                    if ($role['role_id'] == $user->user_role_id) {
+                                                                            $selected = 'selected = "selected"';
+                                    } else {
+                                                                            $selected = '';
+                                    }
                                     echo "<option {$selected} value = '{$role['role_id']}'>{$role['role_name']}</option>";
                                 }
                                 ?>

system/modules/Users/appControllers/UsersController.php

Indentation +9 added lines, -9 removed lines

@@ -168,20 +168,20 @@
                 <h5 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h5>
                 <ul>
                   <?php
-                  foreach ($condition->items as $item) {
-                      $itemComplete = $item->checkComplete($userId);
-                      switch ($item->type) {
-                          case 'event':
+                    foreach ($condition->items as $item) {
+                        $itemComplete = $item->checkComplete($userId);
+                        switch ($item->type) {
+                            case 'event':
                               $name = \Events\Event::get($item->value, 'event')->name();
-                              break;
-                      }
-                      ?>
+                                break;
+                        }
+                        ?>
                       <li> 
                         <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount($userId); ?></b>/<?= $item->count; ?> <br />
                       </li>
                       <?php
-                  }
-                  ?>
+                    }
+                    ?>
                 </ul>
                 <?php
             }

system/modules/Users/appControllers/content/cabinet.php

Indentation +12 added lines, -12 removed lines

@@ -24,20 +24,20 @@
     </div>
     <div class="col-sm-9">
       <?php
-      if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) {
-          foreach ($sections as $section) {
-              if (!empty($section['smallWidget'])) {
-                  $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget'];
-                  $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1;
-                  ?>
+        if (empty($activeSection) || empty($sections[$activeSection]['fullWidget'])) {
+            foreach ($sections as $section) {
+                if (!empty($section['smallWidget'])) {
+                    $widgetName = is_array($section['smallWidget']) ? $section['smallWidget']['widget'] : $section['smallWidget'];
+                    $widgetSize = !empty($section['smallWidget']['size']) ? $section['smallWidget']['size'] : 1;
+                    ?>
                   <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $this->widget($widgetName); ?></div>
                   <?php
-              }
-          }
-      } else {
-          $this->widget($sections[$activeSection]['fullWidget']);
-      }
-      ?>
+                }
+            }
+        } else {
+            $this->widget($sections[$activeSection]['fullWidget']);
+        }
+        ?>
     </div>
   </div>
 </div>
\ No newline at end of file

system/modules/Users/appControllers/content/registration.php

Indentation +8 added lines, -8 removed lines

@@ -8,10 +8,10 @@ 
         <div class="form-group">
           <label>Регистрация через соц.сети</label><br />
           <?php
-          foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-              echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> ";
-          }
-          ?>
+            foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
+                echo "<a href = '/users/social/auth/{$social->code}'>{$social->name()}</a> ";
+            }
+            ?>
         </div>
         <?php
     }
@@ -27,15 +27,15 @@ 
           <?php $form->input('date', 'user_birthday', 'Дата рождения'); ?>
           <?php $form->input('text', 'user_city', 'Город'); ?>
           <?php
-          if (!empty(App::$cur->users->config['invites'])) {
-              ?>
+            if (!empty(App::$cur->users->config['invites'])) {
+                ?>
               <div class ='form-group'>
                 <label><?= !empty(App::$cur->users->config['invitesName']) ? App::$cur->users->config['invitesName'] : 'Код приглашения'; ?></label>
                 <input type ='text' name ='invite_code' class ='form-control' value ="<?= (isset($_POST['invite_code']) ? $_POST['invite_code'] : ((!empty($_COOKIE['invite_code']) ? $_COOKIE['invite_code'] : ((!empty($_GET['invite_code']) ? $_GET['invite_code'] : ''))))); ?>" />
               </div>   
               <?php
-          }
-          ?>
+            }
+            ?>
         </div>
         <div class="col-sm-6">
           <div class ='form-group'>

system/modules/Users/extensions/Dashboard/snippets/adminDashboardWidget/userStatistic.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
           <div class="panel-heading">Пользователи</div>

           <div class="panel-body">

             <p>Всего: <?= Users\User::getCount(); ?></p>

-            <p>Новых сегодня: <?= Users\User::getCount(['where'=>['date_create',date('Y-m-d 00:00:00'),'>']]); ?></p>

+            <p>Новых сегодня: <?= Users\User::getCount(['where'=>['date_create', date('Y-m-d 00:00:00'), '>']]); ?></p>

           </div>

           <div class="panel-footer">

             <a href ="/admin/users/User">Управление</a>

system/modules/Users/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/modules/Users/models/Group.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Group
- *
- * @author Alexey Krupskiy <admin@inji.ru>
- * @link http://inji.ru/
- * @copyright 2015 Alexey Krupskiy
- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
- */
+     * Group
+     *
+     * @author Alexey Krupskiy <admin@inji.ru>
+     * @link http://inji.ru/
+     * @copyright 2015 Alexey Krupskiy
+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
+     */
 namespace Users;
 
 class Group extends \Model

system/modules/Users/models/User.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
         'role_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'role'],
         'admin_text' => ['type' => 'html'],
         'activation' => ['type' => 'text'],
-        'blocked' => ['type' => 'bool',],
+        'blocked' => ['type' => 'bool', ],
         'date_last_active' => ['type' => 'dateTime'],
         'date_create' => ['type' => 'dateTime']
     ];
@@ -100,7 +100,7 @@ 
                 ]
             ],
             'map' => [
-                ['login', 'mail',],
+                ['login', 'mail', ],
                 ['group_id', 'role_id'],
                 ['userSearch', 'blocked'],
                 ['pass'],