cadmium-org / cadmium-cms

www/engine/System/Classes/Frames/Site/View.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 
 		private function getLayout(Template\Block $contents) : Template\Block {
 
-			$layout = View::get('Layouts/' . $this->layout);
+			$layout = View::get('Layouts/'.$this->layout);
 
 			# Set menu
 
@@ -78,7 +78,7 @@ 
 
 			$title = (SEO::get('title') ?: Language::get($this->title) ?: '');
 
-			$page->title = ((('' !== $title) ? ($title . ' | ') : '') . Settings::get('site_title'));
+			$page->title = ((('' !== $title) ? ($title.' | ') : '').Settings::get('site_title'));
 
 			# Set canonical
 

Braces +12 added lines, -4 removed lines

@@ -38,7 +38,9 @@ 
 
 				$layout->getBlock('user')->name = Auth::get('name');
 
-				if (Auth::get('rank') === RANK_ADMINISTRATOR) $layout->getBlock('admin')->enable();
+				if (Auth::get('rank') === RANK_ADMINISTRATOR) {
+					$layout->getBlock('admin')->enable();
+				}
 			}
 
 			# Set title
@@ -82,7 +84,9 @@ 
 
 			# Set canonical
 
-			if (false !== SEO::get('canonical')) $page->getBlock('canonical')->enable()->link = SEO::get('canonical');
+			if (false !== SEO::get('canonical')) {
+				$page->getBlock('canonical')->enable()->link = SEO::get('canonical');
+			}
 
 			# Set layout
 
@@ -90,9 +94,13 @@ 
 
 			# Set global components
 
-			foreach (Variables::generate() as $name => $value) Template::setGlobal($name, $value);
+			foreach (Variables::generate() as $name => $value) {
+				Template::setGlobal($name, $value);
+			}
 
-			foreach (Widgets::generate() as $name => $block) Template::setWidget($name, $block);
+			foreach (Widgets::generate() as $name => $block) {
+				Template::setWidget($name, $block);
+			}
 
 			# ------------------------
 

www/engine/Framework/Engine.php

Spacing +6 added lines, -6 removed lines

@@ -17,13 +17,13 @@ 
 
 		private static function parseContents(string $contents, Throwable $exc) : string {
 
-		   $contents = str_replace('$message$',             $exc->getMessage(),                 $contents);
+		   $contents = str_replace('$message$', $exc->getMessage(), $contents);
 
-		   $contents = str_replace('$file$',                $exc->getFile(),                    $contents);
+		   $contents = str_replace('$file$', $exc->getFile(), $contents);
 
-		   $contents = str_replace('$line$',                $exc->getLine(),                    $contents);
+		   $contents = str_replace('$line$', $exc->getLine(), $contents);
 
-		   $contents = str_replace('$trace$',               nl2br($exc->getTraceAsString()),    $contents);
+		   $contents = str_replace('$trace$', nl2br($exc->getTraceAsString()), $contents);
 
 		   # ------------------------
 
@@ -61,7 +61,7 @@ 
 
 			# Load template
 
-			$file_name = (DIR_TEMPLATES . 'Exception.ctp');
+			$file_name = (DIR_TEMPLATES.'Exception.ctp');
 
 			if (false === ($contents = @file_get_contents($file_name))) $output = nl2br($exc);
 
@@ -77,7 +77,7 @@ 
 
 			header('Pragma: no-cache');
 
-			header($_SERVER['SERVER_PROTOCOL'] . ' 500 Internal Server Error', true, 500);
+			header($_SERVER['SERVER_PROTOCOL'].' 500 Internal Server Error', true, 500);
 
 			header('Content-type: text/html; charset=UTF-8');
 

Braces +23 added lines, -9 removed lines

@@ -36,17 +36,29 @@ 
 
 		public static function getIP() : string {
 
-			if (!empty($_SERVER['HTTP_CLIENT_IP']))         return $_SERVER['HTTP_CLIENT_IP'];
+			if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+				return $_SERVER['HTTP_CLIENT_IP'];
+			}
 
-			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))   return $_SERVER['HTTP_X_FORWARDED_FOR'];
+			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+				return $_SERVER['HTTP_X_FORWARDED_FOR'];
+			}
 
-			if (!empty($_SERVER['HTTP_X_FORWARDED']))       return $_SERVER['HTTP_X_FORWARDED'];
+			if (!empty($_SERVER['HTTP_X_FORWARDED'])) {
+				return $_SERVER['HTTP_X_FORWARDED'];
+			}
 
-			if (!empty($_SERVER['HTTP_FORWARDED_FOR']))     return $_SERVER['HTTP_FORWARDED_FOR'];
+			if (!empty($_SERVER['HTTP_FORWARDED_FOR'])) {
+				return $_SERVER['HTTP_FORWARDED_FOR'];
+			}
 
-			if (!empty($_SERVER['HTTP_FORWARDED']))         return $_SERVER['HTTP_FORWARDED'];
+			if (!empty($_SERVER['HTTP_FORWARDED'])) {
+				return $_SERVER['HTTP_FORWARDED'];
+			}
 
-			if (!empty($_SERVER['REMOTE_ADDR']))            return $_SERVER['REMOTE_ADDR'];
+			if (!empty($_SERVER['REMOTE_ADDR'])) {
+				return $_SERVER['REMOTE_ADDR'];
+			}
 
 			# ------------------------
 
@@ -63,9 +75,11 @@ 
 
 			$file_name = (DIR_TEMPLATES . 'Exception.ctp');
 
-			if (false === ($contents = @file_get_contents($file_name))) $output = nl2br($exc);
-
-			else $output = self::parseContents($contents, $exc);
+			if (false === ($contents = @file_get_contents($file_name))) {
+				$output = nl2br($exc);
+			} else {
+				$output = self::parseContents($contents, $exc);
+			}
 
 			# Set headers