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
 

www/engine/System/Classes/Modules/Entitizer/Definition.php

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 
 		public static function get(string $type, int $id = 0) {
 
-			if (!isset(self::$classes[$type])) throw new Exception\General(self::$error_message);
+			if (!isset(self::$classes[$type])) {
+				throw new Exception\General(self::$error_message);
+			}
 
 			$cached = isset(self::$cache[$type][$id]);
 

www/engine/System/Classes/Modules/Entitizer/Definition/User/Secret.php

Spacing +3 added lines, -3 removed lines

@@ -14,9 +14,9 @@
 
 			# Add params
 
-			$this->addTextual       ('code',            true, 40, true, true, true);
-			$this->addTextual       ('ip',              true, 255, false, true, false);
-			$this->addInteger       ('time',            false, 10, 0, true, false);
+			$this->addTextual('code', true, 40, true, true, true);
+			$this->addTextual('ip', true, 255, false, true, false);
+			$this->addInteger('time', false, 10, 0, true, false);
 		}
 	}
 }

www/engine/System/Classes/Modules/Entitizer/Handler/Menuitem.php

Braces +3 added lines, -1 removed lines

@@ -34,7 +34,9 @@
 
 				$contents->block('parent')->block('browse')->disable();
 
-			} else $contents->block('parent')->block('browse')->link = $this->parent->link;
+			} else {
+				$contents->block('parent')->block('browse')->link = $this->parent->link;
+			}
 		}
 
 		# Add item additional data

www/engine/System/Classes/Modules/Entitizer/Handler/Page.php

Braces +3 added lines, -1 removed lines

@@ -34,7 +34,9 @@
 
 				$contents->block('parent')->block('browse')->disable();
 
-			} else $contents->block('parent')->block('browse')->link = $this->parent->link;
+			} else {
+				$contents->block('parent')->block('browse')->link = $this->parent->link;
+			}
 		}
 
 		# Add item additional data

www/engine/System/Classes/Modules/Entitizer/Listview/Menuitems.php

Braces +3 added lines, -1 removed lines

@@ -34,7 +34,9 @@
 
 				$contents->block('parent')->block('browse')->disable();
 
-			} else $contents->block('parent')->block('browse')->link = $this->parent->link;
+			} else {
+				$contents->block('parent')->block('browse')->link = $this->parent->link;
+			}
 		}
 
 		# Add item additional data

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Listview {
 
-	use Modules\Entitizer, Template;
+	use Modules\Entitizer;
+	use Template;
 
 	class Variables extends Entitizer\Utils\Listview {