fixed sidebar link to todays date, put extract HTTP back for users of stock 4.2.x php (like me).

4 files changed, 15 insertions, 11 deletions

diff --git a/config.inc.php b/config.inc.php
index bc538bf..2a3c46f 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -7,7 +7,7 @@
 
 $style_sheet = 'silver';				// Themes support
 $calendar_path = './calendars';			// Path to directory with calendars
-$default_view = 'day';					// Default view for calendars = 'day', 'week', 'month'
+$default_view = 'day';					// Default view for calendars = 'day', 'week', 'month', 'year'
 $minical_view = 'current';				// Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
 $default_cal = 'Home';					// Exact filename of calendar without .ics
 $language = 'English';					// Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish'
@@ -20,7 +20,7 @@ $tomorrows_events_lines = '1';			// Number of lines to wrap each event title in
 // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
 $save_parsed_cals = 'no';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
 $use_sessions = 'yes';					// This has not yet been implemented.
-$display_custom_goto = 'yes';			// In the 'Jump To' box, display the custom 'go to day' box.
+$display_custom_goto = 'no';			// In the 'Jump To' box, display the custom 'go to day' box.
 $display_ical_list = 'yes';				// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
 $allow_webcals = 'no';					// Allow http:// and webcal:// prefixed URLs to be used as the $cal for remote viewing of "subscribe-able" calendars. This does not have to be enabled to allow specific ones below.
 $this_months_events = 'yes';			// Display "This month's events" at the bottom off the month page.
diff --git a/functions/init.inc.php b/functions/init.inc.php
index 2bb2bc8..b111915 100644
--- a/functions/init.inc.php
+++ b/functions/init.inc.php
@@ -3,15 +3,15 @@
 //error_reporting (E_ALL);
 
 // Retain some compatibility backwards like.
-/* jared.20021003 I think we're always going to make sure these are extracted by hand
-so I'll comment this out for now, otherwise, uncomment this
+//jared.20021003 I think we're always going to make sure these are extracted by hand
+//so I'll comment this out for now, otherwise, uncomment this
+//chad - navigation breaks after 4.2.0 without this.
 if(phpversion() >= '4.2.0') 
 
 	{
 		extract($HTTP_GET_VARS);	
 		extract($HTTP_POST_VARS);
 	}
-*/
 include('./config.inc.php');
 include('./functions/error.php');
 
diff --git a/sidebar.php b/sidebar.php
index dcd24f4..cea7578 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -49,6 +49,13 @@
 									<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$today_today\">$gomonth_lang</a>"; ?></td>
 								</tr>
 								<tr>
+									<td colspan="7"><img src="images/spacer.gif" width="21" height="1"></td>
+								</tr>
+								<tr>
+									<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
+									<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$today_today\">$goyear_lang</a>"; ?></td>
+								</tr>
+								<tr>
 									<td colspan="7"><img src="images/spacer.gif" width="21" height="5"></td>
 								</tr>
 								<tr>
diff --git a/week.php b/week.php
index 9b84e1d..8f32443 100644
--- a/week.php
+++ b/week.php
@@ -15,6 +15,7 @@ $weekstart = 1;
 // dpr 20020926: moved variable gridLength to config.inc.php
 //$gridLength = 30;
 $unix_time = strtotime($getdate);
+$thisday2 = localizeDate($dateFormat_week_list, $unix_time);
 $today_today = date ("Ymd");
 $next_week = date("Ymd", strtotime("+1 week",  $unix_time));
 $prev_week = date("Ymd", strtotime("-1 week",  $unix_time));
@@ -28,7 +29,6 @@ $start_week = localizeDate($dateFormat_week, $start_week_time);
 $end_week =  localizeDate($dateFormat_week, $end_week_time);
 
 $display_date = "$start_week - $end_week";
-$thisday2 = localizeDate($dateFormat_week_list, $unix_time);
 
 
 // For the side months
@@ -112,13 +112,10 @@ for ($i=0;$i<7;$i++) {
 								$thisdate = $start_week_time;
 								$i = 0;
 								do {
-									$thisday = date("Ymd", $thisdate);
-									$thisday2 = localizeDate($dateFormat_week_list, $thisdate);
 									$colWidth = round(70 / $nbrGridCols[$thisday]);
 									for ($j=0;$j < $nbrGridCols[$thisday];$j++) {
 										echo "<td width=\"" . $colWidth . "\"><img src=\"images/spacer.gif\" width=\"" . $colWidth . "\" height=\"1\" alt=\"\"></td>\n";
 									}
-									$thisdate = ($thisdate + (25 * 60 * 60));
 									$i++;
 								} while ($i < 7);
 								?>
@@ -133,9 +130,9 @@ for ($i=0;$i<7;$i++) {
 							echo "<td class=\"dateback\" width=\"1\"></td>";
 							do {
 								$thisday = date("Ymd", $thisdate);
-								$thisday2 = localizeDate($dateFormat_week_list, $thisdate);
+								$thisday3 = localizeDate($dateFormat_week_list, $thisdate);
 								echo "<td width=\"120\" colspan=\"" . $nbrGridCols[$thisday] . "\" valign=\"top\" align=\"center\" class=\"dateback\">\n";
-								echo "<font class=\"V9\"><a class=\"psf\" href=\"day.php?cal=$cal&getdate=$thisday\">$thisday2</a></font>\n";
+								echo "<font class=\"V9\"><a class=\"psf\" href=\"day.php?cal=$cal&getdate=$thisday\">$thisday3</a></font>\n";
 								echo "</td>\n";
 								$thisdate = ($thisdate + (25 * 60 * 60));
 								$i++;