Mercurial > hg > batmud > maputils

changeset 1919:9193e7a8c9ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use less of pageMapURL and get rid of the http/https detection.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 07 Nov 2017 19:35:48 +0200
parents 3075415f052e
children c058c135c33d
files www/common.inc.php www/config.inc.php
diffstat 2 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/www/common.inc.php	Tue Nov 07 19:09:11 2017 +0200
+++ b/www/common.inc.php	Tue Nov 07 19:35:48 2017 +0200
@@ -128,10 +128,9 @@
 
 function mpGetURLLink($url, $name, $extra = FALSE)
 {
-  global $pageMapURL;
   return
     "<a ".($extra !== FALSE ? $extra." " : "").
-    "href=\"".$pageMapURL.$url."\">".chentities($name)."</a>";
+    "href=\"".$url."\">".chentities($name)."</a>";
 }
 
 
--- a/www/config.inc.php	Tue Nov 07 19:09:11 2017 +0200
+++ b/www/config.inc.php	Tue Nov 07 19:35:48 2017 +0200
@@ -25,15 +25,9 @@
 $pageIndex = "index.php";
 //$pageIndex = "maps.php";
 
-//
-// Check for https etc.
-//
-$protocolPrefix = (!isset($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] == "off" || $_SERVER["HTTPS"] == "") ? "http" : "https";
-$pageMapURL = $protocolPrefix."://tnsp.org/maps/";
-
-
+$pageMapURL = "/maps/";
 //$pageGMapURL = $protocolPrefix."://tnsp.org/gmap2/";
 $pageGMapURL = "http://jeskko.pupunen.net/gmap2/";
-$batQuestURL = $protocolPrefix."://www.bat.org/help/quests?str=";
+$batQuestURL = "https://www.bat.org/help/quests?str=";
 
 ?>
\ No newline at end of file