From 3bc142931717f96e8ca7b99b3ccf777ccce04036 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 2 Jun 2007 15:12:49 +0000
Subject: [PATCH] Ajout info mode authentification sur page logon

---
 htdocs/lib/functions.inc.php | 9 ++++-----
 htdocs/master.inc.php        | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php
index 0fdf30ac6b5..f20a9539bbf 100644
--- a/htdocs/lib/functions.inc.php
+++ b/htdocs/lib/functions.inc.php
@@ -1192,13 +1192,14 @@ function dol_loginfunction($notused,$pearstatus)
 	print '<td><input name="username" class="flat" size="15" maxlength="25" value="" tabindex="1" /></td>';
 
     // Affiche logo du theme si existe, sinon logo commun
+    if ($conf->main_authentication) $title.=$langs->trans("AuthenticationMode").': '.$conf->main_authentication;
     if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/login_logo.png'))
     {
-        print '<td rowspan="2"><img src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_logo.png"></td>';
+        print '<td rowspan="2"><img title="'.$title.'" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/login_logo.png"></td>';
     }
     else
     {
-        print '<td rowspan="2"><img src="'.DOL_URL_ROOT.'/theme/login_logo.png"></td>';
+        print '<td rowspan="2"><img title="'.$title.'" src="'.DOL_URL_ROOT.'/theme/login_logo.png"></td>';
     }
 
     print '</tr>';
@@ -1208,9 +1209,7 @@ function dol_loginfunction($notused,$pearstatus)
 	print '</td></tr>';
 
     print '<tr><td colspan="3" style="text-align:center;"><br>';
-    if ($dolibarr_main_authentication) $title.=$langs->trans("AuthenticationMode").': '.$dolibarr_main_authentication;
-
-    print '<input type="submit" class="button" value="&nbsp; '.$langs->trans("Connection").' &nbsp;" alt="'.$title.' tabindex="4" />';
+    print '<input type="submit" class="button" value="&nbsp; '.$langs->trans("Connection").' &nbsp;" tabindex="4" />';
     print '</td></tr>';
 
 	if (! $conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index f83aa2c3e6b..c6e949ef79c 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -118,6 +118,7 @@ if (! isset($character_set_client) || ! $character_set_client) $character_set_cl
 $conf->character_set_client=$character_set_client;
 if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_'; 
 $conf->db->prefix = $dolibarr_main_db_prefix;
+$conf->main_authentication = $dolibarr_main_authentication;
 
 // Defini prefix
 if (isset($_SERVER["LLX_DBNAME"])) $dolibarr_main_db_prefix=$_SERVER["LLX_DBNAME"];