N°8540 - Maintenance mode

eespie · eespie · commit 833217f467f2 · 2026-02-18T16:13:26.000+01:00
diff --git a/application/startup.inc.php b/application/startup.inc.php
@@ -63,9 +63,6 @@
 		}
 	}
 });
-$oKPI = new ExecutionKPI();
-Session::Start();
-$oKPI->ComputeAndReport("Session Start");
 
 $sSwitchEnv = utils::ReadParam('switch_env', null);
 $bAllowCache = true;
diff --git a/bootstrap.inc.php b/bootstrap.inc.php
@@ -30,6 +30,9 @@
  *
  * @since 3.0.0 N°2214
  */
+
+use Combodo\iTop\Application\Helper\Session;
+
 $bIsValidPhpVersion = false;
 if (PHP_MAJOR_VERSION >= 7) {
 	$bIsValidPhpVersion = true;
@@ -47,17 +50,17 @@
 
 if (!isset($GLOBALS['bBypassAutoload']) || $GLOBALS['bBypassAutoload'] == false) {
 	require_once APPROOT.'/lib/autoload.php';
+	$oKPI = new ExecutionKPI();
+	Session::Start();
+	$oKPI->ComputeAndReport('Session Start');
+
+	// Now bBypassMaintenance mode is set in the session rather than the request params
+	$bBypassMaintenance = Session::Get('bBypassMaintenance', false);
 }
 
 //
 // Maintenance mode
 //
-
-// Use 'maintenance' parameter to bypass maintenance mode
-if (!isset($bBypassMaintenance)) {
-	$bBypassMaintenance = isset($_REQUEST['maintenance']) ? boolval($_REQUEST['maintenance']) : false;
-}
-
 if (file_exists(MAINTENANCE_MODE_FILE) && !$bBypassMaintenance) {
 	$sTitle = 'Maintenance';
 	$sMessage = 'This application is currently under maintenance.';
diff --git a/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml b/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml
@@ -4,7 +4,7 @@
     <menu id="iTopUpdate" xsi:type="WebPageMenuNode" _delta="define">
       <rank>60</rank>
       <parent>SystemTools</parent>
-      <url>$pages/UI.php?route=core_update.select_update_file&amp;maintenance=true</url>
+      <url>$pages/UI.php?route=core_update.select_update_file</url>
       <enable_admin_only>1</enable_admin_only>
     </menu>
   </menus>
diff --git a/datamodels/2.x/itop-core-update/templates/UpdateCoreFiles.ready.js.twig b/datamodels/2.x/itop-core-update/templates/UpdateCoreFiles.ready.js.twig
@@ -15,8 +15,7 @@ var oGetCurrentVersion = {
     method: "POST",
     url: "{{ sAjaxURL|raw }}",
     data: {
-        route: "core_update_ajax.get_current_version",
-        maintenance: true
+        route: "core_update_ajax.get_current_version"
     },
     dataType: "json",
     success: function(data)
@@ -36,8 +35,7 @@ function GetAjaxRequest(sOperation)
         url: "{{ sAjaxURL|raw }}",
         data: {
             route: sOperation,
-            authent: "{{ sSetupToken }}",
-            maintenance: true
+            authent: "{{ sSetupToken }}"
         },
         dataType: "json"
     };
diff --git a/setup/index.php b/setup/index.php
@@ -26,8 +26,21 @@
  * @since 3.0.0 N°3253
  */
 
+use Combodo\iTop\Application\Helper\Session;
+
 require_once('../lib/autoload.php');
 
+// Hack for setup, we need these constants in the session
+define('APPROOT', dirname(__DIR__).'/');
+define('APPCONF', APPROOT.'conf/');
+define('ITOP_DEFAULT_ENV', 'production');
+
+Session::Start();
+if (!Session::Get('bBypassMaintenance', false)) {
+	// Allow setup in maintenance mode
+	Session::Set('bBypassMaintenance', true);
+}
+
 echo <<<HTML
 <!DOCTYPE html>
 <html>
diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php
@@ -1940,6 +1940,7 @@ public static function EnterMaintenanceMode($oConfig): bool
 	{
 		$bPreviousMode = self::IsInMaintenanceMode();
 		@touch(MAINTENANCE_MODE_FILE);
+		Session::Set('bBypassMaintenance', true);
 		SetupLog::Info("----> Entering maintenance mode");
 		self::WaitCronTermination($oConfig, "maintenance");
 		return $bPreviousMode;
@@ -1948,6 +1949,7 @@ public static function EnterMaintenanceMode($oConfig): bool
 	public static function ExitMaintenanceMode($bLog = true)
 	{
 		@unlink(MAINTENANCE_MODE_FILE);
+		Session::Set('bBypassMaintenance', false);
 		if ($bLog) {
 			SetupLog::Info("<---- Exiting maintenance mode");
 		}
diff --git a/sources/Application/Helper/Session.php b/sources/Application/Helper/Session.php
@@ -35,7 +35,10 @@ public static function Start()
 		}
 
 		if (!self::$bIsInitialized) {
-			SessionHandler::session_set_save_handler();
+			if (defined('MAINTENANCE_MODE_FILE')) {
+				// Hack for setup, SessionHandler cannot work under setup
+				SessionHandler::session_set_save_handler();
+			}
 			session_name('itop-'.md5(APPROOT));
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`});`
`66`		`-$oKPI = new ExecutionKPI();`
`67`		`-Session::Start();`
`68`		`-$oKPI->ComputeAndReport("Session Start");`
`69`	`66`
`70`	`67`	`$sSwitchEnv = utils::ReadParam('switch_env', null);`
`71`	`68`	`$bAllowCache = true;`
Original file line number	Diff line number	Diff line change
`@@ -1940,6 +1940,7 @@ public static function EnterMaintenanceMode($oConfig): bool`
`1940`	`1940`	`{`
`1941`	`1941`	`$bPreviousMode = self::IsInMaintenanceMode();`
`1942`	`1942`	`@touch(MAINTENANCE_MODE_FILE);`
	`1943`	`+ Session::Set('bBypassMaintenance', true);`
`1943`	`1944`	`SetupLog::Info("----> Entering maintenance mode");`
`1944`	`1945`	`self::WaitCronTermination($oConfig, "maintenance");`
`1945`	`1946`	`return $bPreviousMode;`
`@@ -1948,6 +1949,7 @@ public static function EnterMaintenanceMode($oConfig): bool`
`1948`	`1949`	`public static function ExitMaintenanceMode($bLog = true)`
`1949`	`1950`	`{`
`1950`	`1951`	`@unlink(MAINTENANCE_MODE_FILE);`
	`1952`	`+ Session::Set('bBypassMaintenance', false);`
`1951`	`1953`	`if ($bLog) {`
`1952`	`1954`	`SetupLog::Info("<---- Exiting maintenance mode");`
`1953`	`1955`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,10 @@ public static function Start()`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`if (!self::$bIsInitialized) {`
`38`		`- SessionHandler::session_set_save_handler();`
	`38`	`+ if (defined('MAINTENANCE_MODE_FILE')) {`
	`39`	`+ // Hack for setup, SessionHandler cannot work under setup`
	`40`	`+ SessionHandler::session_set_save_handler();`
	`41`	`+ }`
`39`	`42`	`session_name('itop-'.md5(APPROOT));`
`40`	`43`	`}`
`41`	`44`