cadmium-org / cadmium-cms

www/engine/System/Classes/Utils/Tools/Captcha.php

Braces +42 added lines, -13 removed lines

@@ -12,11 +12,19 @@ 
 
 		private function allocateColor(array $color = null) {
 
-			if (null === $this->image) return false;
+			if (null === $this->image) {
+				return false;
+			}
 
-			if (null === $color) $color = [0, 0, 0]; else if (count($color) !== 3) return false;
+			if (null === $color) {
+				$color = [0, 0, 0];
+			} else if (count($color) !== 3) {
+				return false;
+			}
 
-			foreach (array_values($color) as $key => $value) $color[$key] = Number::format($value, 0, 255);
+			foreach (array_values($color) as $key => $value) {
+				$color[$key] = Number::format($value, 0, 255);
+			}
 
 			# ------------------------
 
@@ -27,7 +35,9 @@ 
 
 		public function __construct(int $width, int $height, array $bg_color = null) {
 
-			if (false === ($image = imagecreatetruecolor($width, $height))) return;
+			if (false === ($image = imagecreatetruecolor($width, $height))) {
+				return;
+			}
 
 			$this->image = $image; $this->width = $width; $this->height = $height;
 
@@ -41,11 +51,17 @@ 
 
 		public function text(string $font, int $size, int $indent, int $step, string $text, array $color = null) {
 
-			if (null === $this->image) return false;
+			if (null === $this->image) {
+				return false;
+			}
 
-			if (!Explorer::isFile($font)) return false;
+			if (!Explorer::isFile($font)) {
+				return false;
+			}
 
-			if (false === ($color = $this->allocateColor($color))) return false;
+			if (false === ($color = $this->allocateColor($color))) {
+				return false;
+			}
 
 			$base = (floor(($this->height - $size) / 2) + $size);
 
@@ -65,13 +81,22 @@ 
 
 		public function noise(int $rate, array $color = null) {
 
-			if (null === $this->image) return false;
+			if (null === $this->image) {
+				return false;
+			}
 
-			if (false === ($color = $this->allocateColor($color))) return false;
+			if (false === ($color = $this->allocateColor($color))) {
+				return false;
+			}
 
-			for ($x = 0; $x < $this->width; $x++) for ($y = 0; $y < $this->height; $y++) {
+			for ($x = 0; $x < $this->width; $x++) {
+				for ($y = 0;
+			}
+			$y < $this->height; $y++) {
 
-				if (random_int(1, $rate) === 1) imagesetpixel($this->image, $x, $y, $color);
+				if (random_int(1, $rate) === 1) {
+					imagesetpixel($this->image, $x, $y, $color);
+				}
 			}
 
 			# ------------------------
@@ -83,9 +108,13 @@ 
 
 		public function lines(int $count, array $color = null) {
 
-			if (null === $this->image) return false;
+			if (null === $this->image) {
+				return false;
+			}
 
-			if (false === ($color = $this->allocateColor($color))) return false;
+			if (false === ($color = $this->allocateColor($color))) {
+				return false;
+			}
 
 			for ($i = 0; $i < $count; $i++) {
 

www/engine/Framework/Classes/XML/XML.php

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 
 		public static function string(SimpleXMLElement $xml) {
 
-			if (false === ($xml = dom_import_simplexml($xml))) return '';
+			if (false === ($xml = dom_import_simplexml($xml))) {
+				return '';
+			}
 
 			$dom = $xml->ownerDocument; $dom->formatOutput = true;
 

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 		public static function create(string $data) {
 
-			$data = ('<?xml version="1.0" encoding="UTF-8" ?>' . $data);
+			$data = ('<?xml version="1.0" encoding="UTF-8" ?>'.$data);
 
 			return @simplexml_load_string($data);
 		}

www/engine/Framework/Classes/Form/Utils/Field.php

Spacing +2 added lines, -2 removed lines

@@ -45,9 +45,9 @@
 
 			if (preg_match(REGEX_FORM_FIELD_KEY, $key)) {
 
-				$prefix = (('' !== $this->form->name()) ? ($this->form->name() . '_') : '');
+				$prefix = (('' !== $this->form->name()) ? ($this->form->name().'_') : '');
 
-				$this->key = $key; $this->name = ($prefix . $key);
+				$this->key = $key; $this->name = ($prefix.$key);
 			}
 
 			# Set params

Doc Comments +3 added lines

@@ -14,6 +14,9 @@
 
 		# Get tag
 
+		/**
+		 * @param string $contents
+		 */
 		protected function getTag(string $name, array $attributes = [], $contents = null) {
 
 			$tag = new Tag($name, $attributes, $contents);

Unused Use Statements +3 added lines, -1 removed lines

@@ -2,7 +2,9 @@
 
 namespace Form\Utils {
 
-	use Form, Request, Tag;
+	use Form;
+	use Request;
+	use Tag;
 
 	abstract class Field {
 

Braces +26 added lines, -11 removed lines

@@ -24,11 +24,17 @@ 
 
 			# Set config
 
-			if ($this->disabled) $tag->set('disabled', 'disabled');
+			if ($this->disabled) {
+				$tag->set('disabled', 'disabled');
+			}
 
-			if ($this->required) $tag->set('data-required', 'required');
+			if ($this->required) {
+				$tag->set('data-required', 'required');
+			}
 
-			if ($this->error) $tag->set('data-error', 'error');
+			if ($this->error) {
+				$tag->set('data-error', 'error');
+			}
 
 			# ------------------------
 
@@ -54,11 +60,12 @@ 
 
 			$params = array_merge(['disabled' => false, 'required' => false], $this->config);
 
-			foreach ($params as $name => $default) if (isset($config[$name])) {
+			foreach ($params as $name => $default) {
+				if (isset($config[$name])) {
 
-				try { $this->$name($config[$name]); }
-
-				catch (\TypeError $e) { /* Ignore setting value of illegal type */ }
+				try { $this->$name($config[$name]);
+			}
+			} catch (\TypeError $e) { /* Ignore setting value of illegal type */ }
 			}
 		}
 
@@ -66,7 +73,9 @@ 
 
 		public function post() {
 
-			if ($this->posted || $this->disabled || ('' === $this->key)) return false;
+			if ($this->posted || $this->disabled || ('' === $this->key)) {
+				return false;
+			}
 
 			$this->error = (!$this->set(Request::post($this->name)) && $this->required);
 
@@ -100,7 +109,9 @@ 
 
 		public function disabled(bool $value = null) {
 
-			if (null === $value) return $this->disabled;
+			if (null === $value) {
+				return $this->disabled;
+			}
 
 			$this->disabled = $value;
 		}
@@ -109,7 +120,9 @@ 
 
 		public function required(bool $value = null) {
 
-			if (null === $value) return $this->required;
+			if (null === $value) {
+				return $this->required;
+			}
 
 			$this->required = $value;
 		}
@@ -118,7 +131,9 @@ 
 
 		public function error(bool $value = null) {
 
-			if (null === $value) return $this->error;
+			if (null === $value) {
+				return $this->error;
+			}
 
 			$this->error = $value;
 		}

www/engine/Framework/Classes/Geo/Country.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		public static function __autoload() {
 
-			self::init(DIR_DATA . 'Geo/Countries.php');
+			self::init(DIR_DATA.'Geo/Countries.php');
 		}
 	}
 }

www/engine/Framework/Classes/Geo/Timezone.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		public static function __autoload() {
 
-			self::init(DIR_DATA . 'Geo/Timezones.php');
+			self::init(DIR_DATA.'Geo/Timezones.php');
 		}
 	}
 }

www/engine/Framework/Classes/Request/Request.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 		public static function redirect(string $url) {
 
-			header("Location: " . $url); exit();
+			header("Location: ".$url); exit();
 		}
 	}
 }

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
 
 		# Validate file or directory name
 
+		/**
+		 * @return string
+		 */
 		public static function fileName(string $value) {
 
 			return (preg_match(REGEX_FILE_NAME, $value) ? $name : false);

www/engine/Framework/Classes/Mailer/Mailer.php

Spacing +4 added lines, -4 removed lines

@@ -12,13 +12,13 @@
 
 			# Set headers
 
-			$headers  = ('MIME-Version: 1.0' . "\r\n");
+			$headers  = ('MIME-Version: 1.0'."\r\n");
 
-			$headers .= ('Content-Type: ' . ($is_html ? 'text/html' : 'text/plain') . '; charset=UTF-8' . "\r\n");
+			$headers .= ('Content-Type: '.($is_html ? 'text/html' : 'text/plain').'; charset=UTF-8'."\r\n");
 
-			$headers .= ('From: ' . $sender . ' <' . $from . '>' . "\r\n" . 'Reply-To: ' . $reply_to . "\r\n");
+			$headers .= ('From: '.$sender.' <'.$from.'>'."\r\n".'Reply-To: '.$reply_to."\r\n");
 
-			$headers .= ('X-Mailer: PHP/' . phpversion() . "\r\n");
+			$headers .= ('X-Mailer: PHP/'.phpversion()."\r\n");
 
 			# Send message
 

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

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 			# Build query
 
-			$this->query = ('DELETE FROM ' . $table . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('DELETE FROM '.$table.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }

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

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
 			# Build query
 
-			$this->query = ('UPDATE ' . $table . ' SET ' . $dataset . ($condition ? (' WHERE (' .  $condition . ')') : ''));
+			$this->query = ('UPDATE '.$table.' SET '.$dataset.($condition ? (' WHERE ('.$condition.')') : ''));
 		}
 	}
 }