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/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/Profile/Handler/Overview.php

Braces +8 added lines, -4 removed lines

@@ -30,14 +30,18 @@
 
 			foreach (['full_name', 'city'] as $name) {
 
-				if ('' === ($text = Auth::user()->$name)) $contents->block($name)->disable();
-
-				else $contents->block($name)->text = $text;
+				if ('' === ($text = Auth::user()->$name)) {
+					$contents->block($name)->disable();
+				} else {
+					$contents->block($name)->text = $text;
+				}
 			}
 
 			# Set country
 
-			if ('' === ($country = Auth::user()->country)) $contents->block('country')->disable(); else {
+			if ('' === ($country = Auth::user()->country)) {
+				$contents->block('country')->disable();
+			} else {
 
 				$contents->block('country')->code = $country;
 

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

Braces +5 added lines, -3 removed lines

@@ -14,9 +14,11 @@
 
 			# Init user by secret code
 
-			if (false !== ($code = Auth::secret())) $this->code = $code;
-
-			else Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/reset');
+			if (false !== ($code = Auth::secret())) {
+				$this->code = $code;
+			} else {
+				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/reset');
+			}
 
 			# Create form
 

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
 			if (false !== ($code = Auth::secret())) $this->code = $code;
 
-			else Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/reset');
+			else Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/reset');
 
 			# Create form
 
@@ -26,7 +26,7 @@ 
 
 			if ($this->form->handle(new Auth\Controller\Recover())) {
 
-				Request::redirect(INSTALL_PATH . (Auth::admin() ? '/admin' : '/profile') . '/login?submitted=recover');
+				Request::redirect(INSTALL_PATH.(Auth::admin() ? '/admin' : '/profile').'/login?submitted=recover');
 			}
 
 			# ------------------------

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

Braces +3 added lines, -1 removed lines

@@ -20,7 +20,9 @@
 
 			# Implement form
 
-			if (null !== $this->form) $this->form->implement($contents);
+			if (null !== $this->form) {
+				$this->form->implement($contents);
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Utils/Container.php

Braces +8 added lines, -3 removed lines

@@ -16,7 +16,9 @@ 
 
 			$path = implode('/', $scheme); $path_full = (DIR_UPLOADS . (('' !== $path) ? ($path . '/') : ''));
 
-			if (!Explorer::isDir($path_full)) return;
+			if (!Explorer::isDir($path_full)) {
+				return;
+			}
 
 			$this->scheme = $scheme; $this->path = $path; $this->path_full = $path_full;
 		}
@@ -27,9 +29,12 @@ 
 
 			$scheme = []; $breadcrumbs = [];
 
-			if ([] !== $this->scheme) foreach ($this->scheme as $name) {
+			if ([] !== $this->scheme) {
+				foreach ($this->scheme as $name) {
 
-				$scheme[] = $name; $breadcrumbs[] = ['path' => implode('/', $scheme), 'name' => $name];
+				$scheme[] = $name;
+			}
+			$breadcrumbs[] = ['path' => implode('/', $scheme), 'name' => $name];
 			}
 
 			# ------------------------

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 			$scheme = array_diff(preg_split('/[\/\\\\]+/', $path, -1, PREG_SPLIT_NO_EMPTY), ['.', '..']);
 
-			$path = implode('/', $scheme); $path_full = (DIR_UPLOADS . (('' !== $path) ? ($path . '/') : ''));
+			$path = implode('/', $scheme); $path_full = (DIR_UPLOADS.(('' !== $path) ? ($path.'/') : ''));
 
 			if (!Explorer::isDir($path_full)) return;