injitools / cms-Inji

system/modules/Ecommerce/models/Item/Offer/Param.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
     public function realType()
     {
-        if ($this->option && $this->option->type)  {
+        if ($this->option && $this->option->type) {
             $type = $this->option->type;
 
             if ($type == 'select') {

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

Spacing +12 added lines, -12 removed lines

@@ -76,7 +76,7 @@ 
                 'col' => 'item_offer_id',
                 //'resultKey' => 'code',
                 'resultKey' => 'item_offer_option_id',
-                'join' => [Offer\Option::table(), Offer\Option::index() . ' = ' . Offer\Param::colPrefix() . Offer\Option::index()]
+                'join' => [Offer\Option::table(), Offer\Option::index().' = '.Offer\Param::colPrefix().Offer\Option::index()]
             ],
             'item' => [
                 'model' => 'Ecommerce\Item',
@@ -89,12 +89,12 @@ 
     {
         $warehouse = Offer\Warehouse::get([['count', '0', '>'], ['item_offer_id', $this->id]]);
         if ($warehouse) {
-            $warehouse->count +=(float) $count;
+            $warehouse->count += (float) $count;
             $warehouse->save();
         } else {
             $warehouse = Offer\Warehouse::get([['item_offer_id', $this->id]]);
             if ($warehouse) {
-                $warehouse->count +=(float) $count;
+                $warehouse->count += (float) $count;
                 $warehouse->save();
             }
         }
@@ -112,21 +112,21 @@ 
             }
         }
         if ($warehouseIds) {
-            \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Warehouse::index(), $warehouseIds, 'IN');
+            \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Warehouse::index(), $warehouseIds, 'IN');
         }
-        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count),0) as `sum` ';
+        \App::$cur->db->where(\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Item\Offer\Warehouse::colPrefix().'count),0) as `sum` ';
         $warehouse = \App::$cur->db->select(\Ecommerce\Item\Offer\Warehouse::table())->fetch();
 
-        \App::$cur->db->cols = 'COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0) as `sum` ';
-        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index(), $this->id);
+        \App::$cur->db->cols = 'COALESCE(sum('.\Ecommerce\Warehouse\Block::colPrefix().'count) ,0) as `sum` ';
+        \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index(), $this->id);
         if ($cart_id) {
-            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index(), (int) $cart_id, '!=');
+            \App::$cur->db->where(\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index(), (int) $cart_id, '!=');
         }
         $on = '
-            ' . \Ecommerce\Cart::index() . ' = ' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Cart::index() . ' AND (
-            (`' . \Ecommerce\Cart::colPrefix() . 'warehouse_block` = 1 and `' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(2,3,6)) || 
-            (`' . \Ecommerce\Cart::colPrefix() . 'cart_status_id` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
+            ' . \Ecommerce\Cart::index().' = '.\Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Cart::index().' AND (
+            (`' . \Ecommerce\Cart::colPrefix().'warehouse_block` = 1 and `'.\Ecommerce\Cart::colPrefix().'cart_status_id` in(2,3,6)) || 
+            (`' . \Ecommerce\Cart::colPrefix().'cart_status_id` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
             )
         ';
         \App::$cur->db->join(\Ecommerce\Cart::table(), $on, 'inner');

system/modules/Ui/Controllers/UiController.php

Spacing +5 added lines, -5 removed lines

@@ -38,25 +38,25 @@
             $return = new Server\Result();
             ob_start();
             $form->checkRequest($params, true);
-            $_GET['item'] = get_class($form->model) . ($model->pk() ? ':' . $model->pk() : '');
+            $_GET['item'] = get_class($form->model).($model->pk() ? ':'.$model->pk() : '');
             $get = $_GET;
             if (isset($get['notSave'])) {
                 unset($get['notSave']);
             }
-            $form->action = (App::$cur->system ? '/' . App::$cur->name : '') . '/ui/formPopUp/?' . http_build_query($get);
+            $form->action = (App::$cur->system ? '/'.App::$cur->name : '').'/ui/formPopUp/?'.http_build_query($get);
             $form->draw($params, true);
             $return->content = ob_get_contents();
             ob_end_clean();
             $return->send();
         } else {
             $form->checkRequest($params);
-            $_GET['item'] = get_class($form->model) . ($model->pk() ? ':' . $model->pk() : '');
+            $_GET['item'] = get_class($form->model).($model->pk() ? ':'.$model->pk() : '');
             $get = $_GET;
             if (isset($get['notSave'])) {
                 unset($get['notSave']);
             }
-            $form->action = (App::$cur->system ? '/' . App::$cur->name : '') . '/ui/formPopUp/?' . http_build_query($get);
-            $this->view->setTitle(($model && $model->pk() ? 'Изменить ' : 'Создать ') . $form->header);
+            $form->action = (App::$cur->system ? '/'.App::$cur->name : '').'/ui/formPopUp/?'.http_build_query($get);
+            $this->view->setTitle(($model && $model->pk() ? 'Изменить ' : 'Создать ').$form->header);
             $this->view->page(['content' => 'form', 'data' => compact('form', 'params')]);
         }
     }

system/modules/Money/snippets/rewardType/currency.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
     'procent' => 'Процент',

     'amount' => 'Сумма',

 ];

-return $levelTypes[$level->params['type']->value] . ': ' . $level->params['amount']->value . ' ' . ($level->params['type']->value == 'procent' ? '%' : ($level->params['currency_id']->value ? \Money\Currency::get($level->params['currency_id']->value)->acronym() : ''));

+return $levelTypes[$level->params['type']->value].': '.$level->params['amount']->value.' '.($level->params['type']->value == 'procent' ? '%' : ($level->params['currency_id']->value ? \Money\Currency::get($level->params['currency_id']->value)->acronym() : ''));

 },

     'rewarder' => function($reward, $sums, $user, $rootUser, $level, $rewardGet) {

 $wallets = \App::$cur->money->getUserWallets($user->id);

@@ -63,9 +63,9 @@ 
         return 0;

     }

 

-    $text = 'Вознаграждение по программе "' . $reward->name . '"';

+    $text = 'Вознаграждение по программе "'.$reward->name.'"';

     if ($rootUser->id != $user->id) {

-        $text .= ' от ' . $rootUser->name();

+        $text .= ' от '.$rootUser->name();

     }

 

     if (!$rewardGet && $reward->block) {

@@ -73,7 +73,7 @@ 
         $block->wallet_id = $wallets[$level->params['currency_id']->value]->id;

         $block->amount = $amount;

         $block->comment = $text;

-        $block->data = 'reward:' . $reward->id;

+        $block->data = 'reward:'.$reward->id;

         $dateGenerators = \App::$cur->money->getSnippets('expiredDateGenerator');

         if ($reward->block_date_expired && !empty($dateGenerators[$reward->block_date_expired])) {

             $date = $dateGenerators[$reward->block_date_expired]($reward, $user);

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

         $wallets[$level->params['currency_id']->value]->diff($amount, $text);

     }

-    \App::$cur->users->AddUserActivity($user->id, 4, $text . '<br />' . $amount . ' ' . $wallets[$level->params['currency_id']->value]->currency->acronym());

+    \App::$cur->users->AddUserActivity($user->id, 4, $text.'<br />'.$amount.' '.$wallets[$level->params['currency_id']->value]->currency->acronym());

 }

 return $amount;

 }

system/modules/Widgets/appAdminControllers/content/widgetChooser.php

Indentation +5 added lines, -5 removed lines

@@ -29,11 +29,11 @@
 <select class ='form-control' id = 'widgetChooser' onchange="selectChange(this);">
   <option value = ''>Выберите виджет</option>
   <?php
-  foreach ($widgets as $code => $options) {
-      $name = is_string($options) ? $options : $options['name'];
-      echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>";
-  }
-  ?>
+    foreach ($widgets as $code => $options) {
+        $name = is_string($options) ? $options : $options['name'];
+        echo "<option value = '{$code}' data-filename='{$code}'>{$name}</option>";
+    }
+    ?>
 </select>
 <?php
 foreach ($widgets as $code => $options) {

Spacing +4 added lines, -4 removed lines

@@ -37,7 +37,7 @@ 
 </select>
 <?php
 foreach ($widgets as $code => $options) {
-    echo "<div id = 'params_" . str_replace('\\', '-', $code) . "' class = 'widgetParams' style='display:none;'>";
+    echo "<div id = 'params_".str_replace('\\', '-', $code)."' class = 'widgetParams' style='display:none;'>";
     if (isset($options['params']) && !is_array($options['params'])) {
         $options['params']();
     } elseif (isset($options['params'])) {
@@ -48,7 +48,7 @@ 
                 if ($param['type'] == 'select') {
                     echo "<div class = 'form-group'>
                         <label>{$param['name']}</label>
-                        <select name = 'params[" . str_replace('\\', '-', $code) . "][]' class = 'form-control' >";
+                        <select name = 'params[".str_replace('\\', '-', $code)."][]' class = 'form-control' >";
                     foreach ($param['model']::get_list() as $item) {
                         echo "<option value = '{$item->pk()}'>{$item->$param['showCol']}</option>";
                     }
@@ -57,12 +57,12 @@ 
                 } elseif ($param['type'] == 'textarea') {
                     echo "<div class = 'form-group'>
                         <label>{$param['name']}</label>
-                        <textarea name = 'params[" . str_replace('\\', '-', $code) . "][]' class = 'form-control'></textarea>
+                        <textarea name = 'params[".str_replace('\\', '-', $code)."][]' class = 'form-control'></textarea>
                         </div>";
                 } else {
                     echo "<div class = 'form-group'>
                         <label>{$param['name']}</label>
-                        <input name = 'params[" . str_replace('\\', '-', $code) . "][]' class = 'form-control' />
+                        <input name = 'params[".str_replace('\\', '-', $code)."][]' class = 'form-control' />
                         </div>";
                 }
             }

system/modules/View/appAdminControllers/content/Template/chooseFile.php

Spacing +2 added lines, -2 removed lines

@@ -3,9 +3,9 @@
 <hr/>

 <?php

 foreach ($template->config['css'] as $file) {

-    if (file_exists($template->path . '/css/' . $file)) {

+    if (file_exists($template->path.'/css/'.$file)) {

         ?>

-        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/' . $file; ?>'><?= $file; ?></a>

+        <a href ='/admin/view/template/editFile/<?= $template->name; ?>?path=<?= 'css/'.$file; ?>'><?= $file; ?></a>

         <?php

     }

 }

system/modules/Sitemap/Sitemap.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,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");
@@ -39,7 +39,7 @@ 
         $root->setAttribute("xmlns", "http://www.sitemaps.org/schemas/sitemap/0.9");
         $root = $xml->appendChild($root);
 
-        $addToXml = function ($xml, $parent, $nodeName, $text) {
+        $addToXml = function($xml, $parent, $nodeName, $text) {
             $node = $parent->appendChild($xml->createElement($nodeName));
             $node->appendChild($xml->createTextNode($text));
             return $node;

system/modules/Sitemap/install_script.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [

system/modules/Materials/Materials.php

Spacing +4 added lines, -4 removed lines

@@ -41,7 +41,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;
@@ -77,7 +77,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;
@@ -91,7 +91,7 @@ 
             $map[] = [
                 'name' => $mat->name,
                 'url' => [
-                    'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($mat->getHref())
+                    'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($mat->getHref())
                 ],
             ];
         }
@@ -104,7 +104,7 @@ 
                 $map[] = [
                     'name' => $mat->name,
                     'url' => [
-                        'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($mat->getHref())
+                        'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($mat->getHref())
                     ],
                 ];
             }