Completed
Branch master (ebb499)
by Alexey
04:15
created
system/modules/Migrations/objects/Parser/Object/Value.php 1 patch
Braces   +8 added lines, -4 removed lines patch added patch discarded remove patch
@@ -38,7 +38,8 @@  discard block
 block discarded – undo
38 38
                                 $itemModel = get_class($item);
39 39
                                 $relation = $itemModel::getRelation($relationName);
40 40
                                 $sourceModel = $relation['model'];
41
-                            } else {
41
+                            }
42
+                            else {
42 43
                                 $relation = $modelName::getRelation($type['relation']);
43 44
                                 $sourceModel = $relation['model'];
44 45
                             }
@@ -49,10 +50,12 @@  discard block
 block discarded – undo
49 50
                         }
50 51
                         break;
51 52
                 }
52
-            } else {
53
+            }
54
+            else {
53 55
                 $type = $col['type'];
54 56
             }
55
-        } else {
57
+        }
58
+        else {
56 59
             $type = 'text';
57 60
         }
58 61
 
@@ -63,7 +66,8 @@  discard block
 block discarded – undo
63 66
                 $valueObject->param_id = $this->param->id;
64 67
                 $valueObject->original = $value;
65 68
                 $valueObject->save();
66
-            } else {
69
+            }
70
+            else {
67 71
                 $valueObject = $values[$value];
68 72
             }
69 73
             $value = $valueObject->replace;
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Parser/Object/Param.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,7 +22,8 @@  discard block
 block discarded – undo
22 22
             foreach ($this->data as &$data) {
23 23
                 $this->parseData($data, $params);
24 24
             }
25
-        } else {
25
+        }
26
+        else {
26 27
             $this->parseData($this->data, $params);
27 28
         }
28 29
     }
@@ -44,7 +45,8 @@  discard block
 block discarded – undo
44 45
                             $valueObject->param_id = $param->id;
45 46
                             $valueObject->original = (string) $objectParam;
46 47
                             $valueObject->save();
47
-                        } else {
48
+                        }
49
+                        else {
48 50
                             $objectParamValue['col'] = $col->replace;
49 51
                         }
50 52
                         break;
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Walker.php 1 patch
Braces   +12 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,7 +27,8 @@  discard block
 block discarded – undo
27 27
         //walk know pathes
28 28
         foreach ($this->map->paths(['where' => ['path', $this->curPath]]) as $path) {
29 29
             if (isset($this->data[$path->item])) {
30
-                if ($path->type == 'container') { //create walker for container
30
+                if ($path->type == 'container') {
31
+//create walker for container
31 32
                     $walker = new Walker();
32 33
                     $walker->migration = $this->migration;
33 34
                     $walker->map = $this->map;
@@ -37,7 +38,9 @@  discard block
 block discarded – undo
37 38
                     $walker->mapPathParent = $this->mapPath;
38 39
                     $walker->migtarionLog = $this->migtarionLog;
39 40
                     $walker->walk();
40
-                } elseif ($path->type == 'object') { //start parse path data
41
+                }
42
+                elseif ($path->type == 'object') {
43
+//start parse path data
41 44
                     $this->startObjectParse($path->object_id, $this->data[$path->item]);
42 45
                 }
43 46
             }
@@ -54,9 +57,12 @@  discard block
 block discarded – undo
54 57
                         ['code', $key],
55 58
                         ['migration_id', $this->migration->id]
56 59
             ]);
57
-            if ($object) { //parse as object
60
+            if ($object) {
61
+//parse as object
58 62
                 $this->startObjectParse($object, $data);
59
-            } else { //create new map path for configure unknown path
63
+            }
64
+            else {
65
+//create new map path for configure unknown path
60 66
                 $this->mapPath = new Migration\Map\Path();
61 67
                 $this->mapPath->parent_id = $this->mapPathParent ? $this->mapPathParent->id : 0;
62 68
                 $this->mapPath->path = $this->curPath;
@@ -79,7 +85,8 @@  discard block
 block discarded – undo
79 85
             $where = json_decode($objectParser->object->clear, true);
80 86
             if (!$where) {
81 87
                 $where = [];
82
-            } else {
88
+            }
89
+            else {
83 90
                 $where = [[$where]];
84 91
             }
85 92
             if ($ids) {
Please login to merge, or discard this patch.
system/modules/Migrations/objects/Reader.php 1 patch
Upper-Lower-Casing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,12 +13,12 @@
 block discarded – undo
13 13
 
14 14
 class Reader extends \Object {
15 15
 
16
-    public $data = NULL;
16
+    public $data = null;
17 17
     public $source = '';
18 18
 
19 19
     public function loadData($source = '') {
20 20
         $this->source = $source;
21
-        return FALSE;
21
+        return false;
22 22
     }
23 23
 
24 24
     public function readPath($path = '/') {
Please login to merge, or discard this patch.
system/modules/Exchange1c/objects/Parser/Item/Images.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,8 @@  discard block
 block discarded – undo
39 39
                 $md5File = '';
40 40
                 if ($file->md5) {
41 41
                     $md5File = $file->md5;
42
-                } elseif (file_exists($file->getRealPath())) {
42
+                }
43
+                elseif (file_exists($file->getRealPath())) {
43 44
                     $md5File = $file->md5 = md5_file($file->getRealPath());
44 45
                     $file->save();
45 46
                 }
@@ -60,7 +61,8 @@  discard block
 block discarded – undo
60 61
                     $image->save();
61 62
                     $ids[] = $image->id;
62 63
                 }
63
-            } else {
64
+            }
65
+            else {
64 66
                 $image->weight = $key;
65 67
             }
66 68
             if ($image && !$this->model->image_file_id) {
Please login to merge, or discard this patch.
system/modules/Exchange1c/objects/Parser/Item/Options.php 1 patch
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,7 +29,8 @@  discard block
 block discarded – undo
29 29
             if (isset(Options::$options[$optionId]) && Options::$options[$optionId]->type == 'select') {
30 30
                 if (empty($options[$optionId])) {
31 31
                     $options[$optionId] = [];
32
-                } else {
32
+                }
33
+                else {
33 34
                     if (!Options::$options[$optionId]->advance) {
34 35
                         Options::$options[$optionId]->advance = ['multi' => true];
35 36
                         Options::$options[$optionId]->save();
@@ -38,7 +39,8 @@  discard block
 block discarded – undo
38 39
                 if ($opt['Значение'] && isset(\App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option\Item'][$opt['Значение']])) {
39 40
                     $options[$optionId][] = \App::$cur->migrations->ids['parseIds']['Ecommerce\Item\Option\Item'][$opt['Значение']]->object_id;
40 41
                 }
41
-            } else {
42
+            }
43
+            else {
42 44
                 $options[$optionId] = $opt['Значение'];
43 45
             }
44 46
         }
@@ -50,13 +52,16 @@  discard block
 block discarded – undo
50 52
             if (isset(Options::$options[$itemParam->item_option_id]) && Options::$options[$itemParam->item_option_id]->type == 'select') {
51 53
                 if (empty($options[$itemParam->item_option_id]) || !in_array($itemParam->value, $options[$itemParam->item_option_id])) {
52 54
                     $itemParam->delete();
53
-                } else {
55
+                }
56
+                else {
54 57
                     unset($options[$itemParam->item_option_id][array_search($itemParam->value, $options[$itemParam->item_option_id])]);
55 58
                 }
56
-            } else {
59
+            }
60
+            else {
57 61
                 if (empty($options[$itemParam->item_option_id])) {
58 62
                     $itemParam->delete();
59
-                } else {
63
+                }
64
+                else {
60 65
                     $itemParam->value = $options[$itemParam->item_option_id];
61 66
                     $itemParam->save();
62 67
                     unset($options[$itemParam->item_option_id]);
@@ -73,7 +78,8 @@  discard block
 block discarded – undo
73 78
                     ]);
74 79
                     $itemParam->save();
75 80
                 }
76
-            } else {
81
+            }
82
+            else {
77 83
                 $itemParam = new \Ecommerce\Item\Param([
78 84
                     'item_option_id' => $optionId,
79 85
                     'item_id' => $this->model->id,
Please login to merge, or discard this patch.
system/modules/Exchange1c/objects/Mode/Init.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
             $query->table = \Exchange1c\Exchange\File::table();
26 26
             $query->cols = \Exchange1c\Exchange\File::colPrefix() . 'id';
27 27
             $queryArr = $query->buildQuery();
28
-            $queryArr['query'].=' where `' . \Exchange1c\Exchange\File::colPrefix() . 'deleted` = 0 AND  `' . \Exchange1c\Exchange\File::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval'];
28
+            $queryArr['query'] .= ' where `' . \Exchange1c\Exchange\File::colPrefix() . 'deleted` = 0 AND  `' . \Exchange1c\Exchange\File::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval'];
29 29
             try {
30 30
                 $ids = array_keys($query->query($queryArr)->getArray(\Exchange1c\Exchange\File::colPrefix() . 'id'));
31 31
             } catch (\PDOException $exc) {
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,8 @@
 block discarded – undo
31 31
             } catch (\PDOException $exc) {
32 32
                 if ($exc->getCode() == '42S02') {
33 33
                     \Exchange1c\Exchange\File::createTable();
34
-                } elseif ($exc->getCode() == '42S22') {
34
+                }
35
+                elseif ($exc->getCode() == '42S22') {
35 36
                     $cols = \Exchange1c\Exchange\File::cols();
36 37
                     foreach (\Exchange1c\Exchange\File::$cols as $colName => $params) {
37 38
                         if (!isset($cols[\Exchange1c\Exchange\File::colPrefix() . $colName])) {
Please login to merge, or discard this patch.
system/modules/Callbacks/Callbacks.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,19 +18,22 @@
 block discarded – undo
18 18
             if (empty($callbacksData['text'])) {
19 19
                 $error = true;
20 20
                 Msg::add('Вы не написали текст отзыва');
21
-            } else {
21
+            }
22
+            else {
22 23
                 $callback->text = nl2br(htmlspecialchars($callbacksData['text']));
23 24
             }
24 25
             if (empty($callbacksData['name'])) {
25 26
                 $error = true;
26 27
                 Msg::add('Вы не указали свое имя');
27
-            } else {
28
+            }
29
+            else {
28 30
                 $callback->name = htmlspecialchars($callbacksData['name']);
29 31
             }
30 32
             if (empty($callbacksData['phone'])) {
31 33
                 $error = true;
32 34
                 Msg::add('Вы не указали свой номер телефона');
33
-            } else {
35
+            }
36
+            else {
34 37
                 $callback->phone = htmlspecialchars($callbacksData['phone']);
35 38
             }
36 39
             $files = filter_var($_FILES['Callbacks'], FILTER_REQUIRE_ARRAY);
Please login to merge, or discard this patch.
system/modules/Users/appAdminControllers/content/create.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,10 +42,10 @@
 block discarded – undo
42 42
                         <div class="col-lg-10">
43 43
                             <select class="form-control" name = 'user_role_id'>
44 44
                               <?php
45
-                              foreach ($roles as $role) {
46
-                                  echo "<option value = '{$role['role_id']}'>{$role['role_name']}</option>";
47
-                              }
48
-                              ?>
45
+                                foreach ($roles as $role) {
46
+                                    echo "<option value = '{$role['role_id']}'>{$role['role_name']}</option>";
47
+                                }
48
+                                ?>
49 49
                             </select>
50 50
                         </div>
51 51
                     </div>
Please login to merge, or discard this patch.