cadmium-org / cadmium-cms

www/engine/Framework/Includes/Regex.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 define('REGEX_TEMPLATE_ITEM_NAME',                  '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
 define('REGEX_TEMPLATE_STRUCTURE',                   '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*' .
-                                                     '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/');
+													 '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/');
 
 define('REGEX_TEMPLATE_VARIABLE',                   '/\$([a-zA-Z0-9_]+)\$/');
 define('REGEX_TEMPLATE_PHRASE',                     '/\%([a-zA-Z0-9_]+)\%/');

Spacing +7 added lines, -7 removed lines

@@ -2,19 +2,19 @@
 
 # Form expressions
 
-define('REGEX_FORM_NAME',                           '/^[a-zA-Z][a-zA-Z0-9]*$/');
-define('REGEX_FORM_FIELD_KEY',                      '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_FORM_NAME', '/^[a-zA-Z][a-zA-Z0-9]*$/');
+define('REGEX_FORM_FIELD_KEY', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
 # Language expressions
 
-define('REGEX_LANGUAGE_PHRASE_NAME',                '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_LANGUAGE_PHRASE_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
 # Template expressions
 
-define('REGEX_TEMPLATE_ITEM_NAME',                  '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_TEMPLATE_ITEM_NAME', '/^(?![0-9_])(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
 
-define('REGEX_TEMPLATE_STRUCTURE',                   '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*' .
+define('REGEX_TEMPLATE_STRUCTURE', '/(?s){[ ]*(!)?[ ]*(block|for|widget)[ ]*:[ ]*([a-zA-Z0-9_]+)[ ]*'.
                                                      '(?:\/[ ]*}|}(.*?){[ ]*\/[ ]*\2[ ]*:[ ]*\3[ ]*})/');
 
-define('REGEX_TEMPLATE_VARIABLE',                   '/\$([a-zA-Z0-9_]+)\$/');
-define('REGEX_TEMPLATE_PHRASE',                     '/\%([a-zA-Z0-9_]+)\%/');
+define('REGEX_TEMPLATE_VARIABLE', '/\$([a-zA-Z0-9_]+)\$/');
+define('REGEX_TEMPLATE_PHRASE', '/\%([a-zA-Z0-9_]+)\%/');

www/engine/Framework/Includes/Constants.php

Spacing +16 added lines, -16 removed lines

@@ -2,28 +2,28 @@
 
 # Cache limiters
 
-define('CACHE_LIMITER_PRIVATE',                     'private');
-define('CACHE_LIMITER_PUBLIC',                      'public');
+define('CACHE_LIMITER_PRIVATE', 'private');
+define('CACHE_LIMITER_PUBLIC', 'public');
 
 # Date formats
 
-define('DATE_FORMAT_STANDART',                      'd.m.Y');
-define('DATE_FORMAT_MYSQL',                         'Y-m-d');
-define('DATE_FORMAT_DATETIME',                      'd.m.Y, H:i');
-define('DATE_FORMAT_W3C',                           'Y-m-d\TH:i:sP');
+define('DATE_FORMAT_STANDART', 'd.m.Y');
+define('DATE_FORMAT_MYSQL', 'Y-m-d');
+define('DATE_FORMAT_DATETIME', 'd.m.Y, H:i');
+define('DATE_FORMAT_W3C', 'Y-m-d\TH:i:sP');
 
 # Form fields
 
-define('FORM_FIELD_HIDDEN',                         'hidden');
-define('FORM_FIELD_PASSWORD',                       'password');
-define('FORM_FIELD_CAPTCHA',                        'captcha');
-define('FORM_FIELD_TEXT',                           'text');
-define('FORM_FIELD_TEXTAREA',                       'textarea');
+define('FORM_FIELD_HIDDEN', 'hidden');
+define('FORM_FIELD_PASSWORD', 'password');
+define('FORM_FIELD_CAPTCHA', 'captcha');
+define('FORM_FIELD_TEXT', 'text');
+define('FORM_FIELD_TEXTAREA', 'textarea');
 
 # String pools
 
-define('STR_POOL_DEFAULT',                          'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
-define('STR_POOL_LATIN',                            'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
-define('STR_POOL_LATIN_LOWER',                      'abcdefghijklmnopqrstuvwxyz');
-define('STR_POOL_LATIN_UPPER',                      'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
-define('STR_POOL_NUMERIC',                          '0123456789');
+define('STR_POOL_DEFAULT', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
+define('STR_POOL_LATIN', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+define('STR_POOL_LATIN_LOWER', 'abcdefghijklmnopqrstuvwxyz');
+define('STR_POOL_LATIN_UPPER', 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
+define('STR_POOL_NUMERIC', '0123456789');

www/engine/Framework/Exception.php

Spacing +4 added lines, -4 removed lines

@@ -32,28 +32,28 @@
 
 	# Class load exception
 
-	class ClassLoad extends Exception  {
+	class ClassLoad extends Exception {
 
 		protected $message = 'Class \'$value$\' not found';
 	}
 
 	# Database connect exception
 
-	class DBConnect extends Exception  {
+	class DBConnect extends Exception {
 
 		protected $message = 'Unable to connect to database';
 	}
 
 	# Database select exception
 
-	class DBSelect extends Exception  {
+	class DBSelect extends Exception {
 
 		protected $message = 'Unable to select database';
 	}
 
 	# Database charset exception
 
-	class DBCharset extends Exception  {
+	class DBCharset extends Exception {
 
 		protected $message = 'Unable to set database charset';
 	}

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 
 		public function __construct(string $message = '') {
 
-			if ('' !== $message) $this->message = $message;
+			if ('' !== $message) {
+				$this->message = $message;
+			}
 		}
 	}
 

www/engine/Framework/Engine.php

Braces +23 added lines, -9 removed lines

@@ -8,17 +8,29 @@ 
 
 		public static function ip() {
 
-			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');
+			}
 
 			# ------------------------
 
@@ -50,9 +62,11 @@ 
 
 			$file_name = (DIR_TEMPLATES . 'Exception.tpl');
 
-			if (false === ($contents = @file_get_contents($file_name))) $output = nl2br($exc);
-
-			else $output = $parse_contents($contents);
+			if (false === ($contents = @file_get_contents($file_name))) {
+				$output = nl2br($exc);
+			} else {
+				$output = $parse_contents($contents);
+			}
 
 			# Set headers
 

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,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);
 
@@ -64,7 +64,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');
 

www/engine/Framework/Classes/Template/Asset/Block.php

Braces +44 added lines, -20 removed lines

@@ -22,15 +22,19 @@ 
 
 				$type = $matches[2][$key]; $name = $matches[3][$key]; $contents = ($matches[4][$key] ?? '');
 
-				if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) continue;
+				if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) {
+					continue;
+				}
 
 				$this->contents = str_replace($match, ('{ ' . $type . ':' . $name . ' / }'), $this->contents);
 
-				if ($type === 'block') $this->blocks[$name] = (new Block($contents))->$toggle();
-
-				else if ($type === 'for') $this->loops[$name] = new Loop($contents);
-
-				else if ($type === 'widget') $this->widgets[] = $name;
+				if ($type === 'block') {
+					$this->blocks[$name] = (new Block($contents))->$toggle();
+				} else if ($type === 'for') {
+					$this->loops[$name] = new Loop($contents);
+				} else if ($type === 'widget') {
+					$this->widgets[] = $name;
+				}
 			}
 		}
 
@@ -48,7 +52,9 @@ 
 
 				foreach ($matches[1] as $index => $name) {
 
-					if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) continue;
+					if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) {
+						continue;
+					}
 
 					$elementaries['stack'][$name] = false;
 				}
@@ -68,29 +74,39 @@ 
 
 		public function __clone() {
 
-			foreach ($this->blocks as $name => $block) $this->blocks[$name] = clone $block;
+			foreach ($this->blocks as $name => $block) {
+				$this->blocks[$name] = clone $block;
+			}
 
-			foreach ($this->loops as $name => $loop) $this->loops[$name] = clone $loop;
+			foreach ($this->loops as $name => $loop) {
+				$this->loops[$name] = clone $loop;
+			}
 		}
 
 		# Setter
 
 		public function __set(string $name, $value) {
 
-			if ($value instanceof Block) $this->block($name, $value);
-
-			else if (is_array($value)) $this->loop($name, $value);
-
-			else if (is_scalar($value)) $this->set($name, $value);
+			if ($value instanceof Block) {
+				$this->block($name, $value);
+			} else if (is_array($value)) {
+				$this->loop($name, $value);
+			} else if (is_scalar($value)) {
+				$this->set($name, $value);
+			}
 		}
 
 		# Set block
 
 		public function block(string $name, Block $block = null) {
 
-			if (!isset($this->blocks[$name])) return ((null === $block) ? new Block() : $this);
+			if (!isset($this->blocks[$name])) {
+				return ((null === $block) ? new Block() : $this);
+			}
 
-			if (null === $block) return $this->blocks[$name];
+			if (null === $block) {
+				return $this->blocks[$name];
+			}
 
 			$this->blocks[$name] = $block;
 
@@ -103,9 +119,13 @@ 
 
 		public function loop(string $name, array $range = null) {
 
-			if (!isset($this->loops[$name])) return ((null === $range) ? new Loop() : $this);
+			if (!isset($this->loops[$name])) {
+				return ((null === $range) ? new Loop() : $this);
+			}
 
-			if (null === $range) return $this->loops[$name];
+			if (null === $range) {
+				return $this->loops[$name];
+			}
 
 			$this->loops[$name]->range($range);
 
@@ -118,7 +138,9 @@ 
 
 		public function set(string $name, string $value) {
 
-			if (isset($this->variables[$name])) $this->variables[$name] = $value;
+			if (isset($this->variables[$name])) {
+				$this->variables[$name] = $value;
+			}
 
 			return $this;
 		}
@@ -127,7 +149,9 @@ 
 
 		public function contents() {
 
-			if (!$this->enabled) return '';
+			if (!$this->enabled) {
+				return '';
+			}
 
 			$this->enabled = false; $insertions = [];
 

Spacing +6 added lines, -6 removed lines

@@ -24,7 +24,7 @@ 
 
 				if (!preg_match(REGEX_TEMPLATE_ITEM_NAME, $name)) continue;
 
-				$this->contents = str_replace($match, ('{ ' . $type . ':' . $name . ' / }'), $this->contents);
+				$this->contents = str_replace($match, ('{ '.$type.':'.$name.' / }'), $this->contents);
 
 				if ($type === 'block') $this->blocks[$name] = (new Block($contents))->$toggle();
 
@@ -135,14 +135,14 @@ 
 
 			foreach ($this->blocks as $name => $block) {
 
-				$insertions['{ block:' . $name . ' / }'] = $block->contents();
+				$insertions['{ block:'.$name.' / }'] = $block->contents();
 			}
 
 			# Process loops
 
 			foreach ($this->loops as $name => $loop) {
 
-				$insertions['{ for:' . $name . ' / }'] = $loop->contents();
+				$insertions['{ for:'.$name.' / }'] = $loop->contents();
 			}
 
 			# Process widgets
@@ -153,7 +153,7 @@ 
 
 				$contents = ((false !== $widget) ? $widget->contents() : '');
 
-				$insertions['{ widget:' . $name . ' / }'] = $contents;
+				$insertions['{ widget:'.$name.' / }'] = $contents;
 			}
 
 			# Process variables
@@ -162,7 +162,7 @@ 
 
 				$value = ((false === $value) ? Template::global($name) : $value);
 
-				$insertions['$' . $name . '$'] = Str::output($value);
+				$insertions['$'.$name.'$'] = Str::output($value);
 			}
 
 			# Process phrases
@@ -171,7 +171,7 @@ 
 
 				$value = Language::get($name);
 
-				$insertions['%' . $name . '%'] = Str::output($value);
+				$insertions['%'.$name.'%'] = Str::output($value);
 			}
 
 			# Unlock and process insertions

www/engine/System/Classes/Modules/Auth/Utils/Mail.php

Unused Use Statements +7 added lines, -1 removed lines

@@ -2,7 +2,13 @@
 
 namespace Modules\Auth\Utils {
 
-	use Modules\Auth, Modules\Entitizer, Modules\Settings, Utils\View, Date, Language, Mailer;
+	use Modules\Auth;
+	use Modules\Entitizer;
+	use Modules\Settings;
+	use Utils\View;
+	use Date;
+	use Language;
+	use Mailer;
 
 	abstract class Mail {
 

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 
 			$to = $user->email; $sender = Settings::get('site_title'); $reply_to = Settings::get('system_email');
 
-			$from = ((false !== ($host = parse_url(Settings::get('system_url'), PHP_URL_HOST))) ? ('noreply@' . $host) : '');
+			$from = ((false !== ($host = parse_url(Settings::get('system_url'), PHP_URL_HOST))) ? ('noreply@'.$host) : '');
 
 			return Mailer::send($to, $sender, $from, $reply_to, $subject, $message->contents(true), true);
 		}
@@ -27,7 +27,7 @@ 
 
 		public static function reset(Entitizer\Entity\User $user, string $code) {
 
-			$link = (Settings::get('system_url') . (Auth::admin() ? '/admin' : '/profile') . '/recover?code=' . $code);
+			$link = (Settings::get('system_url').(Auth::admin() ? '/admin' : '/profile').'/recover?code='.$code);
 
 			return self::send($user, 'Blocks\Auth\Mail\Reset', Language::get('MAIL_SUBJECT_RESET'), $link);
 		}
@@ -36,7 +36,7 @@ 
 
 		public static function register(Entitizer\Entity\User $user) {
 
-			$link = (Settings::get('system_url') . (Auth::admin() ? '/admin' : '/profile'));
+			$link = (Settings::get('system_url').(Auth::admin() ? '/admin' : '/profile'));
 
 			return self::send($user, 'Blocks\Auth\Mail\Register', Language::get('MAIL_SUBJECT_REGISTER'), $link);
 		}

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

Unused Use Statements +2 added lines, -1 removed lines

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Entitizer, Utils\Form;
+	use Modules\Entitizer;
+	use Utils\Form;
 
 	class Widget extends Form {
 

www/engine/System/Classes/Modules/Filemanager/Handler/Dir.php

Unused Use Statements +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 
 namespace Modules\Filemanager\Handler {
 
-	use Modules\Filemanager, Date, Template;
+	use Modules\Filemanager;
+	use Date;
+	use Template;
 
 	class Dir extends Filemanager\Utils\Handler {
 

www/engine/System/Classes/Modules/Filemanager/Handler/File.php

Unused Use Statements +6 added lines, -1 removed lines

@@ -2,7 +2,12 @@
 
 namespace Modules\Filemanager\Handler {
 
-	use Modules\Filemanager, Date, Explorer, Mime, Number, Template;
+	use Modules\Filemanager;
+	use Date;
+	use Explorer;
+	use Mime;
+	use Number;
+	use Template;
 
 	class File extends Filemanager\Utils\Handler {