Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

# Conflicts: # application/ajaxwebpage.class.inc.php # application/csvpage.class.inc.php # application/displayblock.class.inc.php # application/itopwebpage.class.inc.php # application/utils.inc.php # application/webpage.class.inc.php # application/xmlpage.class.inc.php # datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml # datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml # datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml # datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml # js/components/breadcrumbs.js # pages/navigator.php # test/core/DBSearchTest.php
2026-09-29 21:09:10 +02:00 · 2020-10-07 11:25:47 +02:00
parent 157e0a6915 7d26b6092e
commit e48d257b00
274 changed files with 22153 additions and 19640 deletions
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -561,12 +561,6 @@ EOF
 			$oLinkSet = $oOrmLinkSet->ToDBObjectSet(utils::ShowObsoleteData());

 			$iCount = $oLinkSet->Count();
-			$sCount = '';
-			if ($iCount != 0)
-			{
-				$sCount = " ($iCount)";
-			}
-			$oPage->SetCurrentTab('Class:'.$sClass.'/Attribute:'.$sAttCode, $oAttDef->GetLabel().$sCount);
 			if ($this->IsNew())
 			{
 				$iFlags = $this->GetInitialStateAttributeFlags($sAttCode);
@@ -612,6 +606,9 @@ EOF
 				continue;
 			}

+			$sCount = ($iCount != 0) ? " ($iCount)" : "";
+			$oPage->SetCurrentTab('Class:'.$sClass.'/Attribute:'.$sAttCode, $oAttDef->GetLabel().$sCount);
+
 			$aArgs = array('this' => $this);
 			$bReadOnly = ($iFlags & (OPT_ATT_READONLY | OPT_ATT_SLAVE));
 			if ($bEditMode && (!$bReadOnly))
--- a/application/datamodel.application.xml
+++ b/application/datamodel.application.xml
@@ -400,4 +400,36 @@
      </class>
    </classes>
  </meta>
+	<branding >
+		<themes>
+			<theme id="light-grey" _delta="define">
+				<variables>
+				</variables>
+				<imports>
+					<import id="css-variables">../css/css-variables.scss</import>
+				</imports>
+				<stylesheets>
+					<stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
+					<stylesheet id="main">../css/light-grey.scss</stylesheet>
+				</stylesheets>        
+        <precompiled_stylesheet>itop-config-mgmt/precompiled-themes/light-grey/main.css</precompiled_stylesheet>
+			</theme>
+			<theme id="test-red" _delta="define">
+				<variables>
+					<variable id="backoffice-environment-banner-background-color">#C53030</variable>
+					<variable id="backoffice-environment-banner-text-color">#F7FAFC</variable>
+					<variable id="backoffice-environment-banner-text-content">"THIS IS A TEST INSTANCE"</variable>
+				</variables>
+				<imports>
+					<import id="css-variables">../css/css-variables.scss</import>
+				</imports>
+				<stylesheets>
+					<stylesheet id="jqueryui">../css/ui-lightness/jqueryui.scss</stylesheet>
+					<stylesheet id="main">../css/light-grey.scss</stylesheet>
+					<stylesheet id="environment-banner">../css/backoffice-environment-banner.scss</stylesheet>
+				</stylesheets>
+        <precompiled_stylesheet>itop-config-mgmt/precompiled-themes/test-red/main.css</precompiled_stylesheet>
+			</theme>
+		</themes>
+	</branding>
 </itop_design>
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -1614,10 +1614,10 @@ class MenuBlock extends DisplayBlock
 							$this->AddMenuSeparator($aActions);
 							foreach ($aRelations as $sRelationCode => $aRelationInfo) {
 								if (array_key_exists('down', $aRelationInfo)) {
-									$aActions[$sRelationCode.'_down'] = array('label' => $aRelationInfo['down'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=swf_navigator&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}") + $aActionParams;
+									$aActions[$sRelationCode.'_down'] = array('label' => $aRelationInfo['down'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}") + $aActionParams;
 								}
 								if (array_key_exists('up', $aRelationInfo)) {
-									$aActions[$sRelationCode.'_up'] = array('label' => $aRelationInfo['up'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=swf_navigator&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}") + $aActionParams;
+									$aActions[$sRelationCode.'_up'] = array('label' => $aRelationInfo['up'], 'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}") + $aActionParams;
 								}
 							}
 						}
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -78,14 +78,16 @@ class LoginWebPage extends NiceWebPage
 	
 	public function __construct($sTitle = null)
 	{
-	    if($sTitle === null)
-        {
-            $sTitle = Dict::S('UI:Login:Title');
-        }
+		if ($sTitle === null) {
+			$sTitle = Dict::S('UI:Login:Title');
+		}

 		parent::__construct($sTitle);
 		$this->SetStyleSheet();
-		$this->add_header("Cache-control: no-cache");
+		$this->add_header('Cache-control: no-cache, no-store, must-revalidate');
+		$this->add_header('Pragma: no-cache');
+		$this->add_header('Expires: 0');
+		$this->add_header('X-Frame-Options: deny');
 	}
 	
 	public function SetStyleSheet()
--- a/application/themehandler.class.inc.php
+++ b/application/themehandler.class.inc.php
@@ -28,6 +28,12 @@ class ThemeHandler
 	const IMAGE_EXTENSIONS = ['png', 'gif', 'jpg', 'jpeg'];

 	private static $oCompileCSSService;
+
+	public static function GetAppRootWithSlashes()
+	{
+		return str_replace('\\', '/', APPROOT);
+	}
+
 	/**
 	 * Return default theme name and parameters
 	 *
@@ -314,9 +320,8 @@ CSS;
 		}
 		foreach ($aIncludedImages as $sImage)
 		{
-			if (is_file($sImage))
-			{
-				$sUri = str_replace(APPROOT, '', $sImage);
+			if (is_file($sImage)) {
+				$sUri = str_replace(self::GetAppRootWithSlashes(), '', $sImage);
 				$aSignature['images'][$sUri] = md5_file($sImage);
 			}
 		}
@@ -329,9 +334,9 @@ CSS;
 	 *
 	 * @param array $aThemeParametersVariables
 	 * @param array $aStylesheetFiles
-	 * @param string $sThemeId: used only for logging purpose
+	 * @param string $sThemeId : used only for logging purpose
 	 *
-	 * @return array
+	 * @return array complete path of the images, but with slashes as dir separator instead of DIRECTORY_SEPARATOR
 	 * @since 2.8.0
 	 */
 	public static function GetIncludedImages($aThemeParametersVariables, $aStylesheetFiles, $sThemeId)
@@ -377,17 +382,17 @@ CSS;
 				&& ! array_key_exists($sImg, $aImages))
 			{
 				$sFilePath = realpath($sImg);
-				if ($sFilePath!==false)
-				{
-					$aImages[$sImg]=$sFilePath;
+				if ($sFilePath !== false) {
+					$sFilePathWithSlashes = str_replace('\\', '/', $sFilePath);
+					$aImages[$sImg] = $sFilePathWithSlashes;
 					continue;
 				}

-				$sCanonicalPath = static::CanonicalizePath($sTargetThemeFolderPath.DIRECTORY_SEPARATOR.$sImg);
-				$sFilePath=realpath($sCanonicalPath);
-				if ($sFilePath!==false)
-				{
-					$aImages[$sImg]=$sFilePath;
+				$sCanonicalPath = static::CanonicalizePath($sTargetThemeFolderPath.'/'.$sImg);
+				$sFilePath = realpath($sCanonicalPath);
+				if ($sFilePath !== false) {
+					$sFilePathWithSlashes = str_replace('\\', '/', $sFilePath);
+					$aImages[$sImg] = $sFilePathWithSlashes;
 					continue;
 				}

--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -2407,4 +2407,26 @@ class utils
 	{
 		return str_ireplace('<script', '&lt;script', $sHTML);
 	}
+
+	/**
+	 * @param \cmdbAbstractObject $oCmdbAbstract
+	 * @param \Exception $oException
+	 *
+	 * @throws \Exception
+	 * @since 2.7.2/ 2.8.0
+	 */
+	public static function EnrichRaisedException($oCmdbAbstract, $oException)
+	{
+		if (is_null($oCmdbAbstract) ||
+			! is_a($oCmdbAbstract, \cmdbAbstractObject::class))
+		{
+			throw $oException;
+		}
+
+		$sCmdbAbstractInfo = str_replace("\n", '', "" . $oCmdbAbstract);
+		$sMessage = $oException->getMessage() . " (" . $sCmdbAbstractInfo . ")";
+
+		$e = new CoreException($sMessage, null, '', $oException);
+		throw $e;
+	}
 }