From 4845dfa4253b2e35b20679010958ee1ae04a20b7 Mon Sep 17 00:00:00 2001 From: Benjamin Kitt Date: Sat, 12 Dec 2015 16:32:58 -0600 Subject: [PATCH] Trim leading slash from $_SERVER["SCRIPT_NAME"] so that server side rendered links are relative instead of absolute. --- base.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/base.php b/base.php index cd5257a..db809b6 100644 --- a/base.php +++ b/base.php @@ -375,13 +375,16 @@ class Link class LinkNavigation extends Link { public function __construct($phref, $prel = NULL, $ptitle = NULL) { + error_log("BENTEST: " . $_SERVER["SCRIPT_NAME"]); parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle); if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href; if (preg_match ("/(bookdetail|getJSON).php/", $_SERVER["SCRIPT_NAME"])) { $this->href = "index.php" . $this->href; + error_log("BENTEST2: " . $this->href); } else { - $this->href = $_SERVER["SCRIPT_NAME"] . $this->href; + $this->href = trim($_SERVER["SCRIPT_NAME"],'/') . $this->href; + error_log("BENTEST3: " . $this->href); } } } @@ -389,6 +392,7 @@ class LinkNavigation extends Link class LinkFacet extends Link { public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) { + error_log("BENTEST: " . $_SERVER["SCRIPT_NAME"]); parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet); if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); $this->href = $_SERVER["SCRIPT_NAME"] . $this->href;