Completed
Push — master ( 7855c2...b6f450 )
by Alexey
07:32
created
system/modules/Ui/Controllers/DataManagerController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
             ob_end_clean();
97 97
             header('Content-Encoding: UTF-8');
98 98
             header("Content-Type: text/csv");
99
-            header("Content-Disposition: attachment; filename=" . $request['modelName']::$objectName . '.csv');
99
+            header("Content-Disposition: attachment; filename=".$request['modelName']::$objectName.'.csv');
100 100
             echo "\xEF\xBB\xBF"; // UTF-8 BOM
101 101
 
102 102
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
                     echo ";";
109 109
                 }
110 110
                 $endRow = false;
111
-                echo '"' . $options['label'] . '"';
111
+                echo '"'.$options['label'].'"';
112 112
             }
113 113
             echo "\n";
114 114
             $endRow = true;
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
                         echo ";";
123 123
                     }
124 124
                     $endRow = false;
125
-                    echo '"' . str_replace(["\n", '"'], ['“'], $col) . '"';
125
+                    echo '"'.str_replace(["\n", '"'], ['“'], $col).'"';
126 126
                 }
127 127
                 echo "\n";
128 128
                 $endRow = true;
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
             $pages = $dataManager->getPages($request['params'], $request['model']);
144 144
             if ($pages) {
145 145
                 $pages->draw();
146
-                echo '<div style="background:#fff;">записей: <b>' . $pages->options['count'] . '</b>. страница <b>' . $pages->params['page'] . '</b> из <b>' . $pages->params['pages'] . '</b></div>';
146
+                echo '<div style="background:#fff;">записей: <b>'.$pages->options['count'].'</b>. страница <b>'.$pages->params['page'].'</b> из <b>'.$pages->params['pages'].'</b></div>';
147 147
             }
148 148
             $result->content['pages'] = ob_get_contents();
149 149
             ob_end_clean();
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
                 if (!empty($actions[$request['action']])) {
220 220
                     $actionParams = $actions[$request['action']];
221 221
                     if (!empty($actionParams['access']['groups']) && !in_array(\Users\User::$cur->group_id, $actionParams['access']['groups'])) {
222
-                        $result->content = 'У вас нет прав доступа к операции ' . (!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
222
+                        $result->content = 'У вас нет прав доступа к операции '.(!isset($actionParams['name']) ? $actionParams['className']::$name : $actionParams['name']);
223 223
                     } else {
224 224
                         try {
225 225
                             $result->successMsg = $actionParams['className']::groupAction($dataManager, $ids, $actionParams, !empty($_GET['adInfo']) ? $_GET['adInfo'] : []);
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
                 }
232 232
             }
233 233
         } else {
234
-            $result->content = 'У вас нет прав доступа к менеджеру ' . $request['managerName'] . ' модели ' . $request['modelName'];
234
+            $result->content = 'У вас нет прав доступа к менеджеру '.$request['managerName'].' модели '.$request['modelName'];
235 235
         }
236 236
         $result->send();
237 237
     }
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/begin.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
     }
9 9
     ?>>
10 10
       <?php
11
-  }
12
-  ?>
11
+    }
12
+    ?>
13 13
   <?= !empty($header) ? "<h1>{$header}</h1>" : ''; ?>
14 14
     
15 15
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 if (empty($params['activeForm']) || $params['activeForm']->parent === null) {
3 3
     ?>
4
-    <form <?= $form->id ? 'id="' . $form->id . '"' : ''; ?> action ="<?= $form->action; ?>" method ="<?= $form->method; ?>"  enctype="multipart/form-data"
4
+    <form <?= $form->id ? 'id="'.$form->id.'"' : ''; ?> action ="<?= $form->action; ?>" method ="<?= $form->method; ?>"  enctype="multipart/form-data"
5 5
     <?php
6 6
     foreach ($options as $attribute => $value) {
7 7
         echo " {$attribute} = '{$value}' ";
Please login to merge, or discard this patch.
system/modules/Ui/widgets/Form/end.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,10 +5,10 @@
 block discarded – undo
5 5
         <div class="form-group">
6 6
           <button class ='btn btn-primary' 
7 7
                   <?php
8
-                  foreach ($attributs as $attribute => $value) {
9
-                      echo " {$attribute} = '{$value}' ";
10
-                  }
11
-                  ?>
8
+                    foreach ($attributs as $attribute => $value) {
9
+                        echo " {$attribute} = '{$value}' ";
10
+                    }
11
+                    ?>
12 12
                   ><?= $btnText; ?></button>
13 13
         </div>
14 14
         <?php
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Parser/Object.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
                         if ($param->type == 'custom') {
63 63
                             $parserName = $param->value;
64 64
                         } else {
65
-                            $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
65
+                            $parserName = '\Migrations\Parser\Object\\'.ucfirst($param->type);
66 66
                         }
67 67
                         $parser = new $parserName;
68 68
                         $parser->data = &$data[$param->code];
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()], 'order' => $order]);
31
-          }
32
-          $count += count($items);
33
-          foreach ($items as $objectChild) {
34
-              $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
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()], 'order' => $order]);
31
+            }
32
+            $count += count($items);
33
+            foreach ($items as $objectChild) {
34
+                $count+=static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
35
+            }
36
+            ?>
37 37
         </ul>
38 38
         <?php
39 39
         return $count;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 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, $order);
34
+              $count += static::showLi($objectChild, 1, $maxDeep, $hrefFunc, $order);
35 35
           }
36 36
           ?>
37 37
         </ul>
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
             $item = $item['text'];
53 53
         }
54 54
         if (!isset($attributes['id'])) {
55
-            $attributes['id'] = str_replace('\\', '_', get_class($object)) . "-{$object->pk()}";
55
+            $attributes['id'] = str_replace('\\', '_', get_class($object))."-{$object->pk()}";
56 56
         }
57 57
         if (!$maxDeep || $deep < $maxDeep) {
58 58
             $items = $class::getList(['where' => ['parent_id', $object->pk()], 'order' => $order]);
@@ -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, $order);
66
+                $count += static::showLi($objectChild, $deep + 1, $maxDeep, $hrefFunc, $order);
67 67
             }
68 68
         }
69 69
         if ($isset) {
Please login to merge, or discard this patch.
system/modules/Money/models/Wallet.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         'manager' => [
44 44
             'cols' => ['user:id', 'user_id', 'currency_id', 'amount'],
45 45
             'sortable' => ['user:id', 'user_id', 'currency_id', 'amount'],
46
-            'filters' => [ 'currency_id'],
46
+            'filters' => ['currency_id'],
47 47
         ]
48 48
     ];
49 49
 
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
     {
67 67
         $amount = (float) $amount;
68 68
         $query = \App::$cur->db->newQuery();
69
-        $string = 'UPDATE ' . \App::$cur->db->table_prefix . $this->table() . ' SET `' . $this->colPrefix() . 'amount`=`' . $this->colPrefix() . 'amount`+' . $amount . ' where `' . $this->index() . '` = ' . $this->id;
69
+        $string = 'UPDATE '.\App::$cur->db->table_prefix.$this->table().' SET `'.$this->colPrefix().'amount`=`'.$this->colPrefix().'amount`+'.$amount.' where `'.$this->index().'` = '.$this->id;
70 70
         $query->query($string);
71 71
         $history = new Wallet\History();
72 72
         $history->wallet_id = $this->pk();
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     {
87 87
         switch ($this->currency->round_type) {
88 88
             case 'floor':
89
-                $dif = (float) ('1' . str_repeat('0', $this->currency->round_precision));
89
+                $dif = (float) ('1'.str_repeat('0', $this->currency->round_precision));
90 90
                 return floor($this->amount * $dif) / $dif;
91 91
             default :
92 92
                 return $this->amount;
Please login to merge, or discard this patch.
system/modules/Dashboard/appAdminControllers/content/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <div class="dashboard-widgets">
2
-  <h4 class ='dashboard-widgets-welcome'>Добро Пожаловать в панель управления<?= class_exists('\Users\User') ? ', ' . \Users\User::$cur->name() : ''; ?></h4>
2
+  <h4 class ='dashboard-widgets-welcome'>Добро Пожаловать в панель управления<?= class_exists('\Users\User') ? ', '.\Users\User::$cur->name() : ''; ?></h4>
3 3
   <div class = "row">
4 4
     <?php
5 5
     $rowSum = 0;
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
         }
10 10
 
11 11
         $widgetSize = !empty($section['size']) ? $section['size'] : 1;
12
-        $rowSum+=$widgetSize;
12
+        $rowSum += $widgetSize;
13 13
         ?>
14 14
         <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $section['widget'](); ?></div>
15 15
         <?php
Please login to merge, or discard this patch.
system/modules/View/appAdminControllers/TemplateController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,15 +22,15 @@
 block discarded – undo
22 22
     function editFileAction($templateName)
23 23
     {
24 24
         $template = \View\Template::get($templateName, \App::$primary);
25
-        if (!empty($_GET['path']) && file_exists($template->path . '/' . Tools::parsePath($_GET['path']))) {
25
+        if (!empty($_GET['path']) && file_exists($template->path.'/'.Tools::parsePath($_GET['path']))) {
26 26
             $code = file_get_contents("php://input");
27 27
             if (!empty($code)) {
28 28
                 $result = new Server\Result();
29 29
                 $result->successMsg = 'Файл сохранен';
30
-                $content = file_put_contents($template->path . '/' . Tools::parsePath($_GET['path']), $code);
30
+                $content = file_put_contents($template->path.'/'.Tools::parsePath($_GET['path']), $code);
31 31
                 $result->send();
32 32
             }
33
-            $content = file_get_contents($template->path . '/' . Tools::parsePath($_GET['path']));
33
+            $content = file_get_contents($template->path.'/'.Tools::parsePath($_GET['path']));
34 34
             $this->libs->loadLib('Ace');
35 35
             $this->view->page(['content' => 'template/edit', 'data' => compact('template', 'content')]);
36 36
         } else {
Please login to merge, or discard this patch.
system/modules/Sliders/widgets/slider.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
         ?>
33 33
         <div class="item <?= !$i ? 'active' : ''; ?>">
34 34
           <?php
35
-          if ($item->link) {
36
-              echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
37
-          }
38
-          ?>
35
+            if ($item->link) {
36
+                echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
37
+            }
38
+            ?>
39 39
           <img src="<?= Statics::file($item->image->path); ?>" alt="<?= $item->name; ?>">
40 40
           <div class="carousel-caption">
41 41
             <?= $item->description; ?>
42 42
           </div>
43 43
           <?php
44
-          if ($item->link) {
45
-              echo "</a>";
46
-          }
47
-          ?>
44
+            if ($item->link) {
45
+                echo "</a>";
46
+            }
47
+            ?>
48 48
         </div>
49 49
         <?php
50 50
         $i++;
@@ -53,8 +53,8 @@  discard block
 block discarded – undo
53 53
   </div>
54 54
 
55 55
   <?php
56
-  if (!isset($arrows) || $arrows) {
57
-      ?>
56
+    if (!isset($arrows) || $arrows) {
57
+        ?>
58 58
       <!-- Controls -->
59 59
       <a class="left carousel-control" href="#sliderWidget-<?= $slider->id; ?>" role="button" data-slide="prev">
60 60
         <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
@@ -65,6 +65,6 @@  discard block
 block discarded – undo
65 65
         <span class="sr-only">Next</span>
66 66
       </a>
67 67
       <?php
68
-  }
69
-  ?>
68
+    }
69
+    ?>
70 70
 </div>
71 71
\ No newline at end of file
Please login to merge, or discard this patch.