From 22eeabcdd231bcc6984d42d0fd3c24fd7ffffb33 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Sun, 3 Dec 2006 17:58:35 +1300
Subject: [PATCH] Work without register_globals.

---
 htdocs/collection.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/collection.php b/htdocs/collection.php
index 495d8b09..b33302c4 100644
--- a/htdocs/collection.php
+++ b/htdocs/collection.php
@@ -15,16 +15,16 @@ require_once("interactive-page.php");
   $browser->AddHidden( 'resource_link', "'<a href=\"$c->base_url/caldav.php' || caldav_data.dav_name || '\">' || caldav_type || '</a>'" );
   $browser->AddColumn( 'caldav_type', translate('Type'), '', '##resource_link##' );
   $browser->AddColumn( 'dtstart', translate('Start'), '', '', "to_char(dtstart,'YYYY-MM-DD HH24:MI')" );
-  $browser->AddColumn( 'dtend', translate('Finish'), '', '', "to_char(dtstart,'YYYY-MM-DD HH24:MI')" );
+  $browser->AddColumn( 'dtend', translate('Finish'), '', '', "to_char(dtend,'YYYY-MM-DD HH24:MI')" );
   $browser->AddColumn( 'summary', translate('Summary') );
   $browser->AddColumn( 'rrule', translate('Repeat Rule') );
 
   $browser->SetJoins( 'caldav_data JOIN calendar_item USING ( user_no, dav_name ) ' );
-  if ( isset($user_no) ) {
-    $browser->SetWhere( "user_no=" . intval($user_no) );
+  if ( isset($_GET['user_no']) ) {
+    $browser->SetWhere( "user_no=" . intval($_GET['user_no']) );
   }
-  if ( isset($dav_name) ) {
-    $browser->SetWhere( "dav_name ~ " . qpg("^".$dav_name."[^/]+$") );
+  if ( isset($_GET['dav_name']) ) {
+    $browser->SetWhere( "dav_name ~ " . qpg("^".$_GET['dav_name']."[^/]+$") );
   }
 
   if ( isset( $_GET['o']) && isset($_GET['d']) ) {