cadmium-org / cadmium-cms

www/engine/Framework/Classes/Tag/Tag.php

Spacing +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
 
 			$block = clone (self::$block ?? (self::$block = Template::createBlock(
 
-				'<$name${ for:attributes } $name$="$value$"{ / for:attributes }>' .
+				'<$name${ for:attributes } $name$="$value$"{ / for:attributes }>'.
 
 				'{ block:contents / }$contents${ ! block:closing }</$name$>{ / block:closing }'
 			)));

Braces +6 added lines, -2 removed lines

@@ -58,7 +58,9 @@ 
 
 		public function setAttributes(array $attributes) : Tag {
 
-			foreach ($attributes as $name => $value) if (is_scalar($value)) $this->setAttribute($name, $value);
+			foreach ($attributes as $name => $value) {
+				if (is_scalar($value)) $this->setAttribute($name, $value);
+			}
 
 			return $this;
 		}
@@ -71,7 +73,9 @@ 
 
 		public function setContents($contents) : Tag {
 
-			if (Template::isBlock($contents) || is_scalar($contents) || is_null($contents)) $this->contents = $contents;
+			if (Template::isBlock($contents) || is_scalar($contents) || is_null($contents)) {
+				$this->contents = $contents;
+			}
 
 			return $this;
 		}

www/engine/Framework/Classes/Template/Group.php

Braces +9 added lines, -3 removed lines

@@ -28,7 +28,9 @@ 
 
 		public function __clone() {
 
-			foreach ($this->items as $name => $item) $this->items[$name] = clone $item;
+			foreach ($this->items as $name => $item) {
+				$this->items[$name] = clone $item;
+			}
 		}
 
 		/**
@@ -52,7 +54,9 @@ 
 
 		public function addItems(array $items) : Group {
 
- 			foreach ($items as $item) if ($item instanceof Block) $this->addItem($item);
+ 			foreach ($items as $item) {
+ 				if ($item instanceof Block) $this->addItem($item);
+ 			}
 
  			return $this;
  		}
@@ -111,7 +115,9 @@ 
 
 			# Process items
 
-			foreach ($this->items as $block) $contents .= $block->getContents();
+			foreach ($this->items as $block) {
+				$contents .= $block->getContents();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Entitizer/Controller/Variable.php

Braces +12 added lines, -4 removed lines

@@ -29,13 +29,19 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::templateComponentName($name))) return ['name', 'VARIABLE_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::templateComponentName($name))) {
+				return ['name', 'VARIABLE_ERROR_NAME_INVALID'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->variable->check($name, 'name'))) return 'VARIABLE_ERROR_MODIFY';
+			if (false === ($check_name = $this->variable->check($name, 'name'))) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'VARIABLE_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify variable
 
@@ -47,7 +53,9 @@ 
 
 			$modifier = ((0 === $this->variable->id) ? 'create' : 'edit');
 
-			if (!$this->variable->$modifier($data)) return 'VARIABLE_ERROR_MODIFY';
+			if (!$this->variable->$modifier($data)) {
+				return 'VARIABLE_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Entitizer/Controller/Widget.php

Braces +12 added lines, -4 removed lines

@@ -29,13 +29,19 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::templateComponentName($name))) return ['name', 'WIDGET_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::templateComponentName($name))) {
+				return ['name', 'WIDGET_ERROR_NAME_INVALID'];
+			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->widget->check($name, 'name'))) return 'WIDGET_ERROR_MODIFY';
+			if (false === ($check_name = $this->widget->check($name, 'name'))) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			if ($check_name === 1) {
+				return ['name', 'WIDGET_ERROR_NAME_DUPLICATE'];
+			}
 
 			# Modify widget
 
@@ -48,7 +54,9 @@ 
 
 			$modifier = ((0 === $this->widget->id) ? 'create' : 'edit');
 
-			if (!$this->widget->$modifier($data)) return 'WIDGET_ERROR_MODIFY';
+			if (!$this->widget->$modifier($data)) {
+				return 'WIDGET_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 
 			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) return;
 
-			self::$routes['/' . implode('/', $path)] = ('Addons\\' . $name . '\\' . implode('\\', $handler));
+			self::$routes['/'.implode('/', $path)] = ('Addons\\'.$name.'\\'.implode('\\', $handler));
 		}
 
 		# Parse item

Braces +15 added lines, -5 removed lines

@@ -52,7 +52,9 @@ 
 
 			$parts = preg_split('/\//', $string, 0, PREG_SPLIT_NO_EMPTY);
 
-			foreach ($parts as $name) if (!preg_match($regex, $name)) return false;
+			foreach ($parts as $name) {
+				if (!preg_match($regex, $name)) return false;
+			}
 
 			# ------------------------
 
@@ -63,9 +65,13 @@ 
 
 		private static function parseRoute(string $name, array $route) {
 
-			if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) return;
+			if (false === ($path = self::parseString($route['path'], REGEX_MAP_ITEM_PATH))) {
+				return;
+			}
 
-			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) return;
+			if (false === ($handler = self::parseString($route['handler'], REGEX_MAP_ITEM_HANDLER))) {
+				return;
+			}
 
 			self::$routes['/' . implode('/', $path)] = ('Addons\\' . $name . '\\' . implode('\\', $handler));
 		}
@@ -74,14 +80,18 @@ 
 
 		private static function parseItem(array $item) {
 
-			foreach ($item['routes'] as $route) self::parseRoute($item['name'], $route);
+			foreach ($item['routes'] as $route) {
+				self::parseRoute($item['name'], $route);
+			}
 		}
 
 		# Autoloader
 
 		public static function __autoload() {
 
-			foreach (Extend\Addons::items() as $item) self::parseItem($item);
+			foreach (Extend\Addons::items() as $item) {
+				self::parseItem($item);
+			}
 		}
 
 		# Get handler by url

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.1');
-define('CADMIUM_COPY',                              '2016');
+define('CADMIUM_VERSION', '0.4.1');
+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/Main.php

Spacing +14 added lines, -14 removed lines

@@ -2,32 +2,32 @@
 
 # Define constants
 
-define('DIR_SYSTEM',                (dirname(__FILE__) . '/'));
+define('DIR_SYSTEM', (dirname(__FILE__).'/'));
 
-define('DIR_SYSTEM_CLASSES',        (DIR_SYSTEM . 'Classes/'));
-define('DIR_SYSTEM_DATA',           (DIR_SYSTEM . 'Data/'));
-define('DIR_SYSTEM_INCLUDES',       (DIR_SYSTEM . 'Includes/'));
-define('DIR_SYSTEM_LANGUAGES',      (DIR_SYSTEM . 'Languages/'));
-define('DIR_SYSTEM_TEMPLATES',      (DIR_SYSTEM . 'Templates/'));
+define('DIR_SYSTEM_CLASSES', (DIR_SYSTEM.'Classes/'));
+define('DIR_SYSTEM_DATA', (DIR_SYSTEM.'Data/'));
+define('DIR_SYSTEM_INCLUDES', (DIR_SYSTEM.'Includes/'));
+define('DIR_SYSTEM_LANGUAGES', (DIR_SYSTEM.'Languages/'));
+define('DIR_SYSTEM_TEMPLATES', (DIR_SYSTEM.'Templates/'));
 
 # Require classes
 
-require_once (DIR_SYSTEM . 'Exception.php');
+require_once (DIR_SYSTEM.'Exception.php');
 
 # Require configuration
 
-require_once (DIR_SYSTEM_INCLUDES . 'Config.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Constants.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Regex.php');
-require_once (DIR_SYSTEM_INCLUDES . 'Tables.php');
+require_once (DIR_SYSTEM_INCLUDES.'Config.php');
+require_once (DIR_SYSTEM_INCLUDES.'Constants.php');
+require_once (DIR_SYSTEM_INCLUDES.'Regex.php');
+require_once (DIR_SYSTEM_INCLUDES.'Tables.php');
 
 # Process environment variables
 
-define('HTTP_MOD_REWRITE',      (getenv('HTTP_MOD_REWRITE') === 'on'));
+define('HTTP_MOD_REWRITE', (getenv('HTTP_MOD_REWRITE') === 'on'));
 
-define('INSTALL_PATH',          rtrim(getenv('INSTALL_PATH'), '/'));
+define('INSTALL_PATH', rtrim(getenv('INSTALL_PATH'), '/'));
 
-define('DEBUG_MODE',            @file_exists(DIR_SYSTEM_DATA . '.debug'));
+define('DEBUG_MODE', @file_exists(DIR_SYSTEM_DATA.'.debug'));
 
 # Set error reporting
 

Braces +3 added lines, -1 removed lines

@@ -31,4 +31,6 @@
 
 # Set error reporting
 
-if (DEBUG_MODE) error_reporting(E_ALL);
+if (DEBUG_MODE) {
+	error_reporting(E_ALL);
+}

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

Braces +9 added lines, -3 removed lines

@@ -32,9 +32,13 @@ 
 
 				$param = static::$param[$this->loader->section()]; $name = Request::post('name');
 
-				if (false === Settings::set($param, $name)) return $ajax->setError(Language::get(static::$error_activate));
+				if (false === Settings::set($param, $name)) {
+					return $ajax->setError(Language::get(static::$error_activate));
+				}
 
-				if (false === Settings::save()) return $ajax->setError(Language::get(static::$error_save));
+				if (false === Settings::save()) {
+					return $ajax->setError(Language::get(static::$error_save));
+				}
 
 			} else if (Request::post('action') === 'list') {
 
@@ -52,7 +56,9 @@ 
 
 			$this->loader = new static::$loader_class(Request::get('list'));
 
-			if (Request::isAjax()) return $this->handleAjax();
+			if (Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Informer/Handler/Information.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
 			# Set system entries
 
-			$contents->system_version       = CADMIUM_VERSION;
+			$contents->system_version = CADMIUM_VERSION;
 
 			# Set external entries