cadmium-org / cadmium-cms

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

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

@@ -9,7 +9,8 @@
 
 namespace Form\Field {
 
-	use Form, Validate;
+	use Form;
+	use Validate;
 
 	class Checkbox extends Form\Field {
 

Braces +3 added lines, -1 removed lines

@@ -53,7 +53,9 @@
 
 			$tag->setAttribute('type', 'checkbox');
 
-			if ($this->value) $tag->setAttribute('checked', 'checked');
+			if ($this->value) {
+				$tag->setAttribute('checked', 'checked');
+			}
 
 			# ------------------------
 

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

Doc Comments +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 		/**
 		 * Add a field to the form
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		private function addField(Form\Field $field) {
@@ -44,7 +44,7 @@ 
 		/**
 		 * Add a text field
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		public function addText(string $key, string $value = '',
@@ -57,7 +57,7 @@ 
 		/**
 		 * Add a select field
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		public function addSelect(string $key, string $value = '',
@@ -70,7 +70,7 @@ 
 		/**
 		 * Add a checkbox field
 		 *
-		 * @return true if the field was successfully added, otherwise false
+		 * @return boolean if the field was successfully added, otherwise false
 		 */
 
 		public function addCheckbox(string $key, string $value = '') {
@@ -81,7 +81,7 @@ 
 		/**
 		 * Check if valid POST data has been recieved
 		 *
-		 * @return the check status
+		 * @return boolean check status
 		 */
 
 		public function check() {

Spacing +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
 
 			foreach ($this->fields as $field) {
 
-				$block->setBlock(('field_' . $field->getName()), $field->getBlock());
+				$block->setBlock(('field_'.$field->getName()), $field->getBlock());
 			}
 		}
 	}

Braces +20 added lines, -6 removed lines

@@ -23,7 +23,9 @@ 
 
 		private function addField(Form\Field $field) {
 
-			if ($this->posted || ('' === ($key = $field->getKey()))) return false;
+			if ($this->posted || ('' === ($key = $field->getKey()))) {
+				return false;
+			}
 
 			$this->fields[$key] = $field;
 
@@ -38,7 +40,9 @@ 
 
 		public function __construct(string $name = '') {
 
-			if (preg_match(REGEX_FORM_NAME, $name)) $this->name = $name;
+			if (preg_match(REGEX_FORM_NAME, $name)) {
+				$this->name = $name;
+			}
 		}
 
 		/**
@@ -90,9 +94,15 @@ 
 
 			foreach ($this->fields as $field) {
 
-				if (($field instanceof Form\Field\Checkbox) || $field->disabled) continue;
+				if (($field instanceof Form\Field\Checkbox) || $field->disabled) {
+					continue;
+				}
 
-				if (false !== Request::post($field->getName())) $check = true; else return false;
+				if (false !== Request::post($field->getName())) {
+					$check = true;
+				} else {
+					return false;
+				}
 			}
 
 			# ------------------------
@@ -108,7 +118,9 @@ 
 
 		public function post() {
 
-			if ($this->posted || !$this->check()) return false;
+			if ($this->posted || !$this->check()) {
+				return false;
+			}
 
 			$post = []; $errors = false;
 
@@ -116,7 +128,9 @@ 
 
 				$field->post(); $post[$field->getKey()] = $field->getValue();
 
-				if ($field->error) $errors = true;
+				if ($field->error) {
+					$errors = true;
+				}
 			}
 
 			$this->posted = true; $this->errors = $errors;

www/engine/Framework/Classes/JSON/JSON.php

Doc Comments +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		/**
 		 * Convert a JSON value to a string
 		 *
-		 * @return the string or false on failure
+		 * @return string string or false on failure
 		 */
 
 		public static function stringify($value) {

Braces +6 added lines, -2 removed lines

@@ -41,7 +41,9 @@ 
 
 		public static function load(string $file_name) {
 
-			if (false === ($contents = Explorer::getContents($file_name))) return null;
+			if (false === ($contents = Explorer::getContents($file_name))) {
+				return null;
+			}
 
 			return self::parse($contents);
 		}
@@ -54,7 +56,9 @@ 
 
 		public static function save(string $file_name, $value) {
 
-			if (false === ($value = self::stringify($value))) return false;
+			if (false === ($value = self::stringify($value))) {
+				return false;
+			}
 
 			return Explorer::putContents($file_name, $value);
 		}

www/engine/Framework/Classes/Session/Session.php

Doc Comments +1 added lines

@@ -43,6 +43,7 @@
 
 		/**
 		 * Set a variable
+		 * @param string $value
 		 */
 
 		public static function set(string $name, $value) {

Braces +9 added lines, -3 removed lines

@@ -19,7 +19,9 @@ 
 
 		public static function start(string $name, int $lifetime) {
 
-			if (session_id()) return true;
+			if (session_id()) {
+				return true;
+			}
 
 			ini_set('session.gc_maxlifetime', $lifetime);
 
@@ -47,7 +49,9 @@ 
 
 		public static function set(string $name, $value) {
 
-			if (session_id()) $_SESSION[$name] = $value;
+			if (session_id()) {
+				$_SESSION[$name] = $value;
+			}
 		}
 
 		/**
@@ -76,7 +80,9 @@ 
 
 		public static function delete(string $name) {
 
-			if (isset($_SESSION[$name])) unset($_SESSION[$name]);
+			if (isset($_SESSION[$name])) {
+				unset($_SESSION[$name]);
+			}
 		}
 	}
 }

www/engine/Framework/Classes/Url/Url.php

Doc Comments +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 		/**
 		 * Set a query attribute. If the value is null, an attribute will be removed
 		 *
-		 * @return the current url object
+		 * @return Url current url object
 		 */
 
 		public function setAttribute(string $name, string $value = null) {

Indentation +4 added lines, -4 removed lines

@@ -47,10 +47,10 @@
 		}
 
 		/**
-		* Get a query attribute
-		*
-		* @return the value, otherwise false
-		*/
+		 * Get a query attribute
+		 *
+		 * @return the value, otherwise false
+		 */
 
 		public function getAttribute(string $name) {
 

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 
 		public function getPath() {
 
-			return ('/' . implode('/', array_map('urlencode', $this->path)));
+			return ('/'.implode('/', array_map('urlencode', $this->path)));
 		}
 
 		/**
@@ -81,7 +81,7 @@ 
 
 		public function getQuery() {
 
-			return (($query = http_build_query($this->query)) ? ('?' . $query) : '');
+			return (($query = http_build_query($this->query)) ? ('?'.$query) : '');
 		}
 
 		/**
@@ -108,7 +108,7 @@ 
 
 		public function getString(bool $include_query = true) {
 
-			return ($this->getPath() . $this->getQuery());
+			return ($this->getPath().$this->getQuery());
 		}
 	}
 }

Braces +9 added lines, -3 removed lines

@@ -19,18 +19,24 @@
 
 		public function __construct(string $url = '') {
 
-			if (false === ($url = parse_url($url))) return;
+			if (false === ($url = parse_url($url))) {
+				return;
+			}
 
 			# Parse path
 
-			if (isset($url['path'])) foreach (explode('/', $url['path']) as $part) {
+			if (isset($url['path'])) {
+				foreach (explode('/', $url['path']) as $part) {
 
 				if ('' !== $part) $this->path[] = urldecode($part);
 			}
+			}
 
 			# Parse query
 
-			if (isset($url['query'])) parse_str($url['query'], $this->query);
+			if (isset($url['query'])) {
+				parse_str($url['query'], $this->query);
+			}
 		}
 
 		/**

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

Doc Comments +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 		/**
 		 * Parse a string as XML
 		 *
-		 * @return the XML object or false on failure
+		 * @return SimpleXMLElement XML object or false on failure
 		 */
 
 		public static function parse(string $string) {
@@ -25,7 +25,7 @@ 
 		/**
 		 * Convert an XML object to a string
 		 *
-		 * @return the string or false on failure
+		 * @return false|string string or false on failure
 		 */
 
 		public static function stringify(SimpleXMLElement $xml) {

Braces +9 added lines, -3 removed lines

@@ -30,7 +30,9 @@ 
 
 		public static function stringify(SimpleXMLElement $xml) {
 
-			if (false === ($xml = dom_import_simplexml($xml))) return false;
+			if (false === ($xml = dom_import_simplexml($xml))) {
+				return false;
+			}
 
 			$dom = $xml->ownerDocument; $dom->formatOutput = true;
 
@@ -47,7 +49,9 @@ 
 
 		public static function load(string $file_name) {
 
-			if (false === ($contents = Explorer::getContents($file_name))) return false;
+			if (false === ($contents = Explorer::getContents($file_name))) {
+				return false;
+			}
 
 			return self::parse($contents);
 		}
@@ -60,7 +64,9 @@ 
 
 		public static function save(string $file_name, SimpleXMLElement $xml) {
 
-			if (false === ($xml = self::stringify($xml))) return false;
+			if (false === ($xml = self::stringify($xml))) {
+				return false;
+			}
 
 			return Explorer::putContents($file_name, $xml);
 		}

www/engine/System/Classes/Dispatcher.php

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

@@ -2,7 +2,9 @@
 
 namespace {
 
-	use Modules\Extend, Utils\Map, Utils\Schema;
+	use Modules\Extend;
+	use Utils\Map;
+	use Utils\Schema;
 
 	class Dispatcher {
 

Spacing +1 added lines, -1 removed lines

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

www/engine/System/Classes/Frames/Admin/Area/Authorized.php

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

@@ -2,7 +2,12 @@
 
 namespace Frames\Admin\Area {
 
-	use Frames, Frames\Status, Modules, Ajax, Request, Template;
+	use Frames;
+	use Frames\Status;
+	use Modules;
+	use Ajax;
+	use Request;
+	use Template;
 
 	abstract class Authorized extends Frames\Admin\Section {
 

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 			if (!Modules\Auth::check() || ((false !== Request::get('logout')) && Modules\Auth::logout())) {
 
-				Request::redirect(INSTALL_PATH . '/admin/login');
+				Request::redirect(INSTALL_PATH.'/admin/login');
 			}
 
 			# Handle request

Braces +6 added lines, -2 removed lines

@@ -21,9 +21,13 @@
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_200);
+			if (Template::isBlock($result = $this->handle())) {
+				return $this->displayPage($result, STATUS_CODE_200);
+			}
 
-			if (Ajax::isResponse($result)) return Ajax::output($result);
+			if (Ajax::isResponse($result)) {
+				return Ajax::output($result);
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Frames/Admin/Section.php

Unused Use Statements +11 added lines, -2 removed lines

@@ -2,8 +2,17 @@
 
 namespace Frames\Admin {
 
-	use Frames, Frames\Status, Modules\Auth, Modules\Extend, Utils\Messages, Utils\Popup, Utils\View;
-	use DB, Debug, Language, Template;
+	use Frames;
+	use Frames\Status;
+	use Modules\Auth;
+	use Modules\Extend;
+	use Utils\Messages;
+	use Utils\Popup;
+	use Utils\View;
+	use DB;
+	use Debug;
+	use Language;
+	use Template;
 
 	abstract class Section extends Frames\Section {
 

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
 
 		private function getLayout(Template\Block $contents) {
 
-			$layout = View::get('Layouts/' . $this->layout);
+			$layout = View::get('Layouts/'.$this->layout);
 
 			# Set menu and user
 
@@ -82,7 +82,7 @@ 
 
 		protected function displayPage(Template\Block $contents, int $status = STATUS_CODE_200) {
 
-			$page = View::get('Main/' . $this->layout);
+			$page = View::get('Main/'.$this->layout);
 
 			# Set language
 
@@ -90,7 +90,7 @@ 
 
 			# Set title
 
-			$page->title = ((('' !== $this->title) ? (Language::get($this->title) . ' | ') : '') . CADMIUM_NAME);
+			$page->title = ((('' !== $this->title) ? (Language::get($this->title).' | ') : '').CADMIUM_NAME);
 
 			# Set layout
 

Braces +3 added lines, -1 removed lines

@@ -111,7 +111,9 @@
 
 				$ips = preg_split('/ +/', CONFIG_ADMIN_IP, -1, PREG_SPLIT_NO_EMPTY);
 
-				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) return Status::error404();
+				if (!in_array(REQUEST_CLIENT_IP, $ips, true)) {
+					return Status::error404();
+				}
 			}
 
 			# ------------------------