injitools / cms-Inji

system/modules/Menu/widgets/menu.php

Braces +10 added lines, -8 removed lines

@@ -9,18 +9,20 @@
 $menu = \Menu\Menu::get($code, 'code');
 if ($menu) {
     foreach ($menu->items(['where' => ['parent_id', 0], 'order' => ['weight', 'asc']]) as $item) {
-        if (urldecode($_SERVER['REQUEST_URI']) == $item->href)
-            $active = ' class = "active" ';
-        else
-            $active = '';
+        if (urldecode($_SERVER['REQUEST_URI']) == $item->href) {
+                    $active = ' class = "active" ';
+        } else {
+                    $active = '';
+        }
         echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>";
         if ($item->childs(['order' => ['weight', 'asc']])) {
             echo "<ul>";
             foreach ($item->childs as $item) {
-                if (urldecode($_SERVER['REQUEST_URI']) == $item->href)
-                    $active = ' class = "active" ';
-                else
-                    $active = '';
+                if (urldecode($_SERVER['REQUEST_URI']) == $item->href) {
+                                    $active = ' class = "active" ';
+                } else {
+                                    $active = '';
+                }
                 echo "<li {$active}><a href = '{$item->href}'>{$item->name}</a>";
             }
             echo "</ul>";

system/modules/Ecommerce/models/Item/Type.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         'manager' => [
             'map' => [
                 ['name', 'code'],
-                ['delivery', 'electronic','discount']
+                ['delivery', 'electronic', 'discount']
             ]
         ]
     ];

system/modules/Ecommerce/widgets/cart/payType.php

Indentation +18 added lines, -18 removed lines

@@ -2,24 +2,24 @@
   <div class="col-md-4">
     <ul class="nav nav-pills nav-stacked">
       <?php
-      $hiddenId = Tools::randomString();
-      foreach ($payTypes as $payType) {
-          if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) {
-              $checked = 'checked';
-          } else {
-              $checked = '';
-          }
-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
-          echo $payType->name;
-          echo '</a></li>';
-      }
-      $form->input('hidden', "payType", '', [
-          'value' => $cart->paytype_id,
-          'attributes' => [
-              'id' => $hiddenId
-          ],
-      ]);
-      ?>
+        $hiddenId = Tools::randomString();
+        foreach ($payTypes as $payType) {
+            if ((!empty($_POST['payType']) && $_POST['payType'] == $payType->id) || ($cart->payType && $payType->id == $cart->payType->id)) {
+                $checked = 'checked';
+            } else {
+                $checked = '';
+            }
+            echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
+            echo $payType->name;
+            echo '</a></li>';
+        }
+        $form->input('hidden', "payType", '', [
+            'value' => $cart->paytype_id,
+            'attributes' => [
+                'id' => $hiddenId
+            ],
+        ]);
+        ?>
     </ul>
   </div>
   <div class="col-md-8">

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
           } else {
               $checked = '';
           }
-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $payType->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';
+          echo '<li'.($checked ? ' class="active"' : '').'><a href = "#" onclick = "document.getElementById(\''.$hiddenId.'\').value=\''.$payType->id.'\';inji.Ecommerce.Cart.calcSum();return false;">';
           echo $payType->name;
           echo '</a></li>';
       }

system/modules/Ecommerce/widgets/cart/delivery.php

Indentation +18 added lines, -18 removed lines

@@ -2,24 +2,24 @@
   <div class="col-md-4">

     <ul class="nav nav-pills nav-stacked">

       <?php

-      $hiddenId = Tools::randomString();

-      foreach ($deliverys as $delivery) {

-          if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) {

-              $checked = 'checked';

-          } else {

-              $checked = '';

-          }

-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';

-          echo $delivery->name;

-          echo '</a></li>';

-      }

-      $form->input('hidden', "delivery", '', [

-          'value' => $cart->delivery_id,

-          'attributes' => [

-              'id' => $hiddenId

-          ],

-      ]);

-      ?>

+        $hiddenId = Tools::randomString();

+        foreach ($deliverys as $delivery) {

+            if ((!empty($_POST['delivery']) && $_POST['delivery'] == $delivery->id) || ($cart->delivery && $delivery->id == $cart->delivery->id)) {

+                $checked = 'checked';

+            } else {

+                $checked = '';

+            }

+            echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';

+            echo $delivery->name;

+            echo '</a></li>';

+        }

+        $form->input('hidden', "delivery", '', [

+            'value' => $cart->delivery_id,

+            'attributes' => [

+                'id' => $hiddenId

+            ],

+        ]);

+        ?>

     </ul>

   </div>

   <div class="col-md-8">

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
                 $form->input($field->type, "deliveryFields[{$field->id}]", $field->name, ['required' => $field->required]);

             }

         }

-    }

-    else {

+    } else {

         echo "<h4>Выберите способ доставки</h4>";

     }

     ?>

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
           } else {

               $checked = '';

           }

-          echo '<li' . ($checked ? ' class="active"' : '') . '><a href = "#" onclick = "document.getElementById(\'' . $hiddenId . '\').value=\'' . $delivery->id . '\';inji.Ecommerce.Cart.calcSum();return false;">';

+          echo '<li'.($checked ? ' class="active"' : '').'><a href = "#" onclick = "document.getElementById(\''.$hiddenId.'\').value=\''.$delivery->id.'\';inji.Ecommerce.Cart.calcSum();return false;">';

           echo $delivery->name;

           echo '</a></li>';

       }

@@ -27,10 +27,10 @@ 
     if ($cart->delivery) {

         echo "<h4>Информация о доставке</h4>";

         if ($cart->delivery->price_text || $cart->delivery->price) {

-            echo "<div>Стоимость доставки: <b>" . ($cart->delivery->price_text ? $cart->delivery->price_text : ( $cart->delivery->price . ' ' . ($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.') )) . '</b></div>';

+            echo "<div>Стоимость доставки: <b>".($cart->delivery->price_text ? $cart->delivery->price_text : ($cart->delivery->price.' '.($cart->delivery->currency ? $cart->delivery->currency->acronym() : 'руб.'))).'</b></div>';

         }

         if ((float) $cart->delivery->max_cart_price) {

-            echo '<div>При заказе товаров на сумму от ' . $cart->delivery->max_cart_price . ' руб - бесплатно</div>';

+            echo '<div>При заказе товаров на сумму от '.$cart->delivery->max_cart_price.' руб - бесплатно</div>';

         }

         echo $cart->delivery->info;

         if ($cart->delivery->fields) {

system/modules/Users/appControllers/content/login.php

Indentation +9 added lines, -9 removed lines

@@ -5,15 +5,15 @@
         <h3>Вход</h3>
         <div class="form-group">
           <?php
-          $socials = Users\Social::getList(['where' => ['active', 1]]);
-          if ($socials) {
-              echo 'Войти через: ';
-              foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-                  $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
-                  echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
-              }
-          }
-          ?>
+            $socials = Users\Social::getList(['where' => ['active', 1]]);
+            if ($socials) {
+                echo 'Войти через: ';
+                foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
+                    $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
+                    echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
+                }
+            }
+            ?>
         </div>
         <form action = '' method = 'POST' >
           <div class ='row'>

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
           if ($socials) {
               echo 'Войти через: ';
               foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-                  $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
+                  $text = $social->image ? '<img src ="'.Statics::file($social->image->path, '25x25', 'q').'">' : $social->name();
                   echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
               }
           }

system/modules/Exchange1c/appAdminControllers/Exchange1cController.php

Spacing +4 added lines, -4 removed lines

@@ -25,9 +25,9 @@ 
 
         foreach ($reExchange->files as $reFile) {
             if (strpos($reFile->name, '/')) {
-                Tools::createDir($exchange->path . '/' . substr($reFile->name, 0, strrpos($reFile->name, '/')));
+                Tools::createDir($exchange->path.'/'.substr($reFile->name, 0, strrpos($reFile->name, '/')));
             }
-            copy($reExchange->path . '/' . $reFile->name, $exchange->path . '/' . $reFile->name);
+            copy($reExchange->path.'/'.$reFile->name, $exchange->path.'/'.$reFile->name);
         }
 
         //Tools::copyFiles($reExchange->path, $exchange->path);
@@ -46,10 +46,10 @@ 
             $log->query = $reLog->query;
             $log->save();
 
-            $modeClass = 'Exchange1c\Mode\\' . ucfirst(strtolower($log->info));
+            $modeClass = 'Exchange1c\Mode\\'.ucfirst(strtolower($log->info));
             if (!class_exists($modeClass)) {
                 $log->status = 'failure';
-                $log->info = 'mode class ' . $modeClass . ' not found';
+                $log->info = 'mode class '.$modeClass.' not found';
                 $log->date_end = date('Y-m-d H:i:s');
                 $log->save();
             }

system/modules/Exchange1c/appControllers/Exchange1cController.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
             $exchange->type = $_GET['type'];
             $exchange->session = session_id();
             $exchange->save();
-            $exchange->path = App::$cur->path . '/tmp/Exchange1c/' . date('Y-m-d') . '/' . $exchange->id;
+            $exchange->path = App::$cur->path.'/tmp/Exchange1c/'.date('Y-m-d').'/'.$exchange->id;
             $exchange->save();
         }
 
@@ -45,10 +45,10 @@ 
         $log->status = 'process';
         $log->query = json_encode($_GET);
         $log->save();
-        $modeClass = 'Exchange1c\Mode\\' . ucfirst(strtolower($_GET['mode']));
+        $modeClass = 'Exchange1c\Mode\\'.ucfirst(strtolower($_GET['mode']));
         if (!class_exists($modeClass)) {
             $log->status = 'failure';
-            $log->info = 'mode class ' . $modeClass . ' not found';
+            $log->info = 'mode class '.$modeClass.' not found';
             $log->date_end = date('Y-m-d H:i:s');
             $log->save();
         }

system/modules/Exchange1c/objects/Mode/Checkauth.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     public function process()
     {
         $_SESSION['auth'] = true;
-        \App::$cur->exchange1c->response('success', session_name() . "\n" . session_id(), false);
+        \App::$cur->exchange1c->response('success', session_name()."\n".session_id(), false);
         $this->end();
     }
 

system/modules/Exchange1c/objects/Mode/Query.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
         header("Content-Type: text/xml");
         header("Expires: Thu, 19 Feb 1998 13:24:18 GMT");
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
         header("Cache-Control: no-cache, must-revalidate");
         header("Cache-Control: post-check=0,pre-check=0");
         header("Cache-Control: max-age=0");