Index: branches/5.3.x/core/install.php
===================================================================
diff -u -r16731 -r16795
--- branches/5.3.x/core/install.php	(.../install.php)	(revision 16731)
+++ branches/5.3.x/core/install.php	(.../install.php)	(revision 16795)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 16731 2022-09-13 13:08:44Z alex $
+* @version	$Id: install.php 16795 2024-07-31 14:49:08Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -607,6 +607,10 @@
 			}
 
 			switch ($this->currentStep) {
+				case 'check_paths':
+					$this->generateSecurityKeys();
+					break;
+
 				case 'db_config':
 				case 'db_reconfig':
 					// store db configuration
@@ -620,33 +624,6 @@
 						$this->Conn->Query('SET NAMES \''.$this->toolkit->systemConfig->get('DBCharset', 'Database').'\' COLLATE \''.$this->toolkit->systemConfig->get('DBCollation', 'Database').'\'');
 					}
 
-					if ( !$this->toolkit->systemConfig->get('SecurityHmacKey', 'Misc')
-						|| !$this->toolkit->systemConfig->get('SecurityEncryptionKey', 'Misc')
-					) {
-						// Include class declarations manually, because kApplication isn't available.
-						require_once FULL_PATH . '/core/kernel/security/SecurityEncrypter.php';
-						require_once FULL_PATH . '/core/kernel/security/SecurityGenerator.php';
-						require_once FULL_PATH . '/core/kernel/security/SecurityGeneratorPromise.php';
-
-						// Include dependencies, to make "random_int" function available in earlier PHP versions.
-						require_once FULL_PATH . '/vendor/autoload.php';
-
-						// Generate missing security-related settings.
-						$this->toolkit->systemConfig->set(
-							'SecurityHmacKey',
-							'Misc',
-							base64_encode(SecurityGenerator::generateString(
-								SecurityEncrypter::HASHING_KEY_LENGTH,
-								SecurityGenerator::CHAR_ALNUM | SecurityGenerator::CHAR_SYMBOLS
-							))
-						);
-						$this->toolkit->systemConfig->set(
-							'SecurityEncryptionKey',
-							'Misc',
-							SecurityGenerator::generateBytes(SecurityEncrypter::ENCRYPTION_KEY_LENGTH)
-						);
-					}
-
 					$this->toolkit->systemConfig->save();
 
 					if ($this->currentStep == 'db_config') {
@@ -1095,6 +1072,44 @@
 			}
 		}
 
+		/**
+		 * Generates a security keys.
+		 *
+		 * @return void
+		 */
+		protected function generateSecurityKeys()
+		{
+			if ( $this->toolkit->systemConfig->get('SecurityHmacKey', 'Misc')
+				&& $this->toolkit->systemConfig->get('SecurityEncryptionKey', 'Misc')
+			) {
+				return;
+			}
+
+			// Include class declarations manually, because kApplication isn't available.
+			require_once FULL_PATH . '/core/kernel/security/SecurityEncrypter.php';
+			require_once FULL_PATH . '/core/kernel/security/SecurityGenerator.php';
+			require_once FULL_PATH . '/core/kernel/security/SecurityGeneratorPromise.php';
+
+			// Include dependencies, to make "random_int" function available in earlier PHP versions.
+			require_once FULL_PATH . '/vendor/autoload.php';
+
+			// Generate missing security-related settings.
+			$this->toolkit->systemConfig->set(
+				'SecurityHmacKey',
+				'Misc',
+				base64_encode(SecurityGenerator::generateString(
+					SecurityEncrypter::HASHING_KEY_LENGTH,
+					SecurityGenerator::CHAR_ALNUM | SecurityGenerator::CHAR_SYMBOLS
+				))
+			);
+			$this->toolkit->systemConfig->set(
+				'SecurityEncryptionKey',
+				'Misc',
+				SecurityGenerator::generateBytes(SecurityEncrypter::ENCRYPTION_KEY_LENGTH)
+			);
+			$this->toolkit->systemConfig->save();
+		}
+
 		function getUpgradeDependencies($modules, &$upgrade_data)
 		{
 			$dependencies = Array ();