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

Qual: Remove deprecated code

Browse Source
This commit is contained in:
Laurent Destailleur 2010-04-04 23:46:53 +00:00
parent 92df58e7ba
commit b5bc6dac90
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/tpl/passwordforgotten.tpl
View File

@ -115,7 +115,7 @@ function donnefocus() {ldelim}
<center> <center>
<table width="90%"><tr><td align="center"> <table width="90%"><tr><td align="center">
{if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') || (! $disabled)} {if ($mode == 'dolibarr') || (! $disabled)}
<font style="font-size: 12px;"> <font style="font-size: 12px;">
{$langs->trans('SendNewPasswordDesc')} {$langs->trans('SendNewPasswordDesc')}
</font> </font>

9
htdocs/install/etape1.php
View File

@ -557,14 +557,7 @@ function write_conf_file($conffile)
fputs($fp,"\n"); fputs($fp,"\n");
/* Authentication */ /* Authentication */
if ($_POST["db_type"] == 'mssql') fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';');
{
fputs($fp, '$dolibarr_main_authentication=\'dolibarr_mdb2\';');
}
else
{
fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';');
}
fputs($fp,"\n"); fputs($fp,"\n");
fputs($fp, '?>'); fputs($fp, '?>');

2
htdocs/theme/phones/iphone/tpl/user/passwordforgotten.tpl
View File

@ -100,7 +100,7 @@
<ul class="pageitem"> <ul class="pageitem">
<li class="textbox"> <li class="textbox">
<span class="header">{$langs->trans('Infos')}</span> <span class="header">{$langs->trans('Infos')}</span>
{if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') || (! $disabled)} {if ($mode == 'dolibarr') || (! $disabled)}
{$langs->trans('SendNewPasswordDesc')} {$langs->trans('SendNewPasswordDesc')}
{else} {else}
{$langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode)} {$langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode)}

6
htdocs/user/passwordforgotten.php
View File

@ -200,7 +200,7 @@ if ($conf->global->MAIN_SMARTY)
// Send password button enabled ? // Send password button enabled ?
$disabled='disabled'; $disabled='disabled';
if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') $disabled=''; if ($mode == 'dolibarr') $disabled='';
if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled=''; // To force button enabled if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled=''; // To force button enabled
$smarty->assign('disabled', $disabled); $smarty->assign('disabled', $disabled);
@ -325,7 +325,7 @@ else
// Send password button enabled ? // Send password button enabled ?
$disabled='disabled'; $disabled='disabled';
if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') $disabled=''; if ($mode == 'dolibarr') $disabled='';
if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled=''; // To force button enabled if ($conf->global->MAIN_SECURITY_ENABLE_SENDPASSWORD) $disabled=''; // To force button enabled
// Table 2 // Table 2
@ -388,7 +388,7 @@ else
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') || (! $disabled)) if (($mode == 'dolibarr') || (! $disabled))
{ {
print '<font style="font-size: 12px;">'.$langs->trans("SendNewPasswordDesc").'</font>'."\n"; print '<font style="font-size: 12px;">'.$langs->trans("SendNewPasswordDesc").'</font>'."\n";
} }