Inspection of "Merge branch 'doc'" - cadmium-org/cadmium-cms - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#12)

by Anton

created 2016-11-18 15:26 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -14,7 +14,7 @@
 block discarded – undo
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
+			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH.'/admin');
 
 			# Handle request
 

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -14,11 +14,15 @@
 block discarded – undo
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
+			if (Modules\Auth::check()) {
+				Request::redirect(INSTALL_PATH . '/admin');
+			}
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_401);
+			if (Template::isBlock($result = $this->handle())) {
+				return $this->displayPage($result, STATUS_CODE_401);
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@
 block discarded – undo
 
 			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

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,9 +19,13 @@
 block discarded – undo
 
 			# 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);
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

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

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
 
 		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 @@  discard block
 block discarded – undo
 
 		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 @@  discard block
 block discarded – undo
 
 			# Set title
 
-			$page->title = ((('' !== $this->title) ? (Language::get($this->title) . ' | ') : '') . CADMIUM_NAME);
+			$page->title = ((('' !== $this->title) ? (Language::get($this->title).' | ') : '').CADMIUM_NAME);
 
 			# Set layout
 

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -111,7 +111,9 @@
 block discarded – undo
 
 				$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();
+				}
 			}
 
 			# ------------------------

Please login to merge, or discard this patch.

www/engine/System/Classes/Frames/Site/Area/Common.php 1 patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -12,7 +12,9 @@
 block discarded – undo
 
 			# 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);
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Frames/Site/Area/Auth.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@
 block discarded – undo
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/profile');
+			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH.'/profile');
 
 			# Handle request
 

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -12,11 +12,15 @@
 block discarded – undo
 
 			# Check auth
 
-			if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/profile');
+			if (Modules\Auth::check()) {
+				Request::redirect(INSTALL_PATH . '/profile');
+			}
 
 			# Handle request
 
-			if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_401);
+			if (Template::isBlock($result = $this->handle())) {
+				return $this->displayPage($result, STATUS_CODE_401);
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Frames/Site/Area/Authorized.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -19,9 +19,13 @@
 block discarded – undo
 
 			# 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);
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Frames/Site/Section.php 2 patches

Spacing +5 added lines, -9 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
 
 		private function getLayout(Template\Block $contents) {
 
-			$layout = View::get('Layouts/' . $this->layout);
+			$layout = View::get('Layouts/'.$this->layout);
 
 			# Create layout components
 
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 
 				$layout->getBlock('user')->enable();
 
-				$layout->getBlock('user')->gravatar = Auth::user()->gravatar;;
+				$layout->getBlock('user')->gravatar = Auth::user()->gravatar; ;
 
 				$layout->getBlock('user')->name = Auth::user()->name;
 
@@ -50,9 +50,7 @@  discard block
 block discarded – undo
 
 			# Set title
 
-			$layout->title = (('' !== SEO::title()) ? SEO::title() :
-
-				(('' !== $this->title) ? Language::get($this->title) : Settings::get('site_title')));
+			$layout->title = (('' !== SEO::title()) ? SEO::title() : (('' !== $this->title) ? Language::get($this->title) : Settings::get('site_title')));
 
 			# Set slogan
 
@@ -95,13 +93,11 @@  discard block
 block discarded – undo
 
 			$page->keywords = ('' !== SEO::keywords()) ? SEO::keywords() : Settings::get('site_keywords');
 
-			$page->robots = ((SEO::robotsIndex() ? 'INDEX' : 'NOINDEX') . ',' . (SEO::robotsFollow() ? 'FOLLOW' : 'NOFOLLOW'));
+			$page->robots = ((SEO::robotsIndex() ? 'INDEX' : 'NOINDEX').','.(SEO::robotsFollow() ? 'FOLLOW' : 'NOFOLLOW'));
 
 			# Set title
 
-			$page->title = (('' !== SEO::title()) ? SEO::title() :
-
-				((('' !== $this->title) ? (Language::get($this->title) . ' | ') : '') . Settings::get('site_title')));
+			$page->title = (('' !== SEO::title()) ? SEO::title() : ((('' !== $this->title) ? (Language::get($this->title).' | ') : '').Settings::get('site_title')));
 
 			# Set canonical
 

Please login to merge, or discard this patch.

Braces +20 added lines, -8 removed lines patch added patch discarded remove patch

@@ -45,7 +45,9 @@  discard block
 block discarded – undo
 
 				$layout->getBlock('auth')->disable();
 
-				if (Auth::user()->rank === RANK_ADMINISTRATOR) $layout->getBlock('admin')->enable();
+				if (Auth::user()->rank === RANK_ADMINISTRATOR) {
+					$layout->getBlock('admin')->enable();
+				}
 			}
 
 			# Set title
@@ -105,9 +107,11 @@  discard block
 block discarded – undo
 
 			# Set canonical
 
-			if ('' === SEO::canonical()) $page->getBlock('canonical')->disable();
-
-			else $page->getBlock('canonical')->link = SEO::canonical();
+			if ('' === SEO::canonical()) {
+				$page->getBlock('canonical')->disable();
+			} else {
+				$page->getBlock('canonical')->link = SEO::canonical();
+			}
 
 			# Set layout
 
@@ -119,9 +123,13 @@  discard block
 block discarded – undo
 
 			# Set global components
 
-			foreach (Variables::generate() as $name => $value) Template::setGlobal($name, $value);
+			foreach (Variables::generate() as $name => $value) {
+				Template::setGlobal($name, $value);
+			}
 
-			foreach (Widgets::generate() as $name => $block) Template::setWidget($name, $block);
+			foreach (Widgets::generate() as $name => $block) {
+				Template::setWidget($name, $block);
+			}
 
 			# ------------------------
 
@@ -134,9 +142,13 @@  discard block
 block discarded – undo
 
 			# Check site status
 
-			if (Settings::get('site_status') === STATUS_MAINTENANCE) return Status::maintenance();
+			if (Settings::get('site_status') === STATUS_MAINTENANCE) {
+				return Status::maintenance();
+			}
 
-			if (Settings::get('site_status') === STATUS_UPDATE) return Status::update();
+			if (Settings::get('site_status') === STATUS_UPDATE) {
+				return Status::update();
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Frames/Section.php 2 patches

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -36,22 +36,22 @@
 block discarded – undo
 
 			foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
 
-				Language::load($path . 'Phrases/' . $name . '.php');
+				Language::load($path.'Phrases/'.$name.'.php');
 			}
 
 			# Set template globals
 
-			Template::setGlobal('template_name',    strtolower(Extend\Templates::active()));
+			Template::setGlobal('template_name', strtolower(Extend\Templates::active()));
 
-			Template::setGlobal('site_title',       Settings::get('site_title'));
+			Template::setGlobal('site_title', Settings::get('site_title'));
 
-			Template::setGlobal('system_url',       Settings::get('system_url'));
+			Template::setGlobal('system_url', Settings::get('system_url'));
 
-			Template::setGlobal('system_email',     Settings::get('system_email'));
+			Template::setGlobal('system_email', Settings::get('system_email'));
 
-			Template::setGlobal('install_path',     INSTALL_PATH);
+			Template::setGlobal('install_path', INSTALL_PATH);
 
-			Template::setGlobal('index_page',       (('' !== INSTALL_PATH) ? INSTALL_PATH : '/'));
+			Template::setGlobal('index_page', (('' !== INSTALL_PATH) ? INSTALL_PATH : '/'));
 
 			# Init utils
 

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -34,10 +34,12 @@  discard block
 block discarded – undo
 
 			$phrases = array_merge(static::PHRASES, array_keys(Extend\Addons::items() ?? []));
 
-			foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
+			foreach (array_unique($languages) as $path) {
+				foreach ($phrases as $name) {
 
 				Language::load($path . 'Phrases/' . $name . '.php');
 			}
+			}
 
 			# Set template globals
 
@@ -59,7 +61,9 @@  discard block
 block discarded – undo
 
 			# Set timezone
 
-			if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) date_default_timezone_set($timezone);
+			if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) {
+				date_default_timezone_set($timezone);
+			}
 
 			# ------------------------
 

Please login to merge, or discard this patch.

www/engine/System/Classes/Utils/Form.php 1 patch

Braces +14 added lines, -4 removed lines patch added patch discarded remove patch

@@ -12,7 +12,11 @@  discard block
 block discarded – undo
 
 			$text = Language::get($code);
 
-			if (!$popup) Messages::set('error', $text); else Popup::set('negative', $text);
+			if (!$popup) {
+				Messages::set('error', $text);
+			} else {
+				Popup::set('negative', $text);
+			}
 
 			# ------------------------
 
@@ -23,15 +27,21 @@  discard block
 block discarded – undo
 
 		public function handle(callable $callback, bool $popup = false) {
 
-			if (false === ($post = $this->post())) return false;
+			if (false === ($post = $this->post())) {
+				return false;
+			}
 
 			# Check form for errors
 
-			if ($this->hasErrors()) return $this->displayError('FORM_ERROR_REQUIRED', $popup);
+			if ($this->hasErrors()) {
+				return $this->displayError('FORM_ERROR_REQUIRED', $popup);
+			}
 
 			# Call controller method
 
-			if (is_string($result = $callback($post))) return $this->displayError($result, $popup);
+			if (is_string($result = $callback($post))) {
+				return $this->displayError($result, $popup);
+			}
 
 			if (is_array($result)) { $this->getField($result[0])->error = true; return $this->displayError($result[1], $popup); }
 

Please login to merge, or discard this patch.

		@@ -111,7 +111,9 @@
		block discarded – undo
111	111
112	112	$ips = preg_split('/ +/', CONFIG_ADMIN_IP, -1, PREG_SPLIT_NO_EMPTY);
113	113
114		- if (!in_array(REQUEST_CLIENT_IP, $ips, true)) return Status::error404();
	114	+ if (!in_array(REQUEST_CLIENT_IP, $ips, true)) {
	115	+ return Status::error404();
	116	+ }
115	117	}
116	118
117	119	# ------------------------

		@@ -45,7 +45,9 @@ discard block
		block discarded – undo
45	45
46	46	$layout->getBlock('auth')->disable();
47	47
48		- if (Auth::user()->rank === RANK_ADMINISTRATOR) $layout->getBlock('admin')->enable();
	48	+ if (Auth::user()->rank === RANK_ADMINISTRATOR) {
	49	+ $layout->getBlock('admin')->enable();
	50	+ }
49	51	}
50	52
51	53	# Set title
		@@ -105,9 +107,11 @@ discard block
		block discarded – undo
105	107
106	108	# Set canonical
107	109
108		- if ('' === SEO::canonical()) $page->getBlock('canonical')->disable();
109		-
110		- else $page->getBlock('canonical')->link = SEO::canonical();
	110	+ if ('' === SEO::canonical()) {
	111	+ $page->getBlock('canonical')->disable();
	112	+ } else {
	113	+ $page->getBlock('canonical')->link = SEO::canonical();
	114	+ }
111	115
112	116	# Set layout
113	117
		@@ -119,9 +123,13 @@ discard block
		block discarded – undo
119	123
120	124	# Set global components
121	125
122		- foreach (Variables::generate() as $name => $value) Template::setGlobal($name, $value);
	126	+ foreach (Variables::generate() as $name => $value) {
	127	+ Template::setGlobal($name, $value);
	128	+ }
123	129
124		- foreach (Widgets::generate() as $name => $block) Template::setWidget($name, $block);
	130	+ foreach (Widgets::generate() as $name => $block) {
	131	+ Template::setWidget($name, $block);
	132	+ }
125	133
126	134	# ------------------------
127	135
		@@ -134,9 +142,13 @@ discard block
		block discarded – undo
134	142
135	143	# Check site status
136	144
137		- if (Settings::get('site_status') === STATUS_MAINTENANCE) return Status::maintenance();
	145	+ if (Settings::get('site_status') === STATUS_MAINTENANCE) {
	146	+ return Status::maintenance();
	147	+ }
138	148
139		- if (Settings::get('site_status') === STATUS_UPDATE) return Status::update();
	149	+ if (Settings::get('site_status') === STATUS_UPDATE) {
	150	+ return Status::update();
	151	+ }
140	152
141	153	# ------------------------
142	154

		@@ -36,22 +36,22 @@
		block discarded – undo
36	36
37	37	foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
38	38
39		- Language::load($path . 'Phrases/' . $name . '.php');
	39	+ Language::load($path.'Phrases/'.$name.'.php');
40	40	}
41	41
42	42	# Set template globals
43	43
44		- Template::setGlobal('template_name', strtolower(Extend\Templates::active()));
	44	+ Template::setGlobal('template_name', strtolower(Extend\Templates::active()));
45	45
46		- Template::setGlobal('site_title', Settings::get('site_title'));
	46	+ Template::setGlobal('site_title', Settings::get('site_title'));
47	47
48		- Template::setGlobal('system_url', Settings::get('system_url'));
	48	+ Template::setGlobal('system_url', Settings::get('system_url'));
49	49
50		- Template::setGlobal('system_email', Settings::get('system_email'));
	50	+ Template::setGlobal('system_email', Settings::get('system_email'));
51	51
52		- Template::setGlobal('install_path', INSTALL_PATH);
	52	+ Template::setGlobal('install_path', INSTALL_PATH);
53	53
54		- Template::setGlobal('index_page', (('' !== INSTALL_PATH) ? INSTALL_PATH : '/'));
	54	+ Template::setGlobal('index_page', (('' !== INSTALL_PATH) ? INSTALL_PATH : '/'));
55	55
56	56	# Init utils
57	57

		@@ -14,7 +14,7 @@
		block discarded – undo
14	14
15	15	# Check auth
16	16
17		- if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
	17	+ if (Modules\Auth::check()) Request::redirect(INSTALL_PATH.'/admin');
18	18
19	19	# Handle request
20	20

		@@ -14,11 +14,15 @@
		block discarded – undo
14	14
15	15	# Check auth
16	16
17		- if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/admin');
	17	+ if (Modules\Auth::check()) {
	18	+ Request::redirect(INSTALL_PATH . '/admin');
	19	+ }
18	20
19	21	# Handle request
20	22
21		- if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_401);
	23	+ if (Template::isBlock($result = $this->handle())) {
	24	+ return $this->displayPage($result, STATUS_CODE_401);
	25	+ }
22	26
23	27	# ------------------------
24	28

		@@ -16,7 +16,7 @@
		block discarded – undo
16	16
17	17	if (!Modules\Auth::check() \|\| ((false !== Request::get('logout')) && Modules\Auth::logout())) {
18	18
19		- Request::redirect(INSTALL_PATH . '/admin/login');
	19	+ Request::redirect(INSTALL_PATH.'/admin/login');
20	20	}
21	21
22	22	# Handle request

		@@ -19,9 +19,13 @@
		block discarded – undo
19	19
20	20	# Handle request
21	21
22		- if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_200);
	22	+ if (Template::isBlock($result = $this->handle())) {
	23	+ return $this->displayPage($result, STATUS_CODE_200);
	24	+ }
23	25
24		- if (Ajax::isResponse($result)) return Ajax::output($result);
	26	+ if (Ajax::isResponse($result)) {
	27	+ return Ajax::output($result);
	28	+ }
25	29
26	30	# ------------------------
27	31

		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23
24	24	private function getLayout(Template\Block $contents) {
25	25
26		- $layout = View::get('Layouts/' . $this->layout);
	26	+ $layout = View::get('Layouts/'.$this->layout);
27	27
28	28	# Set menu and user
29	29
		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82
83	83	protected function displayPage(Template\Block $contents, int $status = STATUS_CODE_200) {
84	84
85		- $page = View::get('Main/' . $this->layout);
	85	+ $page = View::get('Main/'.$this->layout);
86	86
87	87	# Set language
88	88
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90
91	91	# Set title
92	92
93		- $page->title = ((('' !== $this->title) ? (Language::get($this->title) . ' \| ') : '') . CADMIUM_NAME);
	93	+ $page->title = ((('' !== $this->title) ? (Language::get($this->title).' \| ') : '').CADMIUM_NAME);
94	94
95	95	# Set layout
96	96

		@@ -12,7 +12,9 @@
		block discarded – undo
12	12
13	13	# Handle request
14	14
15		- if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_200);
	15	+ if (Template::isBlock($result = $this->handle())) {
	16	+ return $this->displayPage($result, STATUS_CODE_200);
	17	+ }
16	18
17	19	# ------------------------
18	20

		@@ -12,7 +12,7 @@
		block discarded – undo
12	12
13	13	# Check auth
14	14
15		- if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/profile');
	15	+ if (Modules\Auth::check()) Request::redirect(INSTALL_PATH.'/profile');
16	16
17	17	# Handle request
18	18

		@@ -12,11 +12,15 @@
		block discarded – undo
12	12
13	13	# Check auth
14	14
15		- if (Modules\Auth::check()) Request::redirect(INSTALL_PATH . '/profile');
	15	+ if (Modules\Auth::check()) {
	16	+ Request::redirect(INSTALL_PATH . '/profile');
	17	+ }
16	18
17	19	# Handle request
18	20
19		- if (Template::isBlock($result = $this->handle())) return $this->displayPage($result, STATUS_CODE_401);
	21	+ if (Template::isBlock($result = $this->handle())) {
	22	+ return $this->displayPage($result, STATUS_CODE_401);
	23	+ }
20	24
21	25	# ------------------------
22	26

		@@ -34,10 +34,12 @@ discard block
		block discarded – undo
34	34
35	35	$phrases = array_merge(static::PHRASES, array_keys(Extend\Addons::items() ?? []));
36	36
37		- foreach (array_unique($languages) as $path) foreach ($phrases as $name) {
	37	+ foreach (array_unique($languages) as $path) {
	38	+ foreach ($phrases as $name) {
38	39
39	40	Language::load($path . 'Phrases/' . $name . '.php');
40	41	}
	42	+ }
41	43
42	44	# Set template globals
43	45
		@@ -59,7 +61,9 @@ discard block
		block discarded – undo
59	61
60	62	# Set timezone
61	63
62		- if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) date_default_timezone_set($timezone);
	64	+ if (Auth::check() && ('' !== ($timezone = Auth::user()->timezone))) {
	65	+ date_default_timezone_set($timezone);
	66	+ }
63	67
64	68	# ------------------------
65	69

		@@ -12,7 +12,11 @@ discard block
		block discarded – undo
12	12
13	13	$text = Language::get($code);
14	14
15		- if (!$popup) Messages::set('error', $text); else Popup::set('negative', $text);
	15	+ if (!$popup) {
	16	+ Messages::set('error', $text);
	17	+ } else {
	18	+ Popup::set('negative', $text);
	19	+ }
16	20
17	21	# ------------------------
18	22
		@@ -23,15 +27,21 @@ discard block
		block discarded – undo
23	27
24	28	public function handle(callable $callback, bool $popup = false) {
25	29
26		- if (false === ($post = $this->post())) return false;
	30	+ if (false === ($post = $this->post())) {
	31	+ return false;
	32	+ }
27	33
28	34	# Check form for errors
29	35
30		- if ($this->hasErrors()) return $this->displayError('FORM_ERROR_REQUIRED', $popup);
	36	+ if ($this->hasErrors()) {
	37	+ return $this->displayError('FORM_ERROR_REQUIRED', $popup);
	38	+ }
31	39
32	40	# Call controller method
33	41
34		- if (is_string($result = $callback($post))) return $this->displayError($result, $popup);
	42	+ if (is_string($result = $callback($post))) {
	43	+ return $this->displayError($result, $popup);
	44	+ }
35	45
36	46	if (is_array($result)) { $this->getField($result[0])->error = true; return $this->displayError($result[1], $popup); }
37	47

cadmium-org / cadmium-cms

Pull Request — master (#12)

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -9 removed lines patch added patch discarded remove patch

Braces +20 added lines, -8 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Braces +14 added lines, -4 removed lines patch added patch discarded remove patch