Typos

autocomplete_ajax.php

@@ -49,13 +49,10 @@
 if (empty($query))
   $query = getValue('query');
 
-$sendPlainText = false;
 $format = getValue('format');
-if (
-  !empty($format) &&
-  ($format == 'text' || $format == 'plain')
-);
-$sendPlainText = true;
+$sendPlainText = (! empty ( $format ) &&
+  ( $format === 'text' || $format === 'plain' ) );
+
 if ($sendPlainText) {
   Header('Content-Type: text/plain');
 } else {

category_handler.php

@@ -68,10 +68,10 @@ function updateIconBlob($catId, $iconData, $iconMimeType) {
     $error = db_error();
   }
 
-  if (!dbi_execute("
-    DELETE FROM `webcal_entry_categories`
-    WHERE `cat_id` = ? AND ( `cat_owner` = ?"
-      . ($is_admin ? " OR `cat_owner` = '' )" : " )"),
+  if (!dbi_execute(
+    'DELETE FROM webcal_entry_categories
+    WHERE cat_id = ? AND ( cat_owner = ?'
+      . ($is_admin ? ' OR cat_owner = "" )' : ' )'),
     [$id, $login]
   )) {
     $error = db_error();

edit_entry.php

@@ -1093,8 +1093,6 @@ function time_selection($prefix, $time = '', $trigger = false)
             ? $selected : '') . '>' . translate('Weekly') . '</option>
               <option value="monthlyByDay"'
           . (strcmp($rpt_type, 'monthlyByDay') == 0 ? $selected : '')
-          // translate ( 'Monthly' ) translate ( 'by day' ) translate ( 'by date' )
-          // translate ( 'by position' )
           . '>' . translate('Monthly (by day)') . '</option>
               <option value="monthlyByDate"'
           . (strcmp($rpt_type, 'monthlyByDate') == 0 ? $selected : '')
@@ -1196,10 +1194,10 @@ function time_selection($prefix, $time = '', $trigger = false)
           $rpt_byday_label++
         ) {
           $rpt_byday_mod = $rpt_byday_label % 7;
-          $class = (is_weekend($rpt_byday_mod) ? ' class="weekend" ' : '');
-          echo '
-                <th width="50px"' . $class . '><label>'
-            . translate($weekday_names[$rpt_byday_mod]) . '</label></th>';
+          $class = ( is_weekend ( $rpt_byday_mod ) ? 'class="weekend" ' : '' );
+          echo "
+                <th $class" . 'width="50px"><label>' .
+            $weekday_names[$rpt_byday_mod] . '</label></th>';
         }
         echo '
               </tr>

events_ajax.php

@@ -63,11 +63,10 @@
   $user = $login;
 $get_unapproved = true;
 
-$sendPlainText = false;
 $format = getValue ( 'format' );
-if ( ! empty ( $format ) &&
+
+$sendPlainText = ( ! empty ( $format ) &&
  ( $format == 'text' || $format == 'plain' ) );
-$sendPlainText = true;
 
 $startdate = getIntValue ( 'startdate' );
 if ( empty ( $startdate ) )

export.php

@@ -31,7 +31,7 @@
         <tr>
           <td><label for="exformat">' . translate ( 'Export format' )
  . ':</label></td>
-          <td>' . generate_export_select ( 'toggel_catfilter' ) . '
+          <td>' . generate_export_select ( 'toggle_catfilter' ) . '
           </td>
         </tr>';
 
@@ -126,7 +126,7 @@ function toggle_datefields( name, ele ) {
     updateDateFields();
   }
 
-  function toggel_catfilter() {
+  function toggle_catfilter() {
     if ( $('#exformat option:selected').index() == 0 ) {
       // ICalendar
       $('#catfilter').show();

groups.php

@@ -76,13 +76,13 @@
             <div class="modal-body">
                 <!-- Error Alert -->
                 <div id="edit-group-dialog-alert" class="alert alert-danger" style="display: none">
-                    <strong><?php etranslate("Error"); ?>!</strong>&nbsp;<span id="errorMessage">A problem has been occurred while submitting your data.</span>
+                    <strong><?php etranslate("Error"); ?>!</strong>&nbsp;<span id="errorMessage">A problem has occurred while submitting your data.</span>
                     <button type="button" class="close" onclick="$('.alert').hide()">&times;</button>
                 </div>
                 <form name="editGroupForm" id="editGroupForm">
                     <input type="hidden" name="editGroupAdd" id="editGroupAdd" value="0">
                     <input type="hidden" name="editGroupId" id="editGroupId" value="0">
-                    <div class="form-inline" is="divEditName">
+                    <div class="form-inline" id="divEditName">
                         <label class="col-5" for="editName"><?php etranslate('Group name') ?>: </label>
                         <input required type="text" class="col-7 form-control" id="editName" name="editName" placeholder="<?php echo translate('New group name') . ' (' . translate('required') . ')'; ?>">
                         <div id="invalid-name-error" class="invalid-feedback text-right">

icalclient.php

@@ -142,9 +142,9 @@
 if ( ( empty( $_SERVER['PHP_AUTH_USER'] )
     or empty( $_SERVER['PHP_AUTH_PW'] ) )
     and isset( $_REQUEST['BAD_HOSTING'] )
-    and preg_match( '/Basic\s+(.*)$/i', $_REQUEST['BAD_HOSTING'], $matc ) )
+    AND preg_match ( '/Basic\s+(.*)$/i', $_REQUEST['BAD_HOSTING'], $match ) )
   list( $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] ) =
-    explode( ':', base64_decode( $matc[1] ) );
+    explode ( ':', base64_decode ( $match[1] ) );
 
 unset( $_ENV['REMOTE_USER'] );
 

includes/classes/WebCalendar.php

@@ -575,10 +575,10 @@ function _initValidate() {
             // Invalid session cookie.
             $session_not_found = true;
           } else {
-            $cooie_check = explode('|', decode_string($encoded_login));
+            $cookie_check = explode('|', decode_string($encoded_login));
             // First time after switching to PHP8 you may have
             // incompatible cookies here.
-            if ( empty($cooie_check[0]) || empty($cooie_check[1]))
+            if ( empty($cookie_check[0]) || empty($cookie_check[1]))
               $session_not_found = true;
           }
           if ( ! $session_not_found ) {
@@ -784,8 +784,7 @@ function _initConnect() {
           $lastname = $login_lastname;
           $fullname = $login_fullname;
           $is_admin = ( $login_is_admin == 'Y' );
-          $is_nonuser = ( ! empty ( $GLOBALS['login_is_nonuser'] )
-              && $GLOBALS['login_is_nonuser'] );
+          $is_nonuser = ! empty ( $GLOBALS['login_is_nonuser'] );
           $user_email = $login_email;
         } else {
           // Invalid login.

includes/classes/hKit/hkit.class.php

@@ -1,7 +1,8 @@
 <?php
-
-  /*
-
+/*
+  The only place I've found to get this.
+  https://code.google.com/archive/p/hkit/
+`
   hKit Library for PHP5 - a generic library for parsing Microformats
   Copyright (C) 2006  Drew McLellan
 
@@ -434,4 +435,4 @@ private function dedupeSingles($s)
   }
 
 
-?>
+?>

includes/css/styles.php

@@ -18,7 +18,7 @@
  * while its declaration is 'color: red;'.
  * Each declaration has two parts: 'property' & 'value'.
  *
- * In the example above, there is only one declaraion ("color: red;").
+ * In the example above, there is only one declaration ("color: red;").
  * For that declaration, the PROPERTY is "color" and the VALUE is "red".
  *
  * NOTE: Each property must be followed by a colon (:),

includes/functions.php

@@ -249,7 +249,7 @@ function build_entry_label ( $event, $popupid,
  * @param string $time        Input time in HHMMSS format
  * @param bool   $round_down  Should we change 1100 to 1059?
  *                            (This will make sure a 10AM-100AM appointment just
- *                            shows up in the 10AM slow and not in the 11AM slot
+ *                            shows up in the 10AM slot and not in the 11AM slot
  *                            also.)
  *
  * @return int  The time slot index.
@@ -1633,7 +1633,7 @@ function display_unapproved_events ( $user ) {
     if ( $row && $row[0] > 0 )
       $ret .= ( $MENU_ENABLED == 'N'
         ? '<a class="nav" href="list_unapproved.php'
-         . ( $user != $login ? '?user=' . $user . '"' : '' )
+         . ( $user != $login ? '?user=' . $user : '' )
          . '">' . str_replace ( 'XXX', $row[0],
           translate ( 'You have XXX unapproved entries' ) ) . "</a><br>\n"
         : // Return something that won't display in bottom menu
@@ -4117,7 +4117,7 @@ function load_nonuser_preferences ( $nonuser ) {
 }
 
 /**
- * Returns a custom header, stylesheet or tailer.
+ * Returns a custom header, stylesheet or trailer.
  *
  * The data will be loaded from the webcal_user_template table.
  * If the global variable $ALLOW_EXTERNAL_HEADER is set to 'Y',
@@ -4632,7 +4632,7 @@ function print_color_input_html ($varname, $title, $varval = '', $id='', $tag='d
   }
 
   return '<' . $tag . ' class="form-inline">' .
-  (empty($title) ? '' : ('<label class="' . $class . '" for="' . $prefix . $varname . '">' . $title . '</label>')) .
+  (empty($title) ? '' : ('<label class="' . $class . '" for="' . $prefix . $id . '">' . $title . '</label>')) .
     '<input class="form-control" style="height: 2em; width: 4em;" name="' . $prefix . $varname . '" id="' . $prefix . $id .
     '" type="color" value="' . $setting . '"' . (empty($onchange) ? '' : ' onchange="' . $onchange . '()"') .
     '></' . $tag . '>';

includes/js/popups.js

@@ -156,7 +156,7 @@ if( typeof document.getElementsBySelector == 'undefined' ) {
               return ( e.getAttribute( attrName ) == attrValue );
             };
             break;
-          case '~': // Match one of space seperated words.
+          case '~': // Match one of space separated words.
             checkFunction = function( e ) {
               return ( e.getAttribute( attrName ).match( new RegExp( '\\b'+attrValue+'\\b' ) ) );
             };

includes/js/v_h_scrolls.js

@@ -1,4 +1,4 @@
-/* This function needs to be seperate for each page that has scrollers.
+/* This function needs to be separate for each page that has scrollers.
 function start() {
   // Code each vertical scroller as follows:
   // startScroll( 'id of scroller div', 'scroll content' );

includes/xcal.php

@@ -2208,23 +2208,23 @@ function parse_ical ( $cal_file, $source = 'file' ) {
         $event[$substate] = $match[1];
       } elseif ( preg_match ( '/^EXDATE.*:(.+)$/i', $buff, $match ) ) {
         $substate = 'exdate';
-        // allows multiple ocurrances of EXDATE to be processed
+        // allows multiple occurrences of EXDATE to be processed
         if ( isset ( $event[$substate] ) )
           $event[$substate] .= ',' . $match[1];
          else
           $event[$substate] = $match[1];
 
       } elseif ( preg_match ( '/^RDATE.*:(.+)$/i', $buff, $match ) ) {
         $substate = 'rdate';
-        // allows multiple ocurrances of RDATE to be processed
+        // allows multiple occurrences of RDATE to be processed
         if ( isset ( $event[$substate] ) )
           $event[$substate] .= ',' . $match[1];
          else
           $event[$substate] = $match[1];
 
       } elseif ( preg_match ( '/^CATEGORIES.*:(.+)$/i', $buff, $match ) ) {
         $substate = 'categories';
-        // allows multiple ocurrances of CATEGORIES to be processed
+        // allows multiple occurrences of CATEGORIES to be processed
         if ( isset ( $event[$substate] ) )
           $event[$substate] .= ',' . $match[1];
          else
@@ -2429,23 +2429,23 @@ function parse_hcal ( $hcal_array ) {
         $event[$substate] = $value;
       } elseif ( $key == 'EXDATE' ) {
         $substate = 'exdate';
-        // allows multiple ocurrances of EXDATE to be processed
+        // allows multiple occurrences of EXDATE to be processed
         if ( isset ( $event[$substate] ) )
           $event[$substate] .= ',' . $value;
          else
           $event[$substate] = $value;
 
       } elseif ( $key == 'RDATE' ) {
         $substate = 'rdate';
-        // allows multiple ocurrances of RDATE to be processed
+        // allows multiple occurrences of RDATE to be processed
         if ( isset ( $event[$substate] ) )
           $event[$substate] .= ',' . $value;
          else
           $event[$substate] = $value;
 
       } elseif ( $key == 'CATEGORIES' ) {
         $substate = 'categories';
-        // allows multiple ocurrances of CATEGORIES to be processed
+        // allows multiple occurrences of CATEGORIES to be processed
         if ( isset ( $event[$substate] ) )
           $event[$substate] .= ',' . $value;
          else

install/install_adminuser.php

@@ -1,6 +1,6 @@
 <p>
   <?php
-  $msg = translate("Your have XXX admin accounts.");
+  $msg = translate("You have XXX admin accounts.");
   $msg = str_replace('XXX', $adminUserCount, $msg);
   $defaultAdminExists = false;
   $res = dbi_execute("SELECT COUNT(*) FROM webcal_user WHERE cal_login = 'admin'", [], false, true);

install/install_auth_handler.php

@@ -46,7 +46,7 @@ function write_password_in_new_settings($file, $password, $hint)
 $passwordSet = !empty($settings['install_password']);
 
 if (!$passwordSet) {
-  // No password set.  New instsall. Set password now.
+  // No password set.  New install. Set password now.
   $password = $_POST['password'] ?? '';
   $password2 = $_POST['password2'] ?? '';
   if ($password != $password2) {

install/install_phpsettings_handler.php

@@ -1,6 +1,6 @@
 <?php
 // This handler only gets called if we prompt the user to acknowledge that
-// there PHP settings do not match the recommended settings.
+// their PHP settings do not match the recommended settings.
 $_SESSION["phpSettingsAcked"] = "1";  // User ack'd
 redirectToNextAction();
 ?>

install/sql/tables-mysql.sql

@@ -93,7 +93,7 @@ CREATE TABLE webcal_entry (
   cal_due_date INT DEFAULT NULL,
   /* Task due time */
   cal_due_time INT DEFAULT NULL,
-  /* event priority: 1=Low, 2=Med, 3=High */
+  /* event priority: 1=High, 5=Med, 9=Low */
   cal_priority INT DEFAULT 5,
   /* 'E' = Event, 'M' = Repeating event, 'T' = Task */
   cal_type CHAR(1) DEFAULT 'E',

layers_ajax.php

@@ -28,12 +28,10 @@
 
 $action = getValue ( 'action' );
 $public = getValue ( 'public' );
-
-$sendPlainText = false;
 $format = getValue ( 'format' );
-if ( ! empty ( $format ) &&
+
+$sendPlainText = ( ! empty ( $format ) &&
  ( $format == 'text' || $format == 'plain' ) );
-$sendPlainText = true;
 
 $error = '';
 

purge.php

@@ -96,7 +96,7 @@
     $M_ids = get_ids ( 'SELECT DISTINCT(we.cal_id) FROM webcal_entry we,
       webcal_entry_user weu, webcal_entry_repeats wer
       WHERE we.cal_type = \'M\'
-      AND we.cal_id = wer.cal_id AND we.cal_id = wer.cal_id '
+      AND we.cal_id = wer.cal_id AND weu.cal_id = wer.cal_id '
       . "AND cal_end IS NOT NULL AND cal_end < '$end_date' $tail",
       $ALL );
     $ids = array_merge ( $E_ids, $M_ids );

remotecal_mgmt.php

@@ -109,7 +109,7 @@
             <div class="modal-body">
                 <!-- Error Alert -->
                 <div id="edit-user-dialog-alert" class="alert alert-danger" style="display: none">
-                    <strong><?php etranslate("Error"); ?>!</strong>&nbsp;<span id="errorMessage">A problem has been occurred while submitting your data.</span>
+                    <strong><?php etranslate("Error"); ?>!</strong>&nbsp;<span id="errorMessage">A problem has occurred while submitting your data.</span>
                     <button type="button" class="close" onclick="$('.alert').hide()">&times;</button>
                 </div>
                 <form class="needs-validation" novalidate name="editUserForm" id="editUserForm">

resourcecal_mgmt.php

@@ -85,7 +85,7 @@
             <div class="modal-body">
                 <!-- Error Alert -->
                 <div id="edit-user-dialog-alert" class="alert alert-danger" style="display: none">
-                    <strong><?php etranslate("Error"); ?>!</strong>&nbsp;<span id="errorMessage">A problem has been occurred while submitting your data.</span>
+                    <strong><?php etranslate("Error"); ?>!</strong>&nbsp;<span id="errorMessage">A problem has occurred while submitting your data.</span>
                     <button type="button" class="close" onclick="$('.alert').hide()">&times;</button>
                 </div>
                 <form class="needs-validation" novalidate name="editUserForm" id="editUserForm">

rss_unapproved.php

@@ -97,7 +97,7 @@
   if ( access_is_enabled() ) {
      if ( ! access_user_calendar ( 'approve', $user ) ) {
        // not allowed
-       $user = login;
+       $user = $login;
      }
   } else if ( ! $is_admin && $user != $login && ! $is_assistant &&
     ! access_is_enabled() ) {

translations/English-US.txt

@@ -1771,7 +1771,7 @@ recipients_failed: SMTP Error: The following recipients failed:
 ########################################
 # Page: install/install_adminuser.php
 #
-Your have XXX admin accounts.: Your have XXX admin accounts.
+You have XXX admin accounts.: You have XXX admin accounts.
 Create Default Admin User: Create Default Admin User
 
 ########################################

upcoming.php

@@ -155,17 +155,12 @@ function print_upcoming_event ( $e, $date ) {
 
   $popupid = 'pop' . $e->getId() . '-' . $date;
 
-  $private = $confidential = false;
   // Access: P=Public, R=Private, C=Confidential
-  if ( $e->getAccess() == 'R' ) {
-    // not a public event, so we will just display "Private"
-    $private = true;
-  }
-  else if ( $e->getAccess() == 'C' ) {
-    // not a public event, so we will just display "Confidential"
-    $confidential = true;
-  }
-
+  // not a public event, just "Private"
+  $private = ( $e->getAccess() == 'R' );
+  // not a public event, just "Confidential"
+  $confidential = ( $e->getAccess() == 'C' );
+
   if ( ! empty ( $SERVER_URL ) && ! $private && ! $confidential) {
     echo "<div class=\"vevent\">\n";
       if ( $display_link ) {
@@ -192,7 +187,7 @@ function print_upcoming_event ( $e, $date ) {
       $catNum = abs(intval($e->getCategory()));
       if ($catNum > 0 &&  !empty($categories[$catNum]['cat_icon_mime'])) {
         $catIcon = "getIcon.php?cat_id=" . $catNum;
-        $link .= '<img src="' . $catIcon . '" alt="category icon"></a>';
+        $link .= '<img src="' . $catIcon . '" alt="category icon">';
       }
     }
     echo $link;