injitools / cms-Inji

system/Inji/Tools.php

Spacing +12 added lines, -12 removed lines

@@ -38,7 +38,7 @@ 
     public static function uriParse($uri)
     {
         $answerPos = strpos($uri, '?');
-        $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri) )), 1);
+        $params = array_slice(explode('/', substr($uri, 0, $answerPos ? $answerPos : strlen($uri))), 1);
 
         foreach ($params as $key => $param) {
             if ($param != '') {
@@ -64,7 +64,7 @@ 
         $path = explode('/', $path);
         $cur = '';
         foreach ($path as $item) {
-            $cur .= $item . '/';
+            $cur .= $item.'/';
             if (!file_exists($cur)) {
                 mkdir($cur);
             }
@@ -85,7 +85,7 @@ 
     public static function resizeImage($img_path, $max_width = 1000, $max_height = 1000, $crop = false, $pos = 'center')
     {
         ini_set("gd.jpeg_ignore_warning", 1);
-        list( $img_width, $img_height, $img_type, $img_tag ) = getimagesize($img_path);
+        list($img_width, $img_height, $img_type, $img_tag) = getimagesize($img_path);
         switch ($img_type) {
             case 1:
                 $img_type = 'gif';
@@ -108,14 +108,14 @@ 
 
         if ($crop === true || $crop == 'q') {
             if ($img_width > $img_height) {
-                $imgX = floor(( $img_width - $img_height ) / 2);
+                $imgX = floor(($img_width - $img_height) / 2);
                 $imgY = 0;
                 $img_width = $img_height;
                 $new_width = $max_width;
                 $new_height = $max_height;
             } else {
                 $imgX = 0;
-                $imgY = floor(( $img_height - $img_width ) / 2);
+                $imgY = floor(($img_height - $img_width) / 2);
                 $img_height = $img_width;
                 $new_width = $max_width;
                 $new_height = $max_height;
@@ -136,7 +136,7 @@ 
             $new_width = $max_width;
             $new_height = $max_height;
 //Находим начальные координаты (центрируем новое изображение)
-            $imgX = (int) (($ow / 2) - ($img_width / 2) );
+            $imgX = (int) (($ow / 2) - ($img_width / 2));
             if ($pos == 'center') {
                 $imgY = (int) (($oh / 2) - ($img_height / 2));
             } else {
@@ -206,7 +206,7 @@ 
         if (!headers_sent()) {
             header("Location: {$href}");
         } else {
-            echo '\'"><script>window.location="' . $href . '";</script>';
+            echo '\'"><script>window.location="'.$href.'";</script>';
         }
         exit("Перенаправление на: <a href = '{$href}'>{$href}</a>");
     }
@@ -266,7 +266,7 @@ 
             $pathArray = $cleanPathArray;
             $cleanPathArray = [];
         } while ($changes);
-        return (strpos($path, '/') === 0 ? '/' : '') . implode('/', $pathArray);
+        return (strpos($path, '/') === 0 ? '/' : '').implode('/', $pathArray);
     }
 
     /**
@@ -287,7 +287,7 @@ 
         if (empty($month[$mm - 1])) {
             return 'Не указано';
         }
-        return ($dd > 0 ? $dd . " " : '') . $month[$mm - 1] . " " . $yy . " " . $hours;
+        return ($dd > 0 ? $dd." " : '').$month[$mm - 1]." ".$yy." ".$hours;
     }
 
     /**
@@ -369,10 +369,10 @@ 
             if (in_array($file, ['.', '..'])) {
                 continue;
             }
-            if (is_dir($from . '/' . $file)) {
-                self::copyFiles($from . '/' . $file, $to . '/' . $file);
+            if (is_dir($from.'/'.$file)) {
+                self::copyFiles($from.'/'.$file, $to.'/'.$file);
             } else {
-                copy($from . '/' . $file, $to . '/' . $file);
+                copy($from.'/'.$file, $to.'/'.$file);
             }
         }
     }

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);
     }

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

Spacing +5 added lines, -5 removed lines

@@ -49,9 +49,9 @@ 
     public function listen($eventName, $listenCode, $callback, $save = false)
     {
         if ($save) {
-            $config = Config::custom(App::$primary->path . '/config/events.php');
+            $config = Config::custom(App::$primary->path.'/config/events.php');
             $config[$eventName][$listenCode] = serialize($callback);
-            Config::save(App::$primary->path . '/config/events.php', $config);
+            Config::save(App::$primary->path.'/config/events.php', $config);
         } else {
             $this->_listeners[$eventName][$listenCode] = $callback;
         }
@@ -75,7 +75,7 @@ 
         if (!empty($this->_listeners[$eventName])) {
             $listeners = $this->_listeners[$eventName];
         }
-        $config = Config::custom(App::$primary->path . '/config/events.php');
+        $config = Config::custom(App::$primary->path.'/config/events.php');
         if (!empty($config[$eventName])) {
             foreach ($config[$eventName] as $listenCode => $callback) {
                 $listeners[$listenCode] = (@unserialize($callback) !== false) ? unserialize($callback) : $callback;
@@ -110,10 +110,10 @@ 
     public function unlisten($eventName, $listenCode, $save = false)
     {
         if ($save) {
-            $config = Config::custom(App::$primary->path . '/config/events.php');
+            $config = Config::custom(App::$primary->path.'/config/events.php');
             if (!empty($config[$eventName][$listenCode])) {
                 unset($config[$eventName][$listenCode]);
-                Config::save(App::$primary->path . '/config/events.php', $config);
+                Config::save(App::$primary->path.'/config/events.php', $config);
             }
         }
         if (!empty($this->_listeners[$eventName][$listenCode])) {

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'])) {

index.php

Spacing +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@ 
 // time start
 define('INJI_TIME_START', microtime(true));
 // system files dir
-define('INJI_SYSTEM_DIR', __DIR__ . '/system');
+define('INJI_SYSTEM_DIR', __DIR__.'/system');
 // apps files dir
-define('INJI_PROGRAM_DIR', __DIR__ . '/program');
+define('INJI_PROGRAM_DIR', __DIR__.'/program');
 
 // check base config
 if (!file_exists(INJI_SYSTEM_DIR) || !is_dir(INJI_SYSTEM_DIR)) {
@@ -35,7 +35,7 @@ 
     }
 }
 
-require_once( INJI_SYSTEM_DIR . '/init.php' );
+require_once(INJI_SYSTEM_DIR.'/init.php');
 /**
  * System error messages
  */

system/modules/Users/models/User/Inventory.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/Ui/widgets/Form/password.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 
 <?php
 echo empty($options['noContainer']) ? '<div class="form-group">' : '';
-echo $label !== false ? "<label>{$label}" . (!empty($options['required']) ? ' <span class="required-star">*</span>' : '') . "</label>" : '';
+echo $label !== false ? "<label>{$label}".(!empty($options['required']) ? ' <span class="required-star">*</span>' : '')."</label>" : '';
 ?>
 <div class="row">
     <div class="col-xs-6">