Fix: W3C syntax error (See firefox module HTML Validator / Tidy)

ddb2e5c4 · Laurent Destailleur · 380be061 · ddb2e5c4 · ddb2e5c4
Commit ddb2e5c4 authored Dec 28, 2009 by Laurent Destailleur
--- a/htdocs/core/templates/login.tpl
+++ b/htdocs/core/templates/login.tpl
@@ -21,9 +21,8 @@
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
 {/php}
-<!-- BEGIN SMARTY TEMPLATE -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!-- BEGIN SMARTY TEMPLATE -->
 <html>
 <head>
@@ -124,6 +123,10 @@ function donnefocus() {ldelim}
 		{if $forgetpasslink}
 			<a style="color: #888888; font-size: 10px" href="{$dol_url_root}/user/passwordforgotten.php">(
 			{$langs->trans('PasswordForgotten')}
+			{if ! $helpcenterlink}
+			)
+			{/if}
+			</a>
 		{/if}
 		{if $helpcenterlink}
@@ -133,9 +136,8 @@ function donnefocus() {ldelim}
 			{else}
 				(
 			{/if}  
-			{$langs->trans('NeedHelpCenter')}
+			{$langs->trans('NeedHelpCenter')})</a>			
 		{/if}
-		)</a>
 		{/strip}
 		</td></tr>
 	{/if}

--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -248,10 +248,13 @@ function dol_loginfunction($langs,$conf,$mysoc)
 		if (! empty($conf->browser->phone)) print '<tr><td colspan="3">&nbsp;</td></tr>';	// More space with phones
 		print '<tr><td colspan="3" align="center">';
 		if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
 		{
 			print '<a style="color: #888888; font-size: 10px" href="'.DOL_URL_ROOT.'/user/passwordforgotten.php">(';
 			print $langs->trans("PasswordForgotten");
+			if (! empty($conf->global->MAIN_HELPCENTER_DISABLELINK)) print ')';
+			print '</a>';
 		}
 		if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
@@ -261,8 +264,9 @@ function dol_loginfunction($langs,$conf,$mysoc)
 			if (! empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)) print '(';
 			else print '  -  ';
 			print $langs->trans("NeedHelpCenter");
-		}
 			print ')</a>';
+		}
 		print '</td></tr>';
 	}