Merge branch 'cmpsr' of https://github.com/bbannon/webcalendar into c…

…mpsr
craigk5n · Nov 22, 2023 · e6ee6aa · e6ee6aa
2 parents 8d56a56 + d138a2b
commit e6ee6aa
Show file tree

Hide file tree

Showing 52 changed files with 867 additions and 844 deletions.
diff --git a/,dockerignore b/,dockerignore
diff --git a/.dockerignore b/.dockerignore
@@ -1,24 +1,19 @@
+.git
+.gitignore
 bump_version.sh
 docker
-docs/event_status.gif
-docs/extractfaqs.pl
-docs/faqs.html
-docs/Makefile
-docs/php2html.pl
-docs/README
-docs/sql2html.pl
-docs/WebCalendar-Database.html
-docs/WebCalendar-DeveloperGuide.html
-docs/WebCalendar-Functions.html
-docs/WebCalendar-Styling.html
-docs/WebCalendar-UserManual.html
-*.git
-*.gitignore
+
+# ignore all docs/
+docs
+# except these 2
+!docs/newwin.gif
+!docs/WebCalendar-SysAdmin.html
+
 includes/settings.php
 java
 Makefile
-sqlite-data
 release-files
+sqlite-data
 tests
 TODO
 vendor

diff --git 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
@@ -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 -->
@@ -852,7 +852,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
@@ -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
@@ -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
@@ -66,7 +66,7 @@
     <input type="checkbox" name="delIcon" value="Y"></div>
     <div class="form-inline">
     <label class="col-sm-3 col-form-label" for="FileName">'
-    . (($ENABLE_ICON_UPLOADS == 'Y' || $is_admin)
+    . (($ENABLE_ICON_UPLOADS === 'Y' || $is_admin)
       ? translate('Add Icon to Category') . ':</label>
       <input class="form-control" type="file" name="FileName" id="fileupload" size="45" '
       . 'maxlength="50" value="">
@@ -76,19 +76,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
@@ -141,7 +141,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
@@ -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
@@ -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/docker/Dockerfile-php8-dev b/docker/Dockerfile-php8-dev
@@ -1,6 +1,5 @@
 FROM php:8.0-apache
-MAINTAINER craigk5n <[email protected]>
-
+LABEL org.opencontainers.image.authors="[email protected]"
 RUN docker-php-ext-install mysqli
 
 #COPY docker/cron-hourly /tmp/cron.hourly
@@ -11,4 +10,3 @@ RUN docker-php-ext-install mysqli
 #TODO: setup cron
 
 #RUN chown -R www-data:www-data /var/www
-
diff --git a/docs/extractfaqs.pl b/docs/extractfaqs.pl
@@ -15,13 +15,13 @@
 #  02-Feb-2005  Craig Knudsen <[email protected]>
 #      Updated to group into categories.
 #
-#######################################################################
+################################################################################
 
-my @files = ( );
-my @questions = ( );
 my @answers = ( );
-my @file = ( );
 my @cat = ( );
+my @file = ( );
+my @files = ( );
+my @questions = ( );
 
 for ( $i = 0; $i < @ARGV; $i++ ) {
   if ( -f $ARGV[$i] ) {
@@ -152,4 +152,3 @@ sub process_file {
     }
   }
 }
-