From 194cc073964c28adda3d36f6790bf7504f5079ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Jan 2010 23:54:42 +0000 Subject: [PATCH] Rename the dol_loginfunction2 into dol_loginfunction to keep only one function. This function can support smarty templates and php template. --- htdocs/core/templates/login.tpl.php | 35 +++---- htdocs/lib/security.lib.php | 152 ++++++++++++++++------------ htdocs/main.inc.php | 92 ++++++++--------- 3 files changed, 147 insertions(+), 132 deletions(-) diff --git a/htdocs/core/templates/login.tpl.php b/htdocs/core/templates/login.tpl.php index 6b309292d58..b9c41bc4d55 100644 --- a/htdocs/core/templates/login.tpl.php +++ b/htdocs/core/templates/login.tpl.php @@ -23,6 +23,9 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client); ?> + + @@ -55,10 +58,7 @@ function donnefocus() { } - +global->MAIN_HTML_HEADER ?> @@ -107,7 +107,7 @@ function donnefocus() { - +
@@ -124,7 +124,7 @@ function donnefocus() { if ($forgetpasslink || $helpcenterlink) { echo ''; if ($forgetpasslink) { - echo '('; + echo '('; echo $langs->trans('PasswordForgotten'); if (! $helpcenterlink) { echo ')'; @@ -133,7 +133,7 @@ function donnefocus() { } if ($helpcenterlink) { - echo ''; + echo ''; if ($forgetpasslink) { echo ' - '; } else { @@ -165,11 +165,11 @@ function donnefocus() {