From 0e20666992abcb1ee04def2e10a4abe8fa1ea49f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 4 Jan 2019 15:43:31 -0500
Subject: [PATCH] fix eventdetail actions being in events

---
 web/includes/actions/eventdetail.php | 47 ++++++++++++++++++++++++++++
 web/includes/actions/events.php      | 16 +---------
 2 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 web/includes/actions/eventdetail.php

diff --git a/web/includes/actions/eventdetail.php b/web/includes/actions/eventdetail.php
new file mode 100644
index 000000000..c0507776f
--- /dev/null
+++ b/web/includes/actions/eventdetail.php
@@ -0,0 +1,47 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( !isset($_REQUEST['markEids']) ) {
+  Warning('Events actions require eids');
+  return;
+}
+
+// Event scope actions, view permissions only required
+if ( !canEdit('Events') ) {
+  Warning("Events actions require Edit permissions");
+  return;
+} // end if ! canEdit(Events)
+
+if ( $action == 'eventdetail' ) {
+  $dbConn->beginTransaction();
+  foreach ( getAffectedIds('markEid') as $markEid ) {
+    dbQuery('UPDATE Events SET Cause=?, Notes=? WHERE Id=?',
+      array(
+        $_REQUEST['newEvent']['Cause'],
+        $_REQUEST['newEvent']['Notes'],
+        $markEid
+      )
+    );
+  }
+  $dbConn->commit();
+  $refreshParent = true;
+  $closePopup = true;
+}
+?>
diff --git a/web/includes/actions/events.php b/web/includes/actions/events.php
index dff69d738..10642f329 100644
--- a/web/includes/actions/events.php
+++ b/web/includes/actions/events.php
@@ -29,21 +29,7 @@ if ( !canEdit('Events') ) {
   return;
 } // end if ! canEdit(Events)
 
-if ( $action == 'eventdetail' ) {
-  $dbConn->beginTransaction();
-  foreach ( getAffectedIds('markEid') as $markEid ) {
-    dbQuery('UPDATE Events SET Cause=?, Notes=? WHERE Id=?',
-      array(
-        $_REQUEST['newEvent']['Cause'],
-        $_REQUEST['newEvent']['Notes'],
-        $markEid
-      )
-    );
-  }
-  $dbConn->commit();
-  $refreshParent = true;
-  $closePopup = true;
-} else if ( $action == 'archive' ) {
+if ( $action == 'archive' ) {
   $dbConn->beginTransaction();
   foreach( getAffectedIds('markEid') as $markEid ) {
     dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(1, $markEid));