cadmium-org / cadmium-cms

www/engine/Framework/Classes/Form/Field/Select.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 
 		public function __construct(Form $form, string $key, string $value = '',
 
-		    array $options = [], string $default = null, array $config = []) {
+			array $options = [], string $default = null, array $config = []) {
 
 			# Init field
 

Braces +9 added lines, -3 removed lines

@@ -77,9 +77,13 @@ 
 
 			# Set appearance
 
-			if ($this->search) $tag->setAttribute('data-search', 'search');
+			if ($this->search) {
+				$tag->setAttribute('data-search', 'search');
+			}
 
-			if ($this->auto) $tag->setAttribute('data-auto', 'auto');
+			if ($this->auto) {
+				$tag->setAttribute('data-auto', 'auto');
+			}
 
 			# Set options
 
@@ -87,7 +91,9 @@ 
 
 				$option = (new Tag('option', [], $text))->setAttribute('value', $value);
 
-				if ($this->value === $value) $option->setAttribute('selected', '');
+				if ($this->value === $value) {
+					$option->setAttribute('selected', '');
+				}
 
 				$options->addItem($option->getBlock());
 			}

www/engine/Framework/Classes/Form/Field/Text.php

Indentation +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 
 		public function __construct(Form $form, string $key, string $value = '',
 
-		    string $type = FORM_FIELD_TEXT, int $maxlength = 0, array $config = []) {
+			string $type = FORM_FIELD_TEXT, int $maxlength = 0, array $config = []) {
 
 			# Init field
 

Braces +45 added lines, -23 removed lines

@@ -82,9 +82,13 @@ 
 
 			$tag = $this->getTag('textarea', [], $this->value);
 
-			if ($this->rows > 0) $tag->setAttribute('rows', $this->rows);
+			if ($this->rows > 0) {
+				$tag->setAttribute('rows', $this->rows);
+			}
 
-			if ($this->cols > 0) $tag->setAttribute('cols', $this->cols);
+			if ($this->cols > 0) {
+				$tag->setAttribute('cols', $this->cols);
+			}
 
 			# ------------------------
 
@@ -97,9 +101,11 @@ 
 
 		private function processSpaces() {
 
-			if ($this->spaces === 'strip') $this->value = Str::stripSpaces($this->value);
-
-			else if ($this->spaces === 'single') $this->value = Str::singleSpaces($this->value);
+			if ($this->spaces === 'strip') {
+				$this->value = Str::stripSpaces($this->value);
+			} else if ($this->spaces === 'single') {
+				$this->value = Str::singleSpaces($this->value);
+			}
 		}
 
 		/**
@@ -108,9 +114,11 @@ 
 
 		private function processConvert() {
 
-			if ($this->convert === 'url') $this->value = Str::toUrl($this->value, $this->maxlength);
-
-			else if ($this->convert === 'var') $this->value = Str::toVar($this->value, $this->maxlength);
+			if ($this->convert === 'url') {
+				$this->value = Str::toUrl($this->value, $this->maxlength);
+			} else if ($this->convert === 'var') {
+				$this->value = Str::toVar($this->value, $this->maxlength);
+			}
 		}
 
 		/**
@@ -119,9 +127,11 @@ 
 
 		private function processTransform() {
 
-			if ($this->transform === 'lower') $this->value = Str::toLower($this->value);
-
-			else if ($this->transform === 'upper') $this->value = Str::toUpper($this->value);
+			if ($this->transform === 'lower') {
+				$this->value = Str::toLower($this->value);
+			} else if ($this->transform === 'upper') {
+				$this->value = Str::toUpper($this->value);
+			}
 		}
 
 		/**
@@ -183,27 +193,39 @@ 
 
 			# Process hidden field
 
-			if ($this->type === FORM_FIELD_HIDDEN) return $this->getHidden()->getBlock();
+			if ($this->type === FORM_FIELD_HIDDEN) {
+				return $this->getHidden()->getBlock();
+			}
 
 			# Process visible field
 
-			else if ($this->type === FORM_FIELD_PASSWORD) $tag = $this->getPassword();
-
-			else if ($this->type === FORM_FIELD_CAPTCHA) $tag = $this->getCaptcha();
-
-			else if ($this->type === FORM_FIELD_TEXTAREA) $tag = $this->getTextarea();
-
-			else $tag = $this->getText();
+			else if ($this->type === FORM_FIELD_PASSWORD) {
+				$tag = $this->getPassword();
+			} else if ($this->type === FORM_FIELD_CAPTCHA) {
+				$tag = $this->getCaptcha();
+			} else if ($this->type === FORM_FIELD_TEXTAREA) {
+				$tag = $this->getTextarea();
+			} else {
+				$tag = $this->getText();
+			}
 
 			# Set appearance
 
-			if ($this->maxlength > 0) $tag->setAttribute('maxlength', $this->maxlength);
+			if ($this->maxlength > 0) {
+				$tag->setAttribute('maxlength', $this->maxlength);
+			}
 
-			if ('' !== $this->placeholder) $tag->setAttribute('placeholder', $this->placeholder);
+			if ('' !== $this->placeholder) {
+				$tag->setAttribute('placeholder', $this->placeholder);
+			}
 
-			if ($this->readonly) $tag->setAttribute('readonly', 'readonly');
+			if ($this->readonly) {
+				$tag->setAttribute('readonly', 'readonly');
+			}
 
-			if ($this->autofocus) $tag->setAttribute('autofocus', 'autofocus');
+			if ($this->autofocus) {
+				$tag->setAttribute('autofocus', 'autofocus');
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Cookie/Cookie.php

Braces +3 added lines, -1 removed lines

@@ -31,7 +31,9 @@
 
 		public static function delete(string $name) {
 
-			if (isset($_COOKIE[$name])) unset($_COOKIE[$name]);
+			if (isset($_COOKIE[$name])) {
+				unset($_COOKIE[$name]);
+			}
 		}
 	}
 }

www/engine/Framework/Classes/Mime/Mime.php

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		private static function checkType(string $extension, string $type) {
 
-			if (false === ($mime = self::get($extension))) return false;
+			if (false === ($mime = self::get($extension))) {
+				return false;
+			}
 
 			return (preg_match('/^' . $type . '\//', $mime) ? true : false);
 		}

Spacing +2 added lines, -2 removed lines

@@ -12,14 +12,14 @@
 
 			if (false === ($mime = self::get($extension))) return false;
 
-			return (preg_match(('/^' . $type . '\//'), $mime) ? true : false);
+			return (preg_match(('/^'.$type.'\//'), $mime) ? true : false);
 		}
 
 		# Autoloader
 
 		public static function __autoload() {
 
-			self::init(DIR_DATA . 'Mime.php');
+			self::init(DIR_DATA.'Mime.php');
 		}
 
 		# Check if extension is image

www/engine/Framework/Classes/Image/Image.php

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
 
 		private static function output($image, string $mime, callable $outputter, array $params = []) {
 
-			if (!is_resource($image)) return false;
+			if (!is_resource($image)) {
+				return false;
+			}
 
 			Headers::nocache(); Headers::content($mime);
 

www/engine/Framework/Includes/Headers/Mime.php

Spacing +6 added lines, -6 removed lines

@@ -2,10 +2,10 @@
 
 # Mime types
 
-define('MIME_TYPE_HTML',        'html');
-define('MIME_TYPE_XML',         'xml');
-define('MIME_TYPE_JSON',        'json');
+define('MIME_TYPE_HTML', 'html');
+define('MIME_TYPE_XML', 'xml');
+define('MIME_TYPE_JSON', 'json');
 
-define('MIME_TYPE_JPEG',        'jpeg');
-define('MIME_TYPE_PNG',         'png');
-define('MIME_TYPE_GIF',         'gif');
+define('MIME_TYPE_JPEG', 'jpeg');
+define('MIME_TYPE_PNG', 'png');
+define('MIME_TYPE_GIF', 'gif');

www/engine/Framework/Exception.php

Spacing +4 added lines, -4 removed lines

@@ -32,28 +32,28 @@
 
 	# Class load exception
 
-	class ClassLoad extends Exception  {
+	class ClassLoad extends Exception {
 
 		protected $message = 'Class \'$value$\' not found';
 	}
 
 	# Database connect exception
 
-	class DBConnect extends Exception  {
+	class DBConnect extends Exception {
 
 		protected $message = 'Unable to connect to database';
 	}
 
 	# Database select exception
 
-	class DBSelect extends Exception  {
+	class DBSelect extends Exception {
 
 		protected $message = 'Unable to select database';
 	}
 
 	# Database charset exception
 
-	class DBCharset extends Exception  {
+	class DBCharset extends Exception {
 
 		protected $message = 'Unable to set database charset';
 	}

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 
 		public function __construct(string $message = '') {
 
-			if ('' !== $message) $this->message = $message;
+			if ('' !== $message) {
+				$this->message = $message;
+			}
 		}
 	}
 

www/engine/Main.php

Braces +12 added lines, -6 removed lines

@@ -2,7 +2,9 @@ 
 
 # Check PHP version
 
-if (version_compare(PHP_VERSION, '7.0.0') < 0) exit('PHP version 7 or higher is required.');
+if (version_compare(PHP_VERSION, '7.0.0') < 0) {
+	exit('PHP version 7 or higher is required.');
+}
 
 # Set error reporting
 
@@ -37,9 +39,11 @@ 
 
 	# Require class file
 
-	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) require_once $file_name;
-
-	else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) require_once $file_name;
+	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	} else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	}
 
 	# Check if class exists
 
@@ -50,5 +54,7 @@ 
 
 	# Call autoload method
 
-	if (method_exists($class_name, '__autoload')) $class_name::__autoload();
-});
+	if (method_exists($class_name, '__autoload')) {
+		$class_name::__autoload();
+	}
+	});

Spacing +8 added lines, -8 removed lines

@@ -10,18 +10,18 @@ 
 
 # Define constants
 
-define('DIR_ENGINE',        (dirname(__FILE__) . '/'));
+define('DIR_ENGINE', (dirname(__FILE__).'/'));
 
-define('DIR_WWW',           (DIR_ENGINE . '../'));
-define('DIR_UPLOADS',       (DIR_ENGINE . '../uploads/'));
+define('DIR_WWW', (DIR_ENGINE.'../'));
+define('DIR_UPLOADS', (DIR_ENGINE.'../uploads/'));
 
 # Require framework main file
 
-require_once(DIR_ENGINE . 'Framework/Main.php');
+require_once(DIR_ENGINE.'Framework/Main.php');
 
 # Require system main file
 
-require_once(DIR_ENGINE . 'System/Main.php');
+require_once(DIR_ENGINE.'System/Main.php');
 
 # Register classes autoloader
 
@@ -33,13 +33,13 @@ 
 
 	$system_classes = ['Frames', 'Handlers', 'Modules', 'Utils', 'Views', 'Dispatcher', 'Installer'];
 
-	$path = ((in_array($path[0], $system_classes, true) ? DIR_SYSTEM_CLASSES : DIR_CLASSES) . implode('/', $path));
+	$path = ((in_array($path[0], $system_classes, true) ? DIR_SYSTEM_CLASSES : DIR_CLASSES).implode('/', $path));
 
 	# Require class file
 
-	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) require_once $file_name;
+	if (@file_exists($file_name = ($path.'.php')) && @is_file($file_name)) require_once $file_name;
 
-	else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) require_once $file_name;
+	else if (@file_exists($file_name = ($path.'/'.$last.'.php')) && @is_file($file_name)) require_once $file_name;
 
 	# Check if class exists
 

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

Braces +6 added lines, -2 removed lines

@@ -49,9 +49,13 @@
 
 		public static function url(string $value) {
 
-			if (false === ($value = parent::url($value))) return false;
+			if (false === ($value = parent::url($value))) {
+				return false;
+			}
 
-			if (!preg_match('/^https?:\/\//', $value)) return false;
+			if (!preg_match('/^https?:\/\//', $value)) {
+				return false;
+			}
 
 			# ------------------------