cadmium-org / cadmium-cms

www/engine/Framework/Classes/Agent/Agent.php

Braces +12 added lines, -4 removed lines

@@ -21,9 +21,13 @@ 
 
 		private static function search(array &$list) {
 
-			if (empty($agent = getenv('HTTP_USER_AGENT'))) return false;
+			if (empty($agent = getenv('HTTP_USER_AGENT'))) {
+				return false;
+			}
 
-			foreach ($list as $item) if (false !== stripos($agent, $item)) return true;
+			foreach ($list as $item) {
+				if (false !== stripos($agent, $item)) return true;
+			}
 
 			# ------------------------
 
@@ -40,9 +44,13 @@ 
 
 			$file_robots = (DIR_DATA . 'Agent/Robots.php');
 
-			if (is_array($mobiles = Explorer::include($file_mobiles))) self::$mobiles = $mobiles;
+			if (is_array($mobiles = Explorer::include($file_mobiles))) {
+				self::$mobiles = $mobiles;
+			}
 
-			if (is_array($robots = Explorer::include($file_robots))) self::$robots = $robots;
+			if (is_array($robots = Explorer::include($file_robots))) {
+				self::$robots = $robots;
+			}
 		}
 
 		/**

www/engine/Framework/Classes/Arr/Arr.php

Braces +20 added lines, -5 removed lines

@@ -22,7 +22,12 @@ 
 
 			$value = null;
 
-			foreach ($path as $item) if (isset($array[$item])) $value = ($array = $array[$item]); else return null;
+			foreach ($path as $item) {
+				if (isset($array[$item])) $value = ($array = $array[$item]);
+			}
+			else {
+				return null;
+			}
 
 			# ------------------------
 
@@ -38,7 +43,9 @@ 
 
 			$selected = array_intersect_key($array, array_flip($keys));
 
-			if (null !== $filter) $selected = array_filter($array, $filter);
+			if (null !== $filter) {
+				$selected = array_filter($array, $filter);
+			}
 
 			# ------------------------
 
@@ -54,7 +61,9 @@ 
 
 			$indexed = [];
 
-			foreach ($array as $key => $value) $indexed[] = [$key_name => $key, $value_name => $value];
+			foreach ($array as $key => $value) {
+				$indexed[] = [$key_name => $key, $value_name => $value];
+			}
 
 			# ------------------------
 
@@ -71,9 +80,15 @@ 
 
 			$sorted = []; $column = array_map($select_key, $array);
 
-			if (!$descending) asort($column); else arsort($column);
+			if (!$descending) {
+				asort($column);
+			} else {
+				arsort($column);
+			}
 
-			foreach (array_keys($column) as $key) $sorted[$key] = $array[$key];
+			foreach (array_keys($column) as $key) {
+				$sorted[$key] = $array[$key];
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Date/Date.php

Braces +9 added lines, -3 removed lines

@@ -19,9 +19,13 @@ 
 
 		public static function validate(string $date, string $format) {
 
-			if (false === ($datetime = date_create_from_format($format, $date))) return false;
+			if (false === ($datetime = date_create_from_format($format, $date))) {
+				return false;
+			}
 
-			if (false === ($formatted = $datetime->format($format))) return false;
+			if (false === ($formatted = $datetime->format($format))) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -58,7 +62,9 @@ 
 
 		public static function validateYear(int $year) {
 
-			if (false === ($year = self::validate($year, 'Y'))) return false;
+			if (false === ($year = self::validate($year, 'Y'))) {
+				return false;
+			}
 
 			return (($year > '1900') ? (($year > self::getYear()) ? self::getYear() : $year) : '1900');
 		}

www/engine/Framework/Classes/Ajax/Response.php

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
 
 		public function set(string $name, $value) {
 
-			if (!in_array($name, ['error', 'status'], true)) $this->data[$name] = $value;
+			if (!in_array($name, ['error', 'status'], true)) {
+				$this->data[$name] = $value;
+			}
 
 			return $this;
 		}
@@ -82,7 +84,9 @@ 
 
 			$data = ['status' => $this->status];
 
-			if (null !== $this->error) $data['error'] = $this->error;
+			if (null !== $this->error) {
+				$data['error'] = $this->error;
+			}
 
 			# ------------------------
 

www/engine/Framework/Classes/Str/Str.php

Spacing +21 added lines, -21 removed lines

@@ -73,25 +73,25 @@ 
 
 			$pattern = [
 
-				'А' => 'A',     'Б' => 'B',     'В' => 'V',     'Г' => 'G',
-				'Д' => 'D',     'Е' => 'E',     'Ж' => 'ZH',    'З' => 'Z',
-				'И' => 'I',     'Й' => 'J',     'К' => 'K',     'Л' => 'L',
-				'М' => 'M',     'Н' => 'N',     'О' => 'O',     'П' => 'P',
-				'Р' => 'R',     'С' => 'S',     'Т' => 'T',     'У' => 'U',
-				'Ф' => 'F',     'Х' => 'H',     'Ц' => 'C',     'Ч' => 'CH',
-				'Ш' => 'SH',    'Щ' => 'SCH',   'Ъ' => '',      'Ь' => '',
-				'Ы' => 'Y',     'Э' => 'E',     'Ю' => 'JU',    'Я' => 'JA',
-				'І' => 'I',     'Ї' => 'JI',    'Ё' => 'JO',
-
-				'а' => 'a',     'б' => 'b',     'в' => 'v',     'г' => 'g',
-				'д' => 'd',     'е' => 'e',     'ж' => 'zh',    'з' => 'z',
-				'и' => 'i',     'й' => 'j',     'к' => 'k',     'л' => 'l',
-				'м' => 'm',     'н' => 'n',     'о' => 'o',     'п' => 'p',
-				'р' => 'r',     'с' => 's',     'т' => 't',     'у' => 'u',
-				'ф' => 'f',     'х' => 'h',     'ц' => 'c',     'ч' => 'ch',
-				'ш' => 'sh',    'щ' => 'sch',   'ъ' => '',      'ь' => '',
-				'ы' => 'y',     'э' => 'e',     'ю' => 'ju',    'я' => 'ja',
-				'і' => 'i',     'ї' => 'ji',    'ё' => 'jo'
+				'А' => 'A', 'Б' => 'B', 'В' => 'V', 'Г' => 'G',
+				'Д' => 'D', 'Е' => 'E', 'Ж' => 'ZH', 'З' => 'Z',
+				'И' => 'I', 'Й' => 'J', 'К' => 'K', 'Л' => 'L',
+				'М' => 'M', 'Н' => 'N', 'О' => 'O', 'П' => 'P',
+				'Р' => 'R', 'С' => 'S', 'Т' => 'T', 'У' => 'U',
+				'Ф' => 'F', 'Х' => 'H', 'Ц' => 'C', 'Ч' => 'CH',
+				'Ш' => 'SH', 'Щ' => 'SCH', 'Ъ' => '', 'Ь' => '',
+				'Ы' => 'Y', 'Э' => 'E', 'Ю' => 'JU', 'Я' => 'JA',
+				'І' => 'I', 'Ї' => 'JI', 'Ё' => 'JO',
+
+				'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g',
+				'д' => 'd', 'е' => 'e', 'ж' => 'zh', 'з' => 'z',
+				'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l',
+				'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p',
+				'р' => 'r', 'с' => 's', 'т' => 't', 'у' => 'u',
+				'ф' => 'f', 'х' => 'h', 'ц' => 'c', 'ч' => 'ch',
+				'ш' => 'sh', 'щ' => 'sch', 'ъ' => '', 'ь' => '',
+				'ы' => 'y', 'э' => 'e', 'ю' => 'ju', 'я' => 'ja',
+				'і' => 'i', 'ї' => 'ji', 'ё' => 'jo'
 			];
 
 			# ------------------------
@@ -176,7 +176,7 @@ 
 
 			if (($maxlength < 1) || (self::length($string = trim($string)) <= $maxlength)) return $string;
 
-			$string = (rtrim(self::substr($string, 0, $maxlength)) . ($ellipsis ? '...' : ''));
+			$string = (rtrim(self::substr($string, 0, $maxlength)).($ellipsis ? '...' : ''));
 
 			# ------------------------
 
@@ -204,7 +204,7 @@ 
 
 		public static function encode(string $salt, string $string) {
 
-			return sha1($salt . substr(sha1($string), 8, 32));
+			return sha1($salt.substr(sha1($string), 8, 32));
 		}
 	}
 }

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

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);
+			}
 		}
 
 		/**

Indentation +4 added lines, -4 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -72,7 +72,7 @@ 
 
 		public function getPath() : string {
 
-			return ('/' . implode('/', array_map('urlencode', $this->path)));
+			return ('/'.implode('/', array_map('urlencode', $this->path)));
 		}
 
 		/**
@@ -81,7 +81,7 @@ 
 
 		public function getQuery() : string {
 
-			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) : string {
 
-			return ($this->getPath() . ($include_query ? $this->getQuery() : ''));
+			return ($this->getPath().($include_query ? $this->getQuery() : ''));
 		}
 	}
 }

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

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;

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) : bool {
@@ -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 = '') : bool {
@@ -81,7 +81,7 @@ 
 		/**
 		 * Check if valid POST data has been recieved
 		 *
-		 * @return true if the data has been recieved, otherwise false
+		 * @return boolean if the data has been recieved, otherwise false
 		 */
 
 		public function check() : bool {

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

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/Explorer/Explorer.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 
 					if (($name === '.') || ($name === '..')) continue;
 
-					if (@$checker($dir_name . $name)) yield $name;
+					if (@$checker($dir_name.$name)) yield $name;
 				}
 
 				closedir($handler);
@@ -93,7 +93,7 @@ 
 
 				foreach (array_diff($list, ['.', '..']) as $name) {
 
-					$name = ($dir_name . '/' . $name);
+					$name = ($dir_name.'/'.$name);
 
 					if (@is_dir($name)) self::removeDir($name, true);
 

Braces +23 added lines, -9 removed lines

@@ -21,9 +21,13 @@ 
 
 				while (false !== ($name = readdir($handler))) {
 
-					if (($name === '.') || ($name === '..')) continue;
+					if (($name === '.') || ($name === '..')) {
+						continue;
+					}
 
-					if (@$checker($dir_name . $name)) yield $name;
+					if (@$checker($dir_name . $name)) {
+						yield $name;
+					}
 				}
 
 				closedir($handler);
@@ -36,7 +40,9 @@ 
 
 		private static function getInfo(string $file_name, int $param, bool $check_exists = true) {
 
-			if ($check_exists && !self::isFile($file_name)) return false;
+			if ($check_exists && !self::isFile($file_name)) {
+				return false;
+			}
 
 			return pathinfo($file_name, $param);
 		}
@@ -95,9 +101,11 @@ 
 
 					$name = ($dir_name . '/' . $name);
 
-					if (@is_dir($name)) self::removeDir($name, true);
-
-					else if (@is_file($name)) self::removeFile($name);
+					if (@is_dir($name)) {
+						self::removeDir($name, true);
+					} else if (@is_file($name)) {
+						self::removeFile($name);
+					}
 				}
 			}
 
@@ -123,7 +131,9 @@ 
 
 		public static function iterateDirs(string $dir_name) {
 
-			foreach (self::getList($dir_name, 'is_dir') as $name) yield $name;
+			foreach (self::getList($dir_name, 'is_dir') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -132,7 +142,9 @@ 
 
 		public static function iterateFiles(string $dir_name) {
 
-			foreach (self::getList($dir_name, 'is_file') as $name) yield $name;
+			foreach (self::getList($dir_name, 'is_file') as $name) {
+				yield $name;
+			}
 		}
 
 		/**
@@ -238,7 +250,9 @@ 
 
 		public static function include(string $file_name) {
 
-			if ((strtolower(self::getExtension($file_name)) !== 'php')) return false;
+			if ((strtolower(self::getExtension($file_name)) !== 'php')) {
+				return false;
+			}
 
 			return @include $file_name;
 		}

Doc Comments +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
 		/**
 		 * Create a directory
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function createDir(string $dir_name, int $mode = 0755) : bool {
@@ -75,7 +75,7 @@ 
 		/**
 		 * Create a file
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function createFile(string $file_name) : bool {
@@ -86,7 +86,7 @@ 
 		/**
 		 * Remove a directory
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function removeDir(string $dir_name, bool $recursive = false) : bool {
@@ -111,7 +111,7 @@ 
 		/**
 		 * Remove a file
 		 *
-		 * @return true on success or false on failure
+		 * @return boolean on success or false on failure
 		 */
 
 		public static function removeFile(string $file_name) : bool {
@@ -191,7 +191,7 @@ 
 		/**
 		 * Get an extnesion of a file
 		 *
-		 * @return the string or false if check_exists is true and the file does not actually exists
+		 * @return string string or false if check_exists is true and the file does not actually exists
 		 */
 
 		public static function getExtension(string $file_name, bool $check_exists = true) {
@@ -213,7 +213,7 @@ 
 		/**
 		 * Get file contents
 		 *
-		 * @return the read data or false on failure
+		 * @return string read data or false on failure
 		 */
 
 		public static function getContents(string $file_name) {