Merge branch 'craigk5n:master' into typos

craigk5n · Sep 3, 2024 · e3b950a · e3b950a
2 parents af17dd2 + 402a92a
commit e3b950a
Show file tree

Hide file tree

Showing 33 changed files with 13,360 additions and 15,908 deletions.
diff --git a/admin.php b/admin.php
@@ -766,12 +766,12 @@ function save_pref ( $prefs, $src ) {
                 <div class="form-inline mt-1 mb-2"><label title="' . tooltip ( 'email-smtp-username' ) . '">'
    . translate ( 'SMTP Username' )
    . ':</label><input type="text" size="30" name="admin_SMTP_USERNAME" value="'
-   . ( $s['SMTP_USERNAME'] ?: '' )
+   . ( $s['SMTP_USERNAME'] ??= '' )
    . '"></div>
                 <div class="form-inline mt-1 mb-2"><label title="' . tooltip ( 'email-smtp-password' ) . '">'
    . translate ( 'SMTP Password' )
    . ':</label><input type="text" size="30" name="admin_SMTP_PASSWORD" value="'
-   . ( $s['SMTP_PASSWORD'] ?: '' )
+   . ( $s['SMTP_PASSWORD'] ??= '' )
    . '"></div>
               </div>
             </div>

diff --git a/category_handler.php b/category_handler.php
@@ -62,7 +62,7 @@ function updateIconBlob($catId, $iconData, $iconMimeType) {
   if (!dbi_execute(
     'DELETE FROM webcal_categories
     WHERE cat_id = ? AND ( cat_owner = ?'
-      . ($is_admin ? ' OR cat_owner IS NULL )' : ' )'),
+      . ($is_admin ? ' OR cat_owner = \'\' )' : ' )'),
     [$id, $login]
   )) {
     $error = db_error();
@@ -95,16 +95,18 @@ function updateIconBlob($catId, $iconData, $iconMimeType) {
       $row = dbi_fetch_row($res);
       $id = $row[0] + 1;
       dbi_free_result($res);
-      // Set catowner to NULL for global category
-      $catowner = ($is_admin ? ($isglobal == 'Y' ? null : $login) : $login);
+      // Set catowner to empty string for global category
+      $catowner = ($is_admin ? ($isglobal == 'Y' ? '' : $login) : $login);
       if (!dbi_execute(
         'INSERT INTO webcal_categories ( cat_id, cat_owner,
         cat_name, cat_color ) VALUES ( ?, ?, ?, ? )',
         [$id, $catowner, $catname, $catcolor]
-      ))
+      )) {
         $error = db_error();
-    } else
+      }
+    } else {
       $error = db_error();
+    }
   }
   if (empty($delIcon) && (!empty($ENABLE_ICON_UPLOADS) && $ENABLE_ICON_UPLOADS == 'Y' || $is_admin)) {
     // Save icon if uploaded.

diff --git a/edit_entry.php b/edit_entry.php
@@ -368,7 +368,7 @@ function time_selection($prefix, $time = '', $trigger = false)
   if (!empty($cat_id)) {
     $res = dbi_execute(
       'SELECT cat_name FROM webcal_categories ' .
-        'WHERE cat_id = ? AND ( cat_owner = ? OR cat_owner IS NULL )',
+        'WHERE cat_id = ? AND ( cat_owner = ? OR cat_owner = \'\' )',
       [$cat_id, $real_user]
     );
     if ($res) {

diff --git a/includes/classes/RptEvent.php b/includes/classes/RptEvent.php
@@ -40,11 +40,18 @@ class RepeatingEvent extends Event {
    * @access private
    */
   var $_repeatEndDateTime;
+  /**
+   * The UNIX timestamp for the end date/time of the repetition.
+   * @var int
+   * @access private
+   */
+  var $_repeatEndDateTimeTS;
  /**
    * The frequency of the repetition.
    * @var int
    * @access private
    */
+
   var $_repeatFrequency;
   /**
    * The days each week the event occurs

diff --git a/includes/functions.php b/includes/functions.php
@@ -2471,7 +2471,7 @@ function get_categories_by_id ( $id, $user, $asterisk = false ) {
 
   $res = dbi_execute ( 'SELECT wc.cat_name, wc.cat_id, wec.cat_owner
     FROM webcal_categories wc, webcal_entry_categories wec WHERE wec.cal_id = ?
-    AND wec.cat_id = wc.cat_id AND ( wc.cat_owner = ? OR wc.cat_owner IS NULL )
+    AND wec.cat_id = wc.cat_id AND ( wc.cat_owner = ? OR wc.cat_owner = \'\' )
   ORDER BY wec.cat_order', [$id, ( empty ( $user ) ? $login : $user )] );
   while ( $row = dbi_fetch_row ( $res ) ) {
     $categories[ ( empty ( $row[2] ) ? - $row[1] : $row[1] ) ] = $row[0]
@@ -4209,7 +4209,7 @@ function load_user_categories ( $ex_global = '' ) {
       ( $is_assistant || $is_admin ) ? $user : $login );
     $rows = dbi_get_cached_rows ( 'SELECT cat_id, cat_name, cat_owner, cat_color, cat_icon_mime
       FROM webcal_categories WHERE ( cat_owner = ? ) ' . ( $ex_global == ''
-        ? 'OR ( cat_owner IS NULL ) ORDER BY cat_owner,' : 'ORDER BY' )
+        ? 'OR ( cat_owner = \'\' ) ORDER BY cat_owner,' : 'ORDER BY' )
        . ' cat_name', $query_params );
     if ( $rows ) {
       for ( $i = 0, $cnt = count ( $rows ); $i < $cnt; $i++ ) {