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 @@
' . '
' . ( $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/docs/php2html.pl b/docs/php2html.pl index 7053cbf3c..bdb2eeb86 100755 --- a/docs/php2html.pl +++ b/docs/php2html.pl @@ -30,8 +30,8 @@ sub add_links { $in =~ s/&/&/g; $in =~ s/&&/&/g; - $in =~ s/(Note|Notes):/$1<\/span>/gi; - $in =~ s/(TODO):/$1<\/span>/gi; + $in =~ s/(Note|Notes):/$1<\/span>/gi; + $in =~ s/(TODO):/$1<\/span>/gi; return $in; } @@ -40,13 +40,13 @@ sub print_function { my ( $loc ) = @_; $out{$name} = "

$name

\n"; $out{$name} .= "$name ( " . '$' . join ( ', $', @params ) . - " )

\n"; + " )

\n"; if ( defined ( $description ) ) { $out{$name} .= "Description:" . "
"; $out{$name} .= add_links ( $description ) . "
\n"; } - $out{$name} .= "Parameters:
\n
    \n"; + $out{$name} .= "Parameters:
    \n
      \n"; if ( @params == 0 ) { $out{$name} .= "
    • None
      • \n"; } @@ -61,7 +61,7 @@ sub print_function { ( $returns eq '' ? "Nothing" : add_links ( $returns ) ) . "\n"; $out{$name} .= "Location:" . "
      $loc
      \n"; - $out{$name} .= "

      \n"; + $out{$name} .= "

      \n"; } %funcNames = ( ); @@ -175,11 +175,8 @@ sub print_function { close ( F ); print< - - + + $TITLE