Merge pull request #1331 from GPCsolutions/35b-review

Fixes for 3.5 beta

htdocs/contact/class/contact.class.php

@@ -59,6 +59,8 @@ class Contact extends CommonObject
 	var $country_code;			// Code of country
 	var $country;				// Label of country
 
+    var $poste;                 // Position
+
 	var $socid;					// fk_soc
 	var $statut;				// 0=inactif, 1=actif
 

htdocs/install/etape1.php

@@ -812,7 +812,7 @@ function write_conf_file($conffile)
         fputs($fp, '$dolibarr_main_document_root=\''.str_replace("'","\'",($main_dir)).'\';');
         fputs($fp,"\n");
 
-        fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'","\'",($main_url."/".$main_alt_dir_name)).'\';');
+        fputs($fp, $main_use_alt_dir.'$dolibarr_main_url_root_alt=\''.str_replace("'","\'",("/".$main_alt_dir_name)).'\';');
         fputs($fp,"\n");
 
         fputs($fp, $main_use_alt_dir.'$dolibarr_main_document_root_alt=\''.str_replace("'","\'",($main_dir."/".$main_alt_dir_name)).'\';');

htdocs/master.inc.php

@@ -78,9 +78,14 @@ if (! empty($dolibarr_main_document_root_alt))
 	{
 		if (preg_match('/^http(s)?:/',$value))
 		{
-			print 'Error: values for <b>$dolibarr_main_url_root_alt</b> into <b>conf.php</b> file must contains relative path added to $dolibarr_main_url_root to get alternative URLs.<br>'."\n";
-			print "Found: \"".$value."\"<br>\n";
-			print "Should found something like following examples:<br>\n";
+			// TODO: Make this a warning rather than an error since the correct value can be derived in most cases
+			$correct_value = str_replace($dolibarr_main_url_root, '', $value);
+			print '<b>Error:</b><br>'."\n";
+			print 'Wrong <b>$dolibarr_main_url_root_alt</b> value in <b>conf.php</b> file.<br>'."\n";
+			print 'We now use a relative path to $dolibarr_main_url_root to build alternate URLs.<br>'."\n";
+			print 'Value found: '.$value.'<br>'."\n";
+			print 'Should be replaced by: '.$correct_value.'<br>'."\n";
+			print "Or something like following examples:<br>\n";
 			print "\"/extensions\"<br>\n";
 			print "\"/extensions1,/extensions2,...\"<br>\n";
 			print "\"/../extensions\"<br>\n";