Completed
Push — master ( a8c78d...2ddeae )
by Alexey
05:27
created
system/modules/Sliders/install_script.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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
         [
Please login to merge, or discard this patch.
system/modules/TextBlocks/install_script.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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
         [
Please login to merge, or discard this patch.
system/modules/UserForms/install_script.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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
         [
Please login to merge, or discard this patch.
system/modules/Users/models/User/Inventory.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -97,13 +97,13 @@
 block discarded – undo
97 97
         if ($this->first_name . $this->last_name . $this->middle_name) {
98 98
             $name = '';
99 99
             if ($this->first_name) {
100
-                $name.=$this->first_name;
100
+                $name .= $this->first_name;
101 101
             }
102 102
             if ($this->middle_name) {
103
-                $name.=($name ? ' ' : '') . $this->middle_name;
103
+                $name .= ($name ? ' ' : '') . $this->middle_name;
104 104
             }
105 105
             if ($this->last_name) {
106
-                $name.=($name ? ' ' : '') . $this->last_name;
106
+                $name .= ($name ? ' ' : '') . $this->last_name;
107 107
             }
108 108
             return $name;
109 109
         } else {
Please login to merge, or discard this patch.
system/Inji/Module.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
      * Get all posible directorys for module files
82 82
      * 
83 83
      * @param string $moduleName
84
-     * @return array
84
+     * @return string
85 85
      */
86 86
     public static function getModulePaths($moduleName)
87 87
     {
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
      * Get installed modules for app
132 132
      * 
133 133
      * @param \App $app
134
-     * @param boolean|\App $primary
134
+     * @param App $primary
135 135
      * @return array
136 136
      */
137 137
     public static function getInstalled($app, $primary = false)
Please login to merge, or discard this patch.
system/modules/Ui/widgets/DataManager/rowButtons.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 $buttons = [];
12 12
 foreach ($actions as $action => $actionParams) {
13 13
     if (class_exists($actionParams['className']) && $actionParams['className']::$rowAction) {
14
-        $buttons[]= $actionParams['className']::rowButton($dataManager, $item, $params, $actionParams);
14
+        $buttons[] = $actionParams['className']::rowButton($dataManager, $item, $params, $actionParams);
15 15
     }
16 16
 }
17 17
 echo implode('&nbsp;', $buttons);
Please login to merge, or discard this patch.
system/modules/Users/Users.php 3 patches
Doc Comments   +9 added lines patch added patch discarded remove patch
@@ -92,6 +92,9 @@  discard block
 block discarded – undo
92 92
         }
93 93
     }
94 94
 
95
+    /**
96
+     * @param string $user_mail
97
+     */
95 98
     public function passre($user_mail)
96 99
     {
97 100
         $user = $this->get($user_mail, 'mail');
@@ -322,6 +325,9 @@  discard block
 block discarded – undo
322 325
         return $user->id;
323 326
     }
324 327
 
328
+    /**
329
+     * @param string $pass
330
+     */
325 331
     public function hashpass($pass)
326 332
     {
327 333
         return password_hash($pass, PASSWORD_DEFAULT);
@@ -359,6 +365,9 @@  discard block
 block discarded – undo
359 365
         return $return;
360 366
     }
361 367
 
368
+    /**
369
+     * @param integer $cat_id
370
+     */
362 371
     public function addUserActivity($user_id, $cat_id , $text = '')
363 372
     {
364 373
         $ua = new Users\Activity([
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -307,7 +307,7 @@
 block discarded – undo
307 307
             $to = $user_mail;
308 308
             $subject = 'Регистрация на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
309 309
             $text = 'Вы были зарегистрированы на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME) . '<br />для входа используйте ваш почтовый ящик в качестве логина и пароль: ' . $pass;
310
-            $text .='<br />';
310
+            $text .= '<br />';
311 311
             $text .= '<br />';
312 312
             $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>';
313 313
             Tools::sendMail($from, $to, $subject, $text);
Please login to merge, or discard this patch.
Braces   +13 added lines, -10 removed lines patch added patch discarded remove patch
@@ -196,17 +196,20 @@
 block discarded – undo
196 196
      */
197 197
     public function get($idn, $ltype = 'id')
198 198
     {
199
-        if (!$idn)
200
-            return false;
199
+        if (!$idn) {
200
+                    return false;
201
+        }
201 202
 
202
-        if (is_numeric($idn) && $ltype != 'login')
203
-            $user = Users\User::get($idn, 'id');
204
-        elseif ($ltype == 'login')
205
-            $user = Users\User::get($idn, 'login');
206
-        else
207
-            $user = Users\User::get($idn, 'mail');
208
-        if (!$user)
209
-            return [];
203
+        if (is_numeric($idn) && $ltype != 'login') {
204
+                    $user = Users\User::get($idn, 'id');
205
+        } elseif ($ltype == 'login') {
206
+                    $user = Users\User::get($idn, 'login');
207
+        } else {
208
+                    $user = Users\User::get($idn, 'mail');
209
+        }
210
+        if (!$user) {
211
+                    return [];
212
+        }
210 213
 
211 214
         return $user;
212 215
     }
Please login to merge, or discard this patch.
system/modules/Ecommerce/models/UserAdds/Field.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
             'map' => [
45 45
                 ['name', 'type'],
46 46
                 ['required', 'save'],
47
-                [ 'userfield']
47
+                ['userfield']
48 48
             ]
49 49
         ]
50 50
     ];
Please login to merge, or discard this patch.
system/modules/Ui/objects/Tree.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -23,17 +23,17 @@
 block discarded – undo
23 23
         ?>
24 24
         <ul class="treeview" data-col='tree_path'>
25 25
           <?php
26
-          if (is_string($objectRoot)) {
27
-              $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
28
-          } else {
29
-              $class = get_class($objectRoot);
30
-              $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
31
-          }
32
-          $count += count($items);
33
-          foreach ($items as $objectChild) {
34
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
35
-          }
36
-          ?>
26
+            if (is_string($objectRoot)) {
27
+                $items = $objectRoot::getList(['where' => ['parent_id', 0]]);
28
+            } else {
29
+                $class = get_class($objectRoot);
30
+                $items = $class::getList(['where' => ['parent_id', $objectRoot->pk()]]);
31
+            }
32
+            $count += count($items);
33
+            foreach ($items as $objectChild) {
34
+                $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
35
+            }
36
+            ?>
37 37
         </ul>
38 38
         <?php
39 39
         return $count;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
           }
32 32
           $count += count($items);
33 33
           foreach ($items as $objectChild) {
34
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
34
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc);
35 35
           }
36 36
           ?>
37 37
         </ul>
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
                     echo \Html::el('li', $attributes, $item, true);
64 64
                     echo '<ul>';
65 65
                 }
66
-                $count+=static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
66
+                $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc);
67 67
             }
68 68
         }
69 69
         if ($isset) {
Please login to merge, or discard this patch.