cadmium-org / cadmium-cms

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

Braces +21 added lines, -7 removed lines

@@ -16,9 +16,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
 
@@ -41,19 +43,31 @@ 
 
 			$slug = implode('/', $this->url->path());
 
-			if ('' !== $slug) $this->page->initBySlug($slug); else $this->page->init(1);
+			if ('' !== $slug) {
+				$this->page->initBySlug($slug);
+			} else {
+				$this->page->init(1);
+			}
 
 			# Display error if not found
 
-			if (0 === $this->page->id) return false;
+			if (0 === $this->page->id) {
+				return false;
+			}
 
 			# Get path
 
-			if (false !== ($path = $this->page->path())) $this->path = $path;
+			if (false !== ($path = $this->page->path())) {
+				$this->path = $path;
+			}
 
 			# 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/Modules/Entitizer/Form/Menuitem.php

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

@@ -2,7 +2,9 @@
 
 namespace Modules\Entitizer\Form {
 
-	use Modules\Entitizer, Utils\Form, Utils\Range;
+	use Modules\Entitizer;
+	use Utils\Form;
+	use Utils\Range;
 
 	class Page extends Form {
 

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

Spacing +7 added lines, -7 removed lines

@@ -14,19 +14,19 @@
 
 			# Add params
 
-			$this->params->textual      ('code',                true, 40, true, '');
-			$this->params->textual      ('ip',                  true, 255, false, '');
-			$this->params->integer      ('time',                false, 10, true, 0);
+			$this->params->textual('code', true, 40, true, '');
+			$this->params->textual('ip', true, 255, false, '');
+			$this->params->integer('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/Framework/Classes/Config/Config.php

Braces +14 added lines, -10 removed lines

@@ -10,7 +10,9 @@ 
 
 		public function add(string $name, $default, callable $handler) {
 
-			if ('' === $name) return;
+			if ('' === $name) {
+				return;
+			}
 
 			$this->config[$name] = $handler; $this->values[$name] = null;
 
@@ -23,11 +25,11 @@ 
 
 			foreach ($data as $name => $value) {
 
-				if (!isset($this->config[$name])) continue;
-
-				try { $this->values[$name] = $this->config[$name]($value); }
+				if (!isset($this->config[$name])) {
+					continue;
+				}
 
-				catch (\TypeError $e) { /* Ignore setting value of illegal type */ }
+				try { $this->values[$name] = $this->config[$name]($value); } catch (\TypeError $e) { /* Ignore setting value of illegal type */ }
 			}
 		}
 
@@ -39,11 +41,11 @@ 
 
 			foreach ($this->config as $name => $handler) {
 
-				if (!($isset = isset($data[$name])) && !$process_all) continue;
+				if (!($isset = isset($data[$name])) && !$process_all) {
+					continue;
+				}
 
-				try { $cast[$name] = ($isset ? $handler($data[$name]) : $this->values[$name]); }
-
-				catch (\TypeError $e) { $cast[$name] = $this->values[$name]; }
+				try { $cast[$name] = ($isset ? $handler($data[$name]) : $this->values[$name]); } catch (\TypeError $e) { $cast[$name] = $this->values[$name]; }
 			}
 
 			# ------------------------
@@ -55,7 +57,9 @@ 
 
 		public function get(string $name = null) {
 
-			if (null === $name) return $this->values;
+			if (null === $name) {
+				return $this->values;
+			}
 
 			return ($this->values[$name] ?? null);
 		}

www/engine/System/Includes/Constants.php

Spacing +34 added lines, -34 removed lines

@@ -2,68 +2,68 @@
 
 # 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.3.0');
-define('CADMIUM_COPY',                              '2016');
+define('CADMIUM_VERSION', '0.3.0');
+define('CADMIUM_COPY', '2016');
 
 # External
 
-define('JQUERY_VERSION',                            '2.2.3');
-define('SEMANTIC_UI_VERSION',                       '2.1.8');
-define('CKEDITOR_VERSION',                          '4.5.8');
+define('JQUERY_VERSION', '2.2.3');
+define('SEMANTIC_UI_VERSION', '2.1.8');
+define('CKEDITOR_VERSION', '4.5.8');
 
 # Sections
 
-define('SECTION_ADMIN',                             'Admin');
-define('SECTION_SITE',                              'Site');
+define('SECTION_ADMIN', 'Admin');
+define('SECTION_SITE', 'Site');
 
 # Filemanager types
 
-define('FILEMANAGER_TYPE_DIR',                      'dir');
-define('FILEMANAGER_TYPE_FILE',                     'file');
+define('FILEMANAGER_TYPE_DIR', 'dir');
+define('FILEMANAGER_TYPE_FILE', 'file');
 
 # 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/Entitizer/Utils/Collection.php

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

@@ -2,7 +2,8 @@
 
 namespace Modules\Entitizer\Utils {
 
-	use Modules\Entitizer, Config;
+	use Modules\Entitizer;
+	use Config;
 
 	abstract class View {
 

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.'.$field);
 
 			# ------------------------
 
@@ -45,7 +45,7 @@ 
 
 			$order_by = [];
 
-			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.' . $field . ' ' . $direction);
+			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.'.$field.' '.$direction);
 
 			# ------------------------
 

Braces +9 added lines, -3 removed lines

@@ -16,7 +16,9 @@ 
 
 			foreach ($data as $field => $direction) {
 
-				if (false === ($param = $this->definition->param($field))) continue;
+				if (false === ($param = $this->definition->param($field))) {
+					continue;
+				}
 
 				$order_by[$param->name] = ((strtoupper($direction) !== 'DESC') ? 'ASC' : 'DESC');
 			}
@@ -32,7 +34,9 @@ 
 
 			$selection = [];
 
-			foreach ($this->definition->paramsSecure() as $field) $selection[] = ('ent.' . $field);
+			foreach ($this->definition->paramsSecure() as $field) {
+				$selection[] = ('ent.' . $field);
+			}
 
 			# ------------------------
 
@@ -45,7 +49,9 @@ 
 
 			$order_by = [];
 
-			foreach ($this->castOrderBy($data) as $field => $direction) $order_by[] = ('ent.' . $field . ' ' . $direction);
+			foreach ($this->castOrderBy($data) as $field => $direction) {
+				$order_by[] = ('ent.' . $field . ' ' . $direction);
+			}
 
 			# ------------------------
 

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;
+			}
 
 			# ------------------------
 
@@ -27,11 +29,15 @@ 
 
 			$condition = ['visibility' => VISIBILITY_PUBLISHED, 'access' => ACCESS_PUBLIC, 'locked' => 0];
 
-			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::last()->status)) return;
+			if (!(DB::select(TABLE_PAGES, $selection, $condition, 'slug') && DB::last()->status)) {
+				return;
+			}
 
 			# ------------------------
 
-			while (null !== ($page = DB::last()->row())) yield Entitizer::dataset(TABLE_PAGES, $page);
+			while (null !== ($page = DB::last()->row())) {
+				yield Entitizer::dataset(TABLE_PAGES, $page);
+			}
 		}
 
 		# Handle request
@@ -44,7 +50,9 @@ 
 
 			# Get last modification time
 
-			if ($sitemap->load($this->getLastModified())) return $sitemap;
+			if ($sitemap->load($this->getLastModified())) {
+				return $sitemap;
+			}
 
 			# Fill sitemap
 

www/engine/System/Classes/Modules/Entitizer/Dataset/Page.php

Spacing +5 added lines, -5 removed lines

@@ -12,23 +12,23 @@
 
 		protected function init() {
 
-			$this->addHandler('active', function (array $data) {
+			$this->addHandler('active', function(array $data) {
 
 				return (($data['visibility'] === VISIBILITY_PUBLISHED) && !$data['locked']);
 			});
 
-			$this->addHandler('link', function (array $data) {
+			$this->addHandler('link', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
-				return (INSTALL_PATH . '/' . $data['slug']);
+				return (INSTALL_PATH.'/'.$data['slug']);
 			});
 
-			$this->addHandler('canonical', function (array $data) {
+			$this->addHandler('canonical', function(array $data) {
 
 				if ('' === $data['slug']) return '';
 
-				return (Settings::get('system_url') . (($data['id'] !== 1) ? ('/' . $data['slug']) : ''));
+				return (Settings::get('system_url').(($data['id'] !== 1) ? ('/'.$data['slug']) : ''));
 			});
 		}
 	}

Braces +6 added lines, -2 removed lines

@@ -19,14 +19,18 @@
 
 			$this->addHandler('link', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
 				return (INSTALL_PATH . '/' . $data['slug']);
 			});
 
 			$this->addHandler('canonical', function (array $data) {
 
-				if ('' === $data['slug']) return '';
+				if ('' === $data['slug']) {
+					return '';
+				}
 
 				return (Settings::get('system_url') . (($data['id'] !== 1) ? ('/' . $data['slug']) : ''));
 			});

www/engine/System/Classes/Modules/Entitizer/Dataset/User.php

Spacing +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 
 		protected function init() {
 
-			$this->addHandler('full_name', function (array $data) {
+			$this->addHandler('full_name', function(array $data) {
 
-				return trim($data['first_name'] . ' ' . $data['last_name']);
+				return trim($data['first_name'].' '.$data['last_name']);
 			});
 		}
 	}