From cf08010ebe520565bb0672b55146f176104974e3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 18 Nov 2020 13:04:56 -0500
Subject: [PATCH] Fix redirect on zone editing

---
 web/includes/actions/zone.php    | 4 +++-
 web/skins/classic/views/zone.php | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/includes/actions/zone.php b/web/includes/actions/zone.php
index 0b2809fcb..9515fc626 100644
--- a/web/includes/actions/zone.php
+++ b/web/includes/actions/zone.php
@@ -71,7 +71,9 @@ if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
         $monitor->sendControlCommand('quit');
       }
     } // end if changes
-    $redirect = $_SERVER['HTTP_REFERER'];
+    # HTTP_REFERER will typically be ?view=zone so no good.
+    # if a referer is passed in $_REQUEST then use it otherwise go to ?view=zones
+    $redirect = isset($_REQUEST['REFERER']) ? $_REQUEST['REFERER'] : '?view=zones';
   } // end if action 
 } // end if $mid and canEdit($mid)
 ?>
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index cf03104c7..2c41a885c 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -131,6 +131,7 @@ xhtmlHeaders(__FILE__, translate('Zone'));
     </div>
     <div id="content">
       <form name="zoneForm" id="zoneForm" method="post" action="?">
+        <input type="hidden" name="REFERER" value="<?php echo $_SERVER['HTTP_REFERER'] ?>"/> 
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="zone"/>
         <input type="hidden" name="mid" value="<?php echo $mid ?>"/>