diff --git a/htdocs/core/tpl/passwordforgotten.tpl b/htdocs/core/tpl/passwordforgotten.tpl index 88a5cdd5212..d2647e349fc 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl +++ b/htdocs/core/tpl/passwordforgotten.tpl @@ -115,7 +115,7 @@ function donnefocus() {ldelim}
- {if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') || (! $disabled)} + {if ($mode == 'dolibarr') || (! $disabled)} {$langs->trans('SendNewPasswordDesc')} diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index 471568a12bd..cafe797ddbf 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -557,14 +557,7 @@ function write_conf_file($conffile) fputs($fp,"\n"); /* Authentication */ - if ($_POST["db_type"] == 'mssql') - { - fputs($fp, '$dolibarr_main_authentication=\'dolibarr_mdb2\';'); - } - else - { - fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';'); - } + fputs($fp, '$dolibarr_main_authentication=\'dolibarr\';'); fputs($fp,"\n"); fputs($fp, '?>'); diff --git a/htdocs/theme/phones/iphone/tpl/user/passwordforgotten.tpl b/htdocs/theme/phones/iphone/tpl/user/passwordforgotten.tpl index 20772f20cef..74fafd1da09 100644 --- a/htdocs/theme/phones/iphone/tpl/user/passwordforgotten.tpl +++ b/htdocs/theme/phones/iphone/tpl/user/passwordforgotten.tpl @@ -100,7 +100,7 @@
  • {$langs->trans('Infos')} - {if ($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') || (! $disabled)} + {if ($mode == 'dolibarr') || (! $disabled)} {$langs->trans('SendNewPasswordDesc')} {else} {$langs->trans('AuthenticationDoesNotAllowSendNewPassword', $mode)} diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php index 138c01a2d05..4160f650197 100644 --- a/htdocs/user/passwordforgotten.php +++ b/htdocs/user/passwordforgotten.php @@ -200,7 +200,7 @@ if ($conf->global->MAIN_SMARTY) // Send password button enabled ? $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 $smarty->assign('disabled', $disabled); @@ -325,7 +325,7 @@ else // Send password button enabled ? $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 // Table 2 @@ -388,7 +388,7 @@ else print '
    '."\n"; print '
    '; - if (($mode == 'dolibarr' || $mode == 'dolibarr_mdb2') || (! $disabled)) + if (($mode == 'dolibarr') || (! $disabled)) { print ''.$langs->trans("SendNewPasswordDesc").''."\n"; }