Added "Force" option for login, so that it shows regardless of whethe…

…r user is logged in.
appleseedproj · Oct 20, 2010 · c3561bb · c3561bb
1 parent 996ae58
commit c3561bb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/components/login/controllers/login.php b/components/login/controllers/login.php
@@ -31,6 +31,11 @@ public function __construct ( ) {
 
 	function Display ( $pView = null, $pData = array ( ) ) {
 
+		$this->_Current = $this->Talk ( 'User', 'Current' );
+		$Force = $pData['force'];
+
+		if ( ( !$Force ) && ( $this->_Current ) ) return ( true );
+
 		$referer = $_SERVER['HTTP_REFERER']; 
 		$host = ASD_DOMAIN;
 

diff --git a/foundations/default/common/403.php b/foundations/default/common/403.php
@@ -71,11 +71,11 @@
 				</div>
 				<div id="appleseed-login-content" class="grid_12 omega">
 					<section id="login-local">
-						<?php $zApp->Components->Go ( "login", "login", "login" ); ?>
+						<?php $zApp->Components->Go ( "login", "login", "login", array ( 'force' => true ) ); ?>
 					</section>
 
 					<section id="login-remote">
-						<?php $zApp->Components->Go ( "login", "login", "remote" ); ?>
+						<?php $zApp->Components->Go ( "login", "login", "remote", array ( 'force' => true ) ); ?>
 					</section>
 				</div>
 			</div>