Inspection of "Merge branch 0.4.2 (#14)" - cadmium-org/cadmium-cms - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( c7e98d...e0d6a2 )

by Anton

created 2016-12-08 21:01 UTC

Status

Braces +21 added lines, -7 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@  discard block
 block discarded – undo
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@  discard block
 block discarded – undo
 
 			# Validate values
 
-			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 === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Create user object
 
@@ -32,13 +38,19 @@  discard block
 block discarded – undo
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (!$user->init($name, 'name')) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -48,7 +60,9 @@  discard block
 block discarded – undo
 
 			$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$secret->create($data)) return 'USER_ERROR_AUTH_RESET';
+			if (!$secret->create($data)) {
+				return 'USER_ERROR_AUTH_RESET';
+			}
 
 			# Send mail
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Auth/Controller/Login.php 1 patch

Braces +24 added lines, -8 removed lines patch added patch discarded remove patch

@@ -10,7 +10,9 @@  discard block
 block discarded – undo
 
 		public function __invoke(array $post) {
 
-			if (Auth::check()) return true;
+			if (Auth::check()) {
+				return true;
+			}
 
 			# Declare variables
 
@@ -22,9 +24,13 @@  discard block
 block discarded – undo
 
 			# Validate values
 
-			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 === ($password = Validate::userPassword($password))) return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			if (false === ($password = Validate::userPassword($password))) {
+				return ['password', 'USER_ERROR_PASSWORD_INVALID'];
+			}
 
 			# Create user object
 
@@ -32,19 +38,27 @@  discard block
 block discarded – undo
 
 			# Init user
 
-			if (!$user->init($name, 'name')) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (!$user->init($name, 'name')) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
-			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
+				return ['name', 'USER_ERROR_NAME_INCORRECT'];
+			}
 
 			# Check password
 
 			$password = Str::encode($user->auth_key, $password);
 
-			if (0 !== strcmp($user->password, $password)) return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			if (0 !== strcmp($user->password, $password)) {
+				return ['password', 'USER_ERROR_PASSWORD_INCORRECT'];
+			}
 
 			# Check access
 
-			if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
+			if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
+				return 'USER_ERROR_ACCESS';
+			}
 
 			# Create session
 
@@ -54,7 +68,9 @@  discard block
 block discarded – undo
 
 			$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
 
-			if (!$session->create($data)) return 'USER_ERROR_AUTH_LOGIN';
+			if (!$session->create($data)) {
+				return 'USER_ERROR_AUTH_LOGIN';
+			}
 
 			# Set session variable
 

Please login to merge, or discard this patch.

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

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

@@ -39,7 +39,7 @@
 block discarded – undo
 
 			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
 

Please login to merge, or discard this patch.

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

@@ -29,19 +29,25 @@
 block discarded – undo
 
 			# 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');
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

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

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

@@ -37,7 +37,7 @@
 block discarded – undo
 
 			# 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
 

Please login to merge, or discard this patch.

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

@@ -29,19 +29,25 @@
 block discarded – undo
 
 			# 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');
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Modules/Filemanager/Handler/Lister.php 2 patches

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

@@ -15,7 +15,7 @@  discard block
 block discarded – undo
 
 			$dirs = []; $files = [];
 
-			$prefix = (('' !== $this->parent->path()) ? ($this->parent->path() . '/') : '');
+			$prefix = (('' !== $this->parent->path()) ? ($this->parent->path().'/') : '');
 
 			# Read parent directory contents
 
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 					if (in_array($name, ['.', '..', '.empty'], true)) continue;
 
-					$path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
+					$path = ($prefix.$name); $path_full = ($this->parent->pathFull().$name);
 
 					$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
 
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
 
 		private function getPaginationBlock() {
 
-			$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+			$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-			$url = new Url(INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$url = new Url(INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# ------------------------
 
@@ -137,9 +137,9 @@  discard block
 block discarded – undo
 
 			# Set link
 
-			$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+			$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-			$contents->link = (INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$contents->link = (INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# Implement form
 
@@ -180,9 +180,9 @@  discard block
 block discarded – undo
 
 			if ($upload || $this->form->handle(new Filemanager\Controller\Create($this->parent))) {
 
-				$query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
+				$query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager' . $query);
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager'.$query);
 			}
 
 			# Get index

Please login to merge, or discard this patch.

Braces +13 added lines, -7 removed lines patch added patch discarded remove patch

@@ -25,15 +25,19 @@  discard block
 block discarded – undo
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (in_array($name, ['.', '..', '.empty'], true)) continue;
+					if (in_array($name, ['.', '..', '.empty'], true)) {
+						continue;
+					}
 
 					$path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
 
 					$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
 
-					if (@is_dir($path_full)) $dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
-
-					else if (@is_file($path_full)) $files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
+					if (@is_dir($path_full)) {
+						$dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
+					} else if (@is_file($path_full)) {
+						$files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
+					}
 				}
 
 				closedir($handler);
@@ -135,9 +139,11 @@  discard block
 block discarded – undo
 
 			foreach ($this->items['list'] as $item) {
 
-				if ($item['type'] === FILEMANAGER_TYPE_DIR) $items->addItem($this->getDirItemBlock($item));
-
-				else if ($item['type'] === FILEMANAGER_TYPE_FILE) $items->addItem($this->getFileItemBlock($item));
+				if ($item['type'] === FILEMANAGER_TYPE_DIR) {
+					$items->addItem($this->getDirItemBlock($item));
+				} else if ($item['type'] === FILEMANAGER_TYPE_FILE) {
+					$items->addItem($this->getFileItemBlock($item));
+				}
 			}
 
 			# Set pagination

Please login to merge, or discard this patch.

engine/System/Classes/Modules/Entitizer/Utils/Definition/Group/Params.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,11 +19,15 @@
 block discarded – undo
 
 		private function add(string $type, string $name, array $args) {
 
-			if (('' === $name) || isset($this->list[$name])) return;
+			if (('' === $name) || isset($this->list[$name])) {
+				return;
+			}
 
 			$this->list[$name] = new $this->types[$type](...$args);
 
-			if (($type !== 'textual') || $this->list[$name]->short) $this->secure[] = $name;
+			if (($type !== 'textual') || $this->list[$name]->short) {
+				$this->secure[] = $name;
+			}
 		}
 
 		# Constructor

Please login to merge, or discard this patch.

engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Foreign.php 2 patches

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

@@ -32,11 +32,11 @@
 block discarded – undo
 
 		public function statement() {
 
-			return ("FOREIGN KEY (`" . $this->name . "`) REFERENCES `" . $this->table . "` (`" . $this->field . "`)") .
+			return ("FOREIGN KEY (`".$this->name."`) REFERENCES `".$this->table."` (`".$this->field."`)").
 
-				   ((null !== $this->delete) ? (" ON DELETE " . $this->delete) : "") .
+				   ((null !== $this->delete) ? (" ON DELETE ".$this->delete) : "").
 
-				   ((null !== $this->update) ? (" ON UPDATE " . $this->update) : "");
+				   ((null !== $this->update) ? (" ON UPDATE ".$this->update) : "");
 		}
 	}
 }

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -23,9 +23,13 @@
 block discarded – undo
 
 			$this->name = $name; $this->table = $table; $this->field = $field;
 
-			if (null !== $delete) $this->delete = $this->getAction($delete);
+			if (null !== $delete) {
+				$this->delete = $this->getAction($delete);
+			}
 
-			if (null !== $update) $this->update = $this->getAction($delete);
+			if (null !== $update) {
+				$this->update = $this->getAction($delete);
+			}
 		}
 
 		# Get statement

Please login to merge, or discard this patch.

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

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

		@@ -32,7 +32,7 @@
		block discarded – undo
32	32
33	33	return ((null !== $this->type) ? ($this->type . " ") : "") .
34	34
35		- ("KEY `" . $this->name . "` (`" . $this->name . "`)");
	35	+ ("KEY `" . $this->name . "` (`" . $this->name . "`)");
36	36	}
37	37	}
38	38	}

Please login to merge, or discard this patch.

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

@@ -30,9 +30,9 @@
 block discarded – undo
 
 		public function statement() {
 
-			return ((null !== $this->type) ? ($this->type . " ") : "") .
+			return ((null !== $this->type) ? ($this->type." ") : "").
 
-			       ("KEY `" . $this->name . "` (`" . $this->name . "`)");
+			       ("KEY `".$this->name."` (`".$this->name."`)");
 		}
 	}
 }

Please login to merge, or discard this patch.

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

@@ -23,7 +23,9 @@
 block discarded – undo
 
 			$this->name = $name;
 
-			if (null !== $type) $this->type = $this->getType($type);
+			if (null !== $type) {
+				$this->type = $this->getType($type);
+			}
 		}
 
 		# Get statement

Please login to merge, or discard this patch.

engine/System/Classes/Modules/Entitizer/Utils/Definition/Item/Param/Id.php 1 patch

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

@@ -19,7 +19,7 @@
 block discarded – undo
 
 		public function statement() {
 
-			return ("`" . $this->name . "` int(10) UNSIGNED NOT NULL" . ($this->auto_increment ? " AUTO_INCREMENT" : ""));
+			return ("`".$this->name."` int(10) UNSIGNED NOT NULL".($this->auto_increment ? " AUTO_INCREMENT" : ""));
 		}
 
 		# Cast value

Please login to merge, or discard this patch.

		@@ -39,7 +39,7 @@
		block discarded – undo
39	39
40	40	if ((0 !== strcasecmp($this->entity->name(), $name)) &&
41	41
42		- @file_exists($this->entity->parent()->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
	42	+ @file_exists($this->entity->parent()->pathFull().$name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
43	43
44	44	# Rename item
45	45

		@@ -10,7 +10,9 @@ discard block
		block discarded – undo
10	10
11	11	public function __invoke(array $post) {
12	12
13		- if (Auth::check()) return true;
	13	+ if (Auth::check()) {
	14	+ return true;
	15	+ }
14	16
15	17	# Declare variables
16	18
		@@ -22,9 +24,13 @@ discard block
		block discarded – undo
22	24
23	25	# Validate values
24	26
25		- if (false === ($name = Validate::userName($name))) return ['name', 'USER_ERROR_NAME_INVALID'];
	27	+ if (false === ($name = Validate::userName($name))) {
	28	+ return ['name', 'USER_ERROR_NAME_INVALID'];
	29	+ }
26	30
27		- if (false === Security::checkCaptcha($captcha)) return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
	31	+ if (false === Security::checkCaptcha($captcha)) {
	32	+ return ['captcha', 'USER_ERROR_CAPTCHA_INCORRECT'];
	33	+ }
28	34
29	35	# Create user object
30	36
		@@ -32,13 +38,19 @@ discard block
		block discarded – undo
32	38
33	39	# Init user
34	40
35		- if (!$user->init($name, 'name')) return ['name', 'USER_ERROR_NAME_INCORRECT'];
	41	+ if (!$user->init($name, 'name')) {
	42	+ return ['name', 'USER_ERROR_NAME_INCORRECT'];
	43	+ }
36	44
37		- if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) return ['name', 'USER_ERROR_NAME_INCORRECT'];
	45	+ if (Auth::admin() && ($user->rank < RANK_ADMINISTRATOR)) {
	46	+ return ['name', 'USER_ERROR_NAME_INCORRECT'];
	47	+ }
38	48
39	49	# Check access
40	50
41		- if (!Auth::admin() && ($user->rank === RANK_GUEST)) return 'USER_ERROR_ACCESS';
	51	+ if (!Auth::admin() && ($user->rank === RANK_GUEST)) {
	52	+ return 'USER_ERROR_ACCESS';
	53	+ }
42	54
43	55	# Create session
44	56
		@@ -48,7 +60,9 @@ discard block
		block discarded – undo
48	60
49	61	$data = ['id' => $user->id, 'code' => $code, 'ip' => $ip, 'time' => $time];
50	62
51		- if (!$secret->create($data)) return 'USER_ERROR_AUTH_RESET';
	63	+ if (!$secret->create($data)) {
	64	+ return 'USER_ERROR_AUTH_RESET';
	65	+ }
52	66
53	67	# Send mail
54	68

		@@ -29,19 +29,25 @@
		block discarded – undo
29	29
30	30	# Validate name
31	31
32		- if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
	32	+ if (false === ($name = Validate::fileName($name))) {
	33	+ return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
	34	+ }
33	35
34	36	# Check if item exists
35	37
36	38	if ((0 !== strcasecmp($this->entity->name(), $name)) &&
37	39
38		- @file_exists($this->entity->parent()->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
	40	+ @file_exists($this->entity->parent()->pathFull() . $name)) {
	41	+ return ['name', 'FILEMANAGER_ERROR_EXISTS'];
	42	+ }
39	43
40	44	# Rename item
41	45
42		- if (!$this->entity->rename($name)) return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
	46	+ if (!$this->entity->rename($name)) {
	47	+ return (($this->entity->type() === FILEMANAGER_TYPE_DIR) ?
43	48
44	49	'FILEMANAGER_ERROR_DIR_RENAME' : 'FILEMANAGER_ERROR_FILE_RENAME');
	50	+ }
45	51
46	52	# ------------------------
47	53

		@@ -37,7 +37,7 @@
		block discarded – undo
37	37
38	38	# Check if item exists
39	39
40		- if (@file_exists($this->parent->pathFull() . $name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
	40	+ if (@file_exists($this->parent->pathFull().$name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
41	41
42	42	# Create item
43	43

		@@ -15,7 +15,7 @@ discard block
		block discarded – undo
15	15
16	16	$dirs = []; $files = [];
17	17
18		- $prefix = (('' !== $this->parent->path()) ? ($this->parent->path() . '/') : '');
	18	+ $prefix = (('' !== $this->parent->path()) ? ($this->parent->path().'/') : '');
19	19
20	20	# Read parent directory contents
21	21
		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25
26	26	if (in_array($name, ['.', '..', '.empty'], true)) continue;
27	27
28		- $path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
	28	+ $path = ($prefix.$name); $path_full = ($this->parent->pathFull().$name);
29	29
30	30	$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
31	31
		@@ -112,9 +112,9 @@ discard block
		block discarded – undo
112	112
113	113	private function getPaginationBlock() {
114	114
115		- $query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
	115	+ $query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
116	116
117		- $url = new Url(INSTALL_PATH . '/admin/content/filemanager' . $query);
	117	+ $url = new Url(INSTALL_PATH.'/admin/content/filemanager'.$query);
118	118
119	119	# ------------------------
120	120
		@@ -137,9 +137,9 @@ discard block
		block discarded – undo
137	137
138	138	# Set link
139	139
140		- $query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
	140	+ $query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
141	141
142		- $contents->link = (INSTALL_PATH . '/admin/content/filemanager' . $query);
	142	+ $contents->link = (INSTALL_PATH.'/admin/content/filemanager'.$query);
143	143
144	144	# Implement form
145	145
		@@ -180,9 +180,9 @@ discard block
		block discarded – undo
180	180
181	181	if ($upload \|\| $this->form->handle(new Filemanager\Controller\Create($this->parent))) {
182	182
183		- $query = (('' !== $this->parent->path()) ? ('?parent=' . $this->parent->path()) : '');
	183	+ $query = (('' !== $this->parent->path()) ? ('?parent='.$this->parent->path()) : '');
184	184
185		- Request::redirect(INSTALL_PATH . '/admin/content/filemanager' . $query);
	185	+ Request::redirect(INSTALL_PATH.'/admin/content/filemanager'.$query);
186	186	}
187	187
188	188	# Get index

		@@ -25,15 +25,19 @@ discard block
		block discarded – undo
25	25
26	26	while (false !== ($name = readdir($handler))) {
27	27
28		- if (in_array($name, ['.', '..', '.empty'], true)) continue;
	28	+ if (in_array($name, ['.', '..', '.empty'], true)) {
	29	+ continue;
	30	+ }
29	31
30	32	$path = ($prefix . $name); $path_full = ($this->parent->pathFull() . $name);
31	33
32	34	$data = ['name' => $name, 'path' => $path, 'path_full' => $path_full];
33	35
34		- if (@is_dir($path_full)) $dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
35		-
36		- else if (@is_file($path_full)) $files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
	36	+ if (@is_dir($path_full)) {
	37	+ $dirs[] = array_merge($data, ['type' => FILEMANAGER_TYPE_DIR]);
	38	+ } else if (@is_file($path_full)) {
	39	+ $files[] = array_merge($data, ['type' => FILEMANAGER_TYPE_FILE]);
	40	+ }
37	41	}
38	42
39	43	closedir($handler);
		@@ -135,9 +139,11 @@ discard block
		block discarded – undo
135	139
136	140	foreach ($this->items['list'] as $item) {
137	141
138		- if ($item['type'] === FILEMANAGER_TYPE_DIR) $items->addItem($this->getDirItemBlock($item));
139		-
140		- else if ($item['type'] === FILEMANAGER_TYPE_FILE) $items->addItem($this->getFileItemBlock($item));
	142	+ if ($item['type'] === FILEMANAGER_TYPE_DIR) {
	143	+ $items->addItem($this->getDirItemBlock($item));
	144	+ } else if ($item['type'] === FILEMANAGER_TYPE_FILE) {
	145	+ $items->addItem($this->getFileItemBlock($item));
	146	+ }
141	147	}
142	148
143	149	# Set pagination

		@@ -19,11 +19,15 @@
		block discarded – undo
19	19
20	20	private function add(string $type, string $name, array $args) {
21	21
22		- if (('' === $name) \|\| isset($this->list[$name])) return;
	22	+ if (('' === $name) \|\| isset($this->list[$name])) {
	23	+ return;
	24	+ }
23	25
24	26	$this->list[$name] = new $this->types[$type](...$args);
25	27
26		- if (($type !== 'textual') \|\| $this->list[$name]->short) $this->secure[] = $name;
	28	+ if (($type !== 'textual') \|\| $this->list[$name]->short) {
	29	+ $this->secure[] = $name;
	30	+ }
27	31	}
28	32
29	33	# Constructor

		@@ -32,11 +32,11 @@
		block discarded – undo
32	32
33	33	public function statement() {
34	34
35		- return ("FOREIGN KEY (`" . $this->name . "`) REFERENCES `" . $this->table . "` (`" . $this->field . "`)") .
	35	+ return ("FOREIGN KEY (`".$this->name."`) REFERENCES `".$this->table."` (`".$this->field."`)").
36	36
37		- ((null !== $this->delete) ? (" ON DELETE " . $this->delete) : "") .
	37	+ ((null !== $this->delete) ? (" ON DELETE ".$this->delete) : "").
38	38
39		- ((null !== $this->update) ? (" ON UPDATE " . $this->update) : "");
	39	+ ((null !== $this->update) ? (" ON UPDATE ".$this->update) : "");
40	40	}
41	41	}
42	42	}

		@@ -23,9 +23,13 @@
		block discarded – undo
23	23
24	24	$this->name = $name; $this->table = $table; $this->field = $field;
25	25
26		- if (null !== $delete) $this->delete = $this->getAction($delete);
	26	+ if (null !== $delete) {
	27	+ $this->delete = $this->getAction($delete);
	28	+ }
27	29
28		- if (null !== $update) $this->update = $this->getAction($delete);
	30	+ if (null !== $update) {
	31	+ $this->update = $this->getAction($delete);
	32	+ }
29	33	}
30	34
31	35	# Get statement

		@@ -30,9 +30,9 @@
		block discarded – undo
30	30
31	31	public function statement() {
32	32
33		- return ((null !== $this->type) ? ($this->type . " ") : "") .
	33	+ return ((null !== $this->type) ? ($this->type." ") : "").
34	34
35		- ("KEY `" . $this->name . "` (`" . $this->name . "`)");
	35	+ ("KEY `".$this->name."` (`".$this->name."`)");
36	36	}
37	37	}
38	38	}

		@@ -23,7 +23,9 @@
		block discarded – undo
23	23
24	24	$this->name = $name;
25	25
26		- if (null !== $type) $this->type = $this->getType($type);
	26	+ if (null !== $type) {
	27	+ $this->type = $this->getType($type);
	28	+ }
27	29	}
28	30
29	31	# Get statement

		@@ -19,7 +19,7 @@
		block discarded – undo
19	19
20	20	public function statement() {
21	21
22		- return ("`" . $this->name . "` int(10) UNSIGNED NOT NULL" . ($this->auto_increment ? " AUTO_INCREMENT" : ""));
	22	+ return ("`".$this->name."` int(10) UNSIGNED NOT NULL".($this->auto_increment ? " AUTO_INCREMENT" : ""));
23	23	}
24	24
25	25	# Cast value

cadmium-org / cadmium-cms

Push — master ( c7e98d...e0d6a2 )

Status

Category

Braces +21 added lines, -7 removed lines patch added patch discarded remove patch

Braces +24 added lines, -8 removed lines patch added patch discarded remove patch

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

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

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

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

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

Braces +13 added lines, -7 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

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

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

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

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

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

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