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

Fix: Si fonction GD non active, affichage code graphique desactive.

Browse Source
This commit is contained in:
Laurent Destailleur 2007-09-15 01:26:58 +00:00
parent 1f94839f09
commit a18a2d4844
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/user.class.php
View File

@ -1248,7 +1248,7 @@ class User
} }
else else
{ {
$this->error=$langs->trans("ErrorFailedToSendPassword"); $this->error=$langs->trans("ErrorFailedToSendPassword").' '.$mailfile->error;
//print nl2br($mesg); //print nl2br($mesg);
return -1; return -1;
} }

28
htdocs/user/passwordforgotten.php
View File

@ -78,7 +78,7 @@ if ($_GET["action"] == 'validatenewpassword' && $_GET["username"] && $_GET["pass
if ($_POST["action"] == 'buildnewpassword' && $_POST["username"]) if ($_POST["action"] == 'buildnewpassword' && $_POST["username"])
{ {
// Verifie code // Verifie code
if (! chk_crypt($_POST['code'])) if (function_exists("imagecreatefrompng") && ! chk_crypt($_POST['code']))
{ {
$message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>'; $message = '<div class="error">'.$langs->trans("ErrorBadValueForCode").'</div>';
} }
@ -195,15 +195,17 @@ else
print '</table>'."\n"; print '</table>'."\n";
print '<br>'."\n"; print '<br>'."\n";
// Send password button enabled ?
$disabled='disabled';
if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') $disabled='';
if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled=''; // To force button enabled
// Table 2 // Table 2
print '<table cellpadding="2" align="center" width="450">'."\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';
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>';
$title=''; $title='';
@ -230,16 +232,16 @@ print '></td>';
print '</tr>'."\n"; print '</tr>'."\n";
if ($conf->global->MAIN_SECURITY_ENABLECAPTCHA && !$disabled) if (function_exists("imagecreatefrompng") && ! $disabled)
{ {
//print "Info session: ".session_name().session_id();print_r($_SESSION); //print "Info session: ".session_name().session_id();print_r($_SESSION);
$cryptinstall = DOL_URL_ROOT.'/includes/cryptographp'; $cryptinstall = DOL_URL_ROOT.'/includes/cryptographp';
print '<tr><td align="left"> &nbsp; <b>'.$langs->trans("SecurityCode").'</b></td>'; print '<tr><td align="left"> &nbsp; <b>'.$langs->trans("SecurityCode").'</b></td>';
print '<td><input type="text" size="15" maxlength="10" name="code" tabindex="3"></td>'; print '<td><input type="text" size="15" maxlength="10" name="code" tabindex="3"></td>';
print '<td align="center">'; print '<td align="center">';
dsp_crypt('dolibarr.cfg.php',1); dsp_crypt('dolibarr.cfg.php',1);
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }
print "<tr>".'<td align="center" colspan="3"><input '.$disabled.' 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";
@ -249,7 +251,7 @@ print "</form>"."\n";
print '<center>'."\n"; print '<center>'."\n";
print '<table width="90%"><tr><td align="center">'; print '<table width="90%"><tr><td align="center">';
if (($mode == 'dolibarr' || $mode == 'dolibarr_mdb2')) if (($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') || (! $disabled))
{ {
print '<font style="font-size: 14px;">'.$langs->trans("SendNewPasswordDesc").'</font>'."\n"; print '<font style="font-size: 14px;">'.$langs->trans("SendNewPasswordDesc").'</font>'."\n";
} }