add default host in get_url helper

directus · Sep 13, 2016 · 49d7154 · 49d7154
1 parent 7cc303a
commit 49d7154
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/api/core/functions.php b/api/core/functions.php
@@ -143,13 +143,16 @@ function is_ssl()
      * Get Directus URL
      *
      * @param $path - Extra path to add to the url
+     * @param $defaultHost
+     *
      * @return string
      */
-    function get_url($path = '')
+    function get_url($path = '', $defaultHost = 'localhost')
     {
         $schema = is_ssl() ? 'https://' : 'http://';
+        $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $defaultHost;
         $directusPath = defined('DIRECTUS_PATH') ? DIRECTUS_PATH : '/';
-        $directusHost = rtrim($_SERVER['HTTP_HOST'] . $directusPath, '/') . '/';
+        $directusHost = rtrim($host . $directusPath, '/') . '/';
 
         return $schema . $directusHost . ltrim($path, '/');
     }

diff --git a/tests/api/functionsTest.php b/tests/api/functionsTest.php
@@ -22,6 +22,12 @@ public function testSSL()
 
     public function testGetURL()
     {
+        $url = get_url();
+        $this->assertSame('http://localhost/', $url);
+
+        $url = get_url('/users', 'example.local');
+        $this->assertSame('http://example.local/users', $url);
+
         $_SERVER['HTTP_HOST'] = 'localhost';
 
         $url = get_url();