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: <cl...@us...> - 2005-09-13 21:36:46
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11768/includes Modified Files: event.php Log Message: Updated README, reverted ical_parser's WEEKLY parsing to 2.0b, added charset to event popup, and added two small patches. Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** event.php 30 Aug 2005 19:11:00 -0000 1.32 --- event.php 13 Sep 2005 21:36:38 -0000 1.33 *************** *** 64,67 **** --- 64,68 ---- $page->replace_tags(array( + 'charset' => $charset, 'cal' => $event['calname'], 'event_text' => urldecode($event['event_text']), |
|
From: <cl...@us...> - 2005-09-13 21:36:46
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11768 Modified Files: README Log Message: Updated README, reverted ical_parser's WEEKLY parsing to 2.0b, added charset to event popup, and added two small patches. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** README 1 Sep 2005 18:35:03 -0000 1.87 --- README 13 Sep 2005 21:36:38 -0000 1.88 *************** *** 82,87 **** Changes: -------- ! 2.0 -Event URLs display without LOCATION. -Fixed VTIMEZONE dates on Windows IIS. 2.0 c --- 82,92 ---- Changes: -------- ! 2.0.1 ! -Event URLs display without LOCATION. -Fixed VTIMEZONE dates on Windows IIS. + -Event popup respect CHARSET + -Tabs parsed into + -Search links work again. + -Weekly repeating events display better. 2.0 c |
|
From: <ji...@us...> - 2005-09-07 06:08:14
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15624/phpicalendar/functions Modified Files: date_functions.php event.js Log Message: adjust date_functions.php, event.js, header.tpl to allow event popups to work with cpath multiple calendar directories Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** date_functions.php 16 May 2005 19:14:59 -0000 1.27 --- date_functions.php 7 Sep 2005 06:08:02 -0000 1.28 *************** *** 164,168 **** function openevent($event_date, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') { ! $event_text = stripslashes(urldecode($arr["event_text"])); if (empty($start)) { --- 164,168 ---- function openevent($event_date, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') { ! global $cpath; $event_text = stripslashes(urldecode($arr["event_text"])); if (empty($start)) { *************** *** 194,198 **** $return = " <script language=\"Javascript\" type=\"text/javascript\"><!-- ! var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid'); document.popup_data[$popup_data_index] = eventData; // --></script>"; --- 194,198 ---- $return = " <script language=\"Javascript\" type=\"text/javascript\"><!-- ! var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid','$cpath'); document.popup_data[$popup_data_index] = eventData; // --></script>"; Index: event.js =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/event.js,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** event.js 16 May 2005 19:15:00 -0000 1.14 --- event.js 7 Sep 2005 06:08:02 -0000 1.15 *************** *** 8,11 **** --- 8,12 ---- form.elements.time.value = data.time; form.elements.uid.value = data.uid; + form.elements.cpath.value = data.cpath; // open a new window *************** *** 15,22 **** } ! function EventData(date, time, uid) { this.date = date; this.time = time; this.uid = uid; } --- 16,24 ---- } ! function EventData(date, time, uid, cpath) { this.date = date; this.time = time; this.uid = uid; + this.cpath = cpath; } |
|
From: <ji...@us...> - 2005-09-07 06:08:14
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15624/phpicalendar/templates/default Modified Files: header.tpl Log Message: adjust date_functions.php, event.js, header.tpl to allow event popups to work with cpath multiple calendar directories Index: header.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/header.tpl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** header.tpl 16 May 2005 19:15:02 -0000 1.11 --- header.tpl 7 Sep 2005 06:08:02 -0000 1.12 *************** *** 16,18 **** --- 16,19 ---- <input type="hidden" name="time" id="time" value="" /> <input type="hidden" name="uid" id="uid" value="" /> + <input type="hidden" name="cpath" id="cpath" value="" /> </form> |
|
From: <ji...@us...> - 2005-09-07 06:08:14
|
Update of /cvsroot/phpicalendar/phpicalendar/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15624/phpicalendar/admin Modified Files: index.php Log Message: adjust date_functions.php, event.js, header.tpl to allow event popups to work with cpath multiple calendar directories Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin/index.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** index.php 6 May 2005 22:16:10 -0000 1.3 --- index.php 7 Sep 2005 06:08:02 -0000 1.4 *************** *** 141,146 **** ?> - - - - --- 141,142 ---- |
|
From: <ji...@us...> - 2005-09-07 04:48:54
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3886/phpicalendar/rss Modified Files: index.php Log Message: add show_search to rss.php Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** index.php 13 Feb 2005 18:01:26 -0000 1.36 --- index.php 7 Sep 2005 04:48:42 -0000 1.37 *************** *** 59,63 **** 'rssdisable' => '', 'rss_valid' => '', ! 'show_search' => '', 'l_rss_info' => $lang['l_rss_info'], 'l_rss_subhead' => $lang['l_rss_subhead'], --- 59,63 ---- 'rssdisable' => '', 'rss_valid' => '', ! 'show_search' => $show_search, 'l_rss_info' => $lang['l_rss_info'], 'l_rss_subhead' => $lang['l_rss_subhead'], |
|
From: <ji...@us...> - 2005-09-07 04:41:31
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2838/phpicalendar Modified Files: search.php Log Message: changes to search.php Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** search.php 8 Apr 2005 06:38:38 -0000 1.35 --- search.php 7 Sep 2005 04:41:23 -0000 1.36 *************** *** 310,313 **** --- 310,314 ---- 'l_time' => $lang['l_time'], 'l_summary' => $lang['l_summary'], + 'l_location' => $lang['l_location'], 'l_description' => $lang['l_description'], 'l_recurring_event' => $lang['l_recurring_event'], *************** *** 319,322 **** --- 320,324 ---- 'cal' => $cal, 'getdate' => $getdate, + 'cpath' => $cpath, 'calendar_name' => $calendar_name, 'display_date' => $display_date, *************** *** 325,329 **** 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => '', 'next_month' => $next_month, 'prev_month' => $prev_month, --- 327,331 ---- 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => $show_search, 'next_month' => $next_month, 'prev_month' => $prev_month, |
|
From: <ji...@us...> - 2005-09-07 04:04:51
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30535/phpicalendar/templates/default Modified Files: search.tpl Log Message: fix search.tpl Index: search.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/search.tpl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** search.tpl 19 May 2004 18:26:11 -0000 1.4 --- search.tpl 7 Sep 2005 04:04:44 -0000 1.5 *************** *** 37,40 **** --- 37,43 ---- <td width="120" class="G10BOLD">{L_TIME}:</td> <td align="left" class="G10B">{EVENT_START}</td> + </tr><tr> + <td width="120" class="G10BOLD">{L_LOCATION}:</td> + <td align="left" class="G10B">{LOCATION}</td> </tr> <tr> *************** *** 79,83 **** <td valign="top" align="left" class="V10">{EXCEPT_DESCRIPTION}</td> </tr> ! <!-- switch except_description on --> </table> </div> --- 82,86 ---- <td valign="top" align="left" class="V10">{EXCEPT_DESCRIPTION}</td> </tr> ! <!-- switch except_description off --> </table> </div> |
|
From: <ji...@us...> - 2005-09-07 03:41:26
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27276/phpicalendar Modified Files: preferences.php Log Message: Fix [ 1283135 ] Link on Results partly broken by adding line to template.php; add cpath to other files Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** preferences.php 25 Oct 2004 17:16:08 -0000 1.54 --- preferences.php 7 Sep 2005 03:41:18 -0000 1.55 *************** *** 16,20 **** $current_view = "preferences"; ! $back_page = BASE.$default_view.'.php?cal='.$cal.'&getdate='.$getdate; if ($allow_preferences == 'no') header("Location: $back_page"); --- 16,20 ---- $current_view = "preferences"; ! $back_page = BASE.$default_view.'.php?cal='.$cal.'&getdate='.$getdate.'&cpath='.$cpath; if ($allow_preferences == 'no') header("Location: $back_page"); |
|
From: <ji...@us...> - 2005-09-07 03:41:26
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27276/phpicalendar/functions Modified Files: template.php Log Message: Fix [ 1283135 ] Link on Results partly broken by adding line to template.php; add cpath to other files Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** template.php 16 May 2005 19:15:00 -0000 1.72 --- template.php 7 Sep 2005 03:41:18 -0000 1.73 *************** *** 214,217 **** --- 214,218 ---- + $some_events = str_replace('{KEY}', $val['date'], $some_events); $some_events = str_replace('{DAYOFMONTH}', $dayofmonth, $some_events); $final .= $day_tmp.$some_events; |
|
From: <cl...@us...> - 2005-09-01 18:35:13
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16286/functions Modified Files: ical_parser.php Log Message: Successfully Updated 1277846. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.192 retrieving revision 1.193 diff -C2 -d -r1.192 -r1.193 *** ical_parser.php 16 May 2005 19:15:00 -0000 1.192 --- ical_parser.php 1 Sep 2005 18:35:04 -0000 1.193 *************** *** 950,953 **** --- 950,956 ---- 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]; *************** *** 1001,1004 **** --- 1004,1010 ---- 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]; |
|
From: <cl...@us...> - 2005-09-01 18:35:13
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16286 Modified Files: README Log Message: Successfully Updated 1277846. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** README 30 Aug 2005 19:11:00 -0000 1.86 --- README 1 Sep 2005 18:35:03 -0000 1.87 *************** *** 82,85 **** --- 82,88 ---- Changes: -------- + 2.0 -Event URLs display without LOCATION. + -Fixed VTIMEZONE dates on Windows IIS. + 2.0 c -Enhanced error messaging system. |
|
From: <cl...@us...> - 2005-08-30 19:11:10
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29772/includes Modified Files: event.php Log Message: Fixed event URL popups. Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** event.php 16 May 2005 19:15:01 -0000 1.31 --- event.php 30 Aug 2005 19:11:00 -0000 1.32 *************** *** 12,15 **** --- 12,17 ---- } + + $event = $master_array[$_POST['date']][$_POST['time']][decode_popup($_POST['uid'])]; $organizer = unserialize($event['organizer']); *************** *** 24,27 **** --- 26,31 ---- } + $event['description'] = urldecode($event['description']); + if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); *************** *** 49,52 **** --- 53,61 ---- } + if (!$event['location'] && $event['url']) { + $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>'; + $lang['l_location'] = 'URL'; + } + if (sizeof($attendee) == 0) $attendee = ''; if (sizeof($organizer) == 0) $organizer = ''; |
|
From: <cl...@us...> - 2005-08-30 19:11:10
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29772 Modified Files: README Log Message: Fixed event URL popups. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** README 26 Oct 2004 19:12:28 -0000 1.85 --- README 30 Aug 2005 19:11:00 -0000 1.86 *************** *** 82,86 **** Changes: -------- ! 2.0 -Enhanced error messaging system. -New Open Source Documentation. --- 82,86 ---- Changes: -------- ! 2.0 c -Enhanced error messaging system. -New Open Source Documentation. |
|
From: <cl...@us...> - 2005-07-05 17:15:47
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2509 Removed Files: upload_functions.php Log Message: Removed from project, functions seem to be in admin_functions.php. --- upload_functions.php DELETED --- |
|
From: <ji...@us...> - 2005-05-15 07:17:58
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10631/phpicalendar/rss Modified Files: rss.php Log Message: Bug fix for date range crossing year boundary. Other tweaks for XML validation of special chars Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** rss.php 1 Mar 2005 05:38:55 -0000 1.25 --- rss.php 15 May 2005 07:17:49 -0000 1.26 *************** *** 31,35 **** break; case 'month': ! $parse_month = date ("Ym", strtotime($getdate)); $fromdate = ($parse_month *100) + 1; $nextmonth = ($parse_month +1) * 100; #should give the 0th day of following month --- 31,35 ---- break; case 'month': ! $parse_month = date ("Ym", strtotime($getdate)); $fromdate = ($parse_month *100) + 1; $nextmonth = ($parse_month +1) * 100; #should give the 0th day of following month *************** *** 65,69 **** //allow phpicalendar to use calendar subdirectories - see bbs ! $cal_displayname = str_replace("32", " ", $cal); if ($cal == $ALL_CALENDARS_COMBINED) { $temp = explode("/",$calendar_path); --- 65,69 ---- //allow phpicalendar to use calendar subdirectories - see bbs ! $cal_displayname = str_replace("32", " ", $cal); if ($cal == $ALL_CALENDARS_COMBINED) { $temp = explode("/",$calendar_path); *************** *** 106,110 **** //generate the items ! $numdays = $todate - $fromdate; $thisdate = $fromdate; # start at beginning of date range, # note that usage of $thisdate is different from distribution --- 106,110 ---- //generate the items ! $numdays = round((strtotime($todate) - strtotime($fromdate))/(60*60*24)-1); $thisdate = $fromdate; # start at beginning of date range, # note that usage of $thisdate is different from distribution *************** *** 127,136 **** $event_text = stripslashes(urldecode($val["event_text"])); $event_text = strip_tags($event_text, '<b><i><u>'); ! $event_text = str_replace("& ","&", $event_text); #uncomment for shorter event text with ... # $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); ! $description = stripslashes(urldecode($val["description"])); ! $description = strip_tags($description, '<b><i><u>'); ! $rss_title = htmlspecialchars ("$dayofweek: $event_text"); $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal&cpath=$cpath"); $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); --- 127,142 ---- $event_text = stripslashes(urldecode($val["event_text"])); $event_text = strip_tags($event_text, '<b><i><u>'); ! $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); ! $description = stripslashes(urldecode($val["description"])); ! $description = strip_tags($description, '<b><i><u>'); ! $description = str_replace('&','&',$description); ! $description = str_replace('&amp;','&',$description); ! ! ! $rss_title = htmlspecialchars ("$dayofweek: $event_text"); $rss_link = htmlspecialchars ("$default_path/day.php?getdate=$getdate&cal=$cal&cpath=$cpath"); $rss_description = htmlspecialchars ("$dayofweek $event_start: $description"); *************** *** 150,154 **** $rss .= '<link>'.$rss_link.'</link>'."\n"; $rss .= '<description>'.$rss_description.'</description>'."\n"; ! $rss .= '<location>'.$val['location'].'</location>'; $rss .= '</item>'."\n"; $events_count++; --- 156,164 ---- $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++; *************** *** 163,167 **** } $thisdate++; ! $i++; } while ($i <= $numdays); --- 173,177 ---- } $thisdate++; ! $i++; } while ($i <= $numdays); |
|
From: <da...@us...> - 2005-05-09 18:46:23
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19200/functions Modified Files: ical_parser.php Log Message: SF Bug #1023229 Relatively simple fix to a complex, that changes the weekly code to render to the window of $next_date_range -> $next_date_range + $interval weeks. Took me a while to wrap my head around this one - I knew what the solution was, but wasn't sure if it handles everything. Still not 100% sure about the edge cases, though. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.188 retrieving revision 1.189 diff -C2 -d -r1.188 -r1.189 *** ical_parser.php 6 May 2005 23:01:37 -0000 1.188 --- ical_parser.php 9 May 2005 18:46:12 -0000 1.189 *************** *** 516,528 **** break; case 'WEEKLY': if (!isset($byday)) { ! $next_date = dateOfWeek(date('Ymd', $next_range_time),$bd); ! $next_date_time = strtotime($next_date); ! $recur_data[] = $next_date_time; ! } elseif (is_array($byday)) { foreach($byday as $day) { $day = two2threeCharDays($day); ! $next_date = dateOfWeek(date('Ymd', $next_range_time),$day); ! $next_date_time = strtotime($next_date); $recur_data[] = $next_date_time; } --- 516,533 ---- break; case 'WEEKLY': + // Populate $byday with the default day if it's not set. if (!isset($byday)) { ! $byday[] = strtoupper(substr($daysofweekshort_lang[date('w', $next_range_time)], 0, 2)); ! } ! if (is_array($byday)) { foreach($byday as $day) { $day = two2threeCharDays($day); ! $next_date_time = strtotime($day,$next_range_time) + (12 * 60 * 60); ! // Since this renders events from $next_range_time to $next_range_time + 1 week, I need to handle intervals ! // as well. This checks to see if $next_date_time is after $day_start (i.e., "next week"), and thus ! // if we need to add $interval weeks to $next_date_time. ! if ($next_date_time > strtotime($week_start_day, $next_range_time) && $interval > 1) { ! $next_date_time = strtotime('+'.($interval - 1).' '.$freq_type, $next_date_time); ! } $recur_data[] = $next_date_time; } |
|
From: <da...@us...> - 2005-05-07 00:22:36
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16756 Modified Files: config.inc.php Log Message: SF Patch #1043823 - a modified version of the patch was applied so there wasn't a need for a new function, and it also simplified the code. Update the config text to make more sense, but we should note things in the README when we release 2.0. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.165 retrieving revision 1.166 diff -C2 -d -r1.165 -r1.166 *** config.inc.php 6 May 2005 21:25:02 -0000 1.165 --- config.inc.php 7 May 2005 00:22:15 -0000 1.166 *************** *** 62,66 **** // You can increase the number of unique colors by adding additional images (monthdot_n.gif) // and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n ! // Colors will rotate to double the number listed below. (That's 14 colors, 2 calendars per color). $unique_colors = '7'; --- 62,66 ---- // You can increase the number of unique colors by adding additional images (monthdot_n.gif) // and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n ! // Colors will repeat from the beginning for calendars past $unique_colors (7 by default), with no limit. $unique_colors = '7'; |
|
From: <da...@us...> - 2005-05-07 00:22:36
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16756/functions Modified Files: template.php Log Message: SF Patch #1043823 - a modified version of the patch was applied so there wasn't a need for a new function, and it also simplified the code. Update the config text to make more sense, but we should note things in the README when we release 2.0. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** template.php 6 May 2005 19:04:06 -0000 1.69 --- template.php 7 May 2005 00:22:24 -0000 1.70 *************** *** 274,278 **** $event_calna = $allday['calname']; $event_url = $allday['url']; ! if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors); $event = openevent($event_calna, '', '', $allday, 1, 11, '', '', 'psf', $event_url); $loop_tmp = str_replace('{ALLDAY}', $event, $loop_ad); --- 274,278 ---- $event_calna = $allday['calname']; $event_url = $allday['url']; ! $event_calno = (($event_calno - 1) % $unique_colors) + 1; $event = openevent($event_calna, '', '', $allday, 1, 11, '', '', 'psf', $event_url); $loop_tmp = str_replace('{ALLDAY}', $event, $loop_ad); *************** *** 437,441 **** $event_url = $this_time_arr[($event_length[$thisday][$i]['key'])]['url']; $event_status = strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']); ! if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors); if ($event_status != '') { $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; --- 437,441 ---- $event_url = $this_time_arr[($event_length[$thisday][$i]['key'])]['url']; $event_status = strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']); ! $event_calno = (($event_calno - 1) % $unique_colors) + 1; if ($event_status != '') { $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; *************** *** 502,506 **** $event_calna = $allday['calname']; $event_url = $allday['url']; ! if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors); $event = openevent($event_calna, '', '', $allday, 0, '', '', '', '', $event_url); $loop_tmp = str_replace('{ALLDAY}', $event, $loop_ad); --- 502,506 ---- $event_calna = $allday['calname']; $event_url = $allday['url']; ! $event_calno = (($event_calno - 1) % $unique_colors) + 1; $event = openevent($event_calna, '', '', $allday, 0, '', '', '', '', $event_url); $loop_tmp = str_replace('{ALLDAY}', $event, $loop_ad); *************** *** 651,655 **** $event_recur = $this_time_arr[($event_length[$i]['key'])]['recur']; $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']); ! if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors); if ($event_status != '') { $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; --- 651,655 ---- $event_recur = $this_time_arr[($event_length[$i]['key'])]['recur']; $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']); ! $event_calno = (($event_calno - 1) % $unique_colors) + 1; if ($event_status != '') { $confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" /> '; *************** *** 900,904 **** foreach ($event_times as $val) { $event_calno = $val['calnumber']; ! if ($event_calno > $unique_colors) $event_calno = ($event_calno - $unique_colors); $event_calna = $val['calname']; $event_url = $val['url']; --- 900,904 ---- foreach ($event_times as $val) { $event_calno = $val['calnumber']; ! $event_calno = (($event_calno - 1) % $unique_colors) + 1; $event_calna = $val['calname']; $event_url = $val['url']; |
|
From: <da...@us...> - 2005-05-06 23:01:46
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27874/functions Modified Files: ical_parser.php Log Message: SF Patch #1047465, for SF Bug #1046864. "Clears" the summary/description for PRIVATE/CONFIDENTIAL events. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.187 retrieving revision 1.188 diff -C2 -d -r1.187 -r1.188 *** ical_parser.php 6 May 2005 19:02:05 -0000 1.187 --- ical_parser.php 6 May 2005 23:01:37 -0000 1.188 *************** *** 760,763 **** --- 760,775 ---- $vtodo_sort = $vtodo_priority; } + + // CLASS support + if (isset($class)) { + if ($class == 'PRIVATE') { + $summary = '**PRIVATE**'; + $description = '**PRIVATE**'; + } elseif ($class == 'CONFIDENTIAL') { + $summary = '**CONFIDENTIAL**'; + $description = '**CONFIDENTIAL**'; + } + } + $master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description, 'calname' => $actual_calname); unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description); |
|
From: <da...@us...> - 2005-05-06 22:16:19
|
Update of /cvsroot/phpicalendar/phpicalendar/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16244/admin Modified Files: index.php Log Message: SF Patch #1059866 - fixed support for PHP5 w/ the admin interface. Also fixed a comment that referenced the old name. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin/index.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.php 25 Oct 2004 17:16:08 -0000 1.2 --- index.php 6 May 2005 22:16:10 -0000 1.3 *************** *** 67,71 **** if ((isset($_POST['action'])) && ($_POST['action'] == 'addupdate')) { for ($filenumber = 1; $filenumber < 6; $filenumber++) { ! $file = $HTTP_POST_FILES['calfile']; $addupdate_success = FALSE; --- 67,71 ---- if ((isset($_POST['action'])) && ($_POST['action'] == 'addupdate')) { for ($filenumber = 1; $filenumber < 6; $filenumber++) { ! $file = $_FILES['calfile']; $addupdate_success = FALSE; |
|
From: <da...@us...> - 2005-05-06 22:16:19
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16244/functions Modified Files: admin_functions.php Log Message: SF Patch #1059866 - fixed support for PHP5 w/ the admin interface. Also fixed a comment that referenced the old name. Index: admin_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/admin_functions.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** admin_functions.php 6 May 2005 21:25:02 -0000 1.7 --- admin_functions.php 6 May 2005 22:16:10 -0000 1.8 *************** *** 240,244 **** // return the appropriate error message if the file upload had an error // ! // arg0: array error number from $HTTP_POST_FILES[file]['error'] // returns string error message function get_upload_error ($upload_error) { --- 240,244 ---- // return the appropriate error message if the file upload had an error // ! // arg0: array error number from $_FILES[file]['error'] // returns string error message function get_upload_error ($upload_error) { |
|
From: <da...@us...> - 2005-05-06 21:45:00
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8351 Modified Files: index.php print.php Log Message: SF Patch # 1093772 - copied the changes out, and "applied" the patch. $printview_default works again. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index.php 2 Sep 2004 18:39:51 -0000 1.8 --- index.php 6 May 2005 21:44:50 -0000 1.9 *************** *** 8,12 **** } if ($printview_default == 'yes') { ! $default_view = "print.php?printview=$default_view"; } else { $default_view = "$default_view" . ".php"; --- 8,13 ---- } if ($printview_default == 'yes') { ! $printview = $default_view; ! $default_view = "print.php"; } else { $default_view = "$default_view" . ".php"; *************** *** 16,18 **** include( $default_view ); ! ?> \ No newline at end of file --- 17,19 ---- include( $default_view ); ! ?> Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** print.php 16 Apr 2005 20:25:23 -0000 1.34 --- print.php 6 May 2005 21:44:50 -0000 1.35 *************** *** 10,17 **** $end_week_time = $start_week_time + (6 * 25 * 60 * 60); $parse_month = date ("Ym", strtotime($getdate)); - $printview = $_GET['printview']; $cal_displayname = str_replace("32", " ", $cal); $events_week = 0; $unix_time = strtotime($getdate); if ($printview == 'day') { --- 10,17 ---- $end_week_time = $start_week_time + (6 * 25 * 60 * 60); $parse_month = date ("Ym", strtotime($getdate)); $cal_displayname = str_replace("32", " ", $cal); $events_week = 0; $unix_time = strtotime($getdate); + if (!$printview) $printview = $_GET['printview']; if ($printview == 'day') { |
|
From: <da...@us...> - 2005-05-06 21:25:13
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4255/functions Modified Files: admin_functions.php Log Message: SF Patch #1177367 Trivial option to support non-standard FTP ports. Index: admin_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/admin_functions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** admin_functions.php 2 Oct 2004 01:23:53 -0000 1.6 --- admin_functions.php 6 May 2005 21:25:02 -0000 1.7 *************** *** 48,55 **** // returns boolean was login successful function login_ftp ($username, $password) { ! global $ftp_server; // set up basic connection ! $conn_id = @ftp_connect($ftp_server); if (!$conn_id) exit(error('Cannot connect to FTP server', $filename)); // login with username and password --- 48,55 ---- // returns boolean was login successful function login_ftp ($username, $password) { ! global $ftp_server, $ftp_port; // set up basic connection ! $conn_id = @ftp_connect($ftp_server, $ftp_port); if (!$conn_id) exit(error('Cannot connect to FTP server', $filename)); // login with username and password |
|
From: <da...@us...> - 2005-05-06 21:25:12
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4255 Modified Files: config.inc.php Log Message: SF Patch #1177367 Trivial option to support non-standard FTP ports. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.164 retrieving revision 1.165 diff -C2 -d -r1.164 -r1.165 *** config.inc.php 31 Oct 2004 19:50:11 -0000 1.164 --- config.inc.php 6 May 2005 21:25:02 -0000 1.165 *************** *** 50,58 **** // Administration settings (/admin/) ! $allow_admin = 'yes'; // Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method $auth_method = 'ftp'; // Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic. $auth_internal_username = 'admin'; // Only used if $auth_method='internal'. The username for the administrator. ! $auth_internal_password = 'admin'; // Only used if $auth_method='internal'. The password for the administrator. $ftp_server = 'localhost'; // Only used if $auth_method='ftp'. The ftp server name. 'localhost' will work for most servers. $ftp_calendar_path = ''; // Only used if $auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $calendar_path, but may not be accurate depending on ftp server config. --- 50,59 ---- // Administration settings (/admin/) ! $allow_admin = 'yes'; // Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method $auth_method = 'ftp'; // Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic. $auth_internal_username = 'admin'; // Only used if $auth_method='internal'. The username for the administrator. ! $auth_internal_password = 'admin'; // Only used if $auth_method='internal'. The password for the administrator. $ftp_server = 'localhost'; // Only used if $auth_method='ftp'. The ftp server name. 'localhost' will work for most servers. + $ftp_port = '21'; // Only used if $auth_method='ftp'. The ftp port. '21' is the default for ftp servers. $ftp_calendar_path = ''; // Only used if $auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $calendar_path, but may not be accurate depending on ftp server config. *************** *** 93,95 **** $apache_map['user4'] = array(''); // Example: $apache_map['username'] = array('Calendar1', 'Calendar2'); // add more lines as necessary ! ?> \ No newline at end of file --- 94,96 ---- $apache_map['user4'] = array(''); // Example: $apache_map['username'] = array('Calendar1', 'Calendar2'); // add more lines as necessary ! ?> |
