From 6358b7f0380b8f9268a7270e43ec500cb80ca1af Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Dec 2004 23:24:25 +0000 Subject: [PATCH] =?UTF-8?q?Qual:=20Toutes=20les=20g=E9n=E9rations=20d'imag?= =?UTF-8?q?es=20se=20font=20dans=20un=20r=E9pertoire=20nomm=E9=20$conf->mo?= =?UTF-8?q?dule->dir=5Fimages.=20Cela=20rend=20uniforme=20le=20code=20qui?= =?UTF-8?q?=20des=20fois=20utilisait=20des=20chemins=20en=20dir,=20des=20f?= =?UTF-8?q?ois=20document=20avec=20s=20et=20des=20fois=20sans.=20Toutes=20?= =?UTF-8?q?les=20images=20sont=20dor=E9navant=20dans=20htdocs/images.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/docsoc.php | 4 ++- .../includes/modules/modPrelevement.class.php | 8 +++--- .../includes/modules/modTelephonie.class.php | 12 ++++----- htdocs/master.inc.php | 26 ++++++++++++++----- 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/htdocs/docsoc.php b/htdocs/docsoc.php index 26be770828f..4098aa71c79 100644 --- a/htdocs/docsoc.php +++ b/htdocs/docsoc.php @@ -36,7 +36,9 @@ llxHeader(); $mesg = ""; $socid=$_GET["socid"]; -$upload_dir = SOCIETE_OUTPUTDIR . "/" . $socid ; +if (! is_dir($conf->societe->dir_output)) { mkdir($conf->societe->dir_output); } + +$upload_dir = $conf->societe->dir_output . "/" . $socid ; if (! is_dir($upload_dir)) { diff --git a/htdocs/includes/modules/modPrelevement.class.php b/htdocs/includes/modules/modPrelevement.class.php index 7f5cef6f06b..216dd5ccbca 100644 --- a/htdocs/includes/modules/modPrelevement.class.php +++ b/htdocs/includes/modules/modPrelevement.class.php @@ -45,6 +45,8 @@ class modPrelevement extends DolibarrModules */ function modPrelevement($DB) { + global $conf; + $this->db = $DB ; $this->numero = 57 ; @@ -57,7 +59,7 @@ class modPrelevement extends DolibarrModules // Dir $this->dirs = array(); - $this->data_directory = DOL_DATA_ROOT . "/prelevement/bon/"; + $this->data_directory = $conf->prelevement->dir_output . "/bon"; // Dépendances $this->depends = array(); @@ -102,8 +104,8 @@ class modPrelevement extends DolibarrModules $this->rights[2][3] = 0; // Dir - $this->dirs[0] = DOL_DATA_ROOT . "/prelevement/" ; - $this->dirs[1] = DOL_DATA_ROOT . "/prelevement/bon" ; + $this->dirs[0] = $conf->prelevement->dir_output; + $this->dirs[1] = $conf->prelevement->dir_output."/bon" ; $sql = array(); diff --git a/htdocs/includes/modules/modTelephonie.class.php b/htdocs/includes/modules/modTelephonie.class.php index 170426bdcec..d28a1d61909 100644 --- a/htdocs/includes/modules/modTelephonie.class.php +++ b/htdocs/includes/modules/modTelephonie.class.php @@ -122,12 +122,12 @@ class modTelephonie extends DolibarrModules $this->rights[6][5] = 'creer'; // Dir - $this->dirs[0] = DOL_DATA_ROOT . "/telephonie/" ; - $this->dirs[1] = DOL_DATA_ROOT . "/telephonie/ligne/" ; - $this->dirs[2] = DOL_DATA_ROOT . "/telephonie/ligne/commande" ; - $this->dirs[3] = DOL_DATA_ROOT . "/telephonie/logs" ; - $this->dirs[4] = DOL_DATA_ROOT . "/telephonie/client" ; - $this->dirs[5] = DOL_DATA_ROOT . "/telephonie/rapports" ; + $this->dirs[0] = $conf->telephonie->dir_output; + $this->dirs[1] = $conf->telephonie->dir_output."/ligne"; + $this->dirs[2] = $conf->telephonie->dir_output."/ligne/commande" ; + $this->dirs[3] = $conf->telephonie->dir_output."/logs" ; + $this->dirs[4] = $conf->telephonie->dir_output."/client" ; + $this->dirs[5] = $conf->telephonie->dir_output."/rapports" ; return $this->_init($sql); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 00921f19de3..a630bdeaaf0 100644 --- a/htdocs/master.inc.php +++ b/htdocs/master.inc.php @@ -53,10 +53,15 @@ if (! isset($dolibarr_main_db_type)) { $dolibarr_main_db_type='mysql'; // Pour compatibilité avec anciennes configs, si non défini, on prend 'mysql' } - +if (! $dolibarr_main_data_root) { + // Si le répertoire documents non défini, on utilise celui par défaut + $dolibarr_main_data_root=ereg_replace("/htdocs","",$dolibarr_main_document_root); + $dolibarr_main_data_root.="/documents"; +} define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root); define('DOL_DATA_ROOT', $dolibarr_main_data_root); + if (strtolower(substr($dolibarr_main_url_root, 0, 7)) == 'http://') { $uri = substr($dolibarr_main_url_root, 7); @@ -164,20 +169,24 @@ if (defined("MAIN_MODULE_EXTERNALRSS")) if (defined("MAIN_MODULE_COMMANDE")) { $conf->commande->enabled=MAIN_MODULE_COMMANDE; - $conf->commande->dir_ouput=DOL_DATA_ROOT."/documents/commande"; + $conf->commande->dir_ouput=DOL_DATA_ROOT."/commande"; $conf->commande->dir_images=DOL_DOCUMENT_ROOT."/images/commande"; $conf->commande->url_images=DOL_URL_ROOT."/images/commande"; } if (defined("MAIN_MODULE_EXPEDITION")) { $conf->expedition->enabled=MAIN_MODULE_EXPEDITION; - $conf->expedition->dir_ouput=DOL_DATA_ROOT."/documents/expedition"; + $conf->expedition->dir_ouput=DOL_DATA_ROOT."/expedition"; $conf->expedition->dir_images=DOL_DOCUMENT_ROOT."/images/expedition"; $conf->expedition->url_images=DOL_URL_ROOT."/images/expedition"; } if (defined("MAIN_MODULE_SOCIETE")) { $conf->societe->enabled=MAIN_MODULE_SOCIETE; + $conf->societe->dir_ouput=DOL_DATA_ROOT."/societe"; + if (defined(SOCIETE_OUTPUTDIR) && SOCIETE_OUTPUTDIR) { $conf->societe->dir_ouput=SOCIETE_OUTPUTDIR; } + $conf->societe->dir_images=DOL_DOCUMENT_ROOT."/images/societe"; + $conf->societe->url_images=DOL_URL_ROOT."/images/societe"; require_once(DOL_DOCUMENT_ROOT ."/societe.class.php"); } if (defined("MAIN_MODULE_COMMERCIAL")) @@ -216,7 +225,7 @@ if (defined("MAIN_MODULE_ADHERENT")) if (defined("MAIN_MODULE_PRODUIT")) { $conf->produit->enabled=MAIN_MODULE_PRODUIT; - $conf->produit->dir_ouput=DOL_DATA_ROOT."/documents/produit"; + $conf->produit->dir_ouput=DOL_DATA_ROOT."/produit"; $conf->produit->dir_images=DOL_DOCUMENT_ROOT."/images/produit"; $conf->produit->url_images=DOL_URL_ROOT."/images/produit"; require_once(DOL_DOCUMENT_ROOT ."/product.class.php"); @@ -224,7 +233,7 @@ if (defined("MAIN_MODULE_PRODUIT")) if (defined("MAIN_MODULE_SERVICE")) { $conf->service->enabled=MAIN_MODULE_SERVICE; - $conf->service->dir_ouput=DOL_DATA_ROOT."/documents/produit"; + $conf->service->dir_ouput=DOL_DATA_ROOT."/produit"; $conf->service->dir_images=DOL_DOCUMENT_ROOT."/images/produit"; $conf->service->url_images=DOL_URL_ROOT."/images/produit"; require_once(DOL_DOCUMENT_ROOT ."/product.class.php"); @@ -260,6 +269,9 @@ if (defined("MAIN_MODULE_POSTNUKE")) if (defined("MAIN_MODULE_TELEPHONIE")) { $conf->telephonie->enabled=MAIN_MODULE_TELEPHONIE; + $conf->telephonie->dir_ouput=DOL_DATA_ROOT."/telephonie"; + $conf->telephonie->dir_images=DOL_DOCUMENT_ROOT."/images/telephonie"; + $conf->telephonie->url_images=DOL_URL_ROOT."/images/telephonie"; } if (defined("MAIN_MODULE_PRELEVEMENT")) { @@ -278,7 +290,7 @@ if (defined("MAIN_MODULE_FACTURE")) { $conf->facture->enabled=MAIN_MODULE_FACTURE; require_once(DOL_DOCUMENT_ROOT ."/includes/modules/facture/modules_facture.php"); - $conf->facture->dir_ouput=DOL_DATA_ROOT."/documents/facture"; + $conf->facture->dir_ouput=DOL_DATA_ROOT."/facture"; $conf->facture->dir_images=DOL_DOCUMENT_ROOT."/images/facture"; $conf->facture->url_images=DOL_URL_ROOT."/images/facture"; } @@ -286,7 +298,7 @@ if (defined("MAIN_MODULE_PROPALE")) { $conf->propal->enabled=MAIN_MODULE_PROPALE; require_once(DOL_DOCUMENT_ROOT ."/includes/modules/propale/modules_propale.php"); - $conf->propale->dir_ouput=DOL_DATA_ROOT."/documents/propale"; + $conf->propale->dir_ouput=DOL_DATA_ROOT."/propale"; $conf->propale->dir_images=DOL_DOCUMENT_ROOT."/images/propale"; $conf->propale->url_images=DOL_URL_ROOT."/images/propale";