injitools / cms-Inji

system/modules/Ui/widgets/DataManager/filters.php

Indentation +31 added lines, -31 removed lines

@@ -127,40 +127,40 @@
                     ?>
                     <div class="filter_form_field filter_select">
                       <?php
-                      if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
-                          $value = 1;
-                      } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
-                          $value = 0;
-                      } else {
-                          $value = '';
-                      }
-                      $inputOptions = ['value' => $value, 'values' => [
-                              '' => 'Не важно',
-                              '1' => $colInfo['label'],
-                              '0' => 'Нет'
-                          ]
-                      ];
-                      if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
+                        if (!empty($_GET['datamanagerFilters'][$col]['value'])) {
+                            $value = 1;
+                        } elseif (isset($_GET['datamanagerFilters'][$col]['value'])) {
+                            $value = 0;
+                        } else {
+                            $value = '';
+                        }
+                        $inputOptions = ['value' => $value, 'values' => [
+                                '' => 'Не важно',
+                                '1' => $colInfo['label'],
+                                '0' => 'Нет'
+                            ]
+                        ];
+                        if (!empty($dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col])) {
 
-                          $inputOptions['disabled'] = true;
-                          $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
-                          if (!empty($colOptions['userCol'])) {
-                              if (strpos($colOptions['userCol'], ':')) {
-                                  $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
-                                  $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
+                            $inputOptions['disabled'] = true;
+                            $colOptions = $dataManager->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'][$col];
+                            if (!empty($colOptions['userCol'])) {
+                                if (strpos($colOptions['userCol'], ':')) {
+                                    $rel = substr($colOptions['userCol'], 0, strpos($colOptions['userCol'], ':'));
+                                    $param = substr($colOptions['userCol'], strpos($colOptions['userCol'], ':') + 1);
 
-                                  $inputOptions['value'] = \Users\User::$cur->$rel->$param;
-                              } else {
-                                  $this->model->$col = \Users\User::$cur->{$preset['userCol']};
-                              }
-                          } elseif (!empty($colOptions['value'])) {
+                                    $inputOptions['value'] = \Users\User::$cur->$rel->$param;
+                                } else {
+                                    $this->model->$col = \Users\User::$cur->{$preset['userCol']};
+                                }
+                            } elseif (!empty($colOptions['value'])) {
 
-                              $inputOptions['value'] = $colOptions['value'];
-                          }
-                      }
-                      $inputOptions['class'] = 'input-sm';
-                      $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
-                      ?>
+                                $inputOptions['value'] = $colOptions['value'];
+                            }
+                        }
+                        $inputOptions['class'] = 'input-sm';
+                        $form->input('select', "datamanagerFilters[{$col}][value]", $colInfo['label'], $inputOptions);
+                        ?>
                     </div>
 
                     <?php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (!$dataManager->checkAccess()) {
-    echo 'you not have access to "' . $dataManager->modelName . '" manager with name: "' . $dataManager->managerName . '"';
+    echo 'you not have access to "'.$dataManager->modelName.'" manager with name: "'.$dataManager->managerName.'"';
     return false;
 }
 ?>
@@ -61,7 +61,7 @@ 
                             $options = [
                                 'where' => !empty($filters['getRows']['where']) ? $filters['getRows']['where'] : ''
                             ];
-                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix() . 'name'])) {
+                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix().'name'])) {
                                 $options['order'] = 'name';
                             }
                             $items = $relations[$colInfo['colParams']['relation']]['model']::getList($options);

system/modules/Ui/widgets/Pages/pages.php

Indentation +26 added lines, -26 removed lines

@@ -1,28 +1,28 @@
 <ul class="<?= $class; ?>"><?php
-  if ($pagesInstance->params['page'] > 1) {
-      $getArr['page'] = $pagesInstance->params['page'] - 1;
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&larr;</a></li>";
-  }
+    if ($pagesInstance->params['page'] > 1) {
+        $getArr['page'] = $pagesInstance->params['page'] - 1;
+        echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&larr;</a></li>";
+    }
 
-  for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
-      if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
-          echo '<li ';
-          if ($pagesInstance->params['page'] == $i)
-              echo 'class = "active"';
-          echo ">";
-          $getArr['page'] = $i;
-          echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
-      }
-      elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
-          $getArr['page'] = round($pagesInstance->params['page'] / 2);
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
-      } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
-          $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
-      }
-  }
-  if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) {
-      $getArr['page'] = $pagesInstance->params['page'] + 1;
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&rarr;</a></li>";
-  }
-  ?></ul>
\ No newline at end of file
+    for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
+        if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
+            echo '<li ';
+            if ($pagesInstance->params['page'] == $i)
+                echo 'class = "active"';
+            echo ">";
+            $getArr['page'] = $i;
+            echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
+        }
+        elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
+            $getArr['page'] = round($pagesInstance->params['page'] / 2);
+            echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
+        } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
+            $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
+            echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
+        }
+    }
+    if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) {
+        $getArr['page'] = $pagesInstance->params['page'] + 1;
+        echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&rarr;</a></li>";
+    }
+    ?></ul>
\ No newline at end of file

Braces +4 added lines, -4 removed lines

@@ -7,13 +7,13 @@
   for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
       if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
           echo '<li ';
-          if ($pagesInstance->params['page'] == $i)
-              echo 'class = "active"';
+          if ($pagesInstance->params['page'] == $i) {
+                        echo 'class = "active"';
+          }
           echo ">";
           $getArr['page'] = $i;
           echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
-      }
-      elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
+      } elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
           $getArr['page'] = round($pagesInstance->params['page'] / 2);
           echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
       } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {

Spacing +6 added lines, -6 removed lines

@@ -1,28 +1,28 @@
 <ul class="<?= $class; ?>"><?php
   if ($pagesInstance->params['page'] > 1) {
       $getArr['page'] = $pagesInstance->params['page'] - 1;
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&larr;</a></li>";
+      echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>&larr;</a></li>";
   }
 
   for ($i = 1; $i <= $pagesInstance->params['pages']; $i++) {
-      if (( $i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
+      if (($i >= $pagesInstance->params['page'] - 3 && $i <= $pagesInstance->params['page'] + 3) || $i == 1 || $i == $pagesInstance->params['pages']) {
           echo '<li ';
           if ($pagesInstance->params['page'] == $i)
               echo 'class = "active"';
           echo ">";
           $getArr['page'] = $i;
-          echo "<a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>{$i}</a></li>";
+          echo "<a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>{$i}</a></li>";
       }
       elseif ($i == $pagesInstance->params['page'] - 7 && $i > 1) {
           $getArr['page'] = round($pagesInstance->params['page'] / 2);
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
+          echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>...</a></li>";
       } elseif ($i == $pagesInstance->params['page'] + 7 && $i < $pagesInstance->params['pages']) {
           $getArr['page'] = round(($pagesInstance->params['pages'] - $pagesInstance->params['page']) / 2) + $pagesInstance->params['page'];
-          echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>...</a></li>";
+          echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>...</a></li>";
       }
   }
   if ($pagesInstance->params['page'] < $pagesInstance->params['pages']) {
       $getArr['page'] = $pagesInstance->params['page'] + 1;
-      echo "<li><a href = '{$pagesInstance->options['url']}?" . http_build_query($getArr) . "'>&rarr;</a></li>";
+      echo "<li><a href = '{$pagesInstance->options['url']}?".http_build_query($getArr)."'>&rarr;</a></li>";
   }
   ?></ul>
\ No newline at end of file

system/modules/Ui/widgets/Table/body.php

Indentation +13 added lines, -13 removed lines

@@ -5,19 +5,19 @@
           <div class ='pull-right'>
             <div class="btn-group">
               <?php
-              $html = '';
-              foreach ($table->buttons as $button) {
-                  $html .= '<a class = "btn btn-primary btn-sm"';
-                  if (!empty($button['href'])) {
-                      $html .= " href = '{$button['href']}'";
-                  }
-                  if (!empty($button['onclick'])) {
-                      $html .= " onclick = '{$button['onclick']}'";
-                  }
-                  $html .= ">{$button['text']}</a> ";
-              }
-              echo $html;
-              ?>
+                $html = '';
+                foreach ($table->buttons as $button) {
+                    $html .= '<a class = "btn btn-primary btn-sm"';
+                    if (!empty($button['href'])) {
+                        $html .= " href = '{$button['href']}'";
+                    }
+                    if (!empty($button['onclick'])) {
+                        $html .= " onclick = '{$button['onclick']}'";
+                    }
+                    $html .= ">{$button['text']}</a> ";
+                }
+                echo $html;
+                ?>
             </div>
           </div>
       <?php } ?>

system/modules/UserForms/UserForms.php

Braces +3 added lines, -2 removed lines

@@ -16,8 +16,9 @@
         if (!empty($_POST['UserForms'])) {
             foreach ($_POST['UserForms'] as $form_id => $inputs) {
                 $form = \UserForms\Form::get((int) $form_id);
-                if (!$form)
-                    continue;
+                if (!$form) {
+                                    continue;
+                }
                 $formRecive = new \UserForms\Recive();
                 $formRecive->user_id = (int) \Users\User::$cur->id;
                 $formRecive->form_id = (int) $form_id;

Spacing +10 added lines, -10 removed lines

@@ -24,13 +24,13 @@ 
                 $data = [];
                 $error = false;
                 foreach ($form->inputs as $input) {
-                    if (isset($inputs['input' . $input->id])) {
-                        $data['input' . $input->id] = htmlspecialchars($inputs['input' . $input->id]);
+                    if (isset($inputs['input'.$input->id])) {
+                        $data['input'.$input->id] = htmlspecialchars($inputs['input'.$input->id]);
                     } elseif ($input->required) {
                         $error = true;
-                        Msg::add('Вы не заполнили поле: ' . $input->label);
+                        Msg::add('Вы не заполнили поле: '.$input->label);
                     } else {
-                        $data['input' . $input->id] = '';
+                        $data['input'.$input->id] = '';
                     }
                 }
                 if (!$error) {
@@ -42,13 +42,13 @@ 
             if (!$error && !empty(App::$cur->config['site']['email'])) {
                 $text = '';
                 foreach ($form->inputs as $input) {
-                    if (isset($inputs['input' . $input->id])) {
-                        $text .="<b>{$input->label}:</b> " . htmlspecialchars($inputs['input' . $input->id]) . "<br />";
+                    if (isset($inputs['input'.$input->id])) {
+                        $text .= "<b>{$input->label}:</b> ".htmlspecialchars($inputs['input'.$input->id])."<br />";
                     }
                 }
                 if ($text) {
-                    $text = 'Дата получения по серверному времени: ' . date('Y-m-d H:i:s') . '<br />Заполненые поля:<br />' . $text;
-                    Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, App::$cur->config['site']['email'], $form->name, $text);
+                    $text = 'Дата получения по серверному времени: '.date('Y-m-d H:i:s').'<br />Заполненые поля:<br />'.$text;
+                    Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, App::$cur->config['site']['email'], $form->name, $text);
                 }
             }
             Tools::redirect($_SERVER['REQUEST_URI'], 'Ваша форма была успешно отправлена', 'success');
@@ -60,8 +60,8 @@ 
         $inputs = json_decode($item->data, true);
         $text = '';
         foreach ($item->form->inputs as $input) {
-            if (isset($inputs['input' . $input->id])) {
-                $text .= "{$input->label}: " . htmlspecialchars($inputs['input' . $input->id]) . "<br />";
+            if (isset($inputs['input'.$input->id])) {
+                $text .= "{$input->label}: ".htmlspecialchars($inputs['input'.$input->id])."<br />";
             }
         }
         return $text;

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
             }

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 
         $sections = $this->module->getSnippets('cabinetSection');
         if (!empty($sections[$activeSection]['name'])) {
-            $this->view->setTitle($sections[$activeSection]['name'] . ' - Личный кабинет');
+            $this->view->setTitle($sections[$activeSection]['name'].' - Личный кабинет');
             $bread[] = ['text' => 'Личный кабинет', 'href' => '/users/cabinet'];
             $bread[] = ['text' => $sections[$activeSection]['name']];
         } else {
@@ -100,10 +100,10 @@ 
                     Users\User::$cur->mail = $user_mail;
                     if (!empty($this->module->config['needActivation'])) {
                         Users\User::$cur->activation = Tools::randomString();
-                        $from = 'noreply@' . INJI_DOMAIN_NAME;
+                        $from = 'noreply@'.INJI_DOMAIN_NAME;
                         $to = $user_mail;
-                        $subject = 'Активация аккаунта на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-                        $text = 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . Users\User::$cur->id . '/' . Users\User::$cur->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . Users\User::$cur->id . '/' . Users\User::$cur->activation . '</a>';
+                        $subject = 'Активация аккаунта на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+                        $text = 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://'.INJI_DOMAIN_NAME.'/users/activation/'.Users\User::$cur->id.'/'.Users\User::$cur->activation.'">http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/users/activation/'.Users\User::$cur->id.'/'.Users\User::$cur->activation.'</a>';
                         Tools::sendMail($from, $to, $subject, $text);
                         Msg::add('На указанный почтовый ящик была выслана ваша ссылка для подтверждения E-Mail', 'success');
                     } else {
@@ -126,10 +126,10 @@ 
         if (!$user->activation) {
             Tools::redirect('/', 'Пользователь уже активирован');
         }
-        $from = 'noreply@' . INJI_DOMAIN_NAME;
+        $from = 'noreply@'.INJI_DOMAIN_NAME;
         $to = $user->mail;
-        $subject = 'Активация аккаунта на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-        $text = 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://' . INJI_DOMAIN_NAME . '/users/activation/' . $user->id . '/' . $user->activation . '">http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/activation/' . $user->id . '/' . $user->activation . '</a>';
+        $subject = 'Активация аккаунта на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+        $text = 'Для активации вашего аккаунта перейдите по ссылке <a href = "http://'.INJI_DOMAIN_NAME.'/users/activation/'.$user->id.'/'.$user->activation.'">http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/users/activation/'.$user->id.'/'.$user->activation.'</a>';
         Tools::sendMail($from, $to, $subject, $text);
         Tools::redirect('/', 'На указанный почтовый ящик была выслана ваша ссылка для подтверждения E-Mail', 'success');
     }

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/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'],

system/modules/Users/models/User/Invite.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     static $forms = [
         'manager' => [
             'map' => [
-                ['code', 'type',],
+                ['code', 'type', ],
                 ['user_id'],
                 ['limit', 'count'],
             ]