From e72e4e7ce41e9b3face8af9cdb161e461a3cd79a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 4 Jan 2019 15:52:36 -0500
Subject: [PATCH] Spacing, remove some html4 stuff, clean up duplicated hidden
 form elements.

---
 web/skins/classic/views/eventdetail.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/web/skins/classic/views/eventdetail.php b/web/skins/classic/views/eventdetail.php
index bad9a18bc..1afe23d9f 100644
--- a/web/skins/classic/views/eventdetail.php
+++ b/web/skins/classic/views/eventdetail.php
@@ -18,14 +18,14 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit( 'Events' ) ) {
+if ( !canEdit('Events') ) {
   $view = 'error';
   return;
 }
 if ( isset($_REQUEST['eid']) ) {
   $mode = 'single';
   $eid = validInt($_REQUEST['eid']);
-  $newEvent = dbFetchOne( 'SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid) );
+  $newEvent = dbFetchOne('SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid));
 } elseif ( isset($_REQUEST['eids']) ) {
   $mode = 'multi';
   $sql = 'SELECT E.* FROM Events AS E WHERE ';
@@ -35,8 +35,8 @@ if ( isset($_REQUEST['eid']) ) {
     $sqlWhere[] = 'E.Id = ?';
     $sqlValues[] = $eid;
   }
-  unset( $eid );
-  $sql .= join( " or ", $sqlWhere );
+  unset($eid);
+  $sql .= join(' OR ', $sqlWhere);
   foreach( dbFetchAll( $sql, NULL, $sqlValues ) as $row ) {
     if ( !isset($newEvent) ) {
       $newEvent = $row;
@@ -75,18 +75,15 @@ if ( $mode == 'single' ) {
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <input type="hidden" name="view" value="none"/>
+        <input type="hidden" name="action" value="eventdetail"/>
+        <input type="hidden" name="view" value="<?php echo $view ?>"/>
 <?php
 if ( $mode == 'single' ) {
 ?>
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="action" value="eventdetail"/>
         <input type="hidden" name="eid" value="<?php echo $eid ?>"/>
 <?php
-} elseif ( $mode = 'multi' ) {
+} else if ( $mode = 'multi' ) {
 ?>
-        <input type="hidden" name="view" value="none"/>
-        <input type="hidden" name="action" value="eventdetail"/>
 <?php
     foreach ( $_REQUEST['eids'] as $eid ) {
 ?>
@@ -95,7 +92,7 @@ if ( $mode == 'single' ) {
     }
 }
 ?>
-        <table id="contentTable" class="major" cellspacing="0">
+        <table id="contentTable" class="major">
           <tbody>
             <tr>
               <th scope="row"><?php echo translate('Cause') ?></th>
@@ -108,8 +105,10 @@ if ( $mode == 'single' ) {
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/>
-          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
+          <button type="submit" value="Save" <?php echo !canEdit('Events') ? ' disabled="disabled"' : '' ?>>
+          <?php echo translate('Save') ?>
+          </button>
+          <button type="button" onclick="closeWindow()"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>