cadmium-org / cadmium-cms

www/engine/System/Includes/Config.php

Spacing +62 added lines, -62 removed lines

@@ -9,126 +9,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
 
 # Default settings
 
-define('CONFIG_SITE_LANGUAGE',                      'en-US');
-define('CONFIG_SITE_TEMPLATE',                      'Default');
+define('CONFIG_SITE_LANGUAGE', 'en-US');
+define('CONFIG_SITE_TEMPLATE', 'Default');
 
-define('CONFIG_SITE_TITLE',                         'Demo Site');
-define('CONFIG_SITE_SLOGAN',                        'A place for site slogan');
-define('CONFIG_SITE_STATUS',                        STATUS_ONLINE);
-define('CONFIG_SITE_DESCRIPTION',                   '');
-define('CONFIG_SITE_KEYWORDS',                      '');
+define('CONFIG_SITE_TITLE', 'Demo Site');
+define('CONFIG_SITE_SLOGAN', 'A place for site slogan');
+define('CONFIG_SITE_STATUS', STATUS_ONLINE);
+define('CONFIG_SITE_DESCRIPTION', '');
+define('CONFIG_SITE_KEYWORDS', '');
 
-define('CONFIG_SYSTEM_URL',                         'http://example.com');
-define('CONFIG_SYSTEM_EMAIL',                       'admin@example.com');
-define('CONFIG_SYSTEM_TIMEZONE',                    'UTC');
+define('CONFIG_SYSTEM_URL', 'http://example.com');
+define('CONFIG_SYSTEM_EMAIL', 'admin@example.com');
+define('CONFIG_SYSTEM_TIMEZONE', 'UTC');
 
-define('CONFIG_ADMIN_LANGUAGE',                     'en-US');
-define('CONFIG_ADMIN_TEMPLATE',                     'Default');
+define('CONFIG_ADMIN_LANGUAGE', 'en-US');
+define('CONFIG_ADMIN_TEMPLATE', 'Default');
 
-define('CONFIG_ADMIN_DISPLAY_ENTITIES',             50);
-define('CONFIG_ADMIN_DISPLAY_FILES',                40);
+define('CONFIG_ADMIN_DISPLAY_ENTITIES', 50);
+define('CONFIG_ADMIN_DISPLAY_FILES', 40);
 
 # 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
 
 # Auth
 
-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
 
 # Entitizer
 
-define('CONFIG_ENTITIZER_MAX_DEPTH',                6);
+define('CONFIG_ENTITIZER_MAX_DEPTH', 6);
 
 # Database fields
 
-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);
 
 # Page fields
 
-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 fields
 
-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);
 
 # Variable fields
 
-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);
 
 # Widget fields
 
-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 fields
 
-define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH',        128);
+define('CONFIG_FILEMANAGER_NAME_MAX_LENGTH', 128);
 
 # User fields
 
-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);
 
 # Settings fields
 
-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);
 
-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);
 
 # 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);
 
 # Uploads
 
-define('CONFIG_UPLOADS_MAX_SIZE',                   104857600);     # 100 MB
+define('CONFIG_UPLOADS_MAX_SIZE', 104857600); # 100 MB

www/engine/System/Classes/Installer.php

Spacing +2 added lines, -2 removed lines

@@ -21,13 +21,13 @@
 
 			# Check installation
 
-			if (null !== ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/index.php');
+			if (null !== ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH.'/index.php');
 
 			# Get handler class
 
 			$checked = (Install::checkRequirements() && Validate::boolean(Request::get('checked')));
 
-			$class = ('Modules\Install\Handler\\' . (!$checked ? 'Check' : 'Database'));
+			$class = ('Modules\Install\Handler\\'.(!$checked ? 'Check' : 'Database'));
 
 			# ------------------------
 

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 			# Check installation
 
-			if (null !== ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/index.php');
+			if (null !== ($data = Schema::get('System')->load())) {
+				Request::redirect(INSTALL_PATH . '/index.php');
+			}
 
 			# Get handler class
 

www/engine/System/Classes/Dispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 			# Check installation
 
-			if (null === ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/install.php');
+			if (null === ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH.'/install.php');
 
 			# Connect to database
 

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 			# Check installation
 
-			if (null === ($data = Schema::get('System')->load())) Request::redirect(INSTALL_PATH . '/install.php');
+			if (null === ($data = Schema::get('System')->load())) {
+				Request::redirect(INSTALL_PATH . '/install.php');
+			}
 
 			# Connect to database
 

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

Spacing +5 added lines, -5 removed lines

@@ -68,11 +68,11 @@
 
 			if ($this->page->id !== 1) SEO::title($this->page->title); else $this->_layout = 'Index';
 
-			SEO::description        ($this->page->description);
-			SEO::keywords           ($this->page->keywords);
-			SEO::robotsIndex        ($this->page->robots_index);
-			SEO::robotsFollow       ($this->page->robots_follow);
-			SEO::canonical          ($this->page->canonical);
+			SEO::description($this->page->description);
+			SEO::keywords($this->page->keywords);
+			SEO::robotsIndex($this->page->robots_index);
+			SEO::robotsFollow($this->page->robots_follow);
+			SEO::canonical($this->page->canonical);
 
 			# ------------------------
 

Braces +21 added lines, -7 removed lines

@@ -25,9 +25,11 @@ 
 
 			# Set breadcrumbs
 
-			if (count($this->path) <= 1) $contents->getBlock('breadcrumbs')->disable();
-
-			else $contents->getBlock('breadcrumbs')->path = $this->path;
+			if (count($this->path) <= 1) {
+				$contents->getBlock('breadcrumbs')->disable();
+			} else {
+				$contents->getBlock('breadcrumbs')->path = $this->path;
+			}
 
 			# Set contents
 
@@ -54,19 +56,31 @@ 
 
 			$slug = $this->_url->getSlug();
 
-			if ('' !== $slug) $this->page->initBySlug($slug); else $this->page->init(1);
+			if ('' !== $slug) {
+				$this->page->initBySlug($slug);
+			} else {
+				$this->page->init(1);
+			}
 
 			# Display error if not found
 
-			if (0 === $this->page->id) return false;
+			if (0 === $this->page->id) {
+				return false;
+			}
 
 			# Get path
 
-			if (false !== ($path = $this->page->getPath())) $this->path = $path;
+			if (false !== ($path = $this->page->getPath())) {
+				$this->path = $path;
+			}
 
 			# Set data
 
-			if ($this->page->id !== 1) SEO::title($this->page->title); else $this->_layout = 'Index';
+			if ($this->page->id !== 1) {
+				SEO::title($this->page->title);
+			} else {
+				$this->_layout = 'Index';
+			}
 
 			SEO::description        ($this->page->description);
 			SEO::keywords           ($this->page->keywords);

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

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,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/Utils/Tables.php

Spacing +4 added lines, -4 removed lines

@@ -93,9 +93,9 @@ 
 
 			for ($id = 2; $id <= 4; $id++) $pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
 
-				'locked' => false, 'slug' => ('page-' . ($id - 1)), 'name' => ('page-' . ($id - 1)),
+				'locked' => false, 'slug' => ('page-'.($id - 1)), 'name' => ('page-'.($id - 1)),
 
-				'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . ($id - 1)),
+				'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.($id - 1)),
 
 				'contents' => Template::createBlock(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->getContents(),
 
@@ -132,9 +132,9 @@ 
 
 			for ($id = 1; $id <= 3; $id++) $menu[] = [
 
-				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-' . $id),
+				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-'.$id),
 
-				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $id)];
+				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.$id)];
 
 			# Process insertion
 

Braces +28 added lines, -8 removed lines

@@ -77,7 +77,11 @@ 
 
 			$count = DB::count(TABLE_PAGES);
 
-			if (false === $count) return false; else if ($count > 0) return true;
+			if (false === $count) {
+				return false;
+			} else if ($count > 0) {
+				return true;
+			}
 
 			# Process dataset
 
@@ -91,7 +95,8 @@ 
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME]];
 
-			for ($id = 2; $id <= 4; $id++) $pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
+			for ($id = 2; $id <= 4; $id++) {
+				$pages[] = ['id' => $id, 'visibility' => VISIBILITY_PUBLISHED,
 
 				'locked' => false, 'slug' => ('page-' . ($id - 1)), 'name' => ('page-' . ($id - 1)),
 
@@ -100,10 +105,13 @@ 
 				'contents' => Template::createBlock(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->getContents(),
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME];
+			}
 
 			# Process insertion
 
-			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::getLast()->status)) return false;
+			if (!(DB::insert(TABLE_PAGES, $pages, true) && DB::getLast()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_PAGES_RELATIONS, count($pages));
 
@@ -124,21 +132,29 @@ 
 
 			$count = DB::count(TABLE_MENU);
 
-			if (false === $count) return false; else if ($count > 0) return true;
+			if (false === $count) {
+				return false;
+			} else if ($count > 0) {
+				return true;
+			}
 
 			# Process dataset
 
 			$menu = [];
 
-			for ($id = 1; $id <= 3; $id++) $menu[] = [
+			for ($id = 1; $id <= 3; $id++) {
+				$menu[] = [
 
 				'id' => $id, 'active' => true, 'position' => ($id - 1), 'slug' => ('page-' . $id),
 
 				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $id)];
+			}
 
 			# Process insertion
 
-			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::getLast()->status)) return false;
+			if (!(DB::insert(TABLE_MENU, $menu, true) && DB::getLast()->status)) {
+				return false;
+			}
 
 			self::fillRelationsTable(TABLE_MENU_RELATIONS, count($menu));
 
@@ -157,7 +173,9 @@ 
 
 			$definitions = self::getDefinitions(false);
 
-			foreach ($definitions as $definition) if (!$definition->createTables()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->createTables()) return false;
+			}
 
 			# ------------------------
 
@@ -174,7 +192,9 @@ 
 
 			$definitions = self::getDefinitions(true);
 
-			foreach ($definitions as $definition) if (!$definition->removeTables()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->removeTables()) return false;
+			}
 
 			# ------------------------
 

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

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
 
 		public static function checkFile() : bool {
 
-			return Explorer::isFile(DIR_WWW . 'install.php');
+			return Explorer::isFile(DIR_WWW.'install.php');
 		}
 	}
 }

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

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
 
 		public static function __autoload() {
 
-			if (null === self::$settings) self::$settings = new Settings\Utils\Dataset;
+			if (null === self::$settings) {
+				self::$settings = new Settings\Utils\Dataset;
+			}
 		}
 
 		/**
@@ -32,7 +34,9 @@ 
 
 		public static function load() : bool {
 
-			if (null === ($data = Schema::get('Settings')->load())) return false;
+			if (null === ($data = Schema::get('Settings')->load())) {
+				return false;
+			}
 
 			self::$settings->setArray($data); self::$loaded = true;
 

www/engine/System/Classes/Modules/Auth/Handler/Recover.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
 		public function handle() : Template\Block {
 
-			if (Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::isInitial()) Request::redirect(INSTALL_PATH.'/admin/register');
 
 			return (new Auth\Action\Recover)->handle();
 		}

Braces +3 added lines, -1 removed lines

@@ -21,7 +21,9 @@
 
 		public function handle() : Template\Block {
 
-			if (Auth::isInitial()) Request::redirect(INSTALL_PATH . '/admin/register');
+			if (Auth::isInitial()) {
+				Request::redirect(INSTALL_PATH . '/admin/register');
+			}
 
 			return (new Auth\Action\Recover)->handle();
 		}