Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: alternative url were sometimes relative to server, sometimes to

Browse Source 
DOL_URL_ROOT. Fix to be always relative to DOL_URL_ROOT.
This commit is contained in:
Laurent Destailleur
2013-07-15 00:58:40 +02:00
parent 254f46752e
commit d637212dce
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
htdocs/conf/conf.php.example
View File

@@ -37,8 +37,10 @@ $dolibarr_main_document_root='';
// dolibarr_main_url_root_alt // dolibarr_main_url_root_alt
// This parameter defines the relative sub URLs of alternative Dolibarr root directories. // This parameter defines the relative sub URLs to add to $dolibarr_main_url_root to
// It can be links to some other secondary htdocs directories, separated by a coma. // forge alternative root directories (used by modules developers).
// You can put several values, separated by a coma, but number of entries must match
// number of entries into $dolibarr_main_document_root_alt.
// Examples: // Examples:
// $dolibarr_main_url_root_alt='/extensions'; // $dolibarr_main_url_root_alt='/extensions';
// $dolibarr_main_url_root_alt='/extensions1,/extensions2'; // $dolibarr_main_url_root_alt='/extensions1,/extensions2';
@@ -47,7 +49,10 @@ $dolibarr_main_url_root_alt='';
// dolibarr_main_document_root_alt // dolibarr_main_document_root_alt
// This parameter contains absolute alternative root file system directories of Dolibarr // This parameter contains absolute alternative root file system directories (used by
// modules developers).
// You can put several values, separated by a coma, but number of entries must match
// number of entries into $dolibarr_main_url_root_alt.
// Examples: // Examples:
// $dolibarr_main_document_root_alt='/var/www/dolibarr/htdocs/extensions'; // $dolibarr_main_document_root_alt='/var/www/dolibarr/htdocs/extensions';
// $dolibarr_main_document_root_alt='C:/My web sites/dolibarr/htdocs/extensions1,C:/My web sites/dolibarr/htdocs/extensions2'; // $dolibarr_main_document_root_alt='C:/My web sites/dolibarr/htdocs/extensions1,C:/My web sites/dolibarr/htdocs/extensions2';

2
htdocs/core/lib/functions.lib.php
View File

@@ -1729,7 +1729,7 @@ function img_picto($alt, $picto, $options = '', $pictoisfullpath = false, $srcon
if ($type == 'main') continue; if ($type == 'main') continue;
if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) if (file_exists($dirroot.'/'.$path.'/img/'.$picto))
{ {
$url=$conf->file->dol_url_root[$type]; $url=DOL_URL_ROOT.$conf->file->dol_url_root[$type];
break; break;
} }
} }

4
htdocs/master.inc.php
View File

@@ -78,13 +78,13 @@ if (! empty($dolibarr_main_document_root_alt))
{ {
if (preg_match('/^http(s)?:/',$value)) 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 to alternative URLs.<br>'."\n"; 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 "Found: \"".$value."\"<br>\n";
print "Should found something like following examples:<br>\n"; print "Should found something like following examples:<br>\n";
print "\"/extensions\"<br>\n"; print "\"/extensions\"<br>\n";
print "\"/extensions1,/extensions2,...\"<br>\n"; print "\"/extensions1,/extensions2,...\"<br>\n";
print "\"/../extensions\"<br>\n"; print "\"/../extensions\"<br>\n";
print "\"/dolibarr/custom\"<br>\n"; print "\"/custom\"<br>\n";
exit; exit;
} }
$conf->file->dol_url_root['alt'.($i++)]=(string) $value; $conf->file->dol_url_root['alt'.($i++)]=(string) $value;