Completed
Push — master ( 18aa30...8e3681 )
by Alexey
04:31
created
system/modules/View/objects/Adapter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 {
13 13
     public function el($name, $option = [])
14 14
     {
15
-        $className = get_called_class() . '\\' . $name;
15
+        $className = get_called_class().'\\'.$name;
16 16
         if (class_exists($className)) {
17 17
             return new $className();
18 18
         }
Please login to merge, or discard this patch.
system/modules/Users/models/User/Info.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,16 +89,16 @@
 block discarded – undo
89 89
 
90 90
     public function name()
91 91
     {
92
-        if ($this->first_name . $this->last_name . $this->middle_name) {
92
+        if ($this->first_name.$this->last_name.$this->middle_name) {
93 93
             $name = '';
94 94
             if ($this->first_name) {
95
-                $name.=$this->first_name;
95
+                $name .= $this->first_name;
96 96
             }
97 97
             if ($this->middle_name) {
98
-                $name.=($name ? ' ' : '') . $this->middle_name;
98
+                $name .= ($name ? ' ' : '').$this->middle_name;
99 99
             }
100 100
             if ($this->last_name) {
101
-                $name.=($name ? ' ' : '') . $this->last_name;
101
+                $name .= ($name ? ' ' : '').$this->last_name;
102 102
             }
103 103
             return $name;
104 104
         } else {
Please login to merge, or discard this patch.
system/modules/Users/appAdminControllers/UsersController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
     {
24 24
         $user = Users\User::get($userId);
25 25
         App::$cur->users->newSession($user);
26
-        Tools::redirect('/', 'Теперь вы на сайте под пользователем ' . $user->name());
26
+        Tools::redirect('/', 'Теперь вы на сайте под пользователем '.$user->name());
27 27
     }
28 28
 
29 29
 }
Please login to merge, or discard this patch.
system/modules/Users/install_script.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-return function ($step = NULL, $params = []) {
3
+return function($step = NULL, $params = []) {
4 4
 
5 5
     $groups = [
6 6
         [
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
     } else {
46 46
         $user = new Users\User(array(
47 47
             'user_login' => 'admin',
48
-            'user_mail' => 'admin@' . idn_to_utf8(INJI_DOMAIN_NAME),
48
+            'user_mail' => 'admin@'.idn_to_utf8(INJI_DOMAIN_NAME),
49 49
             'user_pass' => password_hash('admin', PASSWORD_DEFAULT),
50 50
             'user_group_id' => $groupObject->id,
51 51
             'user_role_id' => $roleObject->id,
Please login to merge, or discard this patch.
system/modules/Users/appControllers/content/login.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
           if ($socials) {
10 10
               echo 'Войти через: ';
11 11
               foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
12
-                  $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
12
+                  $text = $social->image ? '<img src ="'.Statics::file($social->image->path, '25x25', 'q').'">' : $social->name();
13 13
                   echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
14 14
               }
15 15
           }
Please login to merge, or discard this patch.
system/modules/Users/appControllers/SocialController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
         if (!$social) {
21 21
             Tools::redirect('/', 'Такой соц. сети не найдено');
22 22
         }
23
-        $helper = 'Users\SocialHelper\\' . $social->object_name;
23
+        $helper = 'Users\SocialHelper\\'.$social->object_name;
24 24
         $helper::auth();
25 25
     }
26 26
 
@@ -36,10 +36,10 @@  discard block
 block discarded – undo
36 36
         foreach (\Users\User::$cur->socials as $userSocial) {
37 37
             if ($userSocial->social_id == $social->id) {
38 38
                 $userSocial->delete();
39
-                Tools::redirect('/', 'Связь с соц. сетью ' . $social->name . ' была удалена');
39
+                Tools::redirect('/', 'Связь с соц. сетью '.$social->name.' была удалена');
40 40
             }
41 41
         }
42
-        Tools::redirect('/', 'Связь с соц. сетью ' . $social->name . ' не найдена');
42
+        Tools::redirect('/', 'Связь с соц. сетью '.$social->name.' не найдена');
43 43
     }
44 44
 
45 45
 }
Please login to merge, or discard this patch.
system/modules/Users/appControllers/UsersController.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 
22 22
         $sections = $this->module->getSnippets('cabinetSection');
23 23
         if (!empty($sections[$activeSection]['name'])) {
24
-            $this->view->setTitle($sections[$activeSection]['name'] . ' - Личный кабинет');
24
+            $this->view->setTitle($sections[$activeSection]['name'].' - Личный кабинет');
25 25
             $bread[] = ['text' => 'Личный кабинет', 'href' => '/users/cabinet'];
26 26
             $bread[] = ['text' => $sections[$activeSection]['name']];
27 27
         } else {
@@ -100,10 +100,10 @@  discard block
 block discarded – undo
100 100
                     Users\User::$cur->mail = $user_mail;
101 101
                     if (!empty($this->module->config['needActivation'])) {
102 102
                         Users\User::$cur->activation = Tools::randomString();
103
-                        $from = 'noreply@' . INJI_DOMAIN_NAME;
103
+                        $from = 'noreply@'.INJI_DOMAIN_NAME;
104 104
                         $to = $user_mail;
105
-                        $subject = 'Активация аккаунта на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
106
-                        $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>';
105
+                        $subject = 'Активация аккаунта на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
106
+                        $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>';
107 107
                         Tools::sendMail($from, $to, $subject, $text);
108 108
                         Msg::add('На указанный почтовый ящик была выслана ваша ссылка для подтверждения E-Mail', 'success');
109 109
                     } else {
@@ -126,10 +126,10 @@  discard block
 block discarded – undo
126 126
         if (!$user->activation) {
127 127
             Tools::redirect('/', 'Пользователь уже активирован');
128 128
         }
129
-        $from = 'noreply@' . INJI_DOMAIN_NAME;
129
+        $from = 'noreply@'.INJI_DOMAIN_NAME;
130 130
         $to = $user->mail;
131
-        $subject = 'Активация аккаунта на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
132
-        $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>';
131
+        $subject = 'Активация аккаунта на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
132
+        $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>';
133 133
         Tools::sendMail($from, $to, $subject, $text);
134 134
         Tools::redirect('/', 'На указанный почтовый ящик была выслана ваша ссылка для подтверждения E-Mail', 'success');
135 135
     }
Please login to merge, or discard this patch.
system/modules/Users/widgets/cabinet/usersTree.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -2,12 +2,12 @@  discard block
 block discarded – undo
2 2
 if (!empty($_POST['partnerInvite']['email'])) {
3 3
     $title = '';
4 4
     if (!empty($_POST['partnerInvite']['name'])) {
5
-        $title .='Ув. ' . htmlspecialchars($_POST['partnerInvite']['name']) . '. ';
5
+        $title .= 'Ув. '.htmlspecialchars($_POST['partnerInvite']['name']).'. ';
6 6
     }
7 7
     if (!filter_var($_POST['partnerInvite']['email'], FILTER_VALIDATE_EMAIL)) {
8 8
         Tools::redirect(null, 'Вы ввели не корректный E-mail', 'danger');
9 9
     }
10
-    $title = \Users\User::$cur->name() . ' приглашает вас зарегистрироваться на сайте: ' . idn_to_utf8(INJI_DOMAIN_NAME);
10
+    $title = \Users\User::$cur->name().' приглашает вас зарегистрироваться на сайте: '.idn_to_utf8(INJI_DOMAIN_NAME);
11 11
     $inviteCode = Tools::randomString(60);
12 12
     $invite = new Users\User\Invite();
13 13
     $invite->code = $inviteCode;
@@ -16,8 +16,8 @@  discard block
 block discarded – undo
16 16
     $invite->limit = 1;
17 17
     $invite->save();
18 18
     $text = "<h3>{$title}</h3>";
19
-    $text .= '<p>Чтобы принять приглашение, перейдите по <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/users/registration?invite_code=' . $inviteCode . '">этой ссылке</a> и завершите процедуру регистрации</p>';
20
-    Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, $_POST['partnerInvite']['email'], $title, $text);
19
+    $text .= '<p>Чтобы принять приглашение, перейдите по <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/users/registration?invite_code='.$inviteCode.'">этой ссылке</a> и завершите процедуру регистрации</p>';
20
+    Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, $_POST['partnerInvite']['email'], $title, $text);
21 21
     Tools::redirect(null, 'Приглашение было отправлено', 'success');
22 22
 }
23 23
 $partners = App::$cur->users->getUserPartners(Users\User::$cur, 8);
Please login to merge, or discard this patch.
system/modules/Users/objects/SocialHelper/Vk.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -22,20 +22,20 @@  discard block
 block discarded – undo
22 22
                 'scope' => 'email',
23 23
                 'response_type' => 'code',
24 24
                 'display' => 'page',
25
-                'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/vk'
25
+                'redirect_uri' => 'http://'.INJI_DOMAIN_NAME.'/users/social/auth/vk'
26 26
             ];
27
-            \Tools::redirect("https://oauth.vk.com/authorize?" . http_build_query($query));
27
+            \Tools::redirect("https://oauth.vk.com/authorize?".http_build_query($query));
28 28
         }
29 29
         if (empty($_GET['code']) && !empty($_GET['error'])) {
30
-            \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: ' . $_GET['error_description']);
30
+            \Tools::redirect('/', 'Произошла ошибка во время авторизации через соц. сеть: '.$_GET['error_description']);
31 31
         }
32 32
         $query = [
33 33
             'client_id' => $config['appId'],
34 34
             'client_secret' => $config['secret'],
35 35
             'code' => $_GET['code'],
36
-            'redirect_uri' => 'http://' . INJI_DOMAIN_NAME . '/users/social/auth/vk'
36
+            'redirect_uri' => 'http://'.INJI_DOMAIN_NAME.'/users/social/auth/vk'
37 37
         ];
38
-        $result = @file_get_contents("https://oauth.vk.com/access_token?" . http_build_query($query));
38
+        $result = @file_get_contents("https://oauth.vk.com/access_token?".http_build_query($query));
39 39
         if ($result === false) {
40 40
             \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
41 41
         }
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             'fields' => 'sex, bdate, photo_max_orig, home_town',
49 49
             'access_token' => $result['access_token']
50 50
         ];
51
-        $userResult = @file_get_contents("https://api.vk.com/method/users.get?" . http_build_query($userQuery));
51
+        $userResult = @file_get_contents("https://api.vk.com/method/users.get?".http_build_query($userQuery));
52 52
         if (!$userResult) {
53 53
             \Tools::redirect('/', 'Во время авторизации произошли ошибки', 'danger');
54 54
         }
Please login to merge, or discard this patch.