cadmium-org / cadmium-cms

www/engine/System/Classes/Utils/Uploader.php

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

@@ -2,7 +2,10 @@
 
 namespace System\Utils {
 
-	use System\Utils\Messages, Explorer, Language, Request;
+	use System\Utils\Messages;
+	use Explorer;
+	use Language;
+	use Request;
 
 	abstract class Uploader {
 

Braces +42 added lines, -14 removed lines

@@ -10,19 +10,33 @@ 
 
 		private static function translateError(int $error) {
 
-			if ($error === UPLOAD_ERR_INI_SIZE)         return 'UPLOADER_ERROR_INI_SIZE';
+			if ($error === UPLOAD_ERR_INI_SIZE) {
+				return 'UPLOADER_ERROR_INI_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_FORM_SIZE)        return 'UPLOADER_ERROR_FORM_SIZE';
+			if ($error === UPLOAD_ERR_FORM_SIZE) {
+				return 'UPLOADER_ERROR_FORM_SIZE';
+			}
 
-			if ($error === UPLOAD_ERR_PARTIAL)          return 'UPLOADER_ERROR_PARTIAL';
+			if ($error === UPLOAD_ERR_PARTIAL) {
+				return 'UPLOADER_ERROR_PARTIAL';
+			}
 
-			if ($error === UPLOAD_ERR_NO_FILE)          return 'UPLOADER_ERROR_NO_FILE';
+			if ($error === UPLOAD_ERR_NO_FILE) {
+				return 'UPLOADER_ERROR_NO_FILE';
+			}
 
-			if ($error === UPLOAD_ERR_NO_TMP_DIR)       return 'UPLOADER_ERROR_NO_TMP_DIR';
+			if ($error === UPLOAD_ERR_NO_TMP_DIR) {
+				return 'UPLOADER_ERROR_NO_TMP_DIR';
+			}
 
-			if ($error === UPLOAD_ERR_CANT_WRITE)       return 'UPLOADER_ERROR_CANT_WRITE';
+			if ($error === UPLOAD_ERR_CANT_WRITE) {
+				return 'UPLOADER_ERROR_CANT_WRITE';
+			}
 
-			if ($error === UPLOAD_ERR_EXTENSION)        return 'UPLOADER_ERROR_EXTENSION';
+			if ($error === UPLOAD_ERR_EXTENSION) {
+				return 'UPLOADER_ERROR_EXTENSION';
+			}
 
 			# ------------------------
 
@@ -33,35 +47,49 @@ 
 
 		public static function save(string $name, string $dir_name) {
 
-			if ((false === ($file = Request::file($name))) || !is_uploaded_file($file['tmp_name'])) return false;
+			if ((false === ($file = Request::file($name))) || !is_uploaded_file($file['tmp_name'])) {
+				return false;
+			}
 
 			# Check for upload errors
 
-			if ($file['error'] !== UPLOAD_ERR_OK) return self::translateError($file['error']);
+			if ($file['error'] !== UPLOAD_ERR_OK) {
+				return self::translateError($file['error']);
+			}
 
 			# Check size
 
-			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) return 'UPLOADER_ERROR_SIZE';
+			if ($file['size'] > CONFIG_UPLOADS_MAX_SIZE) {
+				return 'UPLOADER_ERROR_SIZE';
+			}
 
 			# Check file extension
 
 			$extensions = ['php', 'phtml', 'php3', 'php4', 'php5', 'phps'];
 
-			if (in_array(Explorer::extension($file['name'], false), $extensions)) return 'UPLOADER_ERROR_TYPE';
+			if (in_array(Explorer::extension($file['name'], false), $extensions)) {
+				return 'UPLOADER_ERROR_TYPE';
+			}
 
 			# Check target directory
 
-			if (!Explorer::isDir($dir_name)) return 'UPLOADER_ERROR_DIR';
+			if (!Explorer::isDir($dir_name)) {
+				return 'UPLOADER_ERROR_DIR';
+			}
 
 			# Check target file
 
 			$file_name = ($dir_name . '/' . basename($file['name']));
 
-			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) return 'UPLOADER_ERROR_EXISTS';
+			if (Explorer::isDir($file_name) || Explorer::isFile($file_name)) {
+				return 'UPLOADER_ERROR_EXISTS';
+			}
 
 			# Save uploaded file
 
-			if (!@move_uploaded_file($file['tmp_name'], $file_name)) return 'UPLOADER_ERROR_SAVE';
+			if (!@move_uploaded_file($file['tmp_name'], $file_name)) {
+				return 'UPLOADER_ERROR_SAVE';
+			}
 
 			# ------------------------
 

www/engine/Main.php

Spacing +3 added lines, -3 removed lines

@@ -10,10 +10,10 @@
 
 # Define constants
 
-define('DIR_ENGINE',        (dirname(__FILE__) . '/'));
+define('DIR_ENGINE', (dirname(__FILE__) . '/'));
 
-define('DIR_WWW',           (DIR_ENGINE . '../'));
-define('DIR_UPLOADS',       (DIR_ENGINE . '../uploads/'));
+define('DIR_WWW', (DIR_ENGINE . '../'));
+define('DIR_UPLOADS', (DIR_ENGINE . '../uploads/'));
 
 # Require framework main file
 

Braces +22 added lines, -12 removed lines

@@ -2,7 +2,9 @@ 
 
 # Check PHP version
 
-if (version_compare(PHP_VERSION, '7.0.0') < 0) exit('PHP version 7 or higher is required.');
+if (version_compare(PHP_VERSION, '7.0.0') < 0) {
+	exit('PHP version 7 or higher is required.');
+}
 
 # Set error reporting
 
@@ -31,23 +33,31 @@ 
 
 	# Determine class path
 
-	if ($path[0] === 'System') $path = (DIR_SYSTEM_CLASSES . implode('/', array_slice($path, 1)));
-
-	else if ($path[0] === 'Plugins') $path = (DIR_SYSTEM_PLUGINS . implode('/', array_slice($path, 1)));
-
-	else $path = (DIR_CLASSES . implode('/', $path));
+	if ($path[0] === 'System') {
+		$path = (DIR_SYSTEM_CLASSES . implode('/', array_slice($path, 1)));
+	} else if ($path[0] === 'Plugins') {
+		$path = (DIR_SYSTEM_PLUGINS . implode('/', array_slice($path, 1)));
+	} else {
+		$path = (DIR_CLASSES . implode('/', $path));
+	}
 
 	# Require class file
 
-	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) require_once $file_name;
-
-	else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) require_once $file_name;
+	if (@file_exists($file_name = ($path . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	} else if (@file_exists($file_name = ($path . '/' . $last . '.php')) && @is_file($file_name)) {
+		require_once $file_name;
+	}
 
 	# Check if class exists
 
-	if (!class_exists($class_name) && !interface_exists($class_name) && !trait_exists($class_name)) throw new Exception\ClassLoad($class_name);
+	if (!class_exists($class_name) && !interface_exists($class_name) && !trait_exists($class_name)) {
+		throw new Exception\ClassLoad($class_name);
+	}
 
 	# Call autoload method
 
-	if (method_exists($class_name, '__autoload')) $class_name::__autoload();
-});
+	if (method_exists($class_name, '__autoload')) {
+		$class_name::__autoload();
+	}
+	});

www/engine/System/Main.php

Spacing +8 added lines, -8 removed lines

@@ -2,14 +2,14 @@
 
 # Define constants
 
-define('DIR_SYSTEM',                (dirname(__FILE__) . '/'));
-
-define('DIR_SYSTEM_CLASSES',        (DIR_SYSTEM . 'Classes/'));
-define('DIR_SYSTEM_DATA',           (DIR_SYSTEM . 'Data/'));
-define('DIR_SYSTEM_INCLUDES',       (DIR_SYSTEM . 'Includes/'));
-define('DIR_SYSTEM_LANGUAGES',      (DIR_SYSTEM . 'Languages/'));
-define('DIR_SYSTEM_PLUGINS',        (DIR_SYSTEM . 'Plugins/'));
-define('DIR_SYSTEM_TEMPLATES',      (DIR_SYSTEM . 'Templates/'));
+define('DIR_SYSTEM', (dirname(__FILE__) . '/'));
+
+define('DIR_SYSTEM_CLASSES', (DIR_SYSTEM . 'Classes/'));
+define('DIR_SYSTEM_DATA', (DIR_SYSTEM . 'Data/'));
+define('DIR_SYSTEM_INCLUDES', (DIR_SYSTEM . 'Includes/'));
+define('DIR_SYSTEM_LANGUAGES', (DIR_SYSTEM . 'Languages/'));
+define('DIR_SYSTEM_PLUGINS', (DIR_SYSTEM . 'Plugins/'));
+define('DIR_SYSTEM_TEMPLATES', (DIR_SYSTEM . 'Templates/'));
 
 # Require classes
 

www/engine/System/System.php

Braces +3 added lines, -1 removed lines

@@ -46,7 +46,9 @@
 
 			$system_file = (DIR_SYSTEM_DATA . 'System.json');
 
-			if (false !== ($data = Explorer::json($system_file))) $this->parse($data);
+			if (false !== ($data = Explorer::json($system_file))) {
+				$this->parse($data);
+			}
 		}
 	}
 }

www/engine/System/Classes/Handlers/Site/Page.php

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 
 				$condition = ("parent_id = " . $parent_id . " AND visibility = " . VISIBILITY_PUBLISHED . " ") .
 
-				             ("AND access <= " . $access . " AND name = '" . addslashes($name) . "'");
+							 ("AND access <= " . $access . " AND name = '" . addslashes($name) . "'");
 
 				if (!(DB::select(TABLE_PAGES, $selection, $condition, null, 1) && (DB::last()->rows === 1))) return false;
 

Braces +19 added lines, -7 removed lines

@@ -35,7 +35,9 @@ 
 
 				             ("AND access <= " . $access . " AND name = '" . addslashes($name) . "'");
 
-				if (!(DB::select(TABLE_PAGES, $selection, $condition, null, 1) && (DB::last()->rows === 1))) return false;
+				if (!(DB::select(TABLE_PAGES, $selection, $condition, null, 1) && (DB::last()->rows === 1))) {
+					return false;
+				}
 
 				$path[] = $page(...array_values(DB::last()->row()));
 			}
@@ -53,9 +55,11 @@ 
 
 			# Set breadcrumbs
 
-			if (count($this->path) <= 1) $contents->block('breadcrumbs')->disable();
-
-			else $contents->block('breadcrumbs')->path = $this->path;
+			if (count($this->path) <= 1) {
+				$contents->block('breadcrumbs')->disable();
+			} else {
+				$contents->block('breadcrumbs')->path = $this->path;
+			}
 
 			# Set contents
 
@@ -70,7 +74,9 @@ 
 
 		protected function handle() {
 
-			if (false === ($path = $this->getPath())) return false;
+			if (false === ($path = $this->getPath())) {
+				return false;
+			}
 
 			$this->path = $path;
 
@@ -78,11 +84,17 @@ 
 
 			$this->page = Entitizer::get(ENTITY_TYPE_PAGE, ($this->path ? end($this->path)['id'] : 1));
 
-			if (0 === $this->page->id) return false;
+			if (0 === $this->page->id) {
+				return false;
+			}
 
 			# Set data
 
-			if ($this->page->id !== 1) $this->title = $this->page->title; else $this->layout = 'Index';
+			if ($this->page->id !== 1) {
+				$this->title = $this->page->title;
+			} else {
+				$this->layout = 'Index';
+			}
 
 			$this->description      = $this->page->description;
 			$this->keywords         = $this->page->keywords;

www/engine/System/Classes/Handlers/Tools/Sitemap.php

Braces +12 added lines, -4 removed lines

@@ -12,7 +12,9 @@ 
 
 			$selection = 'MAX(time_modified) as last_modified';
 
-			if (!(DB::select(TABLE_PAGES, $selection) && (DB::last()->rows === 1))) return 0;
+			if (!(DB::select(TABLE_PAGES, $selection) && (DB::last()->rows === 1))) {
+				return 0;
+			}
 
 			# ------------------------
 
@@ -29,9 +31,13 @@ 
 
 			$condition = ['visibility' => VISIBILITY_PUBLISHED, 'access' => ACCESS_PUBLIC];
 
-			if (!(DB::select(TABLE_PAGES, 'id', $condition) && DB::last()->status)) return [];
+			if (!(DB::select(TABLE_PAGES, 'id', $condition) && DB::last()->status)) {
+				return [];
+			}
 
-			while (null !== ($page = DB::last()->row())) $pages[] = $page['id'];
+			while (null !== ($page = DB::last()->row())) {
+				$pages[] = $page['id'];
+			}
 
 			# Init pages
 
@@ -59,7 +65,9 @@ 
 
 			$last_modified = $this->getLastModified();
 
-			if ($sitemap->load($last_modified)) return $sitemap;
+			if ($sitemap->load($last_modified)) {
+				return $sitemap;
+			}
 
 			# Fill sitemap
 

www/engine/System/Classes/Dispatcher.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 
 			# Connect to database
 
-			DB::connect (
+			DB::connect(
 
 				$this->database['server'], $this->database['user'],
 

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
 

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';
+			}
 
 			# ------------------------