Index: openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql	9 Jan 2004 21:54:24 -0000	1.5
+++ openacs-4/packages/calendar/tcl/calendar-procs-oracle.xql	25 Feb 2004 13:07:07 -0000	1.6
@@ -24,7 +24,7 @@
   <querytext>
     select calendar_name, 
            calendar_id, 
-           acs_permission.permission_p(calendar_id, :user_id, 'calendar_admin') as calendar_admin_p
+           acs_permission.permission_p(calendar_id, :user_id, 'admin') as calendar_admin_p
     from   calendars
     where  (private_p = 'f' and package_id = :package_id $permissions_clause) or
            (private_p = 't' and owner_id = :user_id)
Index: openacs-4/packages/calendar/tcl/calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/tcl/calendar-procs.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/calendar/tcl/calendar-procs.tcl	19 Feb 2004 15:10:14 -0000	1.23
+++ openacs-4/packages/calendar/tcl/calendar-procs.tcl	25 Feb 2004 13:07:07 -0000	1.24
@@ -160,6 +160,10 @@
     @param calendar_id_list If you supply the calendar_id_list, then we'll only search 
     for a personal calendar among the calendars supplied here.
 } {
+    # Check whether the user is logged in at all
+    if {!$party_id} {
+	return -1
+    }
 
     if { [llength $calendar_id_list] > 0 } {
         set result [db_string get_calendar_info_calendar_id_list {} -default 0]
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	21 Jul 2003 19:21:36 -0000	1.7
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	25 Feb 2004 13:07:08 -0000	1.8
@@ -1,4 +1,3 @@
-
 #
 # A script that assumes
 #
@@ -14,6 +13,8 @@
     cal_item_id
 }
 
+auth::require_login
+
 calendar::item::get -cal_item_id $cal_item_id -array cal_item
 
 # no time?
Index: openacs-4/packages/calendar/www/cal-item-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/cal-item-delete.tcl	18 Sep 2002 12:12:03 -0000	1.3
+++ openacs-4/packages/calendar/www/cal-item-delete.tcl	25 Feb 2004 13:07:08 -0000	1.4
@@ -1,4 +1,3 @@
-
 ad_page_contract {
     Delete a calendar item
     
@@ -15,6 +14,8 @@
     ad_script_abort
 }
 
+auth::require_login
+
 calendar::item::delete -cal_item_id $cal_item_id
 
 ad_returnredirect $return_url
Index: openacs-4/packages/calendar/www/cal-item-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/calendar/www/cal-item-view.tcl	11 Dec 2003 21:39:59 -0000	1.13
+++ openacs-4/packages/calendar/www/cal-item-view.tcl	25 Feb 2004 13:07:08 -0000	1.14
@@ -9,7 +9,7 @@
     {return_url ""}
 }
 
-set user_id [ad_verify_and_get_user_id]
+set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
 
 permission::require_permission -object_id $cal_item_id -privilege read
Index: openacs-4/packages/calendar/www/cal-options.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/calendar/www/cal-options.adp	12 Sep 2003 20:00:13 -0000	1.7
+++ openacs-4/packages/calendar/www/cal-options.adp	25 Feb 2004 13:07:08 -0000	1.8
@@ -4,7 +4,7 @@
 <ul>
 <multiple name="calendars">
 <li> @calendars.calendar_name@
-<if @calendars.calendar_admin_p@ eq "t">
+<if @calendars.calendar_admin_p@ true>
   <br>
   <font size=-2>[<a href="@base_url@calendar-item-types?calendar_id=@calendars.calendar_id@">Manage Types</a>]</font>
 </if>
Index: openacs-4/packages/calendar/www/cal-options.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-options.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/calendar/www/cal-options.tcl	12 Aug 2003 23:42:38 -0000	1.10
+++ openacs-4/packages/calendar/www/cal-options.tcl	25 Feb 2004 13:07:08 -0000	1.11
@@ -20,6 +20,8 @@
     set base_url ""
 }
 
+set calendar_list [calendar::calendar_list]
+
 multirow create calendars calendar_name calendar_id calendar_admin_p
 foreach calendar $calendar_list {
     multirow append calendars [lindex $calendar 0] [lindex $calendar 1] [lindex $calendar 2]
Index: openacs-4/packages/calendar/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/index.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/calendar/www/index.tcl	10 Jan 2004 18:59:50 -0000	1.15
+++ openacs-4/packages/calendar/www/index.tcl	25 Feb 2004 13:07:08 -0000	1.16
@@ -10,7 +10,7 @@
 }
 
 set package_id [ad_conn package_id]
-set user_id [auth::require_login]
+set user_id [ad_conn user_id]
 
 if { ![calendar::have_private_p $user_id] } {
     calendar::new -owner_id $user_id -private_p "t" -calendar_name "Personal" -package_id $package_id
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.26 -r1.27
--- openacs-4/packages/calendar/www/view.adp	24 Feb 2004 16:13:45 -0000	1.26
+++ openacs-4/packages/calendar/www/view.adp	25 Feb 2004 13:07:08 -0000	1.27
@@ -26,7 +26,7 @@
     </p>
   
     <p>
-    <include src="cal-options" calendar_list="@calendar_list;noquote@">	
+    <include src="cal-options">	
     </p>
   </div>
 
Index: openacs-4/packages/calendar/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/calendar/www/view.tcl	24 Feb 2004 16:13:45 -0000	1.19
+++ openacs-4/packages/calendar/www/view.tcl	25 Feb 2004 13:07:08 -0000	1.20
@@ -27,7 +27,6 @@
 
 set admin_p [permission::permission_p -object_id $package_id -privilege calendar_admin]
 
-set calendar_list [calendar::calendar_list]
 set date [calendar::adjust_date -date $date]
 
 if {$view == "list"} {