Menu
▾
▴
phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(25) |
Mar
(18) |
Apr
|
May
(26) |
Jun
(14) |
Jul
(1) |
Aug
(5) |
Sep
(82) |
Oct
(3) |
Nov
(130) |
Dec
(9) |
| 2004 |
Jan
(4) |
Feb
(62) |
Mar
|
Apr
(3) |
May
(100) |
Jun
|
Jul
(6) |
Aug
(49) |
Sep
(33) |
Oct
(47) |
Nov
(2) |
Dec
(1) |
| 2005 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(8) |
May
(17) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(26) |
Oct
(18) |
Nov
(37) |
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(18) |
Mar
(34) |
Apr
(52) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(10) |
Sep
|
Oct
|
Nov
(18) |
Dec
(4) |
| 2007 |
Jan
|
Feb
(7) |
Mar
(7) |
Apr
(6) |
May
(52) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(250) |
| 2009 |
Jan
(35) |
Feb
(45) |
Mar
|
Apr
(4) |
May
(35) |
Jun
(13) |
Jul
(49) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2010 |
Jan
(3) |
Feb
(30) |
Mar
|
Apr
(35) |
May
(12) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: <ji...@us...> - 2005-12-02 17:18:38
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5767/phpicalendar/functions Modified Files: date_functions.php ical_parser.php Log Message: fix for calculation of negative byday events Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** date_functions.php 30 Oct 2005 01:32:44 -0000 1.30 --- date_functions.php 2 Dec 2005 17:18:31 -0000 1.31 *************** *** 221,225 **** // What the heck is this doing in here? ! $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); // Check for zulu time. --- 221,225 ---- // What the heck is this doing in here? ! #$data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); // Check for zulu time. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.200 retrieving revision 1.201 diff -C2 -d -r1.200 -r1.201 *** ical_parser.php 30 Nov 2005 02:20:32 -0000 1.200 --- ical_parser.php 2 Dec 2005 17:18:31 -0000 1.201 *************** *** 563,566 **** --- 563,569 ---- $recur_data[] = $next_date_time; } + #reset next_range_time to start of month + $next_range_time = strtotime(date('Y-m-'.'1', $next_range_time)); + } elseif (isset($bymonthday) && (!empty($bymonthday))) { // This supports MONTHLY where BYDAY and BYMONTH are both set |
|
From: <jo...@us...> - 2005-12-01 06:25:20
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21357 Modified Files: print.php Log Message: Feature #1109495. Print view will now show the location if the field is defined. Code provided by Nicolas Contamin. Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** print.php 24 Nov 2005 04:28:34 -0000 1.36 --- print.php 1 Dec 2005 06:25:09 -0000 1.37 *************** *** 80,83 **** --- 80,84 ---- 'l_month' => $lang['l_month'], 'l_year' => $lang['l_year'], + 'l_location' => $lang['l_location'], 'l_subscribe' => $lang['l_subscribe'], 'l_download' => $lang['l_download'], |
|
From: <jo...@us...> - 2005-12-01 06:25:20
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21357/functions Modified Files: template.php Log Message: Feature #1109495. Print view will now show the location if the field is defined. Code provided by Nicolas Contamin. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** template.php 1 Dec 2005 06:15:30 -0000 1.78 --- template.php 1 Dec 2005 06:25:09 -0000 1.79 *************** *** 77,80 **** --- 77,81 ---- if ($new_val2['event_text']) { $event_text = stripslashes(urldecode($new_val2['event_text'])); + $location = stripslashes(urldecode($new_val2['location'])); $description = stripslashes(urldecode($new_val2['description'])); $event_start = $new_val2['event_start']; *************** *** 95,101 **** $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp); } ! $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}'); ! $replace = array($event_start, $event_text, $description); $events_tmp = str_replace($search, $replace, $events_tmp); $some_events .= $events_tmp; --- 96,106 ---- $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!is', '', $events_tmp); } + + if ($location == '') { + $events_tmp = preg_replace('!<\!-- switch location_events on -->(.*)<\!-- switch location_events off -->!is', '', $events_tmp); + } ! $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}', '{LOCATION}'); ! $replace = array($event_start, $event_text, $description, $location); $events_tmp = str_replace($search, $replace, $events_tmp); $some_events .= $events_tmp; |
|
From: <jo...@us...> - 2005-12-01 06:25:18
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21357/templates/default Modified Files: print.tpl Log Message: Feature #1109495. Print view will now show the location if the field is defined. Code provided by Nicolas Contamin. Index: print.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/print.tpl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** print.tpl 23 May 2004 23:54:42 -0000 1.5 --- print.tpl 1 Dec 2005 06:25:09 -0000 1.6 *************** *** 39,42 **** --- 39,48 ---- <td align="left" class="G10B">{EVENT_START}</td> </tr> + <!-- switch location_events on --> + <tr> + <td valign="top" width="100" class="G10BOLD">{L_LOCATION}:</td> + <td valign="top" align="left" class="G10B">{LOCATION}</td> + </tr> + <!-- switch location_events off --> <tr> <td valign="top" width="100" class="G10BOLD">{L_SUMMARY}:</td> |
|
From: <jo...@us...> - 2005-12-01 06:15:40
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19823/functions Modified Files: template.php Log Message: Feature #1353342. You can now specify how many days should be displayed on the week view. All numbers, negative to more than seven, work with the expected behavior. Thanks to Nicolas Contamin for the code changes. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** template.php 29 Nov 2005 03:51:50 -0000 1.77 --- template.php 1 Dec 2005 06:15:30 -0000 1.78 *************** *** 232,236 **** function draw_week($template_p) { ! global $unique_colors, $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength, $timeFormat_small, $day_start; // Figure out colspans --- 232,236 ---- function draw_week($template_p) { ! global $unique_colors, $start_week_time, $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day, $dateFormat_week_list, $current_view, $day_array, $timeFormat, $gridLength, $timeFormat_small, $day_start, $week_length; // Figure out colspans *************** *** 253,257 **** } ! for ($i=0; $i<7; $i++) { $thisdate = date ('Ymd', $start_week_time); $weekarray[$i] = $thisdate; --- 253,257 ---- } ! for ($i=0; $i<$week_length; $i++) { $thisdate = date ('Ymd', $start_week_time); $weekarray[$i] = $thisdate; *************** *** 290,294 **** $start_wt = strtotime(dateOfWeek($getdate, $week_start_day)); $start_day = strtotime($week_start_day); ! for ($i=0; $i<7; $i++) { $day_num = date("w", $start_day); $daylink = date('Ymd', $start_wt); --- 290,294 ---- $start_wt = strtotime(dateOfWeek($getdate, $week_start_day)); $start_day = strtotime($week_start_day); ! for ($i=0; $i<$week_length; $i++) { $day_num = date("w", $start_day); $daylink = date('Ymd', $start_wt); *************** *** 361,365 **** // loop this part 7 times, one for each day ! for ($week_loop=0; $week_loop<7; $week_loop++) { $thisday = date("Ymd", $thisdate); $dayborder = 0; --- 361,365 ---- // loop this part 7 times, one for each day ! for ($week_loop=0; $week_loop<$week_length; $week_loop++) { $thisday = date("Ymd", $thisdate); $dayborder = 0; |
|
From: <jo...@us...> - 2005-12-01 06:15:40
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19823 Modified Files: config.inc.php week.php Log Message: Feature #1353342. You can now specify how many days should be displayed on the week view. All numbers, negative to more than seven, work with the expected behavior. Thanks to Nicolas Contamin for the code changes. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.171 retrieving revision 1.172 diff -C2 -d -r1.171 -r1.172 *** config.inc.php 24 Nov 2005 04:31:02 -0000 1.171 --- config.inc.php 1 Dec 2005 06:15:28 -0000 1.172 *************** *** 12,15 **** --- 12,16 ---- $language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto', 'Korean' $week_start_day = 'Sunday'; // Day of the week your week starts on + $week_length = '7'; // Number of days to display in the week view $day_start = '0700'; // Start time for day grid $day_end = '2300'; // End time for day grid Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.126 retrieving revision 1.127 diff -C2 -d -r1.126 -r1.127 *** week.php 30 Nov 2005 02:20:32 -0000 1.126 --- week.php 1 Dec 2005 06:15:28 -0000 1.127 *************** *** 18,22 **** $prev_day = date('Ymd', strtotime("-1 day", $unix_time)); $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); ! $end_week_time = $start_week_time + (6 * 25 * 60 * 60); $start_week = localizeDate($dateFormat_week, $start_week_time); $end_week = localizeDate($dateFormat_week, $end_week_time); --- 18,22 ---- $prev_day = date('Ymd', strtotime("-1 day", $unix_time)); $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); ! $end_week_time = $start_week_time + (($week_length - 1) * 25 * 60 * 60); $start_week = localizeDate($dateFormat_week, $start_week_time); $end_week = localizeDate($dateFormat_week, $end_week_time); |
|
From: <ji...@us...> - 2005-11-30 17:06:05
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3716/phpicalendar/rss Modified Files: rss.php Log Message: temporary fix to calname problem. Still need to deal with webcalnames better Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** rss.php 23 Nov 2005 07:51:01 -0000 1.33 --- rss.php 30 Nov 2005 17:05:56 -0000 1.34 *************** *** 22,26 **** //set the range of days to return based on the view chosen $rssview = $_GET['rssview']; ! if (isset($_GET['getdate'])){ $getdate = $_GET['getdate']; }else{ --- 22,26 ---- //set the range of days to return based on the view chosen $rssview = $_GET['rssview']; ! if (isset($_GET['getdate']) && $_GET['getdate'] !=''){ $getdate = $_GET['getdate']; }else{ *************** *** 96,100 **** //allow phpicalendar to use calendar subdirectories - see bbs ! $cal_displayname = getCalendarName(urldecode($cal)); if ($cal == $ALL_CALENDARS_COMBINED) { $temp = explode("/",$calendar_path); --- 96,100 ---- //allow phpicalendar to use calendar subdirectories - see bbs ! $cal_displayname = urldecode($cal); if ($cal == $ALL_CALENDARS_COMBINED) { $temp = explode("/",$calendar_path); |
|
From: <ji...@us...> - 2005-11-30 16:48:01
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31715/phpicalendar/functions Modified Files: calendar_functions.php Log Message: revert change in calendar_functions. Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** calendar_functions.php 29 Nov 2005 08:35:48 -0000 1.17 --- calendar_functions.php 30 Nov 2005 16:47:53 -0000 1.18 *************** *** 197,201 **** // At this point, just pull the name off the file. ! return basename($cal_path,".ics"); } --- 197,201 ---- // At this point, just pull the name off the file. ! return substr(basename($cal_path),0,4); } |
|
From: <ji...@us...> - 2005-11-30 02:20:42
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6081/phpicalendar Modified Files: day.php month.php week.php Log Message: change date calcs in several files for compatibility with some php installs that fail to calculate now+something Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.127 retrieving revision 1.128 diff -C2 -d -r1.127 -r1.128 *** day.php 24 Nov 2005 04:28:34 -0000 1.127 --- day.php 30 Nov 2005 02:20:32 -0000 1.128 *************** *** 3,7 **** $jumpto_day_time = strtotime($_GET['jumpto_day']); if ($jumpto_day_time == -1) { ! $getdate = date('Ymd', strtotime("now + $second_offset seconds")); } else { $getdate = date('Ymd', $jumpto_day_time); --- 3,7 ---- $jumpto_day_time = strtotime($_GET['jumpto_day']); if ($jumpto_day_time == -1) { ! $getdate = date('Ymd', time() + $second_offset); } else { $getdate = date('Ymd', $jumpto_day_time); *************** *** 19,23 **** $weekstart = 1; $unix_time = strtotime($getdate); ! $today_today = date('Ymd', strtotime("now + $second_offset seconds")); $next_day = date('Ymd', strtotime("+1 day", $unix_time)); $prev_day = date('Ymd', strtotime("-1 day", $unix_time)); --- 19,23 ---- $weekstart = 1; $unix_time = strtotime($getdate); ! $today_today = date('Ymd', time() + $second_offset); $next_day = date('Ymd', strtotime("+1 day", $unix_time)); $prev_day = date('Ymd', strtotime("-1 day", $unix_time)); Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** month.php 24 Nov 2005 04:28:34 -0000 1.134 --- month.php 30 Nov 2005 02:20:32 -0000 1.135 *************** *** 14,18 **** $unix_time = strtotime($getdate); ! $today_today = date('Ymd', strtotime("now + $second_offset seconds")); $tomorrows_date = date('Ymd', strtotime("+1 day", $unix_time)); $yesterdays_date = date('Ymd', strtotime("-1 day", $unix_time)); --- 14,18 ---- $unix_time = strtotime($getdate); ! $today_today = date('Ymd', time() + $second_offset); $tomorrows_date = date('Ymd', strtotime("+1 day", $unix_time)); $yesterdays_date = date('Ymd', strtotime("-1 day", $unix_time)); Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** week.php 24 Nov 2005 04:28:34 -0000 1.125 --- week.php 30 Nov 2005 02:20:32 -0000 1.126 *************** *** 12,16 **** $weekstart = 1; $unix_time = strtotime($getdate); ! $today_today = date('Ymd', strtotime("now + $second_offset seconds")); $next_week = date("Ymd", strtotime("+1 week", $unix_time)); $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); --- 12,16 ---- $weekstart = 1; $unix_time = strtotime($getdate); ! $today_today = date('Ymd', time() + $second_offset); $next_week = date("Ymd", strtotime("+1 week", $unix_time)); $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); |
|
From: <ji...@us...> - 2005-11-30 02:20:42
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6081/phpicalendar/functions Modified Files: ical_parser.php list_functions.php Log Message: change date calcs in several files for compatibility with some php installs that fail to calculate now+something Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.199 retrieving revision 1.200 diff -C2 -d -r1.199 -r1.200 *** ical_parser.php 25 Nov 2005 22:14:54 -0000 1.199 --- ical_parser.php 30 Nov 2005 02:20:32 -0000 1.200 *************** *** 50,54 **** $wcalc = $master_array['-4'][$z]['webcal']; if ($wcalc == 'no') $realcal_mtime = filemtime($fname); ! $webcal_mtime = strtotime("now -$webcal_hours hours"); if (($mtime == $realcal_mtime) && ($wcalc == 'no')) { $y++; --- 50,54 ---- $wcalc = $master_array['-4'][$z]['webcal']; if ($wcalc == 'no') $realcal_mtime = filemtime($fname); ! $webcal_mtime = time() - strtotime($webcal_hours * 3600); if (($mtime == $realcal_mtime) && ($wcalc == 'no')) { $y++; Index: list_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** list_functions.php 30 Oct 2005 01:32:44 -0000 1.14 --- list_functions.php 30 Nov 2005 02:20:32 -0000 1.15 *************** *** 4,8 **** global $second_offset, $lang, $cal; $calName = getCalendarName($cal); ! $today = date('Ymd', strtotime("now + $second_offset seconds")); $return = '<option value="#">'.$lang['l_jump'].'</option>'; $return .= '<option value="day.php?cal='.$calName.'&getdate='.$today.'">'.$lang['l_goday'].'</option>'; --- 4,8 ---- global $second_offset, $lang, $cal; $calName = getCalendarName($cal); ! $today = date('Ymd', time() + $second_offset); $return = '<option value="#">'.$lang['l_jump'].'</option>'; $return .= '<option value="day.php?cal='.$calName.'&getdate='.$today.'">'.$lang['l_goday'].'</option>'; |
|
From: <ji...@us...> - 2005-11-29 08:39:28
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19510/phpicalendar/functions Modified Files: init.inc.php Log Message: init.inc.php - remove .. but not . from cpath Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** init.inc.php 29 Nov 2005 08:35:48 -0000 1.79 --- init.inc.php 29 Nov 2005 08:39:20 -0000 1.80 *************** *** 29,37 **** #cpath modifies the calendar path based on the url or cookie values. This allows you to run multiple calendar subsets from a single phpicalendar installation. Operations on cpath are largely hidden from the end user. if($_REQUEST['cpath']){ ! $cpath = str_replace('.','',$_REQUEST['cpath']); $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; }elseif(isset($default_cpath_check)){ ! $cpath = str_replace('.','',$default_cpath_check); $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; --- 29,37 ---- #cpath modifies the calendar path based on the url or cookie values. This allows you to run multiple calendar subsets from a single phpicalendar installation. Operations on cpath are largely hidden from the end user. if($_REQUEST['cpath']){ ! $cpath = str_replace('..','',$_REQUEST['cpath']); $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; }elseif(isset($default_cpath_check)){ ! $cpath = str_replace('..','',$default_cpath_check); $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; |
|
From: <ji...@us...> - 2005-11-29 08:35:58
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19031/phpicalendar/functions Modified Files: calendar_functions.php init.inc.php Log Message: init.inc.php - strip . from cpath, change time calc, calendar_functions.php change in getCalendarname to not truncate names not ending in .ics Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** calendar_functions.php 24 Nov 2005 04:28:34 -0000 1.16 --- calendar_functions.php 29 Nov 2005 08:35:48 -0000 1.17 *************** *** 197,201 **** // At this point, just pull the name off the file. ! return substr(basename($cal_path), 0, -4); } --- 197,201 ---- // At this point, just pull the name off the file. ! return basename($cal_path,".ics"); } Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** init.inc.php 27 Nov 2005 07:56:31 -0000 1.78 --- init.inc.php 29 Nov 2005 08:35:48 -0000 1.79 *************** *** 27,40 **** if (isset($phpicalendar['cookie_time'])) $day_start = $phpicalendar['cookie_time']; } if($_REQUEST['cpath']){ ! $cpath = $_REQUEST['cpath']; $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; }elseif(isset($default_cpath_check)){ ! $cpath = $default_cpath_check; $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; } - #these need cpath to be set include_once(BASE.'functions/calendar_functions.php'); --- 27,40 ---- if (isset($phpicalendar['cookie_time'])) $day_start = $phpicalendar['cookie_time']; } + #cpath modifies the calendar path based on the url or cookie values. This allows you to run multiple calendar subsets from a single phpicalendar installation. Operations on cpath are largely hidden from the end user. if($_REQUEST['cpath']){ ! $cpath = str_replace('.','',$_REQUEST['cpath']); $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; }elseif(isset($default_cpath_check)){ ! $cpath = str_replace('.','',$default_cpath_check); $calendar_path .= "/$cpath"; $tmp_dir .= "/$cpath"; } #these need cpath to be set include_once(BASE.'functions/calendar_functions.php'); *************** *** 76,80 **** $getdate = $_GET['getdate']; } else { ! $getdate = date('Ymd', strtotime("now + $second_offset seconds")); } } --- 76,80 ---- $getdate = $_GET['getdate']; } else { ! $getdate = date('Ymd', time() + $second_offset); } } |
|
From: <ji...@us...> - 2005-11-29 03:51:59
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4221/phpicalendar/functions Modified Files: template.php Log Message: patches to template.php to handle empty master array without warning on bad foreach - suggested from the bbs by andrew. See http://phpicalendar.net/forums/viewtopic.php?t=292 Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** template.php 30 Oct 2005 01:32:44 -0000 1.76 --- template.php 29 Nov 2005 03:51:50 -0000 1.77 *************** *** 270,274 **** $colspan = 'colspan="'.$nbrGridCols[$get_date].'"'; $replace = str_replace('{COLSPAN}', $colspan, $replace); ! if (is_array($master_array[$get_date]['-1'])) { foreach ($master_array[$get_date]['-1'] as $uid => $allday) { $event_calno = $allday['calnumber']; --- 270,274 ---- $colspan = 'colspan="'.$nbrGridCols[$get_date].'"'; $replace = str_replace('{COLSPAN}', $colspan, $replace); ! if (is_array($master_array[$get_date]['-1']) && !empty($master_array[$get_date]['-1']) ) { foreach ($master_array[$get_date]['-1'] as $uid => $allday) { $event_calno = $allday['calnumber']; |
|
From: <ji...@us...> - 2005-11-27 07:56:42
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6132/phpicalendar/templates/default Modified Files: preferences.tpl Log Message: patches to fix several files to work better with cookies. Changes in preferences.php, preferencees.tpl, init.inc.php Index: preferences.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/preferences.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** preferences.tpl 19 May 2004 18:26:10 -0000 1.10 --- preferences.tpl 27 Nov 2005 07:56:31 -0000 1.11 *************** *** 46,50 **** <td nowrap="nowrap">{L_SELECT_CAL}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select></td> </tr> <tr align="left" valign="top"> --- 46,51 ---- <td nowrap="nowrap">{L_SELECT_CAL}:</td> <td><img src="images/spacer.gif" alt=" " width="20" height="1" border="0" /></td> ! <td><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select> ! <input type="hidden" name="cpath" value="{CPATH}"></td> </tr> <tr align="left" valign="top"> |
|
From: <ji...@us...> - 2005-11-27 07:56:41
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6132/phpicalendar/functions Modified Files: init.inc.php Log Message: patches to fix several files to work better with cookies. Changes in preferences.php, preferencees.tpl, init.inc.php Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** init.inc.php 24 Nov 2005 04:28:34 -0000 1.77 --- init.inc.php 27 Nov 2005 07:56:31 -0000 1.78 *************** *** 16,36 **** include_once(BASE.'config.inc.php'); include_once(BASE.'error.php'); - if($_REQUEST['cpath']){ - $cpath = $_REQUEST['cpath']; - $calendar_path .= "/$cpath"; - $tmp_dir .= "/$cpath"; - } - include_once(BASE.'functions/calendar_functions.php'); - include_once(BASE.'functions/userauth_functions.php'); if (isset($_COOKIE['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($_COOKIE['phpicalendar'])); if (isset($phpicalendar['cookie_language'])) $language = $phpicalendar['cookie_language']; if (isset($phpicalendar['cookie_calendar'])) $default_cal_check = $phpicalendar['cookie_calendar']; if (isset($phpicalendar['cookie_view'])) $default_view = $phpicalendar['cookie_view']; ! if (isset($phpicalendar['cookie_style'])) $style_sheet = $phpicalendar['cookie_style']; if (isset($phpicalendar['cookie_startday'])) $week_start_day = $phpicalendar['cookie_startday']; if (isset($phpicalendar['cookie_time'])) $day_start = $phpicalendar['cookie_time']; } // Set the cookie URI. --- 16,44 ---- include_once(BASE.'config.inc.php'); include_once(BASE.'error.php'); if (isset($_COOKIE['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($_COOKIE['phpicalendar'])); if (isset($phpicalendar['cookie_language'])) $language = $phpicalendar['cookie_language']; if (isset($phpicalendar['cookie_calendar'])) $default_cal_check = $phpicalendar['cookie_calendar']; + if (isset($phpicalendar['cookie_cpath'])) $default_cpath_check = $phpicalendar['cookie_cpath']; if (isset($phpicalendar['cookie_view'])) $default_view = $phpicalendar['cookie_view']; ! if (isset($phpicalendar['cookie_style'])) $template = $phpicalendar['cookie_style']; if (isset($phpicalendar['cookie_startday'])) $week_start_day = $phpicalendar['cookie_startday']; if (isset($phpicalendar['cookie_time'])) $day_start = $phpicalendar['cookie_time']; } + if($_REQUEST['cpath']){ + $cpath = $_REQUEST['cpath']; + $calendar_path .= "/$cpath"; + $tmp_dir .= "/$cpath"; + }elseif(isset($default_cpath_check)){ + $cpath = $default_cpath_check; + $calendar_path .= "/$cpath"; + $tmp_dir .= "/$cpath"; + } + + #these need cpath to be set + include_once(BASE.'functions/calendar_functions.php'); + include_once(BASE.'functions/userauth_functions.php'); + // Set the cookie URI. |
|
From: <ji...@us...> - 2005-11-27 07:56:39
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6132/phpicalendar Modified Files: preferences.php Log Message: patches to fix several files to work better with cookies. Changes in preferences.php, preferencees.tpl, init.inc.php Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** preferences.php 7 Sep 2005 03:41:18 -0000 1.55 --- preferences.php 27 Nov 2005 07:56:31 -0000 1.56 *************** *** 26,32 **** --- 26,34 ---- $startdays = array ('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'); + $cpath = $_REQUEST['cpath']; if ($action == 'setcookie') { $cookie_language = $_POST['cookie_language']; + $cookie_cpath = $_POST['cpath']; $cookie_calendar = $_POST['cookie_calendar']; $cookie_view = $_POST['cookie_view']; *************** *** 35,39 **** $cookie_time = $_POST['cookie_time']; $cookie_unset = $_POST['unset']; ! $the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time"); $the_cookie = serialize($the_cookie); if ($cookie_unset) { --- 37,41 ---- $cookie_time = $_POST['cookie_time']; $cookie_unset = $_POST['unset']; ! $the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time", "cookie_cpath"=>"$cookie_cpath"); $the_cookie = serialize($the_cookie); if ($cookie_unset) { *************** *** 43,46 **** --- 45,50 ---- } $_COOKIE['phpicalendar'] = $the_cookie; + $cpath = $cookie_cpath; + $cal = $cookie_calendar; } *************** *** 63,67 **** $cookie_calendar = $default_cal; $cookie_view = $default_view; ! $cookie_style = $style_sheet; $cookie_startday = $week_start_day; $cookie_time = $day_start; --- 67,71 ---- $cookie_calendar = $default_cal; $cookie_view = $default_view; ! $cookie_style = $template; $cookie_startday = $week_start_day; $cookie_time = $day_start; *************** *** 94,98 **** // select for calendars ! $calendar_select = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED)); // select for dayview --- 98,103 ---- // select for calendars ! $calendar_select = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED),TRUE); ! $calendar_select .="<option value=\"$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>"; // select for dayview *************** *** 147,150 **** --- 152,156 ---- 'template' => $template, 'default_path' => '', + 'cpath' => $cpath, 'cal' => $cal, 'getdate' => $getdate, |
|
From: <ji...@us...> - 2005-11-25 22:15:02
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24958/phpicalendar/functions Modified Files: ical_parser.php Log Message: patch line 38 of ical_parser.php for webcals Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.198 retrieving revision 1.199 diff -C2 -d -r1.198 -r1.199 *** ical_parser.php 23 Nov 2005 07:51:01 -0000 1.198 --- ical_parser.php 25 Nov 2005 22:14:54 -0000 1.199 *************** *** 36,40 **** if ($save_parsed_cals == 'yes') { if (sizeof ($cal_filelist) > 1) { ! $parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year; if (file_exists($parsedcal)) { $fd = fopen($parsedcal, 'r'); --- 36,40 ---- if ($save_parsed_cals == 'yes') { if (sizeof ($cal_filelist) > 1) { ! $parsedcal = $tmp_dir.'/parsedcal-'.urlencode($cal_filename).'-'.$this_year; if (file_exists($parsedcal)) { $fd = fopen($parsedcal, 'r'); |
|
From: <jo...@us...> - 2005-11-24 04:31:13
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19437 Modified Files: config.inc.php Log Message: Accidentally commited webcal URL for US holidays. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** config.inc.php 24 Nov 2005 01:33:31 -0000 1.170 --- config.inc.php 24 Nov 2005 04:31:02 -0000 1.171 *************** *** 73,77 **** // add more lines as necessary ! $list_webcals['US Holidays'] = 'http://ical.mac.com/ical/US32Holidays.ics'; // Fill in between the quotes exact URL of a calendar that you wish $list_webcals[] = ''; // to show up in your calendar list. You must prefix the URL with http:// $list_webcals[] = ''; // or webcal:// and the filename should contain the .ics suffix --- 73,77 ---- // add more lines as necessary ! $list_webcals[] = ''; // Fill in between the quotes exact URL of a calendar that you wish $list_webcals[] = ''; // to show up in your calendar list. You must prefix the URL with http:// $list_webcals[] = ''; // or webcal:// and the filename should contain the .ics suffix |
|
From: <jo...@us...> - 2005-11-24 04:28:42
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18870/functions Modified Files: calendar_functions.php init.inc.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: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** calendar_functions.php 24 Nov 2005 02:02:38 -0000 1.15 --- calendar_functions.php 24 Nov 2005 04:28:34 -0000 1.16 *************** *** 31,34 **** --- 31,35 ---- $unlocked_cals = $locked_map["$username:$password"]; } + // Make a local copy of the requested calendars. if (!is_array($cal_filename)) *************** *** 44,48 **** // Add web calendars. ! if ($cal_filename == $ALL_CALENDARS_COMBINED || $admin) { if (!isset($http_user) && !$admin) { foreach ($list_webcals as $file) { --- 45,49 ---- // Add web calendars. ! if ($cal_filename_local[0] == $ALL_CALENDARS_COMBINED || $admin) { if (!isset($http_user) && !$admin) { foreach ($list_webcals as $file) { *************** *** 57,61 **** // Set some booleans that will dictate our search. ! $find_all = ($cal_filename == $ALL_CALENDARS_COMBINED || $admin); // Process all search paths. --- 58,62 ---- // Set some booleans that will dictate our search. ! $find_all = ($cal_filename_local[0] == $ALL_CALENDARS_COMBINED || $admin); // Process all search paths. *************** *** 77,83 **** // Open the directory. $dir_handle = @opendir($search_path) ! or die(error(sprintf($lang['l_error_path'], $search_path), $cal_filename)); if ($dir_handle === false) ! die(error(sprintf($lang['l_error_path'], $search_path), $cal_filename)); // Add each file in the directory that does not begin with a dot. --- 78,84 ---- // Open the directory. $dir_handle = @opendir($search_path) ! or die(error(sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename))); if ($dir_handle === false) ! die(error(sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename))); // Add each file in the directory that does not begin with a dot. Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** init.inc.php 16 Nov 2005 01:09:36 -0000 1.76 --- init.inc.php 24 Nov 2005 04:28:34 -0000 1.77 *************** *** 77,100 **** - if ($calendar_path == '') { $calendar_path = BASE.'calendars'; } ! $is_webcal = FALSE; if (isset($_GET['cal'])) { ! //if we get a comma-separated list of calendars, split into array ! if(stristr($_GET['cal'], ",")) { ! $_GET['cal'] = explode(",", $_GET['cal']); ! } ! //if we have an array of calendars, decode each (though I'm not sure this is necessary) ! if(is_array($_GET['cal'])) { ! $cal_filename = array(); ! foreach($_GET['cal'] as $c) { ! $cal_filename[] = urldecode($c); ! } ! }else { ! $cal_filename = urldecode($_GET['cal']); ! } } else { if (isset($default_cal_check)) { --- 77,95 ---- if ($calendar_path == '') { $calendar_path = BASE.'calendars'; } ! // Pull the calendars off the GET line if provided. The $cal_filename ! // is always an array, because this makes it easier to deal with below. ! $cal_filenames = array(); if (isset($_GET['cal'])) { ! // If the cal value is not an array, split it into an array on ! // commas. ! if (!is_array($_GET['cal'])) ! $_GET['cal'] = explode(',', $_GET['cal']); ! ! // Grab the calendar filenames off the cal value array. ! $cal_filenames = array_map("urldecode", $_GET['cal']); } else { if (isset($default_cal_check)) { *************** *** 103,180 **** $calcheckopen = @fopen($calcheck, "r"); if ($calcheckopen == FALSE) { ! $cal_filename = $default_cal; } else { ! $cal_filename = $default_cal_check; } } else { ! $cal_filename = $ALL_CALENDARS_COMBINED; } } else { ! $cal_filename = $default_cal; } } ! if (!is_array($cal_filename) && (substr($cal_filename, 0, 7) == 'http://' || substr($cal_filename, 0, 8) == 'https://' || substr($cal_filename, 0, 9) == 'webcal://')) { ! $is_webcal = TRUE; ! $cal_webcalPrefix = str_replace('http://','webcal://',$cal_filename); ! $cal_httpPrefix = str_replace('webcal://','http://',$cal_filename); ! $cal_httpsPrefix = str_replace('webcal://','https://',$cal_filename); ! $cal_httpsPrefix = str_replace('http://','https://',$cal_httpsPrefix); ! $cal_filename = $cal_httpPrefix; ! } ! ! if ($is_webcal == TRUE) { ! if ($allow_webcals == 'yes' || in_array($cal_webcalPrefix, $list_webcals) || in_array($cal_httpPrefix, $list_webcals) || in_array($cal_httpsPrefix, $list_webcals)) { ! $cal_displayname = substr(str_replace('32', ' ', basename($cal_filename)), 0, -4); ! $cal = urlencode($cal_filename); ! $filename = $cal_filename; ! $subscribe_path = $cal_webcalPrefix; ! // empty the filelist array ! $cal_filelist = array(); ! array_push($cal_filelist,$filename); ! } else { ! exit(error($lang['l_error_remotecal'], $_GET['cal'])); ! } ! } else { ! $cal_displayname = str_replace('32', ' ', (is_array($cal_filename) ? implode(", ", $cal_filename) : $cal_filename)); ! if(is_array($cal_filename)) { ! $cal = array(); ! $blacklisted = FALSE; ! foreach($cal_filename as $c) { ! $cal[] = urlencode($c); ! if(in_array($c, $blacklisted_cals)) $blacklisted = TRUE; ! } ! $cal = implode(",", $cal); } else { ! $cal = urlencode($cal_filename); ! $blacklisted = in_array($cal_filename, $blacklisted_cals); } ! if ($blacklisted) { ! exit(error($lang['l_error_restrictedcal'], $cal_filename)); ! } else { ! if (!isset($filename)) { ! $cal_filelist = availableCalendars($username, $password, $cal_filename); ! if (count($cal_filelist) == 1) $filename = $cal_filelist[0]; ! } ! // Sets the download and subscribe paths from the config if present. ! if (isset($filename)) { ! if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) { ! $subscribe_path = 'webcal://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']).'/'."$cpath/".$filename; ! $download_filename = $filename; ! } elseif ($download_uri != '') { ! $newurl = eregi_replace("^(http://)", "", $download_uri); ! $subscribe_path = 'webcal://'.$newurl.'/'."$cpath/".$cal_filename.'.ics'; ! $download_filename = $download_uri.'/'."$cpath/".$cal_filename.'.ics'; ! } else { ! $subscribe_path = "$cpath/"; ! $download_filename = "$cpath/"; ! } } } } $rss_powered = ($enable_rss == 'yes') ? 'yes' : ''; --- 98,222 ---- $calcheckopen = @fopen($calcheck, "r"); if ($calcheckopen == FALSE) { ! $cal_filenames[0] = $default_cal; } else { ! $cal_filenames[0] = $default_cal_check; } } else { ! $cal_filenames[0] = $ALL_CALENDARS_COMBINED; } } else { ! $cal_filenames[0] = $default_cal; } } ! // Separate the calendar identifiers into web calendars and local ! // calendars. ! $web_cals = array(); ! $local_cals = array(); ! foreach ($cal_filenames as $cal_filename) { ! // If the calendar identifier begins with a web protocol, this is a web ! // calendar. ! if (substr($cal_filename, 0, 7) == 'http://' || ! substr($cal_filename, 0, 8) == 'https://' || ! substr($cal_filename, 0, 9) == 'webcal://') ! { ! $web_cals[] = $cal_filename; } + + // Otherwise it is a local calendar. else { ! // Check blacklisted. ! if (in_array($cal_filename, $blacklisted_cals)) { ! exit(error($lang['l_error_restrictedcal'], $cal_filename)); ! } ! $local_cals[] = $cal_filename; } + } ! // We will build the calendar display name as we go. The final display ! // name will get constructed at the end. ! $cal_displaynames = array(); ! ! // This is our list of final calendars. ! $cal_filelist = array(); ! ! // This is our list of URL encoded calendars. ! $cals = array(); ! ! // Process the web calendars. ! foreach ($web_cals as $web_cal) { ! // Make some protocol alternatives, and set our real identifier to the ! // HTTP protocol. ! $cal_webcalPrefix = str_replace('http://','webcal://',$web_cal); ! $cal_httpPrefix = str_replace('webcal://','http://',$web_cal); ! $cal_httpsPrefix = str_replace('webcal://','https://',$web_cal); ! $cal_httpsPrefix = str_replace('http://','https://',$web_cal); ! $web_cal = $cal_httpPrefix; ! // We can only include this web calendar if we allow all web calendars ! // (as defined by $allow_webcals) or if the web calendar shows up in the ! // list of web calendars defined in config.inc.php. ! if ($allow_webcals != 'yes' && ! !in_array($cal_webcalPrefix, $list_webcals) && ! !in_array($cal_httpPrefix, $list_webcals) && ! !in_array($cal_httpsPrefix, $list_webcals)) ! { ! exit(error($lang['l_error_remotecal'], $web_cal)); ! } ! ! // Pull the display name off the URL. ! $cal_displaynames[] = substr(str_replace('32', ' ', basename($web_cal)), 0, -4); ! ! // FIXME ! $cals[] = urlencode($web_cal); ! //$filename = $cal_filename; ! $subscribe_path = $cal_webcalPrefix; ! ! // Add the webcal to the available calendars. ! $cal_filelist[] = $web_cal; ! } ! ! // Process the local calendars. ! if (count($local_cals) > 0) { ! $local_cals = availableCalendars($username, $password, $local_cals); ! foreach ($local_cals as $local_cal) { ! $cal_displaynames[] = str_replace('32', ' ', getCalendarName($local_cal)); ! } ! $cal_filelist = array_merge($cal_filelist, $local_cals); ! $cals = array_merge($cals, array_map("urlencode", array_map("getCalendarName", $local_cals))); ! ! // Set the download and subscribe paths from the config, if there is ! // only one calendar being displayed and those paths are defined. ! if (count($local_cals) == 1) { ! $filename = $local_cals[0]; ! if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) { ! $subscribe_path = 'webcal://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']).'/'."$cpath/".$filename; ! $download_filename = $filename; ! } elseif ($download_uri != '') { ! $newurl = eregi_replace("^(http://)", "", $download_uri); ! $subscribe_path = 'webcal://'.$newurl.'/'."$cpath/".$filename.'.ics'; ! $download_filename = $download_uri.'/'."$cpath/".$filename.'.ics'; ! } else { ! $subscribe_path = "$cpath/"; ! $download_filename = "$cpath/"; } } } + // We should only allow a download filename and subscribe path if there is + // only one calendar being displayed. + if (count($cal_filelist) > 1) { + $subscribe_path = ''; + $download_filename = ''; + } + + // Build the final cal list. This is a comma separated list of the + // url-encoded calendar names and web calendar URLs. + $cal = implode(',', $cals); + + // Build the final display name used for template substitution. + asort($cal_displaynames); + $cal_displayname = implode(', ', $cal_displaynames); + $rss_powered = ($enable_rss == 'yes') ? 'yes' : ''; |
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' => '', |
|
From: <jo...@us...> - 2005-11-24 02:02:49
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28947 Modified Files: calendar_functions.php Log Message: Reverted behavior, as the previous behavior was correct according to the comment in config.inc.php. Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** calendar_functions.php 24 Nov 2005 01:42:49 -0000 1.14 --- calendar_functions.php 24 Nov 2005 02:02:38 -0000 1.15 *************** *** 44,50 **** // Add web calendars. ! if ($allow_webcals == 'yes' && ! ($cal_filename == $ALL_CALENDARS_COMBINED || $admin)) ! { if (!isset($http_user) && !$admin) { foreach ($list_webcals as $file) { --- 44,48 ---- // Add web calendars. ! if ($cal_filename == $ALL_CALENDARS_COMBINED || $admin) { if (!isset($http_user) && !$admin) { foreach ($list_webcals as $file) { |
|
From: <jo...@us...> - 2005-11-24 01:42:57
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25836 Modified Files: calendar_functions.php Log Message: Fixed bug that would display webcals defined in the $list_webcals array for $ALL_CALENDARS_COMBINED even if the global $allow_webcals was not 'yes'. Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** calendar_functions.php 16 Nov 2005 01:36:09 -0000 1.13 --- calendar_functions.php 24 Nov 2005 01:42:49 -0000 1.14 *************** *** 15,19 **** function availableCalendars($username, $password, $cal_filename, $admin = false) { // Import globals. ! global $allow_login, $calendar_path, $recursive_path, $support_ical, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $apache_map, $lang, $ALL_CALENDARS_COMBINED, $_SERVER; // Create the list of available calendars. --- 15,19 ---- function availableCalendars($username, $password, $cal_filename, $admin = false) { // Import globals. ! global $allow_webcals, $allow_login, $calendar_path, $recursive_path, $support_ical, $blacklisted_cals, $list_webcals, $locked_cals, $locked_map, $apache_map, $lang, $ALL_CALENDARS_COMBINED, $_SERVER; // Create the list of available calendars. *************** *** 44,48 **** // Add web calendars. ! if ($cal_filename == $ALL_CALENDARS_COMBINED || $admin) { if (!isset($http_user) && !$admin) { foreach ($list_webcals as $file) { --- 44,50 ---- // Add web calendars. ! if ($allow_webcals == 'yes' && ! ($cal_filename == $ALL_CALENDARS_COMBINED || $admin)) ! { if (!isset($http_user) && !$admin) { foreach ($list_webcals as $file) { |
|
From: <jo...@us...> - 2005-11-24 01:33:39
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24591 Modified Files: README config.inc.php Log Message: Added support for Apple iCal native repository format and recursive calendar searching to the 2.2 README change list. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** README 23 Nov 2005 08:05:30 -0000 1.95 --- README 24 Nov 2005 01:33:31 -0000 1.96 *************** *** 82,87 **** Changes: -------- ! 2.2 -rss.php new feed types for different kinds of date ranges changed handling of multi-day events -bug fixes from 2.1 handling of webcals popup encoding display when individual calendars displayed ! -known bug: webcals don't work with multiple calendar selection 2.1 -Updated languages: Finnish -RSS feeds display as previously indended. --- 82,98 ---- Changes: -------- ! 2.2 ! -Added Apple iCal native repository support. ! -Added support for finding calendars in subdirectories. ! -rss.php ! new feed types for different kinds of date ranges ! changed handling of multi-day events ! -bug fixes from 2.1 ! handling of webcals ! popup encoding ! display when individual calendars displayed ! -known bug: webcals don't work with multiple calendar selection ! ! 2.1 -Updated languages: Finnish -RSS feeds display as previously indended. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** config.inc.php 30 Oct 2005 01:32:44 -0000 1.169 --- config.inc.php 24 Nov 2005 01:33:31 -0000 1.170 *************** *** 73,77 **** // add more lines as necessary ! $list_webcals[] = ''; // Fill in between the quotes exact URL of a calendar that you wish $list_webcals[] = ''; // to show up in your calendar list. You must prefix the URL with http:// $list_webcals[] = ''; // or webcal:// and the filename should contain the .ics suffix --- 73,77 ---- // add more lines as necessary ! $list_webcals['US Holidays'] = 'http://ical.mac.com/ical/US32Holidays.ics'; // Fill in between the quotes exact URL of a calendar that you wish $list_webcals[] = ''; // to show up in your calendar list. You must prefix the URL with http:// $list_webcals[] = ''; // or webcal:// and the filename should contain the .ics suffix |
|
From: <ji...@us...> - 2005-11-23 08:05:44
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16821/phpicalendar/templates/default Modified Files: footer.tpl Log Message: modified footer and README for 2.2 release Index: footer.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/footer.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** footer.tpl 5 Oct 2005 00:29:13 -0000 1.11 --- footer.tpl 23 Nov 2005 08:05:30 -0000 1.12 *************** *** 1,3 **** ! <center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.1</a><br /> <!-- switch rss_valid on --> <p> --- 1,3 ---- ! <center class="V9"><br />{L_POWERED_BY} <a class="psf" href="http://phpicalendar.net/">PHP iCalendar 2.2</a><br /> <!-- switch rss_valid on --> <p> |
|
From: <ji...@us...> - 2005-11-23 08:05:39
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16821/phpicalendar Modified Files: README Log Message: modified footer and README for 2.2 release Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** README 25 Oct 2005 02:47:30 -0000 1.94 --- README 23 Nov 2005 08:05:30 -0000 1.95 *************** *** 82,86 **** Changes: -------- ! 2.1 -Updated languages: Finnish -RSS feeds display as previously indended. --- 82,87 ---- Changes: -------- ! 2.2 -rss.php new feed types for different kinds of date ranges changed handling of multi-day events -bug fixes from 2.1 handling of webcals popup encoding display when individual calendars displayed ! -known bug: webcals don't work with multiple calendar selection 2.1 -Updated languages: Finnish -RSS feeds display as previously indended. |
