newicon / neon

neon/core/web/FilterGlobalPassword.php

Spacing +2 added lines, -2 removed lines

@@ -63,7 +63,7 @@ 
 			$niceId = setting('core', 'global_password_holding_page', '');
 			$page = neon()->cms->getPage();
 			// check the page with the nice_id exists
-			if (! $page->setById($niceId)) throw new \yii\web\HttpException(404, 'No page found');
+			if (!$page->setById($niceId)) throw new \yii\web\HttpException(404, 'No page found');
 			neon()->response->content = $page->render();
 			//return false;
 			return true;
@@ -100,7 +100,7 @@ 
 		// No holding page niceId has been given so display a standard password screen
 		neon()->response->content = neon()->view->render('@neon/core/views/global-password.php', [
 			'passwordParam' => $this->passwordParam,
-			'incorrectPassword' => ($this->getSuppliedPassword()!==null)
+			'incorrectPassword' => ($this->getSuppliedPassword() !== null)
 		]);
 	}
 

Braces +12 added lines, -7 removed lines

@@ -34,16 +34,19 @@ 
 	public function beforeAction($action)
 	{
 		// If the global password option is not set then return - and continue as normal
-		if (setting('core', 'global_password_enabled', false) === 0)
-			return true;
+		if (setting('core', 'global_password_enabled', false) === 0) {
+					return true;
+		}
 		// If the global password is set - still allow the following app controller paths to work.
 		if (neon()->request->isRoute('/admin*') || neon()->request->isRoute('/user/*') || neon()->request->isRoute('/settings*')) {
 			return true;
 		}
-		if ($this->passwordIsValid())
-			return true;
-		if ($this->shouldDisplayHoldingPage())
-			return false;
+		if ($this->passwordIsValid()) {
+					return true;
+		}
+		if ($this->shouldDisplayHoldingPage()) {
+					return false;
+		}
 		$this->displayGlobalPasswordPage();
 		return false;
 	}
@@ -63,7 +66,9 @@ 
 			$niceId = setting('core', 'global_password_holding_page', '');
 			$page = neon()->cms->getPage();
 			// check the page with the nice_id exists
-			if (! $page->setById($niceId)) throw new \yii\web\HttpException(404, 'No page found');
+			if (! $page->setById($niceId)) {
+				throw new \yii\web\HttpException(404, 'No page found');
+			}
 			neon()->response->content = $page->render();
 			//return false;
 			return true;