cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Profile/Handler/Edit.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 			if ($this->form_personal->handle($controller_personal) || $this->form_password->handle($controller_password)) {
 
-				Request::redirect(INSTALL_PATH . '/profile/edit?submitted');
+				Request::redirect(INSTALL_PATH.'/profile/edit?submitted');
 			}
 
 			# Display success message

Braces +3 added lines, -1 removed lines

@@ -50,7 +50,9 @@
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Messages::set('success', Language::get('USER_SUCCESS_EDIT'));
+			if (false !== Request::get('submitted')) {
+				Messages::set('success', Language::get('USER_SUCCESS_EDIT'));
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/DB/Query/Insert.php

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@
 
 				if (0 === $key) $names = $this->getString(array_keys($row), '$name', ', ');
 
-				$values[] = ('(' . $this->getString(array_values($row), '$value', ', ') . ')');
+				$values[] = ('('.$this->getString(array_values($row), '$value', ', ').')');
 			}
 
 			# Build query
 
-			$this->query = ('INSERT ' . ($ignore ? 'IGNORE ' : '') .
+			$this->query = ('INSERT '.($ignore ? 'IGNORE ' : '').
 
-				'INTO ' . $table . ' (' . $names . ') VALUES ' . implode(', ', $values));
+				'INTO '.$table.' ('.$names.') VALUES '.implode(', ', $values));
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -29,9 +29,11 @@
 
 			$names = ''; $values = [];
 
-			foreach ($set as $key => $row) if (is_array($row)) {
+			foreach ($set as $key => $row) {
+				if (is_array($row)) {
 
 				if (0 === $key) $names = $this->getString(array_keys($row), '$name', ', ');
+			}
 
 				$values[] = ('(' . $this->getString(array_values($row), '$value', ', ') . ')');
 			}

www/engine/System/Includes/Tables.php

Spacing +9 added lines, -9 removed lines

@@ -2,15 +2,15 @@
 
 # Database tables
 
-define('TABLE_PAGES',                               'pages');
-define('TABLE_PAGES_RELATIONS',                     'pages_relations');
+define('TABLE_PAGES', 'pages');
+define('TABLE_PAGES_RELATIONS', 'pages_relations');
 
-define('TABLE_MENU',                                'menu');
-define('TABLE_MENU_RELATIONS',                      'menu_relations');
+define('TABLE_MENU', 'menu');
+define('TABLE_MENU_RELATIONS', 'menu_relations');
 
-define('TABLE_VARIABLES',                           'variables');
-define('TABLE_WIDGETS',                             'widgets');
+define('TABLE_VARIABLES', 'variables');
+define('TABLE_WIDGETS', 'widgets');
 
-define('TABLE_USERS',                               'users');
-define('TABLE_USERS_SECRETS',                       'users_secrets');
-define('TABLE_USERS_SESSIONS',                      'users_sessions');
+define('TABLE_USERS', 'users');
+define('TABLE_USERS_SECRETS', 'users_secrets');
+define('TABLE_USERS_SESSIONS', 'users_sessions');

www/engine/System/Classes/Modules/Filemanager/Controller/Rename.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 
 			if ((0 !== strcasecmp($this->entity->name(), $name)) &&
 
-				@file_exists($this->entity->parent()->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+				@file_exists($this->entity->parent()->pathFull().$name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
 
 			# Rename item
 

Braces +9 added lines, -3 removed lines

@@ -29,19 +29,25 @@
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
 			# Check if item exists
 
 			if ((0 !== strcasecmp($this->entity->name(), $name)) &&
 
-				@file_exists($this->entity->parent()->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+				@file_exists($this->entity->parent()->pathFull() . $name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Rename item
 
-			if (!$this->entity->rename($name)) return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
+			if (!$this->entity->rename($name)) {
+				return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
 
 				'FILEMANAGER_ERROR_DIR_RENAME' : 'FILEMANAGER_ERROR_FILE_RENAME');
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Create.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 
 			# Check if item exists
 
-			if (@file_exists($this->parent->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (@file_exists($this->parent->pathFull().$name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
 
 			# Create item
 

Braces +9 added lines, -3 removed lines

@@ -29,19 +29,25 @@
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
 			# Check if item exists
 
-			if (@file_exists($this->parent->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (@file_exists($this->parent->pathFull() . $name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Create item
 
 			$entity = Filemanager::get($type, $this->parent);
 
-			if (!$entity->create($name)) return (($entity->type() === FILEMANAGER_TYPE_DIR) ?
+			if (!$entity->create($name)) {
+				return (($entity->type() === FILEMANAGER_TYPE_DIR) ?
 
 				'FILEMANAGER_ERROR_DIR_CREATE' : 'FILEMANAGER_ERROR_FILE_CREATE');
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Index.php

Indentation +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 			return ((null !== $this->type) ? ($this->type . " ") : "") .
 
-			       ("KEY `" . $this->name . "` (`" . $this->name . "`)");
+				   ("KEY `" . $this->name . "` (`" . $this->name . "`)");
 		}
 	}
 }

Spacing +2 added lines, -2 removed lines

@@ -45,9 +45,9 @@
 
 		public function getStatement() : string {
 
-			return ((null !== $this->type) ? ($this->type . " ") : "") .
+			return ((null !== $this->type) ? ($this->type." ") : "").
 
-			       ("KEY `" . $this->name . "` (`" . $this->name . "`)");
+			       ("KEY `".$this->name."` (`".$this->name."`)");
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 
 			$this->name = $name;
 
-			if (null !== $type) $this->type = $this->validateType($type);
+			if (null !== $type) {
+				$this->type = $this->validateType($type);
+			}
 		}
 
 		/**

www/engine/System/Classes/Modules/Entitizer/Utils/Definition.php

Indentation +2 added lines, -2 removed lines

@@ -30,9 +30,9 @@
 
 			$query = ("CREATE TABLE IF NOT EXISTS `" . static::$table . "` (") .
 
-			         implode(", ", $this->getStatements()) .
+					 implode(", ", $this->getStatements()) .
 
-			         (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
+					 (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
 
 			# ------------------------
 

Spacing +10 added lines, -10 removed lines

@@ -41,9 +41,9 @@ 
 
 		private function createMainTable() : bool {
 
-			$query = ("CREATE TABLE IF NOT EXISTS `" . static::$table . "` (") .
+			$query = ("CREATE TABLE IF NOT EXISTS `".static::$table."` (").
 
-			         implode(", ", $this->getStatements()) .
+			         implode(", ", $this->getStatements()).
 
 			         (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
 
@@ -60,17 +60,17 @@ 
 
 		private function createRelationsTable() : bool {
 
-			$query = ("CREATE TABLE IF NOT EXISTS `" . static::$table_relations . "` (") .
+			$query = ("CREATE TABLE IF NOT EXISTS `".static::$table_relations."` (").
 
-					 ("`ancestor` int(10) UNSIGNED NOT NULL, `descendant` int(10) UNSIGNED NOT NULL, ") .
+					 ("`ancestor` int(10) UNSIGNED NOT NULL, `descendant` int(10) UNSIGNED NOT NULL, ").
 
-					 ("`depth` int(10) UNSIGNED NOT NULL, ") .
+					 ("`depth` int(10) UNSIGNED NOT NULL, ").
 
-					 ("PRIMARY KEY (`ancestor`, `descendant`), KEY (`ancestor`), KEY (`descendant`), KEY (`depth`), ") .
+					 ("PRIMARY KEY (`ancestor`, `descendant`), KEY (`ancestor`), KEY (`descendant`), KEY (`depth`), ").
 
-					 ("FOREIGN KEY (`ancestor`) REFERENCES `" . static::$table . "` (`id`) ON DELETE CASCADE, ") .
+					 ("FOREIGN KEY (`ancestor`) REFERENCES `".static::$table."` (`id`) ON DELETE CASCADE, ").
 
-					 ("FOREIGN KEY (`descendant`) REFERENCES `" . static::$table . "` (`id`) ON DELETE CASCADE ") .
+					 ("FOREIGN KEY (`descendant`) REFERENCES `".static::$table."` (`id`) ON DELETE CASCADE ").
 
 					 (") ENGINE=InnoDB DEFAULT CHARSET=utf8");
 
@@ -87,7 +87,7 @@ 
 
 		private function removeMainTable() : bool {
 
-			$query = ("DROP TABLE IF EXISTS `" . static::$table  . "`");
+			$query = ("DROP TABLE IF EXISTS `".static::$table."`");
 
 			return (DB::send($query) && DB::getLast()->status);
 		}
@@ -100,7 +100,7 @@ 
 
 		private function removeRelationsTable() : bool {
 
-			$query = ("DROP TABLE IF EXISTS `" . static::$table_relations  . "`");
+			$query = ("DROP TABLE IF EXISTS `".static::$table_relations."`");
 
 			return (DB::send($query) && DB::getLast()->status);
 		}

Braces +3 added lines, -1 removed lines

@@ -25,7 +25,9 @@
 
 			foreach ([$this->params, $this->indexes, $this->foreigns] as $group) {
 
-				foreach ($group->getList() as $item) $statements[] = $item->getStatement();
+				foreach ($group->getList() as $item) {
+					$statements[] = $item->getStatement();
+				}
 			}
 
 			# ------------------------

www/engine/System/Classes/Modules/Entitizer/Utils/Lister.php

Spacing +2 added lines, -2 removed lines

@@ -65,9 +65,9 @@
 
 		private function getPaginationBlock() {
 
-			$query = (static::$nesting ? ('?parent_id=' . $this->parent->id) : '');
+			$query = (static::$nesting ? ('?parent_id='.$this->parent->id) : '');
 
-			$url = new Url(INSTALL_PATH . static::$link . $query);
+			$url = new Url(INSTALL_PATH.static::$link.$query);
 
 			# ------------------------
 

Braces +36 added lines, -16 removed lines

@@ -29,15 +29,15 @@ 
 
 			# Set create button
 
-			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) $parent->getBlock('create')->id = $this->parent->id;
-
-			else { $parent->getBlock('create')->disable(); $parent->getBlock('create_disabled')->enable(); }
+			if (count($this->path) < CONFIG_ENTITIZER_MAX_DEPTH) {
+				$parent->getBlock('create')->id = $this->parent->id;
+			} else { $parent->getBlock('create')->disable(); $parent->getBlock('create_disabled')->enable(); }
 
 			# Set edit button
 
-			if (0 !== $this->parent->id) $parent->getBlock('edit')->id = $this->parent->id;
-
-			else { $parent->getBlock('edit')->disable(); $parent->getBlock('edit_disabled')->enable(); }
+			if (0 !== $this->parent->id) {
+				$parent->getBlock('edit')->id = $this->parent->id;
+			} else { $parent->getBlock('edit')->disable(); $parent->getBlock('edit_disabled')->enable(); }
 
 			# Add parent additional data
 
@@ -52,7 +52,9 @@ 
 
 			foreach ($this->items['list'] as $item) {
 
-				if ((null !== $this->entity) && ($item['dataset']->id === $this->entity->id)) continue;
+				if ((null !== $this->entity) && ($item['dataset']->id === $this->entity->id)) {
+					continue;
+				}
 
 				$items->addItem($view = View::get(!$ajax ? static::$view_item : static::$view_ajax_item));
 
@@ -121,11 +123,15 @@ 
 
 			# 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->getBlock('parent'));
+			if (static::$nesting && !$ajax) {
+				$this->processParent($contents->getBlock('parent'));
+			}
 
 			# Process items block
 
@@ -133,7 +139,9 @@ 
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# ------------------------
 
@@ -160,15 +168,21 @@ 
 
 			# Get path and depth
 
-			if (false !== ($path = $this->parent->getPath())) $this->path = $path;
+			if (false !== ($path = $this->parent->getPath())) {
+				$this->path = $path;
+			}
 
-			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->getSubtreeDepth()))) $this->depth = $depth;
+			if ((0 !== $this->entity->id) && (false !== ($depth = $this->entity->getSubtreeDepth()))) {
+				$this->depth = $depth;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'getChildren' : 'getItems');
 
-			if (false !== ($items = $this->parent->$lister())) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister())) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 
@@ -183,7 +197,9 @@ 
 
 		protected function handle(bool $ajax = false) {
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			$this->index = Number::forceInt(Request::get('index'), 1, 999999);
 
@@ -195,13 +211,17 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->getPath())) $this->path = $path;
+			if (false !== ($path = $this->parent->getPath())) {
+				$this->path = $path;
+			}
 
 			# Get items list
 
 			$lister = (static::$nesting ? 'getChildren' : 'getItems'); $display = Settings::get('admin_display_entities');
 
-			if (false !== ($items = $this->parent->$lister([], [], $this->index, $display))) $this->items = $items;
+			if (false !== ($items = $this->parent->$lister([], [], $this->index, $display))) {
+				$this->items = $items;
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Entitizer/Controller/Page.php

Braces +6 added lines, -2 removed lines

@@ -44,11 +44,15 @@
 			$data['contents']           = $contents;
 			$data['time_modified']      = REQUEST_TIME;
 
-			if (0 === $this->page->id) $data['time_created'] = REQUEST_TIME;
+			if (0 === $this->page->id) {
+				$data['time_created'] = REQUEST_TIME;
+			}
 
 			$modifier = ((0 === $this->page->id) ? 'create' : 'edit');
 
-			if (!$this->page->$modifier($data)) return 'PAGE_ERROR_MODIFY';
+			if (!$this->page->$modifier($data)) {
+				return 'PAGE_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		/**
 		 * Invoker
 		 *
-		 * @return true|string : true on success or an error code on failure
+		 * @return string|boolean : true on success or an error code on failure
 		 */
 
 		public function __invoke(array $post) {