Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard

Append port to trusted domain in case it's not 80 or 443

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/base.php b/lib/base.php
index 8cd261fa29f..fc2bdddb440 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -599,10 +599,18 @@ class OC {
 		) {
 			header('HTTP/1.1 400 Bad Request');
 			header('Status: 400 Bad Request');
+
+			$domain = $_SERVER['SERVER_NAME'];
+			// Append port to domain in case it is not
+			if($_SERVER['SERVER_PORT'] !== '80' && $_SERVER['SERVER_PORT'] !== '443') {
+				$domain .= ':'.$_SERVER['SERVER_PORT'];
+			}
+
 			$tmpl = new OCP\Template('core', 'untrustedDomain', 'guest');
-			$tmpl->assign('domain', $_SERVER['SERVER_NAME']);
+			$tmpl->assign('domain', $domain);
 			$tmpl->printPage();
-			return;
+
+			exit();
 		}
 	}