injitools / cms-Inji

system/modules/Dashboard/Dashboard.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
         $modelName = $item->model;
         $relItem = $modelName::get($item->$col);
         if ($relItem) {
-            return "<a href='/admin/" . str_replace('\\', '/view/', $modelName) . "/" . $item->$col . "'>" . $relItem->name() . "</a>";
+            return "<a href='/admin/".str_replace('\\', '/view/', $modelName)."/".$item->$col."'>".$relItem->name()."</a>";
         }
         return 'Ресурс удален';
     }

system/modules/Chats/widgets/chat.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
     echo 'Чат не найден';
     return;
 }
-$id = 'chat-' . Tools::randomString();
+$id = 'chat-'.Tools::randomString();
 $msgTemplate = '<div class="chats-chat-message"><b title="message-date_create user-fullName">user-firstName</b>: message-text</div>';
 $events = $chat->events(['order' => ['date_create', 'DESC'], 'key' => false]);
 $lastDate = $events ? $events[0]->date_create : 0;

system/modules/Recaptcha/Recaptcha.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     {
         $data['secret'] = $this->config['secret'];
         $data['response'] = $gResponse;
-        $response = file_get_contents('https://www.google.com/recaptcha/api/siteverify?' . http_build_query($data));
+        $response = file_get_contents('https://www.google.com/recaptcha/api/siteverify?'.http_build_query($data));
         if ($response) {
             return json_decode($response);
         }

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.php

Spacing +2 added lines, -2 removed lines

@@ -62,9 +62,9 @@
                         if ($param->type == 'custom') {
                             $parserName = $param->value;
                         } else {
-                            $parserName = '\Migrations\Parser\Object\\' . ucfirst($param->type);
+                            $parserName = '\Migrations\Parser\Object\\'.ucfirst($param->type);
                         }
-                        if (!in_array($parserName, ['\Migrations\Parser\Object\ObjectLink','Exchange1c\Parser\Item\Images', '\Migrations\Parser\Object\Value', '\Migrations\Parser\Object\Relation', '\Migrations\Parser\Object\ParamsList'])) {
+                        if (!in_array($parserName, ['\Migrations\Parser\Object\ObjectLink', 'Exchange1c\Parser\Item\Images', '\Migrations\Parser\Object\Value', '\Migrations\Parser\Object\Relation', '\Migrations\Parser\Object\ParamsList'])) {
                             var_dump($parserName);
                             exit();
                         }

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/Migrations/objects/Parser/Object/Value.php

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
                 $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
                 if ($this->model->{$this->param->value}) {
                     $file = \Files\File::get($this->model->{$this->param->value});
-                    if ($file && $value && file_exists($dir . '/' . $value) && file_exists(\App::$primary->path . $file->path) && md5_file($dir . '/' . $value) == md5_file(\App::$primary->path . $file->path)) {
+                    if ($file && $value && file_exists($dir.'/'.$value) && file_exists(\App::$primary->path.$file->path) && md5_file($dir.'/'.$value) == md5_file(\App::$primary->path.$file->path)) {
                         $notEq = false;
                     }
                     if ($file && $notEq) {
@@ -81,11 +81,11 @@ 
                     }
                 }
                 if ($notEq) {
-                    $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir . '/' . $value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
+                    $this->model->{$this->param->value} = \App::$primary->files->uploadFromUrl($dir.'/'.$value, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
                 }
                 break;
             default:
-                if(is_array($value)){
+                if (is_array($value)) {
                     $value = implode(' ', $value);
                 }
                 $this->model->{$this->param->value} = $value;

system/modules/StaticLoader/StaticLoader.php

Spacing +20 added lines, -20 removed lines

@@ -25,16 +25,16 @@ 
             $path = substr($path, 1);
         }
         $app = substr($path, 0, strpos($path, '/'));
-        if (file_exists(INJI_SYSTEM_DIR . '/program/' . $app)) {
+        if (file_exists(INJI_SYSTEM_DIR.'/program/'.$app)) {
             $path = substr($path, strpos($path, '/') + 1);
             if (\App::$cur->name != $app) {
                 $scriptApp = new App();
                 $scriptApp->name = $app;
                 $scriptApp->system = true;
-                $scriptApp->staticPath = "/" . $scriptApp->name . "/static";
-                $scriptApp->templatesPath = "/" . $scriptApp->name . "/static/templates";
-                $scriptApp->path = INJI_SYSTEM_DIR . '/program/' . $scriptApp->name;
-                $scriptApp->type = 'app' . ucfirst(strtolower($scriptApp->name));
+                $scriptApp->staticPath = "/".$scriptApp->name."/static";
+                $scriptApp->templatesPath = "/".$scriptApp->name."/static/templates";
+                $scriptApp->path = INJI_SYSTEM_DIR.'/program/'.$scriptApp->name;
+                $scriptApp->type = 'app'.ucfirst(strtolower($scriptApp->name));
                 $scriptApp->installed = true;
                 $scriptApp->params = [];
                 $scriptApp->config = Config::app($scriptApp);
@@ -52,13 +52,13 @@ 
         $type = substr($path, 0, strpos($path, '/'));
         switch ($type) {
             case 'libs':
-                return App::$cur->Libs->getPath(array_slice(explode('/', $path),2));
+                return App::$cur->Libs->getPath(array_slice(explode('/', $path), 2));
             case 'templates':
                 $path = substr($path, strpos($path, '/') + 1);
-                return $scriptApp->view->templatesPath . '/' . $path;
+                return $scriptApp->view->templatesPath.'/'.$path;
             case 'system':
                 $path = substr($path, strpos($path, '/') + 1);
-                return INJI_SYSTEM_DIR . '/static/' . $path;
+                return INJI_SYSTEM_DIR.'/static/'.$path;
             case 'moduleAsset':
                 $path = substr($path, strpos($path, '/') + 1);
                 if (!strpos($path, '/')) {
@@ -71,11 +71,11 @@ 
                 }
                 $path = substr($path, strpos($path, '/') + 1);
                 if (is_callable([$module, 'staticCalled'])) {
-                    return $scriptApp->$module->staticCalled($path, $scriptApp->$module->path . '/static/');
+                    return $scriptApp->$module->staticCalled($path, $scriptApp->$module->path.'/static/');
                 }
-                return $scriptApp->$module->path . '/static/' . $path;
+                return $scriptApp->$module->path.'/static/'.$path;
             default:
-                return $scriptApp->path . '/static/' . $path;
+                return $scriptApp->path.'/static/'.$path;
         }
     }
 
@@ -138,9 +138,9 @@ 
                         $pos = $_GET['resize_pos'];
                     }
                     $dirnoslash = str_replace('/', '', substr($fileinfo['dirname'], strpos($fileinfo['dirname'], '/static')));
-                    $path = $dir . '/static/cache/' . $dirnoslash . $fileinfo['filename'] . '.' . $sizes[0] . 'x' . $sizes[1] . $crop . $pos . '.' . $fileinfo['extension'];
+                    $path = $dir.'/static/cache/'.$dirnoslash.$fileinfo['filename'].'.'.$sizes[0].'x'.$sizes[1].$crop.$pos.'.'.$fileinfo['extension'];
                     if (!file_exists($path)) {
-                        Tools::createDir($dir . '/static/cache/');
+                        Tools::createDir($dir.'/static/cache/');
                         copy($file, $path);
                         Tools::resizeImage($path, $sizes[0], $sizes[1], $crop, $pos);
                     }
@@ -165,9 +165,9 @@ 
         header("Cache-control: public");
         header("Accept-Ranges: bytes");
         header("Pragma: public");
-        header("Content-Length: " . filesize($file));
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($file)) . ' GMT');
-        header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 60 * 60 * 24 * 256) . ' GMT');
+        header("Content-Length: ".filesize($file));
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s', filemtime($file)).' GMT');
+        header('Expires: '.gmdate('D, d M Y H:i:s', time() + 60 * 60 * 24 * 256).' GMT');
         if (filemtime($file) <= $modifiedSince && (!isset($_SERVER['HTTP_CACHE_CONTROL']) || $_SERVER['HTTP_CACHE_CONTROL'] != 'no-cache')) {
             // Разгружаем канал передачи данных!
             header('HTTP/1.1 304 Not Modified');
@@ -178,19 +178,19 @@ 
         header('Content-Description: File Transfer');
         //}
         if (isset($this->mimes[strtolower($fileinfo['extension'])])) {
-            header("Content-Type: " . $this->mimes[strtolower($fileinfo['extension'])]);
+            header("Content-Type: ".$this->mimes[strtolower($fileinfo['extension'])]);
         }
 
         if (isset($_GET['frustrate_dl']) || in_array($fileinfo['extension'], array('doc', 'docx', 'xls', 'xlsx'))) {
 
-            $fileName = $fileinfo['filename'] . '.' . $fileinfo['extension'];
+            $fileName = $fileinfo['filename'].'.'.$fileinfo['extension'];
             if (App::$cur->db->connect) {
-                $fileObj = Files\File::get([ 'path', '%/' . $fileinfo['filename'] . '.' . $fileinfo['extension'], 'LIKE']);
+                $fileObj = Files\File::get(['path', '%/'.$fileinfo['filename'].'.'.$fileinfo['extension'], 'LIKE']);
                 if ($fileObj) {
                     $fileName = $fileObj->original_name;
                 }
             }
-            header('Content-Disposition: attachment; filename="' . $fileName . '"');
+            header('Content-Disposition: attachment; filename="'.$fileName.'"');
         }
 
         header('Content-Transfer-Encoding: binary');