cadmium-org / cadmium-cms

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

Spacing +5 added lines, -5 removed lines

@@ -61,11 +61,11 @@ 
 
 			# Set link
 
-			$link = (INSTALL_PATH . static::$link . '/');
+			$link = (INSTALL_PATH.static::$link.'/');
 
-			if (static::$nesting) $contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
+			if (static::$nesting) $contents->link = ($link.($this->create ? 'create' : 'edit').'?id='.$this->parent->id);
 
-			else $contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			else $contents->link = ($link.($this->create ? 'create' : ('edit?id='.$this->entity->id)));
 
 			# Process parent block
 
@@ -124,7 +124,7 @@ 
 
 			# Redirect if entity not found
 
-			if (!$this->create && (0 === $this->entity->id)) return Request::redirect(INSTALL_PATH . static::$link);
+			if (!$this->create && (0 === $this->entity->id)) return Request::redirect(INSTALL_PATH.static::$link);
 
 			# Create form
 
@@ -136,7 +136,7 @@ 
 
 			if ($this->form->handle(new static::$controller($this->entity))) {
 
-				Request::redirect(INSTALL_PATH . static::$link . '/edit?id=' . $this->entity->id . '&submitted');
+				Request::redirect(INSTALL_PATH.static::$link.'/edit?id='.$this->entity->id.'&submitted');
 			}
 
 			# Display success message

Braces +37 added lines, -15 removed lines

@@ -45,7 +45,9 @@ 
 
 		private function processSelector(Template\Block $selector) {
 
-			if ($this->create) return $selector->disable();
+			if ($this->create) {
+				return $selector->disable();
+			}
 
 			$selector->parent_id = $this->entity->parent_id;
 
@@ -68,25 +70,33 @@ 
 
 			# Set path / title
 
-			if (static::$nesting) $contents->path = $this->path;
-
-			else $contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			if (static::$nesting) {
+				$contents->path = $this->path;
+			} else {
+				$contents->title = ($this->create ? Language::get(static::$naming_new) : $this->entity->get(static::$naming));
+			}
 
 			# Process parent block
 
-			if (static::$nesting) $this->processParent($contents->getBlock('parent'));
+			if (static::$nesting) {
+				$this->processParent($contents->getBlock('parent'));
+			}
 
 			# Set link
 
 			$link = (INSTALL_PATH . static::$link . '/');
 
-			if (static::$nesting) $contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
-
-			else $contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			if (static::$nesting) {
+				$contents->link = ($link . ($this->create ? 'create' : 'edit') . '?id=' . $this->parent->id);
+			} else {
+				$contents->link = ($link . ($this->create ? 'create' : ('edit?id=' . $this->entity->id)));
+			}
 
 			# Process selector block
 
-			if (static::$nesting) $this->processSelector($contents->getBlock('selector'));
+			if (static::$nesting) {
+				$this->processSelector($contents->getBlock('selector'));
+			}
 
 			# Implement form
 
@@ -119,11 +129,15 @@ 
 
 				$parent_id = Number::forceInt(Request::post('parent_id'));
 
-				if (!$this->entity->move($parent_id)) return $ajax->setError(Language::get(static::$message_error_move));
+				if (!$this->entity->move($parent_id)) {
+					return $ajax->setError(Language::get(static::$message_error_move));
+				}
 
 			} else if (Request::post('action') === 'remove') {
 
-				if (!$this->entity->remove()) return $ajax->setError(Language::get(static::$message_error_remove));
+				if (!$this->entity->remove()) {
+					return $ajax->setError(Language::get(static::$message_error_remove));
+				}
 			}
 
 			# ------------------------
@@ -135,7 +149,9 @@ 
 
 		protected function handle() {
 
-			if (!$this->create && Request::isAjax()) return $this->handleAjax();
+			if (!$this->create && Request::isAjax()) {
+				return $this->handleAjax();
+			}
 
 			# Create entity
 
@@ -143,7 +159,9 @@ 
 
 			$this->entity = Entitizer::get(static::$table, (!$this->create ? $id : 0));
 
-			if (!$this->create && (0 === $this->entity->id)) return Request::redirect(INSTALL_PATH . static::$link);
+			if (!$this->create && (0 === $this->entity->id)) {
+				return Request::redirect(INSTALL_PATH . static::$link);
+			}
 
 			# Create parent entity
 
@@ -151,7 +169,9 @@ 
 
 			# Get path
 
-			if (false !== ($path = $this->parent->path())) $this->path = $path;
+			if (false !== ($path = $this->parent->path())) {
+				$this->path = $path;
+			}
 
 			# Create form
 
@@ -161,7 +181,9 @@ 
 
 			if ($this->form->handle(new static::$controller($this->entity), true)) {
 
-				if ($this->create && (0 !== $this->parent->id)) $this->entity->move($this->parent->id);
+				if ($this->create && (0 !== $this->parent->id)) {
+					$this->entity->move($this->parent->id);
+				}
 
 				Request::redirect(INSTALL_PATH . static::$link . '/edit?id=' . $this->entity->id . '&submitted');
 			}

www/engine/System/Classes/Modules/Settings/Handler/General.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 			if ($this->form->handle(new Settings\Controller\General())) {
 
-				Request::redirect(INSTALL_PATH . '/admin/system/settings?submitted');
+				Request::redirect(INSTALL_PATH.'/admin/system/settings?submitted');
 			}
 
 			# Display success message

Braces +3 added lines, -1 removed lines

@@ -40,7 +40,9 @@
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Popup::set('positive', Language::get('SETTINGS_SUCCESS'));
+			if (false !== Request::get('submitted')) {
+				Popup::set('positive', Language::get('SETTINGS_SUCCESS'));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Profile/Handler/Edit.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 			if ($this->form_personal->handle($controller_personal) || $this->form_password->handle($controller_password)) {
 
-				Request::redirect(INSTALL_PATH . '/profile/edit?submitted');
+				Request::redirect(INSTALL_PATH.'/profile/edit?submitted');
 			}
 
 			# Display success message

Braces +3 added lines, -1 removed lines

@@ -50,7 +50,9 @@
 
 			# Display success message
 
-			if (false !== Request::get('submitted')) Messages::set('success', Language::get('USER_SUCCESS_EDIT'));
+			if (false !== Request::get('submitted')) {
+				Messages::set('success', Language::get('USER_SUCCESS_EDIT'));
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Install/Handler/Database.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 			if ($this->form->handle(new Install\Controller\Database())) {
 
-				Request::redirect(INSTALL_PATH . '/admin/register');
+				Request::redirect(INSTALL_PATH.'/admin/register');
 			}
 
 			# ------------------------

www/engine/System/Classes/Modules/Install/Handler/Check.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 				$class = ($value ? 'positive' : 'negative'); $icon = ($value ? 'check circle' : 'warning circle');
 
-				$text = Language::get('INSTALL_REQUIREMENT_' . strtoupper($name) . '_' . ($value ? 'SUCCESS' : 'FAIL'));
+				$text = Language::get('INSTALL_REQUIREMENT_'.strtoupper($name).'_'.($value ? 'SUCCESS' : 'FAIL'));
 
 				$requirements[] = ['class' => $class, 'icon' => $icon, 'text' => $text];
 			}

www/engine/Framework/Classes/DB/Query/Insert.php

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@
 
 				if (0 === $key) $names = $this->getString(array_keys($row), '$name', ', ');
 
-				$values[] = ('(' . $this->getString(array_values($row), '$value', ', ') . ')');
+				$values[] = ('('.$this->getString(array_values($row), '$value', ', ').')');
 			}
 
 			# Build query
 
-			$this->query = ('INSERT ' . ($ignore ? 'IGNORE ' : '') .
+			$this->query = ('INSERT '.($ignore ? 'IGNORE ' : '').
 
-				'INTO ' . $table . ' (' . $names . ') VALUES ' . implode(', ', $values));
+				'INTO '.$table.' ('.$names.') VALUES '.implode(', ', $values));
 		}
 	}
 }

Braces +3 added lines, -1 removed lines

@@ -29,9 +29,11 @@
 
 			$names = ''; $values = [];
 
-			foreach ($set as $key => $row) if (is_array($row)) {
+			foreach ($set as $key => $row) {
+				if (is_array($row)) {
 
 				if (0 === $key) $names = $this->getString(array_keys($row), '$name', ', ');
+			}
 
 				$values[] = ('(' . $this->getString(array_values($row), '$value', ', ') . ')');
 			}

www/engine/System/Includes/Tables.php

Spacing +9 added lines, -9 removed lines

@@ -2,15 +2,15 @@
 
 # Database tables
 
-define('TABLE_PAGES',                               'pages');
-define('TABLE_PAGES_RELATIONS',                     'pages_relations');
+define('TABLE_PAGES', 'pages');
+define('TABLE_PAGES_RELATIONS', 'pages_relations');
 
-define('TABLE_MENU',                                'menu');
-define('TABLE_MENU_RELATIONS',                      'menu_relations');
+define('TABLE_MENU', 'menu');
+define('TABLE_MENU_RELATIONS', 'menu_relations');
 
-define('TABLE_VARIABLES',                           'variables');
-define('TABLE_WIDGETS',                             'widgets');
+define('TABLE_VARIABLES', 'variables');
+define('TABLE_WIDGETS', 'widgets');
 
-define('TABLE_USERS',                               'users');
-define('TABLE_USERS_SECRETS',                       'users_secrets');
-define('TABLE_USERS_SESSIONS',                      'users_sessions');
+define('TABLE_USERS', 'users');
+define('TABLE_USERS_SECRETS', 'users_secrets');
+define('TABLE_USERS_SESSIONS', 'users_sessions');

www/engine/System/Includes/Config.php

Spacing +61 added lines, -61 removed lines

@@ -2,126 +2,126 @@
 
 # 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
 
 # Entitizer
 
-define('CONFIG_ENTITIZER_MAX_DEPTH',                6);
+define('CONFIG_ENTITIZER_MAX_DEPTH', 6);
 
 # Page
 
-define('CONFIG_PAGE_TITLE_MAX_LENGTH',              255);
-define('CONFIG_PAGE_NAME_MAX_LENGTH',               40);
-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', 40);
+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/Classes/Modules/Auth/Controller/Recover.php

Braces +12 added lines, -6 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function __invoke(array $post) {
 
-			if (!Auth::check()) return false;
+			if (!Auth::check()) {
+				return false;
+			}
 
 			# Declare variables
 
@@ -22,13 +24,15 @@ 
 
 			# Validate values
 
-			if (false === ($password_new = Validate::userPassword($password_new)))
-
+			if (false === ($password_new = Validate::userPassword($password_new))) {
+			
 				return ['password_new', 'USER_ERROR_PASSWORD_NEW_INVALID'];
+			}
 
-			if (0 !== strcmp($password_new, $password_retype))
-
+			if (0 !== strcmp($password_new, $password_retype)) {
+			
 				return ['password_retype', 'USER_ERROR_PASSWORD_MISMATCH'];
+			}
 
 			# Encode password
 
@@ -38,7 +42,9 @@ 
 
 			$data = ['auth_key' => $auth_key, 'password' => $password];
 
-			if (!Auth::user()->edit($data)) return 'USER_ERROR_AUTH_RECOVER';
+			if (!Auth::user()->edit($data)) {
+				return 'USER_ERROR_AUTH_RECOVER';
+			}
 
 			# Remove secret