diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index bff890a09b7e2c665e22bfcdc42b982164c59b41..024cc4922d1a514dd370f2f8abfa464c044458e9 100644 --- a/htdocs/contact/class/contact.class.php +++ b/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 diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index a932a2fb67f9d2b03fff07eddd4d4800dc4d6187..1671d7d976edf4b680de9c8e2f42a49ff650183c 100644 --- a/htdocs/install/etape1.php +++ b/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)).'\';'); diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php index 161cb4aa30ec3226fcffe0c16c4d0f196714f84d..da7642e8df4a6cafc9df8b7d47460318b8846834 100644 --- a/htdocs/master.inc.php +++ b/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";