From 3882fa0c3db958b22534efd6d1309fadaf9664a0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 31 Oct 2016 10:37:58 +0100
Subject: [PATCH] Fix dol_buildpath with parameter 3. Add phpunit tests
---
htdocs/core/lib/functions.lib.php | 18 ++++++++++++++++--
test/phpunit/FunctionsLibTest.php | 28 +++++++++++++++++++++++++++-
2 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ac9d58eee62..ae12bfe4f8b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -368,7 +368,21 @@ function dol_buildpath($path, $type=0)
foreach ($conf->file->dol_document_root as $key => $dirroot) // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
{
- if ($key == 'main') continue;
+ if ($key == 'main')
+ {
+ if ($type == 3)
+ {
+ global $dolibarr_main_url_root;
+
+ // Define $urlwithroot
+ $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+ $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+ //$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
+
+ $res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':$urlwithroot).'/'.$path; // Test on start with http is for old conf syntax
+ }
+ continue;
+ }
preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i',$path,$regs); // Take part before '?'
if (! empty($regs[1]))
{
@@ -392,7 +406,7 @@ function dol_buildpath($path, $type=0)
$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
//$urlwithroot=DOL_MAIN_URL_ROOT; // This is to use same domain name than current
- $res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':$urlwithroot).$conf->file->dol_url_root[$key].'/'.$path;
+ $res=(preg_match('/^http/i',$conf->file->dol_url_root[$key])?'':$urlwithroot).$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax
}
break;
}
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 4c76ba47770..ca06655c845 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -119,6 +119,32 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
}
+
+ /**
+ * testDolBuildPath
+ *
+ * @return boolean
+ */
+ public function testDolBuildPath()
+ {
+ /*$tmp=dol_buildpath('/google/oauth2callback.php', 0);
+ var_dump($tmp);
+ */
+
+ /*$tmp=dol_buildpath('/google/oauth2callback.php', 1);
+ var_dump($tmp);
+ */
+
+ $result=dol_buildpath('/google/oauth2callback.php', 2);
+ print __METHOD__." result=".$result."\n";
+ $this->assertStringStartsWith('http', $result);
+
+ $result=dol_buildpath('/google/oauth2callback.php', 3);
+ print __METHOD__." result=".$result."\n";
+ $this->assertStringStartsWith('http', $result);
+ }
+
+
/**
* testGetBrowserInfo
*
@@ -973,5 +999,5 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
return true;
}
-
+
}
--
GitLab