cadmium-org / cadmium-cms

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

Doc Comments +3 added lines

@@ -54,6 +54,9 @@
 
 		# Output contents
 
+		/**
+		 * @param string $status
+		 */
 		public static function output(Template\Asset\Block $block, $status = null) {
 
 			if ((null === $status) || !Headers::isStatusCode($status)) $status = STATUS_CODE_200;

Braces +15 added lines, -5 removed lines

@@ -10,18 +10,26 @@ 
 
 		public static function global(string $name, string $value = null) {
 
-			if (null === $value) return (self::$globals[$name] ?? false);
+			if (null === $value) {
+				return (self::$globals[$name] ?? false);
+			}
 
-			if (!isset(self::$globals[$name])) self::$globals[$name] = $value;
+			if (!isset(self::$globals[$name])) {
+				self::$globals[$name] = $value;
+			}
 		}
 
 		# Set/get widget
 
 		public static function widget(string $name, Template\Asset\Block $block = null) {
 
-			if (null === $block) return (self::$widgets[$name] ?? false);
+			if (null === $block) {
+				return (self::$widgets[$name] ?? false);
+			}
 
-			if (!isset(self::$widgets[$name])) self::$widgets[$name] = $block;
+			if (!isset(self::$widgets[$name])) {
+				self::$widgets[$name] = $block;
+			}
 		}
 
 		# Create block
@@ -56,7 +64,9 @@ 
 
 		public static function output(Template\Asset\Block $block, $status = null) {
 
-			if ((null === $status) || !Headers::isStatusCode($status)) $status = STATUS_CODE_200;
+			if ((null === $status) || !Headers::isStatusCode($status)) {
+				$status = STATUS_CODE_200;
+			}
 
 			Headers::nocache(); Headers::status($status); Headers::content(MIME_TYPE_HTML);
 

www/engine/System/Classes/Handlers/Site/Page.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
 				$condition = ("parent_id = " . $parent_id . " AND visibility = " . VISIBILITY_PUBLISHED . " ") .
 
-				             ("AND access <= " . $access . " AND name = '" . addslashes($name) . "'");
+							 ("AND access <= " . $access . " AND name = '" . addslashes($name) . "'");
 
 				if (!(DB::select(TABLE_PAGES, $selection, $condition, null, 1) && (DB::last()->rows === 1))) return false;
 

Braces +19 added lines, -7 removed lines

@@ -35,7 +35,9 @@ 
 
 				             ("AND access <= " . $access . " AND name = '" . addslashes($name) . "'");
 
-				if (!(DB::select(TABLE_PAGES, $selection, $condition, null, 1) && (DB::last()->rows === 1))) return false;
+				if (!(DB::select(TABLE_PAGES, $selection, $condition, null, 1) && (DB::last()->rows === 1))) {
+					return false;
+				}
 
 				$path[] = $page(...array_values(DB::last()->row()));
 			}
@@ -53,9 +55,11 @@ 
 
 			# Set breadcrumbs
 
-			if (count($this->path) <= 1) $contents->block('breadcrumbs')->disable();
-
-			else $contents->block('breadcrumbs')->path = $this->path;
+			if (count($this->path) <= 1) {
+				$contents->block('breadcrumbs')->disable();
+			} else {
+				$contents->block('breadcrumbs')->path = $this->path;
+			}
 
 			# Set contents
 
@@ -70,7 +74,9 @@ 
 
 		protected function handle() {
 
-			if (false === ($path = $this->getPath())) return false;
+			if (false === ($path = $this->getPath())) {
+				return false;
+			}
 
 			$this->path = $path;
 
@@ -78,11 +84,17 @@ 
 
 			$this->page = Entitizer::get(ENTITY_TYPE_PAGE, ($this->path ? end($this->path)['id'] : 1));
 
-			if (0 === $this->page->id) return false;
+			if (0 === $this->page->id) {
+				return false;
+			}
 
 			# Set data
 
-			if ($this->page->id !== 1) $this->title = $this->page->title; else $this->layout = 'Index';
+			if ($this->page->id !== 1) {
+				$this->title = $this->page->title;
+			} else {
+				$this->layout = 'Index';
+			}
 
 			$this->description      = $this->page->description;
 			$this->keywords         = $this->page->keywords;

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 
 			$page = function(int $id, string $name, string $title) use(&$parent_id, &$link) {
 
-				$parent_id = $id; $link .= ('/' . $name);
+				$parent_id = $id; $link .= ('/'.$name);
 
 				return ['id' => $id, 'link' => $link, 'title' => $title];
 			};
@@ -31,9 +31,9 @@ 
 
 				$access = (Auth::check() ? Auth::user()->rank : RANK_GUEST);
 
-				$condition = ("parent_id = " . $parent_id . " AND visibility = " . VISIBILITY_PUBLISHED . " ") .
+				$condition = ("parent_id = ".$parent_id." AND visibility = ".VISIBILITY_PUBLISHED." ").
 
-				             ("AND access <= " . $access . " AND name = '" . addslashes($name) . "'");
+				             ("AND access <= ".$access." AND name = '".addslashes($name)."'");
 
 				if (!(DB::select(TABLE_PAGES, $selection, $condition, null, 1) && (DB::last()->rows === 1))) return false;
 

www/engine/System/Classes/Handlers/Tools/Sitemap.php

Braces +12 added lines, -4 removed lines

@@ -12,7 +12,9 @@ 
 
 			$selection = 'MAX(time_modified) as last_modified';
 
-			if (!(DB::select(TABLE_PAGES, $selection) && (DB::last()->rows === 1))) return 0;
+			if (!(DB::select(TABLE_PAGES, $selection) && (DB::last()->rows === 1))) {
+				return 0;
+			}
 
 			# ------------------------
 
@@ -29,9 +31,13 @@ 
 
 			$condition = ['visibility' => VISIBILITY_PUBLISHED, 'access' => ACCESS_PUBLIC];
 
-			if (!(DB::select(TABLE_PAGES, 'id', $condition) && DB::last()->status)) return [];
+			if (!(DB::select(TABLE_PAGES, 'id', $condition) && DB::last()->status)) {
+				return [];
+			}
 
-			while (null !== ($page = DB::last()->row())) $pages[] = $page['id'];
+			while (null !== ($page = DB::last()->row())) {
+				$pages[] = $page['id'];
+			}
 
 			# Init pages
 
@@ -59,7 +65,9 @@ 
 
 			$last_modified = $this->getLastModified();
 
-			if ($sitemap->load($last_modified)) return $sitemap;
+			if ($sitemap->load($last_modified)) {
+				return $sitemap;
+			}
 
 			# Fill sitemap
 

www/engine/System/Classes/Dispatcher.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 			# Check installation
 
-			if (!$this->installed) Request::redirect(INSTALL_PATH . '/install.php');
+			if (!$this->installed) {
+				Request::redirect(INSTALL_PATH . '/install.php');
+			}
 
 			# Connect to database
 

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 
 			# Check installation
 
-			if (!$this->installed) Request::redirect(INSTALL_PATH . '/install.php');
+			if (!$this->installed) Request::redirect(INSTALL_PATH.'/install.php');
 
 			# Connect to database
 
@@ -24,7 +24,7 @@ 
 
 			# Determine handler class
 
-			$class = ((false !== $handler) ? ('Handlers\\' . $handler) : 'Handlers\Site\Page');
+			$class = ((false !== $handler) ? ('Handlers\\'.$handler) : 'Handlers\Site\Page');
 
 			# ------------------------
 

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

Braces +6 added lines, -2 removed lines

@@ -14,7 +14,9 @@ 
 
 			$extensions = ['mysqli', 'mbstring', 'gd', 'simplexml'];
 
-			foreach ($extensions as $name) self::$requirements[$name] = extension_loaded($name);
+			foreach ($extensions as $name) {
+				self::$requirements[$name] = extension_loaded($name);
+			}
 
 			# Check mod_rewrite
 
@@ -24,7 +26,9 @@ 
 
 			$writables = ['data' => DIR_SYSTEM_DATA, 'uploads' => DIR_UPLOADS];
 
-			foreach ($writables as $name => $dir) self::$requirements[$name] = is_writable($dir);
+			foreach ($writables as $name => $dir) {
+				self::$requirements[$name] = is_writable($dir);
+			}
 
 			# Set checking status
 

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

Braces +10 added lines, -10 removed lines

@@ -20,21 +20,19 @@ 
 
 			# Connect to DB
 
-			try { DB::connect($server, $user, $password, $name); }
-
-			catch (Exception\DBConnect $error) { return 'INSTALL_ERROR_DATABASE_CONNECT'; }
-
-			catch (Exception\DBSelect $error) { return 'INSTALL_ERROR_DATABASE_SELECT'; }
-
-			catch (Exception\DBCharset $error) { return 'INSTALL_ERROR_DATABASE_CHARSET'; }
+			try { DB::connect($server, $user, $password, $name); } catch (Exception\DBConnect $error) { return 'INSTALL_ERROR_DATABASE_CONNECT'; } catch (Exception\DBSelect $error) { return 'INSTALL_ERROR_DATABASE_SELECT'; } catch (Exception\DBCharset $error) { return 'INSTALL_ERROR_DATABASE_CHARSET'; }
 
 			# Create tables
 
-			if (!Install\Utils\Tables::create()) return 'INSTALL_ERROR_DATABASE_TABLES_CREATE';
+			if (!Install\Utils\Tables::create()) {
+				return 'INSTALL_ERROR_DATABASE_TABLES_CREATE';
+			}
 
 			# Fill tables
 
-			if (!Install\Utils\Tables::fill()) return 'INSTALL_ERROR_DATABASE_TABLES_FILL';
+			if (!Install\Utils\Tables::fill()) {
+				return 'INSTALL_ERROR_DATABASE_TABLES_FILL';
+			}
 
 			# Save system file
 
@@ -49,7 +47,9 @@ 
 
 			$system_file = (DIR_SYSTEM_DATA . 'System.json'); $system = json_encode($system, JSON_PRETTY_PRINT);
 
-			if (false === Explorer::save($system_file, $system, true)) return 'INSTALL_ERROR_SYSTEM';
+			if (false === Explorer::save($system_file, $system, true)) {
+				return 'INSTALL_ERROR_SYSTEM';
+			}
 
 			# ------------------------
 

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 
 			$system['time'] = REQUEST_TIME;
 
-			$system_file = (DIR_SYSTEM_DATA . 'System.json'); $system = json_encode($system, JSON_PRETTY_PRINT);
+			$system_file = (DIR_SYSTEM_DATA.'System.json'); $system = json_encode($system, JSON_PRETTY_PRINT);
 
 			if (false === Explorer::save($system_file, $system, true)) return 'INSTALL_ERROR_SYSTEM';
 

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

Braces +6 added lines, -2 removed lines

@@ -12,7 +12,9 @@ 
 
 			$languages = [];
 
-			foreach (Extend\Languages::items() as $code => $language) $languages[$code] = $language['title'];
+			foreach (Extend\Languages::items() as $code => $language) {
+				$languages[$code] = $language['title'];
+			}
 
 			# ------------------------
 
@@ -25,7 +27,9 @@ 
 
 			$templates = [];
 
-			foreach (Extend\Templates::items() as $name => $template) $templates[$name] = $template['title'];
+			foreach (Extend\Templates::items() as $name => $template) {
+				$templates[$name] = $template['title'];
+			}
 
 			# ------------------------
 

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

Braces +21 added lines, -7 removed lines

@@ -12,9 +12,13 @@ 
 
 			# Count pages
 
-			if (!(DB::select(TABLE_PAGES, 'COUNT(id) as count') && (DB::last()->rows === 1))) return false;
+			if (!(DB::select(TABLE_PAGES, 'COUNT(id) as count') && (DB::last()->rows === 1))) {
+				return false;
+			}
 
-			if (intval(DB::last()->row()['count']) > 0) return true;
+			if (intval(DB::last()->row()['count']) > 0) {
+				return true;
+			}
 
 			# Insert initial pages
 
@@ -30,7 +34,8 @@ 
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME];
 
-			for ($i = 1; $i <= 3; $i++) $pages[] = ['visibility' => VISIBILITY_PUBLISHED,
+			for ($i = 1; $i <= 3; $i++) {
+				$pages[] = ['visibility' => VISIBILITY_PUBLISHED,
 
 				'hash' => Arr::encode([('page-' . $i), 0]),
 
@@ -39,6 +44,7 @@ 
 				'contents' => Template::block(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->contents(),
 
 				'time_created' => REQUEST_TIME, 'time_modified' => REQUEST_TIME];
+			}
 
 			# ------------------------
 
@@ -51,19 +57,25 @@ 
 
 			# Count menuitems
 
-			if (!(DB::select(TABLE_MENU, 'COUNT(id) as count') && (DB::last()->rows === 1))) return false;
+			if (!(DB::select(TABLE_MENU, 'COUNT(id) as count') && (DB::last()->rows === 1))) {
+				return false;
+			}
 
-			if (intval(DB::last()->row()['count']) > 0) return true;
+			if (intval(DB::last()->row()['count']) > 0) {
+				return true;
+			}
 
 			# Insert initial menuitems
 
 			$menu = [];
 
-			for ($i = 1; $i <= 3; $i++) $menu[] = [
+			for ($i = 1; $i <= 3; $i++) {
+				$menu[] = [
 
 				'position' => ($i - 1), 'slug' => ('page-' . $i),
 
 				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $i)];
+			}
 
 			# ------------------------
 
@@ -90,7 +102,9 @@ 
 
 			$definitions[] = Entitizer\Definition::get(ENTITY_TYPE_USER_SESSION);
 
-			foreach ($definitions as $definition) if (!$definition->createTable()) return false;
+			foreach ($definitions as $definition) {
+				if (!$definition->createTable()) return false;
+			}
 
 			# ------------------------
 

Spacing +4 added lines, -4 removed lines

@@ -32,9 +32,9 @@ 
 
 			for ($i = 1; $i <= 3; $i++) $pages[] = ['visibility' => VISIBILITY_PUBLISHED,
 
-				'hash' => Arr::encode([('page-' . $i), 0]),
+				'hash' => Arr::encode([('page-'.$i), 0]),
 
-				'name' => ('page-' . $i), 'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $i),
+				'name' => ('page-'.$i), 'title' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.$i),
 
 				'contents' => Template::block(Language::get('INSTALL_PAGE_DEMO_CONTENTS'))->contents(),
 
@@ -61,9 +61,9 @@ 
 
 			for ($i = 1; $i <= 3; $i++) $menu[] = [
 
-				'position' => ($i - 1), 'slug' => ('page-' . $i),
+				'position' => ($i - 1), 'slug' => ('page-'.$i),
 
-				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE') . ' ' . $i)];
+				'text' => (Language::get('INSTALL_PAGE_DEMO_TITLE').' '.$i)];
 
 			# ------------------------
 

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

Braces +9 added lines, -3 removed lines

@@ -12,7 +12,9 @@ 
 
 			# Check for demo mode
 
-			if (Informer::isDemoMode()) return 'DEMO_MODE_RESTRICTION';
+			if (Informer::isDemoMode()) {
+				return 'DEMO_MODE_RESTRICTION';
+			}
 
 			# Define errors list
 
@@ -25,12 +27,16 @@ 
 
 			foreach ($post as $name => $value) {
 
-				if (!Settings::set($name, $value)) return (isset($errors[$name]) ? $errors[$name] : false);
+				if (!Settings::set($name, $value)) {
+					return (isset($errors[$name]) ? $errors[$name] : false);
+				}
 			}
 
 			# Save settings
 
-			if (!Settings::save()) return 'SETTINGS_ERROR_SAVE';
+			if (!Settings::save()) {
+				return 'SETTINGS_ERROR_SAVE';
+			}
 
 			# ------------------------