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

Reorg code install

Browse Source
This commit is contained in:
Laurent Destailleur 2006-10-20 21:42:57 +00:00
parent cac9c8b79f
commit c51e43593d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/install/etape1.php
View File

@ -134,7 +134,7 @@ if ($_POST["action"] == "set")
if (file_exists("$conffile")) if (file_exists("$conffile"))
{ {
include ("$conffile"); include_once("$conffile");
print "<tr><td>".$langs->trans("ConfigurationSaving")."</td><td>".$langs->trans("OK")."</td>"; print "<tr><td>".$langs->trans("ConfigurationSaving")."</td><td>".$langs->trans("OK")."</td>";
} }
else else
@ -153,7 +153,7 @@ if ($_POST["action"] == "set")
} }
// Chargement driver acces bases // Chargement driver acces bases
include_once("../lib/databases/".$dolibarr_main_db_type.".lib.php"); require_once($dolibarr_main_document_root."/lib/databases/".$dolibarr_main_db_type.".lib.php");
} }

6
htdocs/install/etape5.php
View File

@ -29,11 +29,6 @@
*/ */
include_once("./inc.php"); include_once("./inc.php");
if (file_exists($conffile)) include_once($conffile);
if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix);
require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php");
require_once($dolibarr_main_document_root . "/conf/conf.class.php");
$setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto'); $setuplang=isset($_POST["selectlang"])?$_POST["selectlang"]:(isset($_GET["selectlang"])?$_GET["selectlang"]:'auto');
$langs->setDefaultLang($setuplang); $langs->setDefaultLang($setuplang);
@ -82,7 +77,6 @@ if ($_POST["action"] == "set" || $_POST["action"] == "upgrade")
print '<table cellspacing="0" cellpadding="2" width="100%">'; print '<table cellspacing="0" cellpadding="2" width="100%">';
$error=0; $error=0;
$conf = new Conf();
$conf->db->type = $dolibarr_main_db_type; $conf->db->type = $dolibarr_main_db_type;
$conf->db->host = $dolibarr_main_db_host; $conf->db->host = $dolibarr_main_db_host;
$conf->db->name = $dolibarr_main_db_name; $conf->db->name = $dolibarr_main_db_name;

2
htdocs/install/fileconf.php
View File

@ -42,8 +42,6 @@ $langs->load("install");
pHeader($langs->trans("ConfigurationFile"),"etape1"); pHeader($langs->trans("ConfigurationFile"),"etape1");
// Ici, le fichier conf.php existe et est forcément editable car le test a été fait précédemment.
include_once($conffile);
print '<table border="0" cellpadding="1" cellspacing="0">'; print '<table border="0" cellpadding="1" cellspacing="0">';

12
htdocs/install/inc.php
View File

@ -29,9 +29,17 @@
require_once('../translate.class.php'); require_once('../translate.class.php');
require_once('../lib/functions.inc.php'); require_once('../lib/functions.inc.php');
$docurl = '<a href="doc/dolibarr-install.html">documentation</a>';
$conffile = "../conf/conf.php"; $conffile = "../conf/conf.php";
if (file_exists($conffile))
{
include_once($conffile);
require_once($dolibarr_main_document_root . "/conf/conf.class.php");
require_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".lib.php");
$conf=new Conf();
}
if (! isset($dolibarr_main_db_prefix) || ! $dolibarr_main_db_prefix) $dolibarr_main_db_prefix='llx_';
define('MAIN_DB_PREFIX',$dolibarr_main_db_prefix);
define('DOL_DOCUMENT_ROOT','../'); define('DOL_DOCUMENT_ROOT','../');