Version 4.5.0

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

@@ -11,7 +11,7 @@
 namespace IPS\core\modules\setup\upgrade;
 
 /* To prevent PHP errors (extending class does not exist) revealing path */
-if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
+if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
 {
 	header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
 	exit;
@@ -108,7 +108,7 @@ class _applications extends \IPS\Dispatcher\Controller
 				}
 			}
 
-			if( count( $errors ) )
+			if( \count( $errors ) )
 			{
 				$haltUpgrade	= TRUE;
 			}
@@ -128,7 +128,7 @@ class _applications extends \IPS\Dispatcher\Controller
 		unset( $apps['core'] );
 		$apps = array_merge( $system, $apps );
 
-		if( count( $defaultTicks ) )
+		if( \count( $defaultTicks ) )
 		{
 			$form = new \IPS\Helpers\Form( 'applications', 'continue' );
 			$form->add( new \IPS\Helpers\Form\Custom( 'apps', $defaultTicks, TRUE, array(
@@ -156,11 +156,11 @@ class _applications extends \IPS\Dispatcher\Controller
 					$_SESSION['apps']['core'] = 'core';
 				}
 
-				if( count( $values['apps'] ) )
+				if( \count( $values['apps'] ) )
 				{
 					foreach ( $values['apps'] as $k => $v )
 					{
-						if ( !is_int( $k ) )
+						if ( !\is_int( $k ) )
 						{
 							$_SESSION['apps'][$k] = $k;
 						}
@@ -169,7 +169,7 @@ class _applications extends \IPS\Dispatcher\Controller
 				
 				$warnings = array();
 				$coreVersion = array_key_exists( 'core', $_SESSION['apps'] ) ? \IPS\Application::getAvailableVersion( 'core' ) : \IPS\Application::load( 'core' )->long_version;
-				foreach ( \IPS\Application::$ipsApps as $key )
+				foreach ( \IPS\IPS::$ipsApps as $key )
 				{
 					if ( $key == 'chat' )
 					{
@@ -191,7 +191,7 @@ class _applications extends \IPS\Dispatcher\Controller
 					}
 				}
 								
-				if ( count( $warnings ) )
+				if ( \count( $warnings ) )
 				{
 					\IPS\Output::i()->redirect( \IPS\Http\Url::internal( "controller=applications&do=warning" )->setQueryString( array( 'key' => $_SESSION['uniqueKey'], 'warnings' => implode( ',', $warnings ) ) ) );
 				}