Qual: Reduce quantity of code. Make code simpler

htdocs/comm/action/rapport/index.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Eric Seigne          <erics@rycks.com>
- * Copyright (C) 2004-2008 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -107,7 +107,7 @@ if ($resql)
 
 			$name = "actions-".$obj->month."-".$obj->year.".pdf";
 			$relativepath= $name;
-			$file = $conf->commercial->dir_actions_temp."/".$name;
+			$file = $conf->agenda->dir_temp."/".$name;
 
 			if (file_exists($file))
 			{

htdocs/compta/prelevement/bon-prelevement.class.php

@@ -830,7 +830,7 @@ class BonPrelevement extends CommonObject
                 {
                     $prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
 
-                    $dir=$conf->prelevement->dir_bon;
+                    $dir=$conf->prelevement->dir_output.'/receipts';
                     $file=$filebonprev;
                     if (! is_dir($dir)) create_exdir($dir);
 

htdocs/compta/prelevement/fiche.php

@@ -58,7 +58,7 @@ if ($_POST["action"] == 'infotrans')
 
 	if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $bon->ref)
 	{
-		$dir = $conf->prelevement->dir_bon;
+		$dir = $conf->prelevement->dir_output.'/receipts';
 
 		if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . $_FILES['userfile']['name'],1) > 0)
 		{

htdocs/includes/modules/modAdherent.class.php

@@ -61,19 +61,7 @@ class modAdherent extends DolibarrModules
         $this->picto='user';
 
         // Data directories to create when module is enabled
-        $this->dirs = array();
+        $this->dirs = array("/adherent/temp");
-        $r=0;
-        
-        $this->dirs[$r][0] = "output";
-        $this->dirs[$r][1] = "/adherent";
-        
-        $r++;
-        $this->dirs[$r][0] = "temp";
-        $this->dirs[$r][1] = "/adherent/temp";
-        
-        $r++;
-        $this->dirs[$r][0] = "photos";
-        $this->dirs[$r][1] = "/adherent/photos";
 
         // Config pages
         //-------------

htdocs/includes/modules/modBanque.class.php

@@ -65,23 +65,15 @@ class modBanque extends DolibarrModules
 		$this->picto='account';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/banque/temp");
-		$r=0;
 
-		$this->dirs[$r][0] = "output";
+		// Dependancies
-		$this->dirs[$r][1] = "/banque";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/banque/temp";
-
-	  // Dépendances
 		$this->depends = array();
 		$this->requiredby = array("modComptabilite","modComptabiliteExpert");
 		$this->conflictwith = array();
 		$this->langfiles = array("banks","compta","bills","companies");
 
-	  // Constantes
+		// Constants
 		$this->const = array();
 
 		// Boites

htdocs/includes/modules/modBarcode.class.php

@@ -59,15 +59,7 @@ class modBarcode extends DolibarrModules
 		$this->picto='barcode';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/barcode/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/barcode";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/barcode/temp";
 
 		// Dependances
 		$this->depends = array("modProduit");

htdocs/includes/modules/modBookmark.class.php

@@ -18,15 +18,15 @@
  */
 
 /**
- \defgroup   bookmark    Module Bookmark
+ *	\defgroup   bookmark    Module Bookmark
- \brief      Module pour g<EFBFBD>rer les Bookmarks
+ *	\brief      Module to manage Bookmarks
- \version	$Id$
+ *	\version	$Id$
  */
 
 /**
- \file       htdocs/includes/modules/modBookmark.class.php
+ *	\file       htdocs/includes/modules/modBookmark.class.php
- \ingroup    bookmark
+ *	\ingroup    bookmark
- \brief      Fichier de description et activation du module Bookmarks
+ *	\brief      Fichier de description et activation du module Bookmarks
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -61,7 +61,7 @@ class modBookmark extends DolibarrModules
 		$this->special = 2;
 		$this->picto='bookmark';
 
-		// Dir
+		// Data directories to create when module is enabled
 		$this->dirs = array();
 
 		// Dependancies

htdocs/includes/modules/modBoutique.class.php

@@ -58,20 +58,20 @@ class modBoutique extends DolibarrModules
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 1;
 
-		// Dir
+		// Data directories to create when module is enabled
 		$this->dirs = array();
 
 		// Config pages
 //		$this->config_page_url = array("boutique.php","osc-languages.php");
 		$this->config_page_url = array("boutique.php");
 
-		// Dependances
+		// Dependancies
 		$this->depends = array();
 		$this->requiredby = array();
 	    $this->conflictwith = array("modOSCommerceWS");
 	   	$this->langfiles = array("shop");
 
-		// Constantes
+		// Constants
 		$this->const = array();
 
 	    // Boites

htdocs/includes/modules/modCashDesk.class.php

@@ -31,8 +31,8 @@ include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
 
 /**
-        \class      modCategorie
+ *       \class      modCategorie
-        \brief      Classe de description et activation du module Categorie
+ *       \brief      Classe de description et activation du module Categorie
  */
 class modCashDesk extends DolibarrModules
 {
@@ -63,7 +63,7 @@ class modCashDesk extends DolibarrModules
 		$this->special = 0;
 		$this->picto = 'generic';
 
-		// Dir
+		// Data directories to create when module is enabled
 		$this->dirs = array();
 
 		// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.

htdocs/includes/modules/modCategorie.class.php

@@ -58,7 +58,7 @@ class modCategorie extends DolibarrModules
 		$this->special = 2;
 		$this->picto = 'generic';
 
-		// Dir
+		// Data directories to create when module is enabled
 		$this->dirs = array();
 
 		// Dependencies

htdocs/includes/modules/modClickToDial.class.php

@@ -60,7 +60,7 @@ class modClickToDial extends DolibarrModules
 		$this->special = 1;
 		$this->picto='phoning';
 
-		// Dir
+		// Data directories to create when module is enabled
 		$this->dirs = array();
 
 		// Dependencies

htdocs/includes/modules/modCommande.class.php

@@ -64,15 +64,7 @@ class modCommande extends DolibarrModules
 		$this->picto='order';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/commande/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/commande";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/commande/temp";
 
 		// Config pages
 		$this->config_page_url = array("commande.php");

htdocs/includes/modules/modCommercial.class.php

@@ -62,29 +62,13 @@ class modCommercial extends DolibarrModules
     $this->picto='commercial';
 
     // Data directories to create when module is enabled
-    $this->dirs = array();
+    $this->dirs = array("/comm/temp");
-    $r=0;
-      
-    $this->dirs[$r][0] = "output";
-    $this->dirs[$r][1] = "/comm";
-      
-    $r++;
-    $this->dirs[$r][0] = "temp";
-    $this->dirs[$r][1] = "/comm/temp";
-    
-    $r++;
-    $this->dirs[$r][0] = "actions";
-    $this->dirs[$r][1] = "/action";
-    
-    $r++;
-    $this->dirs[$r][0] = "actions_temp";
-    $this->dirs[$r][1] = "/action/temp";
 
     // Dependancies
     $this->depends = array("modSociete");
     $this->requiredby = array("modPropale","modContrat","modCommande","modFicheinter");
 
-    // Constantes
+    // Constants
     $this->const = array();
 
     // Boxes

htdocs/includes/modules/modComptabiliteExpert.class.php

@@ -77,43 +77,9 @@ class modComptabiliteExpert extends DolibarrModules
 		$this->const = array();
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/comptabiliteexpert/temp");
-		$r=0;
 
-		$this->dirs[$r][0] = "output";
+		// Boxes
-		$this->dirs[$r][1] = "/comptaexpert";
-		$this->dirs[$r][2] = 1;
-		$this->dirs[$r][3] = "";
-		$this->dirs[$r][4] = "comptaexpert";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/comptaexpert/temp";
-		$this->dirs[$r][2] = 1;
-		$this->dirs[$r][3] = "";
-		$this->dirs[$r][4] = "comptaexpert";
-		
-		$r++;
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/comptaexpert/rapport";
-		$this->dirs[$r][2] = 1;
-		$this->dirs[$r][3] = "rapport";
-		$this->dirs[$r][4] = "comptaexpert";
-		
-		$r++;
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/comptaexpert/export";
-		$this->dirs[$r][2] = 1;
-		$this->dirs[$r][3] = "export";
-		$this->dirs[$r][4] = "comptaexpert";
-
-		// Repertoires
-		//$this->dirs = array();
-		//$this->dirs[0] = $conf->comptaexpert->dir_output;
-		//$this->dirs[1] = $conf->comptaexpert->dir_output."/rapport";
-		//$this->dirs[2] = $conf->comptaexpert->dir_output."/export";
-
-		// Boites
 		$this->boxes = array();
 
 		// Permissions

htdocs/includes/modules/modContrat.class.php

@@ -62,15 +62,7 @@ class modContrat extends DolibarrModules
 		$this->picto='contract';
 
 		// Data directories to create when module is enabled
-		    $this->dirs = array();
+		$this->dirs = array("/contracts/temp");
-		    $r=0;
-		
-		    $this->dirs[$r][0] = "output";
-		    $this->dirs[$r][1] = "/contracts";
-		
-		    $r++;
-		    $this->dirs[$r][0] = "temp";
-		    $this->dirs[$r][1] = "/contracts/temp";
 
 		// Dependances
 		$this->depends = array("modService");

htdocs/includes/modules/modDeplacement.class.php

@@ -63,18 +63,18 @@ class modDeplacement extends DolibarrModules
 		$this->special = 0;
 		$this->picto = "trip";
 
-		// Dir
+		// Data directories to create when module is enabled
 		$this->dirs = array();
 
 		// Config pages
 		$this->config_page_url = array();
 		$this->langfiles = array("companies","trips");
 
-		// Dependances
+		// Dependancies
 		$this->depends = array();
 		$this->requiredby = array();
 
-		// Constantes
+		// Constants
 		$this->const = array();
 
 		// Boxes

htdocs/includes/modules/modDocument.class.php

@@ -61,15 +61,7 @@ class modDocument extends DolibarrModules
 		$this->picto='dir';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/ged/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/ged";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/ged/temp";
 
 		// Config pages
 		//$this->config_page_url = array("document.php");

htdocs/includes/modules/modDomain.class.php

@@ -14,13 +14,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**
-        \defgroup   domain     Module domain
+ *      \defgroup   domain     Module domain
-        \brief      Module pour g<EFBFBD>rer une base de noms de domaines
+ *      \brief      Module to manage a list of DNS names
+ *		\version	$Id$
 */
 
 /**
@@ -66,8 +65,8 @@ class modDomain extends DolibarrModules
         //-------------
         $this->config_page_url = array();
 
-        // D<EFBFBD>pendances
+        // Dependancies
-        //------------
+        //-------------
         $this->depends = array();
         $this->requiredby = array();
         $this->langfiles = array("domains");

htdocs/includes/modules/modDon.class.php

@@ -25,19 +25,18 @@
  */
 
 /**
- \file       htdocs/includes/modules/modDon.class.php
+ *	\file       htdocs/includes/modules/modDon.class.php
- \ingroup    don
+ *	\ingroup    don
- \brief      Fichier de description et activation du module Don
+ *	\brief      Fichier de description et activation du module Don
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
 
 /**
- \class      modDon
+ *	\class      modDon
- \brief      Classe de description et activation du module Don
+ *	\brief      Classe de description et activation du module Don
  */
-
 class modDon  extends DolibarrModules
 {
 
@@ -59,24 +58,16 @@ class modDon  extends DolibarrModules
 		$this->special = 0;
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/dons/temp");
-		$r=0;
 
-		$this->dirs[$r][0] = "output";
+		// Dependancies
-		$this->dirs[$r][1] = "/dons";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/dons/temp";
-
-		// Dependances
 		$this->depends = array();
 		$this->requiredby = array();
 
 		// Config pages
 		$this->config_page_url = array("dons.php");
 
-		// Constantes
+		// Constants
 		$this->const = array();
 		$this->const[0][0] = "DON_FORM";
 		$this->const[0][1] = "chaine";

htdocs/includes/modules/modDroitPret.class.php

@@ -60,10 +60,7 @@ class modDroitPret  extends DolibarrModules
 		// Dir
 		global $dolibarr_smarty_compile;
 		global $dolibarr_smarty_cache;
-		$this->dirs = array();
+		$this->dirs = array($dolibarr_smarty_compile,$dolibarr_smarty_cache);
-		
-	  $this->dirs[0] = $dolibarr_smarty_compile;
-	  $this->dirs[1] = $dolibarr_smarty_cache;
 
 		// Dependances
 		$this->depends = array();

htdocs/includes/modules/modECM.class.php

@@ -66,15 +66,7 @@ class modECM extends DolibarrModules
 		$this->picto='dir';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/ecm/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/ecm";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/ecm/temp";
 
 		// Config pages. Put here list of php page names stored in admmin directory used to setup module
 		$this->config_page_url = array();

htdocs/includes/modules/modEditeur.class.php

@@ -59,13 +59,10 @@ class modEditeur extends DolibarrModules
 		$this->special = 3;
 		$this->picto='book';
 
-		// Dir
+		// Data directories to create when module is enabled
 		global $dolibarr_smarty_compile;
 		global $dolibarr_smarty_cache;
-		$this->dirs = array();
+		$this->dirs = array($dolibarr_smarty_compile,$dolibarr_smarty_cache);
-		
-	  $this->dirs[0] = $dolibarr_smarty_compile;
-	  $this->dirs[1] = $dolibarr_smarty_cache;
 
 		// Config pages
 		$this->config_page_url = array("editeur.php");

htdocs/includes/modules/modEnergie.class.php

@@ -15,13 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**
  	\defgroup   energie     Module energie
  	\brief      Module pour le suivi de la consommation d'energie
+	\version	$Id$
  */
 
 /**
@@ -63,19 +62,7 @@ class modEnergie extends DolibarrModules
 		$this->picto='energie';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/energie/temp","/energie/graph");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/energie";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/energie/temp";
-		
-		$r++;
-		$this->dirs[$r][0] = "graph";
-		$this->dirs[$r][1] = "/energie/graph";
 
 		// Dependances
 		$this->depends = array();

htdocs/includes/modules/modExpedition.class.php

@@ -60,6 +60,7 @@ class modExpedition extends DolibarrModules
 		$this->picto = "sending";
 
 		// Data directories to create when module is enabled
+		// TODO Replace with simple directories
 		$this->dirs = array();
 		$r=0;
 

htdocs/includes/modules/modExport.class.php

@@ -23,9 +23,9 @@
  */
 
 /**
- \file       htdocs/includes/modules/modExport.class.php
+ *	\file       htdocs/includes/modules/modExport.class.php
- \ingroup    export
+ *	\ingroup    export
- \brief      Fichier de description et activation du module export
+ *	\brief      Fichier de description et activation du module export
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -57,15 +57,7 @@ class modExport extends DolibarrModules
 		$this->picto='';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/export/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/export";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/export/temp";
 
 		// Config pages
 		$this->config_page_url = array();

htdocs/includes/modules/modExternalRss.class.php

@@ -60,15 +60,7 @@ class modExternalRss extends DolibarrModules
 		$this->picto='rss';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/rss/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/rss";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/rss/temp";
 
 		// Config pages
 		$this->config_page_url = array("external_rss.php");

htdocs/includes/modules/modFacture.class.php

@@ -65,15 +65,7 @@ class modFacture extends DolibarrModules
 		$this->picto='bill';
 
 		// Data directories to create when module is enabled
-		  $this->dirs = array();
+		$this->dirs = array("/facture/temp");
-		  $r=0;
-		
-		  $this->dirs[$r][0] = "output";
-		  $this->dirs[$r][1] = "/facture";
-		
-		  $r++;
-		  $this->dirs[$r][0] = "temp";
-		  $this->dirs[$r][1] = "/facture/temp";
 
 		// Dependencies
 		$this->depends = array("modSociete");

htdocs/includes/modules/modFckeditor.class.php

@@ -57,19 +57,7 @@ class modFckeditor extends DolibarrModules
 		$this->special = 2;
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/fckeditor/temp","/fckeditor/images");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/fckeditor";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/fckeditor/temp";
-		
-		$r++;
-		$this->dirs[$r][0] = "images";
-		$this->dirs[$r][1] = "/fckeditor/images";
 
 		// Config pages
 		$this->config_page_url = array("fckeditor.php");

htdocs/includes/modules/modFicheinter.class.php

@@ -66,15 +66,7 @@ class modFicheinter  extends DolibarrModules
 		$this->picto = "intervention";
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/ficheinter/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/ficheinter";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/ficheinter/temp";
 
         // Dependencies
 		$this->depends = array("modSociete","modCommercial");

htdocs/includes/modules/modFournisseur.class.php

@@ -61,6 +61,7 @@ class modFournisseur extends DolibarrModules
 		$this->picto='company';
 
 		// Data directories to create when module is enabled
+		// TODO Replace with simple directories
 		$this->dirs = array();
 		$r=0;
 

htdocs/includes/modules/modImport.class.php

@@ -57,15 +57,7 @@ class modImport extends DolibarrModules
 		$this->picto='';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/import/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/import";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/import/temp";
 
 		// Config pages
 		$this->config_page_url = array();

htdocs/includes/modules/modLabel.class.php

@@ -59,15 +59,7 @@ class modLabel extends DolibarrModules
 		$this->picto='label';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/label/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/label";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/label/temp";
 
 		// Dependancies
 		$this->depends = array();

htdocs/includes/modules/modLdap.class.php

@@ -16,8 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**     \defgroup   ldap     Module ldap
@@ -28,6 +26,7 @@
  	\file       htdocs/includes/modules/modLdap.class.php
  	\ingroup    ldap
  	\brief      Fichier de description et activation du module Ldap
+	\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -57,24 +56,16 @@ class modLdap extends DolibarrModules
 		$this->special = 1;
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/ldap/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/ldap";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/ldap/temp";
 
 		// Config pages
 		$this->config_page_url = array("ldap.php");
 
-		// D<EFBFBD>pendances
+		// Dependancies
 		$this->depends = array();
 		$this->requiredby = array();
 
-		// Constantes
+		// Constants
 		$this->const = array();
 		$r=0;
 

htdocs/includes/modules/modMailing.class.php

@@ -59,15 +59,7 @@ class modMailing extends DolibarrModules
 		$this->picto='email';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/mailing/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/mailings";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/mailings/temp";
 
 		// Dependances
 		$this->depends = array();

htdocs/includes/modules/modMantis.class.php

@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**     \defgroup   mantis     Module Mantis
@@ -27,6 +25,7 @@
         \file       htdocs/includes/modules/modMantis.class.php
         \ingroup    mantis
         \brief      Description and activation file for module Mantis
+		\version	$Id$
 */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");

htdocs/includes/modules/modMultiCompany.class.php

@@ -72,8 +72,6 @@ class modMultiCompany extends DolibarrModules
 
 		// Data directories to create when module is enabled.
 		$this->dirs = array();
-		//$this->dirs[0] = DOL_DATA_ROOT.'/mymodule;
-        //$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
 
 		// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
 		$this->style_sheet = '';

htdocs/includes/modules/modNotification.class.php

@@ -58,7 +58,7 @@ class modNotification extends DolibarrModules
 		$this->special = 1;
 		$this->picto='email';
 
-		// Dir
+		// Data directories to create when module is enabled.
 		$this->dirs = array();
 
 		// Dependances

htdocs/includes/modules/modOSCommerceWS.class.php

@@ -59,7 +59,7 @@ class modOSCommerceWS extends DolibarrModules
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 1;
 
-		// Dir
+		// Data directories to create when module is enabled.
 		$this->dirs = array();
 
 		// Config pages

htdocs/includes/modules/modPaybox.class.php

@@ -69,9 +69,7 @@ class modPayBox extends DolibarrModules
 		$this->picto=DOL_URL_ROOT.'/paybox/images/paybox.png';
 
 		// Data directories to create when module is enabled.
-		$this->dirs = array();
+		$this->dirs = array('/paybox/temp');
-		//$this->dirs[0] = DOL_DATA_ROOT.'/mymodule;
-        //$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
 
 		// Relative path to module style sheet if exists. Example: '/mymodule/mycss.css'.
 		$this->style_sheet = '';

htdocs/includes/modules/modPostnuke.class.php

@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**     \defgroup   postnuke     Module postnuke
@@ -27,6 +25,7 @@
  \file       htdocs/includes/modules/modPostnuke.class.php
  \ingroup    postnuke
  \brief      Fichier de description et activation du module Postnuke
+ \version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
@@ -57,7 +56,7 @@ class modPostnuke extends DolibarrModules
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 1;
 
-		// Dir
+		// Data directories to create when module is enabled
 		$this->dirs = array();
 
 		// D<>pendances

htdocs/includes/modules/modPrelevement.class.php

@@ -64,21 +64,7 @@ class modPrelevement extends DolibarrModules
 		$this->picto='payment';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/prelevement/temp","/prelevement/receipts");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/prelevement";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/prelevement/temp";
-		
-		$r++;
-		$this->dirs[$r][0] = "bon";
-		$this->dirs[$r][1] = "/prelevement/bon";
-		
-		$this->dirs[0] = $conf->prelevement->dir_output . "/bon";
 
 		// Dependancies
 		$this->depends = array("modFacture");

htdocs/includes/modules/modProduit.class.php

@@ -66,15 +66,7 @@ class modProduit extends DolibarrModules
 		$this->picto='product';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/produit/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/produit";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/produit/temp";
 
 		// Dependencies
 		$this->depends = array();

htdocs/includes/modules/modProjet.class.php

@@ -60,6 +60,9 @@ class modProjet extends DolibarrModules
 		$this->special = 0;
 		$this->picto='project';
 
+		// Data directories to create when module is enabled
+		$this->dirs = array();
+
 		// Dependancies
 		$this->depends = array();
 		$this->requiredby = array();

htdocs/includes/modules/modPropale.class.php

@@ -64,21 +64,13 @@ class modPropale extends DolibarrModules
 		$this->picto='propal';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/propale/temp");
-		$r=0;
 
-		$this->dirs[$r][0] = "output";
+		// Dependancies
-		$this->dirs[$r][1] = "/propale";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/propale/temp";
-
-		// Dependances
 		$this->depends = array("modSociete","modCommercial");
 		$this->config_page_url = array("propale.php");
 
-		// Constantes
+		// Constants
 		$this->const = array();
 
 		$this->const[0][0] = "PROPALE_ADDON_PDF";

htdocs/includes/modules/modService.class.php

@@ -65,24 +65,16 @@ class modService extends DolibarrModules
 		$this->picto='service';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/produit/temp");
-		$r=0;
 
-		$this->dirs[$r][0] = "output";
+		// Dependancies
-		$this->dirs[$r][1] = "/produit";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/produit/temp";
-
-		// Dependances
 		$this->depends = array("modProduit");
 		$this->requiredby = array("modContrat");
 
-		// Constantes
+		// Constants
 		$this->const = array();
 
-		// Boites
+		// Boxes
 		$this->boxes = array();
 		$this->boxes[0][1] = "box_services_vendus.php";
 

htdocs/includes/modules/modSociete.class.php

@@ -67,6 +67,7 @@ class modSociete extends DolibarrModules
 		$this->picto='company';
 
 		// Data directories to create when module is enabled
+		// TODO Replace with simple directories
 		$this->dirs = array();
 		$r=0;
 

htdocs/includes/modules/modStock.class.php

@@ -63,7 +63,7 @@ class modStock extends DolibarrModules
 		$this->special = 0;
 		$this->picto='stock';
 
-		// Dir
+		// Data directories to create when module is enabled
 		$this->dirs = array();
 
 		$this->config_page_url = array("stock.php");
@@ -73,7 +73,7 @@ class modStock extends DolibarrModules
 		$this->requiredby = array();
 		$this->langfiles = array("stocks");
 
-		// Constantes
+		// Constants
 		$this->const = array();
 
 		// Boxes

htdocs/includes/modules/modSyslog.class.php

@@ -58,11 +58,6 @@ class modSyslog extends DolibarrModules
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/logs";
-		$this->dirs[$r][2] = 1;
 
 		// Config pages
 		$this->config_page_url = array("syslog.php");

htdocs/includes/modules/modTax.class.php

@@ -66,15 +66,7 @@ class modTax extends DolibarrModules
 		$this->picto='bill';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/taxes/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/taxes";
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/taxes/temp";
 
 		// Config pages
 		$this->config_page_url = array("taxes.php");

htdocs/includes/modules/modTelephonie.class.php

@@ -15,8 +15,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
  */
 
 /**
@@ -28,6 +26,7 @@
  \file       htdocs/includes/modules/modTelephonie.class.php
  \ingroup    telephonie
  \brief      Fichier de description et activation du module de Telephonie
+	\version	$Id$
  */
 
 include_once(DOL_DOCUMENT_ROOT."/includes/modules/DolibarrModules.class.php");
@@ -64,57 +63,23 @@ class modTelephonie extends DolibarrModules
 		$this->picto='phoning';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/telephonie/temp",
-		$r=0;
+							"/telephonie/graph",
+							"/telephonie/logs",
+							"/telephonie/client",
+							"/telephonie/rapports",
+							"/telephonie/ligne/commande/retour/traite",
+							"/telephonie/cdr/archives",
+							"/telephonie/cdr/atraiter");
 
-		$this->dirs[$r][0] = "output";
+		// Dependancies
-		$this->dirs[$r][1] = "/telephonie";
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/telephonie/temp";
-		$r++;
-		$this->dirs[$r][0] = "graph";
-		$this->dirs[$r][1] = "/telephonie/graph";
-		$r++;
-		$this->dirs[$r][0] = "logs";
-		$this->dirs[$r][1] = "/telephonie/logs";
-		$r++;
-		$this->dirs[$r][0] = "client";
-		$this->dirs[$r][1] = "/telephonie/client";
-		$r++;
-		$this->dirs[$r][0] = "rapports";
-		$this->dirs[$r][1] = "/telephonie/rapports";
-		$r++;
-		$this->dirs[$r][0] = "ligne";
-		$this->dirs[$r][1] = "/telephonie/ligne";
-		$r++;
-		$this->dirs[$r][0] = "ligne_commande";
-		$this->dirs[$r][1] = "/telephonie/ligne/commande";
-		$r++;
-		$this->dirs[$r][0] = "ligne_commande_retour";
-		$this->dirs[$r][1] = "/telephonie/ligne/commande/retour";
-		$r++;
-		$this->dirs[$r][0] = "ligne_commande_retour_traite";
-		$this->dirs[$r][1] = "/telephonie/ligne/commande/retour/traite";
-		$r++;
-		$this->dirs[$r][0] = "cdr";
-		$this->dirs[$r][1] = "/telephonie/cdr";
-		$r++;
-		$this->dirs[$r][0] = "cdr_archive";
-		$this->dirs[$r][1] = "/telephonie/cdr_archive";
-		$r++;
-		$this->dirs[$r][0] = "cdr_atraiter";
-		$this->dirs[$r][1] = "/telephonie/cdr/atraiter";
-		
-
-		// Dependances
 		$this->depends = array();
 		$this->requiredby = array();
 
-		// Constantes
+		// Constants
 		$this->const = array();
 
-		// Boites
+		// Boxes
 		$this->boxes = array();
 
 		// Permissions

htdocs/includes/modules/modUser.class.php

@@ -63,30 +63,20 @@ class modUser extends DolibarrModules
 		$this->picto='group';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array();
+		$this->dirs = array("/users/temp");
-		$r=0;
-		
-		$this->dirs[$r][0] = "output";
-		$this->dirs[$r][1] = "/users";
-		$this->dirs[$r][2] = 1;
-		
-		$r++;
-		$this->dirs[$r][0] = "temp";
-		$this->dirs[$r][1] = "/users/temp";
-		$this->dirs[$r][2] = 1;
 
 		// Config pages
 		// $this->config_page_url = array("/user/admin/index.php");
 
-		// Dependances
+		// Dependancies
 		$this->depends = array();
 		$this->requiredby = array();
 		$this->langfiles = array("main","users","companies");
 
-		// Constantes
+		// Constants
 		$this->const = array();
 
-		// Boites
+		// Boxes
 		$this->boxes = array();
 
 		// Permissions

htdocs/viewimage.php

@@ -225,7 +225,7 @@ if ($modulepart)
         $user->getrights('prelevement');
         if ($user->rights->prelevement->bons->lire) $accessallowed=1;
 
-        $original_file=$conf->prelevement->dir_bon.'/'.$original_file;
+        $original_file=$conf->prelevement->dir_output.'/receipts/'.$original_file;
     }
 
     // Wrapping pour les graph telephonie
@@ -236,14 +236,14 @@ if ($modulepart)
         {
             $accessallowed=1;
         }
-        $original_file=$conf->telephonie->dir_graph.'/'.$original_file;
+        $original_file=$conf->telephonie->dir_temp.'/'.$original_file;
     }
 
     // Wrapping pour les graph energie
     elseif ($modulepart == 'energie')
     {
       $accessallowed=1;
-      $original_file=$conf->energie->dir_graph.'/'.$original_file;
+      $original_file=$conf->energie->dir_temp.'/'.$original_file;
     }
 
     // Wrapping pour les graph bank