injitools / cms-Inji

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/Ui/objects/ActiveForm.php

Spacing +9 added lines, -9 removed lines

@@ -48,7 +48,7 @@ 
                 $this->formName = $form;
                 $this->form = \App::$cur->ui->getModelForm($this->modelName, $form);
                 if (empty($this->form)) {
-                    throw new \Exception('empty form ' . $form);
+                    throw new \Exception('empty form '.$form);
                 }
                 $this->inputs = $this->getInputs();
             }
@@ -84,7 +84,7 @@ 
                             $this->model->_params[$modelName::index()] = 0;
                         }
                         $relOptions['model']::fixPrefix($relOptions['col']);
-                        $inputs[$col] = new ActiveForm(new $relOptions['model']([ $relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
+                        $inputs[$col] = new ActiveForm(new $relOptions['model']([$relOptions['col'] => &$this->model->_params[$modelName::index()]]), $colPath[2]);
                     }
                     $inputs[$col]->parent = $this;
                 } elseif (!empty($modelName::$cols[$col])) {
@@ -98,7 +98,7 @@ 
     public function checkRequest($params = [], $ajax = false)
     {
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->formName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->formName.'"');
             return [];
         }
         $successId = 0;
@@ -122,7 +122,7 @@ 
                     if (!empty($this->form['userGroupReadonly'][\Users\User::$cur->group_id]) && in_array($col, $this->form['userGroupReadonly'][\Users\User::$cur->group_id])) {
                         continue;
                     }
-                    $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($param['type']);
+                    $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($param['type']);
                     $input = new $inputClassName();
                     $input->activeForm = $this;
                     $input->activeFormParams = $params;
@@ -167,7 +167,7 @@ 
                     if ($ajax) {
                         \Msg::show();
                     } elseif (!empty($_GET['redirectUrl'])) {
-                        \Tools::redirect($_GET['redirectUrl'] . (!empty($_GET['dataManagerHash']) ? '#' . $_GET['dataManagerHash'] : ''));
+                        \Tools::redirect($_GET['redirectUrl'].(!empty($_GET['dataManagerHash']) ? '#'.$_GET['dataManagerHash'] : ''));
                     }
                     $successId = $this->model->pk();
                 }
@@ -182,7 +182,7 @@ 
     public function draw($params = [], $ajax = false)
     {
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" form with name: "' . $this->formName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" form with name: "'.$this->formName.'"');
             return [];
         }
         $form = new Form(!empty($this->form['formOptions']) ? $this->form['formOptions'] : []);
@@ -194,7 +194,7 @@ 
         if (is_object($options)) {
             $options->draw();
         } else {
-            $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($options['type']);
+            $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($options['type']);
             $input = new $inputClassName();
             $input->form = $form;
             $input->activeForm = $this;
@@ -271,7 +271,7 @@ 
         }
         foreach ($values as $key => $value) {
             if (is_array($value) && !empty($value['input']) && empty($value['input']['noprefix'])) {
-                $values[$key]['input']['name'] = $aditionalInputNamePrefix . "[{$value['input']['name']}]";
+                $values[$key]['input']['name'] = $aditionalInputNamePrefix."[{$value['input']['name']}]";
             }
         }
         return $values;
@@ -295,7 +295,7 @@ 
     public function checkAccess()
     {
         if (empty($this->form)) {
-            $this->drawError('"' . $this->modelName . '" form with name: "' . $this->formName . '" not found');
+            $this->drawError('"'.$this->modelName.'" form with name: "'.$this->formName.'" not found');
             return false;
         }
         if (\App::$cur->Access && !\App::$cur->Access->checkAccess($this)) {

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())
                     ],
                 ];
             }

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

Indentation +87 added lines, -87 removed lines

@@ -8,11 +8,11 @@ 
         </tr>
       </thead>
       <?php
-      $orderDeatilCols = [
-          'id' => '№ Заказа',
-          'complete_data' => 'Дата заказа'
-      ];
-      ?>
+        $orderDeatilCols = [
+            'id' => '№ Заказа',
+            'complete_data' => 'Дата заказа'
+        ];
+        ?>
       <tbody>
         <tr>
           <td class="text-left" style="width: 50%;">              
@@ -65,91 +65,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>
@@ -160,24 +160,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

@@ -18,7 +18,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>
@@ -41,7 +41,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>";
                 }
             }
             ?>
@@ -125,7 +125,7 @@ 
                   if (App::$cur->money) {
                       $currency = Money\Currency::get($currency_id);
                       if ($currency) {
-                          echo '&nbsp;' . $currency->acronym();
+                          echo '&nbsp;'.$currency->acronym();
                       } else {
                           echo '&nbsp;руб.';
                       }
@@ -168,7 +168,7 @@ 
                   if (App::$cur->money) {
                       $currency = Money\Currency::get($currency_id);
                       if ($currency) {
-                          echo '&nbsp;' . $currency->acronym();
+                          echo '&nbsp;'.$currency->acronym();
                       } else {
                           echo '&nbsp;руб.';
                       }
@@ -207,7 +207,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 'Товар удален';
                         }
@@ -216,7 +216,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 'Товар удален';
                         }