From 3d968291f9108b17b38d8b7ce67ea2cdb2a950a8 Mon Sep 17 00:00:00 2001
From: Bruce Bannon <brucebannon212@gmail.com>
Date: Wed, 1 Nov 2023 18:25:11 -0600
Subject: [PATCH] Most input -> button convertion

---
 access.php             | 30 +++++++++++++---------
 admin.php              | 15 +++++------
 approve_entry.php      |  8 +++---
 assistant_edit.php     |  7 +++---
 category.php           | 27 ++++++++++----------
 catsel.php             | 16 ++++++------
 docadd.php             |  4 +--
 edit_entry.php         | 56 ++++++++++++++++++++++++------------------
 edit_entry_handler.php |  8 +++---
 edit_report.php        | 16 ++++++------
 edit_template.php      | 13 +++++-----
 export.php             |  4 +--
 groups.php             | 25 ++++++++++++++-----
 help_bug.php           |  2 +-
 import.php             |  3 ++-
 includes/dbtable.php   |  4 +--
 layers.php             | 31 ++++++++++++++---------
 login-app.php          |  4 +--
 login.php              |  3 ++-
 pref.php               | 21 ++++++++++------
 purge.php              | 13 +++++-----
 register.php           | 10 ++++----
 reject_entry.php       |  4 +--
 remotecal_mgmt.php     | 26 ++++++++++++++------
 resourcecal_mgmt.php   | 17 +++++++++----
 search.php             |  9 ++++---
 search_handler.php     |  4 +--
 select_user.php        |  3 ++-
 set_entry_cat.php      |  4 +--
 user_mgmt.php          | 27 ++++++++++++++------
 usersel.php            | 26 ++++++++++----------
 view_entry.php         | 10 ++++----
 views_edit.php         | 11 ++++++---
 33 files changed, 272 insertions(+), 189 deletions(-)

diff --git a/access.php b/access.php
index a892f12f2..193e4e5cf 100644
--- a/access.php
+++ b/access.php
@@ -35,7 +35,8 @@
 $defConfigStr = translate( 'DEFAULT CONFIGURATION' );
 $goStr = '
       </select>
-      <input class="btn btn-primary" type="submit" value="' . translate( 'Go' ) . '">
+      <button class="btn btn-primary" type="submit">'
+  . translate ( 'Go' ) . '</button>
     </form>';
 $saveStr = translate( 'Save' );
 $undoStr = translate( 'Undo' );
@@ -262,8 +263,9 @@
           </tr>
         </tbody>
       </table>
-      <input class="btn btn-secondary" type="submit" value="' . $undoStr . '">
-      <input class="btn btn-primary" type="submit" name="submit" value="' . $saveStr . '">
+      <button class="btn btn-secondary" type="submit">' . $undoStr . '</button>
+      <button class="btn btn-primary" name="submit" type="submit">'
+      . $saveStr . '</button>
     </form>';
 
     $pagetitle = translate( 'Allow Access to Other Users Calendar' );
@@ -415,13 +417,15 @@
     echo '
           <tr>
             <td colspan="2" class="boxleft alignright">'
-     . ( $otheruser != '__default__' && $otheruser != '__public__' ? '
-              <input class="btn btn-secondary" type="button" value="' . translate( 'Assistant' )
-       . '" onclick="selectAll(63);">&nbsp;&nbsp;' : '' ) . '
-              <input class="btn btn-secondary" type="button" value="' . translate( 'Select All' )
-     . '" onclick="selectAll(256);">&nbsp;&nbsp;
-              <input class="btn btn-secondary" type="button" value="' . translate( 'Clear All' )
-     . '" onclick="selectAll(0);">
+      . ( $otheruser !== '__default__' && $otheruser !== '__public__' ? '
+              <button class="btn btn-secondary" type="button" '
+          . 'onclick="selectAll(63);">'
+          . translate ( 'Assistant' ) . '</button>'
+        : '' ) . '
+              <button class="btn btn-secondary" type="button" '
+      . 'onclick="selectAll(256);">' . translate ( 'Select All' ) . '</button>
+              <button class="btn btn-secondary" type="button" '
+      . 'onclick="selectAll(0);">' . translate ( 'Clear All' ) . '</button>
             </td>
             <td colspan="9" class="boxright">
               <table class="aligncenter" cellpadding="5" cellspacing="2">
@@ -438,8 +442,10 @@
   echo '
           <tr>
             <td colspan="11" class="boxleft boxbottom boxright">
-              <input class="btn btn-secondary" type="submit" value="' . $undoStr . '">
-              <input class="btn btn-primary" type="submit" name="submit" value="' . $saveStr . '">
+              <button class="btn btn-secondary" type="submit">'
+    . $undoStr . '</button>
+              <button class="btn btn-primary" name="submit" type="submit">'
+    . $saveStr . '</button>
             </td>
           </tr>
         </tbody>
diff --git a/admin.php b/admin.php
index 4419188c5..eadb8bba5 100644
--- a/admin.php
+++ b/admin.php
@@ -110,10 +110,10 @@ function save_pref ( $prefs, $src ) {
   @session_start();
   $_SESSION['webcal_tmp_login'] = 'blahblahblah';
 
-  $editStr = '<input type="button" value="' . translate ( 'Edit' )
-   . "...\" onclick=\"window.open( 'edit_template.php?type=%s','cal_template','"
-   . 'dependent,menubar,scrollbars,height=500,width=500,outerHeight=520,'
-   . 'outerWidth=520\' );" name="">';
+  $editStr = '<button name="" type="button" '
+    . "onclick=\"window.open('edit_template.php?type=%s','cal_template','"
+    . 'dependent,menubar,scrollbars,height=500,width=500,outerHeight=520,'
+    . 'outerWidth=520\');">' . translate ( 'Edit' ) . '...</button>';
   $choices = ['day.php', 'week.php', 'month.php', 'year.php'];
   $choices_text = [translate ( 'Day' ), translate ( 'Week' ),
     translate ( 'Month' ), translate ( 'Year' )];
@@ -243,8 +243,8 @@ function save_pref ( $prefs, $src ) {
     <form action="admin.php" method="post" onsubmit="return valid_form( this );"'
    . ' name="prefform">' . csrf_form_key()
    . display_admin_link() . '
-      <input class="btn btn-primary" type="submit" value="' . $saveStr
-   . '" name=""><br><br>
+      <button class="btn btn-primary" name="" type="submit">'
+    . $saveStr . '</button><br><br>
 
 <!-- TABS -->' . $tabs . '
 <!-- TABS BODY -->
@@ -854,7 +854,8 @@ function save_pref ( $prefs, $src ) {
       </div>
       </div>
       <div style="clear:both;">
-        <input class="btn btn-primary" type="submit" value="' . $saveStr . '" name="">
+        <button class="btn btn-primary" name="" type="submit">'
+    . $saveStr . '</button>
       </div>
     </form>
   </div>
diff --git a/approve_entry.php b/approve_entry.php
index edb22bdfc..01063da74 100644
--- a/approve_entry.php
+++ b/approve_entry.php
@@ -31,10 +31,10 @@
         </tr>
         <tr>
           <td class="aligncenter">
-            <input type="submit" value="' . translate ( 'Approve and Send' )
-   . '">&nbsp;&nbsp;&nbsp;
-            <input type="submit" id="cancel" name="cancel" value="'
-   . translate( 'Approve and Exit' ) . '">
+            <button type="submit">' . translate ( 'Approve and Send' )
+    . '</button>&nbsp;&nbsp;&nbsp;
+            <button id="cancel" name="cancel" type="submit">'
+    . translate ( 'Approve and Exit' ) . '</button>
           </td>
         </tr>
         <tr>
diff --git a/assistant_edit.php b/assistant_edit.php
index a1f659aca..cabfd71c3 100644
--- a/assistant_edit.php
+++ b/assistant_edit.php
@@ -57,14 +57,15 @@
 echo "</select>\n";
 
 if ( $GROUPS_ENABLED == 'Y' ) {
-  echo '<input class="btn btn-primary" type="button" onclick="selectUsers()" value="'
-   . translate ( 'Select' ) . '...">';
+  echo '<button class="btn btn-primary" type="button" onclick="selectUsers()">'
+    . translate ( 'Select' ) . '...</button>';
 }
  echo "</div>\n";
 
 ?>
 <div class="form-inline col-4 pt-2">
-<input class="btn btn-primary" type="submit" name="action" value="<?php etranslate ( 'Save' );?>">
+  <button class="btn btn-primary" name="action" type="submit">'<?php
+etranslate ( 'Save' );?></button>
 </div>
 
 </form>
diff --git a/category.php b/category.php
index d11f106d2..435d687d1 100644
--- a/category.php
+++ b/category.php
@@ -96,7 +96,7 @@
     <div class="form-inline">
     <label class="col-sm-3 col-form-label" for="FileName">'
     . (is_dir($icon_path) &&
-      (($ENABLE_ICON_UPLOADS == 'Y' || $is_admin) && $canWrite)
+      ( $ENABLE_ICON_UPLOADS === 'Y' || $is_admin ) && $canWrite
       ? translate('Add Icon to Category') . ':</label>
       <input class="form-control" type="file" name="FileName" id="fileupload" size="45" '
       . 'maxlength="50" value="">
@@ -106,19 +106,19 @@
 
     <div class="form-inline p-1">
     <input type="hidden" id="urlname" name="urlname" size="50">&nbsp;&nbsp;&nbsp;
-    <input class="btn btn-secondary openBtn" type="button" value="'
-      . translate('Search for existing icons...')
-      . '">
-     </div>' : '') // end test of ENABLE_ICON_UPLOADS
-    . '<div class="form-inline">
-  <input class="form-control btn btn-primary" type="submit" name="action" value="'
-    . ($add == '1' ? translate('Add') : translate('Save')) . '">'
+      <button class="btn btn-secondary openBtn" type="button">'
+    . translate ( 'Search for existing icons...' ) . '</button>
+    </div>' : '' ) . '
+    <div class="form-inline">
+      <button class="form-control btn btn-primary" name="action" type="submit">'
+    . ( $add === '1' ? translate ( 'Add' ) : translate ( 'Save' ) )
+    . '</button>'
     . '<a href="category.php" class="form-control btn btn-secondary ml-1">Cancel</a> '
     . (!empty($id) ? '
-      <input class="form-control btn btn-danger ml-1" type="submit" name="delete" value="'
-      . translate('Delete') . '" onclick="return confirm( '
-      . translate('Are you sure you want to delete this entry?', true)
-      . '\' )">' : '') . '
+      <button class="form-control btn btn-danger ml-1" name="delete" '
+      . 'type="submit" onclick="return confirm('
+      . translate ( 'Are you sure you want to delete this entry?', true )
+      . '\')">' . translate ( 'Delete' ) . '</button>' : '' ) . '
           </div>
     </form>';
 } else
@@ -171,7 +171,8 @@
 
       </div>
       <div class="modal-footer">
-        <button id="modalclosebtn" type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button class="btn btn-default" id="modalclosebtn" data-dismiss="modal"'
+    . ' type="button">' . translate ( 'Close' ) . '</button>
       </div>
     </div>
   </div>
diff --git a/catsel.php b/catsel.php
index 9a2a64eab..64c68c9df 100644
--- a/catsel.php
+++ b/catsel.php
@@ -59,8 +59,8 @@
 }
 echo '
         </td>
-        <td class="alignmiddle"><input type="button" value=">>" onclick="selAdd()"'
- . '></td>
+        <td class="AlignMiddle"><button type="button" onclick="selAdd()">>>'
+  . '</button></td>
         <td class="aligncenter aligntop">
           <select name="eventcats[]" size="9" multiple>
             <option disabled>' . $entryCatStr . '</option>';
@@ -81,16 +81,16 @@
 }
 echo '
           </select>
-          <input type="button" value="' . translate ( 'Remove' )
- . '" onclick="selRemove()">
+          <button type="button" onclick="selRemove()">'
+  . translate ( 'Remove' ) . '</button>
         </td>
       </tr>
       <tr>
         <td class="aligntop alignright">*' . translate ( 'Global Category' )
- . '&nbsp;&nbsp;&nbsp;<input type="button" value="' . translate ( 'OK' )
- . '" onclick="sendCats()"></td>
-        <td colspan="2" class="alignleft">&nbsp;&nbsp;<input type="button" value="'
- . translate ( 'Cancel' ) . '" onclick="window.close()"></td>
+  . '&nbsp;&nbsp;&nbsp;<button type="button" onclick="sendCats()">'
+  . translate ( 'OK' ) . '</button></td>
+        <td class="AlignLeft" colspan="2"><button type="button" '
+  . 'onclick="window.close()">' . translate ( 'Cancel' ) . '</button></td>
       </tr>
       </form>
     </table>
diff --git a/docadd.php b/docadd.php
index 28a2c4d8f..7a2db359c 100644
--- a/docadd.php
+++ b/docadd.php
@@ -216,7 +216,7 @@
   <?php etranslate ( 'Comment' )?>:</label></td>
   <td><textarea name="comment" rows="15" cols="60" wrap="auto"></textarea></td></tr>
 <tr><td colspan="2">
-<input type="submit" value="<?php etranslate ( 'Add Comment' )?>"></td></tr>
+<button type="submit"><?php etranslate ( 'Add Comment' )?></button></td></tr>
 </table>
 </form>
 
@@ -236,7 +236,7 @@
   <td><input type="text" name="description" size="50" maxlength="127"></td></tr>
 
 <tr><td colspan="2">
-<input type="submit" value="<?php etranslate ( 'Add Attachment' )?>"></td></tr>
+<button type="submit"><?php etranslate ( 'Add Attachment' )?></button></td></tr>
 
 </table>
 </form>
diff --git a/edit_entry.php b/edit_entry.php
index da9bac12d..bd27440f3 100644
--- a/edit_entry.php
+++ b/edit_entry.php
@@ -1016,7 +1016,8 @@ function time_selection($prefix, $time = '', $trigger = false)
                 <legend class="w-auto px-2"><?php etranslate('Users'); ?></legend>
                 <select class="form-control m-1" name="participants[]" id="entry_part" size="<?php echo $size; ?>" multiple><?php echo $users; ?>
                 </select>
-                <input class="btn btn-secondary m-1" name="movert" type="button" value="<?php echo $addStr; ?>" onclick=" selAdd(this);">
+                <button class="btn btn-secondary m-1" name="movert"
+ type="button" onclick="selAdd(this);"><?php echo $addStr ?></button>
               </fieldset>
             </td>
             <?php if (!empty($nonusers)) { ?>
@@ -1026,7 +1027,8 @@ function time_selection($prefix, $time = '', $trigger = false)
                   <select class="form-control m-1" name="nonuserPart[]" id="res_part" size="<?php echo $size; ?>" multiple>
                     <?php echo $nonusers; ?>
                   </select>
-                  <input class="btn btn-secondary m-1" name="movert" type="button" value="<?php echo $addStr; ?>" onclick="selResource(this);">
+                  <button class="btn btn-secondary m-1" name="movert"
+ type="button" onclick="selResource(this);"><?php echo $addStr ?></button>
                 </fieldset>
               </td>
             <?php } ?>
@@ -1037,7 +1039,8 @@ function time_selection($prefix, $time = '', $trigger = false)
                 <select class="form-control m-1" name="groups" id="groups" size="<?php echo $size; ?>" onclick="addGroup()">
                   <?php echo $grouplist; ?>
                 </select>
-                <input class="btn btn-secondary m-1" name="movert" type="button" value="<?php echo $addStr; ?>" onclick="selAdd(this);">
+                <button class="btn btn-secondary m-1" name="movert"
+ type="button" onclick="selAdd(this);"><?php echo $addStr ?></button>
               </fieldset>
             </td>
             <?php } ?>
@@ -1052,8 +1055,10 @@ function time_selection($prefix, $time = '', $trigger = false)
                 <select class="form-control" name="selectedPart[]" id="sel_part" size="7" multiple>'
                   <?php echo $myusers; ?>
                 </select>
-                <input class="btn btn-secondary m-1" name="movelt" type="button" value="<?php etranslate('Remove'); ?>" onclick="selRemove( this );">
-            <input class="btn btn-secondary m-1" type="button" onclick="showSchedule()" value="<?php etranslate('Availability'); ?>...">
+                <button class="btn btn-secondary m-1" name="movelt" type="button"
+ onclick="selRemove(this);"><?php etranslate ( 'Remove' ); ?></button>
+                <button class="btn btn-secondary m-1" type="button"
+ onclick="showSchedule()"><?php etranslate ( 'Availability' )?>...</button>
               </fieldset>
             </td>
           </tr>
@@ -1067,9 +1072,7 @@ function time_selection($prefix, $time = '', $trigger = false)
           <?php } ?>
         </table>
       </div>
-      <?php /* // End Participants */ ?>
-
-      <?php
+      <?php /* // End Participants */
 
       if ($DISABLE_REPEATING_FIELD != 'Y') {
         echo "\n" . '<!-- REPEAT -->
@@ -1237,9 +1240,9 @@ function time_selection($prefix, $time = '', $trigger = false)
                 . translate($byday_names[$rpt_byday_mod]) : '        '));
 
             echo '
-                <td><input type="button" name="byday" id="_' . $loop_ctr
-              . $rpt_byday_mod . '" value="' . $buttonvalue
-              . '" onclick="toggle_byday( this )"></td>';
+                <td><button id="_' . $loop_ctr . $rpt_byday_mod
+              . '" name="byday" type="button" onclick="toggle_byday(this)">'
+              . "$buttonvalue</button></td>";
           }
           echo '
               </tr>';
@@ -1311,9 +1314,9 @@ function time_selection($prefix, $time = '', $trigger = false)
                 <th><label>' . $loop_ctr . '-' . ($loop_ctr + 9)
             . '</label></th>' : '') . ($loop_ctr == 31 ? '
                 <th><label>31</label></th>' : '') . '
-                <td><input type="button" name="bysetpos" id="bysetpos'
-            . $loop_ctr . '" value="' . $buttonvalue
-            . '" onclick="toggle_bysetpos( this )"></td>'
+                <td><button id="bysetpos' . $loop_ctr
+            . '" name="bysetpos" type="button" onclick="toggle_bysetpos(this)">'
+            . "$buttonvalue</button></td>"
             . ($loop_ctr % 10 == 0 ? '
               </tr>
             <tr>' : '');
@@ -1357,9 +1360,10 @@ function time_selection($prefix, $time = '', $trigger = false)
             . '</label></th>' : '')
             . ($loop_ctr == 31 ? '
             <th><label>31</label></th>' : '') . '
-            <td><input type="button" name="bymonthday" id="bymonthday'
-            . $loop_ctr . '" value="' . $buttonvalue
-            . '" onclick="toggle_bymonthday( this )"></td>'
+            <td><button id="bymonthday' . $loop_ctr
+            . '" name="bymonthday" type="button" '
+            . 'onclick="toggle_bymonthday(this)">'
+            . "$buttonvalue</button></td>"
             . ($loop_ctr % 10 == 0 ? '
           </tr>
           <tr>' : '');
@@ -1420,12 +1424,15 @@ function time_selection($prefix, $time = '', $trigger = false)
                 </select>
               </td>
               <td class="aligntop">
-                <input class="alignleft btn" type="button" name="addException" value="'
-          . translate('Add Exception') . '..." onclick="add_exception(0)"><br>
-                <input class="alignleft btn" type="button" name="addInclusion" value="'
-          . translate('Add Inclusion') . '..." onclick="add_exception(1)"><br>
-                <input class="alignleft btn" type="button" name="delSelected" value="'
-          . translate('Delete Selected') . '" onclick="del_selected()">
+                <button class="AlignLeft btn" name="addException" type="button"'
+          . ' onclick="add_exception(0)">'
+          . translate ( 'Add Exception' ) . '...</button><br>
+                <button class="AlignLeft btn" name="addInclusion" type="button"'
+          . ' onclick="add_exception(1)">'
+          . translate ( 'Add Inclusion' ) . '...</button><br>
+                <button class="AlignLeft btn" name="delSelected" type="button"'
+          . ' onclick="del_selected()">'
+          . translate ( 'Delete Selected' ) . '</button>
               </td>
             </tr>
           </table>
@@ -1592,7 +1599,8 @@ function time_selection($prefix, $time = '', $trigger = false)
       ?>
       <div class="container">
         <div class="col-auto">
-          <input type="button" class="form-check btn btn-primary" value="<?php echo $saveStr; ?>" onclick="validate_and_submit()">
+          <button class="form-check btn btn-primary" type="button"
+ onclick="validate_and_submit()"><?php echo $saveStr ?></button>
           <?php if ($id > 0 && ($login == $create_by || $single_user == 'Y' || $is_admin)) { ?>
             <a class="btn btn-danger" href="del_entry.php?id=<?php echo $id; ?>&csrf_form_key=<?php echo getFormKey();?>" onclick="return confirm('<?php etranslate('Are you sure you want to delete this entry?'); ?>');">
               <?php etranslate('Delete entry'); ?></a><br>
diff --git a/edit_entry_handler.php b/edit_entry_handler.php
index c2123fe1c..d0eae6339 100644
--- a/edit_entry_handler.php
+++ b/edit_entry_handler.php
@@ -1290,10 +1290,10 @@ function sort_byday( $a, $b ) {
   echo
   // Allow them to override a conflict if server settings allow it.
    ( ! empty( $ALLOW_CONFLICT_OVERRIDE ) && $ALLOW_CONFLICT_OVERRIDE == 'Y' ? '
-      <input type="submit" name="confirm_conflicts" value="'
-     . translate( 'Save' ) . '">' : '' ) . '
-      <input type="button" value="' . translate( 'Cancel' )
-   . '" onclick="history.back()">
+      <button name="confirm_conflicts" type="submit">'
+    . translate ( 'Save' ) . '</button>' : '' ) . '
+      <button type="button" onclick="history.back()">'
+    . translate ( 'Cancel' ) . '</button>
     </form>';
 
 } else
diff --git a/edit_report.php b/edit_report.php
index bf3ac87c6..c01e91d79 100644
--- a/edit_report.php
+++ b/edit_report.php
@@ -325,13 +325,15 @@ function print_options ( $textarea, $option ) {
 //}
 
 echo '<div class="form-inline mt-1">
-  <input class="btn btn-primary m-1" type="submit" value="' . translate ( 'Save' ) . '">'
- . ( $adding_report ? '' : '
-            <a href="report.php" class="btn btn-secondary m-1">' . translate('Cancel') . '</a>
-            <input class="btn btn-danger m-1" type="submit" name="delete" value="'
-   . translate ( 'Delete' ) . '" onclick="return confirm( \''
-   . translate( 'Are you sure you want to delete this report?' )
-   . '\');">' );
+  <button class="btn btn-primary m-1" type="submit">'
+  . translate ( 'Save' ) . '</button>'
+  . ( $adding_report ? '' : '
+  <a href="report.php" class="btn btn-secondary m-1">'
+    . translate ( 'Cancel' ) . '</a>
+  <button class="btn btn-danger m-1" name="delete" type="submit"'
+    . '" onclick="return confirm(\''
+    . translate ( 'Are you sure you want to delete this report?' ) . '\');">'
+    . translate ( 'Delete' ) . '</button>' );
 
 ?>
 </div>
diff --git a/edit_template.php b/edit_template.php
index b542642ec..eef7631ab 100644
--- a/edit_template.php
+++ b/edit_template.php
@@ -131,14 +131,13 @@
       <input type="hidden" name="user" value="' . $user . '">' : '' ) . '
       <textarea rows="15" cols="60" name="template">' . htmlspecialchars ( $cur )
    . '</textarea><br>
-      <input type="button" value="' . translate ( 'Cancel' )
-   . '" onclick="window.close();">
-      <input name="action" type="submit" value="' . translate ( 'Save' ) . '">'
+      <button type="button" onclick="window.close();">' . translate ( 'Cancel' )
+  . '</button>
+      <button name="action" type="submit">' . translate ( 'Save' ) . '</button>'
    . ( ! empty ( $user ) ? '
-      <input name="delete" type="submit" value="' . translate ( 'Delete' )
-     . '" onclick="return confirm( \''
-     . translate( 'Are you sure you want to delete this entry?' ) . '\');">'
-    : '' ) . '
+      <button name="delete" type="submit" onclick="return confirm(\''
+      . translate ( 'Are you sure you want to delete this entry?' ) . '\');">'
+      . translate ( 'Delete' ) . '</button>' : '' ) . '
     </form>' ) . "\n" . print_trailer ( false, true, true );
 
 ?>
diff --git a/export.php b/export.php
index c4748f620..8d50698d2 100644
--- a/export.php
+++ b/export.php
@@ -106,8 +106,8 @@
           </td>
         </tr>
         <tr>
-          <td colspan="2"><input class="btn btn-primary" type="submit" value="'
- . translate ( 'Export' ) . '"></td>
+          <td colspan="2"><button class="btn btn-primary" type="submit">'
+  . translate ( 'Export' ) . '</button></td>
         </tr>
       </table>
     </form>';
diff --git a/groups.php b/groups.php
index e7a96da86..a480fabfd 100644
--- a/groups.php
+++ b/groups.php
@@ -41,7 +41,8 @@
 <!-- Error Alert -->
 <div id="main-dialog-alert" class="alert alert-info" style="display: none">
     <span id="infoMessage"></span>
-    <button type="button" class="close" onclick="$('.alert').hide()">&times;</button>
+  <button type="button" class="close"
+ onclick="document.querySelector('.alert').hide()">&times;</button>
 </div>
 <!-- Users loaded via AJAX -->
 <table class="table table-striped" id="group-table">
@@ -61,7 +62,9 @@
 </table>
 
 <div class="userButtons">
-    <input class="btn btn-primary" type="button" value="<?php etranslate('Add Group'); ?>..." onclick="return edit_group(0,'')">
+  <button class="btn btn-primary" type="button"
+ onclick="return edit_group(0,'')"><?php
+ etranslate ( 'Add Group' )?>...</button>
 </div>
 
 <!-- add/edit group modal dialog -->
@@ -111,8 +114,13 @@
                     </div>
 
                     <div class="modal-footer">
-                        <input class="form-control btn btn-secondary" onclick="$('#edit-group-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                        <input class="form-control btn btn-primary" data-dismiss="modal" type="button" value="<?php etranslate("Save"); ?>" onclick="save_handler();">
+                      <button class="form-control btn btn-secondary"
+ data-dismiss="modal" type="button"
+ onclick="document.querySelector('#edit-group-dialog').hide();"><?php
+ etranslate ( 'Cancel' ); ?></button>
+                      <button class="form-control btn btn-primary"
+ data-dismiss="modal" type="button" onclick="save_handler();"><?php
+ etranslate ( 'Save' ); ?></button>
                     </div>
                 </form>
             </div>
@@ -142,8 +150,13 @@
                 </form>
                 <br>
                 <div class="modal-footer">
-                    <input class="form-control btn btn-secondary" onclick="$('#delete-group-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                    <input class="form-control btn btn-danger" type="submit" name="delete" value="<?php etranslate('Delete') ?>" onclick="delete_handler ();">
+                  <button class="form-control btn btn-secondary"
+ data-dismiss="modal" type="button"
+ onclick="document.querySelector('#delete-group-dialog').hide();"><?php
+ etranslate ( 'Cancel' ); ?></button>
+                  <button class="form-control btn btn-danger" name="delete"
+ type="submit" onclick="delete_handler();"><?php
+ etranslate ( 'Delete' ) ?></button>
                 </div>
             </div>
         </div>
diff --git a/help_bug.php b/help_bug.php
index 65c45e9e5..79383c12d 100644
--- a/help_bug.php
+++ b/help_bug.php
@@ -18,7 +18,7 @@
      . str_replace ('XXX', translate ( get_browser_language ( true ) ),
      translate ( 'Also, please use English rather than XXX.' ) ) : '' ) . '</p>
     <form action="https://github.com/craigk5n/webcalendar/issues" target="_blank">
-      <input type="submit" value="' . translate ( 'Report Bug' ) . '">
+      <button type="submit">' . translate ( 'Report Bug' ) . '</button>
     </form>
     <h3>' . translate ( 'System Settings' ) . '</h3>
     <div>';
diff --git a/import.php b/import.php
index 7e8703342..f05ad035e 100644
--- a/import.php
+++ b/import.php
@@ -173,7 +173,8 @@ function print_categories() {
   print_categories();
   echo '
       </table><br>
-      <input class="btn btn-primary" type="submit" value="' . translate ( 'Import' ) . '">
+      <button class="btn btn-primary" type="submit">'
+    . translate ( 'Import' ) . '</button>
     </form>';
 }
 echo print_trailer();
diff --git a/includes/dbtable.php b/includes/dbtable.php
index d81809fea..989ac510d 100644
--- a/includes/dbtable.php
+++ b/includes/dbtable.php
@@ -132,8 +132,8 @@ function dbtable_to_html ( $tablear, $valuesar, $action = '', $formname = '',
 
   return $ret . ( empty ( $actionlabel ) ? '' : '
                     <tr>
-                      <td colspan="2" style="text-align:center;"><input '
-     . 'type="submit" value="' . htmlspecialchars ( $actionlabel ) . '"></td>
+                      <td colspan="2" style="text-align:center;"><button '
+      . 'type="submit">' . htmlspecialchars ( $actionlabel ) . '</button></td>
                     </tr>
                   </form>' ) . '
                 </table>
diff --git a/layers.php b/layers.php
index 38104c469..b6baaa6ec 100644
--- a/layers.php
+++ b/layers.php
@@ -38,7 +38,6 @@
 $duplicatesStr   = translate('Duplicates');
 $editLayerStr    = translate('Edit layer');
 $editStr         = translate('Edit');
-$enableLayersStr = translate('Enable layers');
 $layerStr        = translate('Layer');
 $LAYERS_DISABLED = translate('Layers are currently disabled.');
 $LAYERS_ENABLED  = translate('Layers are currently enabled.');
@@ -87,8 +86,14 @@
       </span>
       &nbsp;&nbsp;
       &nbsp;&nbsp;
-      <input class="btn btn-primary" type="button" onclick="return set_layer_status(true);" value=<?php echo $enableLayersStr; ?>" id="enablebutton" <?php echo $layers_enabled ? 'disabled' : ''; ?>>
-      <input class="btn btn-secondary" type="button" onclick="return set_layer_status(false);" value=<?php etranslate("Disable Layers"); ?>" <?php echo $layers_enabled ? '' : 'disabled'; ?> id="disablebutton">
+      <button class="btn btn-primary" id="enablebutton" type="button"<?php
+ echo $layers_enabled ? ' disabled' : ''; ?>
+ onclick="return set_layer_status(true);"><?php
+ etranslate ( 'Enable layers' ) ?></button>
+      <button class="btn btn-secondary" id="disablebutton" type="button" <?php
+ echo $layers_enabled ? '' : ' disabled'; ?>
+ onclick="return set_layer_status(false);"><?php
+ etranslate ( 'Disable Layers' ); ?></button>
     </div>
 
     <br><br>
@@ -98,7 +103,8 @@
     <br>
 
     <div class="layerButtons" style="margin-left: 25px;">
-      <input class="btn btn-primary" type="button" value="<?php etranslate('Add layer'); ?>..." onclick="return edit_layer(-1)">
+      <button class="btn btn-primary" type="button"
+ onclick="return edit_layer(-1)"><?php etranslate ( 'Add layer' ) ?>...</button>
     </div>
     <br>
 
@@ -179,13 +185,16 @@
               </tr>
             </table>
             <div class="modal-footer">
-              <input class="btn btn-secondary" onclick="$('#edit-layer-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-              <input class="btn btn-danger" id="editLayerDeleteButton" type="button" value="<?php etranslate("Delete"); ?>" onclick="if ( confirm ( '<?php echo $areYouSureStr; ?>' ) ) {
-            $('#editLayerDelete').prop ('value', '1');
-            edit_window_closed ();
-            $('#edit-layer-dialog').hide();
-            }">
-              <input class="btn btn-primary" data-dismiss="modal" type="button" value="<?php etranslate("Save"); ?>" onclick="edit_window_closed(); $('#edit-layer-dialog').hide();">
+              <button class="btn btn-secondary" data-dismiss="modal"
+ type="button" onclick="$('#edit-layer-dialog').hide();"><?php
+ etranslate ( 'Cancel' ); ?></button>
+              <button class="btn btn-danger" id="editLayerDeleteButton"
+ type="button" onclick="if ( confirm ( '<?php echo $areYouSureStr; ?>' ) ) {
+ $('#editLayerDelete').prop ('value', '1'); edit_window_closed();
+ $('#edit-layer-dialog').hide(); }"><?php etranslate ( 'Delete' ); ?></button>
+              <button class="btn btn-primary" data-dismiss="modal" type="button"
+ onclick="edit_window_closed(); $('#edit-layer-dialog').hide();"><?php
+ etranslate ( 'Save' ) ?></button>
             </div>
           </form>
         </div>
diff --git a/login-app.php b/login-app.php
index 029c14e34..31bdfd07b 100644
--- a/login-app.php
+++ b/login-app.php
@@ -117,8 +117,8 @@ function myOnLoad() {
 }
 
 echo '
-            <input type="submit" name="' . $app_login_page['submit']
- . '" value="' . translate ( 'Login' ) . '" tabindex="4">
+            <button name="' . $app_login_page['submit']
+  . '" tabindex="4" type="submit">' . translate ( 'Login' ) . '</button>
           </td>
         </tr>
       </table>
diff --git a/login.php b/login.php
index 0b4181b14..1c7dba516 100644
--- a/login.php
+++ b/login.php
@@ -223,7 +223,8 @@
       <label class="form-check-label" for="exampleCheck1">Remember me</label>
     </div>
     <div class="form-group row justify-content-md-center">
-      <button type="submit" class="btn btn-primary">Submit</button>
+      <button class="btn btn-primary" type="submit"><?php
+ etranslate ( 'Submit' )?></button>
     </div>
 
     <div id="public-calendar-list">
diff --git a/pref.php b/pref.php
index 38bf23878..0f349f1bb 100644
--- a/pref.php
+++ b/pref.php
@@ -209,7 +209,8 @@ function save_pref( $prefs, $src) {
 $resetConfirm = str_replace("XXX", $user, $resetConfirm);
 ?>
 <div class="form-row">
-<input class="btn btn-primary mr-2" type="submit" value="<?php etranslate ( 'Save Preferences' )?>" name="">
+  <button class="btn btn-primary mr-2" name="" type="submit"><?php
+etranslate ( 'Save Preferences' )?></button>
 <input type="hidden" name="action" value="save">
 <a class="btn btn-secondary mr-2" href="pref.php?action=reset&user=<?php echo $user;?>&csrf_form_key=<?php echo getFormKey();?>"
   onclick="return confirm('<?php echo $resetConfirm;?>')"><?php etranslate("Reset Preferences");?></a>
@@ -840,24 +841,27 @@ function save_pref( $prefs, $src) {
 <?php if ( $CUSTOM_SCRIPT == 'Y' ) { ?>
  <tr><td data-toggle="tooltip" data-placement="top" title="<?php etooltip ("custom-script-help");?>">
   <label><?php etranslate ( 'Custom script/stylesheet' )?>:</label></td><td>
-  <input class="form-control btn bth-secondary" type="button" value="<?php etranslate ( 'Edit' );?>..." onclick=<?php
-    printf ( $openStr, 'S',$prefuser ) ?> name="">
+  <button class="form-control btn bth-secondary" name="" type="button"
+  onclick=<?php printf ( $openStr, 'S', $prefuser ) ?>><?php
+  etranslate ( 'Edit' );?>...</button>
  </td></tr>
 <?php }
 
 if ( $CUSTOM_HEADER == 'Y' ) { ?>
  <tr><td data-toggle="tooltip" data-placement="top" title="<?php etooltip ("custom-header-help");?>">
   <label><?php etranslate ( 'Custom header' )?>:</label></td><td>
-  <input class="form-control btn btn-secondary" type="button" value="<?php etranslate ( 'Edit' );?>..." onclick=<?php
-    printf ( $openStr, 'H',$prefuser ) ?> name="">
+  <button class="form-control btn btn-secondary" name="" type="button"
+ onclick="<?php printf ( $openStr, 'H', $prefuser ) ?>"><?php
+ etranslate ( 'Edit' );?>...</button>
  </td></tr>
 <?php }
 
 if ( $CUSTOM_TRAILER == 'Y' ) { ?>
  <tr><td data-toggle="tooltip" data-placement="top" title="<?php etooltip ("custom-trailer-help");?>">
   <label><?php etranslate ( 'Custom trailer' )?>:</label></td><td>
-  <input class="form-control btn btn-secondary" type="button" value="<?php etranslate ( 'Edit' );?>..." onclick=<?php
-    printf ( $openStr, 'T',$prefuser ) ?> name="">
+  <button class="form-control btn btn-secondary" name="" type="button"
+  onclick=<?php printf ( $openStr, 'T', $prefuser ) ?>><?php
+  etranslate ( 'Edit' );?>...</button>
  </td></tr>
 <?php } ?>
 </table>
@@ -894,7 +898,8 @@ function save_pref( $prefs, $src) {
 <!-- END TABS -->
 <br><br>
 <div>
-<input class="btn btn-primary" type="submit" value="<?php etranslate ( 'Save Preferences' )?>" name="">
+<button class="btn btn-primary" name="" type="submit"><?php
+etranslate ( 'Save Preferences' )?></button>
 <br><br>
 </div>
 </form>
diff --git a/purge.php b/purge.php
index 316733999..c22dbb990 100644
--- a/purge.php
+++ b/purge.php
@@ -109,9 +109,8 @@
   }
   echo '<h2>...' . translate ( 'Finished' ) . ".</h2>\n";
 ?>
-  <form><input class="btn btn-primary" type="button" value="<?php etranslate ( 'Back' )?>"
-onclick="history.back()"></form
-><?php
+  <form><button class="btn btn-primary" type="button" onclick="history.back()">
+ <?php etranslate ( 'Back' )?></button></form><?php
   if ( $purgeDebug ) {
     echo '<div style="border: 1px solid #000;background-color: #FFF;"><tt>'
       . "$sqlLog</tt></div>\n";
@@ -160,10 +159,10 @@
   <input class="form-control-sm" type="checkbox" name="preview" value="Y" checked>
  </td></tr>
  <tr><td colspan="2">
-   <input class="btn btn-primary" type="submit" name="delete" value="<?php
-    echo $deleteStr?>" onclick="return confirm( '<?php
-    etranslate ( 'Are you sure you want to delete events for', true);
-    ?> ' + document.forms[0].username.value + '?' )">
+   <button class="btn btn-primary" name="delete" type="submit" onclick="return
+ confirm('<?php
+ etranslate ( 'Are you sure you want to delete events for', true ) ?> ' +
+ document.forms[0].username.value + '?')"><?php echo $deleteStr?></button>
  </td></tr>
 </table>
 </form>
diff --git a/register.php b/register.php
index db90fd485..db83d9056 100644
--- a/register.php
+++ b/register.php
@@ -371,7 +371,7 @@ function generate_password()
   function valid_form() {
     validform = true;
 
-    $(':input[type="submit"]').prop('disabled', false);
+    document.querySelector(':button[type="submit"]').prop('disabled', false);
     if ($('#upassword1').length && $('#upassword1').val().length == 0) {
       $('#infoMessage').html(xlate['inputPassword']);
       $('#main-dialog-alert').show();
@@ -404,7 +404,7 @@ function valid_form() {
       checkers('uemail', 'email');
     }
 
-    $(':input[type="submit"]').prop('disabled', !validform);
+    document.querySelector(':button[type="submit"]').prop('disabled', !validform);
 
     return validform;
   }
@@ -430,14 +430,14 @@ function(data, status) {
           $('#main-dialog-alert').show();
           validform = false;
           if(!validform) {
-            $(':input[type="submit"]').prop('disabled', true);
+            document.querySelector(':button[type="submit"]').prop('disabled', true);
           }
           return;
         }
         if(!validform) {
-          $(':input[type="submit"]').prop('disabled', true);
+          document.querySelector(':button[type="submit"]').prop('disabled', true);
         } else {
-          $('#main-dialog-alert').hide();
+          document.querySelector('#main-dialog-alert').hide();
         }
       });
   }
diff --git a/reject_entry.php b/reject_entry.php
index 48e69f58e..1a6968783 100644
--- a/reject_entry.php
+++ b/reject_entry.php
@@ -28,8 +28,8 @@
    . '</textarea></td>
         </tr>
         <tr>
-          <td class="aligncenter"><input type="submit" value="'
-   . translate ( 'Continue' ) . '"></td>
+          <td class="AlignCenter"><button type="submit">'
+   . translate ( 'Continue' ) . '</button></td>
         </tr>
         <tr>
           <td>'
diff --git a/remotecal_mgmt.php b/remotecal_mgmt.php
index 648fcf849..74f23a4fc 100644
--- a/remotecal_mgmt.php
+++ b/remotecal_mgmt.php
@@ -96,7 +96,8 @@
 
 <br>
 <div class="userButtons">
-    <input class="btn btn-primary" type="button" value="<?php etranslate('Add Remote Calendar'); ?>..." onclick="return edit_user('')">
+  <button class="btn btn-primary" type="button" onclick="return edit_user('')">
+ <?php etranslate ( 'Add Remote Calendar' ); ?>...</button>
 </div>
 
 <!-- add/edit user modal dialog -->
@@ -147,8 +148,11 @@
                     </div>
 
                     <div class="modal-footer mt-2">
-                        <input class="btn btn-secondary" onclick="$('#edit-user-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                        <input class="btn btn-primary" data-dismiss="modal" type="button" value="<?php etranslate("Save"); ?>" onclick="save_handler();">
+                        <button class="btn btn-secondary" data-dismiss="modal"
+ type="button" onclick="$('#edit-user-dialog').hide();"><?php
+ etranslate ( 'Cancel' ); ?></button>
+                        <button class="btn btn-primary" data-dismiss="modal"
+ type="button" onclick="save_handler();"><?php etranslate ( 'Save' ) ?></button>
                     </div>
                 </form>
             </div>
@@ -178,8 +182,12 @@
                 </form>
                 <br>
                 <div class="modal-footer">
-                    <input class="form-control btn btn-secondary" onclick="$('#delete-user-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                    <input class="form-control btn btn-danger" type="submit" name="delete" value="<?php etranslate('Delete') ?>" onclick="delete_handler ();">
+                  <button class="form-control btn btn-secondary"
+ data-dismiss="modal" type="button" onclick="$('#delete-user-dialog').hide();">
+ <?php etranslate ( 'Cancel' ); ?></button>
+                  <button class="form-control btn btn-danger" name="delete"
+ type="submit" onclick="delete_handler ();"><?php
+ etranslate ( 'Delete' ) ?></button>
                 </div>
             </div>
         </div>
@@ -211,8 +219,12 @@
                         </tr>
                     </table>
                     <div class="modal-footer">
-                        <input class="form-control btn btn-secondary" onclick="$('#edit-layer-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                        <input class="form-control btn btn-primary" data-dismiss="modal" type="button" value="<?php etranslate("Save"); ?>" onclick="edit_layer_window_closed(); $('#edit-layer-dialog').hide();">
+                      <button class="form-control btn btn-secondary"
+ data-dismiss="modal" type="button" onclick="$('#edit-layer-dialog').hide();">
+<?php etranslate ( 'Cancel' ); ?></button>
+                      <button class="form-control btn btn-primary"
+ data-dismiss="modal" type="button" onclick="edit_layer_window_closed();
+ $('#edit-layer-dialog').hide();"><?php etranslate ( 'Save' ); ?></button>
                     </div>
                 </form>
             </div>
diff --git a/resourcecal_mgmt.php b/resourcecal_mgmt.php
index efa6d3e32..542b971f3 100644
--- a/resourcecal_mgmt.php
+++ b/resourcecal_mgmt.php
@@ -72,7 +72,8 @@
 
 <br>
 <div class="userButtons">
-    <input class="btn btn-primary" type="button" value="<?php etranslate('Add Resource Calendar'); ?>..." onclick="return edit_user('')">
+  <button class="btn btn-primary" type="button" onclick="return edit_user('')">
+ <?php etranslate ( 'Add Resource Calendar' ); ?>...</button>
 </div>
 
 <!-- add/edit user modal dialog -->
@@ -129,8 +130,11 @@
                     <?php } ?>
 
                     <div class="modal-footer mt-2">
-                        <input class="btn btn-secondary" onclick="$('#edit-user-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                        <input class="btn btn-primary" data-dismiss="modal" type="button" value="<?php etranslate("Save"); ?>" onclick="save_handler();">
+                      <button class="btn btn-secondary" data-dismiss="modal"
+ type="button" onclick="$('#edit-user-dialog').hide();"><?php
+ etranslate ( 'Cancel' ); ?></button>
+                      <button class="btn btn-primary" data-dismiss="modal"
+ type="button" onclick="save_handler();"><?php etranslate ( 'Save' ) ?></button>
                     </div>
                 </form>
             </div>
@@ -159,8 +163,11 @@
                 </form>
                 <br>
                 <div class="modal-footer mt-2">
-                    <input class="btn btn-secondary" onclick="$('#delete-user-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                    <input class="btn btn-danger" type="submit" name="delete" value="<?php etranslate('Delete') ?>" onclick="delete_handler ();">
+                  <button class="btn btn-secondary" data-dismiss="modal"
+ type="button" onclick="$('#delete-user-dialog').hide();"><?php
+ etranslate ( 'Cancel' ); ?></button>
+                  <button class="btn btn-danger" name="delete" type="submit"
+ onclick="delete_handler();"><?php etranslate ( 'Delete' ) ?></button>
                 </div>
             </div>
         </div>
diff --git a/search.php b/search.php
index 5ae1986a7..89cc5076a 100644
--- a/search.php
+++ b/search.php
@@ -160,13 +160,14 @@
   }
 
   echo '</select>'
-   . ( $GROUPS_ENABLED == 'Y'
-    ? '<input type="button" onclick="selectUsers()" value="'
-     . translate( 'Select' ) . '...">' : '' ) . '
+    . ( $GROUPS_ENABLED === 'Y'
+      ? '<button type="button" onclick="selectUsers()">'
+        . translate ( 'Select' ) . '...</button>' : '' ) . '
           </td>
         </tr>';
 }
-echo '</table><input class="btn btn-primary" type="submit" value="' . $searchStr . '"></form>';
+echo '</table><button class="btn btn-primary" type="submit">'
+  . $searchStr . '</button></form>';
 ?>
 
 <script>
diff --git a/search_handler.php b/search_handler.php
index be60778ff..b5468fb28 100644
--- a/search_handler.php
+++ b/search_handler.php
@@ -270,8 +270,8 @@
 echo '<form action="search.php' . ( ! empty ( $advanced ) ? '?adv=1' : '' )
         . '"  style="margin-left: 13px;" method="post">';
 print_form_key ();
-echo '<br><input class="btn btn-primary" type="submit" value="'
-        . translate ( 'New Search' ) . '"></form>
+echo '<br><button class="btn btn-primary" type="submit">'
+  . translate ( 'New Search' ) . '</button></form>
     ' . print_trailer ();
 
 ?>
diff --git a/select_user.php b/select_user.php
index 5c3180155..80642f7dc 100644
--- a/select_user.php
+++ b/select_user.php
@@ -41,7 +41,8 @@
 
   echo '
       </select>
-      <input class="btn btn-primary" type="submit" value="' . translate ( 'Go' ) . '">
+      <button class="btn btn-primary" type="submit">'
+    . translate ( 'Go' ) . '</button>
     </form>';
 }
 
diff --git a/set_entry_cat.php b/set_entry_cat.php
index ce280ddc8..b3a435e3c 100644
--- a/set_entry_cat.php
+++ b/set_entry_cat.php
@@ -131,7 +131,7 @@
         <tr>
           <td class="tooltip aligntop" title="{$catHelpStr}">
             <label for="entry_categories" class="colon">{$catStr}<br></label>
-            <input type="button" value="{$editStr}" onclick="editCats( event )">
+            <button type="button" onclick="editCats(event)">{$editStr}</button>
           </td>
           <td class="aligntop">
             <input readonly type="text" name="catnames"
@@ -142,7 +142,7 @@
           </td>
         </tr>
         <tr class="aligntop">
-          <td colspan="2"><br><input type="submit" value="{$saveStr}"></td>
+          <td colspan="2"><br><button type="submit">{$saveStr}</button></td>
         </tr>
       </table>
     </form>
diff --git a/user_mgmt.php b/user_mgmt.php
index 2a5cfef24..0be470b41 100644
--- a/user_mgmt.php
+++ b/user_mgmt.php
@@ -71,7 +71,8 @@
 <br>
 <?php if ($is_admin && $admin_can_delete_user && access_can_access_function(ACCESS_USER_MANAGEMENT)) { ?>
 <div class="userButtons">
-    <input class="btn btn-primary" type="button" value="<?php etranslate('Add User'); ?>..." onclick="return edit_user('')">
+  <button class="btn btn-primary" type="button" onclick="return edit_user('')">
+<?php etranslate ( 'Add User' ); ?>...</button>
 </div>
 <?php } ?>
 
@@ -128,8 +129,11 @@
                     </div>
 
                     <div class="modal-footer">
-                        <input class="btn btn-secondary" onclick="$('#edit-user-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                        <input class="btn btn-primary" data-dismiss="modal" type="button" value="<?php etranslate("Save"); ?>" onclick="save_handler();">
+                      <button class="btn btn-secondary" data-dismiss="modal"
+ type="button" onclick="$('#edit-user-dialog').hide();"><?php
+ etranslate ( 'Cancel' ); ?></button>
+                      <button class="btn btn-primary" data-dismiss="modal"
+ type="button" onclick="save_handler();"><?php etranslate ( 'Save' ) ?></button>
                     </div>
                 </form>
             </div>
@@ -168,8 +172,13 @@
                     </div>
 
                     <div class="modal-footer">
-                        <input class="form-control btn btn-secondary" onclick="$('#edit-user-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                        <input class="form-control btn btn-primary" data-dismiss="modal" type="button" value="<?php etranslate("Set Password"); ?>" onclick="change_password_handler();">
+                      <button class="form-control btn btn-secondary"
+ data-dismiss="modal" type="button"
+ onclick="$('#edit-user-dialog').hide();"><?php
+ etranslate ( 'Cancel' ) ?></button>
+                      <button class="form-control btn btn-primary"
+ data-dismiss="modal" type="button" onclick="change_password_handler();"><?php
+ etranslate ( 'Set Password' ); ?></button>
                     </div>
                 </form>
             </div>
@@ -199,8 +208,12 @@
                     </form>
                     <br>
                     <div class="modal-footer">
-                        <input class="form-control btn btn-secondary" onclick="$('#delete-user-dialog').hide();" data-dismiss="modal" type="button" value="<?php etranslate("Cancel"); ?>">
-                        <input class="form-control btn btn-danger" type="submit" name="delete" value="<?php etranslate('Delete') ?>" onclick="delete_handler ();">
+                      <button class="form-control btn btn-secondary"
+ data-dismiss="modal" type="button" onclick="$('#delete-user-dialog').hide();">
+<?php etranslate ( 'Cancel' ); ?></button>
+                      <button class="form-control btn btn-danger" name="delete"
+ type="submit" onclick="delete_handler();"><?php
+ etranslate ( 'Delete' ) ?></button>
                     </div>
                 </div>
             </div>
diff --git a/usersel.php b/usersel.php
index b9bc68f66..f04afe160 100644
--- a/usersel.php
+++ b/usersel.php
@@ -45,11 +45,11 @@
               <b>' . translate ( 'Users' ) . '</b><br>
               <select name="users" size="15" multiple>
               </select><br>
-              <input type="button" value="' . translate ( 'All' )
- . '" onclick="selectAll( true )">
-              <input type="button" value="' . translate ( 'None' )
- . '" onclick="selectAll( false )">
-              <input type="reset" value="' . translate ( 'Reset' ) . '">
+              <button type="button" onclick="selectAll(true)">'
+  . translate ( 'All' ) . '</button>
+              <button type="button" onclick="selectAll(false)">'
+  . translate ( 'None' ) . '</button>
+              <button type="reset">' . translate ( 'Reset' ) . '</button>
             </td>
             <td class="aligntop">
               <b class="colon">' . translate ( 'Groups' ) . '</b><br>
@@ -63,18 +63,18 @@
 
 echo '
               </select><br>
-              <input type="button" value="' . translate ( 'Add' )
- . '" onclick="toggleGroup( true );">
-              <input type="button" value="' . translate ( 'Remove' )
- . '" onclick="toggleGroup( false );">
+              <button type="button" onclick="toggleGroup(true);">'
+  . translate ( 'Add' ) . '</button>
+              <button type="button" onclick="toggleGroup(false);">'
+  . translate ( 'Remove' ) . '</button>
             </td>
           </tr>
           <tr>
             <td style="text-align:center;" colspan="2"><br><br>
-              <input type="button" value="' . translate ( 'OK' )
- . '" onclick="OkButton()">
-              <input type="button" value="' . translate ( 'Cancel' )
- . '" onclick="window.close()">
+              <button type="button" onclick="OkButton()">'
+  . translate ( 'OK' ) . '</button>
+              <button type="button" onclick="window.close()">'
+  . translate ( 'Cancel' ) . '</button>
             </td>
           </tr>
         </table>
diff --git a/view_entry.php b/view_entry.php
index df8c3f023..f85a2f84d 100644
--- a/view_entry.php
+++ b/view_entry.php
@@ -794,7 +794,7 @@
 }
 echo '
     </select>&nbsp;
-    <input type="submit" value="' . translate ( 'Update' ) . '">
+    <button type="submit">' . translate ( 'Update' ) . '</button>
   </form>';
 echo '</div><div class="w-100"></div></div>' . "\n";
 }
@@ -893,10 +893,10 @@
 else {
 echo '
   ' . $num_comment . ' ' . translate ( 'comments' ) . '
-  <input class="btn" id="showbutton" type="button" value="' . translate ( 'Show' )
-. '" onclick="showComments();">
-  <input class="btn" id="hidebutton" type="button" value="' . translate ( 'Hide' )
-. '" onclick="hideComments();"><br>
+  <button class="btn" id="showbutton" type="button" onclick="showComments();">'
+  . translate ( 'Show' ) '</button>
+  <button class="btn" id="hidebutton" type="button" onclick="hideComments();">'
+  . translate ( 'Hide' ). '</button><br>
   <div id="comtext">' . $comment_text . '</div>';
 // We could put the following JS in includes/js/view_entry.php,
 // but we won't need it in many cases and we don't know whether
diff --git a/views_edit.php b/views_edit.php
index c896ba46a..fd0250918 100644
--- a/views_edit.php
+++ b/views_edit.php
@@ -158,17 +158,20 @@
 </select>
 
 <?php if ( $GROUPS_ENABLED == 'Y' ) { ?>
-  <input class="btn" type="button" onclick="selectUsers()" value="<?php etranslate ( 'Select' );?>...">
+  <button class="btn" type="button" onclick="selectUsers()"><?php
+    etranslate ( 'Select' );?>...</button>
 <?php } ?>
 </div>
 
 <br>
 <div class="form-group">
-<input class="btn btn-primary" type="submit" name="action" value="<?php if ( $newview ) etranslate ( 'Add' ); else etranslate ( 'Save' ); ?>">
+<button class="btn btn-primary" name="action" type="submit"><?php
+if ( $newview ) etranslate ( 'Add' ); else etranslate ( 'Save' ); ?></button>
 <a href="views.php" class="btn btn-secondary active">Cancel</a>
 <?php if ( ! $newview ) { ?>
- <input class="btn btn-danger" type="submit" name="delete" value="<?php etranslate( 'Delete' )?>"
-   onclick="return confirm('<?php etranslate( "Are you sure you want to delete this entry?" ); ?>' )">
+ <button class="btn btn-danger" name="delete" type="submit" onclick="return
+ confirm('<?php etranslate ( 'Are you sure you want to delete this entry?' )
+ ?>')"><?php etranslate ( 'Delete' )?></button>
 <?php } ?>
 </div>