injitools / cms-Inji

system/modules/Files/Files.php

Spacing +10 added lines, -10 removed lines

@@ -46,13 +46,13 @@ 
             }
         }
         $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;
 
         $fileObject->type_id = $type->pk();
@@ -96,17 +96,17 @@ 
             }
         }
         $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;
         }
-        file_put_contents($sitePath . $fileObject->path, $file);
+        file_put_contents($sitePath.$fileObject->path, $file);
 
         $fileObject->type_id = $type->pk();
         $fileObject->original_name = $fileinfo['basename'];

system/modules/Modules/appAdminControllers/content/editor.php

Spacing +10 added lines, -10 removed lines

@@ -12,22 +12,22 @@ 
     'Операции'
 ]);
 $modulePath = Module::getModulePath($module);
-$path = $modulePath . '/models';
-$config = Config::custom(App::$primary->path . '/modules/' . $module . '/generatorHash.php');
+$path = $modulePath.'/models';
+$config = Config::custom(App::$primary->path.'/modules/'.$module.'/generatorHash.php');
 if (file_exists($path)) {
     $files = array_slice(scandir($path), 2);
     foreach ($files as $file) {
-        if (is_dir($path . '/' . $file)) {
+        if (is_dir($path.'/'.$file)) {
             continue;
         }
         $modelName = pathinfo($file, PATHINFO_FILENAME);
         $table->addRow([
             $modelName,
-            (!empty($config['models/' . $file]) && $config['models/' . $file] == md5(file_get_contents($path . '/' . $file))) ? '<b class="text-success">Нету</b>' : '<b class="text-danger">Есть</b>',
+            (!empty($config['models/'.$file]) && $config['models/'.$file] == md5(file_get_contents($path.'/'.$file))) ? '<b class="text-success">Нету</b>' : '<b class="text-danger">Есть</b>',
             [
                 'class' => 'actionTd',
-                'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/editModel/' . $module . '/' . $modelName . '"><i class="glyphicon glyphicon-edit"></i></a>'
-                . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delModel/' . $module . '/' . $modelName . '"><i class="glyphicon glyphicon-remove"></i></a>'
+                'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/editModel/'.$module.'/'.$modelName.'"><i class="glyphicon glyphicon-edit"></i></a>'
+                . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delModel/'.$module.'/'.$modelName.'"><i class="glyphicon glyphicon-remove"></i></a>'
             ]
         ]);
     }
@@ -50,16 +50,16 @@ 
     'Controllers'
 ];
 foreach ($types as $type) {
-    if (file_exists($modulePath . '/' . $type)) {
-        $files = array_slice(scandir($modulePath . '/' . $type), 2);
+    if (file_exists($modulePath.'/'.$type)) {
+        $files = array_slice(scandir($modulePath.'/'.$type), 2);
         foreach ($files as $file) {
             $table->addRow([
                 pathinfo($file, PATHINFO_FILENAME),
                 $type,
                 [
                     'class' => 'actionTd',
-                    'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/controllerEditor/' . $module . '/' . $type . '/' . pathinfo($file, PATHINFO_FILENAME) . '"><i class="glyphicon glyphicon-edit"></i></a>'
-                    . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delController/' . $module . '/' . $type . '/' . pathinfo($file, PATHINFO_FILENAME) . '"><i class="glyphicon glyphicon-remove"></i></a>'
+                    'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/controllerEditor/'.$module.'/'.$type.'/'.pathinfo($file, PATHINFO_FILENAME).'"><i class="glyphicon glyphicon-edit"></i></a>'
+                    . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delController/'.$module.'/'.$type.'/'.pathinfo($file, PATHINFO_FILENAME).'"><i class="glyphicon glyphicon-remove"></i></a>'
                 ]
             ]);
         }

system/modules/Modules/appAdminControllers/content/install.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
     <?php
     $config = Config::app(App::$primary ? App::$primary : App::$cur);
     $modules = array_flip(Module::getInstalled(App::$cur));
-    $systemModules = array_slice(scandir(INJI_SYSTEM_DIR . '/modules'), 2);
+    $systemModules = array_slice(scandir(INJI_SYSTEM_DIR.'/modules'), 2);
     foreach ($systemModules as $module) {
         $info = Module::getInfo($module);
         if (!$info || isset($modules[$module]))

system/modules/Modules/appAdminControllers/content/modelEditor.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 $form = new Ui\Form();
-$form->begin((!empty($modelFullName) ? 'Изменение' : 'Создание') . ' модели');
+$form->begin((!empty($modelFullName) ? 'Изменение' : 'Создание').' модели');
 $cols = [
     'label' => ['type' => 'text', 'label' => 'Название'],
     'code' => ['type' => 'text', 'label' => 'Код'],

system/modules/Modules/appAdminControllers/content/controllerEditor.php

Spacing +3 added lines, -3 removed lines

@@ -10,15 +10,15 @@
     'href' => "/admin/modules/createControllerMethod/{$module}/{$type}/{$controller}",
     'text' => 'Создать'
 ]);
-$class = CodeGenerator::parseClass(Modules::getModulePath($module) . '/' . $type . '/' . $controller . '.php');
+$class = CodeGenerator::parseClass(Modules::getModulePath($module).'/'.$type.'/'.$controller.'.php');
 foreach ($class->methods as $method) {
     $name = str_replace('Action', '', $method->name);
     $table->addRow([
         $name,
         [
             'class' => 'actionTd',
-            'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/editControllerMethod/' . $module . '/' . $type . '/' . $controller . '/' . $name . '"><i class="glyphicon glyphicon-edit"></i></a>'
-            . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delControllerMethod/' . $module . '/' . $type . '/' . $controller . '/' . $name . '"><i class="glyphicon glyphicon-remove"></i></a>'
+            'html' => '<a class="btn btn-xs btn-success" href="/admin/modules/editControllerMethod/'.$module.'/'.$type.'/'.$controller.'/'.$name.'"><i class="glyphicon glyphicon-edit"></i></a>'
+            . ' <a class="btn btn-xs btn-danger" href="/admin/modules/delControllerMethod/'.$module.'/'.$type.'/'.$controller.'/'.$name.'"><i class="glyphicon glyphicon-remove"></i></a>'
         ]
     ]);
 }

system/modules/Modules/appAdminControllers/ModulesController.php

Spacing +19 added lines, -19 removed lines

@@ -21,7 +21,7 @@ 
         $config = App::$primary->config;
         $config['defaultModule'] = $module;
         Config::save('app', $config);
-        Tools::redirect('/admin/modules', 'Модулем по умолчанию установлен: ' . $module, 'success');
+        Tools::redirect('/admin/modules', 'Модулем по умолчанию установлен: '.$module, 'success');
     }
 
     public function installAction()
@@ -30,7 +30,7 @@ 
             foreach ($_GET['modules'] as $module) {
                 $this->modules->install($module);
             }
-            Tools::redirect('/admin/modules', 'Моудли ' . implode(',', $_GET['modules']) . ' установлены');
+            Tools::redirect('/admin/modules', 'Моудли '.implode(',', $_GET['modules']).' установлены');
         }
         $this->view->page();
     }
@@ -40,14 +40,14 @@ 
         $codeName = filter_input(INPUT_POST, 'codeName');
         if ($codeName && filter_input(INPUT_POST, 'name')) {
             $codeName = ucfirst($codeName);
-            if (file_exists(App::$primary->path . '/modules/' . $codeName . '.php')) {
+            if (file_exists(App::$primary->path.'/modules/'.$codeName.'.php')) {
                 Msg::add('Модуль с таким именем уже существует');
             } else {
                 $this->modules->createBlankModule(filter_input(INPUT_POST, 'name'), $codeName);
                 $config = App::$primary->config;
                 $config['modules'][] = $codeName;
                 Config::save('app', $config);
-                Tools::redirect('/admin/modules', 'Моудль ' . $codeName . ' создан и установлен');
+                Tools::redirect('/admin/modules', 'Моудль '.$codeName.' создан и установлен');
             }
         }
         $this->view->page();
@@ -55,7 +55,7 @@ 
 
     public function editorAction($module)
     {
-        if (!file_exists(Module::getModulePath($module) . '/generatorHash.php')) {
+        if (!file_exists(Module::getModulePath($module).'/generatorHash.php')) {
             Msg::add('Этот модуль был создан без помощи генератора. Возможности его изменения ограничены и могут привести к порче модуля', 'danger');
         }
         $this->view->page(['data' => compact('module')]);
@@ -63,18 +63,18 @@ 
 
     public function editModelAction($module, $modelName)
     {
-        $path = Modules::getModulePath($module) . '/models/' . $modelName . '.php';
+        $path = Modules::getModulePath($module).'/models/'.$modelName.'.php';
         if (!file_exists($path)) {
-            Tools::redirect('/admin/modules/edit/' . $module, 'Модель ' . $modelName . ' не найдена', 'danger');
+            Tools::redirect('/admin/modules/edit/'.$module, 'Модель '.$modelName.' не найдена', 'danger');
         }
-        include_once Modules::getModulePath($module) . '/models/' . $modelName . '.php';
-        $modelFullName = $module . '\\' . $modelName;
+        include_once Modules::getModulePath($module).'/models/'.$modelName.'.php';
+        $modelFullName = $module.'\\'.$modelName;
         $model = new $modelFullName;
         if (filter_input(INPUT_POST, 'codeName') && filter_input(INPUT_POST, 'name')) {
             $this->modules->generateModel($module, filter_input(INPUT_POST, 'name'), filter_input(INPUT_POST, 'codeName'), [
                 'cols' => $_POST['cols']
             ]);
-            Tools::redirect('/admin/modules/editor/' . $module, 'Модель ' . filter_input(INPUT_POST, 'codeName') . ' была сохранена');
+            Tools::redirect('/admin/modules/editor/'.$module, 'Модель '.filter_input(INPUT_POST, 'codeName').' была сохранена');
         }
         $this->view->page(['content' => 'modelEditor', 'data' => compact('module', 'modelName', 'modelFullName', 'model')]);
     }
@@ -85,20 +85,20 @@ 
             $this->modules->generateModel($module, filter_input(INPUT_POST, 'name'), filter_input(INPUT_POST, 'codeName'), [
                 'cols' => $_POST['cols']
             ]);
-            Tools::redirect('/admin/modules/editor/' . $module, 'Модель ' . filter_input(INPUT_POST, 'codeName') . ' была создана');
+            Tools::redirect('/admin/modules/editor/'.$module, 'Модель '.filter_input(INPUT_POST, 'codeName').' была создана');
         }
         $this->view->page(['content' => 'modelEditor', 'data' => compact('module')]);
     }
 
     public function delModelAction($module, $modelName)
     {
-        unlink(App::$primary->path . '/modules/' . $module . '/models/' . $modelName . '.php');
-        $config = Config::custom(App::$primary->path . '/modules/' . $module . '/generatorHash.php');
-        if (isset($config['models/' . $modelName . '.php'])) {
-            unset($config['models/' . $modelName . '.php']);
-            Config::save(App::$primary->path . '/modules/' . $module . '/generatorHash.php', $config);
+        unlink(App::$primary->path.'/modules/'.$module.'/models/'.$modelName.'.php');
+        $config = Config::custom(App::$primary->path.'/modules/'.$module.'/generatorHash.php');
+        if (isset($config['models/'.$modelName.'.php'])) {
+            unset($config['models/'.$modelName.'.php']);
+            Config::save(App::$primary->path.'/modules/'.$module.'/generatorHash.php', $config);
         }
-        Tools::redirect('/admin/modules/editor/' . $module, 'Модель ' . $modelName . ' была удалена');
+        Tools::redirect('/admin/modules/editor/'.$module, 'Модель '.$modelName.' была удалена');
     }
 
     public function createControllerAction($module)
@@ -106,7 +106,7 @@ 
         $controllerType = filter_input(INPUT_POST, 'type');
         if ($controllerType) {
             $this->modules->createController($module, $controllerType);
-            Tools::redirect('/admin/modules/editor/' . $module, 'Контроллер был создан');
+            Tools::redirect('/admin/modules/editor/'.$module, 'Контроллер был создан');
         }
         $this->view->page();
     }
@@ -121,7 +121,7 @@ 
         $url = filter_input(INPUT_POST, 'url');
         if ($url) {
             $this->modules->addActionToController($module, $type, $controller, $url);
-            Tools::redirect('/admin/modules/editor/' . $module, 'Контроллер был изменен');
+            Tools::redirect('/admin/modules/editor/'.$module, 'Контроллер был изменен');
         }
         $this->view->page(['data' => compact('module', 'type', 'controller')]);
     }

system/modules/Modules/Modules.php

Spacing +48 added lines, -48 removed lines

@@ -13,19 +13,19 @@ 
     public function createBlankModule($name, $codeName)
     {
         $codeName = ucfirst($codeName);
-        Tools::createDir(App::$primary->path . '/modules/' . $codeName);
+        Tools::createDir(App::$primary->path.'/modules/'.$codeName);
         ob_start();
-        include $this->path . '/tpls/BlankModule.php';
+        include $this->path.'/tpls/BlankModule.php';
         $moduleCode = ob_get_contents();
         ob_end_clean();
-        file_put_contents(App::$primary->path . '/modules/' . $codeName . '/' . $codeName . '.php', $moduleCode);
-        file_put_contents(App::$primary->path . '/modules/' . $codeName . '/info.php', "<?php\nreturn " . CodeGenerator::genArray(['name' => $name]));
-        file_put_contents(App::$primary->path . '/modules/' . $codeName . '/generatorHash.php', "<?php\nreturn " . CodeGenerator::genArray([$codeName . '.php' => md5($moduleCode)]));
+        file_put_contents(App::$primary->path.'/modules/'.$codeName.'/'.$codeName.'.php', $moduleCode);
+        file_put_contents(App::$primary->path.'/modules/'.$codeName.'/info.php', "<?php\nreturn ".CodeGenerator::genArray(['name' => $name]));
+        file_put_contents(App::$primary->path.'/modules/'.$codeName.'/generatorHash.php', "<?php\nreturn ".CodeGenerator::genArray([$codeName.'.php' => md5($moduleCode)]));
     }
 
     public function parseColsForModel($cols = [])
     {
-        $modelCols = [ 'labels' => [], 'cols' => [], 'relations' => []];
+        $modelCols = ['labels' => [], 'cols' => [], 'relations' => []];
         foreach ($cols as $col) {
             $modelCols['labels'][$col['code']] = $col['label'];
             $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type'];
@@ -50,11 +50,11 @@ 
 
         $colsExist = App::$cur->db->getTableCols($tableName);
         $tableCols = [];
-        if (empty($colsExist[$colPrefix . 'id'])) {
-            $tableCols[$colPrefix . 'id'] = 'pk';
+        if (empty($colsExist[$colPrefix.'id'])) {
+            $tableCols[$colPrefix.'id'] = 'pk';
         }
         foreach ($cols as $col) {
-            if (!empty($colsExist[$colPrefix . $col['code']])) {
+            if (!empty($colsExist[$colPrefix.$col['code']])) {
                 continue;
             }
             $colType = !empty($col['type']['primary']) ? $col['type']['primary'] : $col['type'];
@@ -62,23 +62,23 @@ 
                 case 'image':
                 case 'number':
                 case 'relation':
-                    $tableCols[$colPrefix . $col['code']] = 'int(11) NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'int(11) NOT NULL';
                     break;
                 case 'decimal':
-                    $tableCols[$colPrefix . $col['code']] = 'decimal(11,2) NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'decimal(11,2) NOT NULL';
                     break;
                 case 'dateTime':
-                    $tableCols[$colPrefix . $col['code']] = 'timestamp NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'timestamp NOT NULL';
                     break;
                 case 'currentDateTime':
-                    $tableCols[$colPrefix . $col['code']] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+                    $tableCols[$colPrefix.$col['code']] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
                     break;
                 case 'text':
-                    $tableCols[$colPrefix . $col['code']] = 'varchar(255) NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'varchar(255) NOT NULL';
                     break;
                 case 'textarea':
                 default:
-                    $tableCols[$colPrefix . $col['code']] = 'text NOT NULL';
+                    $tableCols[$colPrefix.$col['code']] = 'text NOT NULL';
                     break;
             }
         }
@@ -94,8 +94,8 @@ 
         $modelCols = $this->parseColsForModel();
         if (!empty($options['cols'])) {
             $modelCols = $this->parseColsForModel($options['cols']);
-            $tableName = strtolower($module) . '_' . strtolower($codeName);
-            $tableCols = $this->parseColsForTable($options['cols'], strtolower($codeName) . '_', $tableName);
+            $tableName = strtolower($module).'_'.strtolower($codeName);
+            $tableCols = $this->parseColsForTable($options['cols'], strtolower($codeName).'_', $tableName);
             if (App::$cur->db->tableExist($tableName)) {
                 foreach ($tableCols as $colKey => $params) {
                     App::$cur->db->add_col($tableName, $colKey, $params);
@@ -107,15 +107,15 @@ 
         $class->addProperty('objectName', $name, true);
         $class->addProperty('cols', $modelCols['cols'], true);
         $class->addProperty('labels', $modelCols['labels'], true);
-        $class->addMethod('relations', 'return ' . CodeGenerator::genArray($modelCols['relations']), [], true);
-        $modelCode = "<?php \n\nnamespace {$module};\n\n" . $class->generate();
+        $class->addMethod('relations', 'return '.CodeGenerator::genArray($modelCols['relations']), [], true);
+        $modelCode = "<?php \n\nnamespace {$module};\n\n".$class->generate();
 
         $modulePath = Module::getModulePath($module);
-        Tools::createDir($modulePath . '/models');
-        file_put_contents($modulePath . '/models/' . $codeName . '.php', $modelCode);
-        $config = Config::custom($modulePath . '/generatorHash.php');
-        $config['models/' . $codeName . '.php'] = md5($modelCode);
-        Config::save($modulePath . '/generatorHash.php', $config);
+        Tools::createDir($modulePath.'/models');
+        file_put_contents($modulePath.'/models/'.$codeName.'.php', $modelCode);
+        $config = Config::custom($modulePath.'/generatorHash.php');
+        $config['models/'.$codeName.'.php'] = md5($modelCode);
+        Config::save($modulePath.'/generatorHash.php', $config);
     }
 
     public function install($module, $params = [])
@@ -135,7 +135,7 @@ 
 
         $type = 'modules';
 
-        $path = INJI_SYSTEM_DIR . '/modules/';
+        $path = INJI_SYSTEM_DIR.'/modules/';
         $location = 'modules';
 
         $config[$location][] = $module;
@@ -148,8 +148,8 @@ 
             }
         }
         Config::save('app', $config, null, App::$primary);
-        if (file_exists($path . $module . '/install_script.php')) {
-            $installFunction = include $path . $module . '/install_script.php';
+        if (file_exists($path.$module.'/install_script.php')) {
+            $installFunction = include $path.$module.'/install_script.php';
             $installFunction(1, $params);
         }
     }
@@ -178,8 +178,8 @@ 
             $info = Modules::getInfo($module);
             $moduleName = !empty($info['name']) ? $info['name'] : $module;
             foreach ($modelsNames as $modelName) {
-                $fullModelName = $module . '\\' . $modelName;
-                $models[$fullModelName] = $moduleName . ' - ' . ($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
+                $fullModelName = $module.'\\'.$modelName;
+                $models[$fullModelName] = $moduleName.' - '.($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
             }
         }
         foreach (App::$primary->config['modules'] as $configModule) {
@@ -190,9 +190,9 @@ 
             $info = Modules::getInfo($configModule);
             $moduleName = !empty($info['name']) ? $info['name'] : $configModule;
             foreach ($modelsNames as $modelName) {
-                $fullModelName = $configModule . '\\' . $modelName;
+                $fullModelName = $configModule.'\\'.$modelName;
                 Router::loadClass($fullModelName);
-                $models[$fullModelName] = $moduleName . ' - ' . ($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
+                $models[$fullModelName] = $moduleName.' - '.($fullModelName::$objectName ? $fullModelName::$objectName : $modelName);
             }
         }
         return $models;
@@ -201,16 +201,16 @@ 
     public function getModelsList($module, $dir = '')
     {
         $modulePath = Module::getModulePath($module);
-        $path = rtrim($modulePath . '/models/' . $dir, '/');
+        $path = rtrim($modulePath.'/models/'.$dir, '/');
         $models = [];
         if (file_exists($path)) {
             foreach (array_slice(scandir($path), 2) as $file) {
                 $modelLastName = pathinfo($file, PATHINFO_FILENAME);
-                if (is_dir($path . '/' . $file)) {
-                    $models = array_merge($models, $this->getModelsList($module, $dir . '/' . $modelLastName));
+                if (is_dir($path.'/'.$file)) {
+                    $models = array_merge($models, $this->getModelsList($module, $dir.'/'.$modelLastName));
                 }
-                $nameSpace = trim(preg_replace('!/' . $modelLastName . '$!', '', $dir), '/');
-                $models[] = trim(str_replace('/', '\\', $nameSpace) . '\\' . $modelLastName, '\\');
+                $nameSpace = trim(preg_replace('!/'.$modelLastName.'$!', '', $dir), '/');
+                $models[] = trim(str_replace('/', '\\', $nameSpace).'\\'.$modelLastName, '\\');
             }
         }
         return $models;
@@ -219,30 +219,30 @@ 
     public function createController($module, $controllerType)
     {
         $modulePath = Module::getModulePath($module);
-        $path = $modulePath . '/' . $controllerType . '/' . $module . 'Controller.php';
+        $path = $modulePath.'/'.$controllerType.'/'.$module.'Controller.php';
         $class = new CodeGenerator\ClassGenerator();
-        $class->name = $module . 'Controller';
+        $class->name = $module.'Controller';
         $class->extends = 'Controller';
-        $controllerCode = "<?php\n\n" . $class->generate();
+        $controllerCode = "<?php\n\n".$class->generate();
         Tools::createDir(pathinfo($path, PATHINFO_DIRNAME));
         file_put_contents($path, $controllerCode);
-        $config = Config::custom($modulePath . '/generatorHash.php');
-        $config[$controllerType . '/' . $module . 'Controller.php'] = md5($controllerCode);
-        Config::save($modulePath . '/generatorHash.php', $config);
+        $config = Config::custom($modulePath.'/generatorHash.php');
+        $config[$controllerType.'/'.$module.'Controller.php'] = md5($controllerCode);
+        Config::save($modulePath.'/generatorHash.php', $config);
     }
 
     public function addActionToController($module, $type, $controller, $url)
     {
         $modulePath = Module::getModulePath($module);
-        $path = Modules::getModulePath($module) . '/' . $type . '/' . $controller . '.php';
+        $path = Modules::getModulePath($module).'/'.$type.'/'.$controller.'.php';
         $class = CodeGenerator::parseClass($path);
-        $class->addMethod($url . 'Action');
-        $controllerCode = "<?php\n\n" . $class->generate();
+        $class->addMethod($url.'Action');
+        $controllerCode = "<?php\n\n".$class->generate();
         Tools::createDir(pathinfo($path, PATHINFO_DIRNAME));
         file_put_contents($path, $controllerCode);
-        $config = Config::custom($modulePath . '/generatorHash.php');
-        $config[$type . '/' . $module . 'Controller.php'] = md5($controllerCode);
-        Config::save($modulePath . '/generatorHash.php', $config);
+        $config = Config::custom($modulePath.'/generatorHash.php');
+        $config[$type.'/'.$module.'Controller.php'] = md5($controllerCode);
+        Config::save($modulePath.'/generatorHash.php', $config);
     }
 
 }

system/modules/Modules/tpls/Model.php

Spacing +3 added lines, -3 removed lines

@@ -5,13 +5,13 @@
 class <?= $codeName; ?> extends \Model {
 //modelParams<?php
 if (!empty($name)) {
-    echo "\n    static " . '$objectName = \'' . $name . "';";
+    echo "\n    static ".'$objectName = \''.$name."';";
 }
 if (!empty($labels)) {
-    echo "\n    static " . '$labels = [' . CodeGenerator::genArray($labels, 1) . "\n    ];";
+    echo "\n    static ".'$labels = ['.CodeGenerator::genArray($labels, 1)."\n    ];";
 }
 if (!empty($cols)) {
-    echo "\n    static " . '$cols = [' . CodeGenerator::genArray($cols, 1) . "\n    ];";
+    echo "\n    static ".'$cols = ['.CodeGenerator::genArray($cols, 1)."\n    ];";
 }
 ?>
 //!modelParams

system/modules/Money/models/Reward.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
     public function checkBlocked()
     {
         $blocked = Wallet\Block::getList(['where' => [
-                        ['data', 'reward:' . $this->id],
+                        ['data', 'reward:'.$this->id],
                         [
                             ['date_expired', '0000-00-00 00:00:00'],
                             ['date_expired', date('Y-m-d H:i:s'), '>', 'OR']