cadmium-org / cadmium-cms

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

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 (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				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/Filemanager/Controller/Create.php

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/Filemanager/Controller/Rename.php

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/Utils/Schema/_Object.php

Spacing +3 added lines, -3 removed lines

@@ -75,7 +75,7 @@ 
 
 			if ('' === static::$file_name) return null;
 
-			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
+			$file_name = (DIR_SYSTEM_DATA.static::$file_name);
 
 			if (null === ($data = JSON::load($file_name))) return null;
 
@@ -92,7 +92,7 @@ 
 
 			if ('' === static::$file_name) return false;
 
-			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
+			$file_name = (DIR_SYSTEM_DATA.static::$file_name);
 
 			if (null === ($data = $this->validate($data))) return false;
 
@@ -109,7 +109,7 @@ 
 
 			if ('' === static::$file_name) return false;
 
-			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
+			$file_name = (DIR_SYSTEM_DATA.static::$file_name);
 
 			return (!Explorer::isFile($file_name) || Explorer::removeFile($file_name));
 		}

Braces +42 added lines, -14 removed lines

@@ -18,48 +18,62 @@ 
 
 		protected function addArray(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Array;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Array;
+			}
 		}
 
 		# Add boolean property
 
 		protected function addBoolean(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Boolean;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Boolean;
+			}
 		}
 
 		# Add integer property
 
 		protected function addInteger(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Integer;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Integer;
+			}
 		}
 
 		# Add object property
 
 		protected function addObject(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _Object;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _Object;
+			}
 		}
 
 		# Add string property
 
 		protected function addString(string $name) {
 
-			if ('' !== $name) return $this->properties[$name] = new _String;
+			if ('' !== $name) {
+				return $this->properties[$name] = new _String;
+			}
 		}
 
 		# Validate data
 
 		public function validate($data) {
 
-			if (!is_array($data)) return null;
+			if (!is_array($data)) {
+				return null;
+			}
 
 			$result = [];
 
 			foreach ($this->properties as $name => $property) {
 
-				if (!isset($data[$name]) || (null === ($value = $property->validate($data[$name])))) return null;
+				if (!isset($data[$name]) || (null === ($value = $property->validate($data[$name])))) {
+					return null;
+				}
 
 				$result[$name] = $value;
 			}
@@ -73,13 +87,19 @@ 
 
 		public function load() {
 
-			if ('' === static::$file_name) return null;
+			if ('' === static::$file_name) {
+				return null;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
 
-			if (null === ($data = JSON::load($file_name))) return null;
+			if (null === ($data = JSON::load($file_name))) {
+				return null;
+			}
 
-			if (null === ($data = $this->validate($data))) return null;
+			if (null === ($data = $this->validate($data))) {
+				return null;
+			}
 
 			# ------------------------
 
@@ -90,13 +110,19 @@ 
 
 		public function save(array $data) {
 
-			if ('' === static::$file_name) return false;
+			if ('' === static::$file_name) {
+				return false;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
 
-			if (null === ($data = $this->validate($data))) return false;
+			if (null === ($data = $this->validate($data))) {
+				return false;
+			}
 
-			if (false === JSON::save($file_name, $data)) return false;
+			if (false === JSON::save($file_name, $data)) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -107,7 +133,9 @@ 
 
 		public function remove() {
 
-			if ('' === static::$file_name) return false;
+			if ('' === static::$file_name) {
+				return false;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . static::$file_name);
 

www/engine/System/Classes/Utils/Uploader.php

Braces +42 added lines, -14 removed lines

@@ -10,19 +10,33 @@ 
 
 		private static function translateError(int $error) {
 
-			if ($error === UPLOAD_ERR_INI_SIZE)         return 'UPLOADER_ERROR_INI_SIZE';
+			if ($error === UPLOAD_ERR_INI_SIZE) {
+				return 'UPLOADER_ERROR_INI_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_FORM_SIZE)        return 'UPLOADER_ERROR_FORM_SIZE';
+			if ($error === UPLOAD_ERR_FORM_SIZE) {
+				return 'UPLOADER_ERROR_FORM_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_PARTIAL)          return 'UPLOADER_ERROR_PARTIAL';
+			if ($error === UPLOAD_ERR_PARTIAL) {
+				return 'UPLOADER_ERROR_PARTIAL';
+			}
 
-			if ($error === UPLOAD_ERR_NO_FILE)          return 'UPLOADER_ERROR_NO_FILE';
+			if ($error === UPLOAD_ERR_NO_FILE) {
+				return 'UPLOADER_ERROR_NO_FILE';
+			}
 
-			if ($error === UPLOAD_ERR_NO_TMP_DIR)       return 'UPLOADER_ERROR_NO_TMP_DIR';
+			if ($error === UPLOAD_ERR_NO_TMP_DIR) {
+				return 'UPLOADER_ERROR_NO_TMP_DIR';
+			}
 
-			if ($error === UPLOAD_ERR_CANT_WRITE)       return 'UPLOADER_ERROR_CANT_WRITE';
+			if ($error === UPLOAD_ERR_CANT_WRITE) {
+				return 'UPLOADER_ERROR_CANT_WRITE';
+			}
 
-			if ($error === UPLOAD_ERR_EXTENSION)        return 'UPLOADER_ERROR_EXTENSION';
+			if ($error === UPLOAD_ERR_EXTENSION) {
+				return 'UPLOADER_ERROR_EXTENSION';
+			}
 
 			# ------------------------
 
@@ -33,15 +47,21 @@ 
 
 		public static function save(string $name, string $dir_name) {
 
-			if ((false === ($file = Request::file($name))) || !is_uploaded_file($file['tmp_name'])) return false;
+			if ((false === ($file = Request::file($name))) || !is_uploaded_file($file['tmp_name'])) {
+				return false;
+			}
 
 			# Check for upload errors
 
-			if ($file['error'] !== UPLOAD_ERR_OK) return self::translateError($file['error']);
+			if ($file['error'] !== UPLOAD_ERR_OK) {
+				return self::translateError($file['error']);
+			}
 
 			# Check size
 
-			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) return 'UPLOADER_ERROR_SIZE';
+			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) {
+				return 'UPLOADER_ERROR_SIZE';
+			}
 
 			# Check file extension
 
@@ -49,21 +69,29 @@ 
 
 			$extension = strtolower(Explorer::getExtension($file['name'], false));
 
-			if (in_array($extension, $extensions, true)) return 'UPLOADER_ERROR_TYPE';
+			if (in_array($extension, $extensions, true)) {
+				return 'UPLOADER_ERROR_TYPE';
+			}
 
 			# Check target directory
 
-			if (!Explorer::isDir($dir_name)) return 'UPLOADER_ERROR_DIR';
+			if (!Explorer::isDir($dir_name)) {
+				return 'UPLOADER_ERROR_DIR';
+			}
 
 			# Check target file
 
 			$file_name = ($dir_name . '/' . basename($file['name']));
 
-			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) return 'UPLOADER_ERROR_EXISTS';
+			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) {
+				return 'UPLOADER_ERROR_EXISTS';
+			}
 
 			# Save uploaded file
 
-			if (!@move_uploaded_file($file['tmp_name'], $file_name)) return 'UPLOADER_ERROR_SAVE';
+			if (!@move_uploaded_file($file['tmp_name'], $file_name)) {
+				return 'UPLOADER_ERROR_SAVE';
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Headers/Headers.php

Spacing +9 added lines, -9 removed lines

@@ -134,7 +134,7 @@ 
 
 		public static function sendStatus(int $code) {
 
-			if (self::isStatusCode($code)) header($_SERVER['SERVER_PROTOCOL'] . ' ' . self::$status_codes[$code]);
+			if (self::isStatusCode($code)) header($_SERVER['SERVER_PROTOCOL'].' '.self::$status_codes[$code]);
 		}
 
 		/**
@@ -145,12 +145,12 @@ 
 
 			if (self::isTextContentType($type)) {
 
-				return header('Content-type: ' . self::$content_types_text[$type] . '; charset=UTF-8');
+				return header('Content-type: '.self::$content_types_text[$type].'; charset=UTF-8');
 			}
 
 			if (self::isMediaContentType($type)) {
 
-				return header('Content-type: ' . self::$content_types_media[$type]);
+				return header('Content-type: '.self::$content_types_media[$type]);
 			}
 		}
 
@@ -162,15 +162,15 @@ 
 
 			if (self::$cache_sent) return;
 
-			header('Expires: ' . gmdate('D, d M Y H:i:s', (REQUEST_TIME + $expires)) . ' GMT');
+			header('Expires: '.gmdate('D, d M Y H:i:s', (REQUEST_TIME + $expires)).' GMT');
 
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', REQUEST_TIME) . ' GMT');
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s', REQUEST_TIME).' GMT');
 
 			$limiter = ($public ? 'public' : 'private');
 
-			header('Cache-Control: ' . $limiter . ', max-age=' . $expires . ', pre-check=' . $expires);
+			header('Cache-Control: '.$limiter.', max-age='.$expires.', pre-check='.$expires);
 
-			header('Pragma: ' . $limiter);
+			header('Pragma: '.$limiter);
 
 			# ------------------------
 
@@ -185,9 +185,9 @@ 
 
 			if (self::$cache_sent) return;
 
-			header('Expires: ' . gmdate('D, d M Y H:i:s', strtotime('-1 day')) . ' GMT');
+			header('Expires: '.gmdate('D, d M Y H:i:s', strtotime('-1 day')).' GMT');
 
-			header('Last-Modified: ' . gmdate('D, d M Y H:i:s', strtotime('-1 day')) . ' GMT');
+			header('Last-Modified: '.gmdate('D, d M Y H:i:s', strtotime('-1 day')).' GMT');
 
 			header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0');
 

Braces +9 added lines, -3 removed lines

@@ -134,7 +134,9 @@ 
 
 		public static function sendStatus(int $code) {
 
-			if (self::isStatusCode($code)) header($_SERVER['SERVER_PROTOCOL'] . ' ' . self::$status_codes[$code]);
+			if (self::isStatusCode($code)) {
+				header($_SERVER['SERVER_PROTOCOL'] . ' ' . self::$status_codes[$code]);
+			}
 		}
 
 		/**
@@ -160,7 +162,9 @@ 
 
 		public static function sendCache(int $expires, bool $public = false) {
 
-			if (self::$cache_sent) return;
+			if (self::$cache_sent) {
+				return;
+			}
 
 			header('Expires: ' . gmdate('D, d M Y H:i:s', (REQUEST_TIME + $expires)) . ' GMT');
 
@@ -183,7 +187,9 @@ 
 
 		public static function sendNoCache() {
 
-			if (self::$cache_sent) return;
+			if (self::$cache_sent) {
+				return;
+			}
 
 			header('Expires: ' . gmdate('D, d M Y H:i:s', strtotime('-1 day')) . ' GMT');
 

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

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/DB/DB.php

Braces +18 added lines, -6 removed lines

@@ -23,15 +23,23 @@ 
 
 			// Ignore error to avoid warning when trying to connect to unavailable host
 
-			if (false === ($link = @mysqli_connect($server, $user, $password))) throw new Exception\DBConnect;
+			if (false === ($link = @mysqli_connect($server, $user, $password))) {
+				throw new Exception\DBConnect;
+			}
 
 			# Set encoding
 
-			if (!mysqli_query($link, "SET character_set_client = 'utf8'")) throw new Exception\DBCharset;
+			if (!mysqli_query($link, "SET character_set_client = 'utf8'")) {
+				throw new Exception\DBCharset;
+			}
 
-			if (!mysqli_query($link, "SET character_set_results = 'utf8'")) throw new Exception\DBCharset;
+			if (!mysqli_query($link, "SET character_set_results = 'utf8'")) {
+				throw new Exception\DBCharset;
+			}
 
-			if (!mysqli_query($link, "SET collation_connection = 'utf8_general_ci'")) throw new Exception\DBCharset;
+			if (!mysqli_query($link, "SET collation_connection = 'utf8_general_ci'")) {
+				throw new Exception\DBCharset;
+			}
 
 			# ------------------------
 
@@ -44,7 +52,9 @@ 
 
 		public static function name(string $name) {
 
-			if (!mysqli_select_db(self::$link, $name)) throw new Exception\DBSelect;
+			if (!mysqli_select_db(self::$link, $name)) {
+				throw new Exception\DBSelect;
+			}
 		}
 
 		/**
@@ -55,7 +65,9 @@ 
 
 		public static function send(string $query) {
 
-			if (null === self::$link) return (self::$last = false);
+			if (null === self::$link) {
+				return (self::$last = false);
+			}
 
 			$time = microtime(true); $result = mysqli_query(self::$link, $query); $time = (microtime(true) - $time);
 

www/engine/Framework/Engine.php

Spacing +6 added lines, -6 removed lines

@@ -10,13 +10,13 @@ 
 
 		private static function parseContents(string $contents, Throwable $exc) : string {
 
-		   $contents = str_replace('$message$',             $exc->getMessage(),                 $contents);
+		   $contents = str_replace('$message$', $exc->getMessage(), $contents);
 
-		   $contents = str_replace('$file$',                $exc->getFile(),                    $contents);
+		   $contents = str_replace('$file$', $exc->getFile(), $contents);
 
-		   $contents = str_replace('$line$',                $exc->getLine(),                    $contents);
+		   $contents = str_replace('$line$', $exc->getLine(), $contents);
 
-		   $contents = str_replace('$trace$',               nl2br($exc->getTraceAsString()),    $contents);
+		   $contents = str_replace('$trace$', nl2br($exc->getTraceAsString()), $contents);
 
 		   # ------------------------
 
@@ -54,7 +54,7 @@ 
 
 			# Load template
 
-			$file_name = (DIR_TEMPLATES . 'Exception.tpl');
+			$file_name = (DIR_TEMPLATES.'Exception.tpl');
 
 			if (false === ($contents = @file_get_contents($file_name))) $output = nl2br($exc);
 
@@ -70,7 +70,7 @@ 
 
 			header('Pragma: no-cache');
 
-			header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, 500);
+			header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error', true, 500);
 
 			header('Content-type: text/html; charset=UTF-8');
 

Braces +23 added lines, -9 removed lines

@@ -29,17 +29,29 @@ 
 
 		public static function getIP() : string {
 
-			if (!empty($_SERVER['HTTP_CLIENT_IP']))         return $_SERVER['HTTP_CLIENT_IP'];
+			if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+				return $_SERVER['HTTP_CLIENT_IP'];
+			}
 
-			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))   return $_SERVER['HTTP_X_FORWARDED_FOR'];
+			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+				return $_SERVER['HTTP_X_FORWARDED_FOR'];
+			}
 
-			if (!empty($_SERVER['HTTP_X_FORWARDED']))       return $_SERVER['HTTP_X_FORWARDED'];
+			if (!empty($_SERVER['HTTP_X_FORWARDED'])) {
+				return $_SERVER['HTTP_X_FORWARDED'];
+			}
 
-			if (!empty($_SERVER['HTTP_FORWARDED_FOR']))     return $_SERVER['HTTP_FORWARDED_FOR'];
+			if (!empty($_SERVER['HTTP_FORWARDED_FOR'])) {
+				return $_SERVER['HTTP_FORWARDED_FOR'];
+			}
 
-			if (!empty($_SERVER['HTTP_FORWARDED']))         return $_SERVER['HTTP_FORWARDED'];
+			if (!empty($_SERVER['HTTP_FORWARDED'])) {
+				return $_SERVER['HTTP_FORWARDED'];
+			}
 
-			if (!empty($_SERVER['REMOTE_ADDR']))            return $_SERVER['REMOTE_ADDR'];
+			if (!empty($_SERVER['REMOTE_ADDR'])) {
+				return $_SERVER['REMOTE_ADDR'];
+			}
 
 			# ------------------------
 
@@ -56,9 +68,11 @@ 
 
 			$file_name = (DIR_TEMPLATES . 'Exception.tpl');
 
-			if (false === ($contents = @file_get_contents($file_name))) $output = nl2br($exc);
-
-			else $output = self::parseContents($contents, $exc);
+			if (false === ($contents = @file_get_contents($file_name))) {
+				$output = nl2br($exc);
+			} else {
+				$output = self::parseContents($contents, $exc);
+			}
 
 			# Set headers