From 19f3cce41f60445773281a4b73618e65c10e9276 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 23 Nov 2018 13:54:14 -0500
Subject: [PATCH] Dont auto-guess pathPrefix

---
 web/includes/Server.php                 | 3 ++-
 web/skins/classic/views/js/watch.js.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 7d0b5f436..e39c92a3e 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -95,7 +95,8 @@ class Server {
     if ( isset($this->{'PathPrefix'}) and $this->{'PathPrefix'} ) {
       return $this->{'PathPrefix'};
     }
-    return $_SERVER['PHP_SELF'];
+    return '';
+    //return $_SERVER['PHP_SELF'];
   }
 
   public function __call($fn, array $args){
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 51c1801e8..d9826c66f 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -48,7 +48,7 @@ var maxDisplayEvents = <?php echo 2 * MAX_EVENTS ?>;
 var monitorId = <?php echo $monitor->Id() ?>;
 var monitorWidth = <?php echo $monitor->Width() ?>;
 var monitorHeight = <?php echo $monitor->Height() ?>;
-var monitorUrl = '<?php echo $monitor->Url(); ?>';
+var monitorUrl = '<?php echo $monitor->Url(); ?>/index.php';
 var monitorType = '<?php echo ( $monitor->Type() ) ?>';
 var monitorRefresh = '<?php echo ( $monitor->Refresh() ) ?>';