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

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
         if ($type == 'array') {
             return !is_array($_GET[$key]) ? [] : $_GET[$key];
         }
-        return eval('return (' . $type . ') $_GET[$key];');
+        return eval('return ('.$type.') $_GET[$key];');
     }
 
 }

system/Inji/Value.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 
                 $month = array('января', 'февраля', 'марта', 'апреля', 'мая', 'июня', 'июля', 'августа', 'сентября', 'октября', 'ноября', 'декабря');
                 $yearPosrfix = isset($options['yearPostfix']) ? $options['yearPostfix'] : " г.";
-                return ($dd > 0 ? $dd . " " : '') . $month[$mm - 1] . " " . $yy . $yearPosrfix . (empty($options['notime']) ? " " . $hours : '');
+                return ($dd > 0 ? $dd." " : '').$month[$mm - 1]." ".$yy.$yearPosrfix.(empty($options['notime']) ? " ".$hours : '');
             case 'select':
                 switch ($colInfo['colParams']['source']) {
                     case 'model':
@@ -64,7 +64,7 @@ 
             case 'image':
                 $file = Files\File::get($this->model->{$this->valueKey});
                 if ($file) {
-                    return '<img src="' . $file->path . '?resize=60x120" />';
+                    return '<img src="'.$file->path.'?resize=60x120" />';
                 } else {
                     return '<img src="/static/system/images/no-image.png?resize=60x120" />';
                 }

system/program/admin/objects/adminController.php

Spacing +4 added lines, -4 removed lines

@@ -20,11 +20,11 @@ 
     {
         if (!$model) {
             $modulePath = Module::getModulePath($this->module->moduleName);
-            $path = $modulePath . '/models';
+            $path = $modulePath.'/models';
             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;
                     }
                     $model = pathinfo($file, PATHINFO_FILENAME);
@@ -32,7 +32,7 @@ 
                 }
             }
         }
-        $fullModelName = $this->module->moduleName . '\\' . ucfirst($model);
+        $fullModelName = $this->module->moduleName.'\\'.ucfirst($model);
         $dataManager = new Ui\DataManager($fullModelName, $dataManager);
         $title = !empty($dataManager->managerOptions['name']) ? $dataManager->managerOptions['name'] : $fullModelName::objectName();
         $this->view->setTitle($title);
@@ -41,7 +41,7 @@ 
 
     public function viewAction($model, $pk)
     {
-        $fullModelName = $this->module->moduleName . '\\' . ucfirst($model);
+        $fullModelName = $this->module->moduleName.'\\'.ucfirst($model);
         $item = $fullModelName::get($pk);
         $this->view->setTitle($item->name());
         if (!empty($_POST['comment'])) {