Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18870 Modified Files: README day.php month.php print.php search.php week.php year.php Log Message: Fixed support for multiple selection web calendars. You can now select multiple local and web calendars, in any number and combination. The calendar name will also be displayed correctly, instead of only displaying a single calendar name when multiple calendars are chosen. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** README 24 Nov 2005 01:33:31 -0000 1.96 --- README 24 Nov 2005 04:28:34 -0000 1.97 *************** *** 85,88 **** --- 85,89 ---- -Added Apple iCal native repository support. -Added support for finding calendars in subdirectories. + -Can now select multiple local and web calendars. -rss.php new feed types for different kinds of date ranges *************** *** 92,96 **** popup encoding display when individual calendars displayed - -known bug: webcals don't work with multiple calendar selection 2.1 --- 93,96 ---- Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** day.php 11 Nov 2005 05:08:30 -0000 1.126 --- day.php 24 Nov 2005 04:28:34 -0000 1.127 *************** *** 61,65 **** 'getcpath' => "&cpath=$cpath", 'cpath' => $cpath, ! 'calendar_name' => (is_array($calendar_name) ? "Multiple" : $calendar_name), 'current_view' => $current_view, 'display_date' => $display_date, --- 61,65 ---- 'getcpath' => "&cpath=$cpath", 'cpath' => $cpath, ! 'calendar_name' => $cal_displayname, 'current_view' => $current_view, 'display_date' => $display_date, Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** month.php 11 Nov 2005 05:08:30 -0000 1.133 --- month.php 24 Nov 2005 04:28:34 -0000 1.134 *************** *** 68,72 **** 'getcpath' => "&cpath=$cpath", 'cpath' => $cpath, ! 'calendar_name' => $calendar_name, 'display_date' => $display_date, 'rss_powered' => $rss_powered, --- 68,72 ---- 'getcpath' => "&cpath=$cpath", 'cpath' => $cpath, ! 'calendar_name' => $cal_displayname, 'display_date' => $display_date, 'rss_powered' => $rss_powered, *************** *** 139,141 **** ! ?> \ No newline at end of file --- 139,141 ---- ! ?> Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** print.php 6 May 2005 21:44:50 -0000 1.35 --- print.php 24 Nov 2005 04:28:34 -0000 1.36 *************** *** 52,56 **** 'cal' => $cal, 'getdate' => $getdate, ! 'calendar_name' => $calendar_name, 'current_view' => $current_view, 'printview' => $printview, --- 52,56 ---- 'cal' => $cal, 'getdate' => $getdate, ! 'calendar_name' => $cal_displayname, 'current_view' => $current_view, 'printview' => $printview, Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** search.php 7 Sep 2005 04:41:23 -0000 1.36 --- search.php 24 Nov 2005 04:28:34 -0000 1.37 *************** *** 293,297 **** 'cal' => $cal, 'getdate' => $getdate, ! 'calendar_name' => $calendar_name, 'display_date' => $display_date, 'current_view' => $current_view, --- 293,297 ---- 'cal' => $cal, 'getdate' => $getdate, ! 'calendar_name' => $cal_displayname, 'display_date' => $display_date, 'current_view' => $current_view, *************** *** 321,325 **** 'getdate' => $getdate, 'cpath' => $cpath, ! 'calendar_name' => $calendar_name, 'display_date' => $display_date, 'rss_powered' => $rss_powered, --- 321,325 ---- 'getdate' => $getdate, 'cpath' => $cpath, ! 'calendar_name' => $cal_displayname, 'display_date' => $display_date, 'rss_powered' => $rss_powered, Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.124 retrieving revision 1.125 diff -C2 -d -r1.124 -r1.125 *** week.php 11 Nov 2005 05:08:30 -0000 1.124 --- week.php 24 Nov 2005 04:28:34 -0000 1.125 *************** *** 63,67 **** 'getcpath' => "&cpath=$cpath", 'cpath' => $cpath, ! 'calendar_name' => $calendar_name, 'display_date' => $display_date, 'current_view' => $current_view, --- 63,67 ---- 'getcpath' => "&cpath=$cpath", 'cpath' => $cpath, ! 'calendar_name' => $cal_displayname, 'display_date' => $display_date, 'current_view' => $current_view, Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** year.php 11 Nov 2005 05:08:30 -0000 1.37 --- year.php 24 Nov 2005 04:28:34 -0000 1.38 *************** *** 32,36 **** 'cpath' => $cpath, 'getdate' => $getdate, ! 'calendar_name' => $calendar_name, 'display_date' => $this_year, 'default_path' => '', --- 32,36 ---- 'cpath' => $cpath, 'getdate' => $getdate, ! 'calendar_name' => $cal_displayname, 'display_date' => $this_year, 'default_path' => '', |