injitools / cms-Inji

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

Spacing +29 added lines, -29 removed lines

@@ -72,7 +72,7 @@ 
         $this->info = $this->getInfo();
         $this->config = Config::module($this->moduleName, !empty($this->info['systemConfig']));
         $that = $this;
-        Inji::$inst->listen('Config-change-module-' . $this->app->name . '-' . $this->moduleName, $this->app->name . '-' . $this->moduleName . 'config', function($event) use ($that) {
+        Inji::$inst->listen('Config-change-module-'.$this->app->name.'-'.$this->moduleName, $this->app->name.'-'.$this->moduleName.'config', function($event) use ($that) {
             $that->config = $event['eventObject'];
         });
     }
@@ -88,10 +88,10 @@ 
         $moduleName = ucfirst($moduleName);
         $paths = [];
         if (App::$cur !== App::$primary) {
-            $paths['primaryAppPath'] = App::$primary->path . '/modules/' . $moduleName;
+            $paths['primaryAppPath'] = App::$primary->path.'/modules/'.$moduleName;
         }
-        $paths['curAppPath'] = App::$cur->path . '/modules/' . $moduleName;
-        $paths['systemPath'] = INJI_SYSTEM_DIR . '/modules/' . $moduleName;
+        $paths['curAppPath'] = App::$cur->path.'/modules/'.$moduleName;
+        $paths['systemPath'] = INJI_SYSTEM_DIR.'/modules/'.$moduleName;
         return $paths;
     }
 
@@ -106,7 +106,7 @@ 
         $moduleName = ucfirst($moduleName);
         $paths = Module::getModulePaths($moduleName);
         foreach ($paths as $path) {
-            if (file_exists($path . '/' . $moduleName . '.php')) {
+            if (file_exists($path.'/'.$moduleName.'.php')) {
                 return $path;
             }
         }
@@ -183,31 +183,31 @@ 
         $paths = [];
         if (App::$cur != App::$primary) {
             if (!empty($this->params[0]) && strtolower($this->params[0]) != strtolower($this->moduleName)) {
-                $paths['primaryAppAppTypePath_slice'] = App::$primary->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+                $paths['primaryAppAppTypePath_slice'] = App::$primary->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
                 if (App::$primary->{$this->moduleName}) {
-                    $paths['primaryAppAppTypePath_slice'] = App::$primary->{$this->moduleName}->path . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+                    $paths['primaryAppAppTypePath_slice'] = App::$primary->{$this->moduleName}->path.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
                 }
             }
-            $paths['primaryAppAppAppTypePath'] = App::$primary->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+            $paths['primaryAppAppAppTypePath'] = App::$primary->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
             if (App::$primary->{$this->moduleName}) {
-                $paths['primaryAppAppTypePath'] = App::$primary->{$this->moduleName}->path . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+                $paths['primaryAppAppTypePath'] = App::$primary->{$this->moduleName}->path.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
             }
-            $paths['curAppAppTypePath'] = $this->app->{$this->moduleName}->path . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+            $paths['curAppAppTypePath'] = $this->app->{$this->moduleName}->path.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
         }
 
         if (!empty($this->params[0]) && strtolower($this->params[0]) != strtolower($this->moduleName)) {
-            $paths['appAppTypePath_slice'] = $this->app->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
-            $paths['appTypePath_slice'] = $this->path . '/' . $this->app->type . 'Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+            $paths['appAppTypePath_slice'] = $this->app->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
+            $paths['appTypePath_slice'] = $this->path.'/'.$this->app->type.'Controllers/'.ucfirst($this->params[0]).'Controller.php';
         }
-        $paths['appAppTypePath'] = $this->app->path . '/modules/' . $this->moduleName . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
-        $paths['appTypePath'] = $this->path . '/' . $this->app->type . 'Controllers/' . $this->moduleName . 'Controller.php';
+        $paths['appAppTypePath'] = $this->app->path.'/modules/'.$this->moduleName.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
+        $paths['appTypePath'] = $this->path.'/'.$this->app->type.'Controllers/'.$this->moduleName.'Controller.php';
 
         if (!empty($this->params[0]) && strtolower($this->params[0]) != strtolower($this->moduleName)) {
-            $paths['appUniversalPath_slice'] = $this->app->path . '/modules/' . $this->moduleName . '/Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
-            $paths['universalPath_slice'] = $this->path . '/Controllers/' . ucfirst($this->params[0]) . 'Controller.php';
+            $paths['appUniversalPath_slice'] = $this->app->path.'/modules/'.$this->moduleName.'/Controllers/'.ucfirst($this->params[0]).'Controller.php';
+            $paths['universalPath_slice'] = $this->path.'/Controllers/'.ucfirst($this->params[0]).'Controller.php';
         }
-        $paths['appUniversalPath'] = $this->app->path . '/modules/' . $this->moduleName . '/Controllers/' . $this->moduleName . 'Controller.php';
-        $paths['universalPath'] = $this->path . '/Controllers/' . $this->moduleName . 'Controller.php';
+        $paths['appUniversalPath'] = $this->app->path.'/modules/'.$this->moduleName.'/Controllers/'.$this->moduleName.'Controller.php';
+        $paths['universalPath'] = $this->path.'/Controllers/'.$this->moduleName.'Controller.php';
 
         return $paths;
     }
@@ -230,7 +230,7 @@ 
                     $controllerName = $this->moduleName;
                     $params = $this->params;
                 }
-                $fullControllerName = $controllerName . 'Controller';
+                $fullControllerName = $controllerName.'Controller';
                 $controller = new $fullControllerName();
                 $controller->params = $params;
                 $controller->module = $this;
@@ -256,8 +256,8 @@ 
         }
         $paths = Module::getModulePaths($moduleName);
         foreach ($paths as $path) {
-            if (file_exists($path . '/info.php')) {
-                return include $path . '/info.php';
+            if (file_exists($path.'/info.php')) {
+                return include $path.'/info.php';
             }
         }
         return [];
@@ -276,16 +276,16 @@ 
     {
         $moduleName = $moduleName ? $moduleName : $this->moduleName;
         $modulePaths = Module::getModulePaths($moduleName);
-        $modulePaths['templatePath'] = App::$cur->view->template->path . '/modules/' . ucfirst($moduleName);
+        $modulePaths['templatePath'] = App::$cur->view->template->path.'/modules/'.ucfirst($moduleName);
         $snippets = [];
         foreach ($modulePaths as $path) {
-            if (file_exists($path . $dir . '/' . $snippetsPath)) {
-                $snippetsPaths = array_slice(scandir($path . $dir . '/' . $snippetsPath), 2);
+            if (file_exists($path.$dir.'/'.$snippetsPath)) {
+                $snippetsPaths = array_slice(scandir($path.$dir.'/'.$snippetsPath), 2);
                 foreach ($snippetsPaths as $snippetPath) {
-                    if (is_dir($path . $dir . '/' . $snippetsPath . '/' . $snippetPath)) {
-                        $snippets[$snippetPath] = include $path . $dir . '/' . $snippetsPath . '/' . $snippetPath . '/info.php';
+                    if (is_dir($path.$dir.'/'.$snippetsPath.'/'.$snippetPath)) {
+                        $snippets[$snippetPath] = include $path.$dir.'/'.$snippetsPath.'/'.$snippetPath.'/info.php';
                     } else {
-                        $snippets[pathinfo($snippetPath, PATHINFO_FILENAME)] = include $path . $dir . '/' . $snippetsPath . '/' . $snippetPath;
+                        $snippets[pathinfo($snippetPath, PATHINFO_FILENAME)] = include $path.$dir.'/'.$snippetsPath.'/'.$snippetPath;
                     }
                 }
             }
@@ -307,9 +307,9 @@ 
     {
         $extensions = [];
         $modules = Module::getInstalled(App::$cur);
-        $method = 'get' . ucfirst($extensionType);
+        $method = 'get'.ucfirst($extensionType);
         foreach ($modules as $module) {
-            $extensions = array_merge($extensions, $this->{$method}($request, false, "/extensions/{$this->moduleName}/" . $extensionType, $module));
+            $extensions = array_merge($extensions, $this->{$method}($request, false, "/extensions/{$this->moduleName}/".$extensionType, $module));
         }
         return $extensions;
     }

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

Spacing +54 added lines, -54 removed lines

@@ -211,7 +211,7 @@ 
                         $relModel = $relations[$colInfo['colParams']['relation']]['model'];
                         $relModel = strpos($relModel, '\\') === 0 ? substr($relModel, 1) : $relModel;
                         if ($manageHref) {
-                            $value = $relValue ? "<a href='/admin/" . str_replace('\\', '/view/', $relModel) . "/" . $relValue->pk() . "'>" . $relValue->name() . "</a>" : 'Не задано';
+                            $value = $relValue ? "<a href='/admin/".str_replace('\\', '/view/', $relModel)."/".$relValue->pk()."'>".$relValue->name()."</a>" : 'Не задано';
                         } else {
                             $value = $relValue ? $relValue->name() : 'Не задано';
                         }
@@ -221,7 +221,7 @@ 
             case 'image':
                 $file = Files\File::get($item->$colName);
                 if ($file) {
-                    $value = '<img src="' . $file->path . '?resize=60x120" />';
+                    $value = '<img src="'.$file->path.'?resize=60x120" />';
                 } else {
                     $value = '<img src="/static/system/images/no-image.png?resize=60x120" />';
                 }
@@ -259,12 +259,12 @@ 
             return;
         }
         if (!is_array($array)) {
-            if (!isset($cols[static::colPrefix() . $array]) && isset(static::$cols[$array])) {
+            if (!isset($cols[static::colPrefix().$array]) && isset(static::$cols[$array])) {
                 static::createCol($array);
                 $cols = static::cols(true);
             }
-            if (!isset($cols[$array]) && isset($cols[static::colPrefix() . $array])) {
-                $array = static::colPrefix() . $array;
+            if (!isset($cols[$array]) && isset($cols[static::colPrefix().$array])) {
+                $array = static::colPrefix().$array;
             } else {
                 static::checkForJoin($array, $rootModel);
             }
@@ -273,14 +273,14 @@ 
         switch ($searchtype) {
             case 'key':
                 foreach ($array as $key => $item) {
-                    if (!isset($cols[static::colPrefix() . $key]) && isset(static::$cols[$key])) {
+                    if (!isset($cols[static::colPrefix().$key]) && isset(static::$cols[$key])) {
                         static::createCol($key);
                         $cols = static::cols(true);
                     }
-                    if (!isset($cols[$key]) && isset($cols[static::colPrefix() . $key])) {
-                        $array[static::colPrefix() . $key] = $item;
+                    if (!isset($cols[$key]) && isset($cols[static::colPrefix().$key])) {
+                        $array[static::colPrefix().$key] = $item;
                         unset($array[$key]);
-                        $key = static::colPrefix() . $key;
+                        $key = static::colPrefix().$key;
                     }
                     if (is_array($array[$key])) {
                         static::fixPrefix($array[$key], 'key', $rootModel);
@@ -291,12 +291,12 @@ 
                 break;
             case 'first':
                 if (isset($array[0]) && is_string($array[0])) {
-                    if (!isset($cols[static::colPrefix() . $array[0]]) && isset(static::$cols[$array[0]])) {
+                    if (!isset($cols[static::colPrefix().$array[0]]) && isset(static::$cols[$array[0]])) {
                         static::createCol($array[0]);
                         $cols = static::cols(true);
                     }
-                    if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix() . $array[0]])) {
-                        $array[0] = static::colPrefix() . $array[0];
+                    if (!isset($cols[$array[0]]) && isset($cols[static::colPrefix().$array[0]])) {
+                        $array[0] = static::colPrefix().$array[0];
                     } else {
                         static::checkForJoin($array[0], $rootModel);
                     }
@@ -329,13 +329,13 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+                        $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
                         break;
                     case 'one':
                     case 'many':
                         $relCol = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($relCol);
-                        $rootModel::$relJoins[$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+                        $rootModel::$relJoins[$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
                         break;
                 }
                 $relations[$rel]['model']::fixPrefix($col, 'key', $rootModel);
@@ -376,13 +376,13 @@ 
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
                         //$info['modelName'] = $relations[$rel]['model'];
-                        $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol];
+                        $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol];
                         break;
                     case 'one':
                         $relCol = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($relCol);
                         //$info['modelName'] = $relations[$rel]['model'];
-                        $info['joins'][$relations[$rel]['model'] . '_' . $rel] = [$relations[$rel]['model']::table(), static::index() . ' = ' . $relCol];
+                        $info['joins'][$relations[$rel]['model'].'_'.$rel] = [$relations[$rel]['model']::table(), static::index().' = '.$relCol];
                         break;
                 }
                 $info = $relations[$rel]['model']::parseColRecursion($info);
@@ -400,8 +400,8 @@ 
             } else {
                 $info['colParams'] = [];
             }
-            if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix() . $info['col']])) {
-                $info['col'] = static::colPrefix() . $info['col'];
+            if (!isset($cols[$info['col']]) && isset($cols[static::colPrefix().$info['col']])) {
+                $info['col'] = static::colPrefix().$info['col'];
             }
             $info['modelName'] = get_called_class();
         }
@@ -507,7 +507,7 @@ 
         if ($params === false) {
             return false;
         }
-        return App::$cur->db->addCol(static::table(), static::colPrefix() . $colName, $params);
+        return App::$cur->db->addCol(static::table(), static::colPrefix().$colName, $params);
     }
 
     public static function createTable()
@@ -537,28 +537,28 @@ 
             return true;
         }
         $cols = [
-            $colPrefix . 'id' => 'pk'
+            $colPrefix.'id' => 'pk'
         ];
         $className = get_called_class();
         if (!empty($className::$cols)) {
             foreach ($className::$cols as $colName => $colParams) {
                 if ($colName == 'date_create') {
-                    $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+                    $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
                     continue;
                 }
                 $params = $className::genColParams($colName);
                 if ($params) {
-                    $cols[$colPrefix . $colName] = $params;
+                    $cols[$colPrefix.$colName] = $params;
                 }
             }
         }
-        if (empty($cols[$colPrefix . 'date_create'])) {
-            $cols[$colPrefix . 'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
+        if (empty($cols[$colPrefix.'date_create'])) {
+            $cols[$colPrefix.'date_create'] = 'timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP';
         }
         $tableIndexes = [];
         if ($indexes) {
             foreach ($indexes as $indexName => $index) {
-                $tableIndexes[] = $index['type'] . ' ' . App::$cur->db->table_prefix . $indexName . ' (' . implode(',', $index['cols']) . ')';
+                $tableIndexes[] = $index['type'].' '.App::$cur->db->table_prefix.$indexName.' ('.implode(',', $index['cols']).')';
             }
         }
 
@@ -584,7 +584,7 @@ 
     public static function index()
     {
 
-        return static::colPrefix() . 'id';
+        return static::colPrefix().'id';
     }
 
     /**
@@ -596,7 +596,7 @@ 
     {
         $classPath = explode('\\', get_called_class());
         $classPath = array_slice($classPath, 1);
-        return strtolower(implode('_', $classPath)) . '_';
+        return strtolower(implode('_', $classPath)).'_';
     }
 
     /**
@@ -661,12 +661,12 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+                        App::$cur->db->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
                         break;
                     case 'one':
                         $col = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($col);
-                        App::$cur->db->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+                        App::$cur->db->join($relations[$rel]['model']::table(), static::index().' = '.$col);
                         break;
                 }
             }
@@ -681,8 +681,8 @@ 
             }
             if ($param !== null) {
                 $cols = static::cols();
-                if (!isset($cols[$col]) && isset($cols[static::colPrefix() . $col])) {
-                    $col = static::colPrefix() . $col;
+                if (!isset($cols[$col]) && isset($cols[static::colPrefix().$col])) {
+                    $col = static::colPrefix().$col;
                 }
                 App::$cur->db->where($col, $param);
             } else {
@@ -742,12 +742,12 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
                         break;
                     case 'one':
                         $col = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($col);
-                        $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+                        $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
                         break;
                 }
             }
@@ -1063,12 +1063,12 @@ 
                     case 'to':
                         $relCol = $relations[$rel]['col'];
                         static::fixPrefix($relCol);
-                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index() . ' = ' . $relCol);
+                        $query->join($relations[$rel]['model']::table(), $relations[$rel]['model']::index().' = '.$relCol);
                         break;
                     case 'one':
                         $col = $relations[$rel]['col'];
                         $relations[$rel]['model']::fixPrefix($col);
-                        $query->join($relations[$rel]['model']::table(), static::index() . ' = ' . $col);
+                        $query->join($relations[$rel]['model']::table(), static::index().' = '.$col);
                         break;
                 }
             }
@@ -1085,7 +1085,7 @@ 
         } else {
             $cols .= '*';
         }
-        $cols .=') as `count`' . (!empty($options['cols']) ? ',' . $options['cols'] : '');
+        $cols .= ') as `count`'.(!empty($options['cols']) ? ','.$options['cols'] : '');
         $query->cols = $cols;
         if (!empty($options['group'])) {
             $query->group($options['group']);
@@ -1223,25 +1223,25 @@ 
         $itemModel = $class::$treeCategory;
         $oldPath = $this->tree_path;
         $this->tree_path = $this->getCatalogTree($this);
-        $itemsTable = \App::$cur->db->table_prefix . $itemModel::table();
-        $itemTreeCol = $itemModel::colPrefix() . 'tree_path';
+        $itemsTable = \App::$cur->db->table_prefix.$itemModel::table();
+        $itemTreeCol = $itemModel::colPrefix().'tree_path';
 
-        $categoryTreeCol = $this->colPrefix() . 'tree_path';
-        $categoryTable = \App::$cur->db->table_prefix . $this->table();
+        $categoryTreeCol = $this->colPrefix().'tree_path';
+        $categoryTable = \App::$cur->db->table_prefix.$this->table();
         if ($oldPath) {
             \App::$cur->db->query('UPDATE
-                ' . $categoryTable . ' 
+                ' . $categoryTable.' 
                     SET 
-                        ' . $categoryTreeCol . ' = REPLACE(' . $categoryTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $categoryTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $categoryTreeCol.' = REPLACE('.$categoryTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $categoryTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
 
             \App::$cur->db->query('UPDATE
-                ' . $itemsTable . '
+                ' . $itemsTable.'
                     SET 
-                        ' . $itemTreeCol . ' = REPLACE(' . $itemTreeCol . ', "' . $oldPath . $this->id . '/' . '", "' . $this->tree_path . $this->id . '/' . '") 
-                    WHERE ' . $itemTreeCol . ' LIKE "' . $oldPath . $this->id . '/' . '%"');
+                        ' . $itemTreeCol.' = REPLACE('.$itemTreeCol.', "'.$oldPath.$this->id.'/'.'", "'.$this->tree_path.$this->id.'/'.'") 
+                    WHERE ' . $itemTreeCol.' LIKE "'.$oldPath.$this->id.'/'.'%"');
         }
-        $itemModel::update([$itemTreeCol => $this->tree_path . $this->id . '/'], [$itemModel::colPrefix() . $this->index(), $this->id]);
+        $itemModel::update([$itemTreeCol => $this->tree_path.$this->id.'/'], [$itemModel::colPrefix().$this->index(), $this->id]);
     }
 
     /**
@@ -1256,9 +1256,9 @@ 
         $catalogParent = $catalogClass::get($catalog->parent_id);
         if ($catalog && $catalogParent) {
             if ($catalogParent->tree_path) {
-                return $catalogParent->tree_path . $catalogParent->id . '/';
+                return $catalogParent->tree_path.$catalogParent->id.'/';
             } else {
-                return $this->getCatalogTree($catalogParent) . $catalogParent->id . '/';
+                return $this->getCatalogTree($catalogParent).$catalogParent->id.'/';
             }
         }
         return '/';
@@ -1273,7 +1273,7 @@ 
         $categoryModel = $class::$categoryModel;
         $category = $categoryModel::get($this->{$categoryModel::index()});
         if ($category) {
-            $this->tree_path = $category->tree_path . $category->pk() . '/';
+            $this->tree_path = $category->tree_path.$category->pk().'/';
         } else {
             $this->tree_path = '/';
         }
@@ -1299,7 +1299,7 @@ 
             $this->changeCategoryTree();
         }
         if (!empty($this->_changedParams) && $this->pk()) {
-            Inji::$inst->event('modelItemParamsChanged-' . get_called_class(), $this);
+            Inji::$inst->event('modelItemParamsChanged-'.get_called_class(), $this);
         }
         $this->beforeSave();
 
@@ -1337,7 +1337,7 @@ 
         }
         $this->_params = $result->fetch();
         if ($new) {
-            Inji::$inst->event('modelCreatedItem-' . get_called_class(), $this);
+            Inji::$inst->event('modelCreatedItem-'.get_called_class(), $this);
         }
         $this->afterSave();
         return $this->{$this->index()};
@@ -1483,7 +1483,7 @@ 
         static::fixPrefix($params);
         $className = get_called_class();
         foreach ($params as $paramName => $value) {
-            $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $paramName);
+            $shortName = preg_replace('!'.$this->colPrefix().'!', '', $paramName);
             if (!empty($className::$cols[$shortName])) {
                 switch ($className::$cols[$shortName]['type']) {
                     case 'decimal':
@@ -1763,7 +1763,7 @@ 
     {
         static::fixPrefix($name);
         $className = get_called_class();
-        $shortName = preg_replace('!' . $this->colPrefix() . '!', '', $name);
+        $shortName = preg_replace('!'.$this->colPrefix().'!', '', $name);
         if (!empty($className::$cols[$shortName])) {
             switch ($className::$cols[$shortName]['type']) {
                 case 'decimal':

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