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 ? ' ' : '' ); } diff --git a/autocomplete_ajax.php b/autocomplete_ajax.php index f05088188..b71da1c49 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 { diff --git a/category_handler.php b/category_handler.php index 9ca8bc728..6a7c16e53 100644 --- a/category_handler.php +++ b/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(); diff --git a/edit_entry.php b/edit_entry.php index 8677ac6b5..2552c2746 100644 --- a/edit_entry.php +++ b/edit_entry.php @@ -1093,8 +1093,6 @@ function time_selection($prefix, $time = '', $trigger = false) ? $selected : '') . '>' . translate('Weekly') . ''; } echo ' 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 ) ) diff --git a/export.php b/export.php index 62be94c89..3f6afe04d 100644 --- a/export.php +++ b/export.php @@ -31,7 +31,7 @@ - '; @@ -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(); diff --git a/groups.php b/groups.php index f02bdf6d0..850074682 100644 --- a/groups.php +++ b/groups.php @@ -76,13 +76,13 @@
-
+
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'] ); diff --git a/includes/classes/WebCalendar.php b/includes/classes/WebCalendar.php index 6514ae2c1..2a548cb03 100644 --- a/includes/classes/WebCalendar.php +++ b/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. 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 +?> diff --git a/includes/css/styles.php b/includes/css/styles.php index 82096d82e..693f50eb4 100644 --- a/includes/css/styles.php +++ b/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 (:), diff --git a/includes/functions.php b/includes/functions.php index 82eaf8c03..cd0caa865 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. @@ -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', @@ -4632,7 +4632,7 @@ function print_color_input_html ($varname, $title, $varval = '', $id='', $tag='d } return '<' . $tag . ' class="form-inline">' . - (empty($title) ? '' : ('')) . + (empty($title) ? '' : ('')) . ''; 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' ); diff --git a/includes/xcal.php b/includes/xcal.php index e423785c9..17633eb30 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/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 @@

diff --git a/install/sql/tables-mysql.sql b/install/sql/tables-mysql.sql index 8d370c0e6..ab9724d25 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, 9=Low */ cal_priority INT DEFAULT 5, /* 'E' = Event, 'M' = Repeating event, 'T' = Task */ cal_type CHAR(1) DEFAULT 'E', 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 = ''; diff --git a/purge.php b/purge.php index b6f2b5d89..53510b3b0 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 ); diff --git a/remotecal_mgmt.php b/remotecal_mgmt.php index 781694cad..b68c7e8b7 100644 --- a/remotecal_mgmt.php +++ b/remotecal_mgmt.php @@ -109,7 +109,7 @@

diff --git a/resourcecal_mgmt.php b/resourcecal_mgmt.php index b53f46be8..fef82ad21 100644 --- a/resourcecal_mgmt.php +++ b/resourcecal_mgmt.php @@ -85,7 +85,7 @@
@@ -120,7 +120,7 @@
- +
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() ) { diff --git a/translations/English-US.txt b/translations/English-US.txt index 25ec03e8a..d743b4a9a 100644 --- a/translations/English-US.txt +++ b/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 ######################################## diff --git a/upcoming.php b/upcoming.php index dcaf170e7..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 ) { @@ -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 .= 'category icon'; + $link .= 'category icon'; } } echo $link; diff --git a/user_mgmt.php b/user_mgmt.php index b0dfa3edc..bdbc9123d 100644 --- a/user_mgmt.php +++ b/user_mgmt.php @@ -59,9 +59,9 @@ +
-
' . ( $empLink ? '' : '' ) - . $names[$i] . ( $empLink ? '' : '' ) . ''. $names[$i] . '
' . generate_export_select ( 'toggel_catfilter' ) . ' + ' . generate_export_select ( 'toggle_catfilter' ) . '

@@ -85,43 +85,43 @@
-
+
- +
- - + +
- - + +
- - + +
- +
- +
- +
- +
@@ -152,7 +152,7 @@
@@ -161,11 +161,11 @@
- +
- +
@@ -199,7 +199,7 @@
-
+
diff --git a/view_entry.php b/view_entry.php index 99272977e..a1cc21b52 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') { diff --git a/view_l.php b/view_l.php index 578722f38..9fe33a998 100644 --- a/view_l.php +++ b/view_l.php @@ -73,15 +73,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; diff --git a/week.php b/week.php index 8563acc9c..0aa982753 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 = diff --git a/week_ssi.php b/week_ssi.php index 8c8341d33..550390c37 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 ); @@ -79,9 +79,10 @@ . date ( 'd', $days[$i] ) . ''; $tmpOut2 .= ' - ' . + print_date_entries ( $date, $login, true, true ) . ' '; } echo '