injitools / cms-Inji

system/modules/Migrations/appAdminControllers/content/Map/index.php

Spacing +11 added lines, -11 removed lines

@@ -4,7 +4,7 @@ 
 $form->begin('Карта миграции');
 function drawPath($path, $form, $models, $objects)
 {
-    $form->input('select', 'type[' . $path->id . ']', $path->item, [
+    $form->input('select', 'type['.$path->id.']', $path->item, [
         'values' => [
     '' => 'Выберите',
     'continue' => 'Пропустить',
@@ -12,7 +12,7 @@ 
     'object' => [
         'text' => 'Объект',
         'input' => [
-            'name' => 'typeOptions[' . $path->id . ']',
+            'name' => 'typeOptions['.$path->id.']',
             'type' => 'select',
             'source' => 'array',
             'sourceArray' => $models
@@ -49,7 +49,7 @@ 
     if (empty($objectsCols[$param->object_id])) {
         $modelName = $param->object->model;
         foreach (array_keys($modelName::$cols) as $colName) {
-            $objectsCols[$param->object_id][$colName] = !empty($modelName::$labels[$colName])?$modelName::$labels[$colName]:$colName;
+            $objectsCols[$param->object_id][$colName] = !empty($modelName::$labels[$colName]) ? $modelName::$labels[$colName] : $colName;
         }
     }
     $modelName = $param->object->model;
@@ -58,7 +58,7 @@ 
         $relations[$relName] = $relName;
     }
     if ($parent) {
-        $parserName = '\Migrations\Parser\Object\\' . ucfirst($parent->type);
+        $parserName = '\Migrations\Parser\Object\\'.ucfirst($parent->type);
         $parser = new $parserName;
         $parser->param = $parent;
         $values = $parser->editor();
@@ -72,7 +72,7 @@ 
             'value' => [
                 'text' => 'Значение',
                 'input' => [
-                    'name' => 'paramOptions[' . $param->id . ']',
+                    'name' => 'paramOptions['.$param->id.']',
                     'type' => 'select',
                     'source' => 'array',
                     'sourceArray' => $objectsCols[$param->object_id],
@@ -84,7 +84,7 @@ 
             'relation' => [
                 'text' => 'Зависимость',
                 'input' => [
-                    'name' => 'paramOptions[' . $param->id . ']',
+                    'name' => 'paramOptions['.$param->id.']',
                     'type' => 'select',
                     'source' => 'array',
                     'sourceArray' => $relations,
@@ -96,7 +96,7 @@ 
             'object' => [
                 'text' => 'Объект',
                 'input' => [
-                    'name' => 'paramOptions[' . $param->id . ']',
+                    'name' => 'paramOptions['.$param->id.']',
                     'type' => 'select',
                     'source' => 'array',
                     'sourceArray' => $selectArrays[$param->object->migration_id],
@@ -108,7 +108,7 @@ 
             'objectLink' => [
                 'text' => 'Ссылка на объект',
                 'input' => [
-                    'name' => 'paramOptions[' . $param->id . ']',
+                    'name' => 'paramOptions['.$param->id.']',
                     'type' => 'select',
                     'source' => 'array',
                     'sourceArray' => $selectArrays[$param->object->migration_id],
@@ -120,7 +120,7 @@ 
             'newObject' => [
                 'text' => 'Новый объект',
                 'input' => [
-                    'name' => 'paramOptions[' . $param->id . ']',
+                    'name' => 'paramOptions['.$param->id.']',
                     'type' => 'select',
                     'source' => 'array',
                     'sourceArray' => $models,
@@ -132,7 +132,7 @@ 
             'custom' => [
                 'text' => 'Свой класс обработки',
                 'input' => [
-                    'name' => 'paramOptions[' . $param->id . ']',
+                    'name' => 'paramOptions['.$param->id.']',
                     'type' => 'text',
                     'options' => [
                         'value' => $param->value
@@ -141,7 +141,7 @@ 
             ]
         ];
     }
-    $form->input('select', 'param[' . $param->id . ']', $param->code, ['values' => $values,
+    $form->input('select', 'param['.$param->id.']', $param->code, ['values' => $values,
         'value' => $param->type
     ]);
     foreach ($param->childs as $child) {

system/modules/Migrations/objects/Walker.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,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/Migrations/objects/Parser/Object/ParamsList.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
                 if ($param->type == 'custom') {
                     $parserName = $param->value;
                 } else {
-                    $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
+                    $parserName = '\Migrations\Parser\Object\\'.ucfirst($param->type);
                 }
                 if (!\Tools::isAssoc($this->data)) {
                     foreach ($this->data as $data) {

system/modules/Notifications/install_script.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
     App::$cur->db->createTable('notifications_notification', [
         'notification_id' => 'pk',
         'notification_chanel_id' => 'int(11) UNSIGNED NOT NULL',
@@ -29,8 +29,8 @@ 
         'subscriber_device_subscriber_id' => 'int(11) UNSIGNED NOT NULL',
         'subscriber_device_date_last_check' => 'timestamp NOT NULL DEFAULT 0',
         'subscriber_device_date_create' => 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP',
-    ],[
-        'UNIQUE INDEX ' . App::$cur->db->table_prefix . 'notifications_subscriber_device_subscriber_device_key (subscriber_device_key)'
+    ], [
+        'UNIQUE INDEX '.App::$cur->db->table_prefix.'notifications_subscriber_device_subscriber_device_key (subscriber_device_key)'
     ]);
     App::$cur->db->createTable('notifications_subscribe', [
         'subscribe_id' => 'pk',

system/modules/Apps/appSetupControllers/AppsController.php

Spacing +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
         $app = new App();
         $app->name = $appOptions->name;
         $app->system = true;
-        $app->staticPath = "/" . $appOptions->dir . "/static";
-        $app->templatesPath = "/" . $appOptions->dir . "/static/templates";
-        $app->path = INJI_PROGRAM_DIR . '/' . $appOptions->dir;
+        $app->staticPath = "/".$appOptions->dir."/static";
+        $app->templatesPath = "/".$appOptions->dir."/static/templates";
+        $app->path = INJI_PROGRAM_DIR.'/'.$appOptions->dir;
         $app->type = 'app';
         $app->installed = true;
         $app->params = [];

system/modules/Ui/Controllers/UiController.php

Spacing +5 added lines, -5 removed lines

@@ -38,17 +38,17 @@
             $return = new Server\Result();
             ob_start();
             $form->checkRequest($params, true);
-            $_GET['item'] = get_class($form->model) . ($model->pk() ? ':' . $model->pk() : '');
-            $form->action = (App::$cur->system ? '/' . App::$cur->name : '') . '/ui/formPopUp/?' . http_build_query($_GET);
+            $_GET['item'] = get_class($form->model).($model->pk() ? ':'.$model->pk() : '');
+            $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() : '');
-            $form->action = (App::$cur->system ? '/' . App::$cur->name : '') . '/ui/formPopUp/?' . http_build_query($_GET);
-            $this->view->setTitle(($model && $model->pk() ? 'Изменить ' : 'Создать ') . $form->header);
+            $_GET['item'] = get_class($form->model).($model->pk() ? ':'.$model->pk() : '');
+            $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/Ui/Controllers/ActiveFormController.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
             foreach ($inputs[$inputName]['cols'] as $col) {
                 $part = trim($part);
                 if ($part && strlen($part) > 2) {
-                    $colWhere[] = [$col, '%' . $part . '%', 'LIKE', $first ? 'AND' : 'OR'];
+                    $colWhere[] = [$col, '%'.$part.'%', 'LIKE', $first ? 'AND' : 'OR'];
                     $first = false;
                 }
             }

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

Spacing +4 added lines, -4 removed lines

@@ -12,7 +12,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"';
     }
@@ -22,7 +22,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>";
     }
@@ -39,14 +39,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 +2 added lines, -2 removed lines

@@ -34,7 +34,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>';
@@ -63,7 +63,7 @@ 
     foreach ($options['cols'] as $colName => $col) {
         echo '<td>';
         $col['options']['noContainer'] = true;
-        $form->input($col['type'], $name . '[counterPlaceholder][' . $colName . ']', false, $col['options']);
+        $form->input($col['type'], $name.'[counterPlaceholder]['.$colName.']', false, $col['options']);
         echo '</td>';
     }
     ?>