From 4d6a8a76aa9a8f010b8ee4047fba5cfffb3d3032 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Thu, 30 Sep 2021 10:19:22 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B03904=20-=20Polishing:=20Backup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datamodels/2.x/itop-backup/status.php | 8 ++++----
 sources/application/Branding.php      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/datamodels/2.x/itop-backup/status.php b/datamodels/2.x/itop-backup/status.php
index a6d33a4f6..8df06c84d 100644
--- a/datamodels/2.x/itop-backup/status.php
+++ b/datamodels/2.x/itop-backup/status.php
@@ -393,7 +393,7 @@ try {
 	$sEnvironment = addslashes(utils::GetCurrentEnvironment());
 
 	$oP->add_script(
-<<<JS
+		<<<JS
 function LaunchBackupNow()
 {
 	$('#backup_success').addClass('ibo-is-hidden');
@@ -420,7 +420,7 @@ function LaunchBackupNow()
 			{
 				window.location.reload();
 			}
-			$('#waitbackup').modal('close');
+			$('#waitbackup').dialog('close');
 		});
 	}
 }
@@ -464,11 +464,11 @@ function LaunchRestoreNow(sBackupFile, sConfirmationMessage)
 					$('#backup_success').html('$sRestoreDone');
 					$('#backup_success').removeClass('ibo-is-hidden');
 				}
-			$('#waitrestore').modal('close');
+				$('#waitrestore').dialog('close');
 			});
 		} else {
 			$('button.restore').prop('disabled', true);
-			$('#waitrestore').modal('close');
+			$('#waitrestore').dialog('close');
 		}
 	});
 }
diff --git a/sources/application/Branding.php b/sources/application/Branding.php
index 494fad67d..29fcf6ea1 100644
--- a/sources/application/Branding.php
+++ b/sources/application/Branding.php
@@ -69,11 +69,11 @@ class Branding
 	public static function GetLogoAbsoluteUrl($sType = self::DEFAULT_LOGO_TYPE)
 	{
 		$sDefaultLogoPath = static::$aLogoPaths[$sType]['default'];
-		$sWorkingPath =  APPROOT.'env-'.utils::GetCurrentEnvironment();
-		$aThemeParameters = json_decode(@file_get_contents($sWorkingPath.'/branding/logos.json'), true);
+		$sWorkingPath =  APPROOT.'env-'.utils::GetCurrentEnvironment().'/';
+		$aThemeParameters = json_decode(@file_get_contents($sWorkingPath.'branding/logos.json'), true);
 		if ( isset( $aThemeParameters[$sType])) {
 			$sCustomLogoPath = $aThemeParameters[$sType];
-			if (file_exists(MODULESROOT.$sCustomLogoPath)) {
+			if (file_exists($sWorkingPath.$sCustomLogoPath)) {
 				return utils::GetAbsoluteUrlModulesRoot().$sCustomLogoPath.'?t='.utils::GetCacheBusterTimestamp();
 			}
 		}