injitools / cms-Inji

system/modules/Users/objects/SocialHelper/Google.php

Braces +4 added lines, -2 removed lines

@@ -69,7 +69,8 @@ 
             if (!empty(\App::$cur->users->config['loginUrl'][\App::$cur->type])) {
                 \Tools::redirect(\App::$cur->users->config['loginUrl'][\App::$cur->type]);
             }
-        } else {
+        }
+        else {
             if ($userSocial && !$userSocial->user) {
                 $userSocial->delete();
             }
@@ -111,7 +112,8 @@ 
                     $userInfo->user_id = $user->id;
                     $userInfo->save();
                 }
-            } else {
+            }
+            else {
                 $user = \Users\User::$cur;
             }
             if (!$user->info->photo_file_id && !empty($userDetail['picture'])) {

system/modules/Users/objects/SocialHelper/Twitter.php

Braces +6 added lines, -3 removed lines

@@ -137,7 +137,8 @@ 
             if (!empty(\App::$cur->users->config['loginUrl'][\App::$cur->type])) {
                 \Tools::redirect(\App::$cur->users->config['loginUrl'][\App::$cur->type]);
             }
-        } else {
+        }
+        else {
             if ($userSocial && !$userSocial->user) {
                 $userSocial->delete();
             }
@@ -170,7 +171,8 @@ 
                 $userInfo = new \Users\User\Info();
                 $userInfo->user_id = $user->id;
                 $userInfo->save();
-            } else {
+            }
+            else {
                 $user = \Users\User::$cur;
             }
             $name = explode(' ', $userDetail['name']);
@@ -186,7 +188,8 @@ 
             \App::$cur->users->newSession($user);
             if (!empty(\App::$cur->users->config['loginUrl'][\App::$cur->type])) {
                 \Tools::redirect(\App::$cur->users->config['loginUrl'][\App::$cur->type], 'Вы успешно зарегистрировались через Twitter', 'success');
-            } else {
+            }
+            else {
                 \Tools::redirect('/users/cabinet/profile', 'Вы успешно зарегистрировались через Twitter', 'success');
             }
         }

system/modules/Users/widgets/cabinet/socials.php

Braces +2 added lines, -1 removed lines

@@ -11,7 +11,8 @@
     }
     if ($connect) {
         echo "<a href = '/users/social/disconnect/{$social->code}'>Отключить {$social->name}</a><br />";
-    } else {
+    }
+    else {
         echo "<a href = '/users/social/auth/{$social->code}'>Подключить {$social->name}</a><br />";
     }
 }
\ No newline at end of file

system/modules/Users/appControllers/UsersController.php

Indentation +7 added lines, -7 removed lines

@@ -167,14 +167,14 @@
                 <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>

Braces +10 added lines, -5 removed lines

@@ -22,7 +22,8 @@ 
             $this->view->setTitle($sections[$activeSection]['name'] . ' - Личный кабинет');
             $bread[] = ['text' => 'Личный кабинет', 'href' => '/users/cabinet'];
             $bread[] = ['text' => $sections[$activeSection]['name']];
-        } else {
+        }
+        else {
             $this->view->setTitle('Личный кабинет');
             $bread[] = ['text' => 'Личный кабинет'];
         }
@@ -57,7 +58,8 @@ 
                         Msg::add('Вы не прошли проверку на робота', 'danger');
                         $error = true;
                     }
-                } else {
+                }
+                else {
                     Msg::add('Произошла ошибка, попробуйте ещё раз');
                     $error = true;
                 }
@@ -93,11 +95,13 @@ 
             $user_mail = trim($_POST['mail']);
             if (!filter_var($user_mail, FILTER_VALIDATE_EMAIL)) {
                 Msg::add('Вы ввели не корректный E-mail', 'danger');
-            } else {
+            }
+            else {
                 $user = Users\User::get($user_mail, 'mail');
                 if ($user && $user->id != Users\User::$cur->id) {
                     Msg::add('Данный E-mail уже привязан к другому аккаунту', 'danger');
-                } else {
+                }
+                else {
                     Users\User::$cur->mail = $user_mail;
                     if (!empty($this->module->config['needActivation'])) {
                         Users\User::$cur->activation = Tools::randomString();
@@ -107,7 +111,8 @@ 
                         $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 {
+                    }
+                    else {
                         Msg::add('Вы успешно привязали E-Mail к своему аккаунту', 'success');
                     }
                     Users\User::$cur->save();

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -138,13 +138,13 @@
         $userId = (int) $userId;
         $result = new \Server\Result();
         if (!$userId) {
-            $result->success = FALSE;
+            $result->success = false;
             $result->content = 'Не указан пользователь';
             $result->send();
         }
         $partners = App::$cur->users->getUserPartners(Users\User::$cur, 8);
         if (empty($partners['users'][$userId])) {
-            $result->success = FALSE;
+            $result->success = false;
             $result->content = 'Этот пользователь не находится в вашей структуре';
             $result->send();
         }

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

Indentation +6 added lines, -6 removed lines

@@ -26,12 +26,12 @@
                 </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
                             }

Braces +2 added lines, -1 removed lines

@@ -36,7 +36,8 @@
                                 <?php
                             }
                         }
-                    } else {
+                    }
+                    else {
                         $this->widget($sections[$activeSection]['fullWidget']);
                     }
                     ?>

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

Indentation +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
                     <div class ='row'>
                         <div class="col-sm-6">
                           <?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'] : ''))))); ?>" />

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

Indentation +9 added lines, -9 removed lines

@@ -5,15 +5,15 @@
                 <h3>Вход</h3>
                 <div class="form-group">
                   <?php
-                  $socials = Users\Social::getList(['where' => ['active', 1]]);
-                  if ($socials) {
-                      echo 'Войти через: ';
-                      foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-                          $text = $social->image ? '<img src ="' . Statics::file($social->image->path) . '">' : $social->name();
-                          echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
-                      }
-                  }
-                  ?>
+                    $socials = Users\Social::getList(['where' => ['active', 1]]);
+                    if ($socials) {
+                        echo 'Войти через: ';
+                        foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
+                            $text = $social->image ? '<img src ="' . Statics::file($social->image->path) . '">' : $social->name();
+                            echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
+                        }
+                    }
+                    ?>
                 </div>
                 <form action = '' method = 'POST' >
                     <div class ='row'>

system/modules/Access/snippets/accessGetter/Controller.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 return [
     'classes' => ['Controller'],
     'get' => function($element) {
-$access = NULL;
+$access = null;
 $path = [
     'accessTree',
     $element->module->app->type,

system/modules/Access/Access.php

Braces +10 added lines, -6 removed lines

@@ -20,8 +20,9 @@ 
         if (!$app) {
             $app = $this->app->type;
         }
-        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl']))
-            return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) {
+                    return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        }
 
         return '/';
     }
@@ -46,8 +47,9 @@ 
             return true;
         }
 
-        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access)))
-            return false;
+        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) {
+                    return false;
+        }
 
         return true;
     }
@@ -66,9 +68,11 @@ 
     public function pathWalker($array, $path) {
         if ($path && isset($array[$path[0]])) {
             return $this->pathWalker($array[$path[0]], array_slice($path, 1));
-        } elseif (!$path) {
+        }
+        elseif (!$path) {
             return $array;
-        } else {
+        }
+        else {
             return NULL;
         }
     }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
     }
 
     public function checkAccess($element, $user = null) {
-        $access = NULL;
+        $access = null;
         foreach ($this->accessCheckers as $getter) {
             foreach ($getter['classes'] as $className) {
                 if ($element instanceof $className) {
@@ -69,7 +69,7 @@ 
         } elseif (!$path) {
             return $array;
         } else {
-            return NULL;
+            return null;
         }
     }