Fail hard if usable Ice is not found

Co-authored-by: Jan Klass <[email protected]>
Kissaki · Jun 27, 2022 · 44c65f9 · 44c65f9
1 parent c276886
commit 44c65f9
Showing 1 changed file with 27 additions and 15 deletions.
diff --git a/classes/ServerInterface.php b/classes/ServerInterface.php
@@ -5,25 +5,37 @@
 require_once(MUMPHPI_MAINDIR.'/classes/HelperFunctions.php');
 require_once(MUMPHPI_MAINDIR.'/classes/MessageManager.php');
 
-if (extension_loaded('ice') && function_exists('Ice_intVersion') && Ice_intVersion() >= 30400) {
-	$ICE_INCLUSION_FILENAME = 'Ice.php';
-	// Ice.php is a hard dependency. Whatever includes this file will require Ice to work.
-	if (!stream_resolve_include_path($ICE_INCLUSION_FILENAME)) {
-		MessageManager::addError(TranslationManager::getText('error_iceInclusionFileNotFound'));
-		MessageManager::echoAll();
-		exit();
-	}
+if(!extension_loaded('ice'))
+{
+	error_log('FATAL: IcePHP extension is not loaded. Revise your IcePHP installation.');
+	exit(1);
+}
+if (!function_exists('Ice\intVersion')) {
+	error_log('FATAL: The required Ice function intVersion() was not found. Revise your IcePHP installation.');
+	exit(1);
+}
+if (Ice\intVersion() < 30400) {
+	error_log('FATAL: The loaded Ice extension version is unsupported. It must be higher or equal 3.4.');
+	exit(1);
+}
 
-	if (!stream_resolve_include_path(SettingsManager::getInstance()->getIceGeneratedMurmurPHPFileName())) {
-		MessageManager::addError(TranslationManager::getText('error_iceMurmurPHPFileNotFound') . ' Current setting: ' . SettingsManager::getInstance()->getIceGeneratedMurmurPHPFileName());
-		MessageManager::echoAll();
-		exit();
-	}
+$ICE_INCLUSION_FILENAME = 'Ice.php';
+// Ice.php is a hard dependency. Whatever includes this file will require Ice to work.
+if (!stream_resolve_include_path($ICE_INCLUSION_FILENAME)) {
+	MessageManager::addError(TranslationManager::getText('error_iceInclusionFileNotFound'));
+	MessageManager::echoAll();
+	exit();
+}
 
-	require_once $ICE_INCLUSION_FILENAME;
-	require_once SettingsManager::getInstance()->getIceGeneratedMurmurPHPFileName();
+if (!stream_resolve_include_path(SettingsManager::getInstance()->getIceGeneratedMurmurPHPFileName())) {
+	MessageManager::addError(TranslationManager::getText('error_iceMurmurPHPFileNotFound') . ' Current setting: ' . SettingsManager::getInstance()->getIceGeneratedMurmurPHPFileName());
+	MessageManager::echoAll();
+	exit();
 }
 
+require_once $ICE_INCLUSION_FILENAME;
+require_once SettingsManager::getInstance()->getIceGeneratedMurmurPHPFileName();
+
 /**
  * Provides murmur server functionality
  */