injitools / cms-Inji

system/init.php

Spacing +14 added lines, -14 removed lines

@@ -13,8 +13,8 @@ 
 define('INJI_DOMAIN_NAME', $_SERVER['SERVER_NAME']);
 
 spl_autoload_register(function($class_name) {
-    if (file_exists(INJI_SYSTEM_DIR . '/Inji/' . $class_name . '.php')) {
-        include_once INJI_SYSTEM_DIR . '/Inji/' . $class_name . '.php';
+    if (file_exists(INJI_SYSTEM_DIR.'/Inji/'.$class_name.'.php')) {
+        include_once INJI_SYSTEM_DIR.'/Inji/'.$class_name.'.php';
     }
 });
 
@@ -49,39 +49,39 @@ 
 $params = Tools::uriParse($_SERVER['REQUEST_URI']);
 
 App::$cur->type = 'app';
-App::$cur->path = INJI_PROGRAM_DIR . '/' . App::$cur->dir;
+App::$cur->path = INJI_PROGRAM_DIR.'/'.App::$cur->dir;
 App::$cur->params = $params;
 App::$cur->config = Config::app(App::$cur);
 App::$primary = App::$cur;
 
-if (!empty($params[0]) && file_exists(INJI_SYSTEM_DIR . '/program/' . $params[0] . '/')) {
+if (!empty($params[0]) && file_exists(INJI_SYSTEM_DIR.'/program/'.$params[0].'/')) {
 
     App::$primary->params = [];
 
     App::$cur = new App();
     App::$cur->name = $params[0];
     App::$cur->system = true;
-    App::$cur->staticPath = "/" . App::$cur->name . "/static";
-    App::$cur->templatesPath = "/" . App::$cur->name . "/static/templates";
-    App::$cur->path = INJI_SYSTEM_DIR . '/program/' . App::$cur->name;
-    App::$cur->type = 'app' . ucfirst(strtolower(App::$cur->name));
+    App::$cur->staticPath = "/".App::$cur->name."/static";
+    App::$cur->templatesPath = "/".App::$cur->name."/static/templates";
+    App::$cur->path = INJI_SYSTEM_DIR.'/program/'.App::$cur->name;
+    App::$cur->type = 'app'.ucfirst(strtolower(App::$cur->name));
     App::$cur->installed = true;
     App::$cur->params = array_slice($params, 1);
     App::$cur->config = Config::app(App::$cur);
 
-    Inji::$inst->listen('Config-change-app-' . App::$primary->name, 'primaryAppConfig', function($event) {
+    Inji::$inst->listen('Config-change-app-'.App::$primary->name, 'primaryAppConfig', function($event) {
         App::$primary->config = $event['eventObject'];
     });
 }
-Inji::$inst->listen('Config-change-app-' . App::$cur->name, 'curAppConfig', function($event) {
+Inji::$inst->listen('Config-change-app-'.App::$cur->name, 'curAppConfig', function($event) {
     App::$cur->config = $event['eventObject'];
 });
 $shareConfig = Config::share();
 if (empty($shareConfig['installed']) && App::$cur->name != 'setup' && (empty(App::$cur->params[0]) || App::$cur->params[0] != 'static')) {
     Tools::redirect('/setup');
 }
-putenv('COMPOSER_HOME=' . getcwd());
-putenv('COMPOSER_CACHE_DIR=' . getcwd() . DIRECTORY_SEPARATOR . 'composerCache');
+putenv('COMPOSER_HOME='.getcwd());
+putenv('COMPOSER_CACHE_DIR='.getcwd().DIRECTORY_SEPARATOR.'composerCache');
 ComposerCmd::check();
 if (!function_exists('idn_to_utf8')) {
     ComposerCmd::requirePackage("mabrahamde/idna-converter", "dev-master", './');
@@ -97,8 +97,8 @@ 
 if (file_exists('vendor/autoload.php')) {
     include_once 'vendor/autoload.php';
 }
-if (file_exists(App::$primary->path . '/vendor/autoload.php')) {
-    include_once App::$primary->path . '/vendor/autoload.php';
+if (file_exists(App::$primary->path.'/vendor/autoload.php')) {
+    include_once App::$primary->path.'/vendor/autoload.php';
 }
 Module::$cur = Module::resolveModule(App::$cur);
 

system/Inji/ComposerCmd.php

Spacing +13 added lines, -13 removed lines

@@ -19,7 +19,7 @@ 
             ;
             self::initComposer('./');
         }
-        if (!file_exists(App::$primary->path . '/vendor/autoload.php')) {
+        if (!file_exists(App::$primary->path.'/vendor/autoload.php')) {
             self::initComposer();
         }
     }
@@ -31,7 +31,7 @@ 
             if (!file_exists('composer/composer.phar')) {
                 file_put_contents('composer/composerInstall.php', file_get_contents('https://getcomposer.org/installer'));
                 $argv = ['install', '--install-dir', 'composer/'];
-                header("Location: " . filter_input(INPUT_SERVER, 'REQUEST_URI'));
+                header("Location: ".filter_input(INPUT_SERVER, 'REQUEST_URI'));
                 include_once 'composer/composerInstall.php';
             }
             $composer = new Phar('composer/composer.phar');
@@ -42,18 +42,18 @@ 
     public static function initComposer($path = '')
     {
         if (!$path) {
-            $path = App::$primary->path . '/';
+            $path = App::$primary->path.'/';
         }
-        if (!file_exists($path . 'composer.json')) {
+        if (!file_exists($path.'composer.json')) {
             $json = [
-                "name" => get_current_user() . "/" . App::$primary->name,
+                "name" => get_current_user()."/".App::$primary->name,
                 "config" => [
                     "cache-dir" => "./composerCache/"
                 ],
                 "authors" => [
                     [
                         "name" => get_current_user(),
-                        "email" => get_current_user() . "@" . INJI_DOMAIN_NAME
+                        "email" => get_current_user()."@".INJI_DOMAIN_NAME
                     ]
                 ],
                 "require" => [
@@ -61,7 +61,7 @@ 
                 ]
             ];
             Tools::createDir($path);
-            file_put_contents($path . 'composer.json', json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+            file_put_contents($path.'composer.json', json_encode($json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
         }
         self::command('install', false, $path);
     }
@@ -74,8 +74,8 @@ 
         } else {
             $output = null;
         }
-        $path = str_replace('\\', '/', $path === null ? App::$primary->path . '/' : $path);
-        $input = new Symfony\Component\Console\Input\StringInput($command . ' -d ' . $path);
+        $path = str_replace('\\', '/', $path === null ? App::$primary->path.'/' : $path);
+        $input = new Symfony\Component\Console\Input\StringInput($command.' -d '.$path);
         $app = new Composer\Console\Application();
         $app->setAutoExit(false);
         $dir = getcwd();
@@ -86,10 +86,10 @@ 
     public static function requirePackage($packageName, $version = '', $path = '')
     {
         if (!$path) {
-            $path = App::$primary->path . '/';
+            $path = App::$primary->path.'/';
         }
-        if (file_exists($path . 'composer.lock')) {
-            $lockFile = json_decode(file_get_contents($path . 'composer.lock'), true);
+        if (file_exists($path.'composer.lock')) {
+            $lockFile = json_decode(file_get_contents($path.'composer.lock'), true);
         }
         if (!empty($lockFile['packages'])) {
             foreach ($lockFile['packages'] as $package) {
@@ -99,7 +99,7 @@ 
             }
         }
 
-        ComposerCmd::command('require ' . $packageName . ($version ? ':' . $version : ''), false, $path);
+        ComposerCmd::command('require '.$packageName.($version ? ':'.$version : ''), false, $path);
         return true;
     }
 

system/Inji/Statics.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
             $options['pos'] = $resizePos;
             $path = Cache::file($absolutePath, $options);
             $path = $convet ? mb_convert_encoding($path, 'UTF-8', 'Windows-1251') : $path;
-            return '/' . $path;
+            return '/'.$path;
         }
     }
 

system/Inji/Router.php

Spacing +12 added lines, -12 removed lines

@@ -49,11 +49,11 @@ 
                 $classPath = implode('/', array_slice($classPath, 1));
                 if (App::$cur) {
                     if (App::$cur !== App::$primary) {
-                        $folders['appModule'] = ['folder' => App::$primary->path . '/modules/' . $moduleName, 'classPath' => $classPath];
+                        $folders['appModule'] = ['folder' => App::$primary->path.'/modules/'.$moduleName, 'classPath' => $classPath];
                     }
-                    $folders['primaryAppModule'] = ['folder' => App::$cur->path . '/modules/' . $moduleName, 'classPath' => $classPath];
+                    $folders['primaryAppModule'] = ['folder' => App::$cur->path.'/modules/'.$moduleName, 'classPath' => $classPath];
                 }
-                $folders['systemModule'] = ['folder' => INJI_SYSTEM_DIR . '/modules/' . $moduleName, 'classPath' => $classPath];
+                $folders['systemModule'] = ['folder' => INJI_SYSTEM_DIR.'/modules/'.$moduleName, 'classPath' => $classPath];
             }
         }
         $classPath = str_replace('\\', '/', $className);
@@ -73,7 +73,7 @@ 
             if (file_exists($path)) {
                 include_once $path;
                 if (in_array('Model', class_parents($className, false)) && \App::$primary) {
-                    $filename = Cache::getDir('system') . '/classData.php';
+                    $filename = Cache::getDir('system').'/classData.php';
                     $classData = Config::custom($filename);
                     if (empty($classData['Model'][$className]['tableCreated'])) {
                         $classData['Model'][$className]['tableCreated'] = $className::createTable();
@@ -98,18 +98,18 @@ 
     {
         $paths = [];
         if (strpos($classPath, '/') === false) {
-            $paths[$code . '_Object'] = $folder . '/objects/' . $classPath . '.php';
-            $paths[$code . '_ObjectDir'] = $folder . '/objects/' . $classPath . '/' . $classPath . '.php';
-            $paths[$code . '_Model'] = $folder . '/models/' . $classPath . '.php';
-            $paths[$code . '_ModelDir'] = $folder . '/models/' . $classPath . '/' . $classPath . '.php';
+            $paths[$code.'_Object'] = $folder.'/objects/'.$classPath.'.php';
+            $paths[$code.'_ObjectDir'] = $folder.'/objects/'.$classPath.'/'.$classPath.'.php';
+            $paths[$code.'_Model'] = $folder.'/models/'.$classPath.'.php';
+            $paths[$code.'_ModelDir'] = $folder.'/models/'.$classPath.'/'.$classPath.'.php';
         } else {
             $classFile = substr($classPath, strrpos($classPath, '/') + 1);
             $classPathWithotClass = substr($classPath, 0, strrpos($classPath, '/'));
 
-            $paths[$code . '_Object'] = $folder . '/objects/' . $classPathWithotClass . '/' . $classFile . '.php';
-            $paths[$code . '_ObjectDir'] = $folder . '/objects/' . $classPath . '/' . $classFile . '.php';
-            $paths[$code . '_Model'] = $folder . '/models/' . $classPathWithotClass . '/' . $classFile . '.php';
-            $paths[$code . '_ModelDir'] = $folder . '/models/' . $classPath . '/' . $classFile . '.php';
+            $paths[$code.'_Object'] = $folder.'/objects/'.$classPathWithotClass.'/'.$classFile.'.php';
+            $paths[$code.'_ObjectDir'] = $folder.'/objects/'.$classPath.'/'.$classFile.'.php';
+            $paths[$code.'_Model'] = $folder.'/models/'.$classPathWithotClass.'/'.$classFile.'.php';
+            $paths[$code.'_ModelDir'] = $folder.'/models/'.$classPath.'/'.$classFile.'.php';
         }
         return $paths;
     }

system/Inji/Controller.php

Spacing +3 added lines, -3 removed lines

@@ -64,17 +64,17 @@
      */
     public function run()
     {
-        if (!empty($this->params[0]) && method_exists($this, $this->params[0] . 'Action')) {
+        if (!empty($this->params[0]) && method_exists($this, $this->params[0].'Action')) {
             $this->method = $this->params[0];
             $this->params = array_slice($this->params, 1);
-        } elseif (!method_exists($this, $this->method . 'Action')) {
+        } elseif (!method_exists($this, $this->method.'Action')) {
             INJI_SYSTEM_ERROR('method not found', true);
         }
         if (!$this->checkAccess()) {
             Tools::redirect($this->access->getDeniedRedirect(), 'У вас нет прав доступа');
         }
         $this->run = true;
-        call_user_func_array([$this, $this->method . 'Action'], $this->params);
+        call_user_func_array([$this, $this->method.'Action'], $this->params);
     }
 
     /**

system/Inji/Log.php

Spacing +6 added lines, -6 removed lines

@@ -83,22 +83,22 @@
                     $log['end'] = microtime(true);
                 if (empty($log['start']))
                     $log['start'] = microtime(true);
-                echo "<tr><td>{$log['name']}</td><td" . (round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '') . ">" . round(($log['end'] - $log['start']), 5) . "</td></tr>";
+                echo "<tr><td>{$log['name']}</td><td".(round(($log['end'] - $log['start']), 5) > 0.1 ? ' class ="danger"' : '').">".round(($log['end'] - $log['start']), 5)."</td></tr>";
             }
         }
-        echo '<tr><th>Summary</th><th>' . round(( microtime(true) - $this->startTime), 5) . '</th></tr>';
-        echo '<tr><th>Memory</th><th>' . $this->convertSize(memory_get_peak_usage()) . ' of ' . ini_get('memory_limit') . '</th></tr></table></div>';
+        echo '<tr><th>Summary</th><th>'.round((microtime(true) - $this->startTime), 5).'</th></tr>';
+        echo '<tr><th>Memory</th><th>'.$this->convertSize(memory_get_peak_usage()).' of '.ini_get('memory_limit').'</th></tr></table></div>';
     }
 
     public function convertSize($size)
     {
 
         if ($size < 1024)
-            return $size . "B";
+            return $size."B";
         elseif ($size < 1048576)
-            return round($size / 1024, 2) . "KB";
+            return round($size / 1024, 2)."KB";
         else
-            return round($size / 1048576, 2) . "MB";
+            return round($size / 1048576, 2)."MB";
     }
 
     public function __destruct()

system/Inji/Cache.php

Spacing +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
             }
             return false;
         }
-        $val = @self::$server->get($name . serialize($params));
+        $val = @self::$server->get($name.serialize($params));
         if ($val !== false) {
             return $val;
         } else {
@@ -92,7 +92,7 @@ 
             self::connect();
         }
         if (self::$connected) {
-            return @self::$server->set($name . serialize($params), $val, false, $lifeTime);
+            return @self::$server->set($name.serialize($params), $val, false, $lifeTime);
         }
         return false;
     }
@@ -112,12 +112,12 @@ 
         $crop = !empty($options['crop']) ? $options['crop'] : '';
         $pos = !empty($options['pos']) ? $options['pos'] : 'center';
         $fileinfo = pathinfo($file);
-        $fileCheckSum = md5($fileinfo['dirname'] . filemtime($file));
-        $path = static::getDir('static') . '/' . $fileCheckSum . '_' . $fileinfo['filename'];
+        $fileCheckSum = md5($fileinfo['dirname'].filemtime($file));
+        $path = static::getDir('static').'/'.$fileCheckSum.'_'.$fileinfo['filename'];
         if ($sizes) {
-            $path .= '.' . $sizes['x'] . 'x' . $sizes['y'] . $crop . $pos;
+            $path .= '.'.$sizes['x'].'x'.$sizes['y'].$crop.$pos;
         }
-        $path .= '.' . $fileinfo['extension'];
+        $path .= '.'.$fileinfo['extension'];
         if (!file_exists($path)) {
             copy($file, $path);
             if ($sizes) {

system/Inji/App.php

Spacing +2 added lines, -2 removed lines

@@ -71,8 +71,8 @@
     {
         $paths = Module::getModulePaths($moduleName);
         foreach ($paths as $path) {
-            if (file_exists($path . '/' . $moduleName . '.php')) {
-                include_once $path . '/' . $moduleName . '.php';
+            if (file_exists($path.'/'.$moduleName.'.php')) {
+                include_once $path.'/'.$moduleName.'.php';
                 return $moduleName;
             }
         }

system/Inji/Config.php

Spacing +18 added lines, -18 removed lines

@@ -28,11 +28,11 @@ 
             return self::$_configs['system'];
         }
 
-        if (!file_exists(INJI_SYSTEM_DIR . '/config/config.php')) {
+        if (!file_exists(INJI_SYSTEM_DIR.'/config/config.php')) {
             return [];
         }
 
-        return self::$_configs['system'] = include INJI_SYSTEM_DIR . '/config/config.php';
+        return self::$_configs['system'] = include INJI_SYSTEM_DIR.'/config/config.php';
     }
 
     /**
@@ -68,7 +68,7 @@ 
             return self::$_configs['app'][$app->name];
         }
 
-        $path = $app->path . "/config/config.php";
+        $path = $app->path."/config/config.php";
         if (!file_exists($path)) {
             return [];
         }
@@ -88,16 +88,16 @@ 
             if (isset(self::$_configs['shareModules'][$module])) {
                 return self::$_configs['shareModules'][$module];
             }
-            $path = INJI_PROGRAM_DIR . "/config/modules/{$module}.php";
+            $path = INJI_PROGRAM_DIR."/config/modules/{$module}.php";
         } else {
             if (isset(self::$_configs['share'])) {
                 return self::$_configs['share'];
             }
-            $path = INJI_PROGRAM_DIR . "/config/config.php";
+            $path = INJI_PROGRAM_DIR."/config/config.php";
         }
         if (!file_exists($path)) {
-            if (file_exists(INJI_SYSTEM_DIR . "/modules/{$module}/defaultConfig.php")) {
-                $path = INJI_SYSTEM_DIR . "/modules/{$module}/defaultConfig.php";
+            if (file_exists(INJI_SYSTEM_DIR."/modules/{$module}/defaultConfig.php")) {
+                $path = INJI_SYSTEM_DIR."/modules/{$module}/defaultConfig.php";
             } else {
                 return [];
             }
@@ -136,9 +136,9 @@ 
             return self::$_configs['module'][$appName][$module_name];
         }
 
-        $path = $appPath . "/config/modules/{$module_name}.php";
+        $path = $appPath."/config/modules/{$module_name}.php";
         if (!file_exists($path)) {
-            $path = INJI_SYSTEM_DIR . "/modules/{$module_name}/defaultConfig.php";
+            $path = INJI_SYSTEM_DIR."/modules/{$module_name}/defaultConfig.php";
         }
 
 
@@ -163,27 +163,27 @@ 
         }
         switch ($type) {
             case 'system':
-                $path = INJI_SYSTEM_DIR . '/config/config.php';
+                $path = INJI_SYSTEM_DIR.'/config/config.php';
                 self::$_configs['system'] = $data;
                 Inji::$inst->event('Config-change-system', $data);
                 break;
             case 'app':
-                $path = $app->path . "/config/config.php";
+                $path = $app->path."/config/config.php";
                 self::$_configs['app'][$app->name] = $data;
-                Inji::$inst->event('Config-change-app-' . $app->name, $data);
+                Inji::$inst->event('Config-change-app-'.$app->name, $data);
                 break;
             case 'module':
-                $path = $app->path . "/config/modules/{$module}.php";
+                $path = $app->path."/config/modules/{$module}.php";
                 self::$_configs['module'][$app->name][$module] = $data;
-                Inji::$inst->event('Config-change-module-' . $app->name . '-' . $module, $data);
+                Inji::$inst->event('Config-change-module-'.$app->name.'-'.$module, $data);
                 break;
             case 'share':
                 if ($module) {
-                    $path = INJI_PROGRAM_DIR . "/config/modules/{$module}.php";
+                    $path = INJI_PROGRAM_DIR."/config/modules/{$module}.php";
                     self::$_configs['shareModules'][$module] = $data;
-                    Inji::$inst->event('Config-change-shareModules-' . $module, $data);
+                    Inji::$inst->event('Config-change-shareModules-'.$module, $data);
                 } else {
-                    $path = INJI_PROGRAM_DIR . "/config/config.php";
+                    $path = INJI_PROGRAM_DIR."/config/config.php";
                     self::$_configs['share'] = $data;
                     Inji::$inst->event('Config-change-share', $data);
                 }
@@ -193,7 +193,7 @@ 
                 self::$_configs['custom'][$path] = $data;
                 break;
         }
-        $text = "<?php\nreturn " . CodeGenerator::genArray($data);
+        $text = "<?php\nreturn ".CodeGenerator::genArray($data);
         Tools::createDir(substr($path, 0, strripos($path, '/')));
         file_put_contents($path, $text);
     }