From 3bd5774ea170706e398d447c9693295b37184997 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 29 Nov 2018 15:53:19 -0500
Subject: [PATCH 1/2] Default to PathToIndex should have the index.php in it

---
 web/includes/Server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 069e5830c..06219a1f5 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -10,7 +10,7 @@ class Server {
     'Protocol'    => '',
     'Hostname'    => '',
     'Port'        =>  null,
-    'PathToIndex' => '/zm',
+    'PathToIndex' => '/zm/index.php',
     'PathToZMS'   => ZM_PATH_ZMS,
     'PathToApi'   => '/zm/api',
     'zmaudit'     => 1,

From fe45e83bb4f3a58ac95567b8b12d2feae73d81f0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 29 Nov 2018 15:54:25 -0500
Subject: [PATCH 2/2] Fix PathToIndex

---
 web/includes/Server.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index e91a84142..06219a1f5 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -110,8 +110,7 @@ class Server {
     if ( isset($this->{'PathToIndex'}) and $this->{'PathToIndex'} ) {
       return $this->{'PathToIndex'};
     }
-    return '';
-    //return $_SERVER['PHP_SELF'];
+    return $_SERVER['PHP_SELF'];
   }
 
   public function UrlToIndex( ) {