diff --git a/htdocs/install/etape0.php b/htdocs/install/etape0.php index ebadf70c2115f5ced1502d8e6ac7bbf72aeeebf8..3c1a878fe77ff88bfc695b5154b1e18bef210f50 100644 --- a/htdocs/install/etape0.php +++ b/htdocs/install/etape0.php @@ -78,15 +78,19 @@ if (isset($_POST["db_create_user"]) && $_POST["db_create_user"] == "on") if ($_POST["db_type"] == 'mysql' ||$_POST["db_type"] == 'mysqli') { $databasefortest='mysql'; - }elseif ($_POST["db_type"] == 'pgsql') + } + elseif ($_POST["db_type"] == 'pgsql') { $databasefortest='postgres'; } - else{ + else + { $databasefortest='mssql'; } $db = new DoliDb($_POST["db_type"],$_POST["db_host"],$userroot,$passroot,$databasefortest); -}else{ +} +else +{ $db = new DoliDb($_POST["db_type"],$_POST["db_host"],$_POST["db_user"],$_POST["db_pass"],$_POST["db_name"]); } if ($db->error) diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index e65920fe24f8442df4241d9bfb7b4c60144d8fbc..4f333852b31402dfc15944461d96f2fa4d48d785 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -148,8 +148,15 @@ if ($_POST["action"] == "set") fputs($fp,"\n"); /* Authentication */ - fputs($fp, '$dolibarr_main_authentication="dolibarr";'); - fputs($fp,"\n"); + if ($_POST["db_type"] == 'mssql') + { + fputs($fp, '$dolibarr_main_authentication="dolibarr_mdb2";'); + } + else + { + fputs($fp, '$dolibarr_main_authentication="dolibarr";'); + } + fputs($fp,"\n"); /* Preparation integration SMARTY */ fputs($fp, '$dolibarr_smarty_libs_dir="";');