cadmium-org / cadmium-cms

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/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();
+			}
 
 			# Create parent entity
 
@@ -193,7 +209,9 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->getPath())) $this->path = $path;
+			if (false !== ($path = $this->parent->getPath())) {
+				$this->path = $path;
+			}
 
 			# Get index
 
@@ -203,7 +221,9 @@ 
 
 			$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) {

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

Braces +27 added lines, -9 removed lines

@@ -31,30 +31,46 @@ 
 
 			# Validate name & email
 
-			if (false === ($name = Validate::userName($name))) return ['name', 'USER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::userName($name))) {
+				return ['name', 'USER_ERROR_NAME_INVALID'];
+			}
 
-			if (false === ($email = Validate::userEmail($email))) return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			if (false === ($email = Validate::userEmail($email))) {
+				return ['email', 'USER_ERROR_EMAIL_INVALID'];
+			}
 
 			# Validate password
 
 			if ((0 === $this->user->id) || ('' !== $password)) {
 
-				if (false === ($password = Validate::userPassword($password))) return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+				if (false === ($password = Validate::userPassword($password))) {
+					return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+				}
 
-				if (0 !== strcmp($password, $password_retype)) return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+				if (0 !== strcmp($password, $password_retype)) {
+					return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+				}
 			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->user->check($name, 'name'))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_name = $this->user->check($name, 'name'))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'USER_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'USER_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = $this->user->check($email, 'email'))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_email = $this->user->check($email, 'email'))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			if ($check_email === 1) return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			if ($check_email === 1) {
+				return ['email', 'USER_ERROR_EMAIL_DUPLICATE'];
+			}
 
 			# Modify user
 
@@ -84,7 +100,9 @@ 
 
 			$modifier = ((0 === $this->user->id) ? 'create' : 'edit');
 
-			if (!$this->user->$modifier($data)) return 'USER_ERROR_MODIFY';
+			if (!$this->user->$modifier($data)) {
+				return 'USER_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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

Braces +6 added lines, -2 removed lines

@@ -12,9 +12,13 @@
 
 		public static function get(string $table) {
 
-			if (!isset(static::$classes[$table])) throw new Exception\General(static::$error_message);
+			if (!isset(static::$classes[$table])) {
+				throw new Exception\General(static::$error_message);
+			}
 
-			if (!isset(static::$cache[$table])) static::$cache[$table] = new static::$classes[$table];
+			if (!isset(static::$cache[$table])) {
+				static::$cache[$table] = new static::$classes[$table];
+			}
 
 			# ------------------------
 

www/engine/Framework/Includes/Constants.php

Spacing +14 added lines, -14 removed lines

@@ -2,23 +2,23 @@
 
 # Date formats
 
-define('DATE_FORMAT_STANDART',                      'd.m.Y');
-define('DATE_FORMAT_MYSQL',                         'Y-m-d');
-define('DATE_FORMAT_DATETIME',                      'd.m.Y, H:i');
-define('DATE_FORMAT_W3C',                           'Y-m-d\TH:i:sP');
+define('DATE_FORMAT_STANDART', 'd.m.Y');
+define('DATE_FORMAT_MYSQL', 'Y-m-d');
+define('DATE_FORMAT_DATETIME', 'd.m.Y, H:i');
+define('DATE_FORMAT_W3C', 'Y-m-d\TH:i:sP');
 
 # Form fields
 
-define('FORM_FIELD_HIDDEN',                         'hidden');
-define('FORM_FIELD_PASSWORD',                       'password');
-define('FORM_FIELD_CAPTCHA',                        'captcha');
-define('FORM_FIELD_TEXT',                           'text');
-define('FORM_FIELD_TEXTAREA',                       'textarea');
+define('FORM_FIELD_HIDDEN', 'hidden');
+define('FORM_FIELD_PASSWORD', 'password');
+define('FORM_FIELD_CAPTCHA', 'captcha');
+define('FORM_FIELD_TEXT', 'text');
+define('FORM_FIELD_TEXTAREA', 'textarea');
 
 # String pools
 
-define('STR_POOL_DEFAULT',                          'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
-define('STR_POOL_LATIN',                            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
-define('STR_POOL_LATIN_LOWER',                      'abcdefghijklmnopqrstuvwxyz');
-define('STR_POOL_LATIN_UPPER',                      'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
-define('STR_POOL_NUMERIC',                          '0123456789');
+define('STR_POOL_DEFAULT', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
+define('STR_POOL_LATIN', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+define('STR_POOL_LATIN_LOWER', 'abcdefghijklmnopqrstuvwxyz');
+define('STR_POOL_LATIN_UPPER', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+define('STR_POOL_NUMERIC', '0123456789');

www/engine/Framework/Includes/Headers/Status.php

Spacing +53 added lines, -53 removed lines

@@ -2,60 +2,60 @@
 
 # Status codes
 
-define('STATUS_CODE_100',       100);
-define('STATUS_CODE_101',       101);
-define('STATUS_CODE_102',       102);
+define('STATUS_CODE_100', 100);
+define('STATUS_CODE_101', 101);
+define('STATUS_CODE_102', 102);
 
-define('STATUS_CODE_200',       200);
-define('STATUS_CODE_201',       201);
-define('STATUS_CODE_202',       202);
-define('STATUS_CODE_203',       203);
-define('STATUS_CODE_204',       204);
-define('STATUS_CODE_205',       205);
-define('STATUS_CODE_206',       206);
-define('STATUS_CODE_207',       207);
-define('STATUS_CODE_226',       226);
+define('STATUS_CODE_200', 200);
+define('STATUS_CODE_201', 201);
+define('STATUS_CODE_202', 202);
+define('STATUS_CODE_203', 203);
+define('STATUS_CODE_204', 204);
+define('STATUS_CODE_205', 205);
+define('STATUS_CODE_206', 206);
+define('STATUS_CODE_207', 207);
+define('STATUS_CODE_226', 226);
 
-define('STATUS_CODE_300',       300);
-define('STATUS_CODE_301',       301);
-define('STATUS_CODE_302',       302);
-define('STATUS_CODE_303',       303);
-define('STATUS_CODE_304',       304);
-define('STATUS_CODE_305',       305);
-define('STATUS_CODE_307',       307);
+define('STATUS_CODE_300', 300);
+define('STATUS_CODE_301', 301);
+define('STATUS_CODE_302', 302);
+define('STATUS_CODE_303', 303);
+define('STATUS_CODE_304', 304);
+define('STATUS_CODE_305', 305);
+define('STATUS_CODE_307', 307);
 
-define('STATUS_CODE_400',       400);
-define('STATUS_CODE_401',       401);
-define('STATUS_CODE_402',       402);
-define('STATUS_CODE_403',       403);
-define('STATUS_CODE_404',       404);
-define('STATUS_CODE_405',       405);
-define('STATUS_CODE_406',       406);
-define('STATUS_CODE_407',       407);
-define('STATUS_CODE_408',       408);
-define('STATUS_CODE_409',       409);
-define('STATUS_CODE_410',       410);
-define('STATUS_CODE_411',       411);
-define('STATUS_CODE_412',       412);
-define('STATUS_CODE_413',       413);
-define('STATUS_CODE_414',       414);
-define('STATUS_CODE_415',       415);
-define('STATUS_CODE_416',       416);
-define('STATUS_CODE_417',       417);
-define('STATUS_CODE_422',       422);
-define('STATUS_CODE_423',       423);
-define('STATUS_CODE_424',       424);
-define('STATUS_CODE_425',       425);
-define('STATUS_CODE_426',       426);
-define('STATUS_CODE_449',       449);
+define('STATUS_CODE_400', 400);
+define('STATUS_CODE_401', 401);
+define('STATUS_CODE_402', 402);
+define('STATUS_CODE_403', 403);
+define('STATUS_CODE_404', 404);
+define('STATUS_CODE_405', 405);
+define('STATUS_CODE_406', 406);
+define('STATUS_CODE_407', 407);
+define('STATUS_CODE_408', 408);
+define('STATUS_CODE_409', 409);
+define('STATUS_CODE_410', 410);
+define('STATUS_CODE_411', 411);
+define('STATUS_CODE_412', 412);
+define('STATUS_CODE_413', 413);
+define('STATUS_CODE_414', 414);
+define('STATUS_CODE_415', 415);
+define('STATUS_CODE_416', 416);
+define('STATUS_CODE_417', 417);
+define('STATUS_CODE_422', 422);
+define('STATUS_CODE_423', 423);
+define('STATUS_CODE_424', 424);
+define('STATUS_CODE_425', 425);
+define('STATUS_CODE_426', 426);
+define('STATUS_CODE_449', 449);
 
-define('STATUS_CODE_500',       500);
-define('STATUS_CODE_501',       501);
-define('STATUS_CODE_502',       502);
-define('STATUS_CODE_503',       503);
-define('STATUS_CODE_504',       504);
-define('STATUS_CODE_505',       505);
-define('STATUS_CODE_506',       506);
-define('STATUS_CODE_507',       507);
-define('STATUS_CODE_509',       509);
-define('STATUS_CODE_510',       510);
+define('STATUS_CODE_500', 500);
+define('STATUS_CODE_501', 501);
+define('STATUS_CODE_502', 502);
+define('STATUS_CODE_503', 503);
+define('STATUS_CODE_504', 504);
+define('STATUS_CODE_505', 505);
+define('STATUS_CODE_506', 506);
+define('STATUS_CODE_507', 507);
+define('STATUS_CODE_509', 509);
+define('STATUS_CODE_510', 510);