cadmium-org / cadmium-cms

www/engine/Framework/Main.php

Spacing +5 added lines, -5 removed lines

@@ -2,12 +2,12 @@
 
 # Define constants
 
-define('DIR_FRAMEWORK',     (dirname(__FILE__) . '/'));
+define('DIR_FRAMEWORK', (dirname(__FILE__) . '/'));
 
-define('DIR_CLASSES',       (DIR_FRAMEWORK . 'Classes/'));
-define('DIR_DATA',          (DIR_FRAMEWORK . 'Data/'));
-define('DIR_INCLUDES',      (DIR_FRAMEWORK . 'Includes/'));
-define('DIR_TEMPLATES',     (DIR_FRAMEWORK . 'Templates/'));
+define('DIR_CLASSES', (DIR_FRAMEWORK . 'Classes/'));
+define('DIR_DATA', (DIR_FRAMEWORK . 'Data/'));
+define('DIR_INCLUDES', (DIR_FRAMEWORK . 'Includes/'));
+define('DIR_TEMPLATES', (DIR_FRAMEWORK . 'Templates/'));
 
 # Require classes
 

Braces +3 added lines, -1 removed lines

@@ -23,7 +23,9 @@
 
 # Set defaults
 
-if (function_exists('mb_internal_encoding')) mb_internal_encoding('UTF-8');
+if (function_exists('mb_internal_encoding')) {
+	mb_internal_encoding('UTF-8');
+}
 
 date_default_timezone_set('UTC');
 

www/engine/Framework/Classes/Language/Language.php

Braces +9 added lines, -3 removed lines

@@ -10,16 +10,22 @@
 
 		private static function addPhrase(string $name, string $value) {
 
-			if (preg_match(REGEX_LANGUAGE_PHRASE_NAME, $name)) self::$phrases[$name] = $value;
+			if (preg_match(REGEX_LANGUAGE_PHRASE_NAME, $name)) {
+				self::$phrases[$name] = $value;
+			}
 		}
 
 		# Load phrases file
 
 		public static function load(string $file_name) {
 
-			if (!is_array($phrases = Explorer::php($file_name))) return false;
+			if (!is_array($phrases = Explorer::php($file_name))) {
+				return false;
+			}
 
-			foreach ($phrases as $name => $value) self::addPhrase($name, $value);
+			foreach ($phrases as $name => $value) {
+				self::addPhrase($name, $value);
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Url/Url.php

Braces +12 added lines, -4 removed lines

@@ -10,18 +10,24 @@ 
 
 		public function __construct(string $url = '') {
 
-			if (false === ($url = parse_url($url))) return;
+			if (false === ($url = parse_url($url))) {
+				return;
+			}
 
 			# Parse path
 
-			if (isset($url['path'])) foreach (explode('/', $url['path']) as $part) {
+			if (isset($url['path'])) {
+				foreach (explode('/', $url['path']) as $part) {
 
 				if ('' !== $part) $this->path[] = urldecode($part);
 			}
+			}
 
 			# Parse query
 
-			if (isset($url['query'])) parse_str($url['query'], $this->query);
+			if (isset($url['query'])) {
+				parse_str($url['query'], $this->query);
+			}
 		}
 
 		# Return path
@@ -53,7 +59,9 @@ 
 
 			$path = [];
 
-			foreach ($this->path as $value) $path[] = urlencode($value);
+			foreach ($this->path as $value) {
+				$path[] = urlencode($value);
+			}
 
 			$path = implode('/', $path); $query = http_build_query($this->query);
 

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

Braces +18 added lines, -6 removed lines

@@ -12,19 +12,29 @@ 
 
 			# Establish connection
 
-			if (false === ($link = @mysqli_connect($server, $user, $password))) throw new Exception\DBConnect();
+			if (false === ($link = @mysqli_connect($server, $user, $password))) {
+				throw new Exception\DBConnect();
+			}
 
 			# Select database
 
-			if (!@mysqli_select_db($link, $name)) throw new Exception\DBSelect();
+			if (!@mysqli_select_db($link, $name)) {
+				throw new Exception\DBSelect();
+			}
 
 			# 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();
+			}
 
 			# ------------------------
 
@@ -35,7 +45,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/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/Framework/Classes/DB/Query/Insert.php

Braces +3 added lines, -1 removed lines

@@ -20,9 +20,11 @@
 
 			$names = ''; $values = [];
 
-			foreach ($dataset as $key => $row) if (is_array($row)) {
+			foreach ($dataset as $key => $row) {
+				if (is_array($row)) {
 
 				if (0 === $key) $names = $this->getString(array_keys($row), '$name', ', ');
+			}
 
 				$values[] = ('(' . $this->getString(array_values($row), '$value', ', ') . ')');
 			}

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 			# Build query
 
-			$this->query = ('UPDATE ' . $table . ' SET ' . $dataset . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('UPDATE ' . $table . ' SET ' . $dataset . ($condition ? (' WHERE (' . $condition . ')') : ''));
 		}
 	}
 }

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

Braces +9 added lines, -3 removed lines

@@ -40,7 +40,9 @@ 
 
 		public function row() {
 
-			if (!is_object($this->result)) return null;
+			if (!is_object($this->result)) {
+				return null;
+			}
 
 			return mysqli_fetch_assoc($this->result);
 		}
@@ -49,9 +51,13 @@ 
 
 		public function rows() {
 
-			if (!is_object($this->result)) return [];
+			if (!is_object($this->result)) {
+				return [];
+			}
 
-			$rows = []; while (null !== ($row = $this->row())) $rows[] = $row;
+			$rows = []; while (null !== ($row = $this->row())) {
+				$rows[] = $row;
+			}
 
 			# ------------------------