cadmium-org / cadmium-cms

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

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
 
 			if (preg_match(REGEX_FORM_FIELD_KEY, $key)) {
 
-				$prefix = (('' !== $this->form->getName()) ? ($this->form->getName() . '_') : '');
+				$prefix = (('' !== $this->form->getName()) ? ($this->form->getName().'_') : '');
 
-				$this->key = $key; $this->name = ($prefix . $key); $this->id = str_replace('_', '-', $this->name);
+				$this->key = $key; $this->name = ($prefix.$key); $this->id = str_replace('_', '-', $this->name);
 			}
 
 			# Set configuration

Braces +12 added lines, -4 removed lines

@@ -57,11 +57,17 @@ 
 
 			# Set appearance
 
-			if ($this->disabled)    $data['disabled']           = 'disabled';
+			if ($this->disabled) {
+				$data['disabled']           = 'disabled';
+			}
 
-			if ($this->required)    $data['data-required']      = 'required';
+			if ($this->required) {
+				$data['data-required']      = 'required';
+			}
 
-			if ($this->error)       $data['data-error']         = 'error';
+			if ($this->error) {
+				$data['data-error']         = 'error';
+			}
 
 			# ------------------------
 
@@ -76,7 +82,9 @@ 
 
 		public function post() : bool {
 
-			if ($this->posted || $this->disabled || ('' === $this->key)) return false;
+			if ($this->posted || $this->disabled || ('' === $this->key)) {
+				return false;
+			}
 
 			$this->error = (!$this->setValue(Request::post($this->name)) && $this->required);
 

www/engine/Framework/Classes/JSON/JSON.php

Braces +6 added lines, -2 removed lines

@@ -41,7 +41,9 @@ 
 
 		public static function load(string $file_name) {
 
-			if (false === ($contents = Explorer::getContents($file_name))) return null;
+			if (false === ($contents = Explorer::getContents($file_name))) {
+				return null;
+			}
 
 			return self::parse($contents);
 		}
@@ -54,7 +56,9 @@ 
 
 		public static function save(string $file_name, $value) {
 
-			if (false === ($value = self::stringify($value))) return false;
+			if (false === ($value = self::stringify($value))) {
+				return false;
+			}
 
 			return Explorer::putContents($file_name, $value);
 		}

www/engine/System/Includes/Regex.php

Spacing +9 added lines, -9 removed lines

@@ -2,16 +2,16 @@
 
 # Regular expressions
 
-define('REGEX_MAP_ITEM_PATH',                       '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/');
-define('REGEX_MAP_ITEM_HANDLER',                    '/^[A-Z][a-zA-Z0-9]*$/');
+define('REGEX_MAP_ITEM_PATH', '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/');
+define('REGEX_MAP_ITEM_HANDLER', '/^[A-Z][a-zA-Z0-9]*$/');
 
-define('REGEX_ADDON_NAME',                          '/^[A-Z0-9][a-zA-Z0-9]*$/');
-define('REGEX_LANGUAGE_NAME',                       '/^[a-z][a-z]-[A-Z][A-Z]$/');
-define('REGEX_TEMPLATE_NAME',                       '/^[A-Z0-9][a-zA-Z0-9]*$/');
+define('REGEX_ADDON_NAME', '/^[A-Z0-9][a-zA-Z0-9]*$/');
+define('REGEX_LANGUAGE_NAME', '/^[a-z][a-z]-[A-Z][A-Z]$/');
+define('REGEX_TEMPLATE_NAME', '/^[A-Z0-9][a-zA-Z0-9]*$/');
 
-define('REGEX_USER_AUTH_CODE',                      '/^[a-zA-Z0-9]{40}$/');
+define('REGEX_USER_AUTH_CODE', '/^[a-zA-Z0-9]{40}$/');
 
-define('REGEX_USER_NAME',                           '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
-define('REGEX_USER_PASSWORD',                       '/^.+$/');
+define('REGEX_USER_NAME', '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_USER_PASSWORD', '/^.+$/');
 
-define('REGEX_FILE_NAME',                           '/^[^\/?%*:|"<>\\\]+$/');
+define('REGEX_FILE_NAME', '/^[^\/?%*:|"<>\\\]+$/');

www/engine/System/Classes/Addons/Contact/Handler.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 			# Handle form
 
-			if ($this->form->handle(new Controller)) Request::redirect(INSTALL_PATH . '/contact?submitted');
+			if ($this->form->handle(new Controller)) Request::redirect(INSTALL_PATH.'/contact?submitted');
 
 			# Display success message
 

Braces +6 added lines, -2 removed lines

@@ -35,11 +35,15 @@
 
 			# Handle form
 
-			if ($this->form->handle(new Controller)) Request::redirect(INSTALL_PATH . '/contact?submitted');
+			if ($this->form->handle(new Controller)) {
+				Request::redirect(INSTALL_PATH . '/contact?submitted');
+			}
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Messages::set('success', Language::get('CONTACT_SUCCESS_SEND'));
+			if (false !== Request::get('submitted')) {
+				Messages::set('success', Language::get('CONTACT_SUCCESS_SEND'));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Addons/Contact/Controller.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
 			# Send mail
 
-			$to = Settings::get('system_email'); $subject = (Settings::get('site_title') . ' | Contact form message');
+			$to = Settings::get('system_email'); $subject = (Settings::get('site_title').' | Contact form message');
 
 			if (!Mailer::send($to, $name, $email, $email, $subject, $message)) return 'CONTACT_ERROR_SEND';
 

Braces +9 added lines, -3 removed lines

@@ -20,15 +20,21 @@
 
 			# Validate values
 
-			if (false === ($email = Validate::userEmail($email))) return ['email', 'CONTACT_ERROR_EMAIL_INVALID'];
+			if (false === ($email = Validate::userEmail($email))) {
+				return ['email', 'CONTACT_ERROR_EMAIL_INVALID'];
+			}
 
-			if (false === Security::checkCaptcha($captcha)) return ['captcha', 'CONTACT_ERROR_CAPTCHA_INCORRECT'];
+			if (false === Security::checkCaptcha($captcha)) {
+				return ['captcha', 'CONTACT_ERROR_CAPTCHA_INCORRECT'];
+			}
 
 			# Send mail
 
 			$to = Settings::get('system_email'); $subject = (Settings::get('site_title') . ' | Contact form message');
 
-			if (!Mailer::send($to, $name, $email, $email, $subject, $message)) return 'CONTACT_ERROR_SEND';
+			if (!Mailer::send($to, $name, $email, $email, $subject, $message)) {
+				return 'CONTACT_ERROR_SEND';
+			}
 
 			# ------------------------
 

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

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 			$class_name = ('Schemas\\' . $name);
 
-			if (!isset(self::$cache[$class_name])) self::$cache[$class_name] = new $class_name;
+			if (!isset(self::$cache[$class_name])) {
+				self::$cache[$class_name] = new $class_name;
+			}
 
 			# ------------------------
 

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 		public static function get(string $name) : Schema\_Object {
 
-			$class_name = ('Schemas\\' . $name);
+			$class_name = ('Schemas\\'.$name);
 
 			if (!isset(self::$cache[$class_name])) self::$cache[$class_name] = new $class_name;
 

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

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 
 				list ($extremum, $index) = $data; $block = $pagination->getBlock($class);
 
-				if ($active === $extremum) { $block->disable(); $pagination->getBlock($class . '_disabled')->enable(); }
+				if ($active === $extremum) { $block->disable(); $pagination->getBlock($class.'_disabled')->enable(); }
 
 				else $block->link = $url->setAttribute('index', $index)->getString();
 			}

Braces +15 added lines, -7 removed lines

@@ -23,7 +23,9 @@ 
 
 			for ($index = ($active - 2); $index <= ($active + 2); $index++) {
 
-				if (!($index > 0 && $index <= $count)) continue;
+				if (!($index > 0 && $index <= $count)) {
+					continue;
+				}
 
 				$class = (($index === $active) ? 'active item' : 'item');
 
@@ -52,7 +54,9 @@ 
 
 				$block->link = $url->setAttribute('index', $index)->getString(); $block->index = $index;
 
-				if ($closest) $block->getBlock('ellipsis')->disable();
+				if ($closest) {
+					$block->getBlock('ellipsis')->disable();
+				}
 			}
 		}
 
@@ -71,9 +75,9 @@ 
 
 				list ($extremum, $index) = $data; $block = $pagination->getBlock($class);
 
-				if ($active === $extremum) { $block->disable(); $pagination->getBlock($class . '_disabled')->enable(); }
-
-				else $block->link = $url->setAttribute('index', $index)->getString();
+				if ($active === $extremum) { $block->disable(); $pagination->getBlock($class . '_disabled')->enable(); } else {
+					$block->link = $url->setAttribute('index', $index)->getString();
+				}
 			}
 		}
 
@@ -90,9 +94,13 @@ 
 
 		public static function getBlock(int $index, int $display, int $total, Url $url) {
 
-			if (($index <= 0) || ($display <= 0) || ($total <= 0)) return false;
+			if (($index <= 0) || ($display <= 0) || ($total <= 0)) {
+				return false;
+			}
 
-			if (($display >= $total) || ($index > ($count = ceil($total / $display)))) return false;
+			if (($display >= $total) || ($index > ($count = ceil($total / $display)))) {
+				return false;
+			}
 
 			# Create block
 

www/engine/System/Classes/Utils/Schema/_Array.php

Braces +6 added lines, -2 removed lines

@@ -8,13 +8,17 @@
 
 		public function validate($data) {
 
-			if (!is_array($data)) return null;
+			if (!is_array($data)) {
+				return null;
+			}
 
 			$result = [];
 
 			foreach ($data as $item) {
 
-				if (!is_array($item) || (null === ($item = parent::validate($item)))) return null;
+				if (!is_array($item) || (null === ($item = parent::validate($item)))) {
+					return null;
+				}
 
 				$result[] = $item;
 			}

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

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 		protected static $loader_class = 'Modules\Extend\Loader\Addons';
 
-		protected static $root_dir = (DIR_SYSTEM_CLASSES . 'Addons/');
+		protected static $root_dir = (DIR_SYSTEM_CLASSES.'Addons/');
 
 		protected static $schema_prototype = 'Prototype\Addon', $schema = 'Addons', $regex_name = REGEX_ADDON_NAME;