From 5e9f53b41addecaf2a400e39bf27dcc5682ae1e2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 3 Dec 2023 17:57:22 -0500
Subject: [PATCH] Fixup issues with label for's

---
 web/skins/classic/views/filter.php | 78 +++++++++++++++---------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 4d88a2339..e18faca45 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -151,9 +151,9 @@ echo $navbar = getNavBarHTML();
         <div id="filterSelector"><label for="Id"><?php echo translate('UseFilter') ?></label>
           <?php
 if ( count($filterNames) > 1 ) {
-   echo htmlSelect('Id', $filterNames, $filter->Id(), array('data-on-change-this'=>'selectFilter'));
+   echo htmlSelect('Id', $filterNames, $filter->Id(), ['id'=>'Id', 'data-on-change-this'=>'selectFilter']);
 } else {
-?><select disabled="disabled"><option><?php echo translate('NoSavedFilters') ?></option></select>
+?><select id="Id" disabled="disabled"><option><?php echo translate('NoSavedFilters') ?></option></select>
 <?php
 }
 if ( (null !== $filter->Background()) and $filter->Background() ) 
@@ -176,11 +176,12 @@ if ( (null !== $filter->Concurrent()) and $filter->Concurrent() )
         </p>
 <?php
 if (ZM_OPT_USE_AUTH) {
-  echo '<p><label>'.translate('FilterUser').'</label>'.PHP_EOL;
+  echo '<p><label for="filter[UserId]">'.translate('FilterUser').'</label>'.PHP_EOL;
   global $user;
   echo htmlSelect('filter[UserId]',
     ZM\User::Indexed_By_Id(),
-    $filter->UserId() ? $filter->UserId() : $user->Id()
+    $filter->UserId() ? $filter->UserId() : $user->Id(),
+  ['Id'=>'filter[UserId]']
   );
   echo '</p>'.PHP_EOL;
 }
@@ -210,7 +211,7 @@ $sort_fields = array(
     'AvgScore'      => translate('AttrAvgScore'),
     'MaxScore'      => translate('AttrMaxScore'),
     );
-echo htmlSelect('filter[Query][sort_field]', $sort_fields, $filter->sort_field());
+echo htmlSelect('filter[Query][sort_field]', $sort_fields, $filter->sort_field(), ['Id'=>'filter[Query][sort_field]']);
 $sort_dirns = array(
   '1' => translate('SortAsc'),
   '0'  => translate('SortDesc')
@@ -224,7 +225,7 @@ echo htmlSelect('filter[Query][sort_asc]', $sort_dirns, $filter->sort_asc());
 echo htmlSelect('filter[Query][skip_locked]',
   array('0'=>translate('No'), '1'=>translate('Yes')),
   $filter->skip_locked(),
-  ( db_supports_feature('skip_locks') ? []: ['disabled'=>'disabled', 'title'=>'Database does not support the skip locked feature.'])
+  ( db_supports_feature('skip_locks') ? ['Id'=>'filter[Query][skip_locked]']: ['Id'=>'filter[Query][skip_locked]', 'disabled'=>'disabled', 'title'=>'Database does not support the skip locked feature.',])
 );
 
 ?>
@@ -241,67 +242,67 @@ echo htmlSelect('filter[Query][skip_locked]',
         <div id="actionsTable" class="filterTable">
           <fieldset><legend><?php echo translate('Actions') ?></legend>
             <p>
-              <label><?php echo translate('FilterArchiveEvents') ?></label>
-              <input type="checkbox" name="filter[AutoArchive]" value="1"<?php if ( $filter->AutoArchive() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
+              <label for="filter[AutoArchive]"><?php echo translate('FilterArchiveEvents') ?></label>
+              <input type="checkbox" id="filter[AutoArchive]" name="filter[AutoArchive]" value="1"<?php if ( $filter->AutoArchive() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
             <p>
-              <label><?php echo translate('FilterUnarchiveEvents') ?></label>
-              <input type="checkbox" name="filter[AutoUnarchive]" value="1"<?php if ( $filter->AutoUnarchive() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
+              <label for="filter[AutoUnarchive]"><?php echo translate('FilterUnarchiveEvents') ?></label>
+              <input type="checkbox" id="filter[AutoUnarchive]" name="filter[AutoUnarchive]" value="1"<?php if ( $filter->AutoUnarchive() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
-            <p><label><?php echo translate('FilterUpdateDiskSpace') ?></label>
-              <input type="checkbox" name="filter[UpdateDiskSpace]" value="1"<?php echo !$filter->UpdateDiskSpace() ? '' : ' checked="checked"' ?> data-on-click-this="updateButtons"/>
+            <p><label for="filter[UpdateDiskSpace]"><?php echo translate('FilterUpdateDiskSpace') ?></label>
+              <input type="checkbox" id="filter[UpdateDiskSpace]" name="filter[UpdateDiskSpace]" value="1"<?php echo !$filter->UpdateDiskSpace() ? '' : ' checked="checked"' ?> data-on-click-this="updateButtons"/>
             </p>
 <?php
 if ( ZM_OPT_FFMPEG ) {
 ?>
             <p>
-              <label><?php echo translate('FilterVideoEvents') ?></label>
-              <input type="checkbox" name="filter[AutoVideo]" value="1"<?php if ( $filter->AutoVideo() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
+              <label for="filter[AutoVideo]"><?php echo translate('FilterVideoEvents') ?></label>
+              <input type="checkbox" id="filter[AutoVideo]" name="filter[AutoVideo]" value="1"<?php if ( $filter->AutoVideo() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
 <?php
 }
 if ( ZM_OPT_UPLOAD ) {
 ?>
             <p>
-              <label><?php echo translate('FilterUploadEvents') ?></label>
-              <input type="checkbox" name="filter[AutoUpload]" value="1"<?php if ( $filter->AutoUpload() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
+              <label for="filter[AutoUpload]"><?php echo translate('FilterUploadEvents') ?></label>
+              <input type="checkbox" id="filter[AutoUpload]" name="filter[AutoUpload]" value="1"<?php if ( $filter->AutoUpload() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
 <?php
 }
 if ( ZM_OPT_EMAIL ) {
 ?>
             <p>
-              <label><?php echo translate('FilterEmailEvents') ?></label>
-              <input type="checkbox" name="filter[AutoEmail]" value="1"<?php if ( $filter->AutoEmail() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_AutoEmail"/>
+              <label for="filter[AutoEmail]"><?php echo translate('FilterEmailEvents') ?></label>
+              <input type="checkbox" id="filter[AutoEmail]" name="filter[AutoEmail]" value="1"<?php if ( $filter->AutoEmail() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_AutoEmail"/>
             </p>
 <?php
 }
 if ( ZM_OPT_MESSAGE ) {
 ?>
             <p>
-              <label><?php echo translate('FilterMessageEvents') ?></label>
-              <input type="checkbox" name="filter[AutoMessage]" value="1"<?php if ( $filter->AutoMessage() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
+              <label for="filter[AutoMessage]"><?php echo translate('FilterMessageEvents') ?></label>
+              <input type="checkbox" id="filter[AutoMessage]" name="filter[AutoMessage]" value="1"<?php if ( $filter->AutoMessage() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
 <?php
 }
 ?>
             <p>
-              <label><?php echo translate('FilterExecuteEvents') ?></label>
-              <input type="checkbox" name="filter[AutoExecute]" value="1"<?php if ( $filter->AutoExecute() ) { ?> checked="checked"<?php } ?>/>
+              <label for="filter[AutoExecute]"><?php echo translate('FilterExecuteEvents') ?></label>
+              <input type="checkbox" id="filter[AutoExecute]" name="filter[AutoExecute]" value="1"<?php if ( $filter->AutoExecute() ) { ?> checked="checked"<?php } ?>/>
               <input type="text" name="filter[AutoExecuteCmd]" value="<?php echo (null !==$filter->AutoExecuteCmd())?validHtmlStr($filter->AutoExecuteCmd()):'' ?>" maxlength="255" data-on-change-this="updateButtons"/>
             </p>
             <p>
-              <label><?php echo translate('FilterDeleteEvents') ?></label>
-              <input type="checkbox" name="filter[AutoDelete]" value="1"<?php if ( $filter->AutoDelete() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
+              <label for="filter[AutoDelete]"><?php echo translate('FilterDeleteEvents') ?></label>
+              <input type="checkbox" id="filter[AutoDelete]" name="filter[AutoDelete]" value="1"<?php if ( $filter->AutoDelete() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
             <p>
-              <label><?php echo translate('FilterCopyEvents') ?></label>
-              <input type="checkbox" name="filter[AutoCopy]" value="1"<?php if ( $filter->AutoCopy() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_autocopy"/>
+              <label for="filter[AutoCopy]"><?php echo translate('FilterCopyEvents') ?></label>
+              <input type="checkbox" id="filter[AutoCopy]" name="filter[AutoCopy]" value="1"<?php if ( $filter->AutoCopy() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_autocopy"/>
               <?php echo htmlSelect('filter[AutoCopyTo]', $storageareas, $filter->AutoCopyTo(), $filter->AutoCopy() ? null : array('style'=>'display:none;')); ?>
             </p>
             <p>
-              <label><?php echo translate('FilterMoveEvents') ?></label>
-              <input type="checkbox" name="filter[AutoMove]" value="1"<?php if ( $filter->AutoMove() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_automove"/>
+              <label for="filter[AutoMove]"><?php echo translate('FilterMoveEvents') ?></label>
+              <input type="checkbox" id="filter[AutoMove]" name="filter[AutoMove]" value="1"<?php if ( $filter->AutoMove() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_automove"/>
               <?php echo htmlSelect('filter[AutoMoveTo]', $storageareas, $filter->AutoMoveTo(), $filter->AutoMove() ? null : array('style'=>'display:none;')); ?>
             </p>
           </fieldset>
@@ -313,15 +314,15 @@ if ( ZM_OPT_MESSAGE ) {
               <input type="checkbox" id="filter[Background]" name="filter[Background]" value="1"<?php if ( $filter->Background() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
             <p>
-              <label for="ExecuteInterval"><?php echo translate('Execute Interval') ?></label>
+              <label for="filter[ExecuteInterval]"><?php echo translate('Execute Interval') ?></label>
               <input type="number" id="filter[ExecuteInterval]" name="filter[ExecuteInterval]" min="0" step="1" value="<?php echo $filter->ExecuteInterval() ?>" /><?php echo translate('seconds'); ?>
             </p>
             <p>
-              <label for="Concurrent"><?php echo translate('ConcurrentFilter') ?></label>
+              <label for="filter[Concurrent]"><?php echo translate('ConcurrentFilter') ?></label>
               <input type="checkbox" id="filter[Concurrent]" name="filter[Concurrent]" value="1"<?php if ( $filter->Concurrent() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
             <p>
-              <label for="LockRows"><?php echo translate('FilterLockRows') ?></label>
+              <label for="filter[LockRows]"><?php echo translate('FilterLockRows') ?></label>
               <input type="checkbox" id="filter[LockRows]" name="filter[LockRows]" value="1"<?php if ( $filter->LockRows() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
 <?php
@@ -329,23 +330,24 @@ if ( ZM_OPT_EMAIL ) {
 ?>
             <div id="EmailOptions"<?php echo $filter->AutoEmail() ? '' : ' style="display:none;"' ?>>
               <p>
-                <label><?php echo translate('FilterEmailTo') ?></label>
-                <input type="email" name="filter[EmailTo]" value="<?php echo validHtmlStr($filter->EmailTo()) ?>" multiple/>
+                <label for="filter[EmailTo]"><?php echo translate('FilterEmailTo') ?></label>
+                <input type="email" id="filter[EmailTo]" name="filter[EmailTo]" value="<?php echo validHtmlStr($filter->EmailTo()) ?>" multiple/>
               </p>
               <p>
-                <label><?php echo translate('FilterEmailSubject') ?></label>
-                <input type="text" name="filter[EmailSubject]" value="<?php echo validHtmlStr($filter->EmailSubject()) ?>"/>
+                <label for="filter[EmailSubject]"><?php echo translate('FilterEmailSubject') ?></label>
+                <input type="text" id="filter[EmailSubject]" name="filter[EmailSubject]" value="<?php echo validHtmlStr($filter->EmailSubject()) ?>"/>
               </p>
               <p>
-                <label><?php echo translate('FilterEmailBody') ?></label>
-                <textarea name="filter[EmailBody]" rows="<?php echo count(explode("\n", $filter->EmailBody())) ?>"><?php echo validHtmlStr($filter->EmailBody()) ?></textarea>
+                <label for="filter[EmailBody]"><?php echo translate('FilterEmailBody') ?></label>
+                <textarea id="filter[EmailBody]" name="filter[EmailBody]" rows="<?php echo count(explode("\n", $filter->EmailBody())) ?>"><?php echo validHtmlStr($filter->EmailBody()) ?></textarea>
               </p>
               <p>
-                <label><?php echo translate('Email Format') ?></label>
+                <label for="filter[EmailFormat]Individual"><?php echo translate('Email Format') ?>
 <?php echo html_radio(
   'filter[EmailFormat]',
   ['Individual'=>translate('Individual'), 'Summary'=>translate('Summary')],
   $filter->EmailFormat()); ?>
+</label>
               </p>
               
             </div>