cadmium-org / cadmium-cms

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

Braces +6 added lines, -2 removed lines

@@ -20,7 +20,9 @@ 
 
 					$item = new Map\Item($item->path, $item->handler);
 
-					if ($item->parsed()) $this->map[] = $item;
+					if ($item->parsed()) {
+						$this->map[] = $item;
+					}
 				}
 			}
 		}
@@ -31,7 +33,9 @@ 
 
 			foreach ($this->map as $item) {
 
-				if (false !== ($handler = $item->handler($url->path()))) return $handler;
+				if (false !== ($handler = $item->handler($url->path()))) {
+					return $handler;
+				}
 			}
 
 			# ------------------------

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

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
 
 		public static function info(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['info'] ?? false);
+			if (null === $text) return (self::$messages['info'] ? ? false);
 
 			self::setMessage('info', $text, $header);
 		}
@@ -39,7 +39,7 @@ 
 
 		public static function warning(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['warning'] ?? false);
+			if (null === $text) return (self::$messages['warning'] ? ? false);
 
 			self::setMessage('warning', $text, $header);
 		}
@@ -48,7 +48,7 @@ 
 
 		public static function error(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['error'] ?? false);
+			if (null === $text) return (self::$messages['error'] ? ? false);
 
 			self::setMessage('error', $text, $header);
 		}
@@ -57,7 +57,7 @@ 
 
 		public static function success(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['success'] ?? false);
+			if (null === $text) return (self::$messages['success'] ? ? false);
 
 			self::setMessage('success', $text, $header);
 		}

Braces +23 added lines, -7 removed lines

@@ -12,11 +12,15 @@ 
 
 		private static function setMessage(string $type, string $text, string $header = null) {
 
-			if (('' === $text) || isset(self::$messages[$type])) return;
+			if (('' === $text) || isset(self::$messages[$type])) {
+				return;
+			}
 
 			self::$messages[$type] = ['text' => $text, 'header' => null];
 
-			if ((null !== $header) && ('' !== $header)) self::$messages[$type]['header'] = $header;
+			if ((null !== $header) && ('' !== $header)) {
+				self::$messages[$type]['header'] = $header;
+			}
 		}
 
 		# Init messages
@@ -30,7 +34,9 @@ 
 
 		public static function info(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['info'] ?? false);
+			if (null === $text) {
+				return (self::$messages['info'] ?? false);
+			}
 
 			self::setMessage('info', $text, $header);
 		}
@@ -39,7 +45,9 @@ 
 
 		public static function warning(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['warning'] ?? false);
+			if (null === $text) {
+				return (self::$messages['warning'] ?? false);
+			}
 
 			self::setMessage('warning', $text, $header);
 		}
@@ -48,7 +56,9 @@ 
 
 		public static function error(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['error'] ?? false);
+			if (null === $text) {
+				return (self::$messages['error'] ?? false);
+			}
 
 			self::setMessage('error', $text, $header);
 		}
@@ -57,7 +67,9 @@ 
 
 		public static function success(string $text = null, string $header = null) {
 
-			if (null === $text) return (self::$messages['success'] ?? false);
+			if (null === $text) {
+				return (self::$messages['success'] ?? false);
+			}
 
 			self::setMessage('success', $text, $header);
 		}
@@ -74,7 +86,11 @@ 
 
 				$block->type = $type; $block->text = Template::block($message['text']); $header = $block->block('header');
 
-				if (isset($message['header'])) $header->text = $message['header']; else $header->disable();
+				if (isset($message['header'])) {
+					$header->text = $message['header'];
+				} else {
+					$header->disable();
+				}
 			}
 
 			# ------------------------

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

Braces +15 added lines, -5 removed lines

@@ -20,7 +20,9 @@ 
 
 				$item->children = ($children = Template::group());
 
-				foreach ($this->items[$id]['children'] as $child) $children->add($this->parseItem($child));
+				foreach ($this->items[$id]['children'] as $child) {
+					$children->add($this->parseItem($child));
+				}
 
 			} else {
 
@@ -46,7 +48,9 @@ 
 
 					 ("FROM " . TABLE_MENU . " men ORDER BY men.parent_id ASC, men.position ASC, men.id ASC");
 
-			if (!(DB::send($query) && DB::last()->status)) return;
+			if (!(DB::send($query) && DB::last()->status)) {
+				return;
+			}
 
 			# Process results
 
@@ -57,9 +61,13 @@ 
 				$this->items[$entity->id()] = $entity->data();
 			}
 
-			foreach ($this->items as $id => $item) if (0 === $item['parent_id']) $this->menu[] = $id;
+			foreach ($this->items as $id => $item) {
+				if (0 === $item['parent_id']) $this->menu[] = $id;
+			}
 
-			else if (isset($this->items[$item['parent_id']])) $this->items[$item['parent_id']]['children'][] = $id;
+			else if (isset($this->items[$item['parent_id']])) {
+				$this->items[$item['parent_id']]['children'][] = $id;
+			}
 		}
 
 		# Get block
@@ -68,7 +76,9 @@ 
 
 			$menu = Template::group();
 
-			foreach ($this->menu as $id) $menu->add($this->parseItem($id));
+			foreach ($this->menu as $id) {
+				$menu->add($this->parseItem($id));
+			}
 
 			# ------------------------
 

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

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 
 		public function handle(callable $callback) {
 
-			if (false === ($post = $this->post())) return false;
+			if (false === ($post = $this->post())) {
+				return false;
+			}
 
 			# Check form for errors
 

www/engine/System/Classes/Utils/Tools/Sitemap.php

Braces +21 added lines, -7 removed lines

@@ -14,7 +14,9 @@ 
 
 			$urlset = '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" />';
 
-			if (false !== ($xml = XML::create($urlset))) $this->xml = $xml;
+			if (false !== ($xml = XML::create($urlset))) {
+				$this->xml = $xml;
+			}
 		}
 
 		# Load sitemap
@@ -25,9 +27,13 @@ 
 
 			$modified = Explorer::modified($file_name);
 
-			if ((false === $modified) || ($modified <= $time)) return false;
+			if ((false === $modified) || ($modified <= $time)) {
+				return false;
+			}
 
-			if (false === ($xml = Explorer::xml($file_name))) return false;
+			if (false === ($xml = Explorer::xml($file_name))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -38,7 +44,9 @@ 
 
 		public function save() {
 
-			if ((null === $this->xml) || $this->loaded) return false;
+			if ((null === $this->xml) || $this->loaded) {
+				return false;
+			}
 
 			$file_name = (DIR_SYSTEM_DATA . 'Sitemap.xml');
 
@@ -51,9 +59,13 @@ 
 
 		public function add(string $loc, string $lastmod = null, string $changefreq = null, float $priority = null) {
 
-			if ((null === $this->xml) || $this->loaded) return false;
+			if ((null === $this->xml) || $this->loaded) {
+				return false;
+			}
 
-			if (false === ($loc = Validate::url($loc))) return false;
+			if (false === ($loc = Validate::url($loc))) {
+				return false;
+			}
 
 			# Create url object
 
@@ -75,7 +87,9 @@ 
 
 			# Set priority
 
-			if (null !== $priority) $url->addChild('priority', Number::formatFloat($priority, 0, 1, 1));
+			if (null !== $priority) {
+				$url->addChild('priority', Number::formatFloat($priority, 0, 1, 1));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Utils/Tools/Captcha.php

Braces +42 added lines, -13 removed lines

@@ -12,11 +12,19 @@ 
 
 		private function allocateColor(array $color = null) {
 
-			if (!is_resource($this->image)) return false;
+			if (!is_resource($this->image)) {
+				return false;
+			}
 
-			if (null === $color) $color = [0, 0, 0]; else if (count($color) !== 3) return false;
+			if (null === $color) {
+				$color = [0, 0, 0];
+			} else if (count($color) !== 3) {
+				return false;
+			}
 
-			foreach (array_values($color) as $key => $value) $color[$key] = Number::format($value, 0, 255);
+			foreach (array_values($color) as $key => $value) {
+				$color[$key] = Number::format($value, 0, 255);
+			}
 
 			# ------------------------
 
@@ -27,7 +35,9 @@ 
 
 		public function __construct(int $width, int $height, array $bg_color = null) {
 
-			if (false === ($image = imagecreatetruecolor($width, $height))) return;
+			if (false === ($image = imagecreatetruecolor($width, $height))) {
+				return;
+			}
 
 			$this->image = $image; $this->width = $width; $this->height = $height;
 
@@ -41,11 +51,17 @@ 
 
 		public function text(string $font, int $size, int $indent, int $step, string $text, array $color = null) {
 
-			if (!is_resource($this->image)) return false;
+			if (!is_resource($this->image)) {
+				return false;
+			}
 
-			if (!Explorer::isFile($font)) return false;
+			if (!Explorer::isFile($font)) {
+				return false;
+			}
 
-			if (false === ($color = $this->allocateColor($color))) return false;
+			if (false === ($color = $this->allocateColor($color))) {
+				return false;
+			}
 
 			$base = (floor(($this->height - $size) / 2) + $size);
 
@@ -65,13 +81,22 @@ 
 
 		public function noise(int $rate, array $color = null) {
 
-			if (!is_resource($this->image)) return false;
+			if (!is_resource($this->image)) {
+				return false;
+			}
 
-			if (false === ($color = $this->allocateColor($color))) return false;
+			if (false === ($color = $this->allocateColor($color))) {
+				return false;
+			}
 
-			for ($x = 0; $x < $this->width; $x++) for ($y = 0; $y < $this->height; $y++) {
+			for ($x = 0; $x < $this->width; $x++) {
+				for ($y = 0;
+			}
+			$y < $this->height; $y++) {
 
-				if (random_int(1, $rate) === 1) imagesetpixel($this->image, $x, $y, $color);
+				if (random_int(1, $rate) === 1) {
+					imagesetpixel($this->image, $x, $y, $color);
+				}
 			}
 
 			# ------------------------
@@ -83,9 +108,13 @@ 
 
 		public function lines(int $count, array $color = null) {
 
-			if (!is_resource($this->image)) return false;
+			if (!is_resource($this->image)) {
+				return false;
+			}
 
-			if (false === ($color = $this->allocateColor($color))) return false;
+			if (false === ($color = $this->allocateColor($color))) {
+				return false;
+			}
 
 			for ($i = 0; $i < $count; $i++) {
 

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

Braces +8 added lines, -4 removed lines

@@ -19,13 +19,17 @@
 
 		public static function get(string $name) {
 
-			if ('' === self::$section) throw new Exception\View();
+			if ('' === self::$section) {
+				throw new Exception\View();
+			}
 
 			$class_name = ('System\Views\\' . self::$section . '\\' . $name);
 
-			if (isset(self::$cache[$class_name])) $view = clone self::$cache[$class_name];
-
-			else $view = (self::$cache[$class_name] = new $class_name());
+			if (isset(self::$cache[$class_name])) {
+				$view = clone self::$cache[$class_name];
+			} else {
+				$view = (self::$cache[$class_name] = new $class_name());
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Views/View.php

Braces +3 added lines, -1 removed lines

@@ -18,7 +18,9 @@
 
 		public function __construct() {
 
-			if (static::$section !== Extend\Templates::section()) return;
+			if (static::$section !== Extend\Templates::section()) {
+				return;
+			}
 
 			$file_name = (Extend\Templates::path() . static::$file_name);
 

www/engine/System/Includes/Config.php

Spacing +62 added lines, -62 removed lines

@@ -2,125 +2,125 @@
 
 # Admin ip
 
-define('CONFIG_ADMIN_IP',                           '');
+define('CONFIG_ADMIN_IP', '');
 
 # Session
 
-define('CONFIG_SESSION_NAME',                       '_sessid');
-define('CONFIG_SESSION_LIFETIME',                   2592000);       # 30 days
+define('CONFIG_SESSION_NAME', '_sessid');
+define('CONFIG_SESSION_LIFETIME', 2592000); # 30 days
 
 # Language
 
-define('CONFIG_LANGUAGE_COOKIE_EXPIRES',            30758400);      # 356 days
+define('CONFIG_LANGUAGE_COOKIE_EXPIRES', 30758400); # 356 days
 
 # Template
 
-define('CONFIG_TEMPLATE_COOKIE_EXPIRES',            30758400);      # 356 days
+define('CONFIG_TEMPLATE_COOKIE_EXPIRES', 30758400); # 356 days
 
 # Page
 
-define('CONFIG_PAGE_TITLE_MAX_LENGTH',              255);
-define('CONFIG_PAGE_NAME_MAX_LENGTH',               60);
-define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH',        512);
-define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH',           512);
+define('CONFIG_PAGE_TITLE_MAX_LENGTH', 255);
+define('CONFIG_PAGE_NAME_MAX_LENGTH', 60);
+define('CONFIG_PAGE_DESCRIPTION_MAX_LENGTH', 512);
+define('CONFIG_PAGE_KEYWORDS_MAX_LENGTH', 512);
 
 # Menuitem
 
-define('CONFIG_MENUITEM_TEXT_MAX_LENGTH',           255);
-define('CONFIG_MENUITEM_SLUG_MAX_LENGTH',           255);
-define('CONFIG_MENUITEM_POSITION_MAX_LENGTH',       2);
+define('CONFIG_MENUITEM_TEXT_MAX_LENGTH', 255);
+define('CONFIG_MENUITEM_SLUG_MAX_LENGTH', 255);
+define('CONFIG_MENUITEM_POSITION_MAX_LENGTH', 2);
 
 # Variables
 
-define('CONFIG_VARIABLE_TITLE_MAX_LENGTH',          64);
-define('CONFIG_VARIABLE_NAME_MAX_LENGTH',           32);
-define('CONFIG_VARIABLE_VALUE_MAX_LENGTH',          255);
+define('CONFIG_VARIABLE_TITLE_MAX_LENGTH', 64);
+define('CONFIG_VARIABLE_NAME_MAX_LENGTH', 32);
+define('CONFIG_VARIABLE_VALUE_MAX_LENGTH', 255);
 
 # Widgets
 
-define('CONFIG_WIDGET_TITLE_MAX_LENGTH',            64);
-define('CONFIG_WIDGET_NAME_MAX_LENGTH',             32);
+define('CONFIG_WIDGET_TITLE_MAX_LENGTH', 64);
+define('CONFIG_WIDGET_NAME_MAX_LENGTH', 32);
 
 # Filemanager
 
-define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH',        128);
+define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH', 128);
 
 # User
 
-define('CONFIG_USER_SESSION_LIFETIME',              604800);        # 7 days
-define('CONFIG_USER_SECRET_LIFETIME',               86400);         # 1 day
+define('CONFIG_USER_SESSION_LIFETIME', 604800); # 7 days
+define('CONFIG_USER_SECRET_LIFETIME', 86400); # 1 day
 
-define('CONFIG_USER_NAME_MIN_LENGTH',               4);
-define('CONFIG_USER_NAME_MAX_LENGTH',               16);
+define('CONFIG_USER_NAME_MIN_LENGTH', 4);
+define('CONFIG_USER_NAME_MAX_LENGTH', 16);
 
-define('CONFIG_USER_PASSWORD_MIN_LENGTH',           4);
-define('CONFIG_USER_PASSWORD_MAX_LENGTH',           32);
+define('CONFIG_USER_PASSWORD_MIN_LENGTH', 4);
+define('CONFIG_USER_PASSWORD_MAX_LENGTH', 32);
 
-define('CONFIG_USER_EMAIL_MAX_LENGTH',              128);
+define('CONFIG_USER_EMAIL_MAX_LENGTH', 128);
 
-define('CONFIG_USER_FIRST_NAME_MAX_LENGTH',         32);
-define('CONFIG_USER_LAST_NAME_MAX_LENGTH',          32);
+define('CONFIG_USER_FIRST_NAME_MAX_LENGTH', 32);
+define('CONFIG_USER_LAST_NAME_MAX_LENGTH', 32);
 
-define('CONFIG_USER_CITY_MAX_LENGTH',               32);
+define('CONFIG_USER_CITY_MAX_LENGTH', 32);
 
-define('CONFIG_USER_CAPTCHA_MAX_LENGTH',            16);
+define('CONFIG_USER_CAPTCHA_MAX_LENGTH', 16);
 
 # Captcha
 
-define('CONFIG_CAPTCHA_LENGTH',                     5);
+define('CONFIG_CAPTCHA_LENGTH', 5);
 
-define('CONFIG_CAPTCHA_WIDTH',                      150);
-define('CONFIG_CAPTCHA_HEIGHT',                     40);
+define('CONFIG_CAPTCHA_WIDTH', 150);
+define('CONFIG_CAPTCHA_HEIGHT', 40);
 
-define('CONFIG_CAPTCHA_FONT',                       'Fonts/airstrip.ttf');
-define('CONFIG_CAPTCHA_FONT_SIZE',                  20);
+define('CONFIG_CAPTCHA_FONT', 'Fonts/airstrip.ttf');
+define('CONFIG_CAPTCHA_FONT_SIZE', 20);
 
-define('CONFIG_CAPTCHA_TEXT_INDENT',                15);
-define('CONFIG_CAPTCHA_TEXT_STEP',                  25);
+define('CONFIG_CAPTCHA_TEXT_INDENT', 15);
+define('CONFIG_CAPTCHA_TEXT_STEP', 25);
 
 # Admin
 
-define('CONFIG_ADMIN_LANGUAGE_DEFAULT',             'en-US');
-define('CONFIG_ADMIN_TEMPLATE_DEFAULT',             'Default');
+define('CONFIG_ADMIN_LANGUAGE_DEFAULT', 'en-US');
+define('CONFIG_ADMIN_TEMPLATE_DEFAULT', 'Default');
 
-define('CONFIG_ADMIN_PAGES_DISPLAY',                50);
-define('CONFIG_ADMIN_MENUITEMS_DISPLAY',            50);
-define('CONFIG_ADMIN_VARIABLES_DISPLAY',            50);
-define('CONFIG_ADMIN_WIDGETS_DISPLAY',              50);
-define('CONFIG_ADMIN_USERS_DISPLAY',                50);
+define('CONFIG_ADMIN_PAGES_DISPLAY', 50);
+define('CONFIG_ADMIN_MENUITEMS_DISPLAY', 50);
+define('CONFIG_ADMIN_VARIABLES_DISPLAY', 50);
+define('CONFIG_ADMIN_WIDGETS_DISPLAY', 50);
+define('CONFIG_ADMIN_USERS_DISPLAY', 50);
 
-define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY',    50);
+define('CONFIG_ADMIN_FILEMANAGER_ITEMS_DISPLAY', 50);
 
 # Site
 
-define('CONFIG_SITE_LANGUAGE_DEFAULT',              'en-US');
-define('CONFIG_SITE_TEMPLATE_DEFAULT',              'Default');
+define('CONFIG_SITE_LANGUAGE_DEFAULT', 'en-US');
+define('CONFIG_SITE_TEMPLATE_DEFAULT', 'Default');
 
-define('CONFIG_SITE_TITLE_DEFAULT',                 'Demo Site');
-define('CONFIG_SITE_SLOGAN_DEFAULT',                'A place for site slogan');
+define('CONFIG_SITE_TITLE_DEFAULT', 'Demo Site');
+define('CONFIG_SITE_SLOGAN_DEFAULT', 'A place for site slogan');
 
-define('CONFIG_SITE_TITLE_MAX_LENGTH',              128);
-define('CONFIG_SITE_SLOGAN_MAX_LENGTH',             255);
-define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH',        512);
-define('CONFIG_SITE_KEYWORDS_MAX_LENGTH',           512);
+define('CONFIG_SITE_TITLE_MAX_LENGTH', 128);
+define('CONFIG_SITE_SLOGAN_MAX_LENGTH', 255);
+define('CONFIG_SITE_DESCRIPTION_MAX_LENGTH', 512);
+define('CONFIG_SITE_KEYWORDS_MAX_LENGTH', 512);
 
 # System
 
-define('CONFIG_SYSTEM_URL_MAX_LENGTH',              128);
-define('CONFIG_SYSTEM_URL_DEFAULT',                 'http://example.com');
+define('CONFIG_SYSTEM_URL_MAX_LENGTH', 128);
+define('CONFIG_SYSTEM_URL_DEFAULT', 'http://example.com');
 
-define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH',            128);
-define('CONFIG_SYSTEM_EMAIL_DEFAULT',               'admin@example.com');
+define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH', 128);
+define('CONFIG_SYSTEM_EMAIL_DEFAULT', 'admin@example.com');
 
-define('CONFIG_SYSTEM_TIMEZONE_DEFAULT',            'UTC');
+define('CONFIG_SYSTEM_TIMEZONE_DEFAULT', 'UTC');
 
 # Database
 
-define('CONFIG_DATABASE_SERVER_MAX_LENGTH',         128);
-define('CONFIG_DATABASE_USER_MAX_LENGTH',           64);
-define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH',       64);
-define('CONFIG_DATABASE_NAME_MAX_LENGTH',           64);
+define('CONFIG_DATABASE_SERVER_MAX_LENGTH', 128);
+define('CONFIG_DATABASE_USER_MAX_LENGTH', 64);
+define('CONFIG_DATABASE_PASSWORD_MAX_LENGTH', 64);
+define('CONFIG_DATABASE_NAME_MAX_LENGTH', 64);
 
 # Other
 
-define('CONFIG_UPLOADS_MAX_SIZE',                   104857600);  # 100 MB
+define('CONFIG_UPLOADS_MAX_SIZE', 104857600); # 100 MB