Completed
Pull Request — master (#4)
by
unknown
05:09
created
system/modules/Libs/Libs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
                     $this->loadLib($rLib);
26 26
                 }
27 27
             }
28
-            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'] )) {
28
+            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'])) {
29 29
                 foreach ($className::$files['css'] as $file) {
30 30
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
31 31
                         App::$cur->view->customAsset('css', $file, $libName);
Please login to merge, or discard this patch.
system/modules/Materials/appControllers/content/default.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -4,17 +4,17 @@
 block discarded – undo
4 4
     <?= Ui\FastEdit::block($material, 'text', null, true); ?>
5 5
   </div>
6 6
   <?php
7
-  if ($material->links) {
8
-      echo '<ul class = "material-links">';
9
-      foreach ($material->links as $materialLink) {
10
-          $href = $materialLink->linkedMaterial->alias;
11
-          if ($href == '') {
12
-              $href = '/';
13
-          }
14
-          $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
15
-          echo "<li><a href = '{$href}'>{$name}</a></li>";
16
-      }
17
-      echo '</ul>';
18
-  }
19
-  ?>
7
+    if ($material->links) {
8
+        echo '<ul class = "material-links">';
9
+        foreach ($material->links as $materialLink) {
10
+            $href = $materialLink->linkedMaterial->alias;
11
+            if ($href == '') {
12
+                $href = '/';
13
+            }
14
+            $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
15
+            echo "<li><a href = '{$href}'>{$name}</a></li>";
16
+        }
17
+        echo '</ul>';
18
+    }
19
+    ?>
20 20
 </div>
21 21
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Materials/models/Material.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
         if ($treePath) {
132 132
             $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
133 133
             foreach ($categorys as $category) {
134
-                $href .="/{$category->alias}";
134
+                $href .= "/{$category->alias}";
135 135
             }
136 136
         }
137 137
         return $href . "/" . ($this->alias ? $this->alias : $this->pk());
Please login to merge, or discard this patch.
system/modules/Migrations/appAdminControllers/content/Map/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
     if (empty($objectsCols[$param->object_id])) {
50 50
         $modelName = $param->object->model;
51 51
         foreach (array_keys($modelName::$cols) as $colName) {
52
-            $objectsCols[$param->object_id][$colName] = !empty($modelName::$labels[$colName])?$modelName::$labels[$colName]:$colName;
52
+            $objectsCols[$param->object_id][$colName] = !empty($modelName::$labels[$colName]) ? $modelName::$labels[$colName] : $colName;
53 53
         }
54 54
     }
55 55
     $modelName = $param->object->model;
Please login to merge, or discard this patch.
system/modules/Modules/appAdminControllers/content/install.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
     $systemModules = array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2);
7 7
     foreach ($systemModules as $module) {
8 8
         $info = Module::getInfo($module);
9
-        if (!$info || isset($modules[$module]))
10
-            continue;
9
+        if (!$info || isset($modules[$module])) {
10
+                    continue;
11
+        }
11 12
         ?>
12 13
         <div class ="form-group">
13 14
             <div class="checkbox">
Please login to merge, or discard this patch.
system/modules/Money/objects/MerchantHelper/Robokassa.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,8 +25,9 @@
 block discarded – undo
25 25
 
26 26
         $result['payId'] = $data["InvId"];
27 27
 
28
-        if (strtolower($data['SignatureValue']) == $hashGenerated)
29
-            $result['status'] = 'success';
28
+        if (strtolower($data['SignatureValue']) == $hashGenerated) {
29
+                    $result['status'] = 'success';
30
+        }
30 31
 
31 32
         return $result;
32 33
     }
Please login to merge, or discard this patch.
system/modules/Money/objects/MerchantHelper/WalletOne.php 1 patch
Braces   +18 added lines, -12 removed lines patch added patch discarded remove patch
@@ -28,20 +28,24 @@  discard block
 block discarded – undo
28 28
 
29 29
         // Проверка наличия необходимых параметров в POST-запросе
30 30
 
31
-        if (!isset($data["WMI_SIGNATURE"]))
32
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE");
31
+        if (!isset($data["WMI_SIGNATURE"])) {
32
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_SIGNATURE");
33
+        }
33 34
 
34
-        if (!isset($data["WMI_PAYMENT_NO"]))
35
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO");
35
+        if (!isset($data["WMI_PAYMENT_NO"])) {
36
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_PAYMENT_NO");
37
+        }
36 38
 
37
-        if (!isset($data["WMI_ORDER_STATE"]))
38
-            $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE");
39
+        if (!isset($data["WMI_ORDER_STATE"])) {
40
+                    $result['callback'] = print_answer("Retry", "Отсутствует параметр WMI_ORDER_STATE");
41
+        }
39 42
 
40 43
         // Извлечение всех параметров POST-запроса, кроме WMI_SIGNATURE
41 44
         $params = [];
42 45
         foreach ($data as $name => $value) {
43
-            if ($name !== "WMI_SIGNATURE")
44
-                $params[$name] = $value;
46
+            if ($name !== "WMI_SIGNATURE") {
47
+                            $params[$name] = $value;
48
+            }
45 49
         }
46 50
 
47 51
         // Сортировка массива по именам ключей в порядке возрастания
@@ -86,8 +90,9 @@  discard block
 block discarded – undo
86 90
         $config = static::getConfig();
87 91
         $merchantCurrency = static::getMerchantCurrency($currency);
88 92
         
89
-        if (!$description)
90
-            $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
93
+        if (!$description) {
94
+                    $description = "Оплата заказа на сайте " . idn_to_utf8(INJI_DOMAIN_NAME);
95
+        }
91 96
 
92 97
         //Секретный ключ интернет-магазина
93 98
         $key = $config['secret'];
@@ -117,11 +122,12 @@  discard block
 block discarded – undo
117 122
         $fieldValues = "";
118 123
 
119 124
         foreach ($fields as $value) {
120
-            if (is_array($value))
121
-                foreach ($value as $v) {
125
+            if (is_array($value)) {
126
+                            foreach ($value as $v) {
122 127
                     //Конвертация из текущей кодировки (UTF-8)
123 128
                     //необходима только если кодировка магазина отлична от Windows-1251
124 129
                     $v = iconv("utf-8", "windows-1251", $v);
130
+            }
125 131
                     $fieldValues .= $v;
126 132
                 } else {
127 133
                 //Конвертация из текущей кодировки (UTF-8)
Please login to merge, or discard this patch.
system/modules/Money/snippets/expiredDateGenerator/dayStart.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 
3 3
 return function($reward, $user) {
4 4
     return [
5
-        'date' => date('Y-m-d H:i:s',mktime(0, 0, 0, date('n'), date("j") + 1, date("Y"))),
5
+        'date' => date('Y-m-d H:i:s', mktime(0, 0, 0, date('n'), date("j") + 1, date("Y"))),
6 6
         'type' => 'burn'
7 7
     ];
8 8
 };
Please login to merge, or discard this patch.
system/modules/Money/widgets/cabinet/rewards.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -12,13 +12,13 @@  discard block
 block discarded – undo
12 12
         <h3>Уровни начислений</h3>
13 13
         <ul>
14 14
           <?php
15
-          foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
16
-              ?>
15
+            foreach ($reward->levels(['order' => ['level', 'asc']]) as $level) {
16
+                ?>
17 17
 
18 18
               <li><?= !$level->level ? 'Личный' : $level->level; ?>. <?= $types[$level->type]['viewer']($level); ?></li>
19 19
               <?php
20
-          }
21
-          ?>
20
+            }
21
+            ?>
22 22
 
23 23
         </ul>
24 24
       </div>
@@ -34,20 +34,20 @@  discard block
 block discarded – undo
34 34
             <h4 class="<?= $complete ? 'text-success' : 'text-danger'; ?>"><?= $condition->name(); ?></h4>
35 35
             <ul>
36 36
               <?php
37
-              foreach ($condition->items as $item) {
38
-                  $itemComplete = $item->checkComplete();
39
-                  switch ($item->type) {
40
-                      case 'event':
37
+                foreach ($condition->items as $item) {
38
+                    $itemComplete = $item->checkComplete();
39
+                    switch ($item->type) {
40
+                        case 'event':
41 41
                           $name = \Events\Event::get($item->value, 'event')->name();
42
-                          break;
43
-                  }
44
-                  ?>
42
+                            break;
43
+                    }
44
+                    ?>
45 45
                   <li> 
46 46
                     <b class="<?= $itemComplete ? 'text-success' : 'text-danger'; ?>"><?= $name; ?> <?= $item->recivedCount(); ?></b>/<?= $item->count; ?> <br />
47 47
                   </li>
48 48
                   <?php
49
-              }
50
-              ?>
49
+                }
50
+                ?>
51 51
             </ul>
52 52
             <?php
53 53
         }
Please login to merge, or discard this patch.