cadmium-org / cadmium-cms

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
 

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

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 
 			# Check target file
 
-			$base_name = basename($file['name']); $file_name = ($dir_name . '/' . $base_name);
+			$base_name = basename($file['name']); $file_name = ($dir_name.'/'.$base_name);
 
 			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) return 'UPLOADER_ERROR_EXISTS';
 

Braces +45 added lines, -15 removed lines

@@ -12,19 +12,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';
+			}
 
 			# ------------------------
 
@@ -35,19 +49,27 @@ 
 
 		public static function save(string $name, string $dir_name) {
 
-			if (false === ($file = Request::file($name))) return false;
+			if (false === ($file = Request::file($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 for secure upload
 
-			if (!is_uploaded_file($file['tmp_name'])) return 'UPLOADER_ERROR_SECURITY';
+			if (!is_uploaded_file($file['tmp_name'])) {
+				return 'UPLOADER_ERROR_SECURITY';
+			}
 
 			# 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
 
@@ -55,21 +77,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) && !Explorer::createDir($dir_name)) return 'UPLOADER_ERROR_DIR';
+			if (!Explorer::isDir($dir_name) && !Explorer::createDir($dir_name)) {
+				return 'UPLOADER_ERROR_DIR';
+			}
 
 			# Check target file
 
 			$base_name = basename($file['name']); $file_name = ($dir_name . '/' . $base_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';
+			}
 
 			# Set upload data
 

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

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		protected function handle() {
 
-			if (!Request::isAjax()) return false;
+			if (!Request::isAjax()) {
+				return false;
+			}
 
 			# Create response
 

Spacing +2 added lines, -2 removed lines

@@ -22,9 +22,9 @@
 
 			# Save uploaded file
 
-			if (true === ($upload = (Uploader::save('upload', (DIR_UPLOADS . $target_dir))))) {
+			if (true === ($upload = (Uploader::save('upload', (DIR_UPLOADS.$target_dir))))) {
 
-				$name = Uploader::baseName(); $url = (INSTALL_PATH . '/uploads/' . $target_dir . $name);
+				$name = Uploader::baseName(); $url = (INSTALL_PATH.'/uploads/'.$target_dir.$name);
 
 				$ajax->set('name', $name)->set('url', $url);
 

www/engine/Framework/Classes/Ajax/Response.php

Braces +9 added lines, -3 removed lines

@@ -30,7 +30,9 @@ 
 
 		public function set(string $name, $value) : Response {
 
-			if (!in_array($name, ['error', 'status'], true)) $this->data[$name] = $value;
+			if (!in_array($name, ['error', 'status'], true)) {
+				$this->data[$name] = $value;
+			}
 
 			return $this;
 		}
@@ -43,7 +45,9 @@ 
 
 		public function setArray(array $data) : Response {
 
-			foreach ($data as $name => $value) $this->set($name, $value);
+			foreach ($data as $name => $value) {
+				$this->set($name, $value);
+			}
 
 			return $this;
 		}
@@ -104,7 +108,9 @@ 
 
 			$data = ['status' => $this->status];
 
-			if (null !== $this->error) $data['error'] = $this->error;
+			if (null !== $this->error) {
+				$data['error'] = $this->error;
+			}
 
 			# ------------------------
 

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

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 
 		protected function getValue(string $value) : string {
 
-			return ('\'' . addslashes($value) . '\'');
+			return ('\''.addslashes($value).'\'');
 		}
 
 		/**
@@ -41,7 +41,7 @@ 
 
 			$parser = function($value) { if (is_scalar($value)) return $this->getValue($value); };
 
-			return ('(' . implode(', ', array_filter(array_map($parser, $value))) . ')');
+			return ('('.implode(', ', array_filter(array_map($parser, $value))).')');
 		}
 
 		/**

Braces +18 added lines, -6 removed lines

@@ -37,9 +37,14 @@ 
 
 		protected function getList($value) : string {
 
-			if (!is_array($value)) $value = [$value];
+			if (!is_array($value)) {
+				$value = [$value];
+			}
 
-			$parser = function($value) { if (is_scalar($value)) return $this->getValue($value); };
+			$parser = function($value) { if (is_scalar($value)) {
+				return $this->getValue($value);
+			}
+			};
 
 			return ('(' . implode(', ', array_filter(array_map($parser, $value))) . ')');
 		}
@@ -59,7 +64,9 @@ 
 
 		protected function getString($source = null, string $pattern = '', string $separator = '') : string {
 
-			if (!is_array($source)) return (is_scalar($source) ? strval($source) : '');
+			if (!is_array($source)) {
+				return (is_scalar($source) ? strval($source) : '');
+			}
 
 			$regexs = ['key' => '/\^([a-z]+)/', 'value' => '/\$([a-z]+)/']; $matches = ['key' => [], 'value' => []];
 
@@ -69,7 +76,9 @@ 
 
 			# Parse pattern
 
-			foreach ($regexs as $name => $regex) preg_match($regex, $pattern, $matches[$name]);
+			foreach ($regexs as $name => $regex) {
+				preg_match($regex, $pattern, $matches[$name]);
+			}
 
 			# Process replacements
 
@@ -77,9 +86,12 @@ 
 
 				$output[$count] = $pattern; $item = &$output[$count++];
 
-				foreach ($matches as $name => $match) if (isset($match[1]) && isset($parsers[$match[1]])) {
+				foreach ($matches as $name => $match) {
+					if (isset($match[1]) && isset($parsers[$match[1]])) {
 
-					try { $replace = [$this, $parsers[$match[1]]]($$name); } catch (\TypeError $e) { $replace = ''; }
+					try { $replace = [$this, $parsers[$match[1]]]($$name);
+				}
+				} catch (\TypeError $e) { $replace = ''; }
 
 					$item = str_replace($match[0], $replace, $item);
 				}

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

Spacing +3 added lines, -3 removed lines

@@ -23,15 +23,15 @@
 
 			$table = $this->getName($table);
 
-			if ($column !== '*') $column = (($distinct ? 'DISTINCT ' : '') . $this->getName($column));
+			if ($column !== '*') $column = (($distinct ? 'DISTINCT ' : '').$this->getName($column));
 
 			$condition = $this->getString($condition, '^name IN $list', ' AND ');
 
 			# Build query
 
-			$this->query = ('SELECT COUNT(' . $column . ') as count ' .
+			$this->query = ('SELECT COUNT('.$column.') as count '.
 
-				'FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+				'FROM '.$table.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 
 			$table = $this->getName($table);
 
-			if ($column !== '*') $column = (($distinct ? 'DISTINCT ' : '') . $this->getName($column));
+			if ($column !== '*') {
+				$column = (($distinct ? 'DISTINCT ' : '') . $this->getName($column));
+			}
 
 			$condition = $this->getString($condition, '^name IN $list', ' AND ');
 

www/engine/Framework/Classes/Dataset/Validator.php

Spacing +9 added lines, -9 removed lines

@@ -19,32 +19,32 @@
 
 			# Check basic types
 
-			if (is_string   ($default)) return function (string     $value) { return $value; };
+			if (is_string($default)) return function(string     $value) { return $value; };
 
-			if (is_bool     ($default)) return function (bool       $value) { return $value; };
+			if (is_bool($default)) return function(bool       $value) { return $value; };
 
-			if (is_int      ($default)) return function (int        $value) { return $value; };
+			if (is_int($default)) return function(int        $value) { return $value; };
 
-			if (is_float    ($default)) return function (float      $value) { return $value; };
+			if (is_float($default)) return function(float      $value) { return $value; };
 
-			if (is_array    ($default)) return function (array      $value) { return $value; };
+			if (is_array($default)) return function(array      $value) { return $value; };
 
-			if (is_callable ($default)) return function (callable   $value) { return $value; };
+			if (is_callable($default)) return function(callable   $value) { return $value; };
 
 			# Check object type
 
-			if (is_object($default)) return function ($value) use ($default) {
+			if (is_object($default)) return function($value) use ($default) {
 
 				return (is_a($value, get_class($default)) ? $value : null);
 			};
 
 			# Check resource type
 
-			if (is_resource($default)) return function ($value) { return (is_resource($value) ? $value : null); };
+			if (is_resource($default)) return function($value) { return (is_resource($value) ? $value : null); };
 
 			# ------------------------
 
-			return function () { return null; };
+			return function() { return null; };
 		}
 	}
 }

Braces +31 added lines, -8 removed lines

@@ -19,28 +19,51 @@
 
 			# Check basic types
 
-			if (is_string   ($default)) return function (string     $value) { return $value; };
+			if (is_string   ($default)) {
+				return function (string     $value) { return $value;
+			}
+			};
 
-			if (is_bool     ($default)) return function (bool       $value) { return $value; };
+			if (is_bool     ($default)) {
+				return function (bool       $value) { return $value;
+			}
+			};
 
-			if (is_int      ($default)) return function (int        $value) { return $value; };
+			if (is_int      ($default)) {
+				return function (int        $value) { return $value;
+			}
+			};
 
-			if (is_float    ($default)) return function (float      $value) { return $value; };
+			if (is_float    ($default)) {
+				return function (float      $value) { return $value;
+			}
+			};
 
-			if (is_array    ($default)) return function (array      $value) { return $value; };
+			if (is_array    ($default)) {
+				return function (array      $value) { return $value;
+			}
+			};
 
-			if (is_callable ($default)) return function (callable   $value) { return $value; };
+			if (is_callable ($default)) {
+				return function (callable   $value) { return $value;
+			}
+			};
 
 			# Check object type
 
-			if (is_object($default)) return function ($value) use ($default) {
+			if (is_object($default)) {
+				return function ($value) use ($default) {
 
 				return (is_a($value, get_class($default)) ? $value : null);
+			}
 			};
 
 			# Check resource type
 
-			if (is_resource($default)) return function ($value) { return (is_resource($value) ? $value : null); };
+			if (is_resource($default)) {
+				return function ($value) { return (is_resource($value) ? $value : null);
+			}
+			};
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Extend/Common/Templates.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 		protected static $loader_class = 'Modules\Extend\Loader\Templates', $exception_class = 'Exception\Template';
 
-		protected static $root_dir = [SECTION_SITE => DIR_SYSTEM_TEMPLATES . 'Site/', SECTION_ADMIN => DIR_SYSTEM_TEMPLATES . 'Admin/'];
+		protected static $root_dir = [SECTION_SITE => DIR_SYSTEM_TEMPLATES.'Site/', SECTION_ADMIN => DIR_SYSTEM_TEMPLATES.'Admin/'];
 
 		protected static $schema_prototype = 'Prototype\Template', $regex_name = REGEX_TEMPLATE_NAME;