Version 4.7.23

applications/core/modules/setup/upgrade/done.php

@@ -43,8 +43,6 @@ class _done extends \IPS\Dispatcher\Controller
 		}
 
 		/* Delete some variables we stored in our session */
-		unset( $_SESSION['apps'] );
-
 		if( isset( $_SESSION['upgrade_options'] ) )
 		{
 			unset( $_SESSION['upgrade_options'] );
@@ -74,6 +72,14 @@ class _done extends \IPS\Dispatcher\Controller
 		/* Remove any new version ACP Notifications */
 		\IPS\core\AdminNotification::remove( 'core', 'NewVersion' );
 
+		/* Send v5 notification if the version actually changed */
+		if( !empty( $_SESSION['apps']['core'] ) AND $_SESSION['apps']['core']['current'] !== $_SESSION['apps']['core']['available'] AND !\IPS\IPS::isManaged() )
+		{
+			\IPS\core\AdminNotification::send( 'core', 'VersionFive', NULL, TRUE );
+		}
+
+		unset( $_SESSION['apps'] );
+
 		/* Check for php8 method substitution issues */
 		if ( \IPS\Application\Scanner::scanCustomizationIssues( false, true ) !== null )
 		{

applications/core/modules/setup/upgrade/license.php

@@ -30,7 +30,93 @@ class _license extends \IPS\Dispatcher\Controller
 	 */
 	public function manage()
 	{
-		\IPS\Output::i()->redirect( \IPS\Http\Url::internal( "controller=applications" )->setQueryString( 'key', $_SESSION['uniqueKey'] ) );
+		/* Check license key */
+		if( \IPS\Db::i()->checkForTable( 'core_store' ) )
+		{
+			$licenseData = \IPS\IPS::licenseKey( TRUE );
+		}
+		else
+		{
+			$licenseData	= NULL;
+
+			try
+			{
+				$license	= \IPS\Db::i()->select( '*', 'cache_store', array( 'cs_key=?', 'licenseData' ) )->first();
+				$licenseData	= unserialize( $license['cs_value'] );
+			}
+			catch( \Exception $e ){}
+		}
+
+		if( isset( $licenseData['key'] ) AND !isset( $licenseData['expires'] ) )
+		{
+			$licenseData	= $this->getLicenseData();
+		}
+
+		if( !$licenseData )
+		{
+			$active	= NULL;
+		}
+		else
+		{
+			$active = ( isset( $licenseData['expires'] ) and $licenseData['expires'] AND strtotime( $licenseData['expires'] ) > time() ) ? TRUE : ( ( isset( $licenseData['active'] ) and $licenseData['active'] ) ? TRUE : NULL );
+		}
+
+		if ( !$active )
+		{
+			$response	= NULL;
+			$active		= NULL;
+			$form		= new \IPS\Helpers\Form( 'licensekey', 'continue' );
+			$form->add( new \IPS\Helpers\Form\Text( 'ipb_reg_number', NULL, TRUE, array(), function( $val ){
+				\IPS\IPS::checkLicenseKey( $val, \IPS\Settings::i()->base_url );
+			} ) );
+
+			if( $values = $form->values() )
+			{
+				$values['ipb_reg_number'] = trim( $values['ipb_reg_number'] );
+				
+				if ( mb_substr( $values['ipb_reg_number'], -12 ) === '-TESTINSTALL' )
+				{
+					$values['ipb_reg_number'] = mb_substr( $values['ipb_reg_number'], 0, -12 );
+				}
+	
+				/* Save */
+				$form->saveAsSettings( $values );
+
+				/* Refresh the locally stored license info */
+				if( \IPS\Db::i()->checkForTable( 'core_store' ) )
+				{
+					unset( \IPS\Data\Store::i()->license_data );
+					$licenseData = \IPS\IPS::licenseKey();
+				}
+				else
+				{
+					/* Call the main server */
+					$licenseData	= $this->getLicenseData();
+				}
+
+				/* Reset some vars now */				
+				$active = ( isset( $licenseData['expires'] ) and $licenseData['expires'] AND strtotime( $licenseData['expires'] ) > time() ) ? TRUE : ( ( isset( $licenseData['active'] ) and $licenseData['active'] ) ? TRUE : FALSE );
+
+				if( $active )
+				{
+					$form	= NULL;
+				}
+			}
+		}
+
+		if( $active )
+		{
+			/* Clear any caches or else we might not see new versions on the next screen */
+			if ( isset( \IPS\Data\Store::i()->applications ) )
+			{
+				unset( \IPS\Data\Store::i()->applications );
+			}
+
+			\IPS\Output::i()->redirect( \IPS\Http\Url::internal( "controller=applications" )->setQueryString( 'key', $_SESSION['uniqueKey'] ) );
+		}
+		
+		\IPS\Output::i()->title		= \IPS\Member::loggedIn()->language()->addToStack('license');
+		\IPS\Output::i()->output	= \IPS\Theme::i()->getTemplate( 'global' )->license( $form, $active );
 	}
 
 	/**

applications/core/modules/setup/upgrade/systemcheck.php

@@ -85,17 +85,13 @@ class _systemcheck extends \IPS\Dispatcher\Controller
 				}
 			}
 		}
-		
-		/* Check we have the latest version and run an md5 check */
-		$incorrectFiles = array();
-		/* Or do not check :) */
-		
+
 		/* Display */
 		if ( $canProceed )
 		{
 			\IPS\Output::i()->redirect( \IPS\Http\Url::internal("controller=license&key={$_SESSION['uniqueKey']}") );
 		}		
 		\IPS\Output::i()->title	 = \IPS\Member::loggedIn()->language()->addToStack('healthcheck');
-		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global' )->healthcheck( $requirements, $designersModeEnabled, $incorrectFiles );
+		\IPS\Output::i()->output = \IPS\Theme::i()->getTemplate( 'global' )->healthcheck( $requirements, $designersModeEnabled );
 	}
 }