injitools / cms-Inji

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/widgets/Form/dynamicList.php

Spacing +3 added lines, -3 removed lines

@@ -21,9 +21,9 @@ 
               echo $col['col']['label'];
               if (!empty($col['col']['model'])) {
                 $modelName = $col['col']['model'];
-                $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));return false;';
-                echo ' (<a href="" onclick="' . $onclick . ';this.disabled=true;return false;">Создать</a>)';
+                echo ' (<a href="" onclick="'.$onclick.';this.disabled=true;return false;">Создать</a>)';
               }
               echo "</th>";
             }
@@ -42,7 +42,7 @@ 
                 echo '<td>';
                 $col['options']['noContainer'] = true;
                 $col['options']['value'] = $row[$colName];
-                $form->input($col['type'], $name . '[' . ($i) . '][' . $colName . ']', false, $col['options']);
+                $form->input($col['type'], $name.'['.($i).']['.$colName.']', false, $col['options']);
                 echo '</td>';
               }
               echo '<td class="actionTd"><a class="btn btn-danger btn-xs" onclick="inji.Ui.forms.delRowFromList(this);"><i class="glyphicon glyphicon-remove"></i></a></td>';

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

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
     switch ($this->colParams['source']) {
       case'options':
         foreach ($this->colParams['options']['inputs'] as $colName => $col) {
-          $inputClassName = '\Ui\ActiveForm\Input\\' . ucfirst($col['type']);
+          $inputClassName = '\Ui\ActiveForm\Input\\'.ucfirst($col['type']);
           $input = new $inputClassName();
           $input->form = $this->form;
           $input->activeForm = $this->activeForm;

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

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
   }
 
   public function colName() {
-    return "{$this->activeForm->requestFormName}[{$this->activeForm->modelName}]".(stristr($this->colName, '[')?$this->colName:"[{$this->colName}]");
+    return "{$this->activeForm->requestFormName}[{$this->activeForm->modelName}]".(stristr($this->colName, '[') ? $this->colName : "[{$this->colName}]");
   }
 
   public function colLabel() {
@@ -96,7 +96,7 @@ 
 
   public function validate(&$request) {
     if (empty($request[$this->colName]) && !empty($this->colParams['required'])) {
-      throw new \Exception('Вы не заполнили: ' . $this->colLabel());
+      throw new \Exception('Вы не заполнили: '.$this->colLabel());
     }
     if (!empty($this->colParams['validator'])) {
       $modelName = $this->modelName;

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