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-11-23 07:51:15
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11871/phpicalendar/functions Modified Files: ical_parser.php Log Message: changes to fix bugs in handling webcals Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.197 retrieving revision 1.198 diff -C2 -d -r1.197 -r1.198 *** ical_parser.php 30 Oct 2005 01:32:44 -0000 1.197 --- ical_parser.php 23 Nov 2005 07:51:01 -0000 1.198 *************** *** 72,76 **** foreach ($cal_filelist as $filename) { $realcal_mtime = filemtime($filename); ! $parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year; if (file_exists($parsedcal)) { $parsedcal_mtime = filemtime($parsedcal); --- 72,76 ---- foreach ($cal_filelist as $filename) { $realcal_mtime = filemtime($filename); ! $parsedcal = $tmp_dir.'/parsedcal-'.urlencode($cal_filename).'-'.$this_year; if (file_exists($parsedcal)) { $parsedcal_mtime = filemtime($parsedcal); |
|
From: <ji...@us...> - 2005-11-23 07:51:15
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11871/phpicalendar/rss Modified Files: index.php rss.php Log Message: changes to fix bugs in handling webcals Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** index.php 30 Oct 2005 01:32:44 -0000 1.38 --- index.php 23 Nov 2005 07:51:01 -0000 1.39 *************** *** 25,30 **** // $cal is a urlencoded version of $cal_filename // $cal_displayname is $cal_filename with occurrences of "32" replaced with " " ! $cal_filename_tmp = getCalendarName($file); ! $cal_tmp = urlencode($cal_filename_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); $rss_list .= '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />'; --- 25,34 ---- // $cal is a urlencoded version of $cal_filename // $cal_displayname is $cal_filename with occurrences of "32" replaced with " " ! ! if (substr($file, 0, 7) == 'http://' || substr($file, 0, 8) == 'https://' || substr($file, 0, 9) == 'webcal://') { ! $cal_tmp = urlencode($file); ! }else{ ! $cal_tmp = getCalendarName($file); ! } $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); $rss_list .= '<font class="V12" color="blue"><b>'.$cal_displayname_tmp.' '. $calendar_lang.'</b></font><br />'; Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** rss.php 23 Nov 2005 06:11:45 -0000 1.32 --- rss.php 23 Nov 2005 07:51:01 -0000 1.33 *************** *** 96,100 **** //allow phpicalendar to use calendar subdirectories - see bbs ! $cal_displayname = str_replace("32", " ", $cal); if ($cal == $ALL_CALENDARS_COMBINED) { $temp = explode("/",$calendar_path); --- 96,100 ---- //allow phpicalendar to use calendar subdirectories - see bbs ! $cal_displayname = getCalendarName(urldecode($cal)); if ($cal == $ALL_CALENDARS_COMBINED) { $temp = explode("/",$calendar_path); |
|
From: <ji...@us...> - 2005-11-23 06:11:54
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27206/phpicalendar/rss Modified Files: rss.php Log Message: use lang var instead of english 'all day' Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** rss.php 16 Nov 2005 01:17:34 -0000 1.31 --- rss.php 23 Nov 2005 06:11:45 -0000 1.32 *************** *** 160,164 **** $uid_arr[$uid] = "$dayofweek" ; } ! $event_start = "All Day"; }else{ $event_start = @$val["event_start"]; --- 160,164 ---- $uid_arr[$uid] = "$dayofweek" ; } ! $event_start = $lang['l_all_day']; }else{ $event_start = @$val["event_start"]; *************** *** 226,230 **** $date_range = $temp[0].'-'.array_pop($temp); } ! $rss = str_replace("<uid>$uid</uid>\n<event_start>all day</event_start>","<uid>$uid</uid>\n<event_start>$date_range</event_start>", $rss); } --- 226,230 ---- $date_range = $temp[0].'-'.array_pop($temp); } ! $rss = str_replace("<uid>$uid</uid>\n<event_start>".$lang['l_all_day']."</event_start>","<uid>$uid</uid>\n<event_start>$date_range</event_start>", $rss); } |
|
From: <ji...@us...> - 2005-11-23 06:08:55
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26730/phpicalendar/templates/default Modified Files: year.tpl Log Message: remove a dumb addition I made to the templates, which led to cpath being there twice Index: year.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/year.tpl,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** year.tpl 11 Nov 2005 05:12:11 -0000 1.9 --- year.tpl 23 Nov 2005 06:08:45 -0000 1.10 *************** *** 27,34 **** <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> --- 27,34 ---- <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> |
|
From: <ji...@us...> - 2005-11-23 06:08:04
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26617/phpicalendar/templates/default Modified Files: day.tpl month.tpl week.tpl Log Message: remove a dumb addition I made to the templates, which led to cpath being there twice Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** day.tpl 11 Nov 2005 04:53:21 -0000 1.16 --- day.tpl 23 Nov 2005 06:07:56 -0000 1.17 *************** *** 14,21 **** <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> --- 14,21 ---- <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> Index: month.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month.tpl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** month.tpl 11 Nov 2005 05:12:11 -0000 1.16 --- month.tpl 23 Nov 2005 06:07:56 -0000 1.17 *************** *** 11,18 **** <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> --- 11,18 ---- <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** week.tpl 11 Nov 2005 05:08:31 -0000 1.11 --- week.tpl 23 Nov 2005 06:07:56 -0000 1.12 *************** *** 14,21 **** <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> --- 14,21 ---- <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> |
|
From: <ji...@us...> - 2005-11-16 01:36:18
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15018/phpicalendar/functions Modified Files: calendar_functions.php Log Message: change append .ics method Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** calendar_functions.php 12 Nov 2005 08:21:38 -0000 1.12 --- calendar_functions.php 16 Nov 2005 01:36:09 -0000 1.13 *************** *** 91,95 **** // we have to append '.ics' to the passed in calendar names. foreach ($cal_filename_local as $filename) { ! array_push($files, "$search_path/$filename\.ics"); } } --- 91,95 ---- // we have to append '.ics' to the passed in calendar names. foreach ($cal_filename_local as $filename) { ! array_push($files, "$search_path/$filename".".ics"); } } |
|
From: <ji...@us...> - 2005-11-16 01:17:46
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11974/phpicalendar/rss Modified Files: rss.php Log Message: bug fixes and additions to rss.php. Fixed problems with data calculations and added rssview=year Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** rss.php 12 Nov 2005 07:57:37 -0000 1.30 --- rss.php 16 Nov 2005 01:17:34 -0000 1.31 *************** *** 8,13 **** --- 8,19 ---- * PHP note: #@ is error control operator to suppress execution halt on error * - used below to deal with undef? + * + * using rssview, RSS feeds can be specified to return events for a given day, week, month, or year + * feeds can be specified for a number of days to or from a given date + * feeds can be specified for a range of dates + * *********************************************************************************/ define('BASE', '../'); + include(BASE.'functions/init.inc.php'); include_once(BASE.'functions/date_functions.php'); *************** *** 40,43 **** --- 46,59 ---- $theview = date('M Y',strtotime($fromdate)); break; + case 'year': + if(isset($_GET['year'])){ + $theyear = $_GET['year']; + }else{ + $theyear = date('Y'); + } + $fromdate = ($theyear*10000)+101; + $todate = date("Ymd", strtotime($fromdate) + 365*60*60*24); + $theview = $theyear; + break; case 'daysfrom': $fromdate = $getdate; *************** *** 53,57 **** --- 69,77 ---- break; case 'range': + if(isset($_GET['from'])){ $fromdate = $_GET['from']; + }else{ + $fromdate = $getdate; + } $todate = $_GET['to']; $theview = date('n/d/Y',strtotime($fromdate)).'-'.date('n/d/Y',strtotime($todate)); *************** *** 132,135 **** --- 152,156 ---- foreach ($master_array[("$thisdate")] as $event_times) { foreach ($event_times as $uid=>$val) { + #handle multiday all day events if(!$val["event_start"]){ if (isset($uid_arr[$uid])){ *************** *** 165,170 **** $rss .= '<event_start>'.$event_start.'</event_start>'."\n"; $rss .= '<title>'.$rss_title.'</title>'."\n"; ! /* ! $rss .= '<event_start>'.$event_start.'</event_start>'."\n"; $rss .= '<seminardate>'.$dayofweek.'</seminardate>'."\n"; $rss .= '<seminarspeaker>'.$event_text.'</seminarspeaker>'."\n"; --- 186,190 ---- $rss .= '<event_start>'.$event_start.'</event_start>'."\n"; $rss .= '<title>'.$rss_title.'</title>'."\n"; ! /* custom stuff for Jim Hu's RSS feeds. Deprecated $rss .= '<seminardate>'.$dayofweek.'</seminardate>'."\n"; $rss .= '<seminarspeaker>'.$event_text.'</seminarspeaker>'."\n"; *************** *** 174,183 **** $rss .= '<organizer>'.$val['organizer'].'</organizer>'."\n"; $rss .= '<status>'.$val['status'].'</status>'."\n"; - $location = str_replace('&','&',$val['location']); - $location = str_replace('&amp;','&',$location); - $rss .= '<location>'.$location.'</location>'; */ $rss .= '<link>'.$rss_link.'</link>'."\n"; $rss .= '<description>'.$rss_description.'</description>'."\n"; $rss .= '</item>'."\n"; $events_count++; --- 194,203 ---- $rss .= '<organizer>'.$val['organizer'].'</organizer>'."\n"; $rss .= '<status>'.$val['status'].'</status>'."\n"; */ $rss .= '<link>'.$rss_link.'</link>'."\n"; $rss .= '<description>'.$rss_description.'</description>'."\n"; + $location = str_replace('&','&',$val['location']); + $location = str_replace('&amp;','&',$location); + $rss .= '<location>'.$location.'</location>'; $rss .= '</item>'."\n"; $events_count++; |
|
From: <ji...@us...> - 2005-11-16 01:09:50
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10599/phpicalendar/functions Modified Files: init.inc.php Log Message: bug fixes to handle cpath better Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** init.inc.php 5 Oct 2005 00:29:13 -0000 1.75 --- init.inc.php 16 Nov 2005 01:09:36 -0000 1.76 *************** *** 16,19 **** --- 16,25 ---- 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'); *************** *** 70,78 **** } ! if($_REQUEST['cpath']){ ! $cpath = $_REQUEST['cpath']; ! $calendar_path .= "/$cpath"; ! $tmp_dir .= "/$cpath"; ! } if ($calendar_path == '') { --- 76,80 ---- } ! if ($calendar_path == '') { *************** *** 86,90 **** $_GET['cal'] = explode(",", $_GET['cal']); } ! //if we have an array of calendard, decode each (though I'm not sure this is necessary) if(is_array($_GET['cal'])) { $cal_filename = array(); --- 88,92 ---- $_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(); *************** *** 92,97 **** $cal_filename[] = urldecode($c); } ! } ! else { $cal_filename = urldecode($_GET['cal']); } --- 94,98 ---- $cal_filename[] = urldecode($c); } ! }else { $cal_filename = urldecode($_GET['cal']); } |
|
From: <jo...@us...> - 2005-11-12 08:21:47
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27529/functions Modified Files: calendar_functions.php Log Message: Corrected filename identification issue when selecting a specific calendar by name, where the calendar file would fail to be found. Included a comment explaining what is going on. Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** calendar_functions.php 30 Oct 2005 01:32:44 -0000 1.11 --- calendar_functions.php 12 Nov 2005 08:21:38 -0000 1.12 *************** *** 68,72 **** // Build the list of files we need to check. ! if ($find_all || $recursive_path == 'yes') { // Open the directory. $dir_handle = @opendir($search_path) --- 68,78 ---- // Build the list of files we need to check. ! // ! // We do a full directory search if we are supposed to find all ! // calendars, the calendar we're looking for may be in a ! // subdirectory, or we are supporting the iCal repository format. ! // The latter is necessary because the calendar name cannot be ! // used to identify the calendar filename. ! if ($find_all || $recursive_path == 'yes' || $support_ical == 'yes') { // Open the directory. $dir_handle = @opendir($search_path) *************** *** 82,87 **** } } else { foreach ($cal_filename_local as $filename) { ! array_push($files, "$search_path/$filename"); } } --- 88,95 ---- } } else { + // The file process block below expects actual filenames. So + // we have to append '.ics' to the passed in calendar names. foreach ($cal_filename_local as $filename) { ! array_push($files, "$search_path/$filename\.ics"); } } |
|
From: <ji...@us...> - 2005-11-12 07:57:45
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24628/phpicalendar/rss Modified Files: rss.php Log Message: fix rss.php bugs and merge multiday events Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** rss.php 30 Oct 2005 07:34:35 -0000 1.29 --- rss.php 12 Nov 2005 07:57:37 -0000 1.30 *************** *** 10,23 **** *********************************************************************************/ define('BASE', '../'); - include(BASE.'functions/ical_parser.php'); ! if ($enable_rss != 'yes') { ! die ("RSS feeds are not enabled on this site."); ! } //set the range of days to return based on the view chosen $rssview = $_GET['rssview']; ! ! if (!$getdate){$getdate = date("Ymd");} switch ($rssview){ --- 10,24 ---- *********************************************************************************/ define('BASE', '../'); ! include_once(BASE.'functions/date_functions.php'); ! //set the range of days to return based on the view chosen $rssview = $_GET['rssview']; ! if (isset($_GET['getdate'])){ ! $getdate = $_GET['getdate']; ! }else{ ! $getdate = date("Ymd"); ! } switch ($rssview){ *************** *** 27,30 **** --- 28,36 ---- $theview = $lang['l_day']; break; + case 'week': + $fromdate = dateOfWeek($getdate, $week_start_day); + $todate = $fromdate + 6; + $theview = $lang['l_week']." of ".date('n/d/Y',strtotime($fromdate)); + break; case 'month': $parse_month = date ("Ym", strtotime($getdate)); *************** *** 36,40 **** case 'daysfrom': $fromdate = $getdate; ! $todate = $getdate + $_GET['days']; #print "from:$fromdate to: $todate<br>"; $theview = $_GET['days']." days from ".date('n/d/Y',strtotime($fromdate)); --- 42,46 ---- case 'daysfrom': $fromdate = $getdate; ! $todate = date("Ymd", strtotime($getdate) + $_GET['days']*60*60*24); #print "from:$fromdate to: $todate<br>"; $theview = $_GET['days']." days from ".date('n/d/Y',strtotime($fromdate)); *************** *** 42,46 **** case 'daysto': $todate = $getdate; ! $fromdate = $getdate - $_GET['days']; #print "from:$fromdate to: $todate<br>"; $theview = $_GET['days']." days before ".date('n/d/Y',strtotime($todate)); --- 48,52 ---- case 'daysto': $todate = $getdate; ! $fromdate = date("Ymd", strtotime($getdate) - $_GET['days']*60*60*24); #print "from:$fromdate to: $todate<br>"; $theview = $_GET['days']." days before ".date('n/d/Y',strtotime($todate)); *************** *** 55,61 **** $fromdate = dateOfWeek($getdate, $week_start_day); $todate = $fromdate + 6; ! $theview = $lang['l_week']." of ".date('n/d/Y',strtotime($fromdate)); } //Set calendar or calendar directory name for feed //Note that this depends on other modifications I've made to --- 61,75 ---- $fromdate = dateOfWeek($getdate, $week_start_day); $todate = $fromdate + 6; ! $theview = ""; } + #need to give ical_parser the most distant date to correctly set up master_array. + $getdate = $todate; + #echo "from:$fromdate to:$todate"; + include(BASE.'functions/ical_parser.php'); + if ($enable_rss != 'yes') { + die ("RSS feeds are not enabled on this site."); + } + //Set calendar or calendar directory name for feed //Note that this depends on other modifications I've made to *************** *** 96,100 **** $rss .= '<rss version="0.91">'."\n"; $rss .= '<channel>'."\n"; ! $rss .= '<title>'.$cal_displayname.' - '.$theview.'</title>'."\n"; $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; $rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n"; --- 110,116 ---- $rss .= '<rss version="0.91">'."\n"; $rss .= '<channel>'."\n"; ! $rss .= '<title>'.$cal_displayname; ! if ($theview !=""){$rss .= ' - '.$theview;} ! $rss .= "</title>\n"; $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; $rss .= '<description>'.$cal_displayname.' '.$lang['l_calendar'].' - '.$theview.'</description>'."\n"; *************** *** 108,120 **** # I use it as a date, dist uses it as a time $i = 0; #day counter ! do { $thisdate=date('Ymd', strtotime($thisdate)); ! #echo "Date: $thisdate\n"; $dayofweek = localizeDate ("%a %b %e %Y", strtotime($thisdate)); if (isset($master_array[($thisdate)]) && sizeof($master_array[($thisdate)]) > 0) { foreach ($master_array[("$thisdate")] as $event_times) { ! foreach ($event_times as $val) { if(!$val["event_start"]){ $event_start = "All Day"; }else{ --- 124,142 ---- # I use it as a date, dist uses it as a time $i = 0; #day counter ! $uid_arr = array(); do { $thisdate=date('Ymd', strtotime($thisdate)); ! #echo "Date: $thisdate<br>\n"; $dayofweek = localizeDate ("%a %b %e %Y", strtotime($thisdate)); if (isset($master_array[($thisdate)]) && sizeof($master_array[($thisdate)]) > 0) { foreach ($master_array[("$thisdate")] as $event_times) { ! foreach ($event_times as $uid=>$val) { if(!$val["event_start"]){ + if (isset($uid_arr[$uid])){ + $uid_arr[$uid] .= "+$dayofweek" ; + continue; + }else{ + $uid_arr[$uid] = "$dayofweek" ; + } $event_start = "All Day"; }else{ *************** *** 126,129 **** --- 148,152 ---- $event_text = str_replace('&','&',$event_text); $event_text = str_replace('&amp;','&',$event_text); + $event_text = urlencode($event_text); #uncomment for shorter event text with ... # $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); *************** *** 136,143 **** $rss_title = htmlspecialchars ("$dayofweek: $event_text"); $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$thisdate&cal=$cal&cpath=$cpath"); - if ($description == '') $description = $event_text; $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); $rss .= '<item>'."\n"; $rss .= '<title>'.$rss_title.'</title>'."\n"; /* --- 159,167 ---- $rss_title = htmlspecialchars ("$dayofweek: $event_text"); $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$thisdate&cal=$cal&cpath=$cpath"); $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); $rss .= '<item>'."\n"; + $rss .= '<uid>'.$uid.'</uid>'."\n"; + $rss .= '<event_start>'.$event_start.'</event_start>'."\n"; $rss .= '<title>'.$rss_title.'</title>'."\n"; /* *************** *** 174,177 **** --- 198,212 ---- $rss .= '</rss>'."\n"; + foreach ($uid_arr as $uid=>$date_range){ + #echo "date_range:$date_range<br>"; + + if(strpos($date_range,"+")>0){ + #echo "+ in date_range<br>"; + $temp = explode("+",$date_range); + $date_range = $temp[0].'-'.array_pop($temp); + } + $rss = str_replace("<uid>$uid</uid>\n<event_start>all day</event_start>","<uid>$uid</uid>\n<event_start>$date_range</event_start>", $rss); + + } header ("Content-Type: text/xml"); |
|
From: <ji...@us...> - 2005-11-11 05:15:33
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29514/phpicalendar/templates/default Modified Files: calendar_nav.tpl Log Message: fix calendar nav icons to pass cpath Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/calendar_nav.tpl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** calendar_nav.tpl 14 Sep 2005 20:44:55 -0000 1.13 --- calendar_nav.tpl 11 Nov 2005 05:15:25 -0000 1.14 *************** *** 28,31 **** --- 28,33 ---- <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> + <input type="hidden" name="cpath" value="{CPATH}"> + </form> <!-- switch show_search on --> *************** *** 34,37 **** --- 36,40 ---- <!-- switch show_goto on --> <form style="margin-bottom:0;" action="day.php" method="get"> + <input type="hidden" name="cpath" value="{CPATH}"> <input type="hidden" name="cal" value="{URL_CAL}"> <input type="text" style="width:160px; font-size:10px" name="jumpto_day"> *************** *** 43,46 **** --- 46,50 ---- <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get"> <input type="hidden" name="getdate" value="{GETDATE}"> + <input type="hidden" name="cpath" value="{CPATH}"> <select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br /> <input type="submit" value="go"> |
|
From: <ji...@us...> - 2005-11-11 05:12:19
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29110/phpicalendar/templates/default Modified Files: month.tpl year.tpl Log Message: fix small nav icons to pass cpath Index: month.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/month.tpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** month.tpl 20 May 2004 03:59:37 -0000 1.15 --- month.tpl 11 Nov 2005 05:12:11 -0000 1.16 *************** *** 11,18 **** <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> --- 11,18 ---- <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> Index: year.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/year.tpl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** year.tpl 13 Aug 2004 22:30:10 -0000 1.8 --- year.tpl 11 Nov 2005 05:12:11 -0000 1.9 *************** *** 27,34 **** <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> --- 27,34 ---- <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> |
|
From: <ji...@us...> - 2005-11-11 05:08:39
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28427/phpicalendar/templates/default Modified Files: week.tpl Log Message: fix small nav icons to pass cpath Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** week.tpl 23 May 2004 23:31:22 -0000 1.10 --- week.tpl 11 Nov 2005 05:08:31 -0000 1.11 *************** *** 14,21 **** <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> --- 14,21 ---- <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> |
|
From: <ji...@us...> - 2005-11-11 05:08:39
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28427/phpicalendar Modified Files: day.php month.php week.php year.php Log Message: fix small nav icons to pass cpath Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.125 retrieving revision 1.126 diff -C2 -d -r1.125 -r1.126 *** day.php 14 Sep 2005 20:53:53 -0000 1.125 --- day.php 11 Nov 2005 05:08:30 -0000 1.126 *************** *** 59,62 **** --- 59,63 ---- 'cal' => $cal, 'getdate' => $getdate, + 'getcpath' => "&cpath=$cpath", 'cpath' => $cpath, 'calendar_name' => (is_array($calendar_name) ? "Multiple" : $calendar_name), Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.132 retrieving revision 1.133 diff -C2 -d -r1.132 -r1.133 *** month.php 14 Sep 2005 20:53:53 -0000 1.132 --- month.php 11 Nov 2005 05:08:30 -0000 1.133 *************** *** 66,69 **** --- 66,70 ---- 'cal' => $cal, 'getdate' => $getdate, + 'getcpath' => "&cpath=$cpath", 'cpath' => $cpath, 'calendar_name' => $calendar_name, Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.123 retrieving revision 1.124 diff -C2 -d -r1.123 -r1.124 *** week.php 14 Sep 2005 20:53:53 -0000 1.123 --- week.php 11 Nov 2005 05:08:30 -0000 1.124 *************** *** 61,65 **** 'cal' => $cal, 'getdate' => $getdate, ! 'cpath' => $cpath, 'calendar_name' => $calendar_name, 'display_date' => $display_date, --- 61,66 ---- 'cal' => $cal, 'getdate' => $getdate, ! 'getcpath' => "&cpath=$cpath", ! 'cpath' => $cpath, 'calendar_name' => $calendar_name, 'display_date' => $display_date, Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** year.php 14 Sep 2005 00:42:32 -0000 1.36 --- year.php 11 Nov 2005 05:08:30 -0000 1.37 *************** *** 29,32 **** --- 29,34 ---- 'default_path' => '', 'cal' => $cal, + 'getcpath' => "&cpath=$cpath", + 'cpath' => $cpath, 'getdate' => $getdate, 'calendar_name' => $calendar_name, |
|
From: <ji...@us...> - 2005-11-11 04:53:28
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25584/phpicalendar/templates/default Modified Files: day.tpl Log Message: fix day.tpl small nav icons to pass cpath needs change in day.php Index: day.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/day.tpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** day.tpl 23 May 2004 23:31:22 -0000 1.15 --- day.tpl 11 Nov 2005 04:53:21 -0000 1.16 *************** *** 14,21 **** <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> --- 14,21 ---- <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> ! <td><a class="psf" href="day.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td> ! <td><a class="psf" href="week.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td> ! <td><a class="psf" href="month.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td> ! <td><a class="psf" href="year.php?cal={CAL}&getdate={GETDATE}{GETCPATH}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0" /></a></td> </tr> </table> |
|
From: <ji...@us...> - 2005-11-11 01:39:45
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23692/phpicalendar/templates/default Modified Files: sidebar.tpl Log Message: fix sidebar to pass cpath Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** sidebar.tpl 30 Oct 2005 07:32:45 -0000 1.16 --- sidebar.tpl 11 Nov 2005 01:39:37 -0000 1.17 *************** *** 81,84 **** --- 81,86 ---- <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br /> <select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br /> + <input type="hidden" name="cpath" value="{CPATH}"> + </form> <!-- switch show_search on --> |
|
From: <ji...@us...> - 2005-11-11 01:32:33
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21911/phpicalendar Modified Files: index.php Log Message: fix index.php to pass cpath Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** index.php 27 Oct 2005 17:27:58 -0000 1.11 --- index.php 11 Nov 2005 01:32:24 -0000 1.12 *************** *** 18,21 **** --- 18,24 ---- } } + if(isset($_GET['cpath'])){ + $default_view .= '?cpath='.$_GET['cpath']; + } header("Location: $default_view"); |
|
From: <ji...@us...> - 2005-11-11 01:30:24
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21539/phpicalendar/includes Modified Files: event.php Log Message: stripslashes in event.php Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** event.php 13 Sep 2005 21:57:28 -0000 1.34 --- event.php 11 Nov 2005 01:30:11 -0000 1.35 *************** *** 26,31 **** } ! $event['description'] = urldecode(stripslashes($event['description'])); ! $event['event_text'] = urldecode(stripslashes($event['event_text'])); if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); --- 26,31 ---- } ! $event['description'] = stripslashes(urldecode($event['description'])); ! $event['event_text'] = stripslashes(urldecode($event['event_text'])); if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); *************** *** 73,77 **** 'attendee' => $attendee, 'status' => $event['status'], ! 'location' => $event['location'], 'cal_title_full' => $event['calname'].' '.$lang['l_calendar'], 'template' => $template, --- 73,77 ---- 'attendee' => $attendee, 'status' => $event['status'], ! 'location' => stripslashes($event['location']), 'cal_title_full' => $event['calname'].' '.$lang['l_calendar'], 'template' => $template, |
|
From: <ji...@us...> - 2005-10-30 07:34:44
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27238/phpicalendar/rss Modified Files: rss.php Log Message: fix date for rss_ link Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** rss.php 30 Oct 2005 01:23:48 -0000 1.28 --- rss.php 30 Oct 2005 07:34:35 -0000 1.29 *************** *** 135,139 **** $rss_title = htmlspecialchars ("$dayofweek: $event_text"); ! $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal&cpath=$cpath"); if ($description == '') $description = $event_text; $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); --- 135,139 ---- $rss_title = htmlspecialchars ("$dayofweek: $event_text"); ! $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$thisdate&cal=$cal&cpath=$cpath"); if ($description == '') $description = $event_text; $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); |
|
From: <ji...@us...> - 2005-10-30 07:32:53
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26993/phpicalendar/templates/default Modified Files: sidebar.tpl Log Message: Add support for cpath to multiple calendar pick Index: sidebar.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/sidebar.tpl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** sidebar.tpl 14 Sep 2005 20:44:55 -0000 1.15 --- sidebar.tpl 30 Oct 2005 07:32:45 -0000 1.16 *************** *** 95,98 **** --- 95,99 ---- <div class = 'G10BOLD'>Pick Multiple:</div> <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get"> + <input type="hidden" name="cpath" value="{CPATH}"> <input type="hidden" name="getdate" value="{GETDATE}"> <select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br /> |
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6700/functions Modified Files: calendar_functions.php date_functions.php ical_parser.php list_functions.php template.php Log Message: Added support for recursively searching for calendars in your $calendar_path and the new iCal calendar repository structure. The calendars are still referenced by calendar name, so all URLs are unchanged. Refactored the date parsing code out of ical_parser.php and into date_functions.php. Minor logic changes to the parser to correctly populate the TODO date and time values. Refactored the calendar name code into a new getCalendarName() function, since calendar names may no longer be determined solely by filename if using an iCal repository. Template code updated to match. Added calls to stripslashes() for calendar text data, such as the summaries and descriptions. Also put stripslashes() into people data, since people's names may contain escaped characters. Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** calendar_functions.php 27 Oct 2005 17:41:24 -0000 1.10 --- calendar_functions.php 30 Oct 2005 01:32:44 -0000 1.11 *************** *** 15,19 **** function availableCalendars($username, $password, $cal_filename, $admin = false) { // Import globals. ! global $allow_login, $calendar_path, $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_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. *************** *** 31,67 **** $unlocked_cals = $locked_map["$username:$password"]; } ! ! // Include all local and web calendars if asking for all calendars ! // combined. ! if ($cal_filename == $ALL_CALENDARS_COMBINED || $admin) { ! // Add local calendars. ! $dir_handle = @opendir($calendar_path) ! or die(error(sprintf($lang['l_error_path'], $calendar_path), $cal_filename)); ! while (($file = readdir($dir_handle)) != false) { ! // Make sure this is not a dot file and it ends with .ics, ! // and that it is not blacklisted. ! if (!preg_match("/^[^.].*\.ics$/i", $file)) continue; ! $cal_name = substr($file, 0, -4); ! if (in_array($cal_name, $blacklisted_cals)) continue; ! // If HTTP authenticated, make sure this calendar is available ! // to the user. ! if (isset($http_user)) { ! if (!in_array($cal_name, $apache_map[$http_user])) continue; ! } ! ! // Otherwise exclude locked calendars. ! else if (!$admin && ! in_array($cal_name, $locked_cals) && ! !in_array($cal_name, $unlocked_cals)) ! { ! continue; ! } ! ! // Add this calendar. ! array_push($calendars, "$calendar_path/$file"); ! } ! // Add web calendars. if (!isset($http_user) && !$admin) { foreach ($list_webcals as $file) { --- 31,48 ---- $unlocked_cals = $locked_map["$username:$password"]; } ! // Make a local copy of the requested calendars. ! if (!is_array($cal_filename)) ! $cal_filename_local = array($cal_filename); ! else ! $cal_filename_local = $cal_filename; ! // Create the list of available calendars. ! $calendars = array(); ! ! // This array keeps track of paths we need to search. ! $search_paths = array($calendar_path); ! // Add web calendars. ! if ($cal_filename == $ALL_CALENDARS_COMBINED || $admin) { if (!isset($http_user) && !$admin) { foreach ($list_webcals as $file) { *************** *** 75,119 **** } ! // Otherwise just include the requested calendar. ! else { ! if(!is_array($cal_filename)) { ! $cal_filename_local = array($cal_filename); ! } ! else { ! $cal_filename_local = $cal_filename; ! } ! ! foreach($cal_filename_local as $c) { ! ! // Make sure this is not a blacklisted calendar. We don't have ! // to remove a .ics suffix because it would not have been passed ! // in the argument. ! if (in_array($c, $blacklisted_cals)) ! exit(error($lang['l_error_restrictedcal'], $c)); ! ! // If HTTP authenticated, make sure this calendar is available ! // to the user. ! if (isset($http_user)) { ! if (!in_array($c, $apache_map[$http_user])) { ! // Use the invalid calendar message so that the user is ! // not made aware of locked calendars. ! exit(error($lang['l_error_invalidcal'], $c)); } } ! // Otherwise make sure this calendar is not locked. ! else if (in_array($c, $locked_cals) && ! !in_array($c, $unlocked_cals)) ! { ! // Use the invalid calendar message so that the user is ! // not made aware of locked calendars. ! exit(error($lang['l_error_invalidcal'], $c)); ! } ! // Add this calendar. ! array_push($calendars, "$calendar_path/$c.ics"); } } ! // Return the sorted calendar list. natcasesort($calendars); --- 56,138 ---- } ! // Set some booleans that will dictate our search. ! $find_all = ($cal_filename == $ALL_CALENDARS_COMBINED || $admin); ! ! // Process all search paths. ! while (!empty($search_paths)) { ! // Read the next search path. ! $search_path = array_pop($search_paths); ! ! // This array keeps track of filenames we need to look at. ! $files = array(); ! ! // Build the list of files we need to check. ! if ($find_all || $recursive_path == 'yes') { ! // 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. ! while (false !== ($file = readdir($dir_handle))) { ! // Make sure this is not a dot file. ! if (preg_match("/^\./", $file)) continue; ! array_push($files, "$search_path/$file"); ! } ! } else { ! foreach ($cal_filename_local as $filename) { ! array_push($files, "$search_path/$filename"); } } ! // Process files. ! foreach ($files as $file) { ! // Push directories onto the search paths if recursive paths is ! // turned on. ! if (is_dir($file)) { ! if ($recursive_path == 'yes') { ! array_push($search_paths, $file); ! } ! continue; ! } ! ! // Make sure the file is real. ! if (!is_file($file)) continue; ! ! // Make sure the file ends in .ics. ! if (!preg_match("/^.*\.ics$/i", $file)) continue; ! ! // Make sure this is not a blacklisted calendar. ! $cal_name = getCalendarName($file); ! if (in_array($cal_name, $blacklisted_cals)) continue; ! ! // If HTTP authenticated, make sure this calendar is available ! // to the user. ! if (isset($http_user)) { ! if (!in_array($cal_name, $apache_map[$http_user])) continue; ! } ! // Make sure this calendar is not locked. ! if (!$admin && ! in_array($cal_name, $locked_cals) && ! !in_array($cal_name, $unlocked_cals)) ! { ! continue; ! } ! ! // Add this calendar if we're looking for it, and remove it's name ! // from the local list because we've found it. ! if ($find_all || in_array($cal_name, $cal_filename_local)) { ! array_push($calendars, $file); ! $cal_filename_local = array_diff($cal_filename_local, array($cal_name)); ! ! // If the local list is empty, we're done. ! if (empty($cal_filename_local)) ! break 2; ! } } } ! // Return the sorted calendar list. natcasesort($calendars); *************** *** 122,127 **** // This function returns the result of the availableCalendars function ! // but only includes the calendar filename (including the .ics) and not ! // the entire path. // // $username = The username. Empty if no username provided. --- 141,145 ---- // This function returns the result of the availableCalendars function ! // but only includes the calendar names. // // $username = The username. Empty if no username provided. *************** *** 137,141 **** // Strip the paths off the calendars. foreach (array_keys($calendars) as $key) { ! $calendars[$key] = basename($calendars[$key]); } --- 155,159 ---- // Strip the paths off the calendars. foreach (array_keys($calendars) as $key) { ! $calendars[$key] = getCalendarName($key); } *************** *** 145,148 **** --- 163,194 ---- } + // This function returns the calendar name for the specified calendar + // path. + // + // $cal_path = The path to the calendar file. + function getCalendarName($cal_path) { + global $support_ical; + + // If iCal is supported, check the directory for an Info.plist. + if ($support_ical == 'yes') { + // Look for the Info.plist file. + $plist_filename = dirname($cal_path)."/Info.plist"; + if (is_file($plist_filename)) { + // Read the Info.plist. + $handle = fopen($plist_filename, 'r'); + $contents = fread($handle, filesize($plist_filename)); + fclose($handle); + + // Pull out the calendar name. + $num_matches = preg_match("/<key>Title<\/key>\s*?<string>(.+?)<\/string>/i", $contents, $matches); + if ($num_matches > 0) + return $matches[1]; + } + } + + // At this point, just pull the name off the file. + return substr(basename($cal_path), 0, -4); + } + // This function prints out the calendars available to the user, for // selection. Should be enclosed within a <select>...</select>, which *************** *** 159,165 **** // Only display the calendar name, replace all instances of "32" with " ", // and remove the .ics suffix. ! $cal_displayname_tmp = basename($cal_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp); - $cal_displayname_tmp = substr($cal_displayname_tmp, 0, -4); // If this is a webcal, add 'Webcal' to the display name. --- 205,210 ---- // Only display the calendar name, replace all instances of "32" with " ", // and remove the .ics suffix. ! $cal_displayname_tmp = getCalendarName($cal_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp); // If this is a webcal, add 'Webcal' to the display name. *************** *** 173,178 **** else { // Strip path and .ics suffix. ! $cal_tmp = basename($cal_tmp); ! $cal_tmp = substr($cal_tmp, 0, -4); // Add calendar label. --- 218,222 ---- else { // Strip path and .ics suffix. ! $cal_tmp = getCalendarName($cal_tmp); // Add calendar label. *************** *** 213,215 **** } return $return; ! } \ No newline at end of file --- 257,259 ---- } return $return; ! } Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** date_functions.php 15 Sep 2005 22:51:27 -0000 1.29 --- date_functions.php 30 Oct 2005 01:32:44 -0000 1.30 *************** *** 207,209 **** --- 207,296 ---- return $return; } + + // Returns an array of the date and time extracted from the data + // passed in. This array contains (unixtime, date, time, allday). + // + // $data = A string representing a date-time per RFC2445. + // $property = The property being examined, e.g. DTSTART, DTEND. + // $field = The full field being examined, e.g. DTSTART;TZID=US/Pacific + function extractDateTime($data, $property, $field) { + global $tz_array; + + // Initialize values. + unset($unixtime, $date, $time, $allday); + + // What the heck is this doing in here? + $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); + + // Check for zulu time. + $zulu_time = false; + if (substr($data,-1) == 'Z') $zulu_time = true; + $data = str_replace('Z', '', $data); + + // Remove some substrings we don't want to look at. + $data = str_replace('T', '', $data); + $field = str_replace(';VALUE=DATE-TIME', '', $field); + + // Extract date-only values. + if ((preg_match('/^'.$property.';VALUE=DATE/i', $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data))) { + // Pull out the date value. Minimum year is 1970. + ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dt_check); + if ($dt_check[1] < 1970) { + $data = '1971'.$dt_check[2].$dt_check[3]; + } + + // Set the values. + $unixtime = strtotime($data); + $date = date('Ymd', $unixtime); + $allday = $data; + } + + // Extract date-time values. + else { + // Pull out the timezone, or use GMT if zulu time was indicated. + if (preg_match('/^'.$property.';TZID=/i', $field)) { + $tz_tmp = explode('=', $field); + $tz_dt = $tz_tmp[1]; + unset($tz_tmp); + } elseif ($zulu_time) { + $tz_dt = 'GMT'; + } + + // Pull out the date and time values. Minimum year is 1970. + preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs); + if ($regs[1] < 1970) { + $regs[1] = '1971'; + } + $date = $regs[1] . $regs[2] . $regs[3]; + $time = $regs[4] . $regs[5]; + $unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); + + // Check for daylight savings time. + $dlst = date('I', $unixtime); + $server_offset_tmp = chooseOffset($unixtime); + if (isset($tz_dt)) { + if (array_key_exists($tz_dt, $tz_array)) { + $offset_tmp = $tz_array[$tz_dt][$dlst]; + } else { + $offset_tmp = '+0000'; + } + } elseif (isset($calendar_tz)) { + if (array_key_exists($calendar_tz, $tz_array)) { + $offset_tmp = $tz_array[$calendar_tz][$dlst]; + } else { + $offset_tmp = '+0000'; + } + } else { + $offset_tmp = $server_offset_tmp; + } + + // Set the values. + $unixtime = calcTime($offset_tmp, $server_offset_tmp, $unixtime); + $date = date('Ymd', $unixtime); + $time = date('Hi', $unixtime); + } + + // Return the results. + return array($unixtime, $date, $time, $allday); + } ?> Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.196 retrieving revision 1.197 diff -C2 -d -r1.196 -r1.197 *** ical_parser.php 14 Sep 2005 00:42:32 -0000 1.196 --- ical_parser.php 30 Oct 2005 01:32:44 -0000 1.197 *************** *** 100,105 **** // Find the real name of the calendar. ! $actual_calname = str_replace($calendar_path, '', $filename); ! $actual_calname = str_replace('/', '', str_replace('.ics', '', $actual_calname)); if ($parse_file) { --- 100,104 ---- // Find the real name of the calendar. ! $actual_calname = getCalendarName($filename); if ($parse_file) { *************** *** 806,904 **** // case 'DUE': ! $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); ! $zulu_time = false; ! if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = str_replace('T', '', $data); ! $data = str_replace('Z', '', $data); ! if (preg_match("/^DUE;VALUE=DATE/i", $field)) { ! $allday_start = $data; ! $start_date = $allday_start; ! $start_unixtime = strtotime($data); ! $due_date = date('Ymd', $start_unixtime); ! } else { ! if (preg_match("/^DUE;TZID=/i", $field)) { ! $tz_tmp = explode('=', $field); ! $tz_due = $tz_tmp[1]; ! unset($tz_tmp); ! } elseif ($zulu_time) { ! $tz_due = 'GMT'; ! } ! ! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); ! $due_date = $regs[1] . $regs[2] . $regs[3]; ! $due_time = $regs[4] . $regs[5]; ! $start_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); ! ! $dlst = date('I', $start_unixtime); ! $server_offset_tmp = chooseOffset($start_unixtime); ! if (isset($tz_due)) { ! if (array_key_exists($tz_due, $tz_array)) { ! $offset_tmp = $tz_array[$tz_due][$dlst]; ! } else { ! $offset_tmp = '+0000'; ! } ! } elseif (isset($calendar_tz)) { ! if (array_key_exists($calendar_tz, $tz_array)) { ! $offset_tmp = $tz_array[$calendar_tz][$dlst]; ! } else { ! $offset_tmp = '+0000'; ! } ! } else { ! $offset_tmp = $server_offset_tmp; ! } ! $start_unixtime = calcTime($offset_tmp, $server_offset_tmp, $start_unixtime); ! $due_date = date('Ymd', $start_unixtime); ! $due_time = date('Hi', $start_unixtime); ! unset($server_offset_tmp); ! } break; case 'COMPLETED': ! $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); ! $zulu_time = false; ! if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = str_replace('T', '', $data); ! $data = str_replace('Z', '', $data); ! if (preg_match("/^COMPLETED;VALUE=DATE/i", $field)) { ! $allday_start = $data; ! $start_date = $allday_start; ! } else { ! if (preg_match("/^COMPLETED;TZID=/i", $field)) { ! $tz_tmp = explode('=', $field); ! $tz_completed = $tz_tmp[1]; ! unset($tz_tmp); ! } elseif ($zulu_time) { ! $tz_completed = 'GMT'; ! } ! ! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})', $data, $regs); ! $completed_date = $regs[1] . $regs[2] . $regs[3]; ! $completed_time = $regs[4] . $regs[5]; ! $start_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); ! ! $dlst = date('I', $start_unixtime); ! $server_offset_tmp = chooseOffset($start_unixtime); ! if (isset($tz_completed)) { ! if (array_key_exists($tz_completed, $tz_array)) { ! $offset_tmp = $tz_array[$tz_completed][$dlst]; ! } else { ! $offset_tmp = '+0000'; ! } ! } elseif (isset($calendar_tz)) { ! if (array_key_exists($calendar_tz, $tz_array)) { ! $offset_tmp = $tz_array[$calendar_tz][$dlst]; ! } else { ! $offset_tmp = '+0000'; ! } ! } else { ! $offset_tmp = $server_offset_tmp; ! } ! $start_unixtime = calcTime($offset_tmp, $server_offset_tmp, $start_unixtime); ! $completed_date = date('Ymd', $start_unixtime); ! $completed_time = date('Hi', $start_unixtime); ! unset($server_offset_tmp); ! } ! break; ! case 'PRIORITY': $vtodo_priority = "$data"; --- 805,819 ---- // case 'DUE': ! $datetime = extractDateTime($data, $property, $field); ! $due_date = $datetime[1]; ! $due_time = $datetime[2]; break; case 'COMPLETED': ! $datetime = extractDateTime($data, $property, $field); ! $completed_date = $datetime[1]; ! $completed_time = $datetime[2]; ! break; ! case 'PRIORITY': $vtodo_priority = "$data"; *************** *** 915,1023 **** case 'CATEGORIES': $vtodo_categories = "$data"; ! break; // // End VTODO Parsing case 'DTSTART': ! $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); ! $zulu_time = false; ! if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = str_replace('T', '', $data); ! $data = str_replace('Z', '', $data); ! $field = str_replace(';VALUE=DATE-TIME', '', $field); ! if ((preg_match("/^DTSTART;VALUE=DATE/i", $field)) || (ereg ('^([0-9]{4})([0-9]{2})([0-9]{2})$', $data))) { ! ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtstart_check); ! if ($dtstart_check[1] < 1970) { ! $data = '1971'.$dtstart_check[2].$dtstart_check[3]; ! } ! $allday_start = $data; ! $start_date = $allday_start; ! $start_unixtime = strtotime($data); ! } else { ! if (preg_match("/^DTSTART;TZID=/i", $field)) { ! $tz_tmp = explode('=', $field); ! $tz_dtstart = $tz_tmp[1]; ! unset($tz_tmp); ! } elseif ($zulu_time) { ! $tz_dtstart = 'GMT'; ! } ! ! preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs); ! if ($regs[1] < 1970) { ! $regs[1] = '1971'; ! } ! $start_date = $regs[1] . $regs[2] . $regs[3]; ! $start_time = $regs[4] . $regs[5]; ! $start_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); ! ! $dlst = date('I', $start_unixtime); ! $server_offset_tmp = chooseOffset($start_unixtime); ! if (isset($tz_dtstart)) { ! if (array_key_exists($tz_dtstart, $tz_array)) { ! $offset_tmp = $tz_array[$tz_dtstart][$dlst]; ! } else { ! $offset_tmp = '+0000'; ! } ! } elseif (isset($calendar_tz)) { ! if (array_key_exists($calendar_tz, $tz_array)) { ! $offset_tmp = $tz_array[$calendar_tz][$dlst]; ! } else { ! $offset_tmp = '+0000'; ! } ! } else { ! $offset_tmp = $server_offset_tmp; ! } ! $start_unixtime = calcTime($offset_tmp, $server_offset_tmp, $start_unixtime); ! $start_date = date('Ymd', $start_unixtime); ! $start_time = date('Hi', $start_unixtime); ! unset($server_offset_tmp, $offset_tmp, $tz_dtstart); ! } break; case 'DTEND': ! $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); ! $zulu_time = false; ! if (substr($data,-1) == 'Z') $zulu_time = true; ! $data = str_replace('T', '', $data); ! $data = str_replace('Z', '', $data); ! $field = str_replace(';VALUE=DATE-TIME', '', $field); ! if (preg_match("/^DTEND;VALUE=DATE/i", $field)) { ! preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})/', $data, $dtend_check); ! if ($dtend_check[1] < 1970) { ! $data = '1971'.$dtend_check[2].$dtend_check[3]; ! } ! $allday_end = $data; ! } else { ! if (preg_match("/^DTEND;TZID=/i", $field)) { ! $tz_tmp = explode('=', $field); ! $tz_dtend = $tz_tmp[1]; ! unset($tz_tmp); ! } elseif ($zulu_time) { ! $tz_dtend = 'GMT'; ! } ! ! preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs); ! if ($regs[1] < 1970) { ! $regs[1] = '1971'; ! } ! $end_date = $regs[1] . $regs[2] . $regs[3]; ! $end_time = $regs[4] . $regs[5]; ! $end_unixtime = mktime($regs[4], $regs[5], 0, $regs[2], $regs[3], $regs[1]); ! ! $dlst = date('I', $end_unixtime); ! $server_offset_tmp = chooseOffset($end_unixtime); ! if (isset($tz_dtend)) { ! $offset_tmp = $tz_array[$tz_dtend][$dlst]; ! } elseif (isset($calendar_tz)) { ! $offset_tmp = $tz_array[$calendar_tz][$dlst]; ! } else { ! $offset_tmp = $server_offset_tmp; ! } ! $end_unixtime = calcTime($offset_tmp, $server_offset_tmp, $end_unixtime); ! $end_date = date('Ymd', $end_unixtime); ! $end_time = date('Hi', $end_unixtime); ! unset($server_offset_tmp, $offset_tmp, $tz_dtend); ! ! } break; --- 830,851 ---- case 'CATEGORIES': $vtodo_categories = "$data"; ! break; // // End VTODO Parsing case 'DTSTART': ! $datetime = extractDateTime($data, $property, $field); ! $start_unixtime = $datetime[0]; ! $start_date = $datetime[1]; ! $start_time = $datetime[2]; ! $allday_start = $datetime[3]; break; case 'DTEND': ! $datetime = extractDateTime($data, $property, $field); ! $end_unixtime = $datetime[0]; ! $end_date = $datetime[1]; ! $end_time = $datetime[2]; ! $allday_end = $datetime[3]; break; *************** *** 1043,1046 **** --- 871,875 ---- $data = str_replace("\\r", "<br />", $data); $data = str_replace('$', '$', $data); + $data = stripslashes($data); $data = htmlentities(urlencode($data)); if ($valarm_set == FALSE) { *************** *** 1056,1059 **** --- 885,889 ---- $data = str_replace("\\r", "<br />", $data); $data = str_replace('$', '$', $data); + $data = stripslashes($data); $data = htmlentities(urlencode($data)); if ($valarm_set == FALSE) { *************** *** 1142,1151 **** $field = str_replace("ATTENDEE;CN=", "", $field); $data = str_replace ("mailto:", "", $data); ! $attendee[] = array ('name' => $field, 'email' => $data); break; case 'ORGANIZER': $field = str_replace("ORGANIZER;CN=", "", $field); $data = str_replace ("mailto:", "", $data); ! $organizer[] = array ('name' => $field, 'email' => $data); break; case 'LOCATION': --- 972,981 ---- $field = str_replace("ATTENDEE;CN=", "", $field); $data = str_replace ("mailto:", "", $data); ! $attendee[] = array ('name' => stripslashes($field), 'email' => stripslashes($data)); break; case 'ORGANIZER': $field = str_replace("ORGANIZER;CN=", "", $field); $data = str_replace ("mailto:", "", $data); ! $organizer[] = array ('name' => stripslashes($field), 'email' => stripslashes($data)); break; case 'LOCATION': *************** *** 1153,1156 **** --- 983,987 ---- $data = str_replace("\\t", " ", $data); $data = str_replace("\\r", "<br />", $data); + $data = stripslashes($data); $location = $data; break; Index: list_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** list_functions.php 21 Oct 2004 20:15:14 -0000 1.13 --- list_functions.php 30 Oct 2005 01:32:44 -0000 1.14 *************** *** 3,12 **** function list_jumps() { global $second_offset, $lang, $cal; $today = date('Ymd', strtotime("now + $second_offset seconds")); $return = '<option value="#">'.$lang['l_jump'].'</option>'; ! $return .= '<option value="day.php?cal='.$cal.'&getdate='.$today.'">'.$lang['l_goday'].'</option>'; ! $return .= '<option value="week.php?cal='.$cal.'&getdate='.$today.'">'.$lang['l_goweek'].'</option>'; ! $return .= '<option value="month.php?cal='.$cal.'&getdate='.$today.'">'.$lang['l_gomonth'].'</option>'; ! $return .= '<option value="year.php?cal='.$cal.'&getdate='.$today.'">'.$lang['l_goyear'].'</option>'; return $return; } --- 3,13 ---- function list_jumps() { 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>'; ! $return .= '<option value="week.php?cal='.$calName.'&getdate='.$today.'">'.$lang['l_goweek'].'</option>'; ! $return .= '<option value="month.php?cal='.$calName.'&getdate='.$today.'">'.$lang['l_gomonth'].'</option>'; ! $return .= '<option value="year.php?cal='.$calName.'&getdate='.$today.'">'.$lang['l_goyear'].'</option>'; return $return; } Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** template.php 15 Sep 2005 22:51:27 -0000 1.75 --- template.php 30 Oct 2005 01:32:44 -0000 1.76 *************** *** 22,26 **** $COLUMNS_TO_PRINT = 3; $column = 1; ! $filelist = availableCalendarNames('', '', '', true); foreach ($filelist as $file) { if ($column > $COLUMNS_TO_PRINT) { --- 22,26 ---- $COLUMNS_TO_PRINT = 3; $column = 1; ! $filelist = availableCalendars('', '', '', true); foreach ($filelist as $file) { if ($column > $COLUMNS_TO_PRINT) { *************** *** 32,36 **** } ! $cal_filename_tmp = substr($file,0,-4); $cal_tmp = urlencode($file); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); --- 32,36 ---- } ! $cal_filename_tmp = getCalendarName($file); $cal_tmp = urlencode($file); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); |
|
From: <jo...@us...> - 2005-10-30 01:32:55
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6700 Modified Files: config.inc.php Log Message: Added support for recursively searching for calendars in your $calendar_path and the new iCal calendar repository structure. The calendars are still referenced by calendar name, so all URLs are unchanged. Refactored the date parsing code out of ical_parser.php and into date_functions.php. Minor logic changes to the parser to correctly populate the TODO date and time values. Refactored the calendar name code into a new getCalendarName() function, since calendar names may no longer be determined solely by filename if using an iCal repository. Template code updated to match. Added calls to stripslashes() for calendar text data, such as the summaries and descriptions. Also put stripslashes() into people data, since people's names may contain escaped characters. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.168 retrieving revision 1.169 diff -C2 -d -r1.168 -r1.169 *** config.inc.php 14 Sep 2005 20:53:53 -0000 1.168 --- config.inc.php 30 Oct 2005 01:32:44 -0000 1.169 *************** *** 40,43 **** --- 40,45 ---- $allow_login = 'no'; // Set to yes to prompt for login to unlock calendars. $login_cookies = 'no'; // Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions. + $support_ical = 'no'; // Set to yes to support the Apple iCal calendar database structure. + $recursive_path = 'no'; // Set to yes to recurse into subdirectories of the calendar path. // Calendar Caching (decreases page load times) |
|
From: <jo...@us...> - 2005-10-30 01:32:54
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6700/rss Modified Files: index.php Log Message: Added support for recursively searching for calendars in your $calendar_path and the new iCal calendar repository structure. The calendars are still referenced by calendar name, so all URLs are unchanged. Refactored the date parsing code out of ical_parser.php and into date_functions.php. Minor logic changes to the parser to correctly populate the TODO date and time values. Refactored the calendar name code into a new getCalendarName() function, since calendar names may no longer be determined solely by filename if using an iCal repository. Template code updated to match. Added calls to stripslashes() for calendar text data, such as the summaries and descriptions. Also put stripslashes() into people data, since people's names may contain escaped characters. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** index.php 7 Sep 2005 04:48:42 -0000 1.37 --- index.php 30 Oct 2005 01:32:44 -0000 1.38 *************** *** 20,29 **** $display_date = "RSS Info"; ! $filelist = availableCalendarNames($username, $password, $ALL_CALENDARS_COMBINED); foreach ($filelist as $file) { // $cal_filename is the filename of the calendar without .ics // $cal is a urlencoded version of $cal_filename // $cal_displayname is $cal_filename with occurrences of "32" replaced with " " ! $cal_filename_tmp = substr($file,0,-4); $cal_tmp = urlencode($cal_filename_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); --- 20,29 ---- $display_date = "RSS Info"; ! $filelist = availableCalendars($username, $password, $ALL_CALENDARS_COMBINED); foreach ($filelist as $file) { // $cal_filename is the filename of the calendar without .ics // $cal is a urlencoded version of $cal_filename // $cal_displayname is $cal_filename with occurrences of "32" replaced with " " ! $cal_filename_tmp = getCalendarName($file); $cal_tmp = urlencode($cal_filename_tmp); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); *************** *** 76,78 **** ! ?> \ No newline at end of file --- 76,78 ---- ! ?> |
|
From: <jo...@us...> - 2005-10-30 01:23:56
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6396/rss Modified Files: rss.php Log Message: Removed re-definition of the $default_path. It does not always work correctly, and you should be using the $default_path defined in config.inc.php I think. Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** rss.php 5 Oct 2005 00:29:13 -0000 1.27 --- rss.php 30 Oct 2005 01:23:48 -0000 1.28 *************** *** 16,22 **** } - $default_path = 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].':'.$HTTP_SERVER_VARS['SERVER_PORT'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'],'/rss/')); - - //set the range of days to return based on the view chosen $rssview = $_GET['rssview']; --- 16,19 ---- |
|
From: <cl...@us...> - 2005-10-27 17:41:31
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21419/functions Modified Files: calendar_functions.php Log Message: Took acc out of list Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** calendar_functions.php 14 Sep 2005 20:44:55 -0000 1.9 --- calendar_functions.php 27 Oct 2005 17:41:24 -0000 1.10 *************** *** 194,199 **** $return .= "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp</option>\n"; } ! } ! else { $cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp); if ($cal_httpPrefix_tmp == urldecode($cal)) { --- 194,198 ---- $return .= "<option value=\"$cal_encoded_tmp\">$cal_displayname_tmp</option>\n"; } ! } else { $cal_httpPrefix_tmp = str_replace('webcal://', 'http://', $cal_tmp); if ($cal_httpPrefix_tmp == urldecode($cal)) { *************** *** 202,215 **** $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\">$cal_displayname_tmp</option>"; } ! } } // option to open all (non-web) calenders together ! if ($cal == $ALL_CALENDARS_COMBINED) { ! $return .= "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>"; ! } else { ! $return .= "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\">$all_cal_comb_lang</option>"; } - return $return; } \ No newline at end of file --- 201,215 ---- $return .= "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\">$cal_displayname_tmp</option>"; } ! } } // option to open all (non-web) calenders together ! if (!$pick) { ! if ($cal == $ALL_CALENDARS_COMBINED) { ! $return .= "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\" selected=\"selected\">$all_cal_comb_lang</option>"; ! } else { ! $return .= "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\">$all_cal_comb_lang</option>"; ! } } return $return; } \ No newline at end of file |
