diff --git a/access.php b/access.php index a892f12f2..42d95b8fa 100644 --- a/access.php +++ b/access.php @@ -320,7 +320,7 @@ ' . translate ( 'Calendar' ) . ' + ? 'AlignCenter" width="60%">' . translate ( 'Calendar' ) . ' ' . $typeStr . ' ' . translate ( 'View Event' ) @@ -370,9 +370,9 @@ $bottomedge = 'boxbottom'; } echo ' - ' + ' . $access_type[$j] . ' - ' + ' . ' @@ -385,7 +385,7 @@ . ( ! empty( $op['view'] ) && ( $op['view'] & $j64 ) ? $checked : '' ) . '>' . ( $guser != '__public__' ? ' - @@ -397,7 +397,7 @@ . $j64 . '" name="e_' . $j64 . '"' . ( ! empty( $op['edit'] ) && ( $op['edit'] & $j64 ) ? $checked : '' ) . '> - @@ -414,7 +414,7 @@ } echo ' - ' + ' . ( $otheruser != '__default__' && $otheruser != '__public__' ? '   ' : '' ) . ' @@ -424,7 +424,7 @@ . '" onclick="selectAll(0);"> - +
diff --git a/approve_entry.php b/approve_entry.php index edb22bdfc..1f5bd055a 100644 --- a/approve_entry.php +++ b/approve_entry.php @@ -22,15 +22,15 @@ print_form_key(); echo '
' . translate( 'Public' ) . ' ' . translate( 'Confidential' ) . '
- - -

' +

' . translate ( 'Additional Comments (optional)' ) . '
+     ', '', true, false, true ); echo ' - +
' . csrf_form_key() . ' - - - - - diff --git a/day.php b/day.php index 83debb516..dbb9f24d6 100644 --- a/day.php +++ b/day.php @@ -74,7 +74,7 @@ - - -
' . translate ( 'Categories' ) . '
'; + '; if ( ! empty ( $categories ) ) { echo ' @@ -59,9 +59,9 @@ } echo ' +
*' . translate ( 'Global Category' ) + *' . translate ( 'Global Category' ) . '       
{$navStr} +
{$smallMonthStr} diff --git a/docadd.php b/docadd.php index 28a2c4d8f..ad1f147df 100644 --- a/docadd.php +++ b/docadd.php @@ -208,11 +208,11 @@ - - diff --git a/edit_entry.php b/edit_entry.php index da9bac12d..4344dd2c4 100644 --- a/edit_entry.php +++ b/edit_entry.php @@ -808,7 +808,7 @@ function time_selection($prefix, $time = '', $trigger = false) $defIdx = (empty($extras[$extra_name]['cal_data']) ? $extra_arg2 : $extras[$extra_name]['cal_data']); - echo ' - @@ -1410,7 +1410,7 @@ function time_selection($prefix, $time = '', $trigger = false) . ' - - diff --git a/icons.php b/icons.php index 36c868761..f1d20d861 100644 --- a/icons.php +++ b/icons.php @@ -39,7 +39,7 @@ //echo "
"; print_r($icons); echo "
"; echo ' -
@@ -231,7 +231,7 @@
-
' + echo '
' . ($extra_type == EXTRA_MULTILINETEXT ? '
' : '') . translate($extra_descr) . ':		 '; @@ -1060,7 +1060,7 @@ function time_selection($prefix, $time = '', $trigger = false)
+ - +
-
-
+
'; for ($i = 0, $cnt = count($icons); $i < $cnt; $i++) { echo ' @@ -54,7 +54,7 @@ ?> - +


diff --git a/import.php b/import.php index 7e8703342..95866c9ec 100644 --- a/import.php +++ b/import.php @@ -51,7 +51,7 @@ function print_user_list() { echo '
@@ -736,7 +736,7 @@ function daily_matrix ( $date, $participants, $popup = '' ) { } // End foreach participant. return $ret . <<
-
+
- @@ -6388,9 +6388,9 @@ function site_extras_for_popup ( $id ) { function print_error_box ( $msg ) { echo '
' . - '
{$busy}{$busy}   
' . translate ( 'TASKS' ) . '+
' . - '' . - translate ( 'Error' ) . '' . + '
' . + '' . + translate ( 'Error' ) . '' . translate('The permissions for the icons directory are set to read-only') . "
\n"; } diff --git a/install/index.php b/install/index.php index 26de7cbfb..0de0ea21d 100644 --- a/install/index.php +++ b/install/index.php @@ -968,7 +968,7 @@ function chkPassword() { $class = ( version_compare( phpversion(), '7.4.0', '>=' ) ? '' : 'not' ) . 'recommended'; echo ' - +
@@ -1100,7 +1100,7 @@ function chkPassword() { . translate( 'Configuration Wizard Password' ) . ' - -
' . str_replace( 'XXX', translate( '1' ), $wizardStr ) . '
'; + '; if( $doLogin ) echo ' @@ -1133,7 +1133,7 @@ function chkPassword() {
@@ -1144,9 +1144,9 @@ function chkPassword() {
' . ( empty( $_SESSION['validuser'] ) ? '' : ' - +
-
+
' . csrf_form_key() . '
@@ -1157,7 +1157,7 @@ function chkPassword() { // BEGIN STEP 2 } elseif( $_SESSION['step'] == 2 ) { echo ' - +
@@ -1214,12 +1214,12 @@ function chkPassword() {
' . str_replace( 'XXX', translate( '2' ), $wizardStr ) . '
' . csrf_form_key() . ' - +
- - -
 ' + ' . ' +
+ ' . ( ! empty( $_SESSION['db_noexist'] ) && @@ -1347,20 +1347,20 @@ function chkPassword() {
' ) . ' - +
- - -
+ ' . csrf_form_key() . ' +
' . csrf_form_key() . '
+
' . csrf_form_key() . ' + @@ -1421,7 +1421,7 @@ function chkPassword() { echo ' - - -
' . str_replace( 'XXX', translate( '3' ), $wizardStr ) . '
+ ' . csrf_form_key() . translate( 'ODBC Underlying Database' ) . '
' + ' . ( ! empty( $settings['db_type'] ) && empty( $_SESSION['blank_database'] ) && ( $settings['db_type'] == 'ibase' || $settings['db_type'] == 'oracle' ) @@ -1469,7 +1469,7 @@ function chkPassword() { && $settings['db_type'] != 'sqlite3' && empty( $_SESSION['blank_database'] ) ? '
+ ' . csrf_form_key() . ' @@ -1488,20 +1488,20 @@ function chkPassword() { echo '
- +
- - -
+ ' . csrf_form_key() . ' +
' . csrf_form_key() . '
+
' . csrf_form_key() . ' + @@ -1534,7 +1534,7 @@ function chkPassword() { ' . csrf_form_key() . '
  • ' . translate( 'It appears that you have NOT converted...' ) . '
-
' : '
  • ' . $tzSuccessStr . '
' ) . ' @@ -1552,7 +1552,7 @@ function chkPassword() {
' . str_replace( 'XXX', translate( '4' ), $wizardStr ) . '
- +
' . csrf_form_key() . ' @@ -1641,9 +1641,9 @@ function chkPassword() {
- +
- ' : '' ) . ' - ' /* approve */ . ' - ' /* reject */ . ' - ' /* delete */ . ( ! access_is_enabled() || access_user_calendar ( 'edit', $user ) ? ' - ' : '' ) . ' '; diff --git a/login-app.php b/login-app.php index 029c14e34..89f979497 100644 --- a/login-app.php +++ b/login-app.php @@ -81,16 +81,16 @@ function myOnLoad() { . '" method="post" onsubmit="return valid_form( this )"> -
' + ' . ( ! empty( $_SESSION['db_success'] ) && $_SESSION['db_success'] && empty( $dologin ) ? '

' . $temp_fullname . ' ' . $rssLink . '
' . htmlspecialchars ( $name ) . ' (' . $eventdate . '):
+
- - @@ -107,7 +107,7 @@ function myOnLoad() { ' : '' ) . ' - - - diff --git a/pref.php b/pref.php index 38bf23878..0ff1286b1 100644 --- a/pref.php +++ b/pref.php @@ -870,12 +870,12 @@ function save_pref( $prefs, $src) {
Login
'; + '; if ( ! empty ( $app_login_page['hidden'] ) ) { foreach ( $app_login_page['hidden'] as $key => $val ) { diff --git a/month.php b/month.php index ce40c8ca0..2c40b776b 100644 --- a/month.php +++ b/month.php @@ -97,12 +97,12 @@ echo <<
+ {$prevMonth1}{$nextMonth1} {$navStr} {$monthStr} + {$prevMonth2}{$nextMonth2}
{$smallTasks}
- - - -
+
-		 +

diff --git a/purge.php b/purge.php index 316733999..30cbc3f0d 100644 --- a/purge.php +++ b/purge.php @@ -142,7 +142,7 @@

+
+
+
diff --git a/reject_entry.php b/reject_entry.php index 48e69f58e..1731b3d04 100644 --- a/reject_entry.php +++ b/reject_entry.php @@ -20,15 +20,15 @@ print_form_key (); echo ' - - - diff --git a/search.php b/search.php index 5ae1986a7..5adfb2c8f 100644 --- a/search.php +++ b/search.php @@ -146,7 +146,7 @@ } echo ' -

' +

' . translate ( 'Additional Comments (optional)' ) . '
- + - - - +
{$briefStr} {$event_name}
+ +
{$globalNoteStr} @@ -141,7 +141,7 @@ value="{$catList}">

diff --git a/usersel.php b/usersel.php index b9bc68f66..960faf965 100644 --- a/usersel.php +++ b/usersel.php @@ -41,7 +41,7 @@ - -
+ ' . translate ( 'Users' ) . '

@@ -51,7 +51,7 @@ . '" onclick="selectAll( false )"> 		+ ' . translate ( 'Groups' ) . '
- - + '; $others_complete = 'yes'; for ( $i = 0, $cnt = count ( $participants ); $i < $cnt; $i++ ) { @@ -691,7 +691,7 @@ echo ' ' . $tempfullname; echo ' - + \n\n"; for ( $d = $start_ind; $d <= $end_ind; $d++ ) { diff --git a/view_t.php b/view_t.php index ac4c6cd49..1acbc04a4 100644 --- a/view_t.php +++ b/view_t.php @@ -166,13 +166,13 @@ function print_entry_timebar ( $event, $date ) { $ret .= ' ' . ( $start_padding > 0 ? ' - ': '' ) . ' - ' . ( $pos < 2 ? ( $pos < 1 ? ' ' : '' ) . ( $end_padding > 1 ? ' - ' : '' ) : '' ) // We'll close the table later. . ' diff --git a/week.php b/week.php index d74fa4414..80ff003a5 100644 --- a/week.php +++ b/week.php @@ -232,7 +232,7 @@ $tableWidth = '80%'; $filler = ''; $minical_tasks .= ' -
' . translate ( 'Participants' ) . '' + ' . translate ( 'Participants' ) . '' . translate ( 'Percentage Complete' ) . '' . $percentage . '%' . $percentage . '% diff --git a/view_r.php b/view_r.php index 5fbc0fef0..91225c6ae 100644 --- a/view_r.php +++ b/view_r.php @@ -495,7 +495,7 @@ $time_h = ( int ) ( ( $i * $interval ) / 60 ); $time_m = ( $i * $interval ) % 60; $time = display_time ( ( $time_h * 100 + $time_m ) * 100, 1 ); - echo "
\n' . $time . "
' : '' ); + ' : '' ); if ( $pos > 0 ) { if( ! $event->isUntimed() ) { $ret .= ( $start_padding > 0 ? ' ' . ( $pos > 1 ? ' ' : '' ); + ' : '' ); } else // Untimed, just display text. $ret .= ' '; @@ -198,7 +198,7 @@ function print_entry_timebar ( $event, $date ) { . '   +
' . ( $DISPLAY_SM_MONTH == 'Y' ? '
' diff --git a/year.php b/year.php index 9a0954e34..22afb101b 100644 --- a/year.php +++ b/year.php @@ -119,7 +119,7 @@ {$asstModeStr} {$catSelectStr}

-
+
{$gridOmonths}