injitools / cms-Inji

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);
     }
   }
 

system/modules/Ecommerce/models/Item.php

Spacing +10 added lines, -10 removed lines

@@ -71,7 +71,7 @@ 
             'size' => $_FILES['ActiveForm_simpleItem']['size']['Ecommerce\Item']['image'],
             'error' => $_FILES['ActiveForm_simpleItem']['error']['Ecommerce\Item']['image'],
                 ], [
-            'upload_code' => 'activeForm:' . 'Ecommerce\Item' . ':' . $item->pk(),
+            'upload_code' => 'activeForm:'.'Ecommerce\Item'.':'.$item->pk(),
             'accept_group' => 'image'
         ]);
         if ($file_id) {
@@ -168,7 +168,7 @@ 
                           'option' => ['type' => 'select', 'source' => 'model', 'model' => 'Ecommerce\Item\Offer\Option', 'label' => 'Свойство предложения'],
                           'value' => ['type' => 'dynamicType', 'typeSource' => 'selfMethod', 'selfMethod' => 'realType', 'label' => 'Значение'],
                       ]
-                  ],'label'=>'Параметры предложения'
+                  ], 'label'=>'Параметры предложения'
               ]
           ],
           'map' => [
@@ -225,17 +225,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.' ';
             }
           }
         }
@@ -246,9 +246,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.' ';
                 }
               }
             }
@@ -271,7 +271,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',
@@ -307,7 +307,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/Inji/Tools.php

Spacing +12 added lines, -12 removed lines

@@ -36,7 +36,7 @@ 
    */
   public static function uriParse($uri) {
     $answerPos = strpos($uri, '?');
-    $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1);
+    $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri))), 1);
 
     foreach ($params as $key => $param) {
       if ($param != '') {
@@ -61,7 +61,7 @@ 
     $path = explode('/', $path);
     $cur = '';
     foreach ($path as $item) {
-      $cur .= $item . '/';
+      $cur .= $item.'/';
       if (!file_exists($cur)) {
         mkdir($cur);
       }
@@ -81,7 +81,7 @@ 
    */
   public static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center') {
     ini_set("gd.jpeg_ignore_warning", 1);
-    list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path);
+    list($img_width, $img_height, $img_type, $img_tag) = getimagesize($img_path);
     switch ($img_type) {
       case 1:
         $img_type = 'gif';
@@ -107,14 +107,14 @@ 
 
     if ($crop === true || $crop == 'q') {
       if ($img_width > $img_height) {
-        $imgX = floor(( $img_width - $img_height ) / 2);
+        $imgX = floor(($img_width - $img_height) / 2);
         $imgY = 0;
         $img_width = $img_height;
         $new_width = $max_width;
         $new_height = $max_height;
       } else {
         $imgX = 0;
-        $imgY = floor(( $img_height - $img_width ) / 2);
+        $imgY = floor(($img_height - $img_width) / 2);
         $img_height = $img_width;
         $new_width = $max_width;
         $new_height = $max_height;
@@ -135,7 +135,7 @@ 
       $new_width = $max_width;
       $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-      $imgX = (int) (($ow / 2) - ($img_width / 2) );
+      $imgX = (int) (($ow / 2) - ($img_width / 2));
       if ($pos == 'center') {
         $imgY = (int) (($oh / 2) - ($img_height / 2));
       } else {
@@ -208,7 +208,7 @@ 
     if (!headers_sent()) {
       header("Location: {$href}");
     } else {
-      echo '\'"><script>window.location="' . $href . '";</script>';
+      echo '\'"><script>window.location="'.$href.'";</script>';
     }
     exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
   }
@@ -266,7 +266,7 @@ 
       $pathArray = $cleanPathArray;
       $cleanPathArray = [];
     } while ($changes);
-    return (strpos($path, '/') === 0 ? '/' : '') . implode('/', $pathArray);
+    return (strpos($path, '/') === 0 ? '/' : '').implode('/', $pathArray);
   }
 
   /**
@@ -286,7 +286,7 @@ 
     if (empty($month[$mm - 1])) {
       return 'Не указано';
     }
-    return ($dd > 0 ? $dd . " " : '') . $month[$mm - 1] . " " . $yy . " " . $hours;
+    return ($dd > 0 ? $dd." " : '').$month[$mm - 1]." ".$yy." ".$hours;
   }
 
   /**
@@ -364,10 +364,10 @@ 
       if (in_array($file, ['.', '..'])) {
         continue;
       }
-      if (is_dir($from . '/' . $file)) {
-        self::copyFiles($from . '/' . $file, $to . '/' . $file);
+      if (is_dir($from.'/'.$file)) {
+        self::copyFiles($from.'/'.$file, $to.'/'.$file);
       } else {
-        copy($from . '/' . $file, $to . '/' . $file);
+        copy($from.'/'.$file, $to.'/'.$file);
       }
     }
   }

system/modules/Files/Files.php

Spacing +14 added lines, -14 removed lines

@@ -46,21 +46,21 @@ 
       }
     }
     $fileObject->name = $fileinfo['filename'];
-    $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-    if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+    $fileObject->path = $type->type_dir.date('Y-m-d').'/'.microtime(true).'.'.$fileinfo['extension'];
+    if ($fileObject->id && file_exists($sitePath.$fileObject->path))
+      unlink($sitePath.$fileObject->path);
 
-    Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+    Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
-    if (!move_uploaded_file($file['tmp_name'], $sitePath . $fileObject->path)) {
+    if (!move_uploaded_file($file['tmp_name'], $sitePath.$fileObject->path)) {
       return false;
     }
 
     if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
       $typeOptions = json_decode($type->options, true);
-      list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+      list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath.$fileObject->path);
       if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
-        Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
+        Tools::resizeImage($sitePath.$fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
       }
     }
 
@@ -104,25 +104,25 @@ 
       }
     }
     $fileObject->name = $fileinfo['filename'];
-    $fileObject->path = $type->type_dir . date('Y-m-d') . '/' . microtime(true) . '.' . $fileinfo['extension'];
-    if ($fileObject->id && file_exists($sitePath . $fileObject->path))
-      unlink($sitePath . $fileObject->path);
+    $fileObject->path = $type->type_dir.date('Y-m-d').'/'.microtime(true).'.'.$fileinfo['extension'];
+    if ($fileObject->id && file_exists($sitePath.$fileObject->path))
+      unlink($sitePath.$fileObject->path);
 
-    Tools::createDir($sitePath . $type->type_dir . date('Y-m-d') . '/');
+    Tools::createDir($sitePath.$type->type_dir.date('Y-m-d').'/');
 
     $file = @file_get_contents($url);
     if ($file === false) {
       return 0;
     }
-    if (!file_put_contents($sitePath . $fileObject->path, $file)) {
+    if (!file_put_contents($sitePath.$fileObject->path, $file)) {
       return 0;
     }
 
     if ($type->allow_resize && $type->options && json_decode($type->options, true)) {
       $typeOptions = json_decode($type->options, true);
-      list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($sitePath . $fileObject->path);
+      list($img_width, $img_height, $img_type, $img_tag) = getimagesize($sitePath.$fileObject->path);
       if ($img_height > $typeOptions['max_height'] || $img_width > $typeOptions['max_width']) {
-        Tools::resizeImage($sitePath . $fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
+        Tools::resizeImage($sitePath.$fileObject->path, $typeOptions['max_width'], $typeOptions['max_height']);
       }
     }
 

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

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if (!$dataManager->checkAccess()) {
-    echo 'you not have access to "' . $dataManager->modelName . '" manager with name: "' . $dataManager->managerName . '"';
+    echo 'you not have access to "'.$dataManager->modelName.'" manager with name: "'.$dataManager->managerName.'"';
     return false;
 }
 ?>
@@ -45,7 +45,7 @@ 
             }
             continue;
         }
-        if(++$i && !($i%2)){
+        if (++$i && !($i % 2)) {
           echo '</div><div class="row">';
         }
         echo '<div class="col-md-6">';
@@ -73,7 +73,7 @@ 
                             $options = [
                                 'where' => !empty($filters['getRows']['where']) ? $filters['getRows']['where'] : ''
                             ];
-                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix() . 'name'])) {
+                            if (isset($cols[$relations[$colInfo['colParams']['relation']]['model']::colPrefix().'name'])) {
                                 $options['order'] = 'name';
                             }
                             $items = $relations[$colInfo['colParams']['relation']]['model']::getList($options);

system/modules/Materials/models/Material.php

Spacing +3 added lines, -3 removed lines

@@ -134,14 +134,14 @@
       $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
       foreach ($categorys as $category) {
         if ($category->alias) {
-          $href .="/{$category->alias}";
+          $href .= "/{$category->alias}";
         }
       }
     }
     if ((!$href || $href == '/materials') && !$this->alias) {
-      return ($href ? $href : '/materials') . '/view/' . $this->pk();
+      return ($href ? $href : '/materials').'/view/'.$this->pk();
     }
-    return $href . "/" . ($this->alias ? $this->alias : $this->pk());
+    return $href."/".($this->alias ? $this->alias : $this->pk());
   }
 
   public function resolveTemplate() {