lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: mise en page et dsactivation du captcha si module ldap ou autre

Browse Source
This commit is contained in:
Regis Houssin 2007-09-11 19:03:11 +00:00
parent 47224426fc
commit 67a9561650
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/other.lang
View File

@ -78,7 +78,7 @@ VolumeUnitmm3=mm<SUP>3</SUP>
BugTracker=Bug tracker BugTracker=Bug tracker
SendNewPasswordDesc=This form allows you to request a new passord. It will be send to your email address. Change will be effective only after clicking on confirmation link inside this email. Check your email reader software. SendNewPasswordDesc=This form allows you to request a new passord. It will be send to your email address. Change will be effective only after clicking on confirmation link inside this email. Check your email reader software.
BackToLoginPage=Back to login page BackToLoginPage=Back to login page
AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>. In this mode, Dolibarr can't know nor change your password. Contact your system administrator if you want to change your password. AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br>In this mode, Dolibarr can't know nor change your password.<br>Contact your system administrator if you want to change your password.
##### Webcal ##### ##### Webcal #####
LoginWebcal=Login for Webcalendar LoginWebcal=Login for Webcalendar
AddCalendarEntry=Add entry in calendar AddCalendarEntry=Add entry in calendar

33
htdocs/user/passwordforgotten.php
View File

@ -182,7 +182,7 @@ print '<form id="login" action="'.$_SERVER["PHP_SELF"].'" method="post" name="lo
print '<input type="hidden" name="action" value="buildnewpassword">'."\n"; print '<input type="hidden" name="action" value="buildnewpassword">'."\n";
// Table 1 // Table 1
print '<table cellpadding="0" cellspacing="0" border="0" align="center" width="400">'."\n"; print '<table cellpadding="0" cellspacing="0" border="0" align="center" width="450">'."\n";
if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png')) if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png'))
{ {
print '<tr><td colspan="3" style="text-align:center;">'; print '<tr><td colspan="3" style="text-align:center;">';
@ -196,13 +196,13 @@ print '</table>'."\n";
print '<br>'."\n"; print '<br>'."\n";
// Table 2 // Table 2
print '<table cellpadding="2" align="center" width="400">'."\n"; print '<table cellpadding="2" align="center" width="450">'."\n";
print '<tr><td colspan="3">&nbsp;</td></tr>'."\n"; print '<tr><td colspan="3">&nbsp;</td></tr>'."\n";
print '<tr><td align="left"> &nbsp; <b>'.$langs->trans("Login").'</b> &nbsp;</td>'; print '<tr><td align="left"> &nbsp; <b>'.$langs->trans("Login").'</b> &nbsp;</td>';
$disabled='disabled'; $disabled='disabled';
if ($mode == 'dolibarr') $disabled=''; if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') $disabled='';
print '<td><input '.$disabled.' name="username" class="flat" size="15" maxlength="25" value="'.(isset($_POST["username"])?$_POST["username"]:'').'" tabindex="1" /></td>'; print '<td><input '.$disabled.' name="username" class="flat" size="15" maxlength="25" value="'.(isset($_POST["username"])?$_POST["username"]:'').'" tabindex="1" /></td>';
@ -230,29 +230,32 @@ print '></td>';
print '</tr>'."\n"; print '</tr>'."\n";
//print "Info session: ".session_name().session_id();print_r($_SESSION); if ($conf->global->MAIN_SECURITY_ENABLECAPTCHA && !$disabled)
$cryptinstall = DOL_URL_ROOT.'/includes/cryptographp'; {
print '<tr><td align="left"> &nbsp; <b>'.$langs->trans("SecurityCode").'</b></td>'; //print "Info session: ".session_name().session_id();print_r($_SESSION);
print '<td><input type="text" size="15" maxlength="10" name="code" tabindex="3"></td>'; $cryptinstall = DOL_URL_ROOT.'/includes/cryptographp';
print '<td align="center">'; print '<tr><td align="left"> &nbsp; <b>'.$langs->trans("SecurityCode").'</b></td>';
dsp_crypt('dolibarr.cfg.php',1); print '<td><input type="text" size="15" maxlength="10" name="code" tabindex="3"></td>';
print '</td>'; print '<td align="center">';
print '</tr>'; dsp_crypt('dolibarr.cfg.php',1);
print '</td>';
print '</tr>';
}
print "<tr>".'<td align="center" colspan="3"><input class="button" value="'.$langs->trans("SendNewPassword").'" type="submit"></td></tr>'."\n"; print "<tr>".'<td align="center" colspan="3"><input '.$disabled.' class="button" value="'.$langs->trans("SendNewPassword").'" type="submit"></td></tr>'."\n";
print "</table>"."\n"; print "</table>"."\n";
print "</form>"."\n"; print "</form>"."\n";
print '<center>'."\n"; print '<center>'."\n";
print '<table width="90%"><tr><td>'; print '<table width="90%"><tr><td align="center">';
if (! $mode == 'dolibarr' || $conf->global->MAIN_SECURITY_FORCEFORGETPASSLINK) if (($mode == 'dolibarr' || $mode == 'dolibarr_mdb2'))
{ {
print '<font style="font-size: 14px;">'.$langs->trans("SendNewPasswordDesc").'</font>'."\n"; print '<font style="font-size: 14px;">'.$langs->trans("SendNewPasswordDesc").'</font>'."\n";
} }
else else
{ {
print '<div class="warning">'.$langs->trans("AuthenticationDoesNotAllowSendNewPassword",$mode).'</div>'."\n"; print '<div class="warning" align="center">'.$langs->trans("AuthenticationDoesNotAllowSendNewPassword",$mode).'</div>'."\n";
} }
print '</td></tr></table><br>'; print '</td></tr></table><br>';