From c73d7a3089f53c29a14489c65a5a292a7eaed6c1 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Mon, 25 Mar 2024 14:35:07 -0600 Subject: [PATCH 01/38] spelling --- export.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/export.php b/export.php index a6a7f733a..9f907eddf 100644 --- a/export.php +++ b/export.php @@ -31,7 +31,7 @@ - ' . generate_export_select ( 'toggel_catfilter' ) . ' + ' . generate_export_select ( 'toggle_catfilter' ) . ' '; @@ -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(); From 9c07f7b3cba0137fae7c4f3a856e09aabb4da050 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Mon, 25 Mar 2024 14:37:19 -0600 Subject: [PATCH 02/38] redundant test --- view_entry.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/view_entry.php b/view_entry.php index c098ac61e..c7d9f5d71 100644 --- a/view_entry.php +++ b/view_entry.php @@ -542,13 +542,15 @@ if ($single_user == 'N' && !empty($createby_fullname)) { echo '
' . translate('Created by') . "
\n"; echo '
'; -if ($is_private && !access_is_enabled()) { -echo '[' . translate('Private') . ']'; -} else if ($is_confidential && !access_is_enabled()) { -echo '[' . translate('Confidential') . ']'; + +if ( ! access_is_enabled() ) { + if ( $is_private ) { + echo '[' . translate ( 'Private' ) . ']'; + } elseif ( $is_confidential ) { + echo '[' . translate ( 'Confidential' ) . ']'; + } } else { -if (access_is_enabled()) { -$can_email = access_user_calendar('email', $create_by); + $can_email = access_user_calendar ( 'email', $create_by ); } $pubAccStr = ($row[0] == '__public__') ? translate('Public Access') : $createby_fullname; if (strlen($email_addr) && $can_email != 'N') { From 34055aff1d4b7152d8ede91deb62455b88a7efd3 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Mon, 25 Mar 2024 16:57:16 -0600 Subject: [PATCH 03/38] another redundant test --- week_ssi.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week_ssi.php b/week_ssi.php index 8c8341d33..95746f078 100644 --- a/week_ssi.php +++ b/week_ssi.php @@ -34,7 +34,7 @@ // TODO This is suspect $today = time(); -if ( ! empty ( $date ) && ! empty ( $date ) ) { +if ( ! empty ( $date ) ) { $thisyear = substr ( $date, 0, 4 ); $thismonth = substr ( $date, 4, 2 ); $thisday = substr ( $date, 6, 2 ); From 91938380d206e4e0e5b37da8814aa923dcc7961f Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Mon, 25 Mar 2024 17:13:14 -0600 Subject: [PATCH 04/38] tag not closed --- week_ssi.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/week_ssi.php b/week_ssi.php index 95746f078..550390c37 100644 --- a/week_ssi.php +++ b/week_ssi.php @@ -79,9 +79,10 @@ . date ( 'd', $days[$i] ) . ''; $tmpOut2 .= ' - ' . + print_date_entries ( $date, $login, true, true ) . ' '; } echo ' From f14db8940ba6dbbcb2e01c4905417ad00219ae57 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Wed, 27 Mar 2024 05:04:27 -0600 Subject: [PATCH 05/38] use arrays before empty them --- view_l.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/view_l.php b/view_l.php index 09a2e8d89..bc1ed0369 100644 --- a/view_l.php +++ b/view_l.php @@ -74,15 +74,13 @@ } $e_save = $re_save = []; -for ( $i = 0, $cnt = count ( $viewusers ); $i < $cnt; $i++ ) { +$events = $repeated_events = []; +foreach ( $viewusers as $i ) { /* Pre-Load the repeated events for quicker access */ - $repeated_events = read_repeated_events ( $viewusers[$i], $startdate, $enddate, '' ); - $re_save = array_merge ( $re_save, $repeated_events ); + $re_save = read_repeated_events ( $i, $startdate, $enddate, '' ); /* Pre-load the non-repeating events for quicker access */ - $events = read_events ( $viewusers[$i], $startdate, $enddate ); - $e_save = array_merge ( $e_save, $events ); + $e_save = read_events ( $i, $startdate, $enddate ); } -$events = $repeated_events = []; for ( $i = 0, $cnt = count ( $e_save ); $i < $cnt; $i++ ) { $should_add = 1; From dbd1836831993f4ccd9dfb82084212060d905567 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Fri, 5 Apr 2024 23:23:01 -0600 Subject: [PATCH 06/38] remove translate being called twice --- edit_entry.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/edit_entry.php b/edit_entry.php index a336ab430..1dfc81576 100644 --- a/edit_entry.php +++ b/edit_entry.php @@ -1196,10 +1196,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 ' - '; + $class = ( is_weekend ( $rpt_byday_mod ) ? 'class="weekend" ' : '' ); + echo " + '; } echo ' From 2dbc1b4f18426207c348e8d04edd63d27ab0c615 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Thu, 18 Apr 2024 17:08:25 -0600 Subject: [PATCH 07/38] close anchor properly If we start the anchor outside the if, we need to close it outside the if. --- upcoming.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upcoming.php b/upcoming.php index dcaf170e7..31fa385a9 100644 --- a/upcoming.php +++ b/upcoming.php @@ -192,10 +192,10 @@ 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 .= 'category icon'; + $link .= 'category icon'; } } - echo $link; + echo "$link"; } } if ( $private ) { From eb1b8328bee6b02b5d66e5cbb16d519283cf494f Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Fri, 19 Apr 2024 12:46:55 -0600 Subject: [PATCH 08/38] a little shorter Missed the closing anchor lower down, still don't need 2 close tags. Also, delete un needed if/else. --- upcoming.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/upcoming.php b/upcoming.php index 31fa385a9..bfa6c932b 100644 --- a/upcoming.php +++ b/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 "
\n"; if ( $display_link ) { @@ -195,7 +190,7 @@ function print_upcoming_event ( $e, $date ) { $link .= 'category icon'; } } - echo "$link"; + echo $link; } } if ( $private ) { From 1e99299e43fc8716fdf0b8b4ba1455ac81a5f7a2 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Wed, 24 Apr 2024 02:56:12 -0600 Subject: [PATCH 09/38] Update autocomplete_ajax.php $sendplaintext was always true --- autocomplete_ajax.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/autocomplete_ajax.php b/autocomplete_ajax.php index 1b1714ca4..e3f9feeb8 100644 --- a/autocomplete_ajax.php +++ b/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 { From 1f6308d10d00b9d31d2426ea84786d24726cdd5d Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Wed, 24 Apr 2024 03:04:50 -0600 Subject: [PATCH 10/38] Update events_ajax.php $sendPlainText was always true --- events_ajax.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/events_ajax.php b/events_ajax.php index 45752b25b..7104b272a 100644 --- a/events_ajax.php +++ b/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 ) ) From ad082ba7e527b914361e274112847cbbacb2bc36 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Wed, 24 Apr 2024 03:15:24 -0600 Subject: [PATCH 11/38] Update layers_ajax.php $sendPlainText was always true here, also. --- layers_ajax.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/layers_ajax.php b/layers_ajax.php index 57db7ec96..9bc75d1db 100644 --- a/layers_ajax.php +++ b/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 = ''; From aa0e63fefc0fb8ca6472edf81e14110b71fbfbb8 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Sun, 5 May 2024 11:06:41 -0600 Subject: [PATCH 12/38] spelling --- icalclient.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/icalclient.php b/icalclient.php index 0ac31f41a..ee3bd13fd 100644 --- a/icalclient.php +++ b/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'] ); From 4bb8a570902a5b5984cfd0c3971c464d6b7e0f54 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Sun, 5 May 2024 11:07:44 -0600 Subject: [PATCH 13/38] 'label for' has to match the ID tag --- includes/functions.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/functions.php b/includes/functions.php index 8dd9c6000..8ff256f4b 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -2581,9 +2581,9 @@ function get_groups($user, $includeUserlist=false) $res = dbi_execute($sql, [$groups[$i]['cal_group_id']]); while ($row = dbi_fetch_row($res)) { if (isset($users_by_name[$row[0]])){ - // It is possible some users assigned to this group may not exist, - // so we skip those that don't. For example, if users are fetched - // from an external source via user-app-*.php, and one of those + // It is possible some users assigned to this group may not exist, + // so we skip those that don't. For example, if users are fetched + // from an external source via user-app-*.php, and one of those // users is deleted externally. $users[] = $users_by_name[$row[0]]; } @@ -4632,7 +4632,7 @@ function print_color_input_html ($varname, $title, $varval = '', $id='', $tag='d } return '<' . $tag . ' class="form-inline">' . - (empty($title) ? '' : ('')) . + (empty($title) ? '' : ('')) . ''; From a431e4b4ca7acf235d708cba3588d7832a9ae8df Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Thu, 9 May 2024 14:51:05 -0600 Subject: [PATCH 14/38] missing dollar sign --- rss_unapproved.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rss_unapproved.php b/rss_unapproved.php index d0dd61240..be1138504 100644 --- a/rss_unapproved.php +++ b/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() ) { From 853c8dd45bf42924daf18bdf96c31c30038cf8dc Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Sat, 11 May 2024 17:12:34 -0600 Subject: [PATCH 15/38] change typos ' is=" ' to ' id=" ' --- groups.php | 2 +- user_mgmt.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/groups.php b/groups.php index a480fabfd..9d400abfa 100644 --- a/groups.php +++ b/groups.php @@ -86,7 +86,7 @@
-
+
diff --git a/user_mgmt.php b/user_mgmt.php index 0be470b41..10804c04c 100644 --- a/user_mgmt.php +++ b/user_mgmt.php @@ -95,21 +95,21 @@ -
+
- +
- +
- +
- +
@@ -201,7 +201,7 @@
-
+
From 9c7f121db268762625841930abed74681480218f Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Tue, 14 May 2024 10:38:35 -0600 Subject: [PATCH 16/38] missed db in FROM clause in purge.php --- purge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/purge.php b/purge.php index c22dbb990..2f44371b7 100644 --- a/purge.php +++ b/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 ); From d9db68a3a4603ff50d66e04a6a90804ea29a6800 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Fri, 17 May 2024 16:59:04 -0600 Subject: [PATCH 17/38] Update user_mgmt.php tags thead and tbody were interlaced --- user_mgmt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user_mgmt.php b/user_mgmt.php index 10804c04c..8c3b50f48 100644 --- a/user_mgmt.php +++ b/user_mgmt.php @@ -63,9 +63,9 @@ + -
From acae2638f94eac661e07b0bbbbc7b0c3de3f739e Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Sat, 18 May 2024 12:58:43 -0600 Subject: [PATCH 18/38] Update user_mgmt.php crap! fix one, create another fix spelling maxlengtHH --- user_mgmt.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user_mgmt.php b/user_mgmt.php index 8c3b50f48..e0beb2900 100644 --- a/user_mgmt.php +++ b/user_mgmt.php @@ -97,19 +97,19 @@
- +
- +
- +
- +
From 66efff90a7a1467dea39070fc8819a3c455687a8 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Sat, 18 May 2024 13:02:48 -0600 Subject: [PATCH 19/38] Update user_mgmt.php missing quote on class=" s --- user_mgmt.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/user_mgmt.php b/user_mgmt.php index e0beb2900..ec54ad55c 100644 --- a/user_mgmt.php +++ b/user_mgmt.php @@ -100,31 +100,31 @@
- +
- +
- +
- +
- +
- +
- +
@@ -163,11 +163,11 @@
- +
- +
From 1d294169afb29a557311fe2344767862906dd9de Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Fri, 24 May 2024 17:19:39 -0600 Subject: [PATCH 20/38] Update functions.php 'slow' to 'slot' in comment --- includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/functions.php b/includes/functions.php index 8ff256f4b..9189695a3 100644 --- a/includes/functions.php +++ b/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. From a8b29cdb10ee706a10aee5349d9c70b4945db992 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Sun, 2 Jun 2024 10:52:36 -0600 Subject: [PATCH 21/38] fix spelling and syntax --- groups.php | 2 +- includes/xcal.php | 12 ++++++------ remotecal_mgmt.php | 2 +- resourcecal_mgmt.php | 2 +- user_mgmt.php | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/groups.php b/groups.php index 9d400abfa..3ed4d1658 100644 --- a/groups.php +++ b/groups.php @@ -80,7 +80,7 @@
diff --git a/includes/xcal.php b/includes/xcal.php index 7ac151f91..3d5023d63 100644 --- a/includes/xcal.php +++ b/includes/xcal.php @@ -2208,7 +2208,7 @@ 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 @@ -2216,7 +2216,7 @@ function parse_ical ( $cal_file, $source = 'file' ) { } 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 @@ -2224,7 +2224,7 @@ function parse_ical ( $cal_file, $source = 'file' ) { } 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,7 +2429,7 @@ 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 @@ -2437,7 +2437,7 @@ function parse_hcal ( $hcal_array ) { } 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 @@ -2445,7 +2445,7 @@ function parse_hcal ( $hcal_array ) { } 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 diff --git a/remotecal_mgmt.php b/remotecal_mgmt.php index c312d7e71..f0916745a 100644 --- a/remotecal_mgmt.php +++ b/remotecal_mgmt.php @@ -113,7 +113,7 @@
diff --git a/resourcecal_mgmt.php b/resourcecal_mgmt.php index 542b971f3..fc1031ce1 100644 --- a/resourcecal_mgmt.php +++ b/resourcecal_mgmt.php @@ -89,7 +89,7 @@
diff --git a/user_mgmt.php b/user_mgmt.php index ec54ad55c..110eaae08 100644 --- a/user_mgmt.php +++ b/user_mgmt.php @@ -89,7 +89,7 @@
@@ -154,7 +154,7 @@
From c6463ac42654aecd69669207f95ff64786e2dbd3 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Wed, 12 Jun 2024 04:33:41 -0600 Subject: [PATCH 22/38] been wrong for years and no one noticed --- adminhome.php | 13 +------------ includes/classes/WebCalendar.php | 4 ++-- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/adminhome.php b/adminhome.php index 7388457b3..17fef78d0 100644 --- a/adminhome.php +++ b/adminhome.php @@ -149,18 +149,7 @@ $_SESSION['webcal_tmp_login'] = 'SheIsA1Fine!'; -print_header( '', -/* - ' - If this is the proper way to call css_cacher.php from here? - */ - ' - ' ); +print_header(); echo '

' . translate( 'Administrative Tools' ) . '

diff --git a/includes/classes/WebCalendar.php b/includes/classes/WebCalendar.php index 81e08dd6b..fb500e524 100644 --- a/includes/classes/WebCalendar.php +++ b/includes/classes/WebCalendar.php @@ -576,10 +576,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) { From a7d7643af3e68871645a8645a2f2fe12c95fb010 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Sun, 16 Jun 2024 15:17:50 -0600 Subject: [PATCH 23/38] needed quotes --- category_handler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/category_handler.php b/category_handler.php index 4d030ad29..f5cea9fa6 100644 --- a/category_handler.php +++ b/category_handler.php @@ -71,7 +71,7 @@ function updateIconBlob($catId, $iconData, $iconMimeType) { if (!dbi_execute( 'DELETE FROM webcal_entry_categories WHERE cat_id = ? AND ( cat_owner = ?' - . ($is_admin ? ' OR cat_owner = '' )' : ' )'), + . ($is_admin ? ' OR cat_owner = "" )' : ' )'), [$id, $login] )) { $error = db_error(); From 6847c70c32443d34bffc0c01170a64ee9396a9ce Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Mon, 17 Jun 2024 12:30:56 -0600 Subject: [PATCH 24/38] spelling --- install/install_auth_handler.php | 2 +- install/install_phpsettings_handler.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/install_auth_handler.php b/install/install_auth_handler.php index 41b887965..85e4dee9e 100644 --- a/install/install_auth_handler.php +++ b/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) { diff --git a/install/install_phpsettings_handler.php b/install/install_phpsettings_handler.php index bcbe254e9..992256f07 100644 --- a/install/install_phpsettings_handler.php +++ b/install/install_phpsettings_handler.php @@ -1,6 +1,6 @@ From a557971cbac9892b4eb74021e877fc893efeb31c Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Tue, 18 Jun 2024 15:01:40 -0600 Subject: [PATCH 25/38] spelling --- includes/js/popups.js | 2 +- includes/js/v_h_scrolls.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/js/popups.js b/includes/js/popups.js index 8c35070c2..39945343b 100644 --- a/includes/js/popups.js +++ b/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' ) ) ); }; diff --git a/includes/js/v_h_scrolls.js b/includes/js/v_h_scrolls.js index 72d301142..2f21065b2 100644 --- a/includes/js/v_h_scrolls.js +++ 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' ); From 5af285d24adfea68ae64a3bf52199dc5759ffa7e Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Wed, 26 Jun 2024 06:09:51 -0600 Subject: [PATCH 26/38] missing quote --- category.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/category.php b/category.php index d3afcf4db..bea6509ee 100644 --- a/category.php +++ b/category.php @@ -86,7 +86,7 @@ . 'Cancel ' . (!empty($id) ? ' ' : '' ) . '
From 8b3eb0cb7d1a63672d55f1f9da5c9aa7a3ced46b Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Thu, 27 Jun 2024 11:12:41 -0600 Subject: [PATCH 27/38] According to php docs, these tests are equivalent --- includes/classes/WebCalendar.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/includes/classes/WebCalendar.php b/includes/classes/WebCalendar.php index fb500e524..a2fedf39c 100644 --- a/includes/classes/WebCalendar.php +++ b/includes/classes/WebCalendar.php @@ -785,8 +785,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. From 57752c8d1ac619ada238b545d05f4054bc0917f9 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Fri, 12 Jul 2024 07:22:53 -0600 Subject: [PATCH 28/38] extra quote and correct spelling --- includes/functions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/functions.php b/includes/functions.php index 9189695a3..a0b20935d 100644 --- a/includes/functions.php +++ b/includes/functions.php @@ -1633,7 +1633,7 @@ function display_unapproved_events ( $user ) { if ( $row && $row[0] > 0 ) $ret .= ( $MENU_ENABLED == 'N' ? '' . str_replace ( 'XXX', $row[0], translate ( 'You have XXX unapproved entries' ) ) . "
\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', From 675238c7f04d94ea90645eb4990959aa793a7d6e Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Fri, 12 Jul 2024 07:25:09 -0600 Subject: [PATCH 29/38] unneeded parenthesis --- week.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/week.php b/week.php index d74fa4414..8f6f0241d 100644 --- a/week.php +++ b/week.php @@ -6,7 +6,7 @@ || ( ! empty( $user ) && ! access_user_calendar( 'view', $user ) ) ) send_to_preferred_view(); -load_user_layers ( ( $user != $login ) && $is_nonuser_admin ? $user : '' ); +load_user_layers ( $user != $login && $is_nonuser_admin ? $user : '' ); load_user_categories(); $nextYmd = From 8fe44fbe05ec316d04abaaf4b82cc6fb7cfcb0ad Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Tue, 30 Jul 2024 08:11:32 -0600 Subject: [PATCH 30/38] Fix priority ranks in comment --- install/sql/tables-mysql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/sql/tables-mysql.sql b/install/sql/tables-mysql.sql index c0bb7ebd1..937f28819 100644 --- a/install/sql/tables-mysql.sql +++ b/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, 3=Low */ cal_priority INT DEFAULT 5, /* 'E' = Event, 'M' = Repeating event, 'T' = Task */ cal_type CHAR(1) DEFAULT 'E', From 4bef58ad8a023678f1e20caf65867e03a3051c88 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Tue, 30 Jul 2024 08:14:46 -0600 Subject: [PATCH 31/38] (sigh) fix last priority --- install/sql/tables-mysql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/sql/tables-mysql.sql b/install/sql/tables-mysql.sql index 937f28819..00d9bd8d7 100644 --- a/install/sql/tables-mysql.sql +++ b/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=High, 5=Med, 3=Low */ + /* 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', From 266ffd7981f77376722fae865fc7b352a6db8187 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Fri, 30 Aug 2024 15:38:36 -0600 Subject: [PATCH 32/38] URL for hkit.php --- includes/classes/hKit/hkit.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/includes/classes/hKit/hkit.class.php b/includes/classes/hKit/hkit.class.php index 78c58d4dd..08035c98f 100644 --- a/includes/classes/hKit/hkit.class.php +++ b/includes/classes/hKit/hkit.class.php @@ -1,7 +1,8 @@ \ No newline at end of file +?> From 6cb722806600fda786e6b8b3395330696bb432cf Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Sun, 1 Sep 2024 23:36:38 -0600 Subject: [PATCH 33/38] your => you --- .php-cs-fixer.php | 693 ++++++++++++++++++++++++++++++++++ install/install_adminuser.php | 2 +- translations/English-US.txt | 2 +- 3 files changed, 695 insertions(+), 2 deletions(-) create mode 100644 .php-cs-fixer.php diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php new file mode 100644 index 000000000..6bb46a928 --- /dev/null +++ b/.php-cs-fixer.php @@ -0,0 +1,693 @@ +in( __DIR__ )->exclude( [ + 'autogenerated_content', 'captcha', 'hkit', + 'java', 'phpmailer', 'pub', 'vendor', 'ws', +] ); + +return ( new Config )->setRules( [ + // See https://cs.symfony.com/doc/rules/index.html + // 'align_multiline_comment' => [ + // 'comment_type' => 'phpdocs_like' + // ], + // 'array_indentation' => false, + 'array_syntax' => [ + 'syntax' => 'short', + ], + // 'assign_null_coalescing_to_coalesce_equal' => true, + // 'attribute_empty_parentheses' => [ + // 'use_parentheses' => false + // ], + // 'backtick_to_shell_exec' => false, + // 'binary_operator_spaces' => [ + // 'default' => 'align_single_space_minimal', + // 'operators' => [ + // '!==' => 'align_single_space_minimal', + // '=' => 'align_single_space_minimal', + // '===' => 'align_single_space_minimal', + // '=>' => 'align_single_space_minimal', + // '|' => 'no_space' + // ] + // ], + 'blank_line_after_opening_tag' => false, + // 'blank_lines_before_namespace' => [ + // 'min_line_breaks' => 1, + // 'max_line_breaks' => 1 + // ], + // 'blank_line_after_namespace' => false, + // 'blank_line_before_statement' => [ + // 'statements' => [ + // 'break', 'case', 'continue', 'declare', 'default', 'do', + // 'exit', 'for', 'foreach', 'goto', 'if', 'include', + // 'include_once', 'phpdoc', 'require', 'require_once', 'return', + // 'switch', 'throw', 'try', 'while', 'yield', 'yield_from' + // ] + // ], + // 'blank_line_between_import_groups' => false, + // 'braces_position' => [ + // 'allow_single_line_anonymous_functions' => true, + // 'allow_single_line_empty_anonymous_classes' => true, + // 'anonymous_classes_opening_brace' => 'same_line', + // 'anonymous_functions_opening_brace' => 'same_line', + // 'classes_opening_brace' => 'same_line', + // 'control_structures_opening_brace' => 'same_line', + // 'functions_opening_brace' => 'same_line' + // ], + // 'cast_spaces' => [ + // 'space' => 'single' + // ], + // 'class_attributes_separation' => [ + // 'elements' => [ + // 'case' => 'none', + // 'const' => 'only_if_meta', + // 'method' => 'one', + // 'property' => 'only_if_meta', + // 'trait_import' => 'none' + // ] + // ], + // 'class_definition' => [ + // 'inline_constructor_arguments' => true, + // 'multi_line_extends_each_single_line' => false, + // 'single_item_single_line' => true, + // 'single_line' => true, + // 'space_before_parenthesis' => false + // ], + // 'class_reference_name_casing' => true, + // 'clean_namespace' => true, + // 'combine_consecutive_issets' => true, + // 'combine_consecutive_unsets' => true, + // 'compact_nullable_type_declaration' => true, + // 'concat_space' => [ + // 'spacing' => 'one' + // ], + // 'constant_case' => [ + // 'case' => 'lower' + // ], + // 'control_structure_braces' => true, + // 'control_structure_continuation_position' => [ + // 'position' => 'same_line' + // ], + // 'declare_equal_normalize' => [ + // 'space' => 'single' + // ], + // 'declare_parentheses' => false, + // 'declare_strict_types' => false, + // 'dir_constant' => true, + // 'doctrine_annotation_array_assignment' => [ + // 'operator' => '=' + // ], + // 'doctrine_annotation_braces' => [ + // 'syntax' => 'with_braces' + // ], + // 'doctrine_annotation_indentation' => [ + // 'indent_mixed_lines' => false + // ], + // 'doctrine_annotation_spaces' => [ + // 'before_argument_assignments' => true, + // 'after_argument_assignments' => true, + // 'around_parentheses' => false + // ], + // 'echo_tag_syntax' => [ + // 'format' => 'short', + // 'long_function' => 'echo', + // 'shorten_simple_statements_only' => false + // ], + // 'elseif' => true, + // 'empty_loop_body' => [ + // 'style' => 'semicolon' + // ], + // 'empty_loop_condition' => [ + // 'style' => 'while' + // ], + 'encoding' => true, + // 'error_suppression' => [ + // 'mute_deprecation_error' => false, + // 'noise_remaining_usages' => true + // ], + // 'explicit_indirect_variable' => false, + // 'explicit_string_variable' => true, + // 'full_opening_tag' => true, + // 'fully_qualified_strict_types' => [ + // 'import_symbols' => true, + // 'leading_backslash_in_global_namespace' => false + // ], +/* Doesn't work. + // Always removes space between function name and opening parenthesis + // 'function_declaration' => [ + // 'closure_fn_spacing' => 'one', + // 'closure_function_spacing' => 'one', + // 'trailing_comma_single_line' => false + // ], + */ + // 'function_to_constant' => [ + // 'functions' => ['get_called_class', 'get_class', + // 'get_class_this', 'php_sapi_name', 'phpversion', 'pi' + // ] + // ], + // 'general_phpdoc_annotation_remove' => [ + // 'annotations' => ['access', 'global'], + // 'case_sensitive' => true + // ], + // 'general_phpdoc_tag_rename' => [ + // 'replacements' => ['inheritDocs' => 'inheritDoc'] + // ], + // 'get_class_to_class_keyword' => true, + // 'global_namespace_import' => [ + // 'import_classes' => true, + // 'import_constants' => null, + // 'import_functions' => null + // ], + // + // 'group_import' => [ + // 'group_types' => ['classy', 'functions', 'constants'] + // ], +/* Does NOT append. Overwrites/replaces all! + // + // 'header_comment' => [ + // 'header' => '@package WebCalendar', + // 'comment_type' => 'PHPDoc', + // 'location' => 'after_open', + // 'separate' => 'none' + // ], + // + */ + // 'heredoc_closing_marker' => [ + // 'closing_marker' => 'EOF', + // 'explicit_heredoc_style' => false, + // 'reserved_closing_markers' => [ + // 'CSS', 'DIFF', 'HTML', 'JS', 'JSON', 'MD', 'PHP', + // 'PYTHON', 'RST', 'TS', 'SQL', 'XML', 'YAML' + // ] + // ], +/* + // too much indent + // 'heredoc_indentation' => [ + // 'indentation' => 'same_as_start' + // ], + */ + // 'heredoc_to_nowdoc' => false, + // 'include' => true, + // 'increment_style' => [ + // 'style' => 'post' + // ], + // 'indentation_type' => true, + // 'integer_literal_case' => true, + // 'is_null' => true, + // 'lambda_not_used_import' => true, + // 'line_ending' => true, + // 'linebreak_after_opening_tag' => true, + // 'list_syntax' => [ + // 'syntax' => 'short' + // ], + // 'logical_operators' => true, + // 'long_to_shorthand_operator' => true, + // 'lowercase_cast' => true, + // 'lowercase_keywords' => true, + // 'lowercase_static_reference' => true, + // 'magic_constant_casing' => true, + // 'magic_method_casing' => true, + // 'method_argument_space' => [ + // 'after_heredoc' => true, + // 'attribute_placement' => 'same_line', + // 'keep_multiple_spaces_after_comma' => false, + // 'on_multiline' => 'ensure_single_line' + // ], + // 'method_chaining_indentation' => true, + // 'multiline_comment_opening_closing' => true, + // 'multiline_string_to_heredoc' => false, + // 'multiline_whitespace_before_semicolons' => [ + // 'strategy' => 'no_multi_line' + // ], + // 'native_function_casing' => true, + // 'native_type_declaration_casing' => true, + // 'new_with_parentheses' => [ + // 'anonymous_class' => true, + // 'named_class' => true + // ], + // 'no_alias_language_construct_call' => true, + // 'no_alternative_syntax' => [ + // 'fix_non_monolithic_code' => true + // ], + // 'no_binary_string' => true, + // 'no_blank_lines_after_class_opening' => true, + // 'no_blank_lines_after_phpdoc' => true, + // 'no_break_comment' => [ + // 'comment_text' => 'intentional no break' + // ], + // 'no_closing_tag' => true, + // 'no_empty_comment' => true, + // 'no_empty_phpdoc' => true, + // 'no_empty_statement' => true, + // 'no_extra_blank_lines' => [ + // 'tokens' => [ + // 'attribute', 'break', 'case', 'continue', 'curly_brace_block', + // 'default', 'extra', 'parenthesis_brace_block', 'return', + // 'square_brace_block', 'switch', 'throw', 'use_trait', 'use' + // ] + // ], + // 'no_homoglyph_names' => true, + // 'no_leading_import_slash' => true, + // 'no_leading_namespace_whitespace' => true, + // 'no_mixed_echo_print' => [ + // 'use' => 'echo' + // ], + // 'no_multiline_whitespace_around_double_arrow' => true, + // 'no_multiple_statements_per_line' => true, + // 'no_leading_namespace_whitespace' => true, + // 'no_null_property_initialization' => true, + // 'no_short_bool_cast' => true, + // 'no_singleline_whitespace_before_semicolons' => true, + // 'no_space_around_double_colon' => true, + // 'no_spaces_after_function_name' => false, + // 'no_spaces_around_offset' => [ + // 'positions' => ['inside'] + // ], + // 'no_superfluous_elseif' => true, + // 'no_superfluous_phpdoc_tags' => [ + // 'allow_hidden_params' => true, + // 'allow_mixed' => true + // ], + // 'no_trailing_comma_in_singleline' => [ + // 'elements' => [ + // 'arguments', + // 'array', + // 'array_destructuring', + // 'group_import' + // ] + // ], + // 'no_trailing_whitespace_in_comment' => true, + // 'no_trailing_whitespace_in_string' => true, + 'no_trailing_whitespace' => true, + // 'no_unneeded_braces' => [ + // 'namespaces' => true + // ], + // 'no_unneeded_control_parentheses' => [ + // 'statements' => [ + // 'break', 'clone', 'continue', 'echo_print', + // 'return', 'switch_case', 'yield' + // ] + // ], + // 'no_unneeded_import_alias' => true, + // 'no_unset_cast' => true, + // 'no_unset_on_property' => false, + // 'no_unused_imports' => true, + // 'no_useless_concat_operator' => [ + // 'juggle_simple_strings' => true + // ], + // 'no_useless_else' => true, + // 'no_useless_nullsafe_operator' => true, + // 'no_useless_return' => true, + // 'no_whitespace_before_comma_in_array' => true, + // 'no_whitespace_in_blank_line' => true, + // 'normalize_index_brace' => true, + // 'not_operator_with_space' => true, + // 'not_operator_with_successor_space' => true, + // 'nullable_type_declaration' => [ + // 'syntax' => 'question_mark' + // ], + // 'nullable_type_declaration_for_default_null_value' => true, + // 'numeric_literal_separator' => [ + // 'override_existing' => true, + // 'strategy' => 'no_separator' + // ], + // 'object_operator_without_whitespace' => true, + // 'octal_notation' => true, + // 'operator_linebreak' => [ + // 'only_booleans' => false, + // 'position' => 'end' + // ], + // 'ordered_attributes' => [ + // 'sort_algorithm' => 'alpha' + // ], + // 'ordered_class_elements' => [ + // 'case_sensitive' => true, + // 'order' => ['construct', 'destruct'], + // 'sort_algorithm' => 'alpha' + // ], + // 'ordered_imports' => [ + // 'case_sensitive' => false, + // 'imports_order' => ['const', 'class', 'function'], + // 'sort_algorithm' => 'alpha' + // ], + // 'ordered_interfaces' => [ + // 'case_sensitive' => false, + // 'direction' => 'ascend', + // 'order' => 'alpha' + // ], + // 'ordered_types' => [ + // 'case_sensitive' => false, + // 'null_adjustment' => 'always_last', + // 'sort_algorithm' => 'alpha' + // ], +/* + // adds superfluous params to page header instead of item header + // 'phpdoc_add_missing_param_annotation' => [ + // 'only_untyped' => false + // ], + */ + // 'phpdoc_align' => [ + // 'align' => 'vertical', + // 'spacing' => [ + // 'return' => 1, + // '_default' => 2 + // ] + // ], + // 'phpdoc_annotation_without_dot' => true, + // 'phpdoc_indent' => true, + // 'phpdoc_inline_tag_normalizer' => [ + // 'tags' => [ + // 'example', 'id', 'inheritdoc', 'internal', + // 'link', 'source', 'toc', 'tutorial' + // ] + // ], + // 'phpdoc_line_span' => [ + // 'const' => 'multi', + // 'method' => 'multi', + // 'property' => 'multi' + // ], + // 'phpdoc_no_access' => false, + // 'phpdoc_no_alias_tag' => [ + // 'replacements' => [ + // 'link' => 'see', + // 'property-read' => 'property', + // 'property-write' => 'property', + // 'type' => 'var' + // ] + // ], + // 'phpdoc_no_empty_return' => true, + // 'phpdoc_no_package' => false, + // 'phpdoc_no_useless_inheritdoc' => true, + // 'phpdoc_order' => [ + // 'order' => ['param', 'throws', 'return'] + // ], + // 'phpdoc_order_by_value' => [ + // 'annotations' => [ + // 'author', 'covers', 'coversNothing', 'dataProvider', 'depends', 'group', + // 'internal', 'method', 'mixin', 'property', 'requires', 'throws', 'uses' + // ] + // ], + // 'phpdoc_param_order' => true, + // 'phpdoc_return_self_reference' => [ + // 'replacements' => [ + // '@self' => 'self', + // '@static' => 'static', + // '@this' => '$this', + // '$self' => 'self', + // '$static' => 'static', + // 'this' => '$this' + // ] + // ], + // 'phpdoc_scalar' => [ + // 'types' => ['boolean', 'callback', 'double', 'integer', 'real', 'str'] + // ], + // 'phpdoc_separation' => [ + // 'groups' => [ + // ['author', 'copyright', 'license'], + // ['deprecated', 'link', 'see', 'since'], + // ['category', 'package', 'subpackage'], + // ['property'], + // ['param'], + // ['return'] + // ], + // 'skip_unlisted_annotations' => false, + // ], + // 'phpdoc_single_line_var_spacing' => true, + // 'phpdoc_summary' => false, + // 'phpdoc_tag_casing' => [ + // 'tags' => ['inheritDoc'] + // ], + // 'phpdoc_tag_type' => [ + // 'tags' => [ + // 'see' => 'inline', + // 'var' => 'inline' + // ] + // ], + // 'phpdoc_to_comment' => [ + // 'ignored_tags' => [ + // 'api', 'author', 'copyright', 'deprecated', 'example', + // 'global', 'inheritDoc', 'internal', 'license', 'method', + // 'package', 'param', 'property', 'return', 'see', 'since', + // 'throws', 'todo', 'uses', 'var', 'version' + // ] + // ], + // 'phpdoc_trim_consecutive_blank_line_separation' => true, + // 'phpdoc_trim' => true, + // 'phpdoc_types_order' => [ + // 'case_sensitive' => false, + // 'null_adjustment' => 'always_last', + // 'sort_algorithm' => 'alpha' + // ], + // 'phpdoc_types' => [ + // 'groups' => ['alias', 'meta', 'simple'] + // ], + // 'phpdoc_var_annotation_correct_order' => true, + // 'phpdoc_var_without_name' => true, + // 'protected_to_private' => true, + // 'return_assignment' => true, + // 'return_to_yield_from' => false, + // 'return_type_declaration' => [ + // 'space_before' => 'one' + // ], + // 'self_static_accessor' => true, + // 'semicolon_after_instruction' => true, + // 'short_scalar_cast' => true, + // 'simple_to_complex_string_variable' => true, + // 'simplified_if_return' => true, + // 'simplified_null_return' => true, + 'single_blank_line_at_eof' => true, + // 'single_class_element_per_statement' => [ + // 'elements' => ['const', 'property'] + // ], + // 'single_import_per_statement' => [ + // 'group_to_single_imports' => false + // ], + // 'single_line_after_imports' => true, + // 'single_line_comment_spacing' => true, + // 'single_line_empty_body' => true, + // 'single_line_throw' => true, + // 'single_quote' => [ + // 'strings_containing_single_quote_chars' => false + // ], + // 'single_space_around_construct' => [ + // 'constructs_contain_a_single_space' => ['yield_from'], + // 'constructs_followed_by_a_single_space' => [ + // 'abstract', 'as', 'attribute', 'break', 'case', 'catch', + // 'class', 'clone', 'comment', 'const_import', 'const', + // 'continue', 'do', 'echo', 'else', 'elseif', 'enum', + // 'extends', 'final', 'finally', 'for', 'foreach', 'function_import', + // 'function', 'global', 'goto', 'if', 'implements', 'include_once', + // 'include', 'instanceof', 'insteadof', 'interface', 'match', + // 'named_argument', 'namespace', 'new', 'open_tag_with_echo', + // 'php_doc', 'php_open', 'print', 'private', 'protected', 'public', + // 'readonly', 'require_once', 'require', 'return', 'static', + // 'switch', 'throw', 'trait', 'try', 'type_colon', 'use_lambda', + // 'use_trait', 'use', 'var', 'while', 'yield_from', 'yield' + // ], + // 'constructs_preceded_by_a_single_space' => [ + // 'as', 'use_lambda' + // ] + // ], + // 'single_trait_insert_per_statement' => true, + // 'space_after_semicolon' => [ + // 'remove_in_empty_for_expressions' => false + // ], + // 'spaces_inside_parentheses' => [ + // 'space' => 'single' + // ], + // 'standardize_increment' => true, + // 'standardize_not_equals' => true, + // 'static_lambda' => true, + // 'statement_indentation' => [ + // 'stick_comment_to_next_continuous_control_statement' => true + // ], + 'strict_comparison' => true, + // 'strict_param' => true, + // 'string_implicit_backslashes' => [ + // 'double_quoted' => 'unescape', + // 'heredoc' => 'unescape', + // 'single_quoted' => 'unescape' + // ], + // 'string_length_to_empty' => false, + 'string_line_ending' => true, + // 'switch_case_semicolon_to_colon' => true, + // 'switch_case_space' => true, + // 'switch_continue_to_break' => true, + // 'ternary_operator_spaces' => true, + // 'ternary_to_elvis_operator' => true, + // 'ternary_to_null_coalescing' => true, + // 'trailing_comma_in_multiline' => [ + // 'after_heredoc' => false, + // 'elements' => [] + // ], + // 'trim_array_spaces' => false, + // 'type_declaration_spaces' => [ + // 'elements' => ['function', 'property'] + // ], + // 'types_spaces' => [ + // 'space' => 'none', + // 'space_multiple_catch' => null + // ], + // 'unary_operator_spaces' => [ + // 'only_dec_inc' => false + // ], + // 'use_arrow_functions' => false, + // 'visibility_required' => [ + // 'elements' => ['const', 'method', 'property'] + // ], + // 'void_return' => false, + // 'whitespace_after_comma_in_array' => [ + // 'ensure_single_space' => true + // ], + // 'yoda_style' => [ + // 'always_move_variable' => true, + // 'equal' => true, + // 'identical' => true, + // 'less_and_greater' => true + // ] +/* + * risky rules + */ + // 'array_push' => true, + // 'combine_nested_dirname' => true, + // 'comment_to_phpdoc' => [ + // 'ignored_tags' => ['fixme', 'todo'] + // ], + // 'date_time_create_from_format_call' => true, + // 'date_time_immutable' => false, + // 'ereg_to_preg' => true, + // 'final_class' => false, + // 'final_internal_class' => false, + // 'final_public_method_for_abstract_class' => false, + // 'fopen_flag_order' => true, + // 'fopen_flags' => [ + // 'b_mode' => false + // ], + // 'implode_call' => true, + // 'mb_str_functions' => true, + // 'modernize_strpos' => true, + // 'modernize_types_casting' => true, + // 'native_constant_invocation' => [ + // 'exclude' => ['null', 'false', 'true'], + // 'fix_built_in' => false, + // 'strict' => true + // ], + // 'native_function_invocation' => [ + // 'exclude' => [], + // 'include' => ['@internal'], + // 'scope' => 'all', + // 'strict' => true + // ], + // 'no_alias_functions' => [ + // 'sets' => ['@all'] + // ], + // 'no_php4_constructor' => true, + // 'no_unneeded_final_method' => [ + // 'private_methods' => true + // ], + // 'no_unreachable_default_argument_value' => true, + // 'no_useless_sprintf' => true, + // 'non_printable_character' => [ + // 'use_escape_sequences_in_strings' => false + // ], + // 'ordered_traits' => [ + // 'case_sensitive' => false + // ], + // 'phpdoc_array_type' => false, + // 'phpdoc_readonly_class_comment_to_keyword' => true, + // 'phpdoc_list_type' => true, + // 'pow_to_exponentiation' => true, + // 'psr_autoloading' => false, + // 'random_api_migration' => [ + // 'replacements' => [ + // 'getrandmax' => 'mt_getrandmax', + // // supposed to be cryptographically secure + // 'rand' => 'random_int', + // 'srand' => 'mt_srand' + // ] + // ], + // 'self_accessor' => true, + // 'set_type_to_cast' => true, + // 'yield_from_array_to_yields' => false, +/* + * risky and experimental rules + */ + // 'phpdoc_to_param_type' => [ + // 'scalar_types' => true, + // 'union_types' => true + // ], + // 'phpdoc_to_property_type' => [ + // 'scalar_types' => true, + // 'union_types' => true + // ], + // 'phpdoc_to_return_type' => [ + // 'scalar_types' => true, + // 'union_types' => true + // ], + // 'regular_callable_call' => true, +/* + * phpunit rules + */ + // 'php_unit_attributes' => true, + // 'php_unit_fqcn_annotation' => true, + // 'php_unit_internal_class' => [ + // 'types' => ['normal', 'final'] + // ], + // 'php_unit_method_casing' => [ + // 'case' => 'camel_case' + // ], + // 'php_unit_size_class' => [ + // 'group' => 'small' + // ], + // 'php_unit_test_class_requires_covers' = true, +/* + * phpunit risky rules + */ + // 'php_unit_construct' => [ + // 'assertions' => [ + // 'assertEquals', 'assertSame', 'assertNotEquals', 'assertNotSame' + // ] + // ], + // 'php_unit_data_provider_name' => [ + // 'prefix' => 'provide', + // 'suffix' => 'Cases' + // ] + // 'php_unit_data_provider_return_type' => true, + // 'php_unit_data_provider_static' => [ + // 'force' => false + // ], + // 'php_unit_dedicate_assert' => [ + // 'target' => 'newest' + // ], + // 'php_unit_dedicate_assert_internal_type' => [ + // 'target' => 'newest' + // ], + // 'php_unit_expectation' => [ + // 'target' => 'newest' + // ], + // 'php_unit_mock' => [ + // 'target' => 'newest' + // ], + // 'php_unit_mock_short_will_return' => true, + // 'php_unit_namespaced' => [ + // 'target' => 'newest' + // ], + // 'php_unit_no_expectation_annotation' => [ + // 'target' => 'newest', + // 'use_class_const' => true + // ], + // 'php_unit_set_up_tear_down_visibility' => true, + // 'php_unit_strict' => [ + // 'assertions' => [ + // 'assertAttributeEquals', 'assertAttributeNotEquals', + // 'assertEquals', 'assertNotEquals' + // ] + // ], + // 'php_unit_test_annotation' => [ + // 'style' => 'prefix' + // ], + // 'php_unit_test_case_static_method_calls' => [ + // 'call_type' => 'static', + // 'methods' => [] + // ] +] )->setIndent( ' ' )->setLineEnding( "\n" ); diff --git a/install/install_adminuser.php b/install/install_adminuser.php index 7adcb209b..d60a68045 100644 --- a/install/install_adminuser.php +++ b/install/install_adminuser.php @@ -1,6 +1,6 @@

Date: Mon, 2 Sep 2024 02:20:23 -0600 Subject: [PATCH 34/38] redundant translates --- edit_entry.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/edit_entry.php b/edit_entry.php index d0ad7ad36..ac2baeffa 100644 --- a/edit_entry.php +++ b/edit_entry.php @@ -1093,8 +1093,6 @@ function time_selection($prefix, $time = '', $trigger = false) ? $selected : '') . '>' . translate('Weekly') . '

- +
From 54d944371ad7e2cce7221eea82dd7ee0f7e38e2c Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Wed, 27 Nov 2024 01:40:28 -0700 Subject: [PATCH 38/38] If empty ($links[$i]) then $names[$i] also empty --- adminhome.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/adminhome.php b/adminhome.php index 17fef78d0..41d9407dc 100644 --- a/adminhome.php +++ b/adminhome.php @@ -156,12 +156,10 @@ '; for ( $i = 0, $cnt = count( $names ); $i < $cnt; $i++ ) { - $empLink = empty( $links[$i] ); - echo ( $i % COLUMNS == 0 ? ' + echo ( $i % COLUMNS === 0 ? ' ' : '' ) . ' - ' - . ( $i % COLUMNS == COLUMNS - 1 ? ' + ' . + ( $i % COLUMNS === COLUMNS - 1 ? ' ' : '' ); }
' . ( $empLink ? '' : '' ) - . $names[$i] . ( $empLink ? '' : '' ) . ''. $names[$i] . '