cadmium-org / cadmium-cms

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

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/Admin/Area/Auth.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
+			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH.'/admin');
 
 			# Handle request
 

Braces +6 added lines, -2 removed lines

@@ -14,11 +14,15 @@
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
+			if (Modules\Auth::check()) {
+				Request::redirect(INSTALL_PATH . '/admin');
+			}
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_401);
+			if (Template::isBlock($result = $this->handle())) {
+				return $this->displayPage($result, STATUS_CODE_401);
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Frames/Admin/Area/Authorized.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 			if (!Modules\Auth::check() || ((false !== Request::get('logout')) && Modules\Auth::logout())) {
 
-				Request::redirect(INSTALL_PATH . '/admin/login');
+				Request::redirect(INSTALL_PATH.'/admin/login');
 			}
 
 			# Handle request

Braces +6 added lines, -2 removed lines

@@ -19,9 +19,13 @@
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_200);
+			if (Template::isBlock($result = $this->handle())) {
+				return $this->displayPage($result, STATUS_CODE_200);
+			}
 
-			if (Ajax::isResponse($result)) return Ajax::output($result);
+			if (Ajax::isResponse($result)) {
+				return Ajax::output($result);
+			}
 
 			# ------------------------
 

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

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 
 		private function getLayout(Template\Block $contents) {
 
-			$layout = View::get('Layouts/' . $this->layout);
+			$layout = View::get('Layouts/'.$this->layout);
 
 			# Set menu and user
 
@@ -82,7 +82,7 @@ 
 
 		protected function displayPage(Template\Block $contents, int $status = STATUS_CODE_200) {
 
-			$page = View::get('Main/' . $this->layout);
+			$page = View::get('Main/'.$this->layout);
 
 			# Set language
 
@@ -90,7 +90,7 @@ 
 
 			# Set title
 
-			$page->title = ((('' !== $this->title) ? (Language::get($this->title) . ' | ') : '') . CADMIUM_NAME);
+			$page->title = ((('' !== $this->title) ? (Language::get($this->title).' | ') : '').CADMIUM_NAME);
 
 			# Set layout
 

Braces +3 added lines, -1 removed lines

@@ -111,7 +111,9 @@
 
 				$ips = preg_split('/ +/', CONFIG_ADMIN_IP, -1, PREG_SPLIT_NO_EMPTY);
 
-				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) return Status::error404();
+				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) {
+					return Status::error404();
+				}
 			}
 
 			# ------------------------