Change to add possibility to have two root directory (for dev of modules)

build/makepack-dolibarrmodule.pl

@@ -103,7 +103,7 @@ if (-d "/usr/src/RPM") {
     $RPMDIR="/usr/src/RPM";
 }
 
-$SOURCE="$DIR/../../dolibarr";
+$SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
 
 

htdocs/admin/modules.php

@@ -161,15 +161,22 @@ llxHeader("","");
 print_fiche_titre($langs->trans("ModulesSetup"),'','setup');
 
 
-// Recherche les modules
-$dir = DOL_DOCUMENT_ROOT . "/includes/modules/";
+// Search modules
+$dirlist=array();
+$dirlist[]=DOL_DOCUMENT_ROOT;
+if (defined('DOL_DOCUMENT_ROOT_BIS')) $dirlist[]=DOL_DOCUMENT_ROOT_BIS;
 
-// Charge tableaux modules, nom, numero, orders depuis r�pertoire dir
-$handle=opendir($dir);
 $filename = array();
 $modules = array();
 $orders = array();
 $categ = array();
+$dirmod = array();
+foreach ($dirlist as $dirroot)
+{
+	$dir = $dirroot . "/includes/modules/";
+
+	// Charge tableaux modules, nom, numero, orders depuis r�pertoire dir
+	$handle=opendir($dir);
 	$i = 0;
 	$j = 0;
 	while (($file = readdir($handle))!==false)
@@ -209,15 +216,17 @@ while (($file = readdir($handle))!==false)
 		            $filename[$i]= $modName;
 		            $orders[$i]  = "$objMod->family"."_".$j;   // Tri par famille puis numero module
 					$categ[$objMod->special]++;					// Array of all different modules categories
+		            $dirmod[$i] = $dirroot;
 					$j++;
 		            $i++;
 				}
 	        }
 	    }
 	}
+}
 
-asort($orders);
 
+asort($orders);
 
 // Affichage debut page
 
@@ -368,15 +377,16 @@ foreach ($orders as $key => $value)
                     $i=0;
                     foreach ($objMod->config_page_url as $page)
                     {
+						$urlpage=$page;
                         if ($i++)
                         {
-                            print '<a href="'.$page.'" alt="'.$langs->trans($page).'">'.img_picto(ucfirst($page),"setup").'</a>&nbsp;';
+                            print '<a href="'.$urlpage.'" alt="'.$langs->trans($page).'">'.img_picto(ucfirst($page),"setup").'</a>&nbsp;';
                         //    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
                         }
                         else
                         {
                             //print '<a href="'.$page.'">'.$langs->trans("Setup").'</a>&nbsp;';
-                            print '<a href="'.$page.'" alt="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;';
+                            print '<a href="'.$urlpage.'" alt="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"),"setup").'</a>&nbsp;';
                         }
                     }
                     print "</td>\n";

htdocs/admin/pre.inc.php

@@ -16,18 +16,17 @@
  * 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$
- * $Source$
  */
 
 /**
    \file       htdocs/admin/pre.inc.php
    \brief      Fichier gestionnaire du menu de gauche de l'espace configuration
-   \version    $Revision$
+   \version    $Id$
 */
 
-require("../main.inc.php");
+$res=@include("../main.inc.php");
+if (! $res) include("../../../dolibarr/htdocs/main.inc.php");	// Used on dev env only
+
 
 $langs->load("admin");
 

htdocs/master.inc.php

@@ -78,7 +78,7 @@ if (! isset($dolibarr_main_db_type))
 {	
   $dolibarr_main_db_type='mysql';   // Pour compatibilite avec anciennes configs, si non defini, on prend 'mysql'
 }
-if (! $dolibarr_main_data_root) {
+if (empty($dolibarr_main_data_root)) {
   // Si repertoire documents non defini, on utilise celui par defaut
   $dolibarr_main_data_root=ereg_replace("/htdocs","",$dolibarr_main_document_root);
   $dolibarr_main_data_root.="/documents";
@@ -91,6 +91,9 @@ $pos = strstr ($uri, '/');      // $pos contient alors url sans nom domaine
 if ($pos == '/') $pos = '';     // si $pos vaut /, on le met a ''
 define('DOL_URL_ROOT', $pos);								// URL racine relative
 
+// Special code for alternate dev directories (Used on dev env only)
+if (! empty($dolibarr_main_document_root_bis)) define('DOL_DOCUMENT_ROOT_BIS', $dolibarr_main_document_root_bis);
+
 
 /*
  * Controle validite fichier conf