Prepare usage of modules into custom dir

This commit is contained in:
Laurent Destailleur 2011-08-20 09:58:05 +00:00
parent ebfc75b0b3
commit bcb9a7a867

View File

@ -23,7 +23,7 @@
* \file htdocs/install/etape1.php
* \ingroup install
* \brief Build conf file on disk
* \version $Id: etape1.php,v 1.141 2011/08/16 09:05:39 eldy Exp $
* \version $Id: etape1.php,v 1.142 2011/08/20 09:58:05 eldy Exp $
*/
define('DONOTLOADCONF',1); // To avoid loading conf by file inc.php
@ -164,7 +164,7 @@ if ($action == "set")
// Les documents sont en dehors de htdocs car ne doivent pas pouvoir etre telecharges en passant outre l'authentification
$dir[0] = $main_data_dir."/mycompany";
$dir[1] = $main_data_dir."/users";
$dir[2] = $main_data_dir."/modules";
$dir[2] = $main_data_dir."/custom";
$dir[3] = $main_data_dir."/facture";
$dir[4] = $main_data_dir."/propale";
$dir[5] = $main_data_dir."/ficheinter";
@ -233,10 +233,10 @@ if ($action == "set")
}
/**
* Write main.inc.php and master.inc.php into documents dir
* Write main.inc.php and master.inc.php into documents/custom dir
*/
//$error+=write_main_file($main_data_dir.'/main.inc.php',$main_dir);
$error+=write_master_file($main_data_dir.'/master.inc.php',$main_dir);
$error+=write_main_file($main_data_dir.'/custom/main.inc.php',$main_dir);
$error+=write_master_file($main_data_dir.'/custom/master.inc.php',$main_dir);
/**
* Create database and admin user database
@ -527,7 +527,7 @@ pFooter($error,$setuplang,'jsinfo');
*
* @param mainfile Path to conf file to generate/update
*/
/*function write_main_file($mainfile,$main_dir)
function write_main_file($mainfile,$main_dir)
{
$fp = fopen("$mainfile", "w");
if($fp)
@ -539,7 +539,7 @@ pFooter($error,$setuplang,'jsinfo');
fputs($fp, '?>');
fclose($fp);
}
}*/
}
/**