cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Extend/Utils/Extension.php

Indentation +4 added lines, -4 removed lines

@@ -23,10 +23,10 @@
 		}
 
 		/**
- 		 * Validate an item name
- 		 *
- 		 * @return string|false : the name or false on failure
- 		 */
+		 * Validate an item name
+		 *
+		 * @return string|false : the name or false on failure
+		 */
 
 		public static function validate(string $name) {
 

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 			if (null !== static::$loader) return static::$loader->$name(...$arguments);
 
-			throw new \BadMethodCallException('Call to undefined method ' . get_called_class() . '::' . $name . '()');
+			throw new \BadMethodCallException('Call to undefined method '.get_called_class().'::'.$name.'()');
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -39,7 +39,9 @@
 
 		public static function __callStatic($name, $arguments) {
 
-			if (null !== static::$loader) return static::$loader->$name(...$arguments);
+			if (null !== static::$loader) {
+				return static::$loader->$name(...$arguments);
+			}
 
 			throw new \BadMethodCallException('Call to undefined method ' . get_called_class() . '::' . $name . '()');
 		}

www/engine/System/Classes/Modules/Extend/Utils/Loader/Addons.php

Braces +19 added lines, -7 removed lines

@@ -23,7 +23,9 @@ 
 
 			foreach ((Schema::get(static::$schema)->load() ?? []) as $item) {
 
-				if (isset($items[$item['name']])) $items[$item['name']]['installed'] = true;
+				if (isset($items[$item['name']])) {
+					$items[$item['name']]['installed'] = true;
+				}
 			}
 
 			# ------------------------
@@ -41,7 +43,9 @@ 
 
 			foreach ((Schema::get(static::$schema)->load() ?? []) as $item) {
 
-				if (static::$extension_class::isValid($item['name'])) $items[$item['name']] = $item;
+				if (static::$extension_class::isValid($item['name'])) {
+					$items[$item['name']] = $item;
+				}
 			}
 
 			# ------------------------
@@ -70,18 +74,26 @@ 
 
 		public function install(string $name, bool $value = true) : bool {
 
-			if (!isset($this->items[$name])) return false;
+			if (!isset($this->items[$name])) {
+				return false;
+			}
 
 			$items = [];
 
 			foreach ($this->items as $item) {
 
-				if ($value) { if ($item['installed'] || ($item['name'] === $name)) $items[] = $item; }
-
-				else { if ($item['installed'] && ($item['name'] !== $name)) $items[] = $item; }
+				if ($value) { if ($item['installed'] || ($item['name'] === $name)) {
+					$items[] = $item;
+				}
+				} else { if ($item['installed'] && ($item['name'] !== $name)) {
+					$items[] = $item;
+				}
+				}
 			}
 
-			if (!Schema::get(static::$schema)->save($items)) return false;
+			if (!Schema::get(static::$schema)->save($items)) {
+				return false;
+			}
 
 			$this->items[$name]['installed'] = $value;
 

www/engine/System/Classes/Modules/Extend/Utils/Extension/Basic.php

Braces +6 added lines, -3 removed lines

@@ -32,7 +32,9 @@ 
 
 			# Throw error if no extensions found
 
-			if (false === static::$loader->get('name')) throw new static::$exception_class;
+			if (false === static::$loader->get('name')) {
+				throw new static::$exception_class;
+			}
 
 			# Activate user defined extension
 
@@ -40,9 +42,10 @@ 
 
 				$name = static::$name; $param = static::$param[static::$loader->getSection()];
 
-				if (static::$loader->activate(Request::get($name)) || static::$loader->activate(Cookie::get($param)))
-
+				if (static::$loader->activate(Request::get($name)) || static::$loader->activate(Cookie::get($param))) {
+				
 					Cookie::set($param, static::$loader->get('name'), static::$cookie_expires);
+				}
 			}
 		}
 	}

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

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::get('name')));
+			Template::setGlobal('template_name', strtolower(Extend\Templates::get('name')));
 
-			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());
 		}
 
 		/**

Braces +6 added lines, -2 removed lines

@@ -32,10 +32,12 @@ 
 
 			$phrases = array_merge(static::PHRASES, array_keys(Extend\Addons::getItems() ?? []));
 
-			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');
 			}
+			}
 		}
 
 		/**
@@ -86,7 +88,9 @@ 
 
 			# Set timezone
 
-			if (Auth::isLogged() && ('' !== ($timezone = Auth::get('timezone')))) date_default_timezone_set($timezone);
+			if (Auth::isLogged() && ('' !== ($timezone = Auth::get('timezone')))) {
+				date_default_timezone_set($timezone);
+			}
 
 			# Init utils
 

www/engine/System/Classes/Frames/Site/View.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 
 		private function getLayout(Template\Block $contents) : Template\Block {
 
-			$layout = View::get('Layouts/' . $this->layout);
+			$layout = View::get('Layouts/'.$this->layout);
 
 			# Set menu
 
@@ -78,7 +78,7 @@ 
 
 			$title = (SEO::get('title') ?: Language::get($this->title) ?: '');
 
-			$page->title = ((('' !== $title) ? ($title . ' | ') : '') . Settings::get('site_title'));
+			$page->title = ((('' !== $title) ? ($title.' | ') : '').Settings::get('site_title'));
 
 			# Set canonical
 

Braces +12 added lines, -4 removed lines

@@ -38,7 +38,9 @@ 
 
 				$layout->getBlock('user')->name = Auth::get('name');
 
-				if (Auth::get('rank') === RANK_ADMINISTRATOR) $layout->getBlock('admin')->enable();
+				if (Auth::get('rank') === RANK_ADMINISTRATOR) {
+					$layout->getBlock('admin')->enable();
+				}
 			}
 
 			# Set title
@@ -82,7 +84,9 @@ 
 
 			# Set canonical
 
-			if (false !== SEO::get('canonical')) $page->getBlock('canonical')->enable()->link = SEO::get('canonical');
+			if (false !== SEO::get('canonical')) {
+				$page->getBlock('canonical')->enable()->link = SEO::get('canonical');
+			}
 
 			# Set layout
 
@@ -90,9 +94,13 @@ 
 
 			# Set global components
 
-			foreach (Variables::generate() as $name => $value) Template::setGlobal($name, $value);
+			foreach (Variables::generate() as $name => $value) {
+				Template::setGlobal($name, $value);
+			}
 
-			foreach (Widgets::generate() as $name => $block) Template::setWidget($name, $block);
+			foreach (Widgets::generate() as $name => $block) {
+				Template::setWidget($name, $block);
+			}
 
 			# ------------------------
 

www/engine/Framework/Engine.php

Spacing +6 added lines, -6 removed lines

@@ -17,13 +17,13 @@ 
 
 		private static function parseContents(string $contents, Throwable $exc) : string {
 
-		   $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);
 
 		   # ------------------------
 
@@ -61,7 +61,7 @@ 
 
 			# Load template
 
-			$file_name = (DIR_TEMPLATES . 'Exception.ctp');
+			$file_name = (DIR_TEMPLATES.'Exception.ctp');
 
 			if (false === ($contents = @file_get_contents($file_name))) $output = nl2br($exc);
 
@@ -77,7 +77,7 @@ 
 
 			header('Pragma: no-cache');
 
-			header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, 500);
+			header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error', true, 500);
 
 			header('Content-type: text/html; charset=UTF-8');
 

Braces +23 added lines, -9 removed lines

@@ -36,17 +36,29 @@ 
 
 		public static function getIP() : string {
 
-			if (!empty($_SERVER['HTTP_CLIENT_IP']))         return $_SERVER['HTTP_CLIENT_IP'];
+			if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+				return $_SERVER['HTTP_CLIENT_IP'];
+			}
 
-			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))   return $_SERVER['HTTP_X_FORWARDED_FOR'];
+			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+				return $_SERVER['HTTP_X_FORWARDED_FOR'];
+			}
 
-			if (!empty($_SERVER['HTTP_X_FORWARDED']))       return $_SERVER['HTTP_X_FORWARDED'];
+			if (!empty($_SERVER['HTTP_X_FORWARDED'])) {
+				return $_SERVER['HTTP_X_FORWARDED'];
+			}
 
-			if (!empty($_SERVER['HTTP_FORWARDED_FOR']))     return $_SERVER['HTTP_FORWARDED_FOR'];
+			if (!empty($_SERVER['HTTP_FORWARDED_FOR'])) {
+				return $_SERVER['HTTP_FORWARDED_FOR'];
+			}
 
-			if (!empty($_SERVER['HTTP_FORWARDED']))         return $_SERVER['HTTP_FORWARDED'];
+			if (!empty($_SERVER['HTTP_FORWARDED'])) {
+				return $_SERVER['HTTP_FORWARDED'];
+			}
 
-			if (!empty($_SERVER['REMOTE_ADDR']))            return $_SERVER['REMOTE_ADDR'];
+			if (!empty($_SERVER['REMOTE_ADDR'])) {
+				return $_SERVER['REMOTE_ADDR'];
+			}
 
 			# ------------------------
 
@@ -63,9 +75,11 @@ 
 
 			$file_name = (DIR_TEMPLATES . 'Exception.ctp');
 
-			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 +33 added lines, -33 removed lines

@@ -9,64 +9,64 @@
 
 # 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.7');
-define('CADMIUM_COPY',                              '2017');
+define('CADMIUM_VERSION', '0.4.7');
+define('CADMIUM_COPY', '2017');
 
 # Third-party
 
-define('JQUERY_VERSION',                            '3.2.1');
-define('SEMANTIC_UI_VERSION',                       '2.2.10');
-define('CKEDITOR_VERSION',                          '4.6.2');
-define('ACE_VERSION',                               '1.2.6');
+define('JQUERY_VERSION', '3.2.1');
+define('SEMANTIC_UI_VERSION', '2.2.10');
+define('CKEDITOR_VERSION', '4.6.2');
+define('ACE_VERSION', '1.2.6');
 
 # Sections
 
-define('SECTION_SITE',                              'site');
-define('SECTION_ADMIN',                             'admin');
+define('SECTION_SITE', 'site');
+define('SECTION_ADMIN', 'admin');
 
 # 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);