injitools / cms-Inji

system/modules/Ecommerce/Ecommerce.php

Spacing +45 added lines, -45 removed lines

@@ -48,7 +48,7 @@ 
     $name = '';
     foreach ($fields as $field) {
       if ($field->save && !empty($data[$field->id])) {
-        $name .= htmlspecialchars($data[$field->id]) . ' ';
+        $name .= htmlspecialchars($data[$field->id]).' ';
       }
     }
     $name = trim($name);
@@ -104,7 +104,7 @@ 
     $name = '';
     foreach ($fields as $field) {
       if ($field->save && !empty($data[$field->id])) {
-        $name .= htmlspecialchars($data[$field->id]) . ' ';
+        $name .= htmlspecialchars($data[$field->id]).' ';
       }
     }
     $name = trim($name);
@@ -189,7 +189,7 @@ 
       foreach ($options['sort'] as $col => $direction) {
         switch ($col) {
           case 'price':
-            $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
+            $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
           case 'name':
             $selectOptions['order'][] = ['name', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
@@ -208,22 +208,22 @@ 
       $selectOptions['where'][] = ['image_file_id', 0, '!='];
     }
 
-    $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = ' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'inner'];
+    $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index().' = '.Ecommerce\Item\Offer::colPrefix().Ecommerce\Item::index(), 'inner'];
 
     $selectOptions['join'][] = [Ecommerce\Item\Offer\Price::table(),
-        Ecommerce\Item\Offer::index() . ' = ' . Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer::index() .
-        (empty($this->config['show_zero_price']) ? ' and ' . Ecommerce\Item\Offer\Price::colPrefix() . 'price>0' : ''),
+        Ecommerce\Item\Offer::index().' = '.Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer::index().
+        (empty($this->config['show_zero_price']) ? ' and '.Ecommerce\Item\Offer\Price::colPrefix().'price>0' : ''),
         empty($this->config['show_without_price']) ? 'inner' : 'left'];
 
     $selectOptions['join'][] = [
-        Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix() . Ecommerce\Item\Offer\Price\Type::index() . ' = ' . Ecommerce\Item\Offer\Price\Type::index()
+        Ecommerce\Item\Offer\Price\Type::table(), Ecommerce\Item\Offer\Price::colPrefix().Ecommerce\Item\Offer\Price\Type::index().' = '.Ecommerce\Item\Offer\Price\Type::index()
     ];
 
     $selectOptions['where'][] = [
         [Ecommerce\Item\Offer\Price\Type::index(), NULL, 'is'],
         [
-            [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '', '=', 'OR'],
-            [Ecommerce\Item\Offer\Price\Type::colPrefix() . 'roles', '%|' . \Users\User::$cur->role_id . '|%', 'LIKE', 'OR'],
+            [Ecommerce\Item\Offer\Price\Type::colPrefix().'roles', '', '=', 'OR'],
+            [Ecommerce\Item\Offer\Price\Type::colPrefix().'roles', '%|'.\Users\User::$cur->role_id.'|%', 'LIKE', 'OR'],
         ],
     ];
 
@@ -231,10 +231,10 @@ 
     if (!empty($this->config['view_filter'])) {
       if (!empty($this->config['view_filter']['options'])) {
         foreach ($this->config['view_filter']['options'] as $optionId => $optionValue) {
-          $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
-              'inner', 'option' . $optionId];
+          $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
+              'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
+              'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value = "'.(int) $optionValue.'"',
+              'inner', 'option'.$optionId];
         }
       }
     }
@@ -244,10 +244,10 @@ 
         switch ($col) {
           case 'price':
             if (!empty($filter['min'])) {
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
+              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['min'], '>='];
             }
             if (!empty($filter['max'])) {
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
+              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix().'price', (float) $filter['max'], '<='];
             }
             break;
           case 'options':
@@ -258,14 +258,14 @@ 
                 foreach ($optionValue as $val) {
                   $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
-                $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
+                $qstr = 'IN ('.implode(',', $optionValueArr).')';
               } else {
-                $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
+                $qstr = '= '.\App::$cur->db->connection->pdo->quote($optionValue);
               }
-              $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value ' . $qstr . '',
-                  'inner', 'option' . $optionId];
+              $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index().' = '.'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item::index().' AND '.
+                  'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' = "'.(int) $optionId.'" AND '.
+                  'option'.$optionId.'.'.Ecommerce\Item\Param::colPrefix().'value '.$qstr.'',
+                  'inner', 'option'.$optionId];
             }
             break;
           case 'offerOptions':
@@ -277,14 +277,14 @@ 
                 foreach ($optionValue as $val) {
                   $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
-                $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
+                $qstr = 'IN ('.implode(',', $optionValueArr).')';
               } else {
-                $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
+                $qstr = '= '.\App::$cur->db->connection->pdo->quote($optionValue);
               }
-              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
-                  'inner', 'offerOption' . $optionId];
+              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index().' = '.'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().Ecommerce\Item\Offer::index().' AND '.
+                  'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().Ecommerce\Item\Offer\Option::index().' = "'.(int) $optionId.'" AND '.
+                  'offerOption'.$optionId.'.'.Ecommerce\Item\Offer\Param::colPrefix().'value '.$qstr,
+                  'inner', 'offerOption'.$optionId];
             }
             break;
         }
@@ -299,13 +299,13 @@ 
           continue;
         }
         $category = \Ecommerce\Category::get($categoryId);
-        $where[] = ['tree_path', $category->tree_path . (int) $categoryId . '/%', 'LIKE', $first ? 'AND' : 'OR'];
+        $where[] = ['tree_path', $category->tree_path.(int) $categoryId.'/%', 'LIKE', $first ? 'AND' : 'OR'];
         $first = false;
       }
       $selectOptions['where'][] = $where;
     } elseif (!empty($options['parent'])) {
       $category = \Ecommerce\Category::get($options['parent']);
-      $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
+      $selectOptions['where'][] = ['tree_path', $category->tree_path.(int) $options['parent'].'/%', 'LIKE'];
     }
 
     //search
@@ -315,7 +315,7 @@ 
       foreach (explode(' ', $searchStr) as $part) {
         $part = trim($part);
         if ($part && strlen($part) > 2) {
-          $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
+          $searchArr[] = ['search_index', '%'.$part.'%', 'LIKE'];
         }
       }
       if (!empty($searchArr)) {
@@ -334,19 +334,19 @@ 
       }
       $selectOptions['where'][] = [
           '(
-          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count`),0) 
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Item\Offer\Warehouse::table() . ' iciw 
-            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . '
-                ' . ($warehouseIds ? ' AND iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Warehouse::index() . ' IN(' . implode(',', $warehouseIds) . ')' : '') . '
+          (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix().'count`),0) 
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Item\Offer\Warehouse::table().' iciw 
+            WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().'
+                ' . ($warehouseIds ? ' AND iciw.'.\Ecommerce\Item\Offer\Warehouse::colPrefix().\Ecommerce\Warehouse::index().' IN('.implode(',', $warehouseIds).')' : '').'
             )
           -
-          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix() . 'count) ,0)
-            FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Warehouse\Block::table() . ' iewb
-            inner JOIN ' . \App::$cur->db->table_prefix . \Ecommerce\Cart::table() . ' icc ON icc.' . \Ecommerce\Cart::index() . ' = iewb.' . \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() . \Ecommerce\Cart\Status::index() . '` in(0,1) and `' . \Ecommerce\Cart::colPrefix() . 'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
+          (SELECT COALESCE(sum(' . \Ecommerce\Warehouse\Block::colPrefix().'count) ,0)
+            FROM ' . \App::$cur->db->table_prefix.\Ecommerce\Warehouse\Block::table().' iewb
+            inner JOIN ' . \App::$cur->db->table_prefix.\Ecommerce\Cart::table().' icc ON icc.'.\Ecommerce\Cart::index().' = iewb.'.\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().\Ecommerce\Cart\Status::index().'` in(0,1) and `'.\Ecommerce\Cart::colPrefix().'date_last_activ` >=subdate(now(),INTERVAL 30 MINUTE))
             )
-            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . ')
+            WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix().\Ecommerce\Item\Offer::index().' = '.\Ecommerce\Item\Offer::index().')
           )',
           0,
           '>'
@@ -374,7 +374,7 @@ 
     $items = Ecommerce\Item::getList($selectOptions);
     $items = Ecommerce\Item\Param::getList([
                 'where' => ['item_id', array_keys($items), 'IN'],
-                'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index() . ' = ' . \Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' and ' . \Ecommerce\Item\Option::colPrefix() . 'searchable = 1', 'inner']],
+                'join' => [[Ecommerce\Item\Option::table(), Ecommerce\Item\Option::index().' = '.\Ecommerce\Item\Param::colPrefix().Ecommerce\Item\Option::index().' and '.\Ecommerce\Item\Option::colPrefix().'searchable = 1', 'inner']],
                 'distinct' => \Ecommerce\Item\Option::index()
     ]);
     return $items;
@@ -405,7 +405,7 @@ 
     if (is_array($counts)) {
       $sum = 0;
       foreach ($counts as $count) {
-        $sum +=$count['count'];
+        $sum += $count['count'];
       }
       return $sum;
     }
@@ -439,7 +439,7 @@ 
 
     if (!empty($conf['files']['aditionTemplateFiels'])) {
       foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-        $return[$file['file']] = '- ' . $file['name'];
+        $return[$file['file']] = '- '.$file['name'];
       }
     }
     return $return;
@@ -513,7 +513,7 @@ 
       $map[] = [
           'name' => $item->name,
           'url' => [
-              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
+              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($item->getHref())
           ],
       ];
     }
@@ -526,7 +526,7 @@ 
         $map[] = [
             'name' => $item->name,
             'url' => [
-                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
+                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http').'://'.INJI_DOMAIN_NAME.($item->getHref())
             ],
         ];
       }

system/modules/Ui/widgets/DataManager/DataManager.php

Spacing +2 added lines, -2 removed lines

@@ -3,7 +3,7 @@ 
     'id' => $dataManager->managerId,
     'class' => 'dataManager',
     'data-params' => $params,
-    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName) . ($model && $model->pk() ? ':' . $model->pk() : ''),
+    'data-modelname' => ($model ? get_class($model) : $dataManager->modelName).($model && $model->pk() ? ':'.$model->pk() : ''),
     'data-managername' => $dataManager->managerName,
     'data-cols' => $dataManager->cols,
     'data-options' => array_merge($dataManager->managerOptions, ['actions'=>$dataManager->getActions()])
@@ -22,7 +22,7 @@ 
     'style' => ''
 ];
 if (!empty($dataManager->managerOptions['categorys'])) {
-  $mainCol['style'].='margin-left:260px;';
+  $mainCol['style'] .= 'margin-left:260px;';
   echo '<div class ="pull-left dataManager-categorys" style = "width:250px;">';
   $this->widget('Ui\DataManager/categorys', compact('dataManager'));
   echo '</div>';

system/modules/Ui/widgets/Form/select.php

Spacing +6 added lines, -6 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 $aditionalInputs = [];
 $showedInput = false;
-if(!empty($options['createBtn'])){
+if (!empty($options['createBtn'])) {
   $optionsHtml = '<option disabled onclick="'.$options['createBtn']['onclick'].'">'.$options['createBtn']['text'].'</option>';
-}else {
+} else {
   $optionsHtml = '';
 }
 
@@ -17,7 +17,7 @@ 
     }
     if (
             (!is_array($primaryValue) && ($key === $primaryValue || (isset($form->userDataTree[$name]) && $form->userDataTree[$name] === $key))) ||
-            (is_array($primaryValue) && (in_array($key,$primaryValue) || (isset($form->userDataTree[$name]) && in_array($key,$form->userDataTree[$name]))))
+            (is_array($primaryValue) && (in_array($key, $primaryValue) || (isset($form->userDataTree[$name]) && in_array($key, $form->userDataTree[$name]))))
             ) {
         $selected = ' selected="selected"';
     }
@@ -27,7 +27,7 @@ 
             $showedInput = count($aditionalInputs) - 1;
             $aditionValue = !empty($options['aditionalValue']) ? $options['aditionalValue'] : '';
         }
-        $optionsHtml .= "<option data-aditionalInput='" . ( count($aditionalInputs) - 1) . "' value ='{$key}'{$selected}>{$value['text']}</option>";
+        $optionsHtml .= "<option data-aditionalInput='".(count($aditionalInputs) - 1)."' value ='{$key}'{$selected}>{$value['text']}</option>";
     } else {
         $optionsHtml .= "<option value ='{$key}'{$selected}>{$value}</option>";
     }
@@ -44,14 +44,14 @@ 
 
     if ($key !== $showedInput) {
         $input['options']['disabled'] = true;
-        $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'] . ' hidden' : 'hidden';
+        $input['options']['class'] = !empty($input['options']['class']) ? $input['options']['class'].' hidden' : 'hidden';
     } else {
         $input['options']['value'] = empty($input['options']['value']) ? $aditionValue : $input['options']['value'];
     }
     if ($input['type'] == 'select') {
         $input['options']['values'] = \Ui\ActiveForm::getOptionsList($input);
     }
-    $form->input($input['type'], empty($input['name']) ? $name . '[aditional]' : $input['name'], false, $input['options']);
+    $form->input($input['type'], empty($input['name']) ? $name.'[aditional]' : $input['name'], false, $input['options']);
 }
 ?>
 <?= empty($options['noContainer']) ? '</div>' : ''; ?>
\ No newline at end of file

system/modules/Ui/objects/ActiveForm/Input/Select.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     if (!empty($modelName)) {
       $inputOptions['createBtn'] = [
           'text' => 'Создать элемент',
-          'onclick' => 'inji.Ui.forms.popUp(\'' . addslashes($modelName) . '\',{},function(elem){'
+          'onclick' => 'inji.Ui.forms.popUp(\''.addslashes($modelName).'\',{},function(elem){'
           . 'return function(data,modal){inji.Ui.forms.submitAjax($(elem).closest(\'form\')[0], {notSave: true});}}(this))'
       ];
     }

system/modules/Ui/objects/DataManager.php

Spacing +30 added lines, -30 removed lines

@@ -58,7 +58,7 @@ 
             $this->name = $this->managerOptions['name'];
         }
 
-        $this->managerId = str_replace('\\', '_', 'dataManager_' . $this->modelName . '_' . $this->managerName . '_' . \Tools::randomString());
+        $this->managerId = str_replace('\\', '_', 'dataManager_'.$this->modelName.'_'.$this->managerName.'_'.\Tools::randomString());
     }
 
     /**
@@ -102,13 +102,13 @@ 
         if (!empty($this->managerOptions['filters'])) {
             $buttons[] = [
                 'text' => 'Фильтры',
-                'onclick' => '  var modal = $("#' . $this->managerId . '_filters");
+                'onclick' => '  var modal = $("#'.$this->managerId.'_filters");
                 modal.modal("show");',
             ];
         }
         $buttons[] = [
             'text' => 'Добавить элемент',
-            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("' . str_replace('\\', '\\\\', $modelName) . '",' . json_encode($formParams) . ');',
+            'onclick' => 'inji.Ui.dataManagers.get(this).newItem("'.str_replace('\\', '\\\\', $modelName).'",'.json_encode($formParams).');',
         ];
 
         return $buttons;
@@ -138,7 +138,7 @@ 
                     'className' => $action
                 ];
             }
-            $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\' . $return[$key]['className']) ? 'Ui\DataManager\Action\\' . $return[$key]['className'] : $return[$key]['className'];
+            $return[$key]['className'] = strpos($return[$key]['className'], '\\') === false && class_exists('Ui\DataManager\Action\\'.$return[$key]['className']) ? 'Ui\DataManager\Action\\'.$return[$key]['className'] : $return[$key]['className'];
             if (!class_exists($return[$key]['className']) || ($onlyGroupActions && !$return[$key]['className']::$groupAction)) {
                 unset($return[$key]);
             }
@@ -170,7 +170,7 @@ 
               <?php
               foreach ($actions as $action => $actionParams) {
                   if (class_exists($actionParams['className']) && $actionParams['className']::$groupAction) {
-                      echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"" . str_replace('\\', '\\\\', $action) . "\");return false;'>{$actionParams['className']::$name}</a></li>";
+                      echo "<li><a role='button' href ='#' onclick='inji.Ui.dataManagers.get(this).groupAction(\"".str_replace('\\', '\\\\', $action)."\");return false;'>{$actionParams['className']::$name}</a></li>";
                   }
               }
               ?>
@@ -221,7 +221,7 @@ 
             return [];
         }
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
             return [];
         }
         $modelName = $this->modelName;
@@ -237,7 +237,7 @@ 
             $queryParams['start'] = $this->page * $this->limit - $this->limit;
         }
         if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-            $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+            $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
         }
         if (!empty($params['appType'])) {
             $queryParams['appType'] = $params['appType'];
@@ -296,7 +296,7 @@ 
                         if (!empty($params['filters'][$col]['max'])) {
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                                $date = $params['filters'][$col]['max'].' 23:59:59';
                             } else {
                                 $date = $params['filters'][$col]['max'];
                             }
@@ -323,16 +323,16 @@ 
                         }
                         switch ($params['filters'][$col]['compareType']) {
                             case 'contains':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'equals':
                                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                                 break;
                             case 'starts_with':
-                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'ends_with':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                                 break;
                         }
                         break;
@@ -371,7 +371,7 @@ 
                 $item = $relation['relModel']::get([[$item->index(), $item->id], [$model->index(), $model->id]]);
             }
             $row = [];
-            $row[] = '<input type ="checkbox" name = "pk[]" value =' . $item->pk() . '>';
+            $row[] = '<input type ="checkbox" name = "pk[]" value ='.$item->pk().'>';
             $row[] = $item->pk();
             foreach ($this->managerOptions['cols'] as $key => $colName) {
                 if (!empty($params['download'])) {
@@ -417,16 +417,16 @@ 
                     $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
                     $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
                     $count = $count ? $count : 'Нет';
-                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
                 case 'many':
                     $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
                     $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
                     $count = $count ? $count : 'Нет';
-                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count}</a>";
+                    return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count}</a>";
                 default :
                     if ($item->{$modelName::$cols[$colName]['relation']}) {
                         if (\App::$cur->name == 'admin') {
-                            $href = "<a href ='/admin/" . str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model']) . "/" . $item->{$modelName::$cols[$colName]['relation']}->pk() . "'>";
+                            $href = "<a href ='/admin/".str_replace('\\', '/view/', $relations[$modelName::$cols[$colName]['relation']]['model'])."/".$item->{$modelName::$cols[$colName]['relation']}->pk()."'>";
                             if (!empty($modelName::$cols[$colName]['showCol'])) {
                                 $href .= $item->{$modelName::$cols[$colName]['relation']}->{$modelName::$cols[$colName]['showCol']};
                             } else {
@@ -456,18 +456,18 @@ 
                     case 'many':
                         $managerParams = ['relation' => $modelName::$cols[$colName]['relation']];
                         $count = $item->{$modelName::$cols[$colName]['relation']}(array_merge($params, ['count' => 1]));
-                        return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"" . str_replace('\\', '\\\\', $modelName) . ":" . $item->pk() . "\"," . json_encode(array_merge($params, $managerParams)) . ")'>{$count} " . \Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов']) . "</a>";
+                        return "<a class = 'btn btn-xs btn-primary' onclick = 'inji.Ui.dataManagers.popUp(\"".str_replace('\\', '\\\\', $modelName).":".$item->pk()."\",".json_encode(array_merge($params, $managerParams)).")'>{$count} ".\Tools::getNumEnding($count, ['Элемент', 'Элемента', 'Элементов'])."</a>";
                     default:
                         return $item->$colName;
                 }
             } elseif (!empty($modelName::$cols[$colName]['type'])) {
-                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ( $dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
+                if (\App::$cur->name == 'admin' && $originalCol == 'name' || ($dataManager && !empty($dataManager->managerOptions['colToView']) && $dataManager->managerOptions['colToView'] == $originalCol)) {
                     $formName = $dataManager && !empty($dataManager->managerOptions['editForm']) ? $dataManager->managerOptions['editForm'] : 'manager';
-                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-                    return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($originalItem)) . "/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+                    return "<a href ='/admin/".str_replace('\\', '/view/', get_class($originalItem))."/{$originalItem->id}?formName={$formName}&redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
                 } elseif (\App::$cur->name == 'admin' && $colName == 'name') {
-                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/' . str_replace('\\', '/', get_class($originalItem));
-                    return "<a href ='/admin/" . str_replace('\\', '/view/', get_class($item)) . "/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
+                    $redirectUrl = !empty($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/admin/'.str_replace('\\', '/', get_class($originalItem));
+                    return "<a href ='/admin/".str_replace('\\', '/view/', get_class($item))."/{$item->id}?redirectUrl={$redirectUrl}'>{$item->$colName}</a>";
                 } else {
                     return \Model::resloveTypeValue($item, $colName);
                 }
@@ -502,7 +502,7 @@ 
             return [];
         }
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
             return [];
         }
         if (!empty($params['limit'])) {
@@ -516,7 +516,7 @@ 
         ];
         $modelName = $this->modelName;
         if (!empty($params['categoryPath']) && $modelName::$categoryModel) {
-            $queryParams['where'][] = ['tree_path', $params['categoryPath'] . '%', 'LIKE'];
+            $queryParams['where'][] = ['tree_path', $params['categoryPath'].'%', 'LIKE'];
         }
         if (!empty($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'])) {
             foreach ($this->managerOptions['userGroupFilter'][\Users\User::$cur->group_id]['getRows'] as $colName => $colOptions) {
@@ -570,7 +570,7 @@ 
                         if (!empty($params['filters'][$col]['max'])) {
                             if ($colInfo['colParams']['type'] == 'dateTime' && !strpos($params['filters'][$col]['max'], ' ')) {
 
-                                $date = $params['filters'][$col]['max'] . ' 23:59:59';
+                                $date = $params['filters'][$col]['max'].' 23:59:59';
                             } else {
                                 $date = $params['filters'][$col]['max'];
                             }
@@ -597,16 +597,16 @@ 
                         }
                         switch ($params['filters'][$col]['compareType']) {
                             case 'contains':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'equals':
                                 $queryParams['where'][] = [$col, $params['filters'][$col]['value']];
                                 break;
                             case 'starts_with':
-                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'] . '%', 'LIKE'];
+                                $queryParams['where'][] = [$col, $params['filters'][$col]['value'].'%', 'LIKE'];
                                 break;
                             case 'ends_with':
-                                $queryParams['where'][] = [$col, '%' . $params['filters'][$col]['value'], 'LIKE'];
+                                $queryParams['where'][] = [$col, '%'.$params['filters'][$col]['value'], 'LIKE'];
                                 break;
                         }
                         break;
@@ -640,7 +640,7 @@ 
             $tableCols[] = !empty($colOptions['label']) ? $colOptions['label'] : $colName;
         }
         $tableCols[] = '';
-        $this->table->class .=' datamanagertable';
+        $this->table->class .= ' datamanagertable';
         $this->table->setCols($tableCols);
     }
 
@@ -663,12 +663,12 @@ 
             return false;
         }
         if (!$this->checkAccess()) {
-            $this->drawError('you not have access to "' . $this->modelName . '" manager with name: "' . $this->managerName . '"');
+            $this->drawError('you not have access to "'.$this->modelName.'" manager with name: "'.$this->managerName.'"');
             return [];
         }
         $tree = new Tree();
         $tree->ul($this->managerOptions['categorys']['model'], 0, function($category) {
-            $path = $category->tree_path . ($category->pk() ? $category->pk() . "/" : '');
+            $path = $category->tree_path.($category->pk() ? $category->pk()."/" : '');
             $cleanClassName = str_replace('\\', '\\\\', get_class($category));
             return "<a href='#' onclick='inji.Ui.dataManagers.get(this).switchCategory(this);return false;' data-index='{$category->index()}' data-path ='{$path}' data-id='{$category->pk()}' data-model='{$this->managerOptions['categorys']['model']}'> {$category->name}</a> 
                 

system/modules/Ecommerce/widgets/filters.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
           case 'radio':
             echo "<label>{$option->name}</label>";
             foreach ($option->items as $item) {
-              $this->widget('Ui\Form/' . $option->type, [
+              $this->widget('Ui\Form/'.$option->type, [
                   'label' => $item->name,
                   'name' => "filters[options][{$option->id}]",
                   !empty($_GET['filters']['options'][$option->id]) && $_GET['filters']['options'][$option->id] == $item->id ? 'checked' : false,
@@ -47,7 +47,7 @@ 
             }
             break;
           default:
-            $this->widget('Ui\Form/' . ($option->type ? $option->type : 'text'), [
+            $this->widget('Ui\Form/'.($option->type ? $option->type : 'text'), [
                 'label' => $option->name,
                 'name' => "filters[options][{$option->id}]",
                 'options' => [

system/modules/Ecommerce/models/Item.php

Spacing +8 added lines, -8 removed lines

@@ -114,17 +114,17 @@ 
   public function beforeSave() {
 
     if ($this->id) {
-      $this->search_index = $this->name . ' ';
+      $this->search_index = $this->name.' ';
       if ($this->category) {
-        $this->search_index .= $this->category->name . ' ';
+        $this->search_index .= $this->category->name.' ';
       }
       if ($this->options) {
         foreach ($this->options as $option) {
           if ($option->item_option_searchable && $option->value) {
             if ($option->item_option_type != 'select') {
-              $this->search_index .= $option->value . ' ';
+              $this->search_index .= $option->value.' ';
             } elseif (!empty($option->option->items[$option->value])) {
-              $option->option->items[$option->value]->value . ' ';
+              $option->option->items[$option->value]->value.' ';
             }
           }
         }
@@ -135,9 +135,9 @@ 
             foreach ($offer->options as $option) {
               if ($option->item_offer_option_searchable && $option->value) {
                 if ($option->item_offer_option_type != 'select') {
-                  $this->search_index .= $option->value . ' ';
+                  $this->search_index .= $option->value.' ';
                 } elseif (!empty($option->option->items[$option->value])) {
-                  $option->option->items[$option->value]->value . ' ';
+                  $option->option->items[$option->value]->value.' ';
                 }
               }
             }
@@ -160,7 +160,7 @@ 
             'col' => 'item_id',
             //'resultKey' => 'code',
             'resultKey' => 'item_option_id',
-            'join' => [Item\Option::table(), Item\Option::index() . ' = ' . Item\Param::colPrefix() . Item\Option::index()]
+            'join' => [Item\Option::table(), Item\Option::index().' = '.Item\Param::colPrefix().Item\Option::index()]
         ],
         'offers' => [
             'type' => 'many',
@@ -196,7 +196,7 @@ 
         $curPrice = $price;
       } elseif (
               (!$price->type->roles && !$curPrice) ||
-              ($price->type->roles && !$curPrice && strpos($price->type->roles, "|" . \Users\User::$cur->role_id . "|") !== false)
+              ($price->type->roles && !$curPrice && strpos($price->type->roles, "|".\Users\User::$cur->role_id."|") !== false)
       ) {
         $curPrice = $price;
       }

system/modules/Money/objects/Sums.php

Spacing +7 added lines, -7 removed lines

@@ -55,21 +55,21 @@
       if ($first) {
         $first = false;
       } else {
-        $string.= '<br />';
+        $string .= '<br />';
       }
-      $string.= '<span style="white-space:nowrap;">';
-      $string.= number_format($sum, 2, '.', ' ');
+      $string .= '<span style="white-space:nowrap;">';
+      $string .= number_format($sum, 2, '.', ' ');
       if (\App::$cur->money) {
         $currency = \Money\Currency::get($currency_id);
         if ($currency) {
-          $string.= ' ' . $currency->acronym();
+          $string .= ' '.$currency->acronym();
         } else {
-          $string.= ' руб.';
+          $string .= ' руб.';
         }
       } else {
-        $string.= ' руб.';
+        $string .= ' руб.';
       }
-      $string.= '</span>';
+      $string .= '</span>';
     }
     return $string;
   }

system/modules/Ecommerce/appControllers/CartController.php

Spacing +13 added lines, -13 removed lines

@@ -61,7 +61,7 @@ 
             $warecount = $cartitem->price->offer->warehouseCount($cart->id);
             if ($cartitem->count > $warecount) {
               $error = true;
-              Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+              Msg::add('Вы заказали <b>'.$cartitem->item->name.'</b> больше чем есть на складе. на складе: <b>'.$warecount.'</b>', 'danger');
             }
           }
         }
@@ -73,7 +73,7 @@ 
           foreach ($deliverys[$cart->delivery_id]->fields as $field) {
             if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
               $error = 1;
-              Msg::add('Вы не указали: ' . $field->name);
+              Msg::add('Вы не указали: '.$field->name);
             }
           }
         }
@@ -89,7 +89,7 @@ 
         foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
           if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
             $error = 1;
-            Msg::add('Вы не указали: ' . $field->name);
+            Msg::add('Вы не указали: '.$field->name);
           }
         }
         if (!empty($_POST['discounts']['card_item_id'])) {
@@ -126,13 +126,13 @@ 
           }
           $cart = \Ecommerce\Cart::get($cart->id);
           if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
-            $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
-            $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
-            \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
+            $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/admin/ecommerce/Cart">Админ панель</a>';
+            $title = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
+            \Tools::sendMail('noreply@'.INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
           }
           if ($this->notifications) {
             $notification = new Notifications\Notification();
-            $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
+            $notification->name = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
             $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
             $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
             $notification->save();
@@ -177,10 +177,10 @@ 
         'href' => '/ecommerce/cart'
     ];
     $bread[] = [
-        'text' => 'Заказ: №' . $cart->id,
-        'href' => '/ecommerce/cart/orderDetail/' . $cart->id
+        'text' => 'Заказ: №'.$cart->id,
+        'href' => '/ecommerce/cart/orderDetail/'.$cart->id
     ];
-    $this->view->setTitle('Заказ №' . $cart->id);
+    $this->view->setTitle('Заказ №'.$cart->id);
     $this->view->page(['data' => compact('cart', 'bread')]);
   }
 
@@ -268,7 +268,7 @@ 
       $result->send();
     }
 
-    $item->sales ++;
+    $item->sales++;
     $item->save();
 
     if (empty($_GET['count']))
@@ -280,7 +280,7 @@ 
     $stages = Ecommerce\Cart\Stage::getList();
     if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
       $result->success = false;
-      $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
+      $result->content = 'На складе недостаточно товара! Доступно: '.$price->offer->warehouseCount();
       $result->send();
     }
 
@@ -298,7 +298,7 @@ 
     }
     $cart->date_last_activ = date('Y-m-d H:i:s');
     $cart->calc();
-    $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
+    $result->successMsg = '<a href="/ecommerce/view/'.$item->id.'">'.$item->name().($price->offer->name() ? ' ('.$price->offer->name().')' : '').'</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
     $result->send();
   }