injitools / cms-Inji

system/modules/Access/Access.php

Braces +6 added lines, -4 removed lines

@@ -15,8 +15,9 @@ 
         if (!$app) {
             $app = $this->app->type;
         }
-        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl']))
-            return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        if (!empty($this->config['access']['accessTree'][$app]['deniedUrl'])) {
+                    return $this->config['access']['accessTree'][$app]['deniedUrl'];
+        }
 
         return '/';
     }
@@ -50,8 +51,9 @@ 
             return true;
         }
 
-        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access)))
-            return false;
+        if ((!$user->group_id && !empty($access)) || ($user->group_id && !empty($access) && !in_array($user->group_id, $access))) {
+                    return false;
+        }
 
         return true;
     }

system/modules/Callbacks/appControllers/content/index.php

Indentation +6 added lines, -6 removed lines

@@ -1,12 +1,12 @@
 <div class = 'callbacks'>
   <h1>Отзывы</h1>
   <?php
-  $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
-  foreach ($callbacks as $callback) {
-      echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
-      echo "<p>" . nl2br($callback->text) . "</p>";
-  }
-  ?>
+    $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
+    foreach ($callbacks as $callback) {
+        echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
+        echo "<p>" . nl2br($callback->text) . "</p>";
+    }
+    ?>
 </div>
 <h3>Можете и вы в свободной форме оставить свой отзыв</h3>
 <?php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
   $callbacks = Callbacks\Callback::getList(['where' => ['view', '1'], 'order' => ['weight', 'asc']]);
   foreach ($callbacks as $callback) {
       echo "<h3>{$callback->name}<div class = 'time'>{$callback->date_create}</div></h3>";
-      echo "<p>" . nl2br($callback->text) . "</p>";
+      echo "<p>".nl2br($callback->text)."</p>";
   }
   ?>
 </div>

system/modules/Dashboard/appAdminControllers/content/index.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
         }

 

         $widgetSize = !empty($section['size']) ? $section['size'] : 1;

-        $rowSum+=$widgetSize;

+        $rowSum += $widgetSize;

         ?>

         <div class="col-sm-<?= $widgetSize * 4; ?>" style="margin-bottom: 10px;"><?= $section['widget'](); ?></div>

         <?php

system/modules/Dashboard/appAdminControllers/content/siteConfig.php

Indentation +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@
     <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' />
   </div>
   <?php
-  $form = new Ui\Form();
-  $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']);
-  ?>
+    $form = new Ui\Form();
+    $form->input('image', 'site_logo', 'Лого сайта', ['value' => !empty(\App::$primary->config['site']['site_logo']) ? \App::$primary->config['site']['site_logo'] : '']);
+    ?>
   <h2>Дополнительные мета теги</h2>
   <div class ="form-group">
     <button type = 'button' class = 'btn btn-primary ' onclick = 'addMeta()'>Добавить <i class = 'glyphicon glyphicon-plus'></i></button>

Braces +24 added lines, -6 removed lines

@@ -2,27 +2,45 @@
 <form action = '' method = 'POST' enctype="multipart/form-data">
   <div class ="form-group">
     <label>Название сайта</label>
-    <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) echo \App::$primary->config['site']['name']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_name' value = '<?php if (!empty(\App::$primary->config['site']['name'])) {
+    echo \App::$primary->config['site']['name'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Название компании</label>
-    <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) echo \App::$primary->config['site']['company_name']; ?>' />
+    <input class ="form-control" type = 'text' name = 'company_name' value = '<?php if (!empty(\App::$primary->config['site']['company_name'])) {
+    echo \App::$primary->config['site']['company_name'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Основной домен</label>
-    <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) echo \App::$primary->config['site']['domain']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_domain' value = '<?php if (!empty(\App::$primary->config['site']['domain'])) {
+    echo \App::$primary->config['site']['domain'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Контактный email</label>
-    <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) echo \App::$primary->config['site']['email']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_email' value = '<?php if (!empty(\App::$primary->config['site']['email'])) {
+    echo \App::$primary->config['site']['email'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Ключевые слова</label>
-    <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) echo \App::$primary->config['site']['keywords']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_keywords' value = '<?php if (!empty(\App::$primary->config['site']['keywords'])) {
+    echo \App::$primary->config['site']['keywords'];
+}
+?>' />
   </div>
   <div class ="form-group">
     <label>Краткое описание сайта</label>
-    <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) echo \App::$primary->config['site']['description']; ?>' />
+    <input class ="form-control" type = 'text' name = 'site_description' value = '<?php if (!empty(\App::$primary->config['site']['description'])) {
+    echo \App::$primary->config['site']['description'];
+}
+?>' />
   </div>
   <?php
   $form = new Ui\Form();

system/modules/Db/Db.php

Braces +3 added lines, -2 removed lines

@@ -16,8 +16,9 @@
             $param = isset($this->config['default']) ? $this->config['default'] : 'local';
         }
         if (!is_array($param)) {
-            if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true])))
-                return false;
+            if (!($dbOption = Db\Options::get($param, 'connect_alias', ['array' => true]))) {
+                            return false;
+            }
 
             $db = $dbOption;
         } else {

Spacing +5 added lines, -5 removed lines

@@ -23,16 +23,16 @@ 
         } else {
             $db = $param;
         }
-        $className = 'Db\\' . $db['driver'];
+        $className = 'Db\\'.$db['driver'];
         $this->connection = new $className();
         $this->connection->init($db);
         $this->connection->dbInstance = $this;
         $this->connect = $this->connection->connect;
         $this->dbConfig = $db;
 
-        $this->className = 'Db\\' . $this->dbConfig['driver'];
-        $this->QueryClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Query';
-        $this->ResultClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Result';
+        $this->className = 'Db\\'.$this->dbConfig['driver'];
+        $this->QueryClassName = 'Db\\'.$this->dbConfig['driver'].'\\Query';
+        $this->ResultClassName = 'Db\\'.$this->dbConfig['driver'].'\\Result';
     }
 
     public function __call($name, $params)
@@ -55,7 +55,7 @@ 
 
     public function newQuery()
     {
-        if($this->QueryClassName) {
+        if ($this->QueryClassName) {
             return new $this->QueryClassName($this->connection);
         }
         return false;

system/modules/Db/objects/Mysql/Mysql.php

Braces +12 added lines, -8 removed lines

@@ -30,14 +30,18 @@
     public function init($connect_options)
     {
         extract($connect_options);
-        if (isset($db_name))
-            $this->db_name = $db_name;
-        if (isset($encoding))
-            $this->encoding = $encoding;
-        if (isset($table_prefix))
-            $this->table_prefix = $table_prefix;
-        if (isset($noConnectAbort))
-            $this->noConnectAbort = $noConnectAbort;
+        if (isset($db_name)) {
+                    $this->db_name = $db_name;
+        }
+        if (isset($encoding)) {
+                    $this->encoding = $encoding;
+        }
+        if (isset($table_prefix)) {
+                    $this->table_prefix = $table_prefix;
+        }
+        if (isset($noConnectAbort)) {
+                    $this->noConnectAbort = $noConnectAbort;
+        }
 
         $dsn = "mysql:host=$host;port=$port;dbname=$db_name;charset=$encoding";
         $dt = new \DateTime();

Spacing +6 added lines, -6 removed lines

@@ -13,11 +13,11 @@ 
 
 class Mysql extends \Object
 {
-    public $config = [];       // настройки подключения выбраной базы
-    public $connect = FALSE;        // ярлык соединения с MySQL
-    public $encoding = 'utf-8';        // установленная кодировка
-    public $db_name = 'test';         // выбраная в данный момент база
-    public $table_prefix = 'inji_';   // префикс названий таблиц
+    public $config = []; // настройки подключения выбраной базы
+    public $connect = FALSE; // ярлык соединения с MySQL
+    public $encoding = 'utf-8'; // установленная кодировка
+    public $db_name = 'test'; // выбраная в данный момент база
+    public $table_prefix = 'inji_'; // префикс названий таблиц
     public $pdo = NULL;
     public $lastQuery = '';
     public $last_error = '';
@@ -71,7 +71,7 @@ 
         $this->table_prefix = '';
 
         $query->where('TABLE_SCHEMA', $old_db);
-        $query->where('TABLE_NAME', $old_prefix . $table_name);
+        $query->where('TABLE_NAME', $old_prefix.$table_name);
         $result = $query->select('COLUMNS');
         $this->db_name = $old_db;
         $this->table_prefix = $old_prefix;

system/modules/Ecommerce/appAdminControllers/content/configure.php

Indentation +13 added lines, -13 removed lines

@@ -3,14 +3,14 @@ 
 <ul class="nav nav-tabs" role="tablist">
   <li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">Настройки</a></li>
   <?php
-  $dataManagers = [];
-  foreach ($managers as $manager) {
-      $dataManager = new Ui\DataManager($manager);
-      $dataManagers[$manager] = $dataManager;
-      $code = 'tab_' . str_replace('\\', '_', $manager);
-      echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>";
-  }
-  ?>
+    $dataManagers = [];
+    foreach ($managers as $manager) {
+        $dataManager = new Ui\DataManager($manager);
+        $dataManagers[$manager] = $dataManager;
+        $code = 'tab_' . str_replace('\\', '_', $manager);
+        echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>";
+    }
+    ?>
 </ul>
 <div class="tab-content">
   <div role="tabpanel" class="tab-pane fade in active" id="home">
@@ -52,17 +52,17 @@ 
     </script>
   </div>
   <?php
-  foreach ($dataManagers as $manager => $dataManager) {
-      $code = 'tab_' . str_replace('\\', '_', $manager);
-      ?>
+    foreach ($dataManagers as $manager => $dataManager) {
+        $code = 'tab_' . str_replace('\\', '_', $manager);
+        ?>
       <div role="tabpanel" class="tab-pane fade" id="<?= $code; ?>">
         <?php
         $dataManager->draw();
         ?>
       </div>
       <?php
-  }
-  ?>
+    }
+    ?>
 </div>
 
 

Spacing +2 added lines, -2 removed lines

@@ -7,7 +7,7 @@ 
   foreach ($managers as $manager) {
       $dataManager = new Ui\DataManager($manager);
       $dataManagers[$manager] = $dataManager;
-      $code = 'tab_' . str_replace('\\', '_', $manager);
+      $code = 'tab_'.str_replace('\\', '_', $manager);
       echo "<li role='presentation'><a href='#{$code}' aria-controls='{$code}' role='tab' data-toggle='tab'>{$dataManager->name}</a></li>";
   }
   ?>
@@ -54,7 +54,7 @@ 
   </div>
   <?php
   foreach ($dataManagers as $manager => $dataManager) {
-      $code = 'tab_' . str_replace('\\', '_', $manager);
+      $code = 'tab_'.str_replace('\\', '_', $manager);
       ?>
       <div role="tabpanel" class="tab-pane fade" id="<?= $code; ?>">
         <?php

system/modules/Ecommerce/appControllers/content/Cart/orderDetail.php

Indentation +87 added lines, -87 removed lines

@@ -6,11 +6,11 @@ 
     </tr>
   </thead>
   <?php
-  $orderDeatilCols = [
-      'id' => '№ Заказа',
-      'complete_data' => 'Дата заказа'
-  ];
-  ?>
+    $orderDeatilCols = [
+        'id' => '№ Заказа',
+        'complete_data' => 'Дата заказа'
+    ];
+    ?>
   <tbody>
     <tr>
       <td class="text-left" style="width: 50%;">              
@@ -63,91 +63,91 @@ 
     </thead>
     <tbody>
       <?php
-      $sums = [];
-      foreach ($cart->cartItems as $cartItem) {
-          $item = $cartItem->item;
-          $itemName = $item->name();
-          if (!isset($sums[$cartItem->price->currency_id])) {
-              $sums[$cartItem->price->currency_id] = $cartItem->price->price;
-          } else {
-              $sums[$cartItem->price->currency_id] += $cartItem->price->price;
-          }
-          ?>
+        $sums = [];
+        foreach ($cart->cartItems as $cartItem) {
+            $item = $cartItem->item;
+            $itemName = $item->name();
+            if (!isset($sums[$cartItem->price->currency_id])) {
+                $sums[$cartItem->price->currency_id] = $cartItem->price->price;
+            } else {
+                $sums[$cartItem->price->currency_id] += $cartItem->price->price;
+            }
+            ?>
           <tr>
             <td class="text-left"><?= $itemName; ?></td>
             <td class="text-right"><?= $cartItem->count; ?></td>
             <td class="text-right"><?= $cartItem->price->price; ?> 
               <?php
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($cartItem->price->currency_id);
-                  if ($currency) {
-                      echo $currency->acronym();
-                  } else {
-                      echo 'руб.';
-                  }
-              } else {
-                  echo 'руб.';
-              }
-              ?></td>
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($cartItem->price->currency_id);
+                    if ($currency) {
+                        echo $currency->acronym();
+                    } else {
+                        echo 'руб.';
+                    }
+                } else {
+                    echo 'руб.';
+                }
+                ?></td>
             <td class="text-right"><?= ($cartItem->price->price * $cartItem->count); ?>
               <?php
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($cartItem->price->currency_id);
-                  if ($currency) {
-                      echo $currency->acronym();
-                  } else {
-                      echo 'руб.';
-                  }
-              } else {
-                  echo 'руб.';
-              }
-              ?></td>
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($cartItem->price->currency_id);
+                    if ($currency) {
+                        echo $currency->acronym();
+                    } else {
+                        echo 'руб.';
+                    }
+                } else {
+                    echo 'руб.';
+                }
+                ?></td>
             <td class="text-right" style="white-space: nowrap;">
               <a onclick = 'inji.Ecommerce.Cart.addItem(<?= $item->getPrice()->id; ?>, 1);
                         return false;' data-original-title="Добавить в корзину" href="#" data-toggle="tooltip" title="" class="btn btn-primary"><i class="glyphicon glyphicon-shopping-cart"></i></a>
           </tr>
           <?php
-      }
-      ?>
+        }
+        ?>
     </tbody>
     <tfoot>
       <tr>
         <td colspan="2"></td>
         <td class="text-right"><b>Сумма</b></td>
         <td class="text-right"><?php
-          foreach ($sums as $currency_id => $sum) {
-              if (!$sum) {
-                  continue;
-              }
-              echo number_format($sum, 2, '.', ' ');
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($currency_id);
-                  if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-              } else {
-                  echo '&nbsp;руб.';
-              }
-              echo '<br />';
-          }
-          ?></td>
+            foreach ($sums as $currency_id => $sum) {
+                if (!$sum) {
+                    continue;
+                }
+                echo number_format($sum, 2, '.', ' ');
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($currency_id);
+                    if ($currency) {
+                        echo '&nbsp;' . $currency->acronym();
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                } else {
+                    echo '&nbsp;руб.';
+                }
+                echo '<br />';
+            }
+            ?></td>
         <td></td>
       </tr>
       <?php
-      $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
-      $deliveryPrice = $cart->delivery->price;
-      if (!isset($sums[$deliveryCurrency])) {
-          $sums[$deliveryCurrency] = $deliveryPrice;
-      } else {
-          $sums[$deliveryCurrency] += $deliveryPrice;
-      }
-      $delCurrency = false;
-      if (App::$cur->money) {
-          $delCurrency = Money\Currency::get($deliveryPrice);
-      }
-      ?>
+        $deliveryCurrency = $cart->delivery ? $cart->delivery->currency_id : 0;
+        $deliveryPrice = $cart->delivery->price;
+        if (!isset($sums[$deliveryCurrency])) {
+            $sums[$deliveryCurrency] = $deliveryPrice;
+        } else {
+            $sums[$deliveryCurrency] += $deliveryPrice;
+        }
+        $delCurrency = false;
+        if (App::$cur->money) {
+            $delCurrency = Money\Currency::get($deliveryPrice);
+        }
+        ?>
       <tr>
         <td colspan="2"></td>
         <td class="text-right"><b><?= $cart->delivery ? $cart->delivery->name : 'Доставка'; ?></b></td>
@@ -158,24 +158,24 @@ 
         <td colspan="2"></td>
         <td class="text-right"><b>Итого</b></td>
         <td class="text-right"><?php
-          foreach ($sums as $currency_id => $sum) {
-              if (!$sum) {
-                  continue;
-              }
-              echo number_format($sum, 2, '.', ' ');
-              if (App::$cur->money) {
-                  $currency = Money\Currency::get($currency_id);
-                  if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
-                  } else {
-                      echo '&nbsp;руб.';
-                  }
-              } else {
-                  echo '&nbsp;руб.';
-              }
-              echo '<br />';
-          }
-          ?></td>
+            foreach ($sums as $currency_id => $sum) {
+                if (!$sum) {
+                    continue;
+                }
+                echo number_format($sum, 2, '.', ' ');
+                if (App::$cur->money) {
+                    $currency = Money\Currency::get($currency_id);
+                    if ($currency) {
+                        echo '&nbsp;' . $currency->acronym();
+                    } else {
+                        echo '&nbsp;руб.';
+                    }
+                } else {
+                    echo '&nbsp;руб.';
+                }
+                echo '<br />';
+            }
+            ?></td>
         <td></td>
       </tr>
     </tfoot>

Spacing +6 added lines, -6 removed lines

@@ -16,7 +16,7 @@ 
       <td class="text-left" style="width: 50%;">              
         <?php
         foreach ($orderDeatilCols as $col => $label) {
-            echo "<b>{$label}</b> " . $cart->$col . "<br>";
+            echo "<b>{$label}</b> ".$cart->$col."<br>";
         }
         ?>
       </td>
@@ -39,7 +39,7 @@ 
         <?php
         if ($cart->infos) {
             foreach ($cart->infos as $info) {
-                echo "<b>{$info->field->name()}</b> " . $info->value . "<br>";
+                echo "<b>{$info->field->name()}</b> ".$info->value."<br>";
             }
         }
         ?>
@@ -123,7 +123,7 @@ 
               if (App::$cur->money) {
                   $currency = Money\Currency::get($currency_id);
                   if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
+                      echo '&nbsp;'.$currency->acronym();
                   } else {
                       echo '&nbsp;руб.';
                   }
@@ -166,7 +166,7 @@ 
               if (App::$cur->money) {
                   $currency = Money\Currency::get($currency_id);
                   if ($currency) {
-                      echo '&nbsp;' . $currency->acronym();
+                      echo '&nbsp;'.$currency->acronym();
                   } else {
                       echo '&nbsp;руб.';
                   }
@@ -205,7 +205,7 @@ 
                 case'2':
                     $price = Ecommerce\Item\Offer\Price::get($status->info);
                     if ($price) {
-                        echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a>";
+                        echo "<a href = '/ecommerce/view/{$item->id}'>".$price->offer->item->name()."</a>";
                     } else {
                         echo 'Товар удален';
                     }
@@ -214,7 +214,7 @@ 
                     $info = explode('|', $status->info);
                     $price = Ecommerce\Item\Offer\Price::get($info[0]);
                     if ($price) {
-                        echo "<a href = '/ecommerce/view/{$item->id}'>" . $price->offer->item->name() . "</a> " . ($info[1] > 0 ? '+' . $info[1] : $info[1]);
+                        echo "<a href = '/ecommerce/view/{$item->id}'>".$price->offer->item->name()."</a> ".($info[1] > 0 ? '+'.$info[1] : $info[1]);
                     } else {
                         echo 'Товар удален';
                     }

system/modules/Ecommerce/appControllers/content/buyCard.php

Indentation +4 added lines, -4 removed lines

@@ -50,12 +50,12 @@
                       <td>
                         <ul>
                           <?php
-                          foreach ($card->levels as $level) {
-                              ?>
+                            foreach ($card->levels as $level) {
+                                ?>
                               <li><?= $level->name; ?> - <?= $level->discount->name; ?></li>
                               <?php
-                          }
-                          ?>
+                            }
+                            ?>
                         </ul>
                       </td>
                       <td>