Inspection of "Initial commit for 0.3.0" - cadmium-org/cadmium-cms - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Branch — 0.3.0 (b16461)

by Anton

created 2016-04-16 17:41 UTC

Status

Braces +39 added lines, -17 removed lines patch added patch discarded remove patch

@@ -20,15 +20,15 @@  discard block
 block discarded – undo
 
 			# Set create button
 
-			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) $parent->block('create')->id = $this->parent->id;
-
-			else { $parent->block('create')->disable(); $parent->block('create_disabled')->enable(); }
+			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) {
+				$parent->block('create')->id = $this->parent->id;
+			} else { $parent->block('create')->disable(); $parent->block('create_disabled')->enable(); }
 
 			# Set edit button
 
-			if (0 !== $this->parent->id) $parent->block('edit')->id = $this->parent->id;
-
-			else { $parent->block('edit')->disable(); $parent->block('edit_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->block('edit')->id = $this->parent->id;
+			} else { $parent->block('edit')->disable(); $parent->block('edit_disabled')->enable(); }
 
 			# Add parent additional data
 
@@ -43,7 +43,9 @@  discard block
 block discarded – undo
 
 			foreach ($this->items['list'] as $item) {
 
-				if ((null !== $this->entity) && ($item['entity']->id === $this->entity->id)) continue;
+				if ((null !== $this->entity) && ($item['entity']->id === $this->entity->id)) {
+					continue;
+				}
 
 				$items->add($view = View::get(!$ajax ? static::$view_item : static::$view_ajax_item));
 
@@ -101,21 +103,29 @@  discard block
 block discarded – undo
 
 			# Set path
 
-			if (static::$nesting) $contents->path = $this->path;
+			if (static::$nesting) {
+				$contents->path = $this->path;
+			}
 
 			# Process parent block
 
-			if (static::$nesting && !$ajax) $this->processParent($contents->block('parent'));
+			if (static::$nesting && !$ajax) {
+				$this->processParent($contents->block('parent'));
+			}
 
 			# Set items
 
 			$items = $this->getItemsBlock($ajax);
 
-			if ($items->count() > 0) $contents->items = $items;
+			if ($items->count() > 0) {
+				$contents->items = $items;
+			}
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# ------------------------
 
@@ -140,15 +150,21 @@  discard block
 block discarded – undo
 
 			# Get path and depth
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
-			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) $this->depth = $depth;
+			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) {
+				$this->depth = $depth;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'children' : 'items');
 
-			if (false !== ($items = $this->parent->$lister())) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister())) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 
@@ -159,7 +175,9 @@  discard block
 block discarded – undo
 
 		public function handle() {
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			$this->index = Number::format(Request::get('index'), 1, 999999);
 
@@ -171,13 +189,17 @@  discard block
 block discarded – undo
 
 			# Get path
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'children' : 'items'); $index = $this->index; $display = static::$display;
 
-			if (false !== ($items = $this->parent->$lister([], [], $index, $display))) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister([], [], $index, $display))) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Utils/Treeview.php 3 patches

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
 
 			return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
 
-			       ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
+				   ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
 
 				   ("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
 		}
@@ -23,13 +23,13 @@  discard block
 block discarded – undo
 
 			return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
 
-			       ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
+				   ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
 
-			       ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
+				   ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+				   (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
 
-			       ("GROUP BY ent.id ORDER BY rel.depth ASC, " . $this->getOrderBy($order_by));
+				   ("GROUP BY ent.id ORDER BY rel.depth ASC, " . $this->getOrderBy($order_by));
 		}
 
 		# Get count query
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
 
 			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
 
-			       $this->getQueryJoin($parent_id);
+				   $this->getQueryJoin($parent_id);
 		}
 
 		# Get depth query
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
 
 			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
 
-			         $this->getQueryJoin($parent_id);
+					 $this->getQueryJoin($parent_id);
 
 			# ------------------------
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
 
 			$query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
 
-			         ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
+					 ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
 
 					 ("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
 

Please login to merge, or discard this patch.

Spacing +12 added lines, -14 removed lines patch added patch discarded remove patch

@@ -10,33 +10,31 @@  discard block
 block discarded – undo
 
 		protected function getQueryJoin(int $parent_id) {
 
-			return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
+			return (0 !== $parent_id) ? (("JOIN ".static::$table_relations." rel ").
 
-			       ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
-
-				   ("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
+			       ("ON rel.ancestor = ".$parent_id." AND rel.descendant = ent.id AND rel.depth >= 1")) : ("JOIN ".static::$table_relations." rel ON rel.descendant = ent.id");
 		}
 
 		# Get select query
 
 		private function getSelectQuery(int $parent_id, array $config, array $order_by) {
 
-			return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
+			return ("SELECT ".$this->getSelection().", COALESCE(par.ancestor, 0) as parent_id ").
 
-			       ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
+			       ("FROM ".static::$table." ent ".$this->getQueryJoin($parent_id)." ").
 
-			       ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
+			       ("LEFT JOIN ".static::$table_relations." par ON par.descendant = ent.id AND par.depth = 1 ").
 
-			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
+			       (('' !== ($condition = $this->getCondition($config))) ? ("WHERE ".$condition." ") : "").
 
-			       ("GROUP BY ent.id ORDER BY rel.depth ASC, " . $this->getOrderBy($order_by));
+			       ("GROUP BY ent.id ORDER BY rel.depth ASC, ".$this->getOrderBy($order_by));
 		}
 
 		# Get count query
 
 		private function getCountQuery(int $parent_id) {
 
-			return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
+			return ("SELECT COUNT(DISTINCT ent.id) as count FROM ".static::$table." ent ").
 
 			       $this->getQueryJoin($parent_id);
 		}
@@ -45,7 +43,7 @@  discard block
 block discarded – undo
 
 		private function getDepthQuery(int $parent_id) {
 
-			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
+			$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM ".static::$table." ent ").
 
 			         $this->getQueryJoin($parent_id);
 
@@ -126,11 +124,11 @@  discard block
 block discarded – undo
 
 			# Process query
 
-			$query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
+			$query = ("SELECT ".$this->getSelection()." FROM ".static::$table." ent ").
 
-			         ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
+			         ("JOIN ".static::$table_relations." rel ON rel.ancestor = ent.id ").
 
-					 ("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
+					 ("WHERE rel.descendant = ".$parent_id." ORDER BY rel.depth DESC");
 
 			# Select path
 

Please login to merge, or discard this patch.

Braces +27 added lines, -9 removed lines patch added patch discarded remove patch

@@ -58,13 +58,17 @@  discard block
 block discarded – undo
 
 		public function subtree(int $parent_id = 0, array $config = [], array $order_by = []) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Select entities
 
 			$query = $this->getSelectQuery($parent_id, $config, $order_by);
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Process results
 
@@ -88,13 +92,17 @@  discard block
 block discarded – undo
 
 		public function subtreeCount(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Get count
 
 			$query = $this->getCountQuery($parent_id);
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -105,13 +113,17 @@  discard block
 block discarded – undo
 
 		public function subtreeDepth(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Get depth
 
 			$query = $this->getDepthQuery($parent_id);
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -122,7 +134,9 @@  discard block
 block discarded – undo
 
 		public function path(int $parent_id = 0) {
 
-			if (!(static::$nesting && ($parent_id >= 0))) return false;
+			if (!(static::$nesting && ($parent_id >= 0))) {
+				return false;
+			}
 
 			# Process query
 
@@ -134,13 +148,17 @@  discard block
 block discarded – undo
 
 			# Select path
 
-			if (!(DB::send($query) && DB::last()->status)) return false;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return false;
+			}
 
 			# Process results
 
 			$path = [];
 
-			while (null !== ($data = DB::last()->row())) $path[] = Entitizer::create(static::$table, $data)->data();
+			while (null !== ($data = DB::last()->row())) {
+				$path[] = Entitizer::create(static::$table, $data)->data();
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Definition/User/Session.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -14,19 +14,19 @@
 block discarded – undo
 
 			# Add params
 
-			$this->params->textual      ('code',                true, 40, true, '');
-			$this->params->textual      ('ip',                  true, 255, false, '');
-			$this->params->integer      ('time',                false, 10, true, 0);
+			$this->params->textual('code', true, 40, true, '');
+			$this->params->textual('ip', true, 255, false, '');
+			$this->params->integer('time', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add         ('code',                'UNIQUE');
-			$this->indexes->add         ('ip');
-			$this->indexes->add         ('time');
+			$this->indexes->add('code', 'UNIQUE');
+			$this->indexes->add('ip');
+			$this->indexes->add('time');
 
 			# Add foreign keys
 
-			$this->foreigns->add        ('id',                  TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
+			$this->foreigns->add('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
 		}
 	}
 }

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Definition/Page.php 1 patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -14,29 +14,29 @@
 block discarded – undo
 
 			# Add params
 
-			$this->params->integer      ('visibility',          true, 1, true, VISIBILITY_DRAFT);
-			$this->params->integer      ('access',              true, 1, true, ACCESS_PUBLIC);
-			$this->params->boolean      ('locked',              true);
-			$this->params->textual      ('slug',                true, 255, false, '');
-			$this->params->textual      ('name',                true, 255, false, '');
-			$this->params->textual      ('title',               true, 255, false, '');
-			$this->params->textual      ('contents',            false, 0, false, '');
-			$this->params->textual      ('description',         false, 0, false, '');
-			$this->params->textual      ('keywords',            false, 0, false, '');
-			$this->params->boolean      ('robots_index',        false);
-			$this->params->boolean      ('robots_follow',       false);
-			$this->params->integer      ('time_created',        false, 10, true, 0);
-			$this->params->integer      ('time_modified',       false, 10, true, 0);
+			$this->params->integer('visibility', true, 1, true, VISIBILITY_DRAFT);
+			$this->params->integer('access', true, 1, true, ACCESS_PUBLIC);
+			$this->params->boolean('locked', true);
+			$this->params->textual('slug', true, 255, false, '');
+			$this->params->textual('name', true, 255, false, '');
+			$this->params->textual('title', true, 255, false, '');
+			$this->params->textual('contents', false, 0, false, '');
+			$this->params->textual('description', false, 0, false, '');
+			$this->params->textual('keywords', false, 0, false, '');
+			$this->params->boolean('robots_index', false);
+			$this->params->boolean('robots_follow', false);
+			$this->params->integer('time_created', false, 10, true, 0);
+			$this->params->integer('time_modified', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add         ('visibility');
-			$this->indexes->add         ('access');
-			$this->indexes->add         ('slug');
-			$this->indexes->add         ('name');
-			$this->indexes->add         ('title');
-			$this->indexes->add         ('time_created');
-			$this->indexes->add         ('time_modified');
+			$this->indexes->add('visibility');
+			$this->indexes->add('access');
+			$this->indexes->add('slug');
+			$this->indexes->add('name');
+			$this->indexes->add('title');
+			$this->indexes->add('time_created');
+			$this->indexes->add('time_modified');
 		}
 	}
 }

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Definition/Widget.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -14,16 +14,16 @@
 block discarded – undo
 
 			# Add params
 
-			$this->params->boolean      ('active',              false);
-			$this->params->textual      ('name',                true, 255, false, '');
-			$this->params->textual      ('title',               true, 255, false, '');
-			$this->params->textual      ('contents',            false, 0, false, '');
+			$this->params->boolean('active', false);
+			$this->params->textual('name', true, 255, false, '');
+			$this->params->textual('title', true, 255, false, '');
+			$this->params->textual('contents', false, 0, false, '');
 
 			# Add indexes
 
-			$this->indexes->add         ('active');
-			$this->indexes->add         ('name',                'UNIQUE');
-			$this->indexes->add         ('title');
+			$this->indexes->add('active');
+			$this->indexes->add('name', 'UNIQUE');
+			$this->indexes->add('title');
 		}
 	}
 }

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Definition/Menuitem.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -14,16 +14,16 @@
 block discarded – undo
 
 			# Add params
 
-			$this->params->boolean      ('active',              false);
-			$this->params->integer      ('position',            true, 2, true, 0);
-			$this->params->textual      ('slug',                true, 255, false, '');
-			$this->params->textual      ('text',                true, 255, false, '');
-			$this->params->integer      ('target',              true, 1, true, TARGET_SELF);
+			$this->params->boolean('active', false);
+			$this->params->integer('position', true, 2, true, 0);
+			$this->params->textual('slug', true, 255, false, '');
+			$this->params->textual('text', true, 255, false, '');
+			$this->params->integer('target', true, 1, true, TARGET_SELF);
 
 			# Add indexes
 
-			$this->indexes->add         ('active');
-			$this->indexes->add         ('position');
+			$this->indexes->add('active');
+			$this->indexes->add('position');
 		}
 	}
 }

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Definition/Variable.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -14,14 +14,14 @@
 block discarded – undo
 
 			# Add params
 
-			$this->params->textual      ('name',                true, 255, false, '');
-			$this->params->textual      ('title',               true, 255, false, '');
-			$this->params->textual      ('value',               true, 255, false, '');
+			$this->params->textual('name', true, 255, false, '');
+			$this->params->textual('title', true, 255, false, '');
+			$this->params->textual('value', true, 255, false, '');
 
 			# Add indexes
 
-			$this->indexes->add         ('name',                'UNIQUE');
-			$this->indexes->add         ('title');
+			$this->indexes->add('name', 'UNIQUE');
+			$this->indexes->add('title');
 		}
 	}
 }

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Definition/User.php 1 patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

@@ -14,27 +14,27 @@
 block discarded – undo
 
 			# Add params
 
-			$this->params->integer      ('rank',                true, 1, true, RANK_GUEST);
-			$this->params->textual      ('name',                true, 16, false, '');
-			$this->params->textual      ('email',               true, 128, false, '');
-			$this->params->textual      ('auth_key',            true, 40, true, '');
-			$this->params->textual      ('password',            true, 40, true, '');
-			$this->params->textual      ('first_name',          true, 255, false, '');
-			$this->params->textual      ('last_name',           true, 255, false, '');
-			$this->params->integer      ('sex',                 true, 1, true, SEX_NOT_SELECTED);
-			$this->params->textual      ('city',                true, 255, false, '');
-			$this->params->textual      ('country',             true, 2, false, '');
-			$this->params->textual      ('timezone',            true, 40, false, '');
-			$this->params->integer      ('time_registered',     false, 10, true, 0);
-			$this->params->integer      ('time_logged',         false, 10, true, 0);
+			$this->params->integer('rank', true, 1, true, RANK_GUEST);
+			$this->params->textual('name', true, 16, false, '');
+			$this->params->textual('email', true, 128, false, '');
+			$this->params->textual('auth_key', true, 40, true, '');
+			$this->params->textual('password', true, 40, true, '');
+			$this->params->textual('first_name', true, 255, false, '');
+			$this->params->textual('last_name', true, 255, false, '');
+			$this->params->integer('sex', true, 1, true, SEX_NOT_SELECTED);
+			$this->params->textual('city', true, 255, false, '');
+			$this->params->textual('country', true, 2, false, '');
+			$this->params->textual('timezone', true, 40, false, '');
+			$this->params->integer('time_registered', false, 10, true, 0);
+			$this->params->integer('time_logged', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add         ('rank');
-			$this->indexes->add         ('name',                'UNIQUE');
-			$this->indexes->add         ('email',               'UNIQUE');
-			$this->indexes->add         ('time_registered');
-			$this->indexes->add         ('time_logged');
+			$this->indexes->add('rank');
+			$this->indexes->add('name', 'UNIQUE');
+			$this->indexes->add('email', 'UNIQUE');
+			$this->indexes->add('time_registered');
+			$this->indexes->add('time_logged');
 		}
 	}
 }

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Entitizer/Entitizer.php 1 patch

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

@@ -25,9 +25,13 @@  discard block
 block discarded – undo
 
 		public static function get(string $table, int $id = 0) {
 
-			if (!isset(self::$classes[$table])) throw new Exception\General(self::$error_message);
+			if (!isset(self::$classes[$table])) {
+				throw new Exception\General(self::$error_message);
+			}
 
-			if (isset(self::$cache[$table][$id])) return self::$cache[$table][$id];
+			if (isset(self::$cache[$table][$id])) {
+				return self::$cache[$table][$id];
+			}
 
 			$entity = new self::$classes[$table]; $entity->init($id);
 
@@ -40,7 +44,9 @@  discard block
 block discarded – undo
 
 		public static function create(string $table, array $data = []) {
 
-			if (!isset(self::$classes[$table])) throw new Exception\General(self::$error_message);
+			if (!isset(self::$classes[$table])) {
+				throw new Exception\General(self::$error_message);
+			}
 
 			$entity = new self::$classes[$table]($data);
 

Please login to merge, or discard this patch.

		@@ -20,15 +20,15 @@ discard block
		block discarded – undo
20	20
21	21	# Set create button
22	22
23		- if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) $parent->block('create')->id = $this->parent->id;
24		-
25		- else { $parent->block('create')->disable(); $parent->block('create_disabled')->enable(); }
	23	+ if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) {
	24	+ $parent->block('create')->id = $this->parent->id;
	25	+ } else { $parent->block('create')->disable(); $parent->block('create_disabled')->enable(); }
26	26
27	27	# Set edit button
28	28
29		- if (0 !== $this->parent->id) $parent->block('edit')->id = $this->parent->id;
30		-
31		- else { $parent->block('edit')->disable(); $parent->block('edit_disabled')->enable(); }
	29	+ if (0 !== $this->parent->id) {
	30	+ $parent->block('edit')->id = $this->parent->id;
	31	+ } else { $parent->block('edit')->disable(); $parent->block('edit_disabled')->enable(); }
32	32
33	33	# Add parent additional data
34	34
		@@ -43,7 +43,9 @@ discard block
		block discarded – undo
43	43
44	44	foreach ($this->items['list'] as $item) {
45	45
46		- if ((null !== $this->entity) && ($item['entity']->id === $this->entity->id)) continue;
	46	+ if ((null !== $this->entity) && ($item['entity']->id === $this->entity->id)) {
	47	+ continue;
	48	+ }
47	49
48	50	$items->add($view = View::get(!$ajax ? static::$view_item : static::$view_ajax_item));
49	51
		@@ -101,21 +103,29 @@ discard block
		block discarded – undo
101	103
102	104	# Set path
103	105
104		- if (static::$nesting) $contents->path = $this->path;
	106	+ if (static::$nesting) {
	107	+ $contents->path = $this->path;
	108	+ }
105	109
106	110	# Process parent block
107	111
108		- if (static::$nesting && !$ajax) $this->processParent($contents->block('parent'));
	112	+ if (static::$nesting && !$ajax) {
	113	+ $this->processParent($contents->block('parent'));
	114	+ }
109	115
110	116	# Set items
111	117
112	118	$items = $this->getItemsBlock($ajax);
113	119
114		- if ($items->count() > 0) $contents->items = $items;
	120	+ if ($items->count() > 0) {
	121	+ $contents->items = $items;
	122	+ }
115	123
116	124	# Set pagination
117	125
118		- if (!$ajax) $contents->pagination = $this->getPaginationBlock();
	126	+ if (!$ajax) {
	127	+ $contents->pagination = $this->getPaginationBlock();
	128	+ }
119	129
120	130	# ------------------------
121	131
		@@ -140,15 +150,21 @@ discard block
		block discarded – undo
140	150
141	151	# Get path and depth
142	152
143		- if (false !== ($path = $this->parent->path())) $this->path = $path;
	153	+ if (false !== ($path = $this->parent->path())) {
	154	+ $this->path = $path;
	155	+ }
144	156
145		- if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) $this->depth = $depth;
	157	+ if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->subtreeDepth()))) {
	158	+ $this->depth = $depth;
	159	+ }
146	160
147	161	# Get items list
148	162
149	163	$lister = (static::$nesting ? 'children' : 'items');
150	164
151		- if (false !== ($items = $this->parent->$lister())) $this->items = $items;
	165	+ if (false !== ($items = $this->parent->$lister())) {
	166	+ $this->items = $items;
	167	+ }
152	168
153	169	# ------------------------
154	170
		@@ -159,7 +175,9 @@ discard block
		block discarded – undo
159	175
160	176	public function handle() {
161	177
162		- if (Request::isAjax()) return $this->handleAjax();
	178	+ if (Request::isAjax()) {
	179	+ return $this->handleAjax();
	180	+ }
163	181
164	182	$this->index = Number::format(Request::get('index'), 1, 999999);
165	183
		@@ -171,13 +189,17 @@ discard block
		block discarded – undo
171	189
172	190	# Get path
173	191
174		- if (false !== ($path = $this->parent->path())) $this->path = $path;
	192	+ if (false !== ($path = $this->parent->path())) {
	193	+ $this->path = $path;
	194	+ }
175	195
176	196	# Get items list
177	197
178	198	$lister = (static::$nesting ? 'children' : 'items'); $index = $this->index; $display = static::$display;
179	199
180		- if (false !== ($items = $this->parent->$lister([], [], $index, $display))) $this->items = $items;
	200	+ if (false !== ($items = $this->parent->$lister([], [], $index, $display))) {
	201	+ $this->items = $items;
	202	+ }
181	203
182	204	# ------------------------
183	205

		@@ -12,7 +12,7 @@ discard block
		block discarded – undo
12	12
13	13	return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
14	14
15		- ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
	15	+ ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
16	16
17	17	("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
18	18	}
		@@ -23,13 +23,13 @@ discard block
		block discarded – undo
23	23
24	24	return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
25	25
26		- ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
	26	+ ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
27	27
28		- ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
	28	+ ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
29	29
30		- (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
	30	+ (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
31	31
32		- ("GROUP BY ent.id ORDER BY rel.depth ASC, " . $this->getOrderBy($order_by));
	32	+ ("GROUP BY ent.id ORDER BY rel.depth ASC, " . $this->getOrderBy($order_by));
33	33	}
34	34
35	35	# Get count query
		@@ -38,7 +38,7 @@ discard block
		block discarded – undo
38	38
39	39	return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
40	40
41		- $this->getQueryJoin($parent_id);
	41	+ $this->getQueryJoin($parent_id);
42	42	}
43	43
44	44	# Get depth query
		@@ -47,7 +47,7 @@ discard block
		block discarded – undo
47	47
48	48	$query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
49	49
50		- $this->getQueryJoin($parent_id);
	50	+ $this->getQueryJoin($parent_id);
51	51
52	52	# ------------------------
53	53
		@@ -128,7 +128,7 @@ discard block
		block discarded – undo
128	128
129	129	$query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
130	130
131		- ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
	131	+ ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
132	132
133	133	("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
134	134

		@@ -10,33 +10,31 @@ discard block
		block discarded – undo
10	10
11	11	protected function getQueryJoin(int $parent_id) {
12	12
13		- return (0 !== $parent_id) ? (("JOIN " . static::$table_relations . " rel ") .
	13	+ return (0 !== $parent_id) ? (("JOIN ".static::$table_relations." rel ").
14	14
15		- ("ON rel.ancestor = " . $parent_id . " AND rel.descendant = ent.id AND rel.depth >= 1")) :
16		-
17		- ("JOIN " . static::$table_relations . " rel ON rel.descendant = ent.id");
	15	+ ("ON rel.ancestor = ".$parent_id." AND rel.descendant = ent.id AND rel.depth >= 1")) : ("JOIN ".static::$table_relations." rel ON rel.descendant = ent.id");
18	16	}
19	17
20	18	# Get select query
21	19
22	20	private function getSelectQuery(int $parent_id, array $config, array $order_by) {
23	21
24		- return ("SELECT " . $this->getSelection() . ", COALESCE(par.ancestor, 0) as parent_id ") .
	22	+ return ("SELECT ".$this->getSelection().", COALESCE(par.ancestor, 0) as parent_id ").
25	23
26		- ("FROM " . static::$table . " ent " . $this->getQueryJoin($parent_id) . " ") .
	24	+ ("FROM ".static::$table." ent ".$this->getQueryJoin($parent_id)." ").
27	25
28		- ("LEFT JOIN " . static::$table_relations . " par ON par.descendant = ent.id AND par.depth = 1 ") .
	26	+ ("LEFT JOIN ".static::$table_relations." par ON par.descendant = ent.id AND par.depth = 1 ").
29	27
30		- (('' !== ($condition = $this->getCondition($config))) ? ("WHERE " . $condition . " ") : "") .
	28	+ (('' !== ($condition = $this->getCondition($config))) ? ("WHERE ".$condition." ") : "").
31	29
32		- ("GROUP BY ent.id ORDER BY rel.depth ASC, " . $this->getOrderBy($order_by));
	30	+ ("GROUP BY ent.id ORDER BY rel.depth ASC, ".$this->getOrderBy($order_by));
33	31	}
34	32
35	33	# Get count query
36	34
37	35	private function getCountQuery(int $parent_id) {
38	36
39		- return ("SELECT COUNT(DISTINCT ent.id) as count FROM " . static::$table . " ent ") .
	37	+ return ("SELECT COUNT(DISTINCT ent.id) as count FROM ".static::$table." ent ").
40	38
41	39	$this->getQueryJoin($parent_id);
42	40	}
		@@ -45,7 +43,7 @@ discard block
		block discarded – undo
45	43
46	44	private function getDepthQuery(int $parent_id) {
47	45
48		- $query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM " . static::$table . " ent ") .
	46	+ $query = ("SELECT COUNT(DISTINCT rel.depth) as depth FROM ".static::$table." ent ").
49	47
50	48	$this->getQueryJoin($parent_id);
51	49
		@@ -126,11 +124,11 @@ discard block
		block discarded – undo
126	124
127	125	# Process query
128	126
129		- $query = ("SELECT " . $this->getSelection() . " FROM " . static::$table . " ent ") .
	127	+ $query = ("SELECT ".$this->getSelection()." FROM ".static::$table." ent ").
130	128
131		- ("JOIN " . static::$table_relations . " rel ON rel.ancestor = ent.id ") .
	129	+ ("JOIN ".static::$table_relations." rel ON rel.ancestor = ent.id ").
132	130
133		- ("WHERE rel.descendant = " . $parent_id . " ORDER BY rel.depth DESC");
	131	+ ("WHERE rel.descendant = ".$parent_id." ORDER BY rel.depth DESC");
134	132
135	133	# Select path
136	134

		@@ -58,13 +58,17 @@ discard block
		block discarded – undo
58	58
59	59	public function subtree(int $parent_id = 0, array $config = [], array $order_by = []) {
60	60
61		- if (!(static::$nesting && ($parent_id >= 0))) return false;
	61	+ if (!(static::$nesting && ($parent_id >= 0))) {
	62	+ return false;
	63	+ }
62	64
63	65	# Select entities
64	66
65	67	$query = $this->getSelectQuery($parent_id, $config, $order_by);
66	68
67		- if (!(DB::send($query) && DB::last()->status)) return false;
	69	+ if (!(DB::send($query) && DB::last()->status)) {
	70	+ return false;
	71	+ }
68	72
69	73	# Process results
70	74
		@@ -88,13 +92,17 @@ discard block
		block discarded – undo
88	92
89	93	public function subtreeCount(int $parent_id = 0) {
90	94
91		- if (!(static::$nesting && ($parent_id >= 0))) return false;
	95	+ if (!(static::$nesting && ($parent_id >= 0))) {
	96	+ return false;
	97	+ }
92	98
93	99	# Get count
94	100
95	101	$query = $this->getCountQuery($parent_id);
96	102
97		- if (!(DB::send($query) && DB::last()->status)) return false;
	103	+ if (!(DB::send($query) && DB::last()->status)) {
	104	+ return false;
	105	+ }
98	106
99	107	# ------------------------
100	108
		@@ -105,13 +113,17 @@ discard block
		block discarded – undo
105	113
106	114	public function subtreeDepth(int $parent_id = 0) {
107	115
108		- if (!(static::$nesting && ($parent_id >= 0))) return false;
	116	+ if (!(static::$nesting && ($parent_id >= 0))) {
	117	+ return false;
	118	+ }
109	119
110	120	# Get depth
111	121
112	122	$query = $this->getDepthQuery($parent_id);
113	123
114		- if (!(DB::send($query) && DB::last()->status)) return false;
	124	+ if (!(DB::send($query) && DB::last()->status)) {
	125	+ return false;
	126	+ }
115	127
116	128	# ------------------------
117	129
		@@ -122,7 +134,9 @@ discard block
		block discarded – undo
122	134
123	135	public function path(int $parent_id = 0) {
124	136
125		- if (!(static::$nesting && ($parent_id >= 0))) return false;
	137	+ if (!(static::$nesting && ($parent_id >= 0))) {
	138	+ return false;
	139	+ }
126	140
127	141	# Process query
128	142
		@@ -134,13 +148,17 @@ discard block
		block discarded – undo
134	148
135	149	# Select path
136	150
137		- if (!(DB::send($query) && DB::last()->status)) return false;
	151	+ if (!(DB::send($query) && DB::last()->status)) {
	152	+ return false;
	153	+ }
138	154
139	155	# Process results
140	156
141	157	$path = [];
142	158
143		- while (null !== ($data = DB::last()->row())) $path[] = Entitizer::create(static::$table, $data)->data();
	159	+ while (null !== ($data = DB::last()->row())) {
	160	+ $path[] = Entitizer::create(static::$table, $data)->data();
	161	+ }
144	162
145	163	# ------------------------
146	164

		@@ -14,19 +14,19 @@
		block discarded – undo
14	14
15	15	# Add params
16	16
17		- $this->params->textual ('code', true, 40, true, '');
18		- $this->params->textual ('ip', true, 255, false, '');
19		- $this->params->integer ('time', false, 10, true, 0);
	17	+ $this->params->textual('code', true, 40, true, '');
	18	+ $this->params->textual('ip', true, 255, false, '');
	19	+ $this->params->integer('time', false, 10, true, 0);
20	20
21	21	# Add indexes
22	22
23		- $this->indexes->add ('code', 'UNIQUE');
24		- $this->indexes->add ('ip');
25		- $this->indexes->add ('time');
	23	+ $this->indexes->add('code', 'UNIQUE');
	24	+ $this->indexes->add('ip');
	25	+ $this->indexes->add('time');
26	26
27	27	# Add foreign keys
28	28
29		- $this->foreigns->add ('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
	29	+ $this->foreigns->add('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
30	30	}
31	31	}
32	32	}

		@@ -14,29 +14,29 @@
		block discarded – undo
14	14
15	15	# Add params
16	16
17		- $this->params->integer ('visibility', true, 1, true, VISIBILITY_DRAFT);
18		- $this->params->integer ('access', true, 1, true, ACCESS_PUBLIC);
19		- $this->params->boolean ('locked', true);
20		- $this->params->textual ('slug', true, 255, false, '');
21		- $this->params->textual ('name', true, 255, false, '');
22		- $this->params->textual ('title', true, 255, false, '');
23		- $this->params->textual ('contents', false, 0, false, '');
24		- $this->params->textual ('description', false, 0, false, '');
25		- $this->params->textual ('keywords', false, 0, false, '');
26		- $this->params->boolean ('robots_index', false);
27		- $this->params->boolean ('robots_follow', false);
28		- $this->params->integer ('time_created', false, 10, true, 0);
29		- $this->params->integer ('time_modified', false, 10, true, 0);
	17	+ $this->params->integer('visibility', true, 1, true, VISIBILITY_DRAFT);
	18	+ $this->params->integer('access', true, 1, true, ACCESS_PUBLIC);
	19	+ $this->params->boolean('locked', true);
	20	+ $this->params->textual('slug', true, 255, false, '');
	21	+ $this->params->textual('name', true, 255, false, '');
	22	+ $this->params->textual('title', true, 255, false, '');
	23	+ $this->params->textual('contents', false, 0, false, '');
	24	+ $this->params->textual('description', false, 0, false, '');
	25	+ $this->params->textual('keywords', false, 0, false, '');
	26	+ $this->params->boolean('robots_index', false);
	27	+ $this->params->boolean('robots_follow', false);
	28	+ $this->params->integer('time_created', false, 10, true, 0);
	29	+ $this->params->integer('time_modified', false, 10, true, 0);
30	30
31	31	# Add indexes
32	32
33		- $this->indexes->add ('visibility');
34		- $this->indexes->add ('access');
35		- $this->indexes->add ('slug');
36		- $this->indexes->add ('name');
37		- $this->indexes->add ('title');
38		- $this->indexes->add ('time_created');
39		- $this->indexes->add ('time_modified');
	33	+ $this->indexes->add('visibility');
	34	+ $this->indexes->add('access');
	35	+ $this->indexes->add('slug');
	36	+ $this->indexes->add('name');
	37	+ $this->indexes->add('title');
	38	+ $this->indexes->add('time_created');
	39	+ $this->indexes->add('time_modified');
40	40	}
41	41	}
42	42	}

		@@ -14,16 +14,16 @@
		block discarded – undo
14	14
15	15	# Add params
16	16
17		- $this->params->boolean ('active', false);
18		- $this->params->textual ('name', true, 255, false, '');
19		- $this->params->textual ('title', true, 255, false, '');
20		- $this->params->textual ('contents', false, 0, false, '');
	17	+ $this->params->boolean('active', false);
	18	+ $this->params->textual('name', true, 255, false, '');
	19	+ $this->params->textual('title', true, 255, false, '');
	20	+ $this->params->textual('contents', false, 0, false, '');
21	21
22	22	# Add indexes
23	23
24		- $this->indexes->add ('active');
25		- $this->indexes->add ('name', 'UNIQUE');
26		- $this->indexes->add ('title');
	24	+ $this->indexes->add('active');
	25	+ $this->indexes->add('name', 'UNIQUE');
	26	+ $this->indexes->add('title');
27	27	}
28	28	}
29	29	}

		@@ -14,14 +14,14 @@
		block discarded – undo
14	14
15	15	# Add params
16	16
17		- $this->params->textual ('name', true, 255, false, '');
18		- $this->params->textual ('title', true, 255, false, '');
19		- $this->params->textual ('value', true, 255, false, '');
	17	+ $this->params->textual('name', true, 255, false, '');
	18	+ $this->params->textual('title', true, 255, false, '');
	19	+ $this->params->textual('value', true, 255, false, '');
20	20
21	21	# Add indexes
22	22
23		- $this->indexes->add ('name', 'UNIQUE');
24		- $this->indexes->add ('title');
	23	+ $this->indexes->add('name', 'UNIQUE');
	24	+ $this->indexes->add('title');
25	25	}
26	26	}
27	27	}

		@@ -14,27 +14,27 @@
		block discarded – undo
14	14
15	15	# Add params
16	16
17		- $this->params->integer ('rank', true, 1, true, RANK_GUEST);
18		- $this->params->textual ('name', true, 16, false, '');
19		- $this->params->textual ('email', true, 128, false, '');
20		- $this->params->textual ('auth_key', true, 40, true, '');
21		- $this->params->textual ('password', true, 40, true, '');
22		- $this->params->textual ('first_name', true, 255, false, '');
23		- $this->params->textual ('last_name', true, 255, false, '');
24		- $this->params->integer ('sex', true, 1, true, SEX_NOT_SELECTED);
25		- $this->params->textual ('city', true, 255, false, '');
26		- $this->params->textual ('country', true, 2, false, '');
27		- $this->params->textual ('timezone', true, 40, false, '');
28		- $this->params->integer ('time_registered', false, 10, true, 0);
29		- $this->params->integer ('time_logged', false, 10, true, 0);
	17	+ $this->params->integer('rank', true, 1, true, RANK_GUEST);
	18	+ $this->params->textual('name', true, 16, false, '');
	19	+ $this->params->textual('email', true, 128, false, '');
	20	+ $this->params->textual('auth_key', true, 40, true, '');
	21	+ $this->params->textual('password', true, 40, true, '');
	22	+ $this->params->textual('first_name', true, 255, false, '');
	23	+ $this->params->textual('last_name', true, 255, false, '');
	24	+ $this->params->integer('sex', true, 1, true, SEX_NOT_SELECTED);
	25	+ $this->params->textual('city', true, 255, false, '');
	26	+ $this->params->textual('country', true, 2, false, '');
	27	+ $this->params->textual('timezone', true, 40, false, '');
	28	+ $this->params->integer('time_registered', false, 10, true, 0);
	29	+ $this->params->integer('time_logged', false, 10, true, 0);
30	30
31	31	# Add indexes
32	32
33		- $this->indexes->add ('rank');
34		- $this->indexes->add ('name', 'UNIQUE');
35		- $this->indexes->add ('email', 'UNIQUE');
36		- $this->indexes->add ('time_registered');
37		- $this->indexes->add ('time_logged');
	33	+ $this->indexes->add('rank');
	34	+ $this->indexes->add('name', 'UNIQUE');
	35	+ $this->indexes->add('email', 'UNIQUE');
	36	+ $this->indexes->add('time_registered');
	37	+ $this->indexes->add('time_logged');
38	38	}
39	39	}
40	40	}

		@@ -25,9 +25,13 @@ discard block
		block discarded – undo
25	25
26	26	public static function get(string $table, int $id = 0) {
27	27
28		- if (!isset(self::$classes[$table])) throw new Exception\General(self::$error_message);
	28	+ if (!isset(self::$classes[$table])) {
	29	+ throw new Exception\General(self::$error_message);
	30	+ }
29	31
30		- if (isset(self::$cache[$table][$id])) return self::$cache[$table][$id];
	32	+ if (isset(self::$cache[$table][$id])) {
	33	+ return self::$cache[$table][$id];
	34	+ }
31	35
32	36	$entity = new self::$classes[$table]; $entity->init($id);
33	37
		@@ -40,7 +44,9 @@ discard block
		block discarded – undo
40	44
41	45	public static function create(string $table, array $data = []) {
42	46
43		- if (!isset(self::$classes[$table])) throw new Exception\General(self::$error_message);
	47	+ if (!isset(self::$classes[$table])) {
	48	+ throw new Exception\General(self::$error_message);
	49	+ }
44	50
45	51	$entity = new self::$classes[$table]($data);
46	52

cadmium-org / cadmium-cms

Branch — 0.3.0 (b16461)

Status

Category

Braces +39 added lines, -17 removed lines patch added patch discarded remove patch

Indentation +8 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -14 removed lines patch added patch discarded remove patch

Braces +27 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +18 added lines, -18 removed lines patch added patch discarded remove patch

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch