From f9d6025a756352e2c1e461adcb2b7dc606eb02c1 Mon Sep 17 00:00:00 2001
From: Heiko August <post@auge8472.de>
Date: Mon, 27 Apr 2020 11:23:48 +0200
Subject: [PATCH] Change: replace inputs of type submit with button elements

Attributes 'type="submit"' got removed because it's the default type.
Therefore the attribute can be omitted.
---
 admin/login.php                 | 2 +-
 admin/media/select-picture.php  | 2 +-
 admin/media/upload-picture.php  | 4 ++--
 admin/media/upload-teaser.php   | 2 +-
 error404.php                    | 2 +-
 personal/template.tpl           | 2 +-
 plugins/CommentCloser.jplug.php | 2 +-
 scripts/JlogUpdater.php         | 2 +-
 search.php                      | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/admin/login.php b/admin/login.php
index f288259..deeb7b5 100644
--- a/admin/login.php
+++ b/admin/login.php
@@ -63,7 +63,7 @@ $c['main'] = '
       <input class="userdata" id="password" type="password" name="password" />
       <input style="display: none;" name="username" type="text" value="do-not-change" /></p>
    <p><input type="hidden" name="url" value="' . htmlspecialchars(!empty($get['url']) ? $get['url'] : '') . '" />
-      <input type="submit" value="' . $l['admin']['login_send'] . '" /></p>
+      <button value="' . $l['admin']['login_send'] . '">' . htmlspecialchars($l['admin']['login_send']) . '</button></p>
   </form>
 ';
 
diff --git a/admin/media/select-picture.php b/admin/media/select-picture.php
index a0ef43f..a2b42e2 100644
--- a/admin/media/select-picture.php
+++ b/admin/media/select-picture.php
@@ -25,7 +25,7 @@ if($_GET['p']) { ?>
    	    <input id="class" type="text" size="20"></p>
    	 <p><?php echo $l['admin']['pic_alt'] ?><br />
    	    <input id="alt" type="text" size="20"></p>
-   	 <p><input type="submit" value="<?php echo $l['admin']['pic_insert'] ?>"></p>
+   	 <p><button value="<?php echo $l['admin']['pic_insert'] ?>"><?php echo htmlspecialchars($l['admin']['pic_insert']) ?></button></p>
    	 </form>
 <?php
 }
diff --git a/admin/media/upload-picture.php b/admin/media/upload-picture.php
index 0705ecf..7ac1cd8 100644
--- a/admin/media/upload-picture.php
+++ b/admin/media/upload-picture.php
@@ -63,7 +63,7 @@
         <input id="class" type="text" size="20"></p>
      <p><?php echo $l['admin']['pic_alt'] ?><br />
         <input id="alt" type="text" size="20"></p>
-     <p><input type="submit" value="<?php echo $l['admin']['pic_insert'] ?>"></p>
+     <p><button value="<?php echo $l['admin']['pic_insert'] ?>"><?php echo htmlspecialchars($l['admin']['pic_insert']) ?></button></p>
      </form>
     <?php
    }
@@ -79,7 +79,7 @@ if (empty($_FILES['probe']) or isset($errors))
   <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
   <?php echo add_session_id_input_tag() ?>
   <input type="file" name="probe" /><br><br>
-  <input type="submit" value="<?php echo $l['admin']['pic_upload'] ?>">
+  <button value="<?php echo $l['admin']['pic_upload'] ?>"><?php echo htmlspecialchars($l['admin']['pic_upload']) ?></button>
  </form>
  <?php
  }
diff --git a/admin/media/upload-teaser.php b/admin/media/upload-teaser.php
index c18c68c..89aa66e 100644
--- a/admin/media/upload-teaser.php
+++ b/admin/media/upload-teaser.php
@@ -83,7 +83,7 @@ if (empty($_FILES['probe']) or isset($errors))
   <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $max_file_size ?>">
   <?php echo add_session_id_input_tag() ?>
   <input type="file" name="probe" /><br><br>
-  <input type="submit" value="<?php echo $l['admin']['pic_upload'] ?>">
+  <button value="<?php echo $l['admin']['pic_upload'] ?>"><?php echo htmlspecialchars($l['admin']['pic_upload']) ?></button>
  </form>
  <?php
  }
diff --git a/error404.php b/error404.php
index bd031d8..81b60e6 100644
--- a/error404.php
+++ b/error404.php
@@ -7,7 +7,7 @@
  $c['main'] = "<h2>".$l['err404_topic']."</h2>\n<p>".$l['err404_message']."</p>";
  $c['main'] .= '     <form id="searchform" action="'.JLOG_PATH.'/search.php" accept-charset="UTF-8">
       <p><input class="userdata" type="text" name="q" size="30" value="'.htmlspecialchars($get['url']).'" />
-         <input class="send" type="submit" value="'.$l['content_search'].'" /></p>
+         <button class="send" value="'.$l['content_search'].'">'.htmlspecialchars($l['content_search']).'</button></p>
      </form>';
 
 require(JLOG_BASEPATH.'scripts'.DIRECTORY_SEPARATOR.'do_template.php');
diff --git a/personal/template.tpl b/personal/template.tpl
index 6096758..21033e6 100644
--- a/personal/template.tpl
+++ b/personal/template.tpl
@@ -22,7 +22,7 @@
       <dd>
        <form action="<jlog:homelink />/search.php">
         <p><input class="userdata" type="search" name="q" size="15" value="" />
-         <button class="send" type="submit" value="<jlog:search />"><jlog:search /></button></p>
+         <button class="send" value="<jlog:search />"><jlog:search /></button></p>
        </form>
       </dd>
      <dt><jlog:categorieslist-h /></dt>
diff --git a/plugins/CommentCloser.jplug.php b/plugins/CommentCloser.jplug.php
index a443d7b..6994dea 100644
--- a/plugins/CommentCloser.jplug.php
+++ b/plugins/CommentCloser.jplug.php
@@ -91,7 +91,7 @@ EOT;
         
 		$output .= <<<EOT
 automatisch</label>
-<input type="submit" name="commclose_do" value="schlie&#223;en" />.</p>
+<button name="commclose_do" value="schlie&#223;en">schlie&#223;en</button></p>
 <p>Nach der angegeben Zeit k&#246;nnen Beitr&#228;ge nicht mehr kommentiert werden.</p>
 </form>
 EOT;
diff --git a/scripts/JlogUpdater.php b/scripts/JlogUpdater.php
index cfd878b..9194840 100644
--- a/scripts/JlogUpdater.php
+++ b/scripts/JlogUpdater.php
@@ -52,7 +52,7 @@ class JlogUpdater
             $html .= $class->getForm($l);
             $version = $this->versions[$version];
         }
-        $html .= '<p><input type="submit" name="update" value="' . $l['admin']['update_start'] . '" /></p>';
+        $html .= '<p><button name="update" value="' . $l['admin']['update_start'] . '">' . htmlspecialchars($l['admin']['update_start']) . '</button></p>';
         $html .= '</form>';
         return $html;
     }
diff --git a/search.php b/search.php
index 0f95136..9a2d10a 100644
--- a/search.php
+++ b/search.php
@@ -9,7 +9,7 @@
 
     $c['main'] .= '     <form id="searchform" action="'.JLOG_PATH.'/search.php" accept-charset="UTF-8">
       <p><input class="userdata" type="text" name="q" size="30" value="'.htmlspecialchars($searchstring, ENT_QUOTES).'" />
-         <input class="send" type="submit" value="'.$l['content_search'].'" /></p>
+         <button class="send" value="'.$l['content_search'].'">'.htmlspecialchars($l['content_search']).'</button></p>
      </form>
      <script type="text/javascript">jlog_searchpage = true;</script>
 ';