cadmium-org / cadmium-cms

www/engine/System/Includes/Constants.php

Spacing +41 added lines, -41 removed lines

@@ -2,78 +2,78 @@
 
 # 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.2.1');
-define('CADMIUM_COPY',                              '2016');
+define('CADMIUM_VERSION', '0.2.1');
+define('CADMIUM_COPY', '2016');
 
 # External
 
-define('JQUERY_VERSION',                            '2.1.4');
-define('SEMANTIC_UI_VERSION',                       '2.1.7');
-define('CKEDITOR_VERSION',                          '4.5.6');
+define('JQUERY_VERSION', '2.1.4');
+define('SEMANTIC_UI_VERSION', '2.1.7');
+define('CKEDITOR_VERSION', '4.5.6');
 
 # Sections
 
-define('SECTION_ADMIN',                             'Admin');
-define('SECTION_SITE',                              'Site');
+define('SECTION_ADMIN', 'Admin');
+define('SECTION_SITE', 'Site');
 
 # Entity types
 
-define('ENTITY_TYPE_PAGE',                          'page');
-define('ENTITY_TYPE_MENUITEM',                      'menuitem');
-define('ENTITY_TYPE_VARIABLE',                      'variable');
-define('ENTITY_TYPE_WIDGET',                        'widget');
-define('ENTITY_TYPE_USER',                          'user');
-define('ENTITY_TYPE_USER_SECRET',                   'user_secret');
-define('ENTITY_TYPE_USER_SESSION',                  'user_session');
+define('ENTITY_TYPE_PAGE', 'page');
+define('ENTITY_TYPE_MENUITEM', 'menuitem');
+define('ENTITY_TYPE_VARIABLE', 'variable');
+define('ENTITY_TYPE_WIDGET', 'widget');
+define('ENTITY_TYPE_USER', 'user');
+define('ENTITY_TYPE_USER_SECRET', 'user_secret');
+define('ENTITY_TYPE_USER_SESSION', 'user_session');
 
 # 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/Classes/Modules/Entitizer/Form/Menuitem.php

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

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Entitizer, Utils\Form, Utils\Lister;
+	use Modules\Entitizer;
+	use Utils\Form;
+	use Utils\Lister;
 
 	class Page extends Form {
 

www/engine/System/Classes/Modules/Entitizer/Form/Variable.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/Utils/Template/Variables.php

Braces +6 added lines, -2 removed lines

@@ -23,11 +23,15 @@
 
 			$selection = ['name', 'value']; $order = ['name' => 'ASC'];
 
-			if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::last()->status)) return;
+			if (!(DB::select(TABLE_VARIABLES, $selection, null, $order) && DB::last()->status)) {
+				return;
+			}
 
 			# Process results
 
-			while (null !== ($variable = DB::last()->row())) $this->addItem($variable['name'], $variable['value']);
+			while (null !== ($variable = DB::last()->row())) {
+				$this->addItem($variable['name'], $variable['value']);
+			}
 		}
 
 		# Return items

www/engine/System/Classes/Utils/Template/Widgets.php

Braces +6 added lines, -2 removed lines

@@ -23,11 +23,15 @@
 
 			$selection = ['name', 'contents']; $condition = ['display' => 1]; $order = ['name' => 'ASC'];
 
-			if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::last()->status)) return;
+			if (!(DB::select(TABLE_WIDGETS, $selection, $condition, $order) && DB::last()->status)) {
+				return;
+			}
 
 			# Process results
 
-			while (null !== ($widget = DB::last()->row())) $this->addItem($widget['name'], $widget['contents']);
+			while (null !== ($widget = DB::last()->row())) {
+				$this->addItem($widget['name'], $widget['contents']);
+			}
 		}
 
 		# Return items

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

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

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Controller {
 
-	use Modules\Auth, Modules\Entitizer, Utils\Validate, Str;
+	use Modules\Entitizer;
+	use Utils\Validate;
+	use Str;
 
 	class User {
 

Braces +27 added lines, -9 removed lines

@@ -31,30 +31,46 @@ 
 
 			# Validate name & email
 
-			if (false === ($name = Validate::userName($name))) return 'USER_ERROR_NAME_INVALID';
+			if (false === ($name = Validate::userName($name))) {
+				return 'USER_ERROR_NAME_INVALID';
+			}
 
-			if (false === ($email = Validate::userEmail($email))) return 'USER_ERROR_EMAIL_INVALID';
+			if (false === ($email = Validate::userEmail($email))) {
+				return 'USER_ERROR_EMAIL_INVALID';
+			}
 
 			# Validate password
 
 			if ((0 === $this->user->id) || ('' !== $password)) {
 
-				if (false === ($password = Validate::userPassword($password))) return 'USER_ERROR_PASSWORD_INVALID';
+				if (false === ($password = Validate::userPassword($password))) {
+					return 'USER_ERROR_PASSWORD_INVALID';
+				}
 
-				if (0 !== strcmp($password, $password_retype)) return 'USER_ERROR_PASSWORD_MISMATCH';
+				if (0 !== strcmp($password, $password_retype)) {
+					return 'USER_ERROR_PASSWORD_MISMATCH';
+				}
 			}
 
 			# Check name exists
 
-			if (false === ($check_name = $this->user->check('name', $name))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_name = $this->user->check('name', $name))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			if ($check_name === 1) return 'USER_ERROR_NAME_DUPLICATE';
+			if ($check_name === 1) {
+				return 'USER_ERROR_NAME_DUPLICATE';
+			}
 
 			# Check email exists
 
-			if (false === ($check_email = $this->user->check('email', $email))) return 'USER_ERROR_MODIFY';
+			if (false === ($check_email = $this->user->check('email', $email))) {
+				return 'USER_ERROR_MODIFY';
+			}
 
-			if ($check_email === 1) return 'USER_ERROR_EMAIL_DUPLICATE';
+			if ($check_email === 1) {
+				return 'USER_ERROR_EMAIL_DUPLICATE';
+			}
 
 			# Modify user
 
@@ -84,7 +100,9 @@ 
 
 			$modifier = ((0 === $this->user->id) ? 'create' : 'edit');
 
-			if (!$this->user->$modifier($data)) return 'USER_ERROR_MODIFY';
+			if (!$this->user->$modifier($data)) {
+				return 'USER_ERROR_MODIFY';
+			}
 
 			# ------------------------
 

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

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
 
 		# Validate file or directory name
 
+		/**
+		 * @return string
+		 */
 		public static function fileName(string $value) {
 
 			return (preg_match(REGEX_FILE_NAME, $value) ? $name : false);

Braces +9 added lines, -3 removed lines

@@ -10,7 +10,9 @@ 
 
 		private static function string(string $string, string $regex, int $min, int $max) {
 
-			if (!preg_match($regex, $string)) return false;
+			if (!preg_match($regex, $string)) {
+				return false;
+			}
 
 			return ((Str::between($string, $min, $max)) ? $string : false);
 		}
@@ -58,9 +60,13 @@ 
 
 		public static function url(string $value) {
 
-			if (false === ($value = parent::url($value))) return false;
+			if (false === ($value = parent::url($value))) {
+				return false;
+			}
 
-			if (!preg_match('/^https?:\/\//', $value)) return false;
+			if (!preg_match('/^https?:\/\//', $value)) {
+				return false;
+			}
 
 			# ------------------------
 

www/engine/System/Includes/Config.php

Spacing +60 added lines, -60 removed lines

@@ -2,122 +2,122 @@
 
 # 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_EMAIL_MAX_LENGTH',            128);
+define('CONFIG_SYSTEM_URL_MAX_LENGTH', 128);
+define('CONFIG_SYSTEM_EMAIL_MAX_LENGTH', 128);
 
-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

www/engine/System/Includes/Regex.php

Spacing +8 added lines, -8 removed lines

@@ -2,15 +2,15 @@
 
 # Regular expressions
 
-define('REGEX_MAP_PATH_ITEM_NAME',                  '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/');
-define('REGEX_MAP_HANDLER_ITEM_NAME',               '/^[A-Z][a-zA-Z0-9]*$/');
+define('REGEX_MAP_PATH_ITEM_NAME', '/^[a-zA-Z0-9_\-\+\.\,\'\*\(\)\[\]:;!$%~]+$/');
+define('REGEX_MAP_HANDLER_ITEM_NAME', '/^[A-Z][a-zA-Z0-9]*$/');
 
-define('REGEX_LANGUAGE_NAME',                       '/^[a-z][a-z]-[A-Z][A-Z]$/');
-define('REGEX_TEMPLATE_NAME',                       '/^[A-Z0-9][a-zA-Z0-9]*$/');
+define('REGEX_LANGUAGE_NAME', '/^[a-z][a-z]-[A-Z][A-Z]$/');
+define('REGEX_TEMPLATE_NAME', '/^[A-Z0-9][a-zA-Z0-9]*$/');
 
-define('REGEX_USER_AUTH_CODE',                      '/^[a-zA-Z0-9]{40}$/');
+define('REGEX_USER_AUTH_CODE', '/^[a-zA-Z0-9]{40}$/');
 
-define('REGEX_USER_NAME',                           '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
-define('REGEX_USER_PASSWORD',                       '/^.+$/');
+define('REGEX_USER_NAME', '/^(?!_)(?!.*_$)(?!.*_{2,})[a-zA-Z0-9_]+$/');
+define('REGEX_USER_PASSWORD', '/^.+$/');
 
-define('REGEX_FILE_NAME',                           '/^[^\/?%*:|"<>\\\]+$/');
+define('REGEX_FILE_NAME', '/^[^\/?%*:|"<>\\\]+$/');