Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/calendar/www/cal-item-new.adp	21 Jul 2003 19:21:36 -0000	1.8
+++ openacs-4/packages/calendar/www/cal-item-new.adp	26 Jul 2003 20:55:11 -0000	1.9
@@ -12,7 +12,7 @@
       <p>
       <include src="mini-calendar" base_url="view" view="day" date="@date@">
       <p>
-	<include src="cal-options">	
+	<include src="cal-options" calendar_list="@calendar_list@">	
     </td>	
 
     <td valign=top> 
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/calendar/www/cal-item-new.tcl	21 Jul 2003 19:21:36 -0000	1.9
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	26 Jul 2003 20:55:11 -0000	1.10
@@ -16,6 +16,7 @@
 set package_id [ad_conn package_id]
 
 set date [calendar::adjust_date -date $date -julian_date $julian_date]
+set calendar_list [calendar::calendar_list]
 
 if {[empty_string_p $calendar_id]} {
     set calendar_list [calendar::calendar_list]
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 -N -r1.6 -r1.7
--- openacs-4/packages/calendar/www/cal-options.tcl	22 Jul 2003 11:49:18 -0000	1.6
+++ openacs-4/packages/calendar/www/cal-options.tcl	26 Jul 2003 20:55:11 -0000	1.7
@@ -14,22 +14,11 @@
 } {
 }
 
-# get a user_id
-set user_id [ad_verify_and_get_user_id]
+set user_id [ad_conn user_id]
 
-set calendar_list [calendar::calendar_list]
-
-if {[llength $calendar_list] > 0} {
-    set calendar_list_sql "[join $calendar_list ","]"
-
-    db_multirow calendars select_calendars "
-    select calendar_id, calendar_name, 
-    acs_permission__permission_p(calendar_id, :user_id, 'calendar_admin') as calendar_admin_p
-    from calendars
-    where calendar_id in ($calendar_list_sql)
-    "
-} else {
-    multirow create calendars
+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]
 }
 
 ad_return_template
Index: openacs-4/packages/calendar/www/calendar-choose.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/calendar-choose.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/calendar/www/calendar-choose.adp	21 Jul 2003 19:21:36 -0000	1.5
+++ openacs-4/packages/calendar/www/calendar-choose.adp	26 Jul 2003 20:55:11 -0000	1.6
@@ -10,7 +10,7 @@
       <p>
       <include src="mini-calendar" base_url="view" view="day" date="@date@">
      <p>
-	<include src="cal-options">	
+	<include src="cal-options" calendar_list="@calendar_list@">	
     </td>	
 
     <td valign=top> 
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/calendar/www/view.adp	22 Jul 2003 16:16:05 -0000	1.13
+++ openacs-4/packages/calendar/www/view.adp	26 Jul 2003 20:55:11 -0000	1.14
@@ -16,7 +16,7 @@
 <if @admin_p@ eq 1>
     <a href="admin/">Administer Calendar</a>
 </if>
-<include src="cal-options">	
+<include src="cal-options" calendar_list="@calendar_list@">	
 
     </td>	
 
Index: openacs-4/packages/calendar/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/calendar/www/view.tcl	22 Jul 2003 16:16:05 -0000	1.13
+++ openacs-4/packages/calendar/www/view.tcl	26 Jul 2003 20:55:11 -0000	1.14
@@ -10,7 +10,6 @@
     {view day}
     {date ""}
     {julian_date ""}
-    {calendar_list:multiple ""}
     {sort_by ""}
     {start_date ""}
     {period_days:integer "31"}
@@ -31,7 +30,7 @@
 
 set admin_p [ad_permission_p $package_id calendar_admin]
 
-set calendar_list [calendar::adjust_calendar_list -calendar_list $calendar_list -package_id $package_id -user_id $user_id]
+set calendar_list [calendar::calendar_list]
 set date [calendar::adjust_date -date $date -julian_date $julian_date]
 
 if {$view == "list"} {