injitools / cms-Inji

system/modules/Db/objects/Mysql/Query.php

Spacing +14 added lines, -14 removed lines

@@ -190,15 +190,15 @@ 
                     $newValue = '';
                     foreach ($value as $item) {
                         if ($newValue) {
-                            $newValue.=',';
+                            $newValue .= ',';
                         }
                         if (is_string($item)) {
-                            $newValue .='"' . $item . '"';
+                            $newValue .= '"'.$item.'"';
                         } else {
-                            $newValue .=$item;
+                            $newValue .= $item;
                         }
                     }
-                    $value = '(' . $newValue . ')';
+                    $value = '('.$newValue.')';
                 } elseif (!preg_match('!\(!', $value) && !preg_match('![^0-9,\.\(\) ]!', $value))
                     $value = "({$value})";
                 elseif (preg_match('!\(!', $value) && preg_match('![^0-9,\.\(\) ]!', $value))
@@ -262,8 +262,8 @@ 
 
         switch ($this->operation) {
             case 'SELECT':
-                $query .= ' ' . ($this->distinct ? 'DISTINCT' : '');
-                $query .= ' ' . (!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
+                $query .= ' '.($this->distinct ? 'DISTINCT' : '');
+                $query .= ' '.(!$this->cols ? '*' : ((is_array($this->cols) ? implode(',', $this->cols) : $this->cols)));
             case 'DELETE':
                 $query .= ' FROM';
                 break;
@@ -280,9 +280,9 @@ 
                 $this->params = array_merge($this->params, array_values($this->cols));
                 $colsStr = '';
                 if ($this->cols) {
-                    $colsStr = '`' . implode('`,`', array_keys($this->cols)) . '`';
+                    $colsStr = '`'.implode('`,`', array_keys($this->cols)).'`';
                 }
-                $query .= ' (' . $colsStr . ') VALUES (' . rtrim(str_repeat('?,', count($this->cols)), ',') . ')';
+                $query .= ' ('.$colsStr.') VALUES ('.rtrim(str_repeat('?,', count($this->cols)), ',').')';
                 break;
             case 'CREATE TABLE':
                 $query .= " (";
@@ -294,7 +294,7 @@ 
                 }
                 $query = rtrim($query, ',');
                 if ($this->indexes) {
-                    $query .= ', ' . implode(',', $this->indexes);
+                    $query .= ', '.implode(',', $this->indexes);
                 }
                 $query .= ") ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci";
                 break;
@@ -309,23 +309,23 @@ 
                     }
                 }
                 $update = implode(',', $updates);
-                $query .=" SET {$update}";
+                $query .= " SET {$update}";
             case 'SELECT':
             case 'DELETE':
                 $this->buildWhere($this->where);
                 if ($this->whereString) {
-                    $query .= ' ' . $this->whereString;
+                    $query .= ' '.$this->whereString;
                 }
                 break;
         }
         if ($this->group) {
-            $query .= ' GROUP BY ' . implode(',', $this->group);
+            $query .= ' GROUP BY '.implode(',', $this->group);
         }
         if ($this->order) {
-            $query .= ' ORDER BY ' . implode(',', $this->order);
+            $query .= ' ORDER BY '.implode(',', $this->order);
         }
         if ($this->limit) {
-            $query .= ' ' . $this->limit;
+            $query .= ' '.$this->limit;
         }
         return ['query' => $query, 'params' => $this->params];
     }

system/modules/Db/Db.php

Spacing +5 added lines, -5 removed lines

@@ -23,16 +23,16 @@ 
         } else {
             $db = $param;
         }
-        $className = 'Db\\' . $db['driver'];
+        $className = 'Db\\'.$db['driver'];
         $this->connection = new $className();
         $this->connection->init($db);
         $this->connection->dbInstance = $this;
         $this->connect = $this->connection->connect;
         $this->dbConfig = $db;
 
-        $this->className = 'Db\\' . $this->dbConfig['driver'];
-        $this->QueryClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Query';
-        $this->ResultClassName = 'Db\\' . $this->dbConfig['driver'] . '\\Result';
+        $this->className = 'Db\\'.$this->dbConfig['driver'];
+        $this->QueryClassName = 'Db\\'.$this->dbConfig['driver'].'\\Query';
+        $this->ResultClassName = 'Db\\'.$this->dbConfig['driver'].'\\Result';
     }
 
     public function __call($name, $params)
@@ -55,7 +55,7 @@ 
 
     public function newQuery()
     {
-        if($this->QueryClassName) {
+        if ($this->QueryClassName) {
             return new $this->QueryClassName($this->connection);
         }
         return false;

system/modules/Materials/models/Category.php

Spacing +2 added lines, -2 removed lines

@@ -102,10 +102,10 @@
         if ($treePath) {
             $categorys = Category::getList(['where' => ['id', implode(',', $treePath), 'IN']]);
             foreach ($categorys as $category) {
-                $href .="/{$category->alias}";
+                $href .= "/{$category->alias}";
             }
         }
-        return $href . "/" . ($this->alias ? $this->alias : $this->pk());
+        return $href."/".($this->alias ? $this->alias : $this->pk());
     }
 
     public static function relations()

system/modules/Materials/appControllers/MaterialsController.php

Spacing +7 added lines, -7 removed lines

@@ -97,8 +97,8 @@ 
         } else {
             $this->view->setTitle($category->name);
 
-            $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE']]), 'limit' => 10]);
-            $materials = Materials\Material::getList(['where' => ['tree_path', $category->tree_path . $category->id . '/%', 'LIKE'], 'order' => ['date_create', 'desc'], 'start' => $pages->params['start'], 'limit' => $pages->params['limit']]);
+            $pages = new Ui\Pages($_GET, ['count' => Materials\Material::getCount(['where' => ['tree_path', $category->tree_path.$category->id.'/%', 'LIKE']]), 'limit' => 10]);
+            $materials = Materials\Material::getList(['where' => ['tree_path', $category->tree_path.$category->id.'/%', 'LIKE'], 'order' => ['date_create', 'desc'], 'start' => $pages->params['start'], 'limit' => $pages->params['limit']]);
 
             $this->view->page(['page' => $category->resolveTemplate(), 'content' => $category->resolveViewer(), 'data' => compact('materials', 'pages', 'category')]);
         }
@@ -132,17 +132,17 @@ 
             $this->view->addMetaTag(['name' => 'description', 'content' => $material->description]);
         }
         $this->view->addMetaTag(['property' => 'og:title', 'content' => $material->name]);
-        $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->alias]);
+        $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->alias]);
         if ($material->description) {
-            $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/' . $material->description]);
+            $this->view->addMetaTag(['property' => 'og:description', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).'/'.$material->description]);
         }
         if ($material->image) {
-            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $material->image->path]);
+            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$material->image->path]);
         } elseif ($logo = Files\File::get('site_logo', 'code')) {
-            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . idn_to_utf8(INJI_DOMAIN_NAME) . $logo->path]);
+            $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.idn_to_utf8(INJI_DOMAIN_NAME).$logo->path]);
         }
         $this->view->setTitle($material->name);
-        $bread[] = ['text' => $material->name, 'href' => '/' . $material->alias];
+        $bread[] = ['text' => $material->name, 'href' => '/'.$material->alias];
         $this->view->page([
             'page' => $material->resolveTemplate(),
             'content' => $material->resolveViewer(),

system/modules/Materials/Materials.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;
@@ -76,7 +76,7 @@ 
 
         if (!empty($conf['files']['aditionTemplateFiels'])) {
             foreach ($conf['files']['aditionTemplateFiels'] as $file) {
-                $return[$file['file']] = '- ' . $file['name'];
+                $return[$file['file']] = '- '.$file['name'];
             }
         }
         return $return;

system/objects/CodeGenerator/Property.php

Spacing +3 added lines, -3 removed lines

@@ -20,13 +20,13 @@
 
     public function generate()
     {
-        $code = $this->security . ' ';
+        $code = $this->security.' ';
         $code .= $this->static ? 'static ' : '';
-        $code .= '$' . $this->name . ' = ';
+        $code .= '$'.$this->name.' = ';
         if (is_array($this->value)) {
             $code .= \CodeGenerator::genArray($this->value);
         } else {
-            $code .= '"' . str_replace('"', '\"', $this->value) . '";';
+            $code .= '"'.str_replace('"', '\"', $this->value).'";';
         }
         return $code;
     }

system/objects/CodeGenerator/Method.php

Spacing +6 added lines, -6 removed lines

@@ -21,16 +21,16 @@
 
     public function generate()
     {
-        $code = $this->security . ' ';
+        $code = $this->security.' ';
         $code .= $this->static ? 'static ' : '';
-        $code .= 'function ' . $this->name . '(';
+        $code .= 'function '.$this->name.'(';
         foreach ($this->propertys as $param) {
-            $code .= '$' . $param . ',';
+            $code .= '$'.$param.',';
         }
         $code = rtrim($code, ',');
-        $code.= ") {\n";
-        $code.= '    ' . str_replace("\n", "\n    ", $this->body);
-        $code .="\n}";
+        $code .= ") {\n";
+        $code .= '    '.str_replace("\n", "\n    ", $this->body);
+        $code .= "\n}";
         return $code;
     }
 

system/objects/CodeGenerator/ClassGenerator.php

Spacing +4 added lines, -4 removed lines

@@ -39,16 +39,16 @@
 
     public function generate()
     {
-        $code = 'class ' . $this->name . ' ';
+        $code = 'class '.$this->name.' ';
         if ($this->extends) {
-            $code .= 'extends ' . $this->extends . ' ';
+            $code .= 'extends '.$this->extends.' ';
         }
         $code .= "{\n";
         foreach ($this->propertys as $property) {
-            $code .= '    ' . str_replace("\n", "\n    ", $property->generate()) . "\n";
+            $code .= '    '.str_replace("\n", "\n    ", $property->generate())."\n";
         }
         foreach ($this->methods as $method) {
-            $code .= '    ' . str_replace("\n", "\n    ", $method->generate()) . "\n";
+            $code .= '    '.str_replace("\n", "\n    ", $method->generate())."\n";
         }
         $code .= "}\n";
         return $code;

system/objects/CodeGenerator.php

Spacing +3 added lines, -3 removed lines

@@ -16,17 +16,17 @@
         if ($level == 0)
             $return = "[";
         foreach ($data as $key => $item) {
-            $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "'{$key}' => ";
+            $return .= "\n".str_repeat(' ', ($level * 4 + 4))."'{$key}' => ";
             if (!is_array($item))
                 $return .= "'{$item}',";
             else {
                 $return .= "[";
                 $return .= rtrim(self::genArray($item, $level + 1), ',');
-                $return .= "\n" . str_repeat(' ', ( $level * 4 + 4)) . "],";
+                $return .= "\n".str_repeat(' ', ($level * 4 + 4))."],";
             }
         }
         if ($level == 0)
-            $return = rtrim($return, ',') . "\n];";
+            $return = rtrim($return, ',')."\n];";
 
         return $return;
     }