injitools / cms-Inji

system/modules/Ecommerce/appControllers/EcommerceController.php

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
       foreach ($fields as $field) {
         if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
           $error = 1;
-          Msg::add('Вы не указали: ' . $field->name);
+          Msg::add('Вы не указали: '.$field->name);
         }
       }
       if (!$error) {
@@ -70,7 +70,7 @@ 
         $extra->price = $card->price;
         $extra->count = 1;
         $extra->cart_id = $cart->id;
-        $extra->info = 'card:' . $card->id . '|cardItem:' . $cardItem->id;
+        $extra->info = 'card:'.$card->id.'|cardItem:'.$cardItem->id;
         $extra->save();
         Tools::redirect('/ecommerce/cart/success');
       }
@@ -84,7 +84,7 @@ 
       $items = $this->ecommerce->getItems();
       $return = [];
       foreach ($items as $item) {
-        $return[] = ['name' => $item->name(), 'search' => $item->search_index . ' ' . $item->name];
+        $return[] = ['name' => $item->name(), 'search' => $item->search_index.' '.$item->name];
       }
       $return = json_encode($return);
       Cache::set('itemsAutocomplete', [], $return);
@@ -158,7 +158,7 @@ 
       $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
       foreach ($categoryIds as $id) {
         $cat = Ecommerce\Category::get($id);
-        $bread[] = array('text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id);
+        $bread[] = array('text' => $cat->name, 'href' => '/ecommerce/itemList/'.$cat->id);
       }
       $bread[] = array('text' => $category->name);
       $this->view->setTitle($category->name);
@@ -223,7 +223,7 @@ 
     foreach ($catalogIds as $id) {
       $cat = Ecommerce\Category::get($id);
       if ($cat) {
-        $bread[] = ['text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id];
+        $bread[] = ['text' => $cat->name, 'href' => '/ecommerce/itemList/'.$cat->id];
       }
     }
     $bread[] = ['text' => $item->name()];
@@ -239,9 +239,9 @@ 
     $this->view->addMetaTag(['property' => 'og:title', 'content' => $item->name]);
     $this->view->addMetaTag(['property' => 'og:description', 'content' => $item->description]);
     if ($item->image) {
-      $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . INJI_DOMAIN_NAME . $item->image->path]);
+      $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.INJI_DOMAIN_NAME.$item->image->path]);
     }
-    $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . INJI_DOMAIN_NAME . '/view/' . $item->id]);
+    $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://'.INJI_DOMAIN_NAME.'/view/'.$item->id]);
 
     $this->view->page($options);
   }

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

Spacing +4 added lines, -4 removed lines

@@ -15,7 +15,7 @@ 
 
   public function process() {
     echo "zip=no\n";
-    echo 'file_limit=' . \Tools::toBytes(ini_get('post_max_size'));
+    echo 'file_limit='.\Tools::toBytes(ini_get('post_max_size'));
     $this->end();
 
     //clean files
@@ -23,9 +23,9 @@ 
       $query = \App::$cur->db->newQuery();
       $query->operation = 'select';
       $query->table = \Exchange1c\Exchange\File::table();
-      $query->cols = \Exchange1c\Exchange\File::colPrefix() . 'id';
+      $query->cols = \Exchange1c\Exchange\File::colPrefix().'id';
       $queryArr = $query->buildQuery();
-      $queryArr['query'].=' where `' . \Exchange1c\Exchange\File::colPrefix() . 'deleted` = 0 AND  `' . \Exchange1c\Exchange\File::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval'];
+      $queryArr['query'] .= ' where `'.\Exchange1c\Exchange\File::colPrefix().'deleted` = 0 AND  `'.\Exchange1c\Exchange\File::colPrefix().'date_create` < NOW() - INTERVAL '.\App::$cur->exchange1c->config['maxSaveFilesInterval'];
       try {
         $ids = array_keys($query->query($queryArr)->getArray(\Exchange1c\Exchange\File::colPrefix().'id'));
       } catch (\PDOException $exc) {
@@ -34,7 +34,7 @@ 
         } elseif ($exc->getCode() == '42S22') {
           $cols = \Exchange1c\Exchange\File::cols();
           foreach (\Exchange1c\Exchange\File::$cols as $colName => $params) {
-            if (!isset($cols[\Exchange1c\Exchange\File::colPrefix() . $colName])) {
+            if (!isset($cols[\Exchange1c\Exchange\File::colPrefix().$colName])) {
               \Exchange1c\Exchange\File::createCol($colName);
             }
           }

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

Spacing +5 added lines, -5 removed lines

@@ -25,20 +25,20 @@
     $filename = \Tools::parsePath($_GET['filename']);
     if (strpos($filename, '/') !== false) {
       $subDir = substr($filename, 0, strrpos($filename, "/") + 1);
-      \Tools::createDir($dir . '/' . $subDir);
+      \Tools::createDir($dir.'/'.$subDir);
     }
     $text = '';
-    if (false === file_put_contents($dir . '/' . $filename, file_get_contents("php://input"))) {
-      $text = 'Fail on save file: ' . $filename;
+    if (false === file_put_contents($dir.'/'.$filename, file_get_contents("php://input"))) {
+      $text = 'Fail on save file: '.$filename;
       $file->status = 'failure';
     } else {
-      $file->size = ceil(filesize($dir . '/' . $filename));
+      $file->size = ceil(filesize($dir.'/'.$filename));
       $file->name = $filename;
       $file->status = 'success';
     }
     $file->save();
     if (strpos($filename, '1cbitrix') !== false) {
-      $data = new \SimpleXMLElement(file_get_contents($dir . '/' . $filename));
+      $data = new \SimpleXMLElement(file_get_contents($dir.'/'.$filename));
       $orders = new \Exchange1c\Parser\Orders($data);
       $orders->process();
     }

system/modules/Exchange1c/models/Exchange/File.php

Spacing +2 added lines, -2 removed lines

@@ -30,8 +30,8 @@
   ];
 
   public function deleteFile() {
-    if ($this->exchange && file_exists($this->exchange->path . '/' . $this->name)) {
-      unlink($this->exchange->path . '/' . $this->name);
+    if ($this->exchange && file_exists($this->exchange->path.'/'.$this->name)) {
+      unlink($this->exchange->path.'/'.$this->name);
     }
     $this->deleted = 1;
     $this->save();

system/modules/Migrations/objects/Walker.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
           $walker->migration = $this->migration;
           $walker->map = $this->map;
           $walker->data = &$this->data[$path->item];
-          $walker->curPath = $this->curPath . $path->item . '/';
+          $walker->curPath = $this->curPath.$path->item.'/';
           $walker->mapPath = $path;
           $walker->mapPathParent = $this->mapPath;
           $walker->migtarionLog = $this->migtarionLog;

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

Spacing +6 added lines, -6 removed lines

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

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

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,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>";
   }
@@ -33,7 +33,7 @@ 
 <?= $label !== false ? "<label>{$label}" : ''; ?>
 <?php
 if ($label !== false && !empty($options['createBtn'])) {
-  echo ' (<a href="" onclick="' . $options['createBtn']['onclick'] . ';this.disabled=true;return false;">' . $options['createBtn']['text'] . '</a>)';
+  echo ' (<a href="" onclick="'.$options['createBtn']['onclick'].';this.disabled=true;return false;">'.$options['createBtn']['text'].'</a>)';
 }
 ?>
 <?= $label !== false ? "</label>" : ''; ?>
@@ -46,14 +46,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.php

Spacing +9 added lines, -9 removed lines

@@ -47,7 +47,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();
       }
@@ -82,7 +82,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])) {
@@ -95,7 +95,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;
@@ -126,7 +126,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;
@@ -171,7 +171,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();
           }
@@ -186,7 +186,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'] : []);
@@ -197,7 +197,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;
@@ -273,7 +273,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/Ecommerce/appAdminControllers/EcommerceController.php

Spacing +2 added lines, -2 removed lines

@@ -75,8 +75,8 @@
         unset($items[$key]);
         unset($item);
       }
-      echo 'Происходит процесс индексации: проиндексировано ' . $i * $count;
-      Tools::redirect('/admin/ecommerce/reSearchIndex/' . $i);
+      echo 'Происходит процесс индексации: проиндексировано '.$i * $count;
+      Tools::redirect('/admin/ecommerce/reSearchIndex/'.$i);
     }
   }