Completed
Push — master ( 8717df...fdbe7f )
by Alexey
05:44
created
system/modules/Materials/Materials.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Materials module
4
- *
5
- * @author Alexey Krupskiy <[email protected]>
6
- * @link http://inji.ru/
7
- * @copyright 2015 Alexey Krupskiy
8
- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
9
- */
3
+     * Materials module
4
+     *
5
+     * @author Alexey Krupskiy <[email protected]>
6
+     * @link http://inji.ru/
7
+     * @copyright 2015 Alexey Krupskiy
8
+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
9
+     */
10 10
 class Materials extends Module
11 11
 {
12 12
     function viewsList()
Please login to merge, or discard this patch.
system/modules/Materials/appControllers/content/category.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@  discard block
 block discarded – undo
2 2
   <div class="row">
3 3
     <div class="col-md-3">
4 4
       <?php
5
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
6
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
7
-      });
8
-      ?>
5
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
6
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
7
+        });
8
+        ?>
9 9
     </div>
10 10
     <div class="col-md-9">
11 11
       <h2 class ='category-name'><?= $category->name; ?></h2>
@@ -15,9 +15,9 @@  discard block
 block discarded – undo
15 15
       <div class ="category-materials">
16 16
         <div class ="row">
17 17
           <?php
18
-          $i = 0;
19
-          foreach ($materials as $material) {
20
-              ?>
18
+            $i = 0;
19
+            foreach ($materials as $material) {
20
+                ?>
21 21
               <div class = "col-sm-6 category-material">
22 22
                 <a class="category-material-name" href ="<?= $material->getHref(); ?>"><h3><?= $material->name; ?></h3></a>
23 23
                 <div class="category-material-preview"><?= $material->preview; ?></div>
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
                 </div>
27 27
               </div>
28 28
               <?php
29
-              if (!( ++$i % 2)) {
30
-                  echo '</div><hr /><div class ="row">';
31
-              }
32
-          }
33
-          ?>
29
+                if (!( ++$i % 2)) {
30
+                    echo '</div><hr /><div class ="row">';
31
+                }
32
+            }
33
+            ?>
34 34
         </div>
35 35
         <?php
36 36
         $pages->draw();
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/appControllers/content/materialWithCategorys.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -2,11 +2,11 @@  discard block
 block discarded – undo
2 2
   <div class="row">
3 3
     <div class="col-md-3">
4 4
       <?php
5
-      $category = $material->category;
6
-      \Ui\Tree::ul($category->getRoot(), 0, function($category) {
7
-          echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
8
-      });
9
-      ?>
5
+        $category = $material->category;
6
+        \Ui\Tree::ul($category->getRoot(), 0, function($category) {
7
+            echo "<a href='{$category->getHref()}'> {$category->name()}</a>";
8
+        });
9
+        ?>
10 10
     </div>
11 11
     <div class="col-md-9">
12 12
       <h2 class="material-name"><?= $material->name; ?></h2>
@@ -14,19 +14,19 @@  discard block
 block discarded – undo
14 14
         <?= Ui\FastEdit::block($material, 'text', null, true); ?>
15 15
       </div>
16 16
       <?php
17
-      if ($material->links) {
18
-          echo '<ul class = "material-links">';
19
-          foreach ($material->links as $materialLink) {
20
-              $href = $materialLink->linkedMaterial->alias;
21
-              if ($href == '') {
22
-                  $href = '/';
23
-              }
24
-              $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
25
-              echo "<li><a href = '{$href}'>{$name}</a></li>";
26
-          }
27
-          echo '</ul>';
28
-      }
29
-      ?>
17
+        if ($material->links) {
18
+            echo '<ul class = "material-links">';
19
+            foreach ($material->links as $materialLink) {
20
+                $href = $materialLink->linkedMaterial->alias;
21
+                if ($href == '') {
22
+                    $href = '/';
23
+                }
24
+                $name = $materialLink->name ? $materialLink->name : $materialLink->linkedMaterial->name;
25
+                echo "<li><a href = '{$href}'>{$name}</a></li>";
26
+            }
27
+            echo '</ul>';
28
+        }
29
+        ?>
30 30
     </div>
31 31
   </div>
32 32
 </div>
33 33
\ No newline at end of file
Please login to merge, or discard this patch.
system/modules/Money/appControllers/content/pay.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -8,12 +8,12 @@  discard block
 block discarded – undo
8 8
     <th></th>
9 9
   </tr>
10 10
   <?php
11
-  foreach ($merchants as $merchant) {
12
-      $allowCurrencies = $merchant->allowCurrencies($pay);
13
-      if (!$allowCurrencies) {
14
-          continue;
15
-      }
16
-      ?>
11
+    foreach ($merchants as $merchant) {
12
+        $allowCurrencies = $merchant->allowCurrencies($pay);
13
+        if (!$allowCurrencies) {
14
+            continue;
15
+        }
16
+        ?>
17 17
       <tr>
18 18
         <td>
19 19
           <img src="<?= Statics::file($merchant->image ? $merchant->image->path : '/static/system/images/no-image.png', '150x150'); ?>" class="img-responsive" />
@@ -21,21 +21,21 @@  discard block
 block discarded – undo
21 21
         </td>
22 22
         <td>
23 23
           <?php
24
-          foreach ($allowCurrencies as $allowCurrency) {
25
-              $className = 'Money\MerchantHelper\\' . $merchant->object_name;
26
-              $sum = $className::getFinalSum($pay, $allowCurrency);
27
-              ?>
24
+            foreach ($allowCurrencies as $allowCurrency) {
25
+                $className = 'Money\MerchantHelper\\' . $merchant->object_name;
26
+                $sum = $className::getFinalSum($pay, $allowCurrency);
27
+                ?>
28 28
               <b><?= $allowCurrency['currency']->name(); ?></b>
29 29
               <a class="btn btn-primary" href ="/money/merchants/go/<?= $pay->id; ?>/<?= $merchant->id; ?>/<?= $allowCurrency['currency']->id; ?>">Оплатить <?= $sum; ?> <?= $allowCurrency['currency']->acronym(); ?></a>
30 30
               <?php
31
-          }
32
-          ?>
31
+            }
32
+            ?>
33 33
         </td>
34 34
         <td width="100%">
35 35
           <?= $merchant->previewImage ? '<img src="' . $merchant->previewImage->path . '" class="img-responsive" />' : ''; ?>
36 36
         </td>
37 37
       </tr>
38 38
       <?php
39
-  }
40
-  ?>
39
+    }
40
+    ?>
41 41
 </table>
42 42
\ No newline at end of file
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.
system/modules/Money/widgets/cabinet/wallets.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <h3>Мои кошельки</h3>
2 2
 <div class="row">
3 3
   <?php
4
-  $blocked = App::$cur->money->getUserBlocks();
5
-  $wallets = App::$cur->money->getUserWallets();
6
-  $rates = Money\Currency\ExchangeRate::getList();
7
-  foreach ($wallets as $wallet) {
8
-      ?>
4
+    $blocked = App::$cur->money->getUserBlocks();
5
+    $wallets = App::$cur->money->getUserWallets();
6
+    $rates = Money\Currency\ExchangeRate::getList();
7
+    foreach ($wallets as $wallet) {
8
+        ?>
9 9
       <div class="col-sm-4">
10 10
         <h4><?= $wallet->currency->name(); ?></h4>
11 11
         <b><?= $wallet->showAmount(); ?></b> <?= $wallet->currency->acronym(); ?><br />
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
         ?>
31 31
       </div>
32 32
       <?php
33
-  }
34
-  ?>
33
+    }
34
+    ?>
35 35
 </div>
36 36
 <?php
37 37
 $transfers = Money\Transfer::getList(['where' => [
Please login to merge, or discard this patch.
system/modules/Sliders/widgets/slider.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -27,19 +27,19 @@
 block discarded – undo
27 27
         ?>
28 28
         <div class="item <?= !$i ? 'active' : ''; ?>">
29 29
           <?php
30
-          if ($item->link) {
31
-              echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
32
-          }
33
-          ?>
30
+            if ($item->link) {
31
+                echo "<a href = '{$item->link}' style = 'display:inline-block;'>";
32
+            }
33
+            ?>
34 34
           <img src="<?= Statics::file($item->image->path); ?>" alt="<?= $item->name; ?>">
35 35
           <div class="carousel-caption">
36 36
             <?= $item->description; ?>
37 37
           </div>
38 38
           <?php
39
-          if ($item->link) {
40
-              echo "</a>";
41
-          }
42
-          ?>
39
+            if ($item->link) {
40
+                echo "</a>";
41
+            }
42
+            ?>
43 43
         </div>
44 44
         <?php
45 45
         $i++;
Please login to merge, or discard this patch.
system/modules/TextBlocks/TextBlocks.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Text blocks module
4
- *
5
- * @author Alexey Krupskiy <[email protected]>
6
- * @link http://inji.ru/
7
- * @copyright 2015 Alexey Krupskiy
8
- * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
9
- */
3
+     * Text blocks module
4
+     *
5
+     * @author Alexey Krupskiy <[email protected]>
6
+     * @link http://inji.ru/
7
+     * @copyright 2015 Alexey Krupskiy
8
+     * @license https://github.com/injitools/cms-Inji/blob/master/LICENSE
9
+     */
10 10
 class TextBlocks extends Module
11 11
 {
12 12
     function init()
Please login to merge, or discard this patch.