From e0186431fa3f7a3a6e45b632b2ddc135482a29e7 Mon Sep 17 00:00:00 2001 From: Bruce Bannon Date: Wed, 26 Jul 2023 16:42:20 -0600 Subject: [PATCH] Upgrade the 'almost optional' bits. --- about.php | 10 +- access.php | 62 +++++------ activity_log.php | 2 +- admin.php | 52 ++++----- adminhome.php | 6 +- approve_entry.php | 4 +- assistant_edit.php | 15 ++- availability.php | 8 +- category.php | 24 ++--- catsel.php | 10 +- docadd.php | 21 ++-- edit_entry.php | 170 +++++++++++++++--------------- edit_entry_handler.php | 12 +-- edit_remotes_handler.php | 12 +-- edit_report.php | 22 ++-- edit_template.php | 18 ++-- events_ajax.php | 6 +- export.php | 12 +-- export_handler.php | 2 +- groups.php | 22 ++-- help_bug.php | 2 +- icons.php | 4 +- import.php | 20 ++-- import_handler.php | 26 ++--- includes/assert.php | 4 +- includes/classes/WebCalMailer.php | 2 +- includes/classes/WebCalendar.php | 2 +- includes/config.php | 4 +- includes/dbi4php.php | 20 ++-- includes/dbtable.php | 32 +++--- includes/formvars.php | 8 +- includes/functions.php | 124 +++++++++++----------- includes/gradient.php | 4 +- includes/index.html | 4 +- includes/index.php | 4 +- includes/init.php | 20 ++-- includes/menu.php | 12 +-- includes/site_extras.php | 2 +- includes/site_extras.php.modified | 4 +- includes/trailer.php | 12 +-- includes/translate.php | 2 +- includes/validate.php | 2 +- includes/xcal.php | 68 ++++++------ install/index.php | 106 +++++++++---------- install/install_functions.php | 10 +- layers.php | 26 ++--- list_unapproved.php | 22 ++-- login-app.php | 36 +++---- month.php | 8 +- pref.php | 49 +++++---- purge.php | 20 ++-- register.php | 18 ++-- reject_entry.php | 2 +- remotecal_mgmt.php | 38 +++---- report.php | 4 +- resourcecal_mgmt.php | 26 ++--- rss_activity_log.php | 2 +- search.php | 20 ++-- search_handler.php | 6 +- security_audit.php | 4 +- select_user.php | 4 +- set_entry_cat.php | 16 +-- themes/theme_inc.php | 2 +- tools/convert_passwords.php | 10 +- tools/reload_remotes.php | 8 +- tools/send_reminders.php | 64 +++++------ user_mgmt.php | 46 ++++---- usersel.php | 26 ++--- view_d.php | 14 +-- view_entry.php | 36 +++---- view_l.php | 6 +- view_m.php | 12 +-- view_r.php | 21 ++-- view_t.php | 8 +- view_v.php | 8 +- view_w.php | 8 +- views.php | 4 +- views_edit.php | 17 ++- week.php | 4 +- week_details.php | 24 ++--- week_ssi.php | 2 +- year.php | 16 ++- 82 files changed, 809 insertions(+), 816 deletions(-) diff --git a/about.php b/about.php index 195e4a4cf..cf2995504 100644 --- a/about.php +++ b/about.php @@ -16,24 +16,24 @@ $replacements[1] = ""; $data = preg_replace ( $patterns, $replacements, $data ); } -print_header ( [], '', +print_header ( [], '', '', true, false, true ); echo '
' . ( empty( $credits ) ? '

' . translate( 'Title' ) . '

' . str_replace( 'XXX', $PROGRAM_VERSION, - translate( 'version XXX' ) ) . '
' . $PROGRAM_DATE . '

 -
+ translate( 'version XXX' ) ) . '
' . $PROGRAM_DATE . '

+

' . translate( 'WebCalendar is a PHP application used...' ) . '

' : '' ) . '
'; print_form_key(); echo ' + : 'About" value="' . translate( 'About' ) ) . '"> + . '" onclick="window.close()">
' . ( empty ( $credits ) ? '' : " - ', + ', ( ! empty( $op['time'] ) && $op['time'] == 'Y' ? 'onload="enableAll( true );"' : '' ) ); @@ -214,8 +214,8 @@ echo '
'; print_form_key(); echo ' - - + + @@ -246,7 +246,7 @@ if( $show ) echo print_checkbox ( ['access_' . $order[$i], 'Y', access_get_function_description( $order[$i] ), - substr( $access, $order[$i], 1 )], 'dito' ) . '
'; + substr( $access, $order[$i], 1 )], 'dito' ) . '
'; if( ( $i + 1 ) % $div == 0 ) echo ' @@ -259,8 +259,8 @@
- - + +
'; $pagetitle = translate( 'Allow Access to Other Users Calendar' ); @@ -284,7 +284,7 @@
'; print_form_key(); echo ' - + -
+ +
@@ -350,15 +350,15 @@ if( $j == 1 ) echo '"invite"' . ( ! empty( $op['invite'] ) && $op['invite'] == 'N' ? '' : $checked ) - . ' />' . translate( 'Can Invite' ); + . '>' . translate( 'Can Invite' ); elseif( $j == 2 ) echo '"email"' . ( ! empty( $op['email'] ) && $op['email'] == 'N' ? '' : $checked ) - . ' />' . translate( 'Can Email' ); + . '>' . translate( 'Can Email' ); else { echo '"time"' . ( ! empty( $op['time'] ) && $op['time'] == 'Y' ? $checked : '' ) - . ' onclick="enableAll( this.checked );" />' + . ' onclick="enableAll( this.checked );">' . translate( 'Can See Time Only' ); $bottomedge = 'boxbottom'; } @@ -368,40 +368,40 @@ + . '> + ? $checked : '' ) . '>' + ? $checked : '' ) . '>' . ( $guser != '__public__' ? ' + . '> + ? $checked : '' ) . '> + ? $checked : '' ) . '> + ? $checked : '' ) . '> + ? $checked : '' ) . '>' + ? $checked : '' ) . '>' : '' ) . ' '; } @@ -410,11 +410,11 @@ @@ -73,7 +73,7 @@ @@ -82,7 +82,7 @@ @@ -107,7 +107,7 @@ + . translate ( 'Export' ) . '">
' . '
' . ( $otheruser != '__default__' && $otheruser != '__public__' ? '   ' : '' ) . ' + . '" onclick="selectAll(63);">  ' : '' ) . '    + . '" onclick="selectAll(256);">   + . '" onclick="selectAll(0);"> @@ -431,8 +431,8 @@ echo ' diff --git a/activity_log.php b/activity_log.php index c01144dce..06863ffc4 100644 --- a/activity_log.php +++ b/activity_log.php @@ -50,7 +50,7 @@ . '" class="next" href="activity_log.php' . ( $row[0] <= $previd ? ( $sys ? '?system=1' : '' ) : '?startid=' . $previd . ( $sys ? '&system=1' : '' ) ) . '">' - . $nextStr . ' ' . $PAGE_SIZE . ' ' . $eventsStr . '
'; + . $nextStr . ' ' . $PAGE_SIZE . ' ' . $eventsStr . '
'; dbi_free_result ( $res ); } diff --git a/admin.php b/admin.php index 08889c3bf..7838433b6 100644 --- a/admin.php +++ b/admin.php @@ -102,8 +102,8 @@ function save_pref ( $prefs, $src ) { define_languages(); // Load the language list. reset ( $languages ); - $checked = ' checked="checked"'; - $selected = ' selected="selected"'; + $checked = ' checked'; + $selected = ' selected'; $select = translate ( 'Select' ) . '...'; // Allow css_cache of webcal_config values. @@ -113,7 +113,7 @@ function save_pref ( $prefs, $src ) { $editStr = ''; + . 'outerWidth=520\' );" name="">'; $choices = ['day.php', 'week.php', 'month.php', 'year.php']; $choices_text = [translate ( 'Day' ), translate ( 'Week' ), translate ( 'Month' ), translate ( 'Year' )]; @@ -238,12 +238,12 @@ function save_pref ( $prefs, $src ) { . '' . translate ( 'Help' ) . ' + . 'outerWidth=420\' );">' . csrf_form_key() . display_admin_link() . '

+ . '" name="">

' . $tabs . ' @@ -258,7 +258,7 @@ function save_pref ( $prefs, $src ) { . ':' + . htmlspecialchars ( $s['APPLICATION_NAME'] ) . '">' . ( $s['APPLICATION_NAME'] == 'Title' ? str_replace ( 'XXX', translate ( 'Title' ), translate ( 'Translated Name (XXX)' ) ) : '' ) . ' @@ -267,13 +267,13 @@ function save_pref ( $prefs, $src ) { . ': + . '">
+ . '">
+ . htmlspecialchars ( $s['FONTS'] ) . '">
' . print_radio ( 'DISPLAY_SM_MONTH' ) . '
@@ -434,7 +434,7 @@ function save_pref ( $prefs, $src ) { . translate ( 'Conflict checking months' ) . ': + . htmlspecialchars ( $s['CONFLICT_REPEAT_MONTHS'] ) . '">
' . print_radio ( 'ALLOW_CONFLICT_OVERRIDE' ) . '
@@ -444,7 +444,7 @@ function save_pref ( $prefs, $src ) {
+ . htmlspecialchars ( $s['LIMIT_APPTS_NUMBER'] ) . '">
' . print_radio ( 'DISABLE_CROSSDAY_EVENTS' ) . '
@@ -495,7 +495,7 @@ function save_pref ( $prefs, $src ) {
+ . $s['SUMMARY_LENGTH'] . '">
@@ -543,7 +543,7 @@ function save_pref ( $prefs, $src ) {
+ . $s['OVERRIDE_PUBLIC_TEXT'] . '" size="25">
' . print_radio ( 'ENABLE_CAPTCHA' ) . '
@@ -590,7 +590,7 @@ function save_pref ( $prefs, $src ) {
' . translate('Upcoming Events') . ' - ' . htmlspecialchars( $SERVER_URL ) . 'upcoming.php
+ ' . htmlspecialchars( $SERVER_URL ) . 'upcoming.php
' . print_radio ( 'UPCOMING_EVENTS', '', '', 'N' ) . '
@@ -675,7 +675,7 @@ function save_pref ( $prefs, $src ) { . print_radio ( 'SELF_REGISTRATION_BLACKLIST' ) . '
' . print_radio ( 'SELF_REGISTRATION_FULL' ) . '

+ . ':' . print_radio ( 'SELF_REGISTRATION_FULL' ) . '

@@ -689,7 +689,7 @@ function save_pref ( $prefs, $src ) { . translate ( 'Admin and owner can always add attachments if enabled.' ) . '

' . print_checkbox ( ['ALLOW_ATTACH_PART', 'Y', $partyStr] ) . print_checkbox ( ['ALLOW_ATTACH_ANY', 'Y', $anyoneStr] ) - . '


+ . htmlspecialchars ( $EMAIL_FALLBACK_FROM ) . '">
+ . $s['SMTP_HOST'] . '">
+ . $s['SMTP_PORT'] . '">
@@ -738,11 +738,11 @@ function save_pref ( $prefs, $src ) {
+ . ( empty ( $s['SMTP_USERNAME'] ) ? '' : $s['SMTP_USERNAME'] ) . '">
+ . ( empty ( $s['SMTP_PASSWORD'] ) ? '' : $s['SMTP_PASSWORD'] ) . '">

' . translate ( 'Default user settings' ) . ':

' @@ -786,7 +786,7 @@ function save_pref ( $prefs, $src ) {

' . date_to_str ( date ( 'Ymd' ), $DATE_FORMAT_MY, false ) . '

' . display_month ( date ( 'm' ), date ( 'Y' ), true ) . ' - +

' . print_radio ( 'ALLOW_COLOR_CUSTOMIZATION' ) . '

@@ -794,7 +794,7 @@ function save_pref ( $prefs, $src ) { . translate ( 'Enable gradient images for background colors' ) . ':' . ( function_exists ( 'imagepng' ) || function_exists ( 'imagegif' ) ? print_radio ( 'ENABLE_GRADIENTS' ) : translate ( 'Not available' ) ) - . '


' . $color_sets . ' + . '


' . $color_sets . ' @@ -803,17 +803,17 @@ function save_pref ( $prefs, $src ) {

+ . ( empty ( $s['BGIMAGE'] ) ? '' : htmlspecialchars ( $s['BGIMAGE'] ) ) . '">

+ . ( empty ( $s['BGREPEAT'] ) ? '' : $s['BGREPEAT'] ) . '">

- +
diff --git a/adminhome.php b/adminhome.php index 771f3b817..0b1e9ac61 100644 --- a/adminhome.php +++ b/adminhome.php @@ -152,7 +152,7 @@ print_header( '', /* - ' If this is the proper way to call css_cacher.php from here? */ - ' - ' ); + ' + ' ); echo '

' . translate( 'Administrative Tools' ) . '

diff --git a/approve_entry.php b/approve_entry.php index c63c4ddda..bf041f24a 100644 --- a/approve_entry.php +++ b/approve_entry.php @@ -32,9 +32,9 @@ diff --git a/assistant_edit.php b/assistant_edit.php index 9426a4286..5f5d22134 100644 --- a/assistant_edit.php +++ b/assistant_edit.php @@ -11,17 +11,17 @@ $user = ( ( $is_admin || $is_nonuser_admin ) && $user ) ? $user : $login; print_header( '', ! $GROUPS_ENABLED == 'Y' ? '' : - '' ); + '' ); echo ' ' . csrf_form_key() . ( $user ? ' - ' : '' ) . ' + ' : '' ) . '

'; $assistStr = translate ( 'Assistants' ); if ( $is_nonuser_admin ) { nonuser_load_variables ( $user, 'nonuser' ); - echo $nonuserfullname . ' ' . $assistStr . '
+ echo $nonuserfullname . ' ' . $assistStr . '
' . translate ( 'Admin mode' ) . ''; } else echo translate ( 'Your assistants' ); @@ -29,7 +29,7 @@ echo '

' . display_admin_link() . ''; -echo '
'; // Get list of all users. $users = get_my_users(); @@ -50,7 +50,7 @@ continue; echo ' '; } @@ -58,16 +58,15 @@ if ( $GROUPS_ENABLED == 'Y' ) { echo ''; + . translate ( 'Select' ) . '...">'; } echo "
\n"; ?>
- +
- diff --git a/availability.php b/availability.php index b5f0f7f2a..802ee915c 100644 --- a/availability.php +++ b/availability.php @@ -68,17 +68,17 @@
+ . $prevStr . '"> + . $nextStr . '">
'; printf ( "%s, %s %d, %d", weekday_name ( strftime ( "%w", $time ) ), month_name ( $month - 1 ), $day, $year ); -echo '
+echo '
-

+
' . csrf_form_key() . daily_matrix ( $date, $users ) . ' diff --git a/category.php b/category.php index 2d3600f0a..388fa2aaa 100644 --- a/category.php +++ b/category.php @@ -40,7 +40,7 @@ // Try PNG if GIF not found if ( ! file_exists ( $catIcon ) ) $catIcon = $icon_path . 'cat-' . $id . '.png'; - $idStr = ''; + $idStr = ''; } else $catcolor = '#000000'; @@ -69,7 +69,7 @@
' . + . htmlspecialchars ($catname) . '">' . ($is_admin && empty ($id) ? '
-
+
-
-     +     + . '">
' : '' ) // end test of ENABLE_ICON_UPLOADS . '
' + . ( $add == '1' ? translate ('Add') : translate ('Save') ) . '">' . 'Cancel ' . ( ! empty ( $id ) ? ' ' : '' ) . ' + . '\' )">' : '' ) . '
'; } else @@ -145,14 +145,14 @@ } echo ( file_exists ( $catIcon ) ? '' - . $catIconStr . '' : '' ) . ''; + . $catIconStr . '" title="' . $catIconStr . '">' : '' ) . ''; } echo ' '; } echo ( $global_found ? '* ' . $globalStr : '' ) . '
' . translate ( 'Make New Category' ) - . '

'; + . '
'; } ?> diff --git a/catsel.php b/catsel.php index 1ba190002..dbd2e9d77 100644 --- a/catsel.php +++ b/catsel.php @@ -60,9 +60,9 @@ echo ' + . '> + . '" onclick="sendCats()"> + . translate ( 'Cancel' ) . '" onclick="window.close()">
- - + +
    + . '">    + . translate( 'Approve and Exit' ) . '">
- '; if ( strlen ( $cats ) ) { @@ -82,15 +82,15 @@ echo ' + . '" onclick="selRemove()">
*' . translate ( 'Global Category' ) . '      
diff --git a/docadd.php b/docadd.php index ae759df30..0cc11e7d6 100644 --- a/docadd.php +++ b/docadd.php @@ -143,7 +143,7 @@ if ( ! empty ( $_FILES['FileName'] ) ) $file = $_FILES['FileName']; if ( empty ( $file['file'] ) ) - $error = 'File Upload error!
'; + $error = 'File Upload error!
'; //print_r ( $file ); exit; $mimetype = $file['type']; @@ -203,20 +203,20 @@ ?>
- - + + - + +
-
@@ -225,22 +225,21 @@ ?>
- - + + - + +
- +
-
- diff --git a/edit_entry.php b/edit_entry.php index 4a3fc41d0..35831144c 100644 --- a/edit_entry.php +++ b/edit_entry.php @@ -81,10 +81,10 @@ function time_selection($prefix, $time = '', $trigger = false) return $ret . ($found ? '' : '') . '' . ($TIME_FORMAT == '12' ? ' ' : ''); + . $prefix . 'ampmP" value="12" ' . $pmsel . '> ' . translate('pm') + . ' ' : ''); } $daysStr = translate('days'); @@ -97,8 +97,8 @@ function time_selection($prefix, $time = '', $trigger = false) // Make sure this is not a read-only calendar. $can_edit = false; $others_complete = 'yes'; -$checked = ' checked="checked"'; -$selected = ' selected="selected"'; +$checked = ' checked'; +$selected = ' selected'; $eType = getGetValue('eType','event',true); $id = getGetValue('id'); @@ -437,7 +437,7 @@ function time_selection($prefix, $time = '', $trigger = false) if (empty($cal_url)) $cal_url = ''; -if (empty($description) || $description == '
') +if (empty($description) || $description == '
') $description = ''; if (empty($duration)) @@ -530,7 +530,7 @@ function time_selection($prefix, $time = '', $trigger = false) ?>

 <?php etranslate('Help'); ?>

+ 'cal_help', 'dependent,menubar,scrollbars,height=400,width=400,innerHeight=420,outerWidth=420');">
- + - + - + - - + + - + - + @@ -599,7 +599,7 @@ function time_selection($prefix, $time = '', $trigger = false) - + @@ -642,15 +642,15 @@ function time_selection($prefix, $time = '', $trigger = false)
- - - + + +
-
+
@@ -703,19 +703,19 @@ function time_selection($prefix, $time = '', $trigger = false)
- + - + - + " />: + } ?>">: " /> + } ?>">  (: ) @@ -807,18 +807,18 @@ function time_selection($prefix, $time = '', $trigger = false) ? $extra_arg2 : $extras[$extra_name]['cal_data']); echo '
' - . ($extra_type == EXTRA_MULTILINETEXT ? '
' : '') + . ($extra_type == EXTRA_MULTILINETEXT ? '
' : '') . translate($extra_descr) . ':		 '; if ($extra_type == EXTRA_URL) echo ''; + ? '' : htmlspecialchars($extras[$extra_name]['cal_data'])) . '">'; elseif ($extra_type == EXTRA_EMAIL) echo ''; + ? '' : htmlspecialchars($extras[$extra_name]['cal_data'])) . '">'; elseif ($extra_type == EXTRA_DATE) echo date_selection( $extra_name, @@ -829,7 +829,7 @@ function time_selection($prefix, $time = '', $trigger = false) $size = ($extra_arg1 > 0 ? $extra_arg1 : 50); echo ''; + ? '' : htmlspecialchars($extras[$extra_name]['cal_data'])) . '">'; } elseif ($extra_type == EXTRA_MULTILINETEXT) { echo '
+ . '
- ' + . '" onclick="window.close();"> + ' . ( ! empty ( $user ) ? ' ' + . translate( 'Are you sure you want to delete this entry?' ) . '\');">' : '' ) . ' ' ) . "\n" . print_trailer ( false, true, true ); diff --git a/events_ajax.php b/events_ajax.php index a6e9e637e..ffbd0a40e 100644 --- a/events_ajax.php +++ b/events_ajax.php @@ -109,7 +109,7 @@ $wkstart = get_weekday_before ( $startyear, $startmonth ); $startTime = $wkstart; if ( $debug ) - echo "startdate: $startdate
enddate: $enddate
startTime: $startTime
"; + echo "startdate: $startdate
enddate: $enddate
startTime: $startTime
"; $repeated_events = read_repeated_events ( $user, $startTime, $endTime ); /* Pre-load the non-repeating events for quicker access */ $events = read_events ( $user, $startTime, $endTime ); @@ -400,7 +400,7 @@ function load_category_ids ( $ids ) //$ids = array_unique ( sort ( $ids, SORT_NUMERIC ) ); $idList = implode ( ",", $ids ); if ( $debug ) - echo "load_category_ids: $idList
\n\n"; + echo "load_category_ids: $idList
\n\n"; $sql = 'SELECT cal_id, cat_id FROM webcal_entry_categories WHERE cal_id IN ( ' . $idList . ' ) @@ -408,7 +408,7 @@ function load_category_ids ( $ids ) OR cat_owner IS NULL ) ORDER BY cat_order'; if ( $debug ) - echo "SQL: $sql
"; + echo "SQL: $sql
"; $res = dbi_execute ( $sql, [] ); $eventCats = []; if ( $res ) { diff --git a/export.php b/export.php index 1c0314abe..021194841 100644 --- a/export.php +++ b/export.php @@ -21,7 +21,7 @@ $dateY = date ( 'Y' ); $yearAgo = time () - 365 * 24 * 3600; $dateYearAgo = date('Ymd', $yearAgo); -$selected = ' selected="selected" '; +$selected = ' selected '; print_header('', '', 'onload="updateDateFields();"' ); echo '

' . translate ( 'Export' ) . '

@@ -63,7 +63,7 @@ 		  + . 'value="y">   + . 'value="y">   + . 'value="y" checked onclick="toggle_datefields( \'dateArea\', this );">
'; @@ -121,7 +121,7 @@ function updateDateFields () { $('#dateArea').hide(); } } - + function toggle_datefields( name, ele ) { updateDateFields(); } diff --git a/export_handler.php b/export_handler.php index edd8dee50..baca72390 100644 --- a/export_handler.php +++ b/export_handler.php @@ -271,7 +271,7 @@ function transmit_header( $mime, $file ) { echo '

' . translate ( 'Export' ) . ' ' . $errorStr . '

' . $errorStr . ': ' - . translate( 'export format not defined or incorrect.' ) . '
+ . translate( 'export format not defined or incorrect.' ) . '
' . print_trailer(); } //end if ($format == "ical") diff --git a/groups.php b/groups.php index 88d2b2709..d49fff6f1 100644 --- a/groups.php +++ b/groups.php @@ -61,7 +61,7 @@
- +
@@ -81,11 +81,11 @@
- - + +
- +
@@ -102,7 +102,7 @@ } else { $users = array_merge(get_my_users(), get_nonuser_cals($login)); } - } + } foreach ($users as $user) { echo '\n"; } @@ -111,8 +111,8 @@
- " /> - " onclick="save_handler();" /> + "> + " onclick="save_handler();">
@@ -134,16 +134,16 @@
- +
- +

- " /> - + "> +
diff --git a/help_bug.php b/help_bug.php index 1b47eaa98..e78a116af 100644 --- a/help_bug.php +++ b/help_bug.php @@ -18,7 +18,7 @@ . str_replace ('XXX', translate ( get_browser_language ( true ) ), translate ( 'Also, please use English rather than XXX.' ) ) : '' ) . '

- +

' . translate ( 'System Settings' ) . '

'; diff --git a/icons.php b/icons.php index 3208283d8..2733af76d 100644 --- a/icons.php +++ b/icons.php @@ -45,7 +45,7 @@ echo ' ' . $title_str . '' + . $title_str . '" alt="' . $title_str . '">' . ($i > 0 && $i % 8 == 0 ? ' ' : ''); @@ -58,4 +58,4 @@ - \ No newline at end of file + diff --git a/import.php b/import.php index f156d5bd4..488fc534b 100644 --- a/import.php +++ b/import.php @@ -40,7 +40,7 @@ function print_user_list() { $users .= ' '; } @@ -66,7 +66,7 @@ function print_categories() { if ( $CATEGORIES_ENABLED = 'Y' ) { $cat_options = ' - '; load_user_categories(); @@ -107,7 +107,7 @@ function print_categories() { echo '

' . translate ( 'Import' ) . ' ' . translate ( 'Help' ) . '

'; + . 'dependent,menubar,scrollbars,height=400,width=400\' );">'; if ( ! $upload_enabled ) // The php.ini file does not have file_uploads enabled, @@ -141,9 +141,9 @@ function print_categories() { -

'; +
'; } /** @@ -1266,10 +1266,10 @@ function display_small_month ( $thismonth, $thisyear, $showyear, + . '">' . $prevStr . ' ' + . '">' . $nextStr . '' . date_to_str ( sprintf ( "%04d%02d%02d", $thisyear, $thismonth, 1 ), ( $showyear != '' ? $DATE_FORMAT_MY : '__month__' ), false ) . ' @@ -1286,10 +1286,10 @@ function display_small_month ( $thismonth, $thisyear, $showyear, + . '">' . $prevStr . ' ' + . '">' . $nextStr . '' . date_to_str ( sprintf ( "%04d%02d%02d", $thisyear, $thismonth, 1 ), ( $showyear != '' ? $DATE_FORMAT_MY : '__month__' ), false ) . ' @@ -1421,11 +1421,11 @@ function display_small_tasks ( $cat_id ) { for ( $i = 0; $i < 4; $i++ ) { $ajax[$i] = ' '; + . ', this )">'; $ajax[$i + 4] = ' '; + . ', this )">'; } } else { $dueSpacer = '         '; @@ -1444,7 +1444,7 @@ function display_small_tasks ( $cat_id ) { ' . translate ( 'TASKS' ) . ' + + . '">+ ! ' . $ajax[0] . ' @@ -1652,7 +1652,7 @@ function display_unapproved_events ( $user ) { ? '' . str_replace ( 'XXX', $row[0], - translate ( 'You have XXX unapproved entries' ) ) . "
\n" + translate ( 'You have XXX unapproved entries' ) ) . "
\n" : // Return something that won't display in bottom menu // but still has strlen > 0. '' ); @@ -1719,7 +1719,7 @@ function do_redirect ( $url ) { if ( ( substr ( $SERVER_SOFTWARE, 0, 5 ) == 'Micro' ) || ( substr ( $SERVER_SOFTWARE, 0, 3 ) == 'WN/' ) ) $meta = ' - '; + '; else header ( 'Location: ' . $url ); @@ -1835,9 +1835,9 @@ function event_get_external_users ( $event_id, $use_mailto = 0 ) { * @ignore */ function fake_mail ( $mailto, $subj, $text, $hdrs ) { - echo 'To: ' . $mailto . '
-Subject: ' . $subj . '
-' . nl2br ( $hdrs ) . '
+ echo 'To: ' . $mailto . '
+Subject: ' . $subj . '
+' . nl2br ( $hdrs ) . '
' . nl2br ( $text ); } @@ -1864,7 +1864,7 @@ function generate_activity_log ( $id = '', $sys = false, $startid = '' ) { . ( $sys ? translate ( 'System Log' ) : translate ( 'Activity Log' ) ) . ( $sys ? '' : '  ' . 'RSS 2.0 - ' - . translate( 'Activity Log' ) . '' ) + . translate( 'Activity Log' ) . '">' ) . "" . display_admin_link(false) . ' @@ -2002,7 +2002,7 @@ function generate_refresh_meta() { ? ' ' : '' ); + . '; url=' . addslashes(htmlentities($REQUEST_URI)) . '">' : '' ); } /** @@ -2140,7 +2140,7 @@ function get_all_dates ( $date, $rpt_type, $interval = 1, $ByMonth = '', for ( $i=$WkstDay; $i<=( $WkstDay + 6 ); $i++ ) { $td = $cdate + ( $i * 86400 ); $tdDay = date ( 'w', $td ); - //echo $Count . ' ' . $n . ' ' .$WkstDay .'
'; + //echo $Count . ' ' . $n . ' ' .$WkstDay .'
'; if ( in_array( $byday_names[$tdDay], $byday ) && $td >= $date && $td <= $realend && $n < $Count ) $ret[$n++] = $td; @@ -3657,11 +3657,11 @@ function html_for_event_day_at_a_glance ( $event, $date ) { if ( $getCat > 0 && file_exists ( $catIcon ) ) { $catAlt = translate ( 'Category' ) . ': ' . $categories[$getCat]['cat_name']; $hour_arr[$ind] .= '' . $catAlt - . ''; + . '" title="' . $catAlt . '">'; } if ( $getCalTypeName == 'task' ) { - $hour_arr[$ind] .= '* '; + $hour_arr[$ind] .= '* '; $view_text = translate ( 'View this task' ); } @@ -3734,7 +3734,7 @@ function html_for_event_day_at_a_glance ( $event, $date ) {
' . ( ! empty ( $ALLOW_HTML_DESCRIPTION ) && $ALLOW_HTML_DESCRIPTION == 'Y' ? $getDesc : strip_tags ( $getDesc ) ) . '
- ' : '' ) . "
\n"; + ' : '' ) . "
\n"; } /** @@ -3816,7 +3816,7 @@ function html_for_event_week_at_a_glance ( $event, $date, if ( $getCat > 0 && file_exists ( $catIcon ) ) { $catAlt = translate ( 'Category' ) . ': ' . $categories[$getCat]['cat_name']; $hour_arr[$ind] .= '' . $catAlt - . ''; + . '" title="' . $catAlt . '">'; } // Build entry link if UAC permits viewing. @@ -3825,12 +3825,12 @@ function html_for_event_week_at_a_glance ( $event, $date, $href = 'href="view_entry.php?id=' . $id . '&date=' . ( $getClone ? $getClone : $date ); if ( $getCalTypeName == 'task' ) { - $hour_arr[$ind] .= '* '; + $hour_arr[$ind] .= '* '; $title .= translate ( 'View this task' ); } else { // Must be event. if ( $isAllDay || $isUntime && $catAlt == '' ) - $hour_arr[$ind] .= '* '; + $hour_arr[$ind] .= '* '; $title .= translate ( 'View this event' ); } @@ -3899,7 +3899,7 @@ function html_for_event_week_at_a_glance ( $event, $date, . ( empty ( $in_span ) ? '' : '' )// End color span. . ( $getPri == 3 ? '' : '' ) . '' // . ( $DISPLAY_ICONS == 'Y' ? icon_text ( $id, true, true ) : '' ) - . "
\n"; + . "
\n"; } /** @@ -4498,9 +4498,9 @@ function print_category_menu ( $form, $date = '', $cat_id = '' ) { ' . ( empty ( $date ) ? '' : ' ' ) + . '" value="' . $date . '">' ) . ( ! empty ( $user ) && $user != $login ? ' - ' : '' ) + ' : '' ) . $catStr . ': ' ); + ' ); if( ! empty( $id ) && $id = 'dito' ) $id = $vals[0]; if( empty( $checked ) ) { - $checked = ' checked="checked"'; + $checked = ' checked'; $No = translate( 'No' ); $Yes = translate( 'Yes' ); } @@ -4571,7 +4571,7 @@ function print_checkbox( $vals, $id = '', $onchange = '' ) { . '" ' . ( empty( $id ) ? '' : 'id="' . $id . '" ' ) . ( $setting == $vals[1] ? $checked : '' ) . ( empty( $onchange ) ? '' : ' onchange="' . $onchange . '()"' ) - . ' /> ' . $vals[2] . ''; + . '> ' . $vals[2] . ''; } /** @@ -4589,7 +4589,7 @@ function print_color_input_html ($varname, $title, $varval = '', $id='', $tag='d $id = empty($id) ? $varname : $id; // TODO: Get the text input box working so users can input RGB values. //$textId = $id . 'RGB'; - //return '
' . + //return '
' . // '' . $newEntryStr - . '' : '' ) . ' + . '" class="new">' : '' ) . ' ' . substr ( $date, 6, 2 ) . '' . ( empty ( $tmp ) ? '' : '' . $moon_title . '' ) . "
\n"; + . '" alt="' . $moon_title . '">' ) . "
\n"; $cnt++; } // Get, combime and sort the events for this date. @@ -4713,7 +4713,7 @@ function print_day_at_a_glance ( $date, $user, $can_add = 0 ) { $TIME_SLOTS, $today, $TODAYCELLBG, $WORK_DAY_END_HOUR, $WORK_DAY_START_HOUR; if ( empty ( $TIME_SLOTS ) ) - return translate ( 'Error TIME_SLOTS undefined!' ) . "
\n"; + return translate ( 'Error TIME_SLOTS undefined!' ) . "
\n"; $get_unapproved = ( $DISPLAY_UNAPPROVED == 'Y' ); // Get, combine and sort the events for this date. @@ -4758,7 +4758,7 @@ function print_day_at_a_glance ( $date, $user, $can_add = 0 ) { // This will move entries apart that appear in one field, // yet start on different hours. for ( $u = $diff_start_time; $u > 0; $u-- ) { - $hour_arr[$last_row] .= "
\n"; + $hour_arr[$last_row] .= "
\n"; } $hour_arr[$last_row] .= $hour_arr[$i]; $hour_arr[$i] = ''; @@ -4916,14 +4916,14 @@ function print_entry ( $event, $date ) { if ( empty ( $catIcon ) ) $ret .= 'images/' . $icon . '" class="bullet" alt="' . $view_text - . '" width="5" height="7" />'; + . '" width="5" height="7">'; else { // Use category icon. $catAlt = ( empty ( $categories[$catNum] ) ? '' : translate ( 'Category' ) . ': ' . $categories[$catNum]['cat_name'] ); - $ret .= $catIcon . '" alt="' . $catAlt . '" title="' . "$catAlt\" />"; + $ret .= $catIcon . '" alt="' . $catAlt . '" title="' . "$catAlt\">"; } if ( $login != $loginStr && strlen ( $loginStr ) ) { @@ -4965,11 +4965,11 @@ function print_entry ( $event, $date ) { // Added to allow a small location to be displayed if wanted. . ( ! empty ( $location ) && ! empty ( $DISPLAY_LOCATION ) && $DISPLAY_LOCATION == 'Y' - ? '
(' + ? '
(' . htmlspecialchars ( $location ) . ')' : '' ) . ( $in_span == true ? '' : '' ) . '' . ( $event->getPriority() < 4 ? '' : '' ) // end font-weight span - . '
'; + . '
'; } /** @@ -5019,7 +5019,7 @@ function print_not_auth ( $full = false ) { * if empty ( Yes/No options will be displayed ) * @param string $onclick javascript function to call if needed * @param string $defIdx default array index to select - * @param string $sep HTML value between radio options ( ,
) + * @param string $sep HTML value between radio options ( ,
) * * @return string HTML for the radio control. */ @@ -5031,7 +5031,7 @@ function print_radio ( $variable, $vals = '', $onclick = '', $defIdx = '', $ret = ''; $setting = $defIdx; if ( empty ( $checked ) ) { - $checked = ' checked="checked"'; + $checked = ' checked'; $No = translate ( 'No' ); $Yes = translate ( 'Yes' ); } @@ -5055,7 +5055,7 @@ function print_radio ( $variable, $vals = '', $onclick = '', $defIdx = '', $ret .= ' ' . $V; + . ( $setting == $K ? $checked : '' ) . $onclickStr . '>' . $V; } return $ret; } @@ -5105,7 +5105,7 @@ function print_timezone_select_html ( $prefix, $tz ) { for ( $i = -12; $i <= 13; $i++ ) { $ret .= ' '; @@ -5137,7 +5137,7 @@ function print_timezone_select_html ( $prefix, $tz ) { for ( $i = 0, $cnt = count ( $timezones ); $i < $cnt; $i++ ) { $ret .= ' '; } $ret .= ' @@ -6242,7 +6242,7 @@ function build_entry_popup ( $popupid, $user, $description, $time, str_replace ( '&amp;', '&', str_replace ( '&', '&', $description ) ) ); // If there is no HTML found, then go ahead and replace - // the line breaks ("\n") with the HTML break ("
"). + // the line breaks ("\n") with the HTML break ("
"). $ret .= ( strstr ( $str, '<' ) && strstr ( $str, '>' ) ? $str : nl2br ( $str ) ); } else @@ -6399,7 +6399,7 @@ function print_error_box ( $msg ) echo '
' . '
' . '' . - translate ( 'Error' ) . '' . + translate ( 'Error' ) . '">' . translate('The permissions for the icons directory are set to read-only') . "
\n"; } diff --git a/includes/gradient.php b/includes/gradient.php index 062b03bda..8fa7f6b7d 100644 --- a/includes/gradient.php +++ b/includes/gradient.php @@ -349,7 +349,7 @@ function create_image ( $file_name, $base = '', $height = '', $percent = '', } else imagegif ( $image, $file_name ); } else - echo 'No image formats supported!
' . "\n"; + echo 'No image formats supported!
' . "\n"; imagedestroy ( $image ); return; @@ -373,7 +373,7 @@ function rgb2hsl ( $rgb ) { if ( $deltaMax == 0 ) //This is a gray, no chroma... { - $H = 0; //HSL results = 0 ÷ 1 + $H = 0; //HSL results = 0 ≈ 1 $S = 0; } else //Chromatic data... diff --git a/includes/index.html b/includes/index.html index 0bd9be31b..1ba05a061 100644 --- a/includes/index.html +++ b/includes/index.html @@ -5,7 +5,7 @@

Not Found

- The requested URL was not found on this server.
-
+ The requested URL was not found on this server.
+
diff --git a/includes/index.php b/includes/index.php index 0bd9be31b..1ba05a061 100644 --- a/includes/index.php +++ b/includes/index.php @@ -5,7 +5,7 @@

Not Found

- The requested URL was not found on this server.
-
+ The requested URL was not found on this server.
+
diff --git a/includes/init.php b/includes/init.php index 8df1cb20a..b1867d2fa 100644 --- a/includes/init.php +++ b/includes/init.php @@ -185,7 +185,7 @@ function print_header( $includes = '', $HeadX = '', $BodyX = '', " top.location = self.location;\n" . " }\n" . "\n"; - + $ret .= $ASSETS; @@ -211,7 +211,7 @@ function print_header( $includes = '', $HeadX = '', $BodyX = '', // Not added to $cs_ar because I think we want these, // even if $disableStyle. $cs_ret .= ' - '; + '; } elseif( substr( $inc, 0, 12 ) == 'js/popups.js' && ! empty( $DISABLE_POPUPS ) && $DISABLE_POPUPS == 'Y' ) { // Don't load popups.js if DISABLE_POPUPS. @@ -256,15 +256,15 @@ function print_header( $includes = '', $HeadX = '', $BodyX = '', // the current user has permissions to approve for, but I'm thinking // that's too many db requests to repeat on every page. - $ret .= $tmp_l . $tmp_f . '?' . filemtime( $tmp_f ) . $tmp . $login . '" />' + $ret .= $tmp_l . $tmp_f . '?' . filemtime( $tmp_f ) . $tmp . $login . '">' . ( $is_admin && $PUBLIC_ACCESS == 'Y' ? $tmp_l . $tmp_f . '?user=public&' . filemtime( $tmp_f ) . $tmp . translate( $PUBLIC_ACCESS_FULLNAME ) - . '" />' : '' ); + . '">' : '' ); } if( $is_admin ) { $tmp_f = 'rss_activity_log.php'; $ret .= $tmp_l . $tmp_f . '?' . filemtime( $tmp_f ) . '" rel="alternate"' - . ' title="' . $appStr . ' - ' . translate('Activity Log') . '" />'; + . ' title="' . $appStr . ' - ' . translate('Activity Log') . '">'; } if( ! $disableStyle ) { // Check the CSS version for cache clearing if needed. @@ -278,13 +278,13 @@ function print_header( $includes = '', $HeadX = '', $BodyX = '', '; + . '&css_cache=' . $webcalendar_csscache . '" rel="stylesheet">'; foreach( $cs_ar as $c ) { $i = 'includes/' . $c; $ret .= ' ' . "\n"; + ? ' media="print"' : '' ) . '>' . "\n"; } } echo $ret . $cs_ret @@ -298,13 +298,13 @@ function print_header( $includes = '', $HeadX = '', $BodyX = '', $tmp_l . 'rss.php?' . filemtime( 'rss.php' ) /* TODO: single-user mode, etc. */ . ( $login != '__public__' ? '&user=' . $login : '' ) - . '" rel="alternate" title="' . $appStr . ' [RSS 2.0]" />' : '' ) + . '" rel="alternate" title="' . $appStr . ' [RSS 2.0]">' : '' ) // Do we need anything else inside the header tag? // $HeadX moved here because linked CSS may override standard styles. . ( $HeadX ? ' ' . $HeadX : '' ) . ' + . filemtime( 'favicon.ico' ) . '" rel="shortcut icon"> ' . 'Valid XHTML 1.0!

' : '' )/* Close HTML page properly. */ . ' + . 'class="valid">

' : '' )/* Close HTML page properly. */ . ' '; diff --git a/includes/menu.php b/includes/menu.php index af1547f87..3e972fa89 100644 --- a/includes/menu.php +++ b/includes/menu.php @@ -11,7 +11,7 @@ $PUBLIC_ACCESS_ADD_NEEDS_APPROVAL, $PUBLIC_ACCESS_CAN_ADD, $PUBLIC_ACCESS_OTHERS, $readonly, $REMOTES_ENABLED, $REPORTS_ENABLED, $REQUIRE_APPROVALS, $show_printer, $single_user, $START_VIEW, $thisday, - $thismonth, $thisyear, $use_http_auth, $user, $user_fullname, $views, + $thismonth, $thisyear, $use_http_auth, $user, $user_fullname, $views, $OVERRIDE_PUBLIC, $GROUPS_ENABLED; /* ----------------------------------------------------------------------------- @@ -492,8 +492,8 @@ @@ -317,7 +317,7 @@ $tret .= '
Executed queries:' . dbi_num_queries() . '   Cached queries:' . dbi_num_cached_queries() - . "
    \n"; + . "
      \n"; $log = $GLOBALS['SQLLOG']; // $log=0; $logcnt = count ( $log ); diff --git a/includes/translate.php b/includes/translate.php index f5ce6c03c..47c7761f3 100644 --- a/includes/translate.php +++ b/includes/translate.php @@ -220,7 +220,7 @@ function load_translation_text() { if ( ! is_dir ( $cache_tran_dir ) ) die_miserable_death ( 'Error creating translation cache directory: "' . $cache_tran_dir - . '"

      Please check the permissions of the directory: "' + . '"

      Please check the permissions of the directory: "' . $cachedir . '"' ); */ } diff --git a/includes/validate.php b/includes/validate.php index b278255b1..ee6e901e4 100644 --- a/includes/validate.php +++ b/includes/validate.php @@ -8,7 +8,7 @@ function doDbSanityCheck() { global $db_database, $db_host, $db_login; $dieMsgStr = 'Error finding WebCalendar tables in database "' . $db_database . '" using db login "' . $db_login . '" on db server "' . $db_host - . '".

      + . '".

      Have you created the database tables as specified in the WebCalendar System Administrator\'s Guide?'; diff --git a/includes/xcal.php b/includes/xcal.php index f4f5fbe0a..d74cacd98 100644 --- a/includes/xcal.php +++ b/includes/xcal.php @@ -1468,7 +1468,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { $Entry['Description'] = str_replace ( "\;", ";", $Entry['Description'] ); $Entry['Description'] = str_replace ( "\,", ",", $Entry['Description'] ); // Mozilla will send this goofy string, so replace it with real html - $Entry['Description'] = str_replace ( '=0D=0A=', '
      ', + $Entry['Description'] = str_replace ( '=0D=0A=', '
      ', $Entry['Description'] ); $Entry['Description'] = str_replace ( '=0D=0A', '', $Entry['Description'] ); @@ -1550,7 +1550,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { $sql = 'INSERT INTO webcal_import_data ( cal_import_id, cal_id, cal_login, cal_import_type, cal_external_id ) VALUES ( ?, ?, ?, ?, ? )'; - $sqlLog .= $sql . "
      \n"; + $sqlLog .= $sql . "
      \n"; if ( ! dbi_execute ( $sql, [$importId, $id, $calUser, 'palm', $Entry['RecordID']] ) ) { $error = db_error(); @@ -1563,7 +1563,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { $sql = 'INSERT INTO webcal_import_data ( cal_import_id, cal_id, cal_login, cal_import_type, cal_external_id ) VALUES ( ?, ?, ?, ?, ? )'; - $sqlLog .= $sql . "
      \n"; + $sqlLog .= $sql . "
      \n"; if ( ! dbi_execute ( $sql, [$importId, $id, $calUser, 'vcal', $uid] ) ) { $error = db_error(); break; @@ -1576,7 +1576,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { $sql = 'INSERT INTO webcal_import_data ( cal_import_id, cal_id, cal_login, cal_import_type, cal_external_id ) VALUES ( ?, ?, ?, ?, ? )'; - $sqlLog .= $sql . "
      \n"; + $sqlLog .= $sql . "
      \n"; if ( ! dbi_execute ( $sql, [$importId, $id, $calUser, 'ical', $uid] ) ) { $error = db_error(); break; @@ -1589,7 +1589,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { $sql = 'INSERT INTO webcal_import_data ( cal_import_id, cal_id, cal_login, cal_import_type, cal_external_id ) VALUES ( ?, ?, ?, ?, ? )'; - $sqlLog .= $sql . "
      \n"; + $sqlLog .= $sql . "
      \n"; if ( ! dbi_execute ( $sql, [$importId, $id, $calUser, 'gitlog', $uid] ) ) { $error = db_error(); break; @@ -1738,7 +1738,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { if ( ! dbi_execute ( $sql, $sql_params ) ) { $error = 'Unable to add to webcal_entry_repeats: ' - . dbi_error() . "

      \nSQL: $sql"; + . dbi_error() . "

      \nSQL: $sql"; break; } // Repeating Exceptions... @@ -1750,7 +1750,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { if ( ! dbi_execute ( $sql, [$id, $ex_date, 1] ) ) { $error = 'Unable to add to webcal_entry_repeats_not: ' . - dbi_error() . "

      \nSQL: $sql"; + dbi_error() . "

      \nSQL: $sql"; break; } } @@ -1764,7 +1764,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { if ( ! dbi_execute ( $sql, [$id, $inc_date, 0] ) ) { $error = 'Unable to add to webcal_entry_repeats_not: ' . - dbi_error() . "

      \nSQL: $sql"; + dbi_error() . "

      \nSQL: $sql"; break; } } @@ -1836,7 +1836,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { if ($silent) { $errormsg .= $error; } else { - echo print_error ( $error ) . "\n
      \n"; + echo print_error ( $error ) . "\n
      \n"; } } if ( $Entry['Duration'] > 0 ) { @@ -1857,14 +1857,14 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { echo ' (' . $dd; if ( ! empty ( $time ) ) echo '  ' . $time; - echo ")
      \n"; + echo ")
      \n"; etranslate ( 'conflicts with the following existing calendar entries' ); echo ":
        \n" . $overlap . "
      \n"; } else { // No Conflict if ( $count_suc == 0 && ! $silent ) { echo '

      ' . - translate ( 'Event Imported' ) . ":


      \n"; + translate ( 'Event Imported' ) . ":
      \n"; } $count_suc++; @@ -1881,7 +1881,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { echo '  ' . translate ( 'All day event' ); else if ( ! empty ( $time ) ) echo '  ' . $time; - echo ")

      \n"; + echo ")

      \n"; } } // Reset Variables @@ -1907,7 +1907,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { if ($silent) { $errormsg .= "\n" . db_error(); } else { - echo db_error() . "
      \n"; + echo db_error() . "
      \n"; } } } @@ -1915,7 +1915,7 @@ function import_data ( $data, $overwrite, $type, $silent=false ) { for ( $i = 0; $i < $oldidcnt; $i++ ) { $sql = "UPDATE webcal_entry_user SET cal_status = 'D' " . "WHERE cal_id = ?"; - $sqlLog .= $sql . "
      \n"; + $sqlLog .= $sql . "
      \n"; dbi_execute ( $sql, [$oldIds[$i]] ); $numDeleted++; } @@ -1972,7 +1972,7 @@ function parse_ical ( $cal_file, $source = 'file' ) { // send error message if you can $errormsg .= "Cannot read file: $e"; return []; - } + } if (!$fd && stripos($cal_file, "http") == 0) { // Try curl instead so we can ignore cert errors $data = curl_download($cal_file); @@ -2017,9 +2017,9 @@ function parse_ical ( $cal_file, $source = 'file' ) { do_debug ( "Read $cnt lines of data, but got no data :-(" ); do_debug( "Informing user of PHP server bug (PHP v" . phpversion() . ")" ); // Note: Mozilla Calendar does not display this error for some reason. - echo '
      Error: Your PHP server ' . phpversion() + echo '
      Error: Your PHP server ' . phpversion() . ' seems to have a bug reading stdin. ' - . 'Try upgrading to a newer PHP release.
      '; + . 'Try upgrading to a newer PHP release.
      '; exit; } } @@ -2053,14 +2053,14 @@ function parse_ical ( $cal_file, $source = 'file' ) { // a CRLF and then a single white space character. // We will allow it to be CRLF, CR or LF or any repeated sequence // so long as there is a single white space character next. - // echo "Orig:
      $data


      \n"; - // Special cases for stupid Sunbird wrapping every line! + // echo "Orig:
      $data


      \n"; + // Special cases for stupid Sunbird wrapping every line! $data = preg_replace ( "/[\r\n]+[\t ];/", ";", $data ); $data = preg_replace ( "/[\r\n]+[\t ]:/", ":", $data ); $data = preg_replace ( "/[\r\n]+[\t ]/", "", $data ); $data = preg_replace ( "/[\r\n]+/", "\n", $data ); - // echo "Data:
      $data

      "; + // echo "Data:

      $data

      "; // reflect the section where we are in the file: // VEVENT, VTODO, VJORNAL, VFREEBUSY, VTIMEZONE $state = 'NONE'; @@ -2087,11 +2087,11 @@ function parse_ical ( $cal_file, $source = 'file' ) { // do_debug ( "Product ID: " . $prodid ); } // parser debugging code... - // echo "line = $line
      "; - // echo "state = $state
      "; - // echo "substate = $substate
      "; - // echo "subsubstate = $subsubstate
      "; - // echo "buff = " . htmlspecialchars ( $buff ) . "

      \n"; + // echo "line = $line
      "; + // echo "state = $state
      "; + // echo "substate = $substate
      "; + // echo "subsubstate = $subsubstate
      "; + // echo "buff = " . htmlspecialchars ( $buff ) . "

      \n"; if ( $state == 'VEVENT' || $state == 'VTODO' ) { if ( ! empty ( $subsubstate ) ) { if ( preg_match ( '/^END.*:(.+)$/i', $buff, $match ) ) { @@ -2239,7 +2239,7 @@ function parse_ical ( $cal_file, $source = 'file' ) { if ( $substate != 'none' ) { $event[$substate] .= $match[1]; } else { - $errormsg .= "iCal parse error on line $line:
      $buff\n"; + $errormsg .= "iCal parse error on line $line:
      $buff\n"; $error = true; } // For unsupported properties @@ -2349,7 +2349,7 @@ function parse_hcal ( $hcal_array ) { // set default UID $event['uid'] = generate_uid ( 1 ); // parser debugging code... - // echo "buff = " . htmlspecialchars ( $buff ) . "

      \n"; + // echo "buff = " . htmlspecialchars ( $buff ) . "

      \n"; if ( $key == 'SUMMARY' ) { $substate = 'summary'; $event[$substate] = $value; @@ -2744,7 +2744,7 @@ function format_ical ( $event ) { // first remove any UNTIL that may have been calculated above unset ( $fevent['Repeat']['Until'] ); // split into pieces - // echo "RRULE line: $event[rrule]
      \n"; + // echo "RRULE line: $event[rrule]
      \n"; $RR = explode ( ';', $event['rrule'] ); // create an associative array of key-value pairs in $RR2[] $rrcnt = count ( $RR ); @@ -2767,7 +2767,7 @@ function format_ical ( $event ) { // but don't overwrite Manual setting from above if ( $fevent['Repeat']['Frequency'] != 7 ) $fevent['Repeat']['Frequency'] = 0; - echo "Unsupported iCal FREQ value \"$match[1]\"
      \n"; + echo "Unsupported iCal FREQ value \"$match[1]\"
      \n"; // Abort this import return; } @@ -2782,13 +2782,13 @@ function format_ical ( $event ) { $fevent['Repeat']['Count'] = $match[1]; } else if ( preg_match ( "/^BYSECOND=(.+)$/i", $RR[$i], $match ) ) { // NOT YET SUPPORTED -- TODO - echo "Unsupported iCal BYSECOND value \"$RR[$i]\"
      \n"; + echo "Unsupported iCal BYSECOND value \"$RR[$i]\"
      \n"; } else if ( preg_match ( "/^BYMINUTE=(.+)$/i", $RR[$i], $match ) ) { // NOT YET SUPPORTED -- TODO - echo "Unsupported iCal BYMINUTE value \"$RR[$i]\"
      \n"; + echo "Unsupported iCal BYMINUTE value \"$RR[$i]\"
      \n"; } else if ( preg_match ( "/^BYHOUR=(.+)$/i", $RR[$i], $match ) ) { // NOT YET SUPPORTED -- TODO - echo "Unsupported iCal BYHOUR value \"$RR[$i]\"
      \n"; + echo "Unsupported iCal BYHOUR value \"$RR[$i]\"
      \n"; } else if ( preg_match ( "/^BYMONTH=(.+)$/i", $RR[$i], $match ) ) { // this event repeats during the specified months $fevent['Repeat']['ByMonth'] = $match[1]; @@ -2866,7 +2866,7 @@ function parse_vcal( $cal_file ) { global $errormsg, $tz; $vcal_data = []; - // echo "Parsing vcal file...
      \n"; + // echo "Parsing vcal file...
      \n"; if ( ! $fd = @fopen ( $cal_file, 'r' ) ) { $errormsg .= "Can't read temporary file: $cal_file\n"; exit(); @@ -2949,7 +2949,7 @@ function parse_vcal( $cal_file ) { if ( $substate != 'none' ) { $event[$substate] .= $match[1]; } else { - $errormsg .= "Error in file $cal_file line $line:
      $buff\n"; + $errormsg .= "Error in file $cal_file line $line:
      $buff\n"; $error = true; } // For unsupported properties diff --git a/install/index.php b/install/index.php index ceda01d0c..dfad1e2ce 100644 --- a/install/index.php +++ b/install/index.php @@ -103,11 +103,11 @@ $failure = $failureStr . '

      '; -$checked = ' checked="checked"'; -$selected= ' selected="selected"'; +$checked = ' checked'; +$selected= ' selected'; -$setting_correct_img = '!'; -$setting_wrong_img = '!'; +$setting_correct_img = '!'; +$setting_wrong_img = '!'; // First pass at settings.php. // We need to read it first in order to get the md5 password. @@ -186,13 +186,13 @@ if( md5( $pwd ) == $password ) { $_SESSION['validuser'] = $password; echo translate( 'Password Accepted' ) . ' - + '; } else // Invalid password. echo translate( 'Password Incorrect' ) . ' - + '; @@ -235,7 +235,7 @@ $pwd2 = getPostValue( 'password2' ); if( file_exists( $file ) && $forcePassword && ! empty( $pwd1 ) ) { if( $pwd1 != $pwd2 ) { - echo translate( 'Passwords do not match!' ) . '
      ' . "\n"; + echo translate( 'Passwords do not match!' ) . "
      \n"; exit; } $fd = @fopen( $file, 'a+b', false ); @@ -253,7 +253,7 @@ ' . translate( 'Password Updated' ) . ' - + "; exit; + echo "Bugger off.
      "; exit; } $fd = @fopen( $file, 'w+b', false ); @@ -764,7 +764,7 @@ fwrite( $fd, ' $v ) { - if( $v != '
      ' && $v != '' ) + if( $v != '
      ' && $v != '' ) fwrite( $fd, $k . ': ' . $v . "\r\n" ); } fwrite( $fd, '# end settings.php */' . "\r\n?>\r\n" ); @@ -791,7 +791,7 @@ ' . translate( 'WebCalendar Setup Wizard' ) . ' ' + . translate( 'charset' ) . '">' . "\n" . $jquery_install . ' - diff --git a/purge.php b/purge.php index bef9c0b85..74df6604c 100644 --- a/purge.php +++ b/purge.php @@ -106,7 +106,7 @@ echo '

      ...' . translate ( 'Finished' ) . ".

      \n"; ?>
      ' . @@ -130,7 +130,7 @@ for ( $i = 0, $cnt = count ( $userlist ); $i < $cnt; $i++ ) { echo '\n"; } ?> @@ -140,7 +140,7 @@ - + @@ -149,18 +149,18 @@ - + - + + ?> ' + document.forms[0].username.value + '?' )"> @@ -204,7 +204,7 @@ function purge_events ( $ids ) { ") FROM {$tables[$i][0]}" . $clause; $res = dbi_execute ( $sql ); - $sqlLog .= $sql . "
      \n"; + $sqlLog .= $sql . "
      \n"; if ( $res ) { if ( $row = dbi_fetch_row ( $res ) ) $num[$i] += $row[0]; @@ -212,7 +212,7 @@ function purge_events ( $ids ) { } } else { $sql = "DELETE FROM {$tables[$i][0]}" . $clause; - $sqlLog .= $sql . "
      \n"; + $sqlLog .= $sql . "
      \n"; $res = dbi_execute ( $sql ); if ( $cal_id == 'ALL' ) $num[$i] = $allStr; @@ -226,7 +226,7 @@ function purge_events ( $ids ) { $table = $tables[$i][0]; echo '[' . $previewStr . '] ' . str_replace( 'XXX', " $table: {$num[$i]}" , $xxxStr ) . - "
      \n"; + "
      \n"; } } /** @@ -236,7 +236,7 @@ function get_ids ( $sql, $ALL = '' ) { global $sqlLog; $ids = []; - $sqlLog .= $sql . "
      \n"; + $sqlLog .= $sql . "
      \n"; $res = dbi_execute ( $sql ); if ( $res ) { while ( $row = dbi_fetch_row ( $res ) ) { diff --git a/register.php b/register.php index 29fa62a75..44c43a022 100644 --- a/register.php +++ b/register.php @@ -43,7 +43,7 @@ Restrict self-registration to blacklist ($SELF_REGISTRATION_BLACKLIST = Y): If enabled, admin can configure the includes/blacklist.php to restrict or permit self-registration based on the user's IP. This will restrict access to existing - users or new user's set up by admin. Details and examples are available in the top + users or new user's set up by admin. Details and examples are available in the top of the file. Generate passwords and send to new users ($SELF_REGISTRATION_FULL = Y): If enabled, self-registration user's will be emailed a randomly generated password @@ -260,10 +260,10 @@ function generate_password() xlate['noBlankEmail'] = ''; xlate['passwordsNoMatch'] = ''; - - + + -
      - +

      - + -
      -
      -
      +
      +
      +
      + . translate ( 'Continue' ) . '"> ' diff --git a/remotecal_mgmt.php b/remotecal_mgmt.php index 674354344..b4e85fc7d 100644 --- a/remotecal_mgmt.php +++ b/remotecal_mgmt.php @@ -1,7 +1,7 @@
      @@ -94,9 +94,9 @@ -
      +
      - +
      @@ -117,17 +117,17 @@
      - +
      - +
      - +
      @@ -140,15 +140,15 @@
      - +
      - " /> - " onclick="save_handler();" /> + "> + " onclick="save_handler();">
      @@ -173,13 +173,13 @@
      - +

      - " /> - + "> +
      @@ -197,7 +197,7 @@
      - + @@ -206,13 +206,13 @@ -
      +
      "> - " onclick="edit_layer_window_closed(); $('#edit-layer-dialog').hide();" /> + " onclick="edit_layer_window_closed(); $('#edit-layer-dialog').hide();">
      @@ -253,7 +253,7 @@ function user_menu(login, showAddLayer) { // Remove any PHP warnings/errors at the beginning of our response. // Example: - // Warning: Cannot modify header information - headers already sent in /var/www/html/includes/ajax.php on line 78
      + // Warning: Cannot modify header information - headers already sent in /var/www/html/includes/ajax.php on line 78
      // {"error":0,"status":"OK","message":"35 events added, 0 events deleted"} function trim_json(str) { console.log("Trimming JSON string: " + str); @@ -316,11 +316,11 @@ function(data, status) { lastchecked: u.lastchecked }; var tooltip = u.layercount == 0 ? 'data-toggle="tooltip" data-placement="bottom" title=""' : ''; - var warning = u.layercount == 0 ? '' : ''; + var warning = u.layercount == 0 ? '' : ''; var id = u.login.substring(0, 5) == '' ? u.login.substring(5) : u.login; tbody += '' + warning + id + '' + (u.fullname == null ? '' : u.fullname) + '' + (u.admin == null ? '' : u.admin) + - '' + (u.public == 'Y' ? '' : '') + + '' + (u.public == 'Y' ? '' : '') + '' + u.eventcount + '' + u.lastupdated + '' + u.lastchecked + '' + (u.url == null ? '' : u.url) + '' + user_menu(u.login, u.layercount == 0) + '\n'; diff --git a/report.php b/report.php index 39396eeb7..6f814bf6c 100644 --- a/report.php +++ b/report.php @@ -301,8 +301,8 @@ function event_to_text ( $event, $date ) { $day_str = $printerStr = ''; $day_template = '
      ${date}
      ${events}
      '; $event_template = '
      ${name}
      -
      ' . translate ( 'Date' ) . ' ${date}
      -' . translate ( 'Time' ) . ' ${time}
      +
      ' . translate ( 'Date' ) . ' ${date}
      +' . translate ( 'Time' ) . ' ${time}
      ${description}
      '; $page_template = '
      ${days}
      '; diff --git a/resourcecal_mgmt.php b/resourcecal_mgmt.php index 40a2412f2..e1de8af23 100644 --- a/resourcecal_mgmt.php +++ b/resourcecal_mgmt.php @@ -1,7 +1,7 @@ -
      +
      - +
      @@ -92,17 +92,17 @@
      - +
      - +
      - +
      @@ -129,8 +129,8 @@
      - " /> - " onclick="save_handler();" /> + "> + " onclick="save_handler();">
      @@ -154,13 +154,13 @@
      - +

      - " /> - + "> +
      @@ -193,7 +193,7 @@ function user_menu(login) { // Remove any PHP warnings/errors at the beginning of our response. // Example: - // Warning: Cannot modify header information - headers already sent in /var/www/html/includes/ajax.php on line 78
      + // Warning: Cannot modify header information - headers already sent in /var/www/html/includes/ajax.php on line 78
      // {"error":0,"status":"OK","message":"35 events added, 0 events deleted"} function trim_json(str) { console.log("Trimming JSON string: " + str); @@ -254,7 +254,7 @@ function(data, status) { var id = u.login.substring(0, 5) == '' ? u.login.substring(5) : u.login; tbody += '' + id + '' + (u.fullname == null ? '' : u.fullname) + '' + (u.admin == null ? '' : u.admin) + - '' + (u.public == 'Y' ? '' : '') + + '' + (u.public == 'Y' ? '' : '') + '' + u.eventcount + '' + user_menu(u.login) + '\n'; } diff --git a/rss_activity_log.php b/rss_activity_log.php index 56ead4976..c5f6f16a4 100644 --- a/rss_activity_log.php +++ b/rss_activity_log.php @@ -183,7 +183,7 @@ function rss_activity_log ( $sys, $entries ) { $l_id = $row[8]; $l_etype = $row[9]; $l_description = $row[10]; - // convert lines to
      if no HTML formatting found + // convert lines to
      if no HTML formatting found if ( strpos ( $l_description, " - + - @@ -86,9 +86,9 @@ echo ' - '; } if ($show_advanced) { @@ -150,26 +150,26 @@ . translate( 'Users' ) . ': '; } -echo '
        +  
      +
      ' . ( $GROUPS_ENABLED == 'Y' ? '' : '' ) . ' + . translate( 'Select' ) . '...">' : '' ) . '
      '; +echo ''; ?> -' ); $trailerStr = print_trailer(); @@ -124,9 +124,9 @@ {$prevMonth}{$nextMonth} {$navStr} -
      {$view_name}       +
      {$view_name}       -
      +
      {$monthStr} {$eventinfo} {$unapprovedStr} diff --git a/view_m.php b/view_m.php index 876661b79..8765bf722 100644 --- a/view_m.php +++ b/view_m.php @@ -51,17 +51,17 @@
      + . $prevStr . '"> + . $nextStr . '">
      '; printf ( "%s %d", month_name ( $thismonth - 1 ), $thisyear ); -echo '
      +echo '
      ' . $view_name . '
      -

      '; +
      '; // The table has names across the top and dates for rows. Since we need to spit // out an entire row before we can move to the next date, we'll save up all the @@ -108,7 +108,7 @@ : 5 ); echo ' -

      +

      ' . + $header[$i] = $weekdays[$i] . '
      ' . month_name ( date ( 'm', $days[$i] ) - 1, 'M' ) . ' ' . date ( 'd', $days[$i] ); if ( empty ( $first_date ) ) @@ -187,7 +187,7 @@ $table_width = ( $col_pixels * $viewusercnt ) * ( $end_ind - $start_ind + 1 ) + 100; } -//echo "table_width=$table_width
      \n"; +//echo "table_width=$table_width
      \n"; // tdw is the cell width for each day if ( ! $fit_to_window ) @@ -223,7 +223,7 @@ user_load_variables ( $viewusers[$i], 'temp' ); $uheader .= "\n"; - //echo "$viewusers[$i]: loaded " . count ( $events ) . " events
      \n"; + //echo "$viewusers[$i]: loaded " . count ( $events ) . " events
      \n"; } $num_users = $viewusercnt; @@ -237,9 +237,9 @@ ?>
      - + - +

      +?>
      \n(" . + echo "
      \n(" . translate( 'Week' ) . ' ' . date( 'W', $wkstart + 86400 ) . ')'; } ?> -

      +
      getDuration() == 1440 ) $all_day[$d] = 1; html_for_event_week_at_a_glance ( $ev[$i], $dateYmd, 'small', $show_time ); - //echo "Found event date=$dateYmd name='$viewname'
      \n"; + //echo "Found event date=$dateYmd name='$viewname'
      \n"; //print_r ( $rowspan_arr ); } } @@ -425,7 +425,7 @@ $start_time = $i; $diff_start_time = $start_time - $last_row; for ( $x = $diff_start_time; $x > 0; $x-- ) - $hour_arr[$last_row] .= "
      \n"; + $hour_arr[$last_row] .= "
      \n"; $hour_arr[$last_row] .= $hour_arr[$i]; $hour_arr[$i] = ''; $rowspan_arr[$i] = 0; @@ -581,4 +581,3 @@ function dblclick( date, name, hour, minute ) { echo $printerStr; echo print_trailer(); ?> - diff --git a/view_t.php b/view_t.php index 84a9ffa75..cf17819b1 100644 --- a/view_t.php +++ b/view_t.php @@ -299,17 +299,17 @@ function print_header_timebar() {
      + . '">' . $prevStr . ' + . '">' . $nextStr . '
      ' . date_to_str ( date ( 'Ymd', $wkstart ), '', false ) . '    -    ' - . date_to_str ( date ( 'Ymd', $wkend ), '', false ) . '
      + . date_to_str ( date ( 'Ymd', $wkend ), '', false ) . '
      ' . $view_name . '
      -


      '; +

      '; // The table has names across the top and dates for rows. Since we need to // spit out an entire row before we can move to the next date, we'll save up all diff --git a/view_v.php b/view_v.php index 37c78ac94..069e7ce34 100644 --- a/view_v.php +++ b/view_v.php @@ -48,17 +48,17 @@
      + . $prevStr . '"> + . $nextStr . '">
      ' . date_to_str ( $thisdate, '', false ) . '    -    ' - . date_to_str ( date ( 'Ymd', $wkend ), '', false ) . '
      + . date_to_str ( date ( 'Ymd', $wkend ), '', false ) . '
      ' . $view_name . '
      -

      '; +
      '; // The table has names across the top and dates for rows. Since we need to spit // out an entire row before we can move to the next date, we'll save up all the diff --git a/view_w.php b/view_w.php index be5905268..d21a93924 100644 --- a/view_w.php +++ b/view_w.php @@ -60,18 +60,18 @@ + ' . $prevStr . ' + ' . $nextStr . '
      ' . date_to_str ( date ( 'Ymd', $wkstart ), '', false ) . '    -    ' - . date_to_str ( date ( 'Ymd', $wkend ), '', false ) . '
      + . date_to_str ( date ( 'Ymd', $wkend ), '', false ) . '
      ' . $view_name . '
      -
      '; +
      '; // The table has names across the top and dates for rows. Since we need to spit // out an entire row before we can move to the next date, we'll save up all the diff --git a/views.php b/views.php index f3f79a41e..4ce6843b4 100644 --- a/views.php +++ b/views.php @@ -28,8 +28,8 @@ echo ''; -echo ( $global_found ? '
      - * ' . translate ( 'Global' ) : '' ) . '
      +echo ( $global_found ? '
      + * ' . translate ( 'Global' ) : '' ) . '
      ' . print_trailer(); diff --git a/views_edit.php b/views_edit.php index e2d90b1bf..06734bc3e 100644 --- a/views_edit.php +++ b/views_edit.php @@ -29,8 +29,8 @@ $newview = true; $viewname = $viewtype = ''; $viewisglobal = 'N'; -$checked = ' checked="checked"'; -$selected = ' selected="selected"'; +$checked = ' checked'; +$selected = ' selected'; $unnameViewStr = translate ( 'Unnamed View' ); @@ -81,10 +81,10 @@ if ( $newview ) { $v = []; echo '

      ' . translate ( 'Add View' ) . "

      \n"; - echo '' . "\n"; + echo '' . "\n"; } else { echo '

      ' . translate ( 'Edit View' ) . "

      \n"; - echo "\n"; + echo "\n"; } ?> @@ -137,7 +137,7 @@
      - - +

      - + Cancel ' )" /> + onclick="return confirm('' )">
      - diff --git a/week.php b/week.php index 51ab52b97..8feab94e2 100644 --- a/week.php +++ b/week.php @@ -77,7 +77,7 @@ $weekdays[$i] = weekday_name ( ( $i + $WEEK_START ) % 7, $DISPLAY_LONG_DAYS ); $dateYmd = date ( 'Ymd', $days[$i] ); - $header[$i] = $weekdays[$i] . '
      ' + $header[$i] = $weekdays[$i] . '
      ' . date_to_str ( $dateYmd, $DATE_FORMAT_MD, false, true ); // Generate header row. @@ -130,7 +130,7 @@ // This will move entries apart that appear in one field, // yet start on different hours. for ( $u = $diff_start_time; $u > 0; $u-- ) { - $hour_arr[$last_row] .= '
      ' . "\n"; + $hour_arr[$last_row] .= "
      \n"; } $hour_arr[$last_row] .= $hour_arr[$j]; $hour_arr[$j] = ''; diff --git a/week_details.php b/week_details.php index c14fac6a4..e56674770 100644 --- a/week_details.php +++ b/week_details.php @@ -53,24 +53,24 @@
      + . '">' . $prevStr . ' + . '">' . $nextStr . ' ' . date_to_str ( date ( 'Ymd', $wkstart ), '', false ) . '    -    ' . date_to_str ( date ( 'Ymd', $wkend ), '', false ) . '' - . ( $DISPLAY_WEEKNUMBER == 'Y' ? '
      + . ( $DISPLAY_WEEKNUMBER == 'Y' ? '
      (' . translate ( 'Week' ) . ' ' . date ( 'W', $wkstart + 86400 ) . ')' : '' ) . ' - ' . ( $single_user == 'N' ? '
      - ' . $user_fullname : '' ) . ( $is_nonuser_admin ? '
      -- ' - . translate ( 'Admin mode' ) . ' --' : '' ) . ( $is_assistant ? '
      -- ' + ' . ( $single_user == 'N' ? '
      + ' . $user_fullname : '' ) . ( $is_nonuser_admin ? '
      -- ' + . translate ( 'Admin mode' ) . ' --' : '' ) . ( $is_assistant ? '
      -- ' . translate ( 'Assistant mode' ) . ' --' : '' ) . '      ' - . ( $CATEGORIES_ENABLED == 'Y' ? '

      ' + . ( $CATEGORIES_ENABLED == 'Y' ? '

      ' . print_category_menu( 'week', sprintf ( "%04d%02d%02d", $thisyear, $thismonth, $thisday ), $cat_id ) : '' ) . ' -

      +
      " . $tempfullname . "
      '; @@ -91,7 +91,7 @@ ' . $newEntryStr - . '' : '' ) . ' + . '">' : '' ) . ' ' . $header[$d] . ' @@ -107,7 +107,7 @@ echo '
      - ' . ( empty ( $eventinfo ) ? '' : $eventinfo ) . '
      ' . $printerStr . print_trailer (); + ' . ( empty ( $eventinfo ) ? '' : $eventinfo ) . '
      ' . $printerStr . print_trailer (); /** * Prints the HTML for one event in detailed view. @@ -150,7 +150,7 @@ function print_detailed_entry ( $event, $date ) { if ( $class == 'layerentry' ) echo '&user=' . $loginStr; - echo 'view icon'; + echo 'view icon'; if ( $login != $loginStr && strlen ( $loginStr ) ) { if ( $layers ) { foreach ( $layers as $layer ) { @@ -193,7 +193,7 @@ function print_detailed_entry ( $event, $date ) { echo $PN . '' . ( $evPri ? ' ' : '' ) # Only display description if it is different than the event name. - . ( $PN != $PD ? ' - ' . $PD : '' ) . '
      '; + . ( $PN != $PD ? ' - ' . $PD : '' ) . '
      '; $eventinfo .= build_entry_popup ( 'eventinfo-' . $linkid, $loginStr, $descStr, $timestr, site_extras_for_popup ( $id ) ); diff --git a/week_ssi.php b/week_ssi.php index e0641c2a8..83e8366fc 100644 --- a/week_ssi.php +++ b/week_ssi.php @@ -75,7 +75,7 @@ . ( date ( 'Ymd', $days[$i] ) == date ( 'Ymd', $today ) ? $TODAYCELLBG : $THBG ) . ';">' . weekday_name ( ( $i + $WEEK_START ) % 7, $DISPLAY_LONG_DAYS ) - . '
      ' . month_name ( date ( 'm', $days[$i] ) - 1, 'M' ) . ' ' + . '
      ' . month_name ( date ( 'm', $days[$i] ) - 1, 'M' ) . ' ' . date ( 'd', $days[$i] ) . ''; $tmpOut2 .= ' diff --git a/year.php b/year.php index 0c39515dc..28034e2f6 100644 --- a/year.php +++ b/year.php @@ -111,24 +111,22 @@ echo << + {$prevStr} - {$thisyear}
      - {$fullnameStr}
      + {$nextStr} + {$thisyear}
      + {$fullnameStr}
      {$asstModeStr} {$catSelectStr} -
      +
      {$gridOmonths}
      -

      - {$unapprovedStr}
      +
      + {$unapprovedStr}
      {$printerStr} {$trailerStr} EOT; ?> - -