cadmium-org / cadmium-cms

www/engine/System/Classes/Modules/Entitizer/Definition/User/Session.php

Spacing +7 added lines, -7 removed lines

@@ -23,19 +23,19 @@
 
 			# Add params
 
-			$this->params->addTextual       ('code',                true, 40, true, '');
-			$this->params->addTextual       ('ip',                  true, 255, false, '');
-			$this->params->addInteger       ('time',                false, 10, true, 0);
+			$this->params->addTextual('code', true, 40, true, '');
+			$this->params->addTextual('ip', true, 255, false, '');
+			$this->params->addInteger('time', false, 10, true, 0);
 
 			# Add indexes
 
-			$this->indexes->add             ('code',                'UNIQUE');
-			$this->indexes->add             ('ip');
-			$this->indexes->add             ('time');
+			$this->indexes->add('code', 'UNIQUE');
+			$this->indexes->add('ip');
+			$this->indexes->add('time');
 
 			# Add foreign keys
 
-			$this->foreigns->add            ('id',                  TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
+			$this->foreigns->add('id', TABLE_USERS, 'id', 'CASCADE', 'RESTRICT');
 		}
 	}
 }

www/engine/System/Classes/Modules/Filemanager/Utils/Entity.php

Doc Comments +3 added lines, -3 removed lines

@@ -183,7 +183,7 @@ 
 		/**
 		 * Get the entity creation time
 		 *
-		 * @return int|false : the time or false on failure
+		 * @return null|integer : the time or false on failure
 		 */
 
 		public function getCreated() {
@@ -209,7 +209,7 @@ 
 		/**
 		 * Get the entity modification time
 		 *
-		 * @return int|false : the time or false on failure
+		 * @return null|integer : the time or false on failure
 		 */
 
 		public function getModified() {
@@ -235,7 +235,7 @@ 
 		/**
 		 * Get the entity size
 		 *
-		 * @return int|false : the size or false on failure
+		 * @return integer : the size or false on failure
 		 */
 
 		public function getSize() {

Spacing +2 added lines, -2 removed lines

@@ -27,9 +27,9 @@
 
 			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) return false;
 
-			$path = (($this->parent->getPath() ? ($this->parent->getPath() . '/') : '') . $name);
+			$path = (($this->parent->getPath() ? ($this->parent->getPath().'/') : '').$name);
 
-			$path_full = ($this->parent->getPathFull() . $name);
+			$path_full = ($this->parent->getPathFull().$name);
 
 			# ------------------------
 

Braces +72 added lines, -24 removed lines

@@ -23,9 +23,13 @@ 
 
 		private function getPrototype(string $name) {
 
-			if (('' === $name) || preg_match('/[\/\\\\]/', $name)) return false;
+			if (('' === $name) || preg_match('/[\/\\\\]/', $name)) {
+				return false;
+			}
 
-			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) return false;
+			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) {
+				return false;
+			}
 
 			$path = (($this->parent->getPath() ? ($this->parent->getPath() . '/') : '') . $name);
 
@@ -53,17 +57,23 @@ 
 
 		public function init(string $name) : bool {
 
-			if (false === ($prototype = $this->getPrototype($name))) return false;
+			if (false === ($prototype = $this->getPrototype($name))) {
+				return false;
+			}
 
 			# Check type
 
 			$type = Explorer::getType($prototype['path_full']);
 
-			if (!in_array($type, ['dir', 'file'], true)) return false;
+			if (!in_array($type, ['dir', 'file'], true)) {
+				return false;
+			}
 
 			# Set data
 
-			foreach ($prototype as $var => $value) $this->$var = $value;
+			foreach ($prototype as $var => $value) {
+				$this->$var = $value;
+			}
 
 			$this->type = $type;
 
@@ -81,9 +91,13 @@ 
 
 		public function check(string $name) : bool {
 
-			if (false === ($prototype = $this->getPrototype($name))) return false;
+			if (false === ($prototype = $this->getPrototype($name))) {
+				return false;
+			}
 
-			if (($name !== $this->name) && Explorer::exists($prototype['path_full'])) return false;
+			if (($name !== $this->name) && Explorer::exists($prototype['path_full'])) {
+				return false;
+			}
 
 			# ------------------------
 
@@ -98,19 +112,27 @@ 
 
 		public function create(string $name, string $type) : bool {
 
-			if (('' !== $this->name) || (false === ($prototype = $this->getPrototype($name)))) return false;
+			if (('' !== $this->name) || (false === ($prototype = $this->getPrototype($name)))) {
+				return false;
+			}
 
-			if (!in_array($type, ['dir', 'file'], true)) return false;
+			if (!in_array($type, ['dir', 'file'], true)) {
+				return false;
+			}
 
 			# Create entity
 
 			$create = (($type === 'dir') ? 'createDir' : 'createFile');
 
-			if (!Explorer::$create($prototype['path_full'])) return false;
+			if (!Explorer::$create($prototype['path_full'])) {
+				return false;
+			}
 
 			# Set data
 
-			foreach ($prototype as $var => $value) $this->$var = $value;
+			foreach ($prototype as $var => $value) {
+				$this->$var = $value;
+			}
 
 			$this->type = $type;
 
@@ -127,15 +149,21 @@ 
 
 		public function rename(string $name) : bool {
 
-			if (('' === $this->name) || (false === ($prototype = $this->getPrototype($name)))) return false;
+			if (('' === $this->name) || (false === ($prototype = $this->getPrototype($name)))) {
+				return false;
+			}
 
 			# Rename entity
 
-			if (!Explorer::rename($this->path_full, $prototype['path_full'])) return false;
+			if (!Explorer::rename($this->path_full, $prototype['path_full'])) {
+				return false;
+			}
 
 			# Set data
 
-			foreach ($prototype as $var => $value) $this->$var = $value;
+			foreach ($prototype as $var => $value) {
+				$this->$var = $value;
+			}
 
 			# ------------------------
 
@@ -150,13 +178,17 @@ 
 
 		public function remove() : bool {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			# Remove entity
 
 			$remove = (($this->type === 'dir') ? 'removeDir' : 'removeFile');
 
-			if (!Explorer::$remove($this->path_full, true)) return false;
+			if (!Explorer::$remove($this->path_full, true)) {
+				return false;
+			}
 
 			# Reset data
 
@@ -175,7 +207,9 @@ 
 
 		public function getExtension() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return strtolower(Explorer::getExtension($this->name, false));
 		}
@@ -188,7 +222,9 @@ 
 
 		public function getCreated() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getCreated($this->path_full);
 		}
@@ -201,7 +237,9 @@ 
 
 		public function getAccessed() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getAccessed($this->path_full);
 		}
@@ -214,7 +252,9 @@ 
 
 		public function getModified() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getModified($this->path_full);
 		}
@@ -227,7 +267,9 @@ 
 
 		public function getPermissions() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getPermissions($this->path_full);
 		}
@@ -240,7 +282,9 @@ 
 
 		public function getSize() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getSize($this->path_full);
 		}
@@ -253,7 +297,9 @@ 
 
 		public function getContents() {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::getContents($this->path_full);
 		}
@@ -266,7 +312,9 @@ 
 
 		public function putContents(string $contents) {
 
-			if ('' === $this->name) return false;
+			if ('' === $this->name) {
+				return false;
+			}
 
 			return Explorer::putContents($this->path_full, $contents);
 		}

www/engine/System/Includes/Constants.php

Spacing +33 added lines, -33 removed lines

@@ -9,64 +9,64 @@
 
 # Cadmium
 
-define('CADMIUM_NAME',                              'Cadmium CMS');
-define('CADMIUM_HOME',                              'http://cadmium-cms.com');
+define('CADMIUM_NAME', 'Cadmium CMS');
+define('CADMIUM_HOME', 'http://cadmium-cms.com');
 
-define('CADMIUM_VERSION',                           '0.4.6');
-define('CADMIUM_COPY',                              '2017');
+define('CADMIUM_VERSION', '0.4.6');
+define('CADMIUM_COPY', '2017');
 
 # Third-party
 
-define('JQUERY_VERSION',                            '3.2.1');
-define('SEMANTIC_UI_VERSION',                       '2.2.10');
-define('CKEDITOR_VERSION',                          '4.6.2');
-define('ACE_VERSION',                               '1.2.6');
+define('JQUERY_VERSION', '3.2.1');
+define('SEMANTIC_UI_VERSION', '2.2.10');
+define('CKEDITOR_VERSION', '4.6.2');
+define('ACE_VERSION', '1.2.6');
 
 # Sections
 
-define('SECTION_SITE',                              'site');
-define('SECTION_ADMIN',                             'admin');
+define('SECTION_SITE', 'site');
+define('SECTION_ADMIN', 'admin');
 
 # Access
 
-define('ACCESS_PUBLIC',                             0);
-define('ACCESS_REGISTERED',                         1);
-define('ACCESS_ADMINISTRATOR',                      2);
+define('ACCESS_PUBLIC', 0);
+define('ACCESS_REGISTERED', 1);
+define('ACCESS_ADMINISTRATOR', 2);
 
 # Frequency
 
-define('FREQUENCY_ALWAYS',                          'always');
-define('FREQUENCY_HOURLY',                          'hourly');
-define('FREQUENCY_DAILY',                           'daily');
-define('FREQUENCY_WEEKLY',                          'weekly');
-define('FREQUENCY_MONTHLY',                         'monthly');
-define('FREQUENCY_YEARLY',                          'yearly');
-define('FREQUENCY_NEVER',                           'never');
+define('FREQUENCY_ALWAYS', 'always');
+define('FREQUENCY_HOURLY', 'hourly');
+define('FREQUENCY_DAILY', 'daily');
+define('FREQUENCY_WEEKLY', 'weekly');
+define('FREQUENCY_MONTHLY', 'monthly');
+define('FREQUENCY_YEARLY', 'yearly');
+define('FREQUENCY_NEVER', 'never');
 
 # Rank
 
-define('RANK_GUEST',                                0);
-define('RANK_USER',                                 1);
-define('RANK_ADMINISTRATOR',                        2);
+define('RANK_GUEST', 0);
+define('RANK_USER', 1);
+define('RANK_ADMINISTRATOR', 2);
 
 # Sex
 
-define('SEX_NOT_SELECTED',                          0);
-define('SEX_MALE',                                  1);
-define('SEX_FEMALE',                                2);
+define('SEX_NOT_SELECTED', 0);
+define('SEX_MALE', 1);
+define('SEX_FEMALE', 2);
 
 # Status
 
-define('STATUS_ONLINE',                             0);
-define('STATUS_MAINTENANCE',                        1);
-define('STATUS_UPDATE',                             2);
+define('STATUS_ONLINE', 0);
+define('STATUS_MAINTENANCE', 1);
+define('STATUS_UPDATE', 2);
 
 # Target
 
-define('TARGET_SELF',                               0);
-define('TARGET_BLANK',                              1);
+define('TARGET_SELF', 0);
+define('TARGET_BLANK', 1);
 
 # Visibility
 
-define('VISIBILITY_DRAFT',                          0);
-define('VISIBILITY_PUBLISHED',                      1);
+define('VISIBILITY_DRAFT', 0);
+define('VISIBILITY_PUBLISHED', 1);

www/engine/System/Classes/Modules/Filemanager/Controller/Rename.php

Braces +12 added lines, -4 removed lines

@@ -44,19 +44,27 @@
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
-			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) return ['name', 'FILEMANAGER_ERROR_HIDDEN'];
+			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) {
+				return ['name', 'FILEMANAGER_ERROR_HIDDEN'];
+			}
 
 			# Check if name is used
 
-			if (!$this->entity->check($name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (!$this->entity->check($name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Rename entity
 
-			if (!$this->entity->rename($name)) return (($this->entity->getType() === 'dir') ?
+			if (!$this->entity->rename($name)) {
+				return (($this->entity->getType() === 'dir') ?
 
 				'FILEMANAGER_ERROR_DIR_RENAME' : 'FILEMANAGER_ERROR_FILE_RENAME');
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Edit.php

Braces +3 added lines, -1 removed lines

@@ -44,7 +44,9 @@
 
 			# Rename item
 
-			if (false === $this->entity->putContents($contents)) return 'FILEMANAGER_ERROR_FILE_EDIT';
+			if (false === $this->entity->putContents($contents)) {
+				return 'FILEMANAGER_ERROR_FILE_EDIT';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Controller/Create.php

Braces +12 added lines, -4 removed lines

@@ -44,9 +44,13 @@ 
 
 			# Validate name
 
-			if (false === ($name = Validate::fileName($name))) return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			if (false === ($name = Validate::fileName($name))) {
+				return ['name', 'FILEMANAGER_ERROR_NAME_INVALID'];
+			}
 
-			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) return ['name', 'FILEMANAGER_ERROR_HIDDEN'];
+			if ($this->parent->isIgnoreHidden() && preg_match('/^\./', $name)) {
+				return ['name', 'FILEMANAGER_ERROR_HIDDEN'];
+			}
 
 			# Get entity
 
@@ -54,11 +58,15 @@ 
 
 			# Check if name is used
 
-			if (!$entity->check($name)) return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			if (!$entity->check($name)) {
+				return ['name', 'FILEMANAGER_ERROR_EXISTS'];
+			}
 
 			# Create entity
 
-			if (!$entity->create($name, 'dir')) return 'FILEMANAGER_ERROR_DIR_CREATE';
+			if (!$entity->create($name, 'dir')) {
+				return 'FILEMANAGER_ERROR_DIR_CREATE';
+			}
 
 			# ------------------------
 

www/engine/System/Classes/Modules/Filemanager/Container/Addons.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 
 		use Filemanager\Common\Addons;
 
-		protected $path_full = (DIR_SYSTEM_CLASSES . 'Addons/');
+		protected $path_full = (DIR_SYSTEM_CLASSES.'Addons/');
 	}
 }

www/engine/System/Classes/Modules/Filemanager/Container/Templates.php

Spacing +1 added lines, -1 removed lines

@@ -15,6 +15,6 @@
 
 		use Filemanager\Common\Templates;
 
-		protected $path_full = (DIR_SYSTEM_TEMPLATES . SECTION_SITE . '/');
+		protected $path_full = (DIR_SYSTEM_TEMPLATES.SECTION_SITE.'/');
 	}
 }

www/engine/System/Classes/Modules/Filemanager/Utils/Lister.php

Spacing +6 added lines, -6 removed lines

@@ -28,9 +28,9 @@ 
 
 			# Set link
 
-			$query = (('' !== $this->parent->getPath()) ? ('?parent=' . $this->parent->getPath()) : '');
+			$query = (('' !== $this->parent->getPath()) ? ('?parent='.$this->parent->getPath()) : '');
 
-			$bar->link = (INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$bar->link = (INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# Implement form
 
@@ -45,9 +45,9 @@ 
 
 		private function getPaginationBlock() {
 
-			$query = (('' !== $this->parent->getPath()) ? ('?parent=' . $this->parent->getPath()) : '');
+			$query = (('' !== $this->parent->getPath()) ? ('?parent='.$this->parent->getPath()) : '');
 
-			$url = new Url(INSTALL_PATH . '/admin/content/filemanager' . $query);
+			$url = new Url(INSTALL_PATH.'/admin/content/filemanager'.$query);
 
 			# ------------------------
 
@@ -148,9 +148,9 @@ 
 
 			if (isset($submitted)) {
 
-				Request::redirect(INSTALL_PATH . '/admin/content/filemanager/' . static::$origin . '?' . (('' !==
+				Request::redirect(INSTALL_PATH.'/admin/content/filemanager/'.static::$origin.'?'.(('' !==
 
-					($parent = $this->parent->getPath())) ? ('parent=' . $parent . '&') : '') . 'submitted=' . $submitted);
+					($parent = $this->parent->getPath())) ? ('parent='.$parent.'&') : '').'submitted='.$submitted);
 			}
 
 			# Display success message

Braces +27 added lines, -13 removed lines

@@ -64,7 +64,9 @@ 
 
 			# Set parent
 
-			if (!$ajax) $contents->parent = $this->parent->getPath();
+			if (!$ajax) {
+				$contents->parent = $this->parent->getPath();
+			}
 
 			# Set origin and title
 
@@ -76,7 +78,9 @@ 
 
 			# Process bar
 
-			if (!$ajax) $this->processBar($contents->getBlock('bar'));
+			if (!$ajax) {
+				$this->processBar($contents->getBlock('bar'));
+			}
 
 			# Set items
 
@@ -84,14 +88,18 @@ 
 
 			foreach ($this->loader->getItems() as $entity) {
 
-				if ($entity->isDir()) $items->addItem(Lister\Dir::getBlock($entity, $ajax));
-
-				else $items->addItem(Lister\File::getBlock($entity, $ajax));
+				if ($entity->isDir()) {
+					$items->addItem(Lister\Dir::getBlock($entity, $ajax));
+				} else {
+					$items->addItem(Lister\File::getBlock($entity, $ajax));
+				}
 			}
 
 			# Set pagination
 
-			if (!$ajax) $contents->pagination = $this->getPaginationBlock();
+			if (!$ajax) {
+				$contents->pagination = $this->getPaginationBlock();
+			}
 
 			# ------------------------
 
@@ -127,7 +135,9 @@ 
 
 		protected function handle(bool $ajax = false) {
 
-			if ($ajax) return $this->handleAjax();
+			if ($ajax) {
+				return $this->handleAjax();
+			}
 
 			# Create parent
 
@@ -141,9 +151,11 @@ 
 
 			if (static::$permissions['manage']) {
 
-				if (Uploader::submit('upload', $this->parent->getPathFull())) $submitted = 'upload';
-
-				else if ($this->form->handle(new Filemanager\Controller\Create($this->parent), true)) $submitted = 'create';
+				if (Uploader::submit('upload', $this->parent->getPathFull())) {
+					$submitted = 'upload';
+				} else if ($this->form->handle(new Filemanager\Controller\Create($this->parent), true)) {
+					$submitted = 'create';
+				}
 			}
 
 			if (isset($submitted)) {
@@ -155,9 +167,11 @@ 
 
 			# Display success message
 
-			if (Request::get('submitted') === 'upload') Popup::set('positive', Language::get('FILEMANAGER_SUCCESS_UPLOAD'));
-
-			else if (Request::get('submitted') === 'create') Popup::set('positive', Language::get('FILEMANAGER_SUCCESS_DIR_CREATE'));
+			if (Request::get('submitted') === 'upload') {
+				Popup::set('positive', Language::get('FILEMANAGER_SUCCESS_UPLOAD'));
+			} else if (Request::get('submitted') === 'create') {
+				Popup::set('positive', Language::get('FILEMANAGER_SUCCESS_DIR_CREATE'));
+			}
 
 			# Load items