injitools / cms-Inji

system/modules/Libs/Libs.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
     public function loadLib($libName, $options = [])
     {
 
-        $className = 'Libs\\' . ucfirst($libName);
+        $className = 'Libs\\'.ucfirst($libName);
         if (class_exists($className)) {
             if (!empty($className::$composerPacks)) {
                 foreach ($className::$composerPacks as $packageName => $version) {
@@ -25,12 +25,12 @@ 
                     $this->loadLib($rLib);
                 }
             }
-            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'] )) {
+            if (!empty($className::$files['css']) && (!isset($options['loadCss']) || $options['loadCss'])) {
                 foreach ($className::$files['css'] as $file) {
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('css', $file, $libName);
                     } else {
-                        App::$cur->view->customAsset('css', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
+                        App::$cur->view->customAsset('css', '/static/libs/vendor/'.ucfirst($libName).'/'.$file, $libName);
                     }
                 }
             }
@@ -39,7 +39,7 @@ 
                     if (strpos($file, '/') === 0 || strpos($file, 'http') === 0) {
                         App::$cur->view->customAsset('js', $file, $libName);
                     } else {
-                        App::$cur->view->customAsset('js', '/static/libs/vendor/' . ucfirst($libName) . '/' . $file, $libName);
+                        App::$cur->view->customAsset('js', '/static/libs/vendor/'.ucfirst($libName).'/'.$file, $libName);
                     }
                 }
             }
@@ -50,30 +50,30 @@ 
     {
         $libPath = preg_replace('!^libs/!', '', $file);
         $libName = substr($libPath, 0, strpos($libPath, '/'));
-        $className = 'Libs\\' . ucfirst($libName);
+        $className = 'Libs\\'.ucfirst($libName);
         if (class_exists($className)) {
             if (!empty($className::$programDirs)) {
                 $fileDir = substr($libPath, strlen($libName) + 1, strpos($libPath, '/', strlen($libName) + 1) - strlen($libName) - 1);
                 foreach ($className::$programDirs as $programDir) {
                     if ($programDir == $fileDir) {
-                        include $dir . $file;
+                        include $dir.$file;
                         exit();
                     }
                 }
             }
         }
-        return $dir . $file;
+        return $dir.$file;
     }
 
     public function getPath($args)
     {
         if (!empty($args[0])) {
-            $libName = 'Libs\\' . ucfirst($args[0]);
+            $libName = 'Libs\\'.ucfirst($args[0]);
             if (class_exists($libName)) {
                 $file = implode('/', array_slice($args, 1));
                 foreach ($libName::$staticDirs as $dir) {
                     if (strpos($file, $dir) === 0) {
-                        return \App::$primary->path . '/vendor/' . $file;
+                        return \App::$primary->path.'/vendor/'.$file;
                     }
                 }
             }

system/modules/View/appAdminControllers/ViewController.php

Spacing +7 added lines, -7 removed lines

@@ -48,9 +48,9 @@ 
             $templates = App::$primary->view->config;
             $templates['app']['installed'][$_POST['name']] = $_POST['name'];
             Config::save('module', $templates, 'View', App::$primary);
-            $path = App::$primary->path . '/templates/' . $_POST['name'] . '/index.html';
-            $pathMap = App::$primary->path . '/templates/' . $_POST['name'] . '/map.html';
-            Tools::createDir(App::$primary->path . '/templates/' . $_POST['name']);
+            $path = App::$primary->path.'/templates/'.$_POST['name'].'/index.html';
+            $pathMap = App::$primary->path.'/templates/'.$_POST['name'].'/map.html';
+            Tools::createDir(App::$primary->path.'/templates/'.$_POST['name']);
             file_put_contents($path, $text);
             file_put_contents($pathMap, trim($_POST['map']));
             $template = [
@@ -58,7 +58,7 @@ 
                 'name' => $_POST['name'],
                 'file' => 'index.html',
             ];
-            Config::save(App::$primary->path . '/templates/' . $_POST['name'] . '/config.php', $template);
+            Config::save(App::$primary->path.'/templates/'.$_POST['name'].'/config.php', $template);
             Tools::redirect('/admin/View');
         }
         $this->view->page();
@@ -69,8 +69,8 @@ 
         $this->view->setTitle('Редактирование шаблона');
         App::$cur->view->customAsset('css', '/static/moduleAsset/View/css/blockDrop.css');
         App::$cur->view->customAsset('js', '/static/moduleAsset/View/js/blockDrop.js');
-        $template = Config::custom(App::$primary->path . '/templates/' . $templateName . '/config.php');
-        $pathMap = App::$primary->path . '/templates/' . $templateName . '/map.html';
+        $template = Config::custom(App::$primary->path.'/templates/'.$templateName.'/config.php');
+        $pathMap = App::$primary->path.'/templates/'.$templateName.'/map.html';
         if (!empty($_POST)) {
             $templates = App::$primary->view->config;
             $templates['app']['installed'][$templateName] = $_POST['name'];
@@ -80,7 +80,7 @@ 
 
             $template['template_name'] = $templateName;
             $template['name'] = $templateName;
-            Config::save(App::$primary->path . '/templates/' . $_POST['name'] . '/config.php', $template);
+            Config::save(App::$primary->path.'/templates/'.$_POST['name'].'/config.php', $template);
             Tools::redirect('/admin/View');
         }
         $template['map'] = file_get_contents($pathMap);

system/modules/View/appControllers/ViewController.php

Spacing +4 added lines, -4 removed lines

@@ -12,8 +12,8 @@ 
 {
     public function editorcssAction()
     {
-        if (file_exists($this->view->template->path . '/css/editor.css')) {
-            Tools::redirect('/static/templates/' . $this->view->template['name'] . '/css/editor.css');
+        if (file_exists($this->view->template->path.'/css/editor.css')) {
+            Tools::redirect('/static/templates/'.$this->view->template['name'].'/css/editor.css');
         } else {
             header("Content-type: text/css");
             exit();
@@ -26,8 +26,8 @@ 
         if ($args) {
             $moduleName = ucfirst($args[0]);
             $params = array_slice($args, 1);
-            if (file_exists($this->view->template->path . '/program/modules/' . $moduleName . '/' . $moduleName . '.php')) {
-                include_once $this->view->template->path . '/program/modules/' . $moduleName . '/' . $moduleName . '.php';
+            if (file_exists($this->view->template->path.'/program/modules/'.$moduleName.'/'.$moduleName.'.php')) {
+                include_once $this->view->template->path.'/program/modules/'.$moduleName.'/'.$moduleName.'.php';
                 $module = new $moduleName($this->module->app);
                 $cotroller = $module->findController();
                 $cotroller->params = $params;

system/modules/View/objects/Template.php

Spacing +22 added lines, -22 removed lines

@@ -94,7 +94,7 @@ 
     {
         $this->setParams($params);
         if (!$this->path) {
-            $this->path = $this->app->view->templatesPath . '/' . $this->name;
+            $this->path = $this->app->view->templatesPath.'/'.$this->name;
         }
         $this->loadConfig();
         $this->setPage();
@@ -110,7 +110,7 @@ 
     public function loadConfig($configPath = '')
     {
         if (!$configPath) {
-            $configPath = $this->path . '/config.php';
+            $configPath = $this->path.'/config.php';
         }
         $this->configPath = $configPath;
         $this->config = \Config::custom($this->configPath);
@@ -140,7 +140,7 @@ 
         }
         $this->page = $page;
         if (!$this->pagePath) {
-            $this->pagePath = $this->path . '/' . $this->page . '.html';
+            $this->pagePath = $this->path.'/'.$this->page.'.html';
         }
         $this->pagePath = \Tools::pathsResolve($this->getPagePaths(), $this->pagePath);
     }
@@ -157,8 +157,8 @@ 
             $page = $this->page;
         }
         return [
-            'template' => $this->path . '/' . $page . '.html',
-            'defaultPage' => \Module::getModulePath('View') . '/templatePages/' . $page . '.html'
+            'template' => $this->path.'/'.$page.'.html',
+            'defaultPage' => \Module::getModulePath('View').'/templatePages/'.$page.'.html'
         ];
     }
 
@@ -194,7 +194,7 @@ 
                 $this->content = \Controller::$cur->method;
             }
             if ((!$this->contentPath || $content) && \Module::$cur) {
-                $this->contentPath = \Module::$cur->path . '/' . \Module::$cur->app->type . "Controllers/content/{$this->content}.php";
+                $this->contentPath = \Module::$cur->path.'/'.\Module::$cur->app->type."Controllers/content/{$this->content}.php";
             }
             $this->contentPath = \Tools::pathsResolve($this->getContentPaths(), $this->contentPath);
         }
@@ -214,33 +214,33 @@ 
         $paths = [];
         if ($this->module) {
             if (\Controller::$cur) {
-                $paths['templateModuleController'] = $this->path . "/modules/{$this->module->moduleName}/" . \Controller::$cur->name . "/{$content}.php";
+                $paths['templateModuleController'] = $this->path."/modules/{$this->module->moduleName}/".\Controller::$cur->name."/{$content}.php";
             }
-            $paths['templateModule'] = $this->path . "/modules/{$this->module->moduleName}/{$content}.php";
+            $paths['templateModule'] = $this->path."/modules/{$this->module->moduleName}/{$content}.php";
         }
         if (\Module::$cur) {
             if (\Controller::$cur) {
-                $paths['templateCurModuleController'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
+                $paths['templateCurModuleController'] = $this->path."/modules/".\Module::$cur->moduleName."/".\Controller::$cur->name."/{$content}.php";
             }
-            $paths['templateCurModule'] = $this->path . "/modules/" . \Module::$cur->moduleName . "/{$content}.php";
+            $paths['templateCurModule'] = $this->path."/modules/".\Module::$cur->moduleName."/{$content}.php";
         }
         if (\Controller::$cur) {
-            $paths['appControllerContentController'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['appControllerContent'] = \Controller::$cur->module->app->path . '/modules/' . \Controller::$cur->module->moduleName . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
-            $paths['controllerContentController'] = \Controller::$cur->path . "/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['controllerContent'] = \Controller::$cur->path . "/content/{$content}.php";
-            $paths['moduleControllerContentController'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['moduleControllerContent'] = \Controller::$cur->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
+            $paths['appControllerContentController'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['appControllerContent'] = \Controller::$cur->module->app->path.'/modules/'.\Controller::$cur->module->moduleName.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
+            $paths['controllerContentController'] = \Controller::$cur->path."/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['controllerContent'] = \Controller::$cur->path."/content/{$content}.php";
+            $paths['moduleControllerContentController'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['moduleControllerContent'] = \Controller::$cur->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
         }
         if ($this->module) {
             if (\Controller::$cur) {
-                $paths['customModuleTemplateControllerContentController'] = $this->path . "/modules/" . $this->module->moduleName . "/" . \Controller::$cur->name . "/{$content}.php";
+                $paths['customModuleTemplateControllerContentController'] = $this->path."/modules/".$this->module->moduleName."/".\Controller::$cur->name."/{$content}.php";
             }
-            $paths['customModuleTemplateControllerContent'] = $this->path . "/modules/" . $this->module->moduleName . "/{$content}.php";
+            $paths['customModuleTemplateControllerContent'] = $this->path."/modules/".$this->module->moduleName."/{$content}.php";
         }
         if ($this->module && \Controller::$cur) {
-            $paths['customModuleControllerContentController'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/" . \Controller::$cur->name . "/{$content}.php";
-            $paths['customModuleControllerContent'] = $this->module->path . '/' . \Controller::$cur->module->app->type . "Controllers/content/{$content}.php";
+            $paths['customModuleControllerContentController'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/".\Controller::$cur->name."/{$content}.php";
+            $paths['customModuleControllerContent'] = $this->module->path.'/'.\Controller::$cur->module->app->type."Controllers/content/{$content}.php";
         }
         return $paths;
     }
@@ -260,10 +260,10 @@ 
         if (!$templatesPath) {
             $templatesPath = $app->view->templatesPath;
         }
-        if (file_exists($templatesPath . '/' . $templateName)) {
+        if (file_exists($templatesPath.'/'.$templateName)) {
             return new Template([
                 'name' => $templateName,
-                'path' => $templatesPath . '/' . $templateName,
+                'path' => $templatesPath.'/'.$templateName,
                 'app' => $app
             ]);
         }

system/modules/View/objects/Adapter.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 {
     public function el($name, $option = [])
     {
-        $className = get_called_class() . '\\' . $name;
+        $className = get_called_class().'\\'.$name;
         if (class_exists($className)) {
             return new $className();
         }

system/modules/Users/models/User/Info.php

Spacing +4 added lines, -4 removed lines

@@ -89,16 +89,16 @@
 
     public function name()
     {
-        if ($this->first_name . $this->last_name . $this->middle_name) {
+        if ($this->first_name.$this->last_name.$this->middle_name) {
             $name = '';
             if ($this->first_name) {
-                $name.=$this->first_name;
+                $name .= $this->first_name;
             }
             if ($this->middle_name) {
-                $name.=($name ? ' ' : '') . $this->middle_name;
+                $name .= ($name ? ' ' : '').$this->middle_name;
             }
             if ($this->last_name) {
-                $name.=($name ? ' ' : '') . $this->last_name;
+                $name .= ($name ? ' ' : '').$this->last_name;
             }
             return $name;
         } else {

system/modules/Users/appAdminControllers/UsersController.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     {
         $user = Users\User::get($userId);
         App::$cur->users->newSession($user);
-        Tools::redirect('/', 'Теперь вы на сайте под пользователем ' . $user->name());
+        Tools::redirect('/', 'Теперь вы на сайте под пользователем '.$user->name());
     }
 
 }

system/modules/Users/install_script.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-return function ($step = NULL, $params = []) {
+return function($step = NULL, $params = []) {
 
     $groups = [
         [
@@ -45,7 +45,7 @@ 
     } else {
         $user = new Users\User(array(
             'user_login' => 'admin',
-            'user_mail' => 'admin@' . idn_to_utf8(INJI_DOMAIN_NAME),
+            'user_mail' => 'admin@'.idn_to_utf8(INJI_DOMAIN_NAME),
             'user_pass' => password_hash('admin', PASSWORD_DEFAULT),
             'user_group_id' => $groupObject->id,
             'user_role_id' => $roleObject->id,

system/modules/Users/appControllers/content/login.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
           if ($socials) {
               echo 'Войти через: ';
               foreach (Users\Social::getList(['where' => ['active', 1]]) as $social) {
-                  $text = $social->image ? '<img src ="' . Statics::file($social->image->path, '25x25', 'q') . '">' : $social->name();
+                  $text = $social->image ? '<img src ="'.Statics::file($social->image->path, '25x25', 'q').'">' : $social->name();
                   echo "<a href = '/users/social/auth/{$social->code}'>{$text}</a> ";
               }
           }