cadmium-org / cadmium-cms

www/engine/Framework/Classes/Request/Request.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 		public static function redirect(string $url) {
 
-			header("Location: " . $url); exit();
+			header("Location: ".$url); exit();
 		}
 	}
 }

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 		/**
 		 * Get a FILE-param value
 		 *
-		 * @return array|false : the array with file info or false if the param does not exist
+		 * @return string : the array with file info or false if the param does not exist
 		 */
 
 		public static function file(string $name) {

www/engine/Framework/Classes/Agent/Agent.php

Spacing +2 added lines, -2 removed lines

@@ -23,9 +23,9 @@
 
 		public static function __autoload() {
 
-			$file_mobiles = (DIR_DATA . 'Agent/Mobiles.php');
+			$file_mobiles = (DIR_DATA.'Agent/Mobiles.php');
 
-			$file_robots = (DIR_DATA . 'Agent/Robots.php');
+			$file_robots = (DIR_DATA.'Agent/Robots.php');
 
 			if (is_array($mobiles = Explorer::php($file_mobiles))) self::$mobiles = $mobiles;
 

Braces +12 added lines, -4 removed lines

@@ -21,9 +21,13 @@ 
 
 		private static function search(array &$list) : bool {
 
-			if (empty($_SERVER['HTTP_USER_AGENT'])) return false;
+			if (empty($_SERVER['HTTP_USER_AGENT'])) {
+				return false;
+			}
 
-			foreach ($list as $item) if (false !== stripos($_SERVER['HTTP_USER_AGENT'], $item)) return true;
+			foreach ($list as $item) {
+				if (false !== stripos($_SERVER['HTTP_USER_AGENT'], $item)) return true;
+			}
 
 			# ------------------------
 
@@ -40,9 +44,13 @@ 
 
 			$file_robots = (DIR_DATA . 'Agent/Robots.php');
 
-			if (is_array($mobiles = Explorer::include($file_mobiles))) self::$mobiles = $mobiles;
+			if (is_array($mobiles = Explorer::include($file_mobiles))) {
+				self::$mobiles = $mobiles;
+			}
 
-			if (is_array($robots = Explorer::include($file_robots))) self::$robots = $robots;
+			if (is_array($robots = Explorer::include($file_robots))) {
+				self::$robots = $robots;
+			}
 		}
 
 		/**

www/engine/Framework/Classes/Mailer/Mailer.php

Spacing +4 added lines, -4 removed lines

@@ -12,13 +12,13 @@
 
 			# Set headers
 
-			$headers  = ('MIME-Version: 1.0' . "\r\n");
+			$headers  = ('MIME-Version: 1.0'."\r\n");
 
-			$headers .= ('Content-Type: ' . ($is_html ? 'text/html' : 'text/plain') . '; charset=UTF-8' . "\r\n");
+			$headers .= ('Content-Type: '.($is_html ? 'text/html' : 'text/plain').'; charset=UTF-8'."\r\n");
 
-			$headers .= ('From: ' . $sender . ' <' . $from . '>' . "\r\n" . 'Reply-To: ' . $reply_to . "\r\n");
+			$headers .= ('From: '.$sender.' <'.$from.'>'."\r\n".'Reply-To: '.$reply_to."\r\n");
 
-			$headers .= ('X-Mailer: PHP/' . phpversion() . "\r\n");
+			$headers .= ('X-Mailer: PHP/'.phpversion()."\r\n");
 
 			# Send message
 

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

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 			# Build query
 
-			$this->query = ('DELETE FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('DELETE FROM '.$table.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }

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

Spacing +2 added lines, -2 removed lines

@@ -22,9 +22,9 @@
 
 			# Build query
 
-			$this->query = ('SELECT ' . $selection . ' FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : '') .
+			$this->query = ('SELECT '.$selection.' FROM '.$table.($condition ? (' WHERE ('.$condition.')') : '').
 
-				($order ? (' ORDER BY ' .  $order) : '') . ($limit ? (' LIMIT ' .  $limit) : ''));
+				($order ? (' ORDER BY '.$order) : '').($limit ? (' LIMIT '.$limit) : ''));
 		}
 	}
 }

www/engine/System/Classes/Modules/Filemanager/Utils/Handler.php

Spacing +4 added lines, -4 removed lines

@@ -88,9 +88,9 @@ 
 
 			if (!$this->entity->init(Request::get('name'))) {
 
-				$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);
 			}
 
 			# Create form
@@ -101,9 +101,9 @@ 
 
 			if ($this->form->handle(new Filemanager\Controller\Rename($this->entity))) {
 
-				$query = ('?parent=' . $this->parent->path() . '&name=' . $this->entity->name() . '&submitted');
+				$query = ('?parent='.$this->parent->path().'&name='.$this->entity->name().'&submitted');
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager/' . static::$type . $query);
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager/'.static::$type.$query);
 			}
 
 			# Display success message

Braces +9 added lines, -3 removed lines

@@ -56,7 +56,9 @@ 
 
 			if (Request::post('action') === 'remove') {
 
-				if (!$this->entity->remove()) return $ajax->setError(Language::get(static::$message_error_remove));
+				if (!$this->entity->remove()) {
+					return $ajax->setError(Language::get(static::$message_error_remove));
+				}
 			}
 
 			# ------------------------
@@ -78,7 +80,9 @@ 
 
 			# Handle ajax request
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# Init entity
 
@@ -104,7 +108,9 @@ 
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Popup::set('positive', Language::get(static::$message_success_rename));
+			if (false !== Request::get('submitted')) {
+				Popup::set('positive', Language::get(static::$message_success_rename));
+			}
 
 			# ------------------------
 

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

Spacing +5 added lines, -5 removed lines

@@ -61,11 +61,11 @@ 
 
 			# Set link
 
-			$link = (INSTALL_PATH . static::$link . '/');
+			$link = (INSTALL_PATH.static::$link.'/');
 
-			if (static::$nesting) $contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
+			if (static::$nesting) $contents->link = ($link.($this->create ? 'create' : 'edit').'?id='.$this->parent->id);
 
-			else $contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			else $contents->link = ($link.($this->create ? 'create' : ('edit?id='.$this->entity->id)));
 
 			# Process parent block
 
@@ -124,7 +124,7 @@ 
 
 			# Redirect if entity not found
 
-			if (!$this->create && (0 === $this->entity->id)) return Request::redirect(INSTALL_PATH . static::$link);
+			if (!$this->create && (0 === $this->entity->id)) return Request::redirect(INSTALL_PATH.static::$link);
 
 			# Create form
 
@@ -136,7 +136,7 @@ 
 
 			if ($this->form->handle(new static::$controller($this->entity))) {
 
-				Request::redirect(INSTALL_PATH . static::$link . '/edit?id=' . $this->entity->id . '&submitted');
+				Request::redirect(INSTALL_PATH.static::$link.'/edit?id='.$this->entity->id.'&submitted');
 			}
 
 			# Display success message

Braces +37 added lines, -15 removed lines

@@ -45,7 +45,9 @@ 
 
 		private function processSelector(Template\Block $selector) {
 
-			if ($this->create) return $selector->disable();
+			if ($this->create) {
+				return $selector->disable();
+			}
 
 			$selector->parent_id = $this->entity->parent_id;
 
@@ -68,25 +70,33 @@ 
 
 			# Set path / title
 
-			if (static::$nesting) $contents->path = $this->path;
-
-			else $contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			if (static::$nesting) {
+				$contents->path = $this->path;
+			} else {
+				$contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			}
 
 			# Process parent block
 
-			if (static::$nesting) $this->processParent($contents->getBlock('parent'));
+			if (static::$nesting) {
+				$this->processParent($contents->getBlock('parent'));
+			}
 
 			# Set link
 
 			$link = (INSTALL_PATH . static::$link . '/');
 
-			if (static::$nesting) $contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
-
-			else $contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			if (static::$nesting) {
+				$contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
+			} else {
+				$contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			}
 
 			# Process selector block
 
-			if (static::$nesting) $this->processSelector($contents->getBlock('selector'));
+			if (static::$nesting) {
+				$this->processSelector($contents->getBlock('selector'));
+			}
 
 			# Implement form
 
@@ -119,11 +129,15 @@ 
 
 				$parent_id = Number::forceInt(Request::post('parent_id'));
 
-				if (!$this->entity->move($parent_id)) return $ajax->setError(Language::get(static::$message_error_move));
+				if (!$this->entity->move($parent_id)) {
+					return $ajax->setError(Language::get(static::$message_error_move));
+				}
 
 			} else if (Request::post('action') === 'remove') {
 
-				if (!$this->entity->remove()) return $ajax->setError(Language::get(static::$message_error_remove));
+				if (!$this->entity->remove()) {
+					return $ajax->setError(Language::get(static::$message_error_remove));
+				}
 			}
 
 			# ------------------------
@@ -135,7 +149,9 @@ 
 
 		protected function handle(bool $ajax = false) {
 
-			if (!$this->create && $ajax) return $this->handleAjax();
+			if (!$this->create && $ajax) {
+				return $this->handleAjax();
+			}
 
 			# Create entity
 
@@ -143,7 +159,9 @@ 
 
 			$this->entity = Entitizer::get(static::$table, (!$this->create ? $id : 0));
 
-			if (!$this->create && (0 === $this->entity->id)) return Request::redirect(INSTALL_PATH . static::$link);
+			if (!$this->create && (0 === $this->entity->id)) {
+				return Request::redirect(INSTALL_PATH . static::$link);
+			}
 
 			# Create parent entity
 
@@ -151,7 +169,9 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
 			# Create form
 
@@ -161,7 +181,9 @@ 
 
 			if ($this->form->handle(new static::$controller($this->entity), true)) {
 
-				if ($this->create && (0 !== $this->parent->id)) $this->entity->move($this->parent->id);
+				if ($this->create && (0 !== $this->parent->id)) {
+					$this->entity->move($this->parent->id);
+				}
 
 				Request::redirect(INSTALL_PATH . static::$link . '/edit?id=' . $this->entity->id . '&submitted');
 			}

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/System/Classes/Modules/Install/Handler/Database.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 			if ($this->form->handle(new Install\Controller\Database())) {
 
-				Request::redirect(INSTALL_PATH . '/admin/register');
+				Request::redirect(INSTALL_PATH.'/admin/register');
 			}
 
 			# ------------------------