cadmium-org / cadmium-cms

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

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 			if (null === ($data = Schema::get('System')->load())) {
 
-				Request::redirect(INSTALL_PATH . '/install.php');
+				Request::redirect(INSTALL_PATH.'/install.php');
 			}
 
 			# Connect to database

www/engine/System/Classes/Frames/Section.php

Braces +6 added lines, -2 removed lines

@@ -34,10 +34,12 @@ 
 
 			$phrases = array_merge(static::PHRASES, array_keys(Extend\Addons::items() ?? []));
 
-			foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
+			foreach (array_unique($languages) as $path) {
+				foreach ($phrases as $name) {
 
 				Language::load($path . 'Phrases/' . $name . '.php');
 			}
+			}
 
 			# Set template globals
 
@@ -59,7 +61,9 @@ 
 
 			# Set timezone
 
-			if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) date_default_timezone_set($timezone);
+			if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) {
+				date_default_timezone_set($timezone);
+			}
 
 			# ------------------------
 

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
 
 			foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
 
-				Language::load($path . 'Phrases/' . $name . '.php');
+				Language::load($path.'Phrases/'.$name.'.php');
 			}
 		}
 
@@ -44,24 +44,24 @@ 
 
 		private function setGlobals() {
 
-			Template::setGlobal('cadmium_home',         CADMIUM_HOME);
-			Template::setGlobal('cadmium_copy',         CADMIUM_COPY);
-			Template::setGlobal('cadmium_name',         CADMIUM_NAME);
-			Template::setGlobal('cadmium_version',      CADMIUM_VERSION);
+			Template::setGlobal('cadmium_home', CADMIUM_HOME);
+			Template::setGlobal('cadmium_copy', CADMIUM_COPY);
+			Template::setGlobal('cadmium_name', CADMIUM_NAME);
+			Template::setGlobal('cadmium_version', CADMIUM_VERSION);
 
-			Template::setGlobal('template_name',        strtolower(Extend\Templates::active()));
+			Template::setGlobal('template_name', strtolower(Extend\Templates::active()));
 
-			Template::setGlobal('site_title',           Settings::get('site_title'));
-			Template::setGlobal('site_slogan',          Settings::get('site_slogan'));
+			Template::setGlobal('site_title', Settings::get('site_title'));
+			Template::setGlobal('site_slogan', Settings::get('site_slogan'));
 
-			Template::setGlobal('system_url',           Settings::get('system_url'));
-			Template::setGlobal('system_email',         Settings::get('system_email'));
+			Template::setGlobal('system_url', Settings::get('system_url'));
+			Template::setGlobal('system_email', Settings::get('system_email'));
 
-			Template::setGlobal('install_path',         INSTALL_PATH);
+			Template::setGlobal('install_path', INSTALL_PATH);
 
-			Template::setGlobal('index_page',           (('' !== INSTALL_PATH) ? INSTALL_PATH : '/'));
+			Template::setGlobal('index_page', (('' !== INSTALL_PATH) ? INSTALL_PATH : '/'));
 
-			Template::setGlobal('current_year',         Date::getYear());
+			Template::setGlobal('current_year', Date::getYear());
 		}
 
 		/**

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

Braces +14 added lines, -4 removed lines

@@ -12,7 +12,11 @@ 
 
 			$text = Language::get($code);
 
-			if (!$popup) Messages::set('error', $text); else Popup::set('negative', $text);
+			if (!$popup) {
+				Messages::set('error', $text);
+			} else {
+				Popup::set('negative', $text);
+			}
 
 			# ------------------------
 
@@ -23,15 +27,21 @@ 
 
 		public function handle(callable $callback, bool $popup = false) {
 
-			if (false === ($post = $this->post())) return false;
+			if (false === ($post = $this->post())) {
+				return false;
+			}
 
 			# Check form for errors
 
-			if ($this->hasErrors()) return $this->displayError('FORM_ERROR_REQUIRED', $popup);
+			if ($this->hasErrors()) {
+				return $this->displayError('FORM_ERROR_REQUIRED', $popup);
+			}
 
 			# Call controller method
 
-			if (is_string($result = $callback($post))) return $this->displayError($result, $popup);
+			if (is_string($result = $callback($post))) {
+				return $this->displayError($result, $popup);
+			}
 
 			if (is_array($result)) { $this->getField($result[0])->error = true; return $this->displayError($result[1], $popup); }
 

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

Spacing +1 added lines, -1 removed lines

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

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;
+			}
 
 			# ------------------------
 

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

Braces +9 added lines, -3 removed lines

@@ -20,7 +20,9 @@ 
 
 				$item->children = ($children = Template::createBlock());
 
-				foreach ($this->menu[$id]['children'] as $child) $children->addItem($this->parseItem($child));
+				foreach ($this->menu[$id]['children'] as $child) {
+					$children->addItem($this->parseItem($child));
+				}
 
 			} else {
 
@@ -44,7 +46,9 @@ 
 
 			$menu = Entitizer::treeview(TABLE_MENU)->subtree(0, ['active' => true]);
 
-			if (false !== $menu) $this->menu = $menu;
+			if (false !== $menu) {
+				$this->menu = $menu;
+			}
 		}
 
 		# Get block
@@ -53,7 +57,9 @@ 
 
 			$menu = Template::createBlock();
 
-			foreach ($this->menu[0]['children'] as $id) $menu->addItem($this->parseItem($id));
+			foreach ($this->menu[0]['children'] as $id) {
+				$menu->addItem($this->parseItem($id));
+			}
 
 			# ------------------------