From c9d5743c4a3915167123901682619b39b005b8bf Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Thu, 18 Oct 2012 10:17:49 +0000
Subject: [PATCH] Config: use app_icon_url to change the hyperlink used when
 clicking on the main icon

SVN:trunk[2289]
---
 application/itopwebpage.class.inc.php  | 3 ++-
 application/loginwebpage.class.inc.php | 6 ++++--
 core/config.class.inc.php              | 8 ++++++++
 pages/logoff.php                       | 3 ++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 623ca0b00..63a3c718c 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -709,6 +709,7 @@ EOF
 				$sApplicationBanner .= '<div id="admin-banner"><span style="padding:5px;">'.Dict::Format('UI:ApplicationEnvironment', $sEnvLabel).$sBackButton.'<span></div>';
 			}
 
+			$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
 			$sOnlineHelpUrl = MetaModel::GetConfig()->Get('online_help');
 			//$sLogOffMenu = "<span id=\"logOffBtn\" style=\"height:55px;padding:0;margin:0;\"><img src=\"../images/onOffBtn.png\"></span>";
 
@@ -716,7 +717,7 @@ EOF
 			$sHtml .= '<!-- Beginning of the left pane -->';
 			$sHtml .= ' <div class="ui-layout-north">';
 			$sHtml .= ' <div id="header-logo">';
-			$sHtml .= ' <div id="top-left"></div><div id="logo"><a href="http://www.combodo.com/itop"><img src="../images/itop-logo.png" title="'.htmlentities($sVersionString, ENT_QUOTES, 'UTF-8').'" style="border:0; margin-top:16px; margin-right:40px;"/></a></div>';
+			$sHtml .= ' <div id="top-left"></div><div id="logo"><a href="'.htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8').'"><img src="../images/itop-logo.png" title="'.htmlentities($sVersionString, ENT_QUOTES, 'UTF-8').'" style="border:0; margin-top:16px; margin-right:40px;"/></a></div>';
 			$sHtml .= ' </div>';
 			$sHtml .= ' <div class="header-menu">';
 			$sHtml .= '		<div class="icon ui-state-default ui-corner-all"><span id="tPinMenu" class="ui-icon ui-icon-pin-w">pin</span></div>';
diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php
index 39ae11f6c..2ffbab5cd 100644
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -121,7 +121,8 @@ EOF
 			$sAuthPwd = utils::ReadParam('suggest_pwd', '', true, 'raw_data');
 	
 			$sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_VERSION);
-			$this->add("<div id=\"login-logo\"><a href=\"http://www.combodo.com/itop\"><img title=\"$sVersionShort\" src=\"../images/itop-logo-external.png\"></a></div>\n");
+			$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
+			$this->add("<div id=\"login-logo\"><a href=\"".htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8')."\"><img title=\"$sVersionShort\" src=\"../images/itop-logo-external.png\"></a></div>\n");
 			$this->add("<div id=\"login\">\n");
 			$this->add("<h1>".Dict::S('UI:Login:Welcome')."</h1>\n");
 			if ($bFailedLogin)
@@ -176,7 +177,8 @@ function DoCheckPwd()
 }
 EOF
 );
-		$this->add("<div id=\"login-logo\"><a href=\"http://www.combodo.com/itop\"><img title=\"$sVersionShort\" src=\"../images/itop-logo.png\"></a></div>\n");
+		$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
+		$this->add("<div id=\"login-logo\"><a href=\"".htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8')."\"><img title=\"$sVersionShort\" src=\"../images/itop-logo.png\"></a></div>\n");
 		$this->add("<div id=\"login\">\n");
 		$this->add("<h1>".Dict::S('UI:Login:ChangeYourPassword')."</h1>\n");
 		if ($bFailedLogin)
diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index 7874d61d7..837ca38b9 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -100,6 +100,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
 		),
+		'app_icon_url' => array(
+			'type' => 'string',
+			'description' => 'Hyperlink to redirect the user when clicking on the application icon (in the main window, or login/logoff pages)',
+			'default' => 'http://www.combodo.com/itop',
+			'value' => '',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		),
 		'skip_check_to_write' => array(
 			'type' => 'bool',
 			'description' => 'Disable data format and integrity checks to boost up data load (insert or update)',
diff --git a/pages/logoff.php b/pages/logoff.php
index e26beecf6..61b12f67b 100644
--- a/pages/logoff.php
+++ b/pages/logoff.php
@@ -51,7 +51,8 @@ switch($sLoginMode)
 }
 $oPage = new LoginWebPage();
 $sVersionShort = Dict::Format('UI:iTopVersion:Short', ITOP_VERSION);
-$oPage->add("<div id=\"login-logo\"><a href=\"http://www.combodo.com/itop\"><img title=\"$sVersionShort\" src=\"../images/itop-logo-external.png\"></a></div>\n");
+$sIconUrl = Utils::GetConfig()->Get('app_icon_url');
+$oPage->add("<div id=\"login-logo\"><a href=\"".htmlentities($sIconUrl, ENT_QUOTES, 'UTF-8')."\"><img title=\"$sVersionShort\" src=\"../images/itop-logo-external.png\"></a></div>\n");
 $oPage->add("<div id=\"login\">\n");
 $oPage->add("<h1>".Dict::S('UI:LogOff:ThankYou')."</h1>\n");