Merge branch 'master' of https://github.com/HaschekSolutions/pictshare

HaschekSolutions · Nov 13, 2023 · fc9a7d3 · fc9a7d3
2 parents 67fba8e + 7f18a19
commit fc9a7d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docker/rootfs/start.sh b/docker/rootfs/start.sh
@@ -57,7 +57,7 @@ _buildConfig() {
     echo "define('ENCRYPTION_KEY', '${ENCRYPTION_KEY:-}');"
     echo "define('FFMPEG_BINARY', '${FFMPEG_BINARY:-/usr/bin/ffmpeg}');"
     echo "define('ALWAYS_WEBP', ${ALWAYS_WEBP:-false});"
-    echo "define('ALLOWED_DOMAINS', ${ALLOWED_DOMAINS:-});"
+    echo "define('ALLOWED_DOMAINS', '${ALLOWED_DOMAINS:-}');"
     echo "define('SPLIT_DATA_DIR', ${SPLIT_DATA_DIR:-false});"
 }
 

diff --git a/inc/core.php b/inc/core.php
@@ -983,6 +983,7 @@ function getDomain($stripport=true)
     //strip port
     if(strpos($host,':')!==false)
         $strippedhost = substr($host,0,strpos($host,':'));
+    else $strippedhost = $host;
 
     //check if it's in ALLOWED_DOMAINS
     if(defined('ALLOWED_DOMAINS') && ALLOWED_DOMAINS!='')
@@ -1001,4 +1002,4 @@ function getURL()
         return URL;
     $protocol = strpos(strtolower($_SERVER['SERVER_PROTOCOL']), 'https') === FALSE ? 'http' : 'https';
     return $protocol . '://' . getDomain(false).'/';
-}
+}