cadmium-org / cadmium-cms

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

Spacing +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 
 			foreach ($this->fields as $field) {
 
-				$block->setBlock(('field_' . $field->getName()), $field->getBlock());
+				$block->setBlock(('field_'.$field->getName()), $field->getBlock());
 			}
 		}
 	}

Braces +20 added lines, -6 removed lines

@@ -23,7 +23,9 @@ 
 
 		private function addField(Form\Field $field) {
 
-			if ($this->posted || ('' === ($key = $field->getKey()))) return false;
+			if ($this->posted || ('' === ($key = $field->getKey()))) {
+				return false;
+			}
 
 			$this->fields[$key] = $field;
 
@@ -38,7 +40,9 @@ 
 
 		public function __construct(string $name = '') {
 
-			if (preg_match(REGEX_FORM_NAME, $name)) $this->name = $name;
+			if (preg_match(REGEX_FORM_NAME, $name)) {
+				$this->name = $name;
+			}
 		}
 
 		/**
@@ -90,9 +94,15 @@ 
 
 			foreach ($this->fields as $field) {
 
-				if (($field instanceof Form\Field\Checkbox) || $field->disabled) continue;
+				if (($field instanceof Form\Field\Checkbox) || $field->disabled) {
+					continue;
+				}
 
-				if (false !== Request::post($field->getName())) $check = true; else return false;
+				if (false !== Request::post($field->getName())) {
+					$check = true;
+				} else {
+					return false;
+				}
 			}
 
 			# ------------------------
@@ -108,7 +118,9 @@ 
 
 		public function post() {
 
-			if ($this->posted || !$this->check()) return false;
+			if ($this->posted || !$this->check()) {
+				return false;
+			}
 
 			$post = []; $errors = false;
 
@@ -116,7 +128,9 @@ 
 
 				$field->post(); $post[$field->getKey()] = $field->getValue();
 
-				if ($field->error) $errors = true;
+				if ($field->error) {
+					$errors = true;
+				}
 			}
 
 			$this->posted = true; $this->errors = $errors;

Doc Comments +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 		/**
 		 * Add a field to the form
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		private function addField(Form\Field $field) : bool {
@@ -44,7 +44,7 @@ 
 		/**
 		 * Add a text field
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		public function addText(string $key, string $value = '',
@@ -57,7 +57,7 @@ 
 		/**
 		 * Add a select field
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		public function addSelect(string $key, string $value = '',
@@ -70,7 +70,7 @@ 
 		/**
 		 * Add a checkbox field
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		public function addCheckbox(string $key, string $value = '') : bool {
@@ -81,7 +81,7 @@ 
 		/**
 		 * Check if valid POST data has been recieved
 		 *
-		 * @return true if the data has been recieved, otherwise false
+		 * @return boolean if the data has been recieved, otherwise false
 		 */
 
 		public function check() : bool {

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

Braces +3 added lines, -1 removed lines

@@ -53,7 +53,9 @@
 
 			$tag->setAttribute('type', 'checkbox');
 
-			if ($this->value) $tag->setAttribute('checked', 'checked');
+			if ($this->value) {
+				$tag->setAttribute('checked', 'checked');
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Explorer/Explorer.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 
 					if (($name === '.') || ($name === '..')) continue;
 
-					if (@$checker($dir_name . $name)) yield $name;
+					if (@$checker($dir_name.$name)) yield $name;
 				}
 
 				closedir($handler);
@@ -93,7 +93,7 @@ 
 
 				foreach (array_diff($list, ['.', '..']) as $name) {
 
-					$name = ($dir_name . '/' . $name);
+					$name = ($dir_name.'/'.$name);
 
 					if (@is_dir($name)) self::removeDir($name, true);
 

Braces +23 added lines, -9 removed lines

@@ -21,9 +21,13 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (($name === '.') || ($name === '..')) continue;
+					if (($name === '.') || ($name === '..')) {
+						continue;
+					}
 
-					if (@$checker($dir_name . $name)) yield $name;
+					if (@$checker($dir_name . $name)) {
+						yield $name;
+					}
 				}
 
 				closedir($handler);
@@ -36,7 +40,9 @@ 
 
 		private static function getInfo(string $file_name, int $param, bool $check_exists = true) {
 
-			if ($check_exists && !self::isFile($file_name)) return false;
+			if ($check_exists && !self::isFile($file_name)) {
+				return false;
+			}
 
 			return pathinfo($file_name, $param);
 		}
@@ -95,9 +101,11 @@ 
 
 					$name = ($dir_name . '/' . $name);
 
-					if (@is_dir($name)) self::removeDir($name, true);
-
-					else if (@is_file($name)) self::removeFile($name);
+					if (@is_dir($name)) {
+						self::removeDir($name, true);
+					} else if (@is_file($name)) {
+						self::removeFile($name);
+					}
 				}
 			}
 
@@ -123,7 +131,9 @@ 
 
 		public static function iterateDirs(string $dir_name) {
 
-			foreach (self::getList($dir_name, 'is_dir') as $name) yield $name;
+			foreach (self::getList($dir_name, 'is_dir') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -132,7 +142,9 @@ 
 
 		public static function iterateFiles(string $dir_name) {
 
-			foreach (self::getList($dir_name, 'is_file') as $name) yield $name;
+			foreach (self::getList($dir_name, 'is_file') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -238,7 +250,9 @@ 
 
 		public static function include(string $file_name) {
 
-			if ((strtolower(self::getExtension($file_name)) !== 'php')) return false;
+			if ((strtolower(self::getExtension($file_name)) !== 'php')) {
+				return false;
+			}
 
 			return @include $file_name;
 		}

Doc Comments +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
 		/**
 		 * Create a directory
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function createDir(string $dir_name, int $mode = 0755) : bool {
@@ -75,7 +75,7 @@ 
 		/**
 		 * Create a file
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function createFile(string $file_name) : bool {
@@ -86,7 +86,7 @@ 
 		/**
 		 * Remove a directory
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function removeDir(string $dir_name, bool $recursive = false) : bool {
@@ -111,7 +111,7 @@ 
 		/**
 		 * Remove a file
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function removeFile(string $file_name) : bool {
@@ -191,7 +191,7 @@ 
 		/**
 		 * Get an extnesion of a file
 		 *
-		 * @return the string or false if check_exists is true and the file does not actually exists
+		 * @return string string or false if check_exists is true and the file does not actually exists
 		 */
 
 		public static function getExtension(string $file_name, bool $check_exists = true) {
@@ -213,7 +213,7 @@ 
 		/**
 		 * Get file contents
 		 *
-		 * @return the read data or false on failure
+		 * @return string read data or false on failure
 		 */
 
 		public static function getContents(string $file_name) {

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/Framework/Engine.php

Spacing +6 added lines, -6 removed lines

@@ -10,13 +10,13 @@ 
 
 		private static function parseContents(string $contents, Throwable $exc) {
 
-		   $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(getenv('SERVER_PROTOCOL') . ' 500 Internal Server Error', true, 500);
+			header(getenv('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() {
 
-			if (!empty(getenv('HTTP_CLIENT_IP')))           return getenv('HTTP_CLIENT_IP');
+			if (!empty(getenv('HTTP_CLIENT_IP'))) {
+				return getenv('HTTP_CLIENT_IP');
+			}
 
-			if (!empty(getenv('HTTP_X_FORWARDED_FOR')))     return getenv('HTTP_X_FORWARDED_FOR');
+			if (!empty(getenv('HTTP_X_FORWARDED_FOR'))) {
+				return getenv('HTTP_X_FORWARDED_FOR');
+			}
 
-			if (!empty(getenv('HTTP_X_FORWARDED')))         return getenv('HTTP_X_FORWARDED');
+			if (!empty(getenv('HTTP_X_FORWARDED'))) {
+				return getenv('HTTP_X_FORWARDED');
+			}
 
-			if (!empty(getenv('HTTP_FORWARDED_FOR')))       return getenv('HTTP_FORWARDED_FOR');
+			if (!empty(getenv('HTTP_FORWARDED_FOR'))) {
+				return getenv('HTTP_FORWARDED_FOR');
+			}
 
-			if (!empty(getenv('HTTP_FORWARDED')))           return getenv('HTTP_FORWARDED');
+			if (!empty(getenv('HTTP_FORWARDED'))) {
+				return getenv('HTTP_FORWARDED');
+			}
 
-			if (!empty(getenv('REMOTE_ADDR')))              return getenv('REMOTE_ADDR');
+			if (!empty(getenv('REMOTE_ADDR'))) {
+				return getenv('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/Includes/Constants.php

Spacing +34 added lines, -34 removed lines

@@ -2,68 +2,68 @@
 
 # Cadmium
 
-define('CADMIUM_NAME',                              'Cadmium CMS');
-define('CADMIUM_HOME',                              'http://cadmium-cms.com');
+define('CADMIUM_NAME', 'Cadmium CMS');
+define('CADMIUM_HOME', 'http://cadmium-cms.com');
 
-define('CADMIUM_VERSION',                           '0.4.0');
-define('CADMIUM_COPY',                              '2016');
+define('CADMIUM_VERSION', '0.4.0');
+define('CADMIUM_COPY', '2016');
 
 # External
 
-define('JQUERY_VERSION',                            '3.1.1');
-define('SEMANTIC_UI_VERSION',                       '2.2.6');
-define('CKEDITOR_VERSION',                          '4.5.11');
+define('JQUERY_VERSION', '3.1.1');
+define('SEMANTIC_UI_VERSION', '2.2.6');
+define('CKEDITOR_VERSION', '4.5.11');
 
 # Sections
 
-define('SECTION_ADMIN',                             'admin');
-define('SECTION_SITE',                              'site');
+define('SECTION_ADMIN', 'admin');
+define('SECTION_SITE', 'site');
 
 # Filemanager types
 
-define('FILEMANAGER_TYPE_DIR',                      'dir');
-define('FILEMANAGER_TYPE_FILE',                     'file');
+define('FILEMANAGER_TYPE_DIR', 'dir');
+define('FILEMANAGER_TYPE_FILE', 'file');
 
 # Access
 
-define('ACCESS_PUBLIC',                             0);
-define('ACCESS_REGISTERED',                         1);
-define('ACCESS_ADMINISTRATOR',                      2);
+define('ACCESS_PUBLIC', 0);
+define('ACCESS_REGISTERED', 1);
+define('ACCESS_ADMINISTRATOR', 2);
 
 # Frequency
 
-define('FREQUENCY_ALWAYS',                          'always');
-define('FREQUENCY_HOURLY',                          'hourly');
-define('FREQUENCY_DAILY',                           'daily');
-define('FREQUENCY_WEEKLY',                          'weekly');
-define('FREQUENCY_MONTHLY',                         'monthly');
-define('FREQUENCY_YEARLY',                          'yearly');
-define('FREQUENCY_NEVER',                           'never');
+define('FREQUENCY_ALWAYS', 'always');
+define('FREQUENCY_HOURLY', 'hourly');
+define('FREQUENCY_DAILY', 'daily');
+define('FREQUENCY_WEEKLY', 'weekly');
+define('FREQUENCY_MONTHLY', 'monthly');
+define('FREQUENCY_YEARLY', 'yearly');
+define('FREQUENCY_NEVER', 'never');
 
 # Rank
 
-define('RANK_GUEST',                                0);
-define('RANK_USER',                                 1);
-define('RANK_ADMINISTRATOR',                        2);
+define('RANK_GUEST', 0);
+define('RANK_USER', 1);
+define('RANK_ADMINISTRATOR', 2);
 
 # Sex
 
-define('SEX_NOT_SELECTED',                          0);
-define('SEX_MALE',                                  1);
-define('SEX_FEMALE',                                2);
+define('SEX_NOT_SELECTED', 0);
+define('SEX_MALE', 1);
+define('SEX_FEMALE', 2);
 
 # Status
 
-define('STATUS_ONLINE',                             0);
-define('STATUS_MAINTENANCE',                        1);
-define('STATUS_UPDATE',                             2);
+define('STATUS_ONLINE', 0);
+define('STATUS_MAINTENANCE', 1);
+define('STATUS_UPDATE', 2);
 
 # Target
 
-define('TARGET_SELF',                               0);
-define('TARGET_BLANK',                              1);
+define('TARGET_SELF', 0);
+define('TARGET_BLANK', 1);
 
 # Visibility
 
-define('VISIBILITY_DRAFT',                          0);
-define('VISIBILITY_PUBLISHED',                      1);
+define('VISIBILITY_DRAFT', 0);
+define('VISIBILITY_PUBLISHED', 1);

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