From d1187b8c0470f4d54bfa7074303c039017d2885b Mon Sep 17 00:00:00 2001 From: Chad Little Date: Tue, 16 Sep 2003 06:14:16 +0000 Subject: more code lightening. --- includes/sidebar.php | 61 +++++++++++++++++++++------------------------------- week.php | 37 ++++++++++++++++--------------- 2 files changed, 42 insertions(+), 56 deletions(-) diff --git a/includes/sidebar.php b/includes/sidebar.php index 8051434..7869a5d 100644 --- a/includes/sidebar.php +++ b/includes/sidebar.php @@ -25,37 +25,24 @@ - - - - - - - - - - - - -
- $goday_lang
\n"; - echo "$goweek_lang
\n"; - echo "$gomonth_lang
\n"; - echo "$goyear_lang
\n"; - echo "$goprint_lang
\n"; - if ($allow_preferences != 'no') echo "$preferences_lang
\n"; - if ($cal != 'all_calenders_combined971') echo "$subscribe_lang | $download_lang\n"; - ?> -
+ '; + echo ''.$cal_displayname2.'
'; + echo ''; + echo "$goday_lang
\n"; + echo "$goweek_lang
\n"; + echo "$gomonth_lang
\n"; + echo "$goyear_lang
\n"; + echo "$goprint_lang
\n"; + if ($allow_preferences != 'no') echo "$preferences_lang
\n"; + if ($cal != 'all_calenders_combined971') echo "$subscribe_lang | $download_lang\n"; + echo ''; + ?> - - - -
- +
+
@@ -63,13 +50,13 @@

'; + echo '
'; echo "
'; echo '
'; } - + echo '
'; ?>
-
+
0) { ?> - +
@@ -146,7 +133,7 @@
-
+
@@ -224,7 +211,7 @@ -
+
@@ -283,7 +270,7 @@ -
+
@@ -338,7 +325,7 @@
-
+
diff --git a/week.php b/week.php index e255889..18629ab 100644 --- a/week.php +++ b/week.php @@ -5,20 +5,20 @@ define('BASE', './'); include(BASE.'functions/ical_parser.php'); if ($minical_view == "current") $minical_view = "week"; -$starttime = "0500"; -$weekstart = 1; -$unix_time = strtotime($getdate); -$thisday2 = localizeDate($dateFormat_week_list, $unix_time); -$today_today = date('Ymd', strtotime("now + $second_offset seconds")); -$next_week = date("Ymd", strtotime("+1 week", $unix_time)); -$prev_week = date("Ymd", strtotime("-1 week", $unix_time)); -$tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); -$yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); -$start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); -$end_week_time = $start_week_time + (6 * 25 * 60 * 60); -$start_week = localizeDate($dateFormat_week, $start_week_time); -$end_week = localizeDate($dateFormat_week, $end_week_time); -$display_date = "$start_week - $end_week"; +$starttime = "0500"; +$weekstart = 1; +$unix_time = strtotime($getdate); +$thisday2 = localizeDate($dateFormat_week_list, $unix_time); +$today_today = date('Ymd', strtotime("now + $second_offset seconds")); +$next_week = date("Ymd", strtotime("+1 week", $unix_time)); +$prev_week = date("Ymd", strtotime("-1 week", $unix_time)); +$tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); +$yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); +$start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); +$end_week_time = $start_week_time + (6 * 25 * 60 * 60); +$start_week = localizeDate($dateFormat_week, $start_week_time); +$end_week = ocalizeDate($dateFormat_week, $end_week_time); +$display_date = "$start_week - $end_week"; // For the side months ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); @@ -50,11 +50,10 @@ for ($i=0;$i<7;$i++) { <?php echo "$calendar_name - $display_date"; ?> - "> + "> "; } ?> @@ -366,8 +365,8 @@ for ($i=0;$i<7;$i++) {
- - + + -- cgit v1.2.3