Version 4.6.0

2025-12-19 05:55:31 -08:00
1 parent f79dcf067a
commit 517a5e1f70
@@ -48,9 +48,10 @@ class _Front extends \IPS\Dispatcher\Standard
 			}

 			/* Don't allow the setup in progress page to be cached, it will only be displayed for a very short period of time */
-			header( "Cache-Control: no-cache, no-store, must-revalidate" );
-			header( "Pragma: no-cache" );
-			header( "Expires: 0" );
+			foreach( \IPS\Output::getNoCacheHeaders() as $headerKey => $headerValue )
+			{
+				header( "{$headerKey}: {$headerValue}" );
+			}
 			
 			if ( \IPS\CIC and ! \IPS\Session\Front::loggedIn() and ! \IPS\Session\Front::i()->userAgent->spider )
 			{
@@ -121,11 +122,7 @@ class _Front extends \IPS\Dispatcher\Standard
 			}
 		}

-		/* Set a referral cookie */
-		if( \IPS\Settings::i()->ref_on and isset( \IPS\Request::i()->_rid ) )
-		{
-			\IPS\Request::i()->setCookie( 'referred_by', \intval( \IPS\Request::i()->_rid ), \IPS\DateTime::create()->add( new \DateInterval( 'P1Y' ) ) );
-		}
+		$this->_setReferralCookie();
 		
 		/* Enable sidebar by default (controllers can turn it off if needed) */
 		\IPS\Output::i()->sidebar['enabled'] = ( \IPS\Request::i()->isAjax() ) ? FALSE : TRUE;
@@ -153,7 +150,14 @@ class _Front extends \IPS\Dispatcher\Standard
 		}
 		
 		/* Member Ban? */
-		$ipBanned = \IPS\Request::i()->ipAddressIsBanned();
+
+		/* IP Ban check happens only the Login and Register Controller for guests */
+		$ipBanned = FALSE;
+		if( \IPS\Member::loggedIn()->member_id OR \in_array( $this->controller, array( 'register', 'login' ) ) )
+		{
+			$ipBanned = \IPS\Request::i()->ipAddressIsBanned();
+		}
+
 		if ( $ipBanned or $banEnd = \IPS\Member::loggedIn()->isBanned() )
 		{
 			if ( !$ipBanned and !\IPS\Member::loggedIn()->member_id )
@@ -188,7 +192,7 @@ class _Front extends \IPS\Dispatcher\Standard
 		/* Do we need more info from the member or do they need to validate? */

 		/* This controllers should always be accessible, no matter if the member is awaiting validation or needs to set up the email or name */
-		$legalControllers = array( 'privacy', 'contact', 'terms', 'embed', 'metatags' );
+		$legalControllers = array( 'privacy', 'contact', 'terms', 'embed', 'metatags', 'store', 'checkout', 'subscriptions' );

 		/* Do we need more info from the member or do they need to validate? */
 		if( \IPS\Member::loggedIn()->member_id and $this->controller !== 'language' and $this->controller !== 'theme' and $this->controller !== 'ajax' and !\in_array( $this->controller, $legalControllers ) )
@@ -219,19 +223,9 @@ class _Front extends \IPS\Dispatcher\Standard
 					}
 				}
 			}
-			/* Need to reset password */
-			elseif ( $this->controller !== 'settings' AND ( !isset( \IPS\Request::i()->area ) OR \IPS\Request::i()->area !== 'password' ) )
-			{
-				foreach( \IPS\Login::methods() AS $method )
-				{
-					if ( $url = $method->forcePasswordResetUrl( \IPS\Member::loggedIn(), \IPS\Request::i()->url() ) )
-					{
-						\IPS\Output::i()->redirect( $url );
-					}
-				}
-			}
+
 			/* Need to set up MFA... */
-			elseif ( !\in_array( $this->controller, array( 'register', 'login', 'redirect', 'ajax', 'settings', 'embed' ) ) )
+			if ( !\in_array( $this->controller, array( 'register', 'login', 'redirect', 'ajax', 'settings', 'embed' ) ) )
 			{
 				$haveAcceptableHandlers = FALSE;
 				$haveConfiguredHandler = FALSE;
@@ -263,6 +257,18 @@ class _Front extends \IPS\Dispatcher\Standard
 					}
 				}
 			}
+
+			/* Need to reset password */
+			if ( $this->controller !== 'settings' AND ( !isset( \IPS\Request::i()->area ) OR \IPS\Request::i()->area !== 'password' ) )
+			{
+				foreach( \IPS\Login::methods() AS $method )
+				{
+					if ( $url = $method->forcePasswordResetUrl( \IPS\Member::loggedIn(), \IPS\Request::i()->url() ) )
+					{
+						\IPS\Output::i()->redirect( $url );
+					}
+				}
+			}
 		}
 		
 		/* Permission Check */
@@ -325,6 +331,20 @@ class _Front extends \IPS\Dispatcher\Standard
 		}
 	}

+	/**
+	 * Set the referral cookie if appropriate
+	 *
+	 * @return void
+	 */
+	protected function _setReferralCookie()
+	{
+		/* Set a referral cookie */
+		if( \IPS\Settings::i()->ref_on and isset( \IPS\Request::i()->_rid ) )
+		{
+			\IPS\Request::i()->setCookie( 'referred_by', \intval( \IPS\Request::i()->_rid ), \IPS\DateTime::create()->add( new \DateInterval( 'P1Y' ) ) );
+		}
+	}
+
 	/**
 	  * Check whether the URL we visited is correct and route appropriately
 	  *
@@ -431,8 +451,23 @@ class _Front extends \IPS\Dispatcher\Standard
 	protected function checkCached()
 	{
 		/* If this is a guest and there's a full cached page, we can serve that */
-		if( mb_strtolower( $_SERVER['REQUEST_METHOD'] ) == 'get' and !isset( \IPS\Request::i()->csrfKey ) and !isset( \IPS\Request::i()->_mfaLogin ) and !\IPS\Session\Front::loggedIn() and !isset( \IPS\Request::i()->cookie['noCache'] ) and !\IPS\Request::i()->ipAddressIsBanned() and \IPS\CACHE_PAGE_TIMEOUT )
+		if( mb_strtolower( $_SERVER['REQUEST_METHOD'] ) == 'get' and !isset( \IPS\Request::i()->csrfKey ) and !isset( \IPS\Request::i()->_mfaLogin ) and !\IPS\Session\Front::loggedIn() and !isset( \IPS\Request::i()->cookie['noCache'] ) and \IPS\CACHE_PAGE_TIMEOUT )
 		{
+			/* Check whether a 304 Not modified response is appropriate */
+			if( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) AND ( new \IPS\DateTime( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )->getTimestamp() > ( time() - \IPS\CACHE_PAGE_TIMEOUT ) )
+			{
+				/* This is intentionally using PHP methods to avoid database connections */
+				$this->destruct = false;
+				header('HTTP/1.1 304 Not Modified' );
+				exit;
+			}
+
+			/* Only check the output cache if it is enabled */
+			if( empty( \IPS\OUTPUT_CACHE_METHOD ) OR ( !empty( \IPS\OUTPUT_CACHE_METHOD ) AND \IPS\OUTPUT_CACHE_METHOD == 'None' ) )
+			{
+				return;
+			}
+
 			/* Which language? */
 			if ( isset( \IPS\Request::i()->cookie['language'] ) )
 			{
@@ -464,11 +499,8 @@ class _Front extends \IPS\Dispatcher\Standard
 				/* RSS feeds can be shown cached, all other pages contain a cache buster once logged in */
 				$cache['meta']['httpHeaders'] += \IPS\Output::getCacheHeaders( $cache['meta']['lastUpdated'], \IPS\CACHE_PAGE_TIMEOUT );

-				if( isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) AND $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $cache['meta']['httpHeaders']['Last-Modified'] )
-				{
-					\IPS\Output::i()->sendOutput( NULL, 304, $cache['meta']['contentType'], $cache['meta']['httpHeaders'], FALSE, TRUE, FALSE, FALSE );
-				}
-				
+				$this->_setReferralCookie();
+
 				\IPS\Output::i()->sendOutput( str_replace( '{{csrfKey}}', md5( \IPS\SUITE_UNIQUE_KEY . '&& 0&' . $sessionId ), $cache['output'] ), $cache['meta']['code'], $cache['meta']['contentType'], $cache['meta']['httpHeaders'], FALSE, TRUE );

 			}