From 7d46652453f7a6b9e395885b6e953258cf79a392 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 20 Oct 2009 17:53:24 +0000
Subject: [PATCH] Remove deprecated code. Now usage of smarty is simpler (no
 need to declare things in config file)

---
 htdocs/includes/modules/modDroitPret.class.php |  2 +-
 htdocs/includes/modules/modEditeur.class.php   |  2 +-
 htdocs/install/fileconf.php                    | 11 +++++------
 htdocs/master.inc.php                          |  5 ++---
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/htdocs/includes/modules/modDroitPret.class.php b/htdocs/includes/modules/modDroitPret.class.php
index eceac519ab6..aae993b7e15 100644
--- a/htdocs/includes/modules/modDroitPret.class.php
+++ b/htdocs/includes/modules/modDroitPret.class.php
@@ -58,7 +58,7 @@ class modDroitPret  extends DolibarrModules
 		$this->special = 3;
 
 		// Dir
-		$this->dirs = array('/smarty/cache','/smarty/template');
+		$this->dirs = array('/smarty/cache/temp','/smarty/templates/temp');
 
 		// Dependances
 		$this->depends = array();
diff --git a/htdocs/includes/modules/modEditeur.class.php b/htdocs/includes/modules/modEditeur.class.php
index 4cfd7d0f131..c97c18756f7 100644
--- a/htdocs/includes/modules/modEditeur.class.php
+++ b/htdocs/includes/modules/modEditeur.class.php
@@ -60,7 +60,7 @@ class modEditeur extends DolibarrModules
 		$this->picto='book';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array('/smarty/cache','/smarty/template');
+		$this->dirs = array('/smarty/cache/temp','/smarty/templates/temp');
 
 		// Config pages
 		$this->config_page_url = array("editeur.php");
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 1ea8e6f9f25..c1e8c29f237 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -150,19 +150,18 @@ print $langs->trans("Examples").":<br>";
 <?php echo $langs->trans("URLRoot"); ?>
 </b></td><td valign="top" class="label"><input type="text" size="60" name="main_url" value="
 <?php
-if (isset($main_url) && $main_url)
-  $dolibarr_main_url_root=$main_url;
-if (! isset($dolibarr_main_url_root) || strlen($dolibarr_main_url_root) == 0)
+if (! empty($main_url)) $dolibarr_main_url_root=$main_url;
+if (empty($dolibarr_main_url_root))
 {
-	# If defined (Ex: Apache sous Linux)
+	# If defined (Ie: Apache with Linux)
 	if (isset($_SERVER["SCRIPT_URI"])) {
 		$dolibarr_main_url_root=$_SERVER["SCRIPT_URI"];
 	}
-	# If defined (Ex: Apache sous Caudium)
+	# If defined (Ie: Apache with Caudium)
 	elseif (isset($_SERVER["SERVER_URL"]) && isset($_SERVER["DOCUMENT_URI"])) {
 		$dolibarr_main_url_root=$_SERVER["SERVER_URL"].$_SERVER["DOCUMENT_URI"];
 	}
-	# Si SCRIPT_URI, SERVER_URL, DOCUMENT_URI non d�fini (Ex: Apache 2.0.44 pour Windows)
+	# If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows)
 	else
 	{
 		$proto='http';
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 6cf30d288ef..239fb7eb338 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -83,10 +83,9 @@ if (empty($dolibarr_main_data_root))
 // Define some constants
 define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);		// Filesystem pages php (htdocs)
 define('DOL_DATA_ROOT', $dolibarr_main_data_root);				// Filesystem donnes (documents)
-if ($dolibarr_main_url_root == 'auto')
+if ($dolibarr_main_url_root == 'auto' && ! empty($_SERVER["SCRIPT_URL"]) && ! empty($_SERVER["SCRIPT_URI"]))
 {
-	// TODO Try to define dolibarr_main_url_root with non root installation
-	$dolibarr_main_url_root=$_SERVER["SERVER_NAME"];	// This make possible to reach web site with different URLs (works only if dolibarr dir is virtual web root dir).
+	$dolibarr_main_url_root=eregi_replace($_SERVER["SCRIPT_URL"].'$','',$_SERVER["SCRIPT_URI"]);
 }
 define('DOL_MAIN_URL_ROOT', $dolibarr_main_url_root);			// URL relative root
 $uri=eregi_replace('^http(s?)://','',$dolibarr_main_url_root);	// $suburi contains url without http*