injitools / cms-Inji

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

system/modules/Users/snippets/cabinetSection/socials.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php

-if(!Users\Social::getList(['where' => ['active', 1]])){

+if (!Users\Social::getList(['where' => ['active', 1]])) {

     return false;

 }

 return [

system/modules/View/appAdminControllers/content/index.php

Braces +2 added lines, -1 removed lines

@@ -11,13 +11,14 @@
     '',
     ''
 ]);
-if (!empty($templates['app']['installed']))
+if (!empty($templates['app']['installed'])) {
     foreach ($templates['app']['installed'] as $template => $name) {
         $table->addRow([
             $name,
             (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/' . $template . '">Установить по умолчанию</a>' : 'Тема по умолчанию',
             '<a href = "/admin/view/editTemplate/' . $template . '">Редактировать</a>'
         ]);
+}
     }
 $table->draw();
 ?>
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
     foreach ($templates['app']['installed'] as $template => $name) {
         $table->addRow([
             $name,
-            (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/' . $template . '">Установить по умолчанию</a>' : 'Тема по умолчанию',
-            '<a href = "/admin/view/template/editFile/' . $template . '">Файлы</a> <a href = "/admin/view/editTemplate/' . $template . '">Редактировать</a>'
+            (empty($templates['app']['current']) || $templates['app']['current'] != $template) ? '<a href = "/admin/view/setDefault/'.$template.'">Установить по умолчанию</a>' : 'Тема по умолчанию',
+            '<a href = "/admin/view/template/editFile/'.$template.'">Файлы</a> <a href = "/admin/view/editTemplate/'.$template.'">Редактировать</a>'
         ]);
     }
 $table->draw();
\ No newline at end of file

system/modules/Widgets/appAdminControllers/WidgetsController.php

Braces +3 added lines, -2 removed lines

@@ -36,8 +36,9 @@
                     $params = json_decode($widget->widget_params, true);
                     if ($params) {
                         foreach ($params as $param) {
-                            if (!isset($widgetCode[$i]))
-                                break;
+                            if (!isset($widgetCode[$i])) {
+                                                            break;
+                            }
                             if ($param['type'] == 'select') {
                                 $item = $param['model']::get($widgetCode[$i++]);
                                 if ($item) {

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
             $widget = false; //Widget::get($widgetCode[0], 'widget_filename');
 
             if ($widget) {
-                $text .= $widget->widget_name . "\n";
+                $text .= $widget->widget_name."\n";
                 $i = 1;
                 if (isset($widgetCode[$i]) && $widget->widget_params) {
                     $params = json_decode($widget->widget_params, true);
@@ -41,28 +41,28 @@ 
                             if ($param['type'] == 'select') {
                                 $item = $param['model']::get($widgetCode[$i++]);
                                 if ($item) {
-                                    $text .= $param['name'] . ': ' . $item->$param['showCol'] . "\n";
+                                    $text .= $param['name'].': '.$item->$param['showCol']."\n";
                                 } else {
                                     $text .= $widgetCode[$i - 1];
                                 }
                             } else {
                                 $value = $widgetCode[$i++];
                                 if (mb_strlen($value, 'utf-8') > 50) {
-                                    $value = mb_substr($value, 0, 50) . '...';
+                                    $value = mb_substr($value, 0, 50).'...';
                                 }
-                                $text .= $param['name'] . ': ' . $value . "\n";
+                                $text .= $param['name'].': '.$value."\n";
                             }
                         }
                     }
                 } else {
                     unset($widgetCode[0]);
                     foreach ($widgetCode as $item) {
-                        $text .= $item . "\n";
+                        $text .= $item."\n";
                     }
                 }
             } else {
                 foreach ($widgetCode as $item) {
-                    $text .= $item . "\n";
+                    $text .= $item."\n";
                 }
             }
         } else {
@@ -71,7 +71,7 @@ 
 
         header('Content-type: image/png');
         // шрифт
-        $font = dirname(__FILE__) . '/../fonts/Cousine/Cousine-Regular.ttf';
+        $font = dirname(__FILE__).'/../fonts/Cousine/Cousine-Regular.ttf';
         // вычисляем сколько места займёт текст
         $bbox = imageftbbox(10, 0, $font, $text);
 

system/program/setup/modules/Main/appSetupControllers/MainController.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
                 if (empty($config['failTry'])) {
                     $config['failTry'] = 1;
                 } else {
-                    $config['failTry'] ++;
+                    $config['failTry']++;
                 }
                 Config::save('share', $config);
             }