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...> - 2008-12-29 03:10:47
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/grey In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10345/templates/grey Removed Files: week.tpl Log Message: remove week.tpl from alternative template folders --- week.tpl DELETED --- |
|
From: <ji...@us...> - 2008-12-29 03:07:41
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10074/includes Modified Files: event.php Log Message: change handling of multiday allday events in week view; other misc changes Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** event.php 28 Dec 2008 20:13:01 -0000 1.47 --- event.php 29 Dec 2008 03:07:34 -0000 1.48 *************** *** 3,6 **** --- 3,7 ---- define('BASE', '../'); include_once(BASE.'functions/init.inc.php'); + require_once(BASE.'functions/date_functions.php'); require_once(BASE.'functions/template.php'); *************** *** 15,21 **** // All day if ($_POST['time'] == -1) { ! $event_times = $lang['l_all_day']; } else { ! $event_times = date($timeFormat, $event['start_unixtime']) . ' - ' . date($timeFormat, $event['end_unixtime']); } --- 16,28 ---- // All day if ($_POST['time'] == -1) { ! $start = localizeDate($dateFormat_week, $event['start_unixtime']); ! $end = localizeDate($dateFormat_week, ($event['end_unixtime'] - 60)); ! $event_times = $lang['l_all_day']." $start"; ! if ($start != $end) $event_times = "$start - $end"; } else { ! $start = date($timeFormat, $event['start_unixtime']); ! $end = date($timeFormat, $event['end_unixtime']); ! $event_times = "$start"; ! if ($start != $end) $event_times = "$start - $end"; } |
|
From: <ji...@us...> - 2008-12-29 03:07:40
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10074 Modified Files: default_config.php error.php preferences.php Log Message: change handling of multiday allday events in week view; other misc changes Index: default_config.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** default_config.php 28 Dec 2008 11:55:43 -0000 1.10 --- default_config.php 29 Dec 2008 03:07:34 -0000 1.11 *************** *** 23,27 **** $this->gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred $this->num_years = '1'; // Number of years (up and back) to display in 'Jump to' ! $this->month_event_lines = '1'; // Number of lines to wrap each event title in month view, 0 means display all lines. $this->tomorrows_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. $this->allday_week_lines = '1'; // Number of lines to wrap each event title in all-day events in week view, 0 means display all lines. --- 23,27 ---- $this->gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred $this->num_years = '1'; // Number of years (up and back) to display in 'Jump to' ! $this->month_event_lines = '0'; // Number of lines to wrap each event title in month view, 0 means display all lines. $this->tomorrows_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. $this->allday_week_lines = '1'; // Number of lines to wrap each event title in all-day events in week view, 0 means display all lines. Index: error.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/error.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** error.php 28 Dec 2008 10:50:57 -0000 1.6 --- error.php 29 Dec 2008 03:07:34 -0000 1.7 *************** *** 45,49 **** 'error_msg' => $error_msg, 'error_calendar' => $error_calendar, - 'generated' => $generated, 'l_powered_by' => $lang['l_powered_by'], 'l_error_back' => $lang['l_error_back'], --- 45,48 ---- Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** preferences.php 28 Dec 2008 19:30:41 -0000 1.68 --- preferences.php 29 Dec 2008 03:07:34 -0000 1.69 *************** *** 157,174 **** 'CET', 'EET', - 'Etc/GMT-1', - 'Etc/GMT-2', - 'Etc/GMT-3', - 'Etc/GMT-4', - 'Etc/GMT-5', - 'Etc/GMT-6', - 'Etc/GMT-7', - 'Etc/GMT-8', - 'Etc/GMT-9', - 'Etc/GMT-10', - 'Etc/GMT-11', - 'Etc/GMT-12', - 'Etc/GMT-13', 'Etc/GMT-14', 'Etc/GMT+1', 'Etc/GMT+2', --- 157,174 ---- 'CET', 'EET', 'Etc/GMT-14', + 'Etc/GMT-13', + 'Etc/GMT-12', + 'Etc/GMT-11', + 'Etc/GMT-10', + 'Etc/GMT-9', + 'Etc/GMT-8', + 'Etc/GMT-7', + 'Etc/GMT-6', + 'Etc/GMT-5', + 'Etc/GMT-4', + 'Etc/GMT-3', + 'Etc/GMT-2', + 'Etc/GMT-1', 'Etc/GMT+1', 'Etc/GMT+2', *************** *** 188,197 **** 'WET' ); $timezone_select = ''; ! foreach ($timezone_subset as $i => $timezone) { ! if ($timezone_subset[$i] == $cookie_timezone) { $timezone_select .= "<option value='$timezone' selected='selected'>$timezone</option>\n"; } else { ! $timezone_select .= "<option value='$timezone.'>$timezone</option>\n"; } } --- 188,198 ---- 'WET' ); + $timezone_select = ''; ! foreach ($timezone_subset as $timezone) { ! if ($timezone == $cookie_timezone) { $timezone_select .= "<option value='$timezone' selected='selected'>$timezone</option>\n"; } else { ! $timezone_select .= "<option value='$timezone'>$timezone</option>\n"; } } *************** *** 210,216 **** closedir($dir_handle); - $php_ended = getmicrotime(); - $generated = number_format(($php_ended-$php_started),3); - $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/preferences.tpl'); --- 211,214 ---- *************** *** 243,247 **** 'style_select' => $style_select, 'display_date' => $lang['l_preferences'], - 'generated' => $generated, 'message' => $message, 'l_preferences' => $lang['l_preferences'], --- 241,244 ---- |
|
From: <ji...@us...> - 2008-12-29 03:07:37
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10074/functions/parse Modified Files: end_vevent.php recur_functions.php Log Message: change handling of multiday allday events in week view; other misc changes Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** end_vevent.php 28 Dec 2008 19:30:41 -0000 1.20 --- end_vevent.php 29 Dec 2008 03:07:34 -0000 1.21 *************** *** 125,131 **** case 'UNTIL': # UNTIL must be in UTC ! $until = date("YmdHis",strtotime($val)); ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', $until, $regs); ! $until_unixtime = mktime($regs[4],$regs[5],@$regs[6],$regs[2],$regs[3],$regs[1]); $recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week,$until); break; --- 125,131 ---- case 'UNTIL': # UNTIL must be in UTC ! $until = date("YmdHis",strtotime($val)); ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', $until, $regs); ! $until_unixtime = mktime($regs[4],@$regs[5],@$regs[6],$regs[2],$regs[3],$regs[1]); $recur_array[($start_date)][($hour.$minute)][$uid]['recur'][$key] = localizeDate($dateFormat_week,$until); break; *************** *** 182,186 **** if($current_view == 'search') $freq_type = 'none'; # $recur is the recurrence info that goes into the master array for this VEVENT ! $recur = @$recur_array[($start_date)][($hour.$minute)][$uid]['recur']; /* ============================ Load $recur_data ============================ --- 182,187 ---- if($current_view == 'search') $freq_type = 'none'; # $recur is the recurrence info that goes into the master array for this VEVENT ! $recur =''; ! if (isset($recur_array[($start_date)][($hour.$minute)][$uid]['recur'])) $recur = $recur_array[($start_date)][($hour.$minute)][$uid]['recur']; /* ============================ Load $recur_data ============================ *************** *** 215,219 **** # stop at the until limit if set ! if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime; # more adjustments --- 216,220 ---- # stop at the until limit if set ! if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime;else $until_unixtime = $mArray_end; # more adjustments *************** *** 258,265 **** break; case 'year': ! $times = expand_bymonth($time); #echo "exp bymonth";dump_times($times); ! $times = expand_byweekno($times); #echo "exp byweekno";dump_times($times); ! $times = expand_byyearday($times); #echo "exp byyearday";dump_times($times); ! $times = expand_bymonthday($times); #echo "\nexp bymonthday";dump_times($times); foreach($times as $time){ add_recur(expand_byday($time)); --- 259,266 ---- break; case 'year': ! $times = expand_bymonth($time); #echo "exp bymonth";dump_times($times); ! $times = expand_byweekno($times); #echo "exp byweekno";dump_times($times); ! $times = expand_byyearday($times); #echo "exp byyearday";dump_times($times); ! $times = expand_bymonthday($times); #echo "\nexp bymonthday";dump_times($times); foreach($times as $time){ add_recur(expand_byday($time)); *************** *** 320,324 **** if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400'; } ! if($this_date_tmp == $end_date_tmp && ($end_time == '0000' ||$time_key == -1)) continue; $master_array[$this_date_tmp][$time_key][$uid] = array ( 'event_start' => $start_time, # hhmm --- 321,325 ---- if ($this_date_tmp < $end_date_tmp) $display_end_tmp = '2400'; } ! if($this_date_tmp == $end_date_tmp && ($end_time == '0000' && $time_key == -1)) continue; $master_array[$this_date_tmp][$time_key][$uid] = array ( 'event_start' => $start_time, # hhmm Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** recur_functions.php 28 Dec 2008 19:30:41 -0000 1.17 --- recur_functions.php 29 Dec 2008 03:07:34 -0000 1.18 *************** *** 11,15 **** function add_recur($times,$freq=''){ global $recur_data; ! global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime, $day_offset, $current_view; if (!is_array($times)) $times = array($times); /* BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS */ --- 11,15 ---- function add_recur($times,$freq=''){ global $recur_data; ! global $count, $mArray_begin, $mArray_end, $except_dates, $start_date, $start_date_unixtime,$end_range_unixtime,$until_unixtime, $day_offset, $current_view; if (!is_array($times)) $times = array($times); /* BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS */ *************** *** 28,32 **** $until_date = date("Ymd",$end_range_unixtime); foreach ($times as $time){ ! #echo "time:". date("Ymd",$time)."\n"; if (!isset($time) || $time == '') continue; $date = date("Ymd",$time); --- 28,32 ---- $until_date = date("Ymd",$end_range_unixtime); foreach ($times as $time){ ! #echo "time:". date("Ymd",$time)." $until_date<br>\n"; if (!isset($time) || $time == '') continue; $date = date("Ymd",$time); *************** *** 39,42 **** --- 39,43 ---- && !in_array($time, $recur_data) && !in_array($date, $except_dates) + && $time <= $until_unixtime && $time >= $start_date_unixtime && $date <= $until_date |
|
From: <ji...@us...> - 2008-12-29 03:07:37
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10074/templates/default Modified Files: week.tpl Log Message: change handling of multiday allday events in week view; other misc changes Index: week.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/week.tpl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** week.tpl 23 Nov 2005 06:07:56 -0000 1.12 --- week.tpl 29 Dec 2008 03:07:34 -0000 1.13 *************** *** 52,55 **** --- 52,56 ---- <!-- loop daysofweek off --> </tr> + <!-- loop allday row on --> <tr valign="top" id="allday"> <td width="60" class="rowOff2" colspan="4"><img src="images/spacer.gif" width="60" height="1" alt=" " /></td> *************** *** 66,69 **** --- 67,71 ---- <!-- loop alldaysofweek off --> </tr> + <!-- loop allday row off --> <!-- loop row on --> <tr> |
|
From: <ji...@us...> - 2008-12-29 03:07:37
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10074/calendars Modified Files: US Holidays.ics test.ics Log Message: change handling of multiday allday events in week view; other misc changes Index: US Holidays.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/US Holidays.ics,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** US Holidays.ics 26 Dec 2008 05:54:46 -0000 1.7 --- US Holidays.ics 29 Dec 2008 03:07:34 -0000 1.8 *************** *** 661,665 **** CREATED:20081223T190054Z DTEND;VALUE=DATE:20021028 ! RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20071027;BYMONTH=10;BYDAY=-1SU END:VEVENT BEGIN:VEVENT --- 661,665 ---- CREATED:20081223T190054Z DTEND;VALUE=DATE:20021028 ! RRULE:FREQ=YEARLY;INTERVAL=1;UNTIL=20071027T0000Z;BYMONTH=10;BYDAY=-1SU END:VEVENT BEGIN:VEVENT Index: test.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/test.ics,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** test.ics 28 Dec 2008 10:50:57 -0000 1.11 --- test.ics 29 Dec 2008 03:07:34 -0000 1.12 *************** *** 67,70 **** --- 67,71 ---- BEGIN:VEVENT SEQUENCE:7 + UID:starts on 12 DTSTAMP:20020918T224617Z SUMMARY:5 days *************** *** 75,77 **** --- 76,100 ---- END:VEVENT + BEGIN:VEVENT + SEQUENCE:7 + UID:starts on 10 + DTSTAMP:20020918T224617Z + SUMMARY:5 days b4 + STATUS:CONFIRMED + DURATION:P4DT48H + DTSTART;TZID=US/Eastern:20081210 + URL:http://google.com + END:VEVENT + + BEGIN:VEVENT + SEQUENCE:7 + UID:starts on 07 + DTSTAMP:20020918T224617Z + SUMMARY:5 days 07 + STATUS:CONFIRMED + DURATION:P3D + DTSTART;TZID=US/Eastern:20081207 + URL:http://google.com + END:VEVENT + END:VCALENDAR |
|
From: <ji...@us...> - 2008-12-29 03:07:37
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10074/functions Modified Files: date_functions.php list_functions.php template.php Log Message: change handling of multiday allday events in week view; other misc changes Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** date_functions.php 28 Dec 2008 20:13:01 -0000 1.47 --- date_functions.php 29 Dec 2008 03:07:34 -0000 1.48 *************** *** 154,167 **** return $offset; } ! function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') { ! global $cpath, $master_array; $return = ''; $event_text = stripslashes(urldecode($arr["event_text"])); ! if (empty($start)) { $title = $event_text; } else { ! $title = $arr['event_start'].' - '.$arr['event_end'].': '.$event_text; } # for iCal pseudo tag <http> comptability if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$matches)) { --- 154,184 ---- return $offset; } ! /* Returns a string to make event text with a link to popup boxes ! $arr is a master array item ! $lines is the number of lines to restrict the event_text to, using word_wrap ! $length is the length of one line ! $link_class is a css class ! $pre_text and $post_text are to add tags around the link text (e.g. <b> or<i>) ! ! $title is the tooltip for the link ! */ function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') { ! global $cpath, $timeFormat, $dateFormat_week; $return = ''; $event_text = stripslashes(urldecode($arr["event_text"])); ! # build tooltip ! if ($time == -1) { ! $start = localizeDate($dateFormat_week, $arr['start_unixtime']); ! $end = localizeDate($dateFormat_week, ($arr['end_unixtime'] - 60)); $title = $event_text; + if ($start != $end) $title = "$start - $end $event_text"; } else { ! $start = date($timeFormat, $arr['start_unixtime']); ! $end = date($timeFormat, $arr['end_unixtime']); ! $title = "$start: $event_text"; ! if ($start != $end) $title = "$start - $end $event_text"; } + $title .= "\n".urldecode($arr['description'])."\n".urldecode($arr['location']); + $title = trim($title); # for iCal pseudo tag <http> comptability if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$matches)) { *************** *** 182,193 **** $escaped_time = addslashes($time); $escaped_uid = addslashes($uid); ! $event_data = addslashes(serialize ($master_array[$event_date][$time][$uid])); // fix for URL-length bug in IE: populate and submit a hidden form on click static $popup_data_index = 0; ! $return = " ! <script language=\"Javascript\" type=\"text/javascript\"><!-- ! var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid','$cpath','$event_data'); ! document.popup_data[$popup_data_index] = eventData; ! // --></script>"; $return .= '<a class="'.$link_class.'" title="'.$title.'" href="#" onclick="openEventWindow('.$popup_data_index.'); return false;">'; --- 199,210 ---- $escaped_time = addslashes($time); $escaped_uid = addslashes($uid); ! $event_data = addslashes(serialize ($arr)); // fix for URL-length bug in IE: populate and submit a hidden form on click static $popup_data_index = 0; ! $return = " ! <script language='Javascript' type='text/javascript'><!-- ! var eventData = new EventData('$escaped_date', '$escaped_time', '$escaped_uid','$cpath','$event_data'); ! document.popup_data[$popup_data_index] = eventData; ! // --></script>"; $return .= '<a class="'.$link_class.'" title="'.$title.'" href="#" onclick="openEventWindow('.$popup_data_index.'); return false;">'; Index: list_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** list_functions.php 20 Dec 2008 00:33:14 -0000 1.20 --- list_functions.php 29 Dec 2008 03:07:34 -0000 1.21 *************** *** 77,81 **** function list_weeks() { ! global $getdate, $this_year, $cal, $dateFormat_week_jump, $week_start_day; ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); $this_day = $day_array2[3]; --- 77,81 ---- function list_weeks() { ! global $getdate, $this_year, $cal, $dateFormat_week_jump, $phpiCal_config; ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); $this_day = $day_array2[3]; *************** *** 83,87 **** $this_year = $day_array2[1]; $check_week = strtotime($getdate); ! $start_week_time = strtotime(dateOfWeek(date("Ymd", strtotime("$this_year-01-01")), $week_start_day)); $end_week_time = $start_week_time + (6 * 25 * 60 * 60); $return = ''; --- 83,87 ---- $this_year = $day_array2[1]; $check_week = strtotime($getdate); ! $start_week_time = strtotime(dateOfWeek(date("Ymd", strtotime("$this_year-01-01")), $phpiCal_config->week_start_day)); $end_week_time = $start_week_time + (6 * 25 * 60 * 60); $return = ''; Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** template.php 28 Dec 2008 19:30:41 -0000 1.108 --- template.php 29 Dec 2008 03:07:34 -0000 1.109 *************** *** 66,73 **** $seen_events = array(); $final = ''; foreach($master_array as $key => $val) { preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs); if (((@$regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week')) || ((substr(@$regs[1],0,4) == $parse_year) && ($printview == 'year'))) { ! @$events_week++; $dayofmonth = strtotime ($key); $dayofmonth = localizeDate ($dateFormat_day, $dayofmonth); --- 66,74 ---- $seen_events = array(); $final = ''; + $events_week = 0; foreach($master_array as $key => $val) { preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs); if (((@$regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week')) || ((substr(@$regs[1],0,4) == $parse_year) && ($printview == 'year'))) { ! $events_week++; $dayofmonth = strtotime ($key); $dayofmonth = localizeDate ($dateFormat_day, $dayofmonth); *************** *** 87,94 **** if (isset($new_val2['event_text'])) { $event_text = stripslashes(urldecode($new_val2['event_text'])); ! $location = stripslashes(urldecode(@$new_val2['location'])); ! $description = stripslashes(urldecode(@$new_val2['description'])); ! $event_start = @$new_val2['event_start']; ! $event_end = @$new_val2['event_end']; if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end']; if (!isset($new_val2['event_start'])) { --- 88,95 ---- if (isset($new_val2['event_text'])) { $event_text = stripslashes(urldecode($new_val2['event_text'])); ! $location = stripslashes(urldecode($new_val2['location'])); ! $description = stripslashes(urldecode($new_val2['description'])); ! $event_start = $new_val2['event_start']; ! $event_end = $new_val2['event_end']; if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end']; if (!isset($new_val2['event_start'])) { *************** *** 272,283 **** #echo "<pre>";print_r($nbrGridCols); // Replaces the allday events preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1); preg_match("!<\!-- loop alldaysofweek on -->(.*)<\!-- loop allday on -->!Uis", $this->page, $match2); preg_match("!<\!-- loop allday off -->(.*)<\!-- loop alldaysofweek off -->!Uis", $this->page, $match3); ! $loop_ad = trim($match1[1]); ! $loop_begin = trim($match2[1]); ! $loop_end = trim($match3[1]); $weekreplace = ''; ! foreach ($weekarray as $get_date) { $replace = $loop_begin; $colspan = 'colspan="'.$nbrGridCols[$get_date].'"'; --- 273,335 ---- #echo "<pre>";print_r($nbrGridCols); // Replaces the allday events + preg_match("!<\!-- loop allday row on -->(.*)<\!-- loop alldaysofweek on -->!Uis", $this->page, $match1); + $loop_row_begin = trim($match1[1]); # <tr>etc preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1); preg_match("!<\!-- loop alldaysofweek on -->(.*)<\!-- loop allday on -->!Uis", $this->page, $match2); preg_match("!<\!-- loop allday off -->(.*)<\!-- loop alldaysofweek off -->!Uis", $this->page, $match3); ! $loop_ad = trim($match1[1]); # one day cell ! $loop_begin = trim($match2[1]); # <td> ! $loop_end = trim($match3[1]); # </td> ! preg_match("!<\!-- loop alldaysofweek off -->(.*)<\!-- loop allday row off -->!Uis", $this->page, $match3); ! $loop_row_end = trim($match3[1]); # </tr> ! $allday_uids = array(); ! $allday_uid_dates = array(); $weekreplace = ''; ! foreach ($weekarray as $i=>$get_date){ ! if (isset($master_array[$get_date]['-1']) && is_array($master_array[$get_date]['-1']) && !empty($master_array[$get_date]['-1'])){ ! foreach ($master_array[$get_date]['-1'] as $uid => $allday){ ! if (!array_key_exists($uid, $allday_uids)) $allday_uids[$uid] = $get_date; ! $allday_uid_dates[$uid][] = $get_date; ! } ! } ! } ! # new allday routine is better for multiday events ! while(!empty($allday_uids)){ ! $row = $loop_row_begin; ! $day = 0; ! $replace =''; ! while ($day < $phpiCal_config->week_length){ ! $colspan = 0; ! $replace .= $loop_begin; # <td> ! if(array_search($weekarray[$day], $allday_uids)){ ! $uid = array_search($weekarray[$day], $allday_uids); ! unset($allday_uids[$uid]); ! $allday = $master_array[$weekarray[$day]]['-1'][$uid]; ! foreach ($allday_uid_dates[$uid] as $date){ ! #$ev = (!isset($ev)) ? " $uid ":""; ! #$replace .= $ev; ! $colspan += $nbrGridCols[$weekarray[$day]]; ! $day++; ! } ! $event_calno = $allday['calnumber']; ! $event_calno = (($event_calno - 1) % $phpiCal_config->unique_colors) + 1; ! $event = openevent($get_date, -1, $uid, $allday, $phpiCal_config->allday_week_lines, 11, 'psf'); ! $loop_tmp = str_replace('{ALLDAY}', $event, $loop_ad); ! $loop_tmp = str_replace('{CALNO}', $event_calno, $loop_tmp); ! $replace .= $loop_tmp; ! $replace .= $loop_end; ! }else{ ! $colspan = $nbrGridCols[$weekarray[$day]]; ! $replace .= $loop_end; ! $day++; ! } ! unset ($ev); ! $replace = str_replace('{COLSPAN}', "colspan='$colspan'", $replace); ! } ! $row .= "$replace $loop_row_end\n"; ! $weekreplace .= "$row\n"; ! } ! /* old routine ! foreach ($weekarray as $i=>$get_date) { $replace = $loop_begin; $colspan = 'colspan="'.$nbrGridCols[$get_date].'"'; *************** *** 287,291 **** $event_calno = $allday['calnumber']; $event_calno = (($event_calno - 1) % $phpiCal_config->unique_colors) + 1; ! $event = openevent($get_date, -1, $uid, $allday, 1, 11, 'psf'); $loop_tmp = str_replace('{ALLDAY}', $event, $loop_ad); $loop_tmp = str_replace('{CALNO}', $event_calno, $loop_tmp); --- 339,343 ---- $event_calno = $allday['calnumber']; $event_calno = (($event_calno - 1) % $phpiCal_config->unique_colors) + 1; ! $event = openevent($get_date, -1, $uid, $allday, $phpiCal_config->allday_week_lines, 11, 'psf'); $loop_tmp = str_replace('{ALLDAY}', $event, $loop_ad); $loop_tmp = str_replace('{CALNO}', $event_calno, $loop_tmp); *************** *** 296,299 **** --- 348,352 ---- $weekreplace .= $replace; } + */ $this->page = preg_replace('!<\!-- loop alldaysofweek on -->.*<\!-- loop alldaysofweek off -->!Uis', $weekreplace, $this->page); *************** *** 727,734 **** if ($event_text != "") { if (!isset($val["event_start"])) { ! $return_adtmp = openevent($next_day, $cal_time, $uid, $val, $tomorrows_events_lines, 21, 'psf'); $replace_ad .= str_replace('{T_ALLDAY}', $return_adtmp, $loop_t_ad); } else { ! $return_etmp = openevent($next_day, $cal_time, $uid, $val, $tomorrows_events_lines, 21, 'ps3'); $replace_e .= str_replace('{T_EVENT}', $return_etmp, $loop_t_e); } --- 780,787 ---- if ($event_text != "") { if (!isset($val["event_start"])) { ! $return_adtmp = openevent($next_day, $cal_time, $uid, $val, $phpiCal_config->tomorrows_events_lines, 21, 'psf'); $replace_ad .= str_replace('{T_ALLDAY}', $return_adtmp, $loop_t_ad); } else { ! $return_etmp = openevent($next_day, $cal_time, $uid, $val, $phpiCal_config->tomorrows_events_lines, 21, 'ps3'); $replace_e .= str_replace('{T_EVENT}', $return_etmp, $loop_t_e); } *************** *** 911,914 **** --- 964,968 ---- $temp = $t_month[2]; } + $switch['ALLDAY'] = $switch['EVENT'] = ''; if (isset($master_array[$daylink]) && $i <= $phpiCal_config->week_length) { if ($type != 'small') { *************** *** 921,925 **** if ($type == 'large') { $switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />'; ! $switch['ALLDAY'] .= openevent($daylink, $cal_time, $uid, $val, $month_event_lines, 15, 'psf'); $switch['ALLDAY'] .= (isset($val['location']) && $val['location'] != '') ? $val['location']."<br />" : ''; $switch['ALLDAY'] .= '</div>'; --- 975,979 ---- if ($type == 'large') { $switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />'; ! $switch['ALLDAY'] .= openevent($daylink, $cal_time, $uid, $val, $phpiCal_config->month_event_lines, 15, 'psf'); $switch['ALLDAY'] .= (isset($val['location']) && $val['location'] != '') ? $val['location']."<br />" : ''; $switch['ALLDAY'] .= '</div>'; *************** *** 930,935 **** $start2 = date($timeFormat_small, $val['start_unixtime']); if ($type == 'large') { ! @$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />'; ! $switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $month_event_lines, 10, 'ps3', "$start2 ").''; $switch['EVENT'] .= (isset($val['location']) && $val['location'] != '') ? "<br />".$val['location']."<br />" : ''; $switch['EVENT'] .= '</div>'; --- 984,989 ---- $start2 = date($timeFormat_small, $val['start_unixtime']); if ($type == 'large') { ! $switch['EVENT'] .= '<div class="V9"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />'; ! $switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $phpiCal_config->month_event_lines, 10, 'ps3', "$start2 ").''; $switch['EVENT'] .= (isset($val['location']) && $val['location'] != '') ? "<br />".$val['location']."<br />" : ''; $switch['EVENT'] .= '</div>'; *************** *** 1009,1013 **** if (!isset($val['event_start'])) { $switch['START_TIME'] = $lang['l_all_day']; ! $switch['EVENT_TEXT'] = openevent($m_start, $cal_time, $uid, $val, @$month_event_lines, 15, 'psf'); $switch['DESCRIPTION'] = urldecode($val['description']); } else { --- 1063,1067 ---- if (!isset($val['event_start'])) { $switch['START_TIME'] = $lang['l_all_day']; ! $switch['EVENT_TEXT'] = openevent($m_start, $cal_time, $uid, $val, $phpiCal_config->month_event_lines, 15, 'psf'); $switch['DESCRIPTION'] = urldecode($val['description']); } else { |
|
From: <ji...@us...> - 2008-12-28 21:02:49
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/init In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12036/functions/init Modified Files: configs.php Log Message: change timezone to cookie_timezone in congig.php line 45 Index: configs.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/configs.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** configs.php 27 Dec 2008 23:18:07 -0000 1.8 --- configs.php 28 Dec 2008 21:02:44 -0000 1.9 *************** *** 43,47 **** if (isset($phpicalendar['cookie_time'])) $phpiCal_config->setProperty('day_start', $phpicalendar['cookie_time']); if (isset($phpicalendar['cookie_endtime'])) $phpiCal_config->setProperty('day_end', $phpicalendar['cookie_endtime']); ! if (isset($phpicalendar['cookie_timezone'])) $phpiCal_config->setProperty('timezone', $phpicalendar['timezone']); } --- 43,47 ---- if (isset($phpicalendar['cookie_time'])) $phpiCal_config->setProperty('day_start', $phpicalendar['cookie_time']); if (isset($phpicalendar['cookie_endtime'])) $phpiCal_config->setProperty('day_end', $phpicalendar['cookie_endtime']); ! if (isset($phpicalendar['cookie_timezone'])) $phpiCal_config->setProperty('timezone', $phpicalendar['cookie_timezone']); } |
|
From: <ji...@us...> - 2008-12-28 20:18:43
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/grey In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10159/templates/grey Removed Files: search_box.tpl Log Message: remove sear_box.tpl from alternative template folders --- search_box.tpl DELETED --- |
|
From: <ji...@us...> - 2008-12-28 20:18:38
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/red In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10159/templates/red Removed Files: search_box.tpl Log Message: remove sear_box.tpl from alternative template folders --- search_box.tpl DELETED --- |
|
From: <ji...@us...> - 2008-12-28 20:18:38
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/green In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10159/templates/green Modified Files: event.tpl Removed Files: search_box.tpl Log Message: remove sear_box.tpl from alternative template folders Index: event.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/green/event.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** event.tpl 18 May 2007 19:03:07 -0000 1.1 --- event.tpl 28 Dec 2008 20:18:32 -0000 1.2 *************** *** 16,22 **** <td align="left" class="V12"> <div style="margin-left: 10px; margin-bottom:10px;"> ! <p>{EVENT_TEXT} - <span class="V9">(<i>{EVENT_TIMES}</i>)</span></p> <!-- switch description on --> ! <p>{DESCRIPTION}</p> <!-- switch description off --> <p> --- 16,22 ---- <td align="left" class="V12"> <div style="margin-left: 10px; margin-bottom:10px;"> ! <p><b>{L_SUMMARY}</b>:{EVENT_TEXT} - <span class="V9">(<i>{EVENT_TIMES}</i>)</span></p> <!-- switch description on --> ! <p><b>{L_DESCRIPTION}</b>:{DESCRIPTION}</p> <!-- switch description off --> <p> *************** *** 33,36 **** --- 33,39 ---- <b>{L_LOCATION}</b>: {LOCATION}<br /> <!-- switch location off --> + <!-- switch url on --> + <b>{L_URL}</b>: {URL}<br /> + <!-- switch url off --> </p> </div> --- search_box.tpl DELETED --- |
|
From: <ji...@us...> - 2008-12-28 20:18:38
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/tan In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10159/templates/tan Removed Files: search_box.tpl Log Message: remove sear_box.tpl from alternative template folders --- search_box.tpl DELETED --- |
|
From: <ji...@us...> - 2008-12-28 20:13:08
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/tan In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9878/templates/tan Removed Files: admin.tpl Log Message: remove admin.tpl from alternative template folders --- admin.tpl DELETED --- |
|
From: <ji...@us...> - 2008-12-28 20:13:06
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/red In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9878/templates/red Removed Files: admin.tpl Log Message: remove admin.tpl from alternative template folders --- admin.tpl DELETED --- |
|
From: <ji...@us...> - 2008-12-28 20:13:06
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/grey In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9878/templates/grey Removed Files: admin.tpl Log Message: remove admin.tpl from alternative template folders --- admin.tpl DELETED --- |
|
From: <ji...@us...> - 2008-12-28 20:13:06
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9878/functions Modified Files: date_functions.php Log Message: remove admin.tpl from alternative template folders Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** date_functions.php 28 Dec 2008 19:30:41 -0000 1.46 --- date_functions.php 28 Dec 2008 20:13:01 -0000 1.47 *************** *** 167,174 **** if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$matches)) { $full_event_text = $matches[1] . $matches[2]; ! $event_text = $matches[2]; } else { $full_event_text = $event_text; ! $event_text = strip_tags($event_text, '<b><i><u><img>'); } --- 167,174 ---- if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$matches)) { $full_event_text = $matches[1] . $matches[2]; ! $event_text = $matches[2]; } else { $full_event_text = $event_text; ! $event_text = strip_tags($event_text, '<b><i><u><img>'); } *************** *** 181,186 **** $escaped_date = addslashes($event_date); $escaped_time = addslashes($time); ! $escaped_uid = addslashes($uid); ! $event_data = addslashes(serialize ($master_array[$event_date][$time][$uid])); // fix for URL-length bug in IE: populate and submit a hidden form on click static $popup_data_index = 0; --- 181,186 ---- $escaped_date = addslashes($event_date); $escaped_time = addslashes($time); ! $escaped_uid = addslashes($uid); ! $event_data = addslashes(serialize ($master_array[$event_date][$time][$uid])); // fix for URL-length bug in IE: populate and submit a hidden form on click static $popup_data_index = 0; |
|
From: <ji...@us...> - 2008-12-28 20:13:06
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/green In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9878/templates/green Removed Files: admin.tpl Log Message: remove admin.tpl from alternative template folders --- admin.tpl DELETED --- |
|
From: <ji...@us...> - 2008-12-28 20:13:06
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv9878/includes Modified Files: event.php Log Message: remove admin.tpl from alternative template folders Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** event.php 26 Dec 2008 17:07:53 -0000 1.46 --- event.php 28 Dec 2008 20:13:01 -0000 1.47 *************** *** 8,12 **** # in function openevent() from functions/date_functions.php # character encoding has been problematic with popups. ! $event = unserialize($_POST['event_data']); $organizer = unserialize($event['organizer']); $attendee = unserialize($event['attendee']); --- 8,12 ---- # in function openevent() from functions/date_functions.php # character encoding has been problematic with popups. ! $event = unserialize(stripslashes($_POST['event_data'])); $organizer = unserialize($event['organizer']); $attendee = unserialize($event['attendee']); *************** *** 20,28 **** } ! $event['event_text'] = stripslashes(urldecode($event['event_text'])); ! $event['description'] = stripslashes(urldecode($event['description'])); ! $event['location'] = stripslashes(urldecode($event['location'])); $display =''; ! if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); if (isset($organizer) && is_array($organizer)) { --- 20,28 ---- } ! $event['event_text'] = urldecode($event['event_text']); ! $event['description'] = urldecode($event['description']); ! $event['location'] = urldecode($event['location']); $display =''; ! if (isset($event['description'])) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']); if (isset($organizer) && is_array($organizer)) { |
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7568/functions Modified Files: calendar_functions.php date_functions.php draw_functions.php init.inc.php template.php Log Message: fix misc bugs; rewrite some places where warnings squelched with @; require php5.1 or greater Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** calendar_functions.php 28 Dec 2008 11:55:43 -0000 1.32 --- calendar_functions.php 28 Dec 2008 19:30:41 -0000 1.33 *************** *** 74,80 **** // Open the directory. $dir_handle = opendir($search_path) ! or die(error("cal fn 78:".sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename))); if ($dir_handle === false) ! die(error(" cal fn 80:".sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename))); // Add each file in the directory that does not begin with a dot. --- 74,80 ---- // Open the directory. $dir_handle = opendir($search_path) ! or die(error(sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename))); if ($dir_handle === false) ! die(error(sprintf($lang['l_error_path'], $search_path), implode(',', $cal_filename))); // Add each file in the directory that does not begin with a dot. Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** date_functions.php 27 Dec 2008 10:58:51 -0000 1.45 --- date_functions.php 28 Dec 2008 19:30:41 -0000 1.46 *************** *** 1,17 **** <?php // date_functions.php // functions for returning or comparing dates - // not a date function, but I didn't know where to put it - // for backwards compatibility - if (phpversion() < '4.1') { - function array_key_exists($key, $arr) { - if (!is_array($arr)) return false; - foreach (array_keys($arr) as $k) { - if ("$k" == "$key") return true; - } - return false; - } - } // takes iCalendar 2 day format and makes it into 3 characters --- 1,7 ---- <?php + require_once(BASE."functions/is_daylight.php"); // date_functions.php // functions for returning or comparing dates // takes iCalendar 2 day format and makes it into 3 characters *************** *** 291,317 **** } return $data; ! } ! ! require_once(BASE."functions/is_daylight.php"); ! /* function is_daylight($date, $timezone) returns 1 if daylight time, 0 if not ! ! default is to use the server's date function. This will be off when the timezone's rules are not the same as the server's rules. In php5.2+ there seems to be a better way to do this, but we can't count on users having php5.2+. ! ! Although we set dt_start and st_start in parse_tzs.php, these are not rrules and I don't know how to use them yet. So we'll do it by brute force for the ones we know about, from: http://www.webexhibits.org/daylightsaving/g.html ! ! Note that this sends a screwy time value - it's not necessarily UTC unixtime, since the mktime functions that create the time are not using the timezone. ! ! function is_daylight($time, $timezone){ ! global $tz_array; ! # default to std time, overwrite if daylight. ! $dlst = 0; ! switch ($timezone){ ! default: ! $dlst = date('I', $time); ! } ! ! return $dlst; ! ! } ! */ ! ?> \ No newline at end of file --- 281,283 ---- } return $data; ! }?> \ No newline at end of file Index: draw_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/draw_functions.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** draw_functions.php 23 Dec 2008 10:20:50 -0000 1.8 --- draw_functions.php 28 Dec 2008 19:30:41 -0000 1.9 *************** *** 1,11 **** <?php ! // function returns starttime and endtime and event length for drawing into a grid ! function drawEventTimes ($start, $end) { global $phpiCal_config; $gridLength = $phpiCal_config->gridLength; ! preg_match ('/([0-9]{2})([0-9]{2})/', $start, $time); ! $sta_h = @$time[1]; ! $sta_min = @$time[2]; $sta_min = sprintf("%02d", floor($sta_min / $gridLength) * $gridLength); if ($sta_min == 60) { --- 1,12 ---- <?php ! # drawEventTimes returns starttime and endtime and event length for drawing into a grid function drawEventTimes ($start, $end) { global $phpiCal_config; + $sta_h = $sta_min = $end_h = $end_min = "00"; $gridLength = $phpiCal_config->gridLength; ! if (preg_match ('/([0-9]{2})([0-9]{2})/', $start, $time)){ ! $sta_h = $time[1]; ! $sta_min = $time[2]; ! } $sta_min = sprintf("%02d", floor($sta_min / $gridLength) * $gridLength); if ($sta_min == 60) { *************** *** 14,20 **** } ! preg_match ('/([0-9]{2})([0-9]{2})/', $end, $time); ! $end_h = @$time[1]; ! $end_min = @$time[2]; $end_min = sprintf("%02d", floor($end_min / $gridLength) * $gridLength); if ($end_min == 60) { --- 15,22 ---- } ! if (preg_match ('/([0-9]{2})([0-9]{2})/', $end, $time)){ ! $end_h = $time[1]; ! $end_min = $time[2]; ! } $end_min = sprintf("%02d", floor($end_min / $gridLength) * $gridLength); if ($end_min == 60) { *************** *** 29,36 **** $end_min = "00"; } ! } ! $draw_len = ($end_h * 60 + $end_min) - ($sta_h * 60 + $sta_min); - return array ("draw_start" => ($sta_h . $sta_min), "draw_end" => ($end_h . $end_min), "draw_length" => $draw_len); } --- 31,36 ---- $end_min = "00"; } ! } $draw_len = ($end_h * 60 + $end_min) - ($sta_h * 60 + $sta_min); return array ("draw_start" => ($sta_h . $sta_min), "draw_end" => ($end_h . $end_min), "draw_length" => $draw_len); } Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** init.inc.php 28 Dec 2008 11:58:46 -0000 1.119 --- init.inc.php 28 Dec 2008 19:30:41 -0000 1.120 *************** *** 12,20 **** include_once(BASE.'functions/userauth_functions.php'); ! // Grab the action (login or logout). if (isset($_GET['action'])) $action = $_GET['action']; ! else if (isset($_POST['action'])) $action = $_POST['action']; ! else $action = ''; // Login and/or logout. --- 12,21 ---- include_once(BASE.'functions/userauth_functions.php'); ! # require php 5 ! if (phpversion() < '5.1') die (error(sprintf($lang['l_php_version_required'],phpversion()) ) ); // Grab the action (login or logout). + $action = ''; if (isset($_GET['action'])) $action = $_GET['action']; ! else if (isset($_POST['action'])) $action = $_POST['action']; // Login and/or logout. Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** template.php 28 Dec 2008 10:50:58 -0000 1.107 --- template.php 28 Dec 2008 19:30:41 -0000 1.108 *************** *** 1063,1067 **** } if (!is_file($file)){ ! exit(error($lang['l_error_path']." template 1065", $file)); } ob_start(); --- 1063,1067 ---- } if (!is_file($file)){ ! exit(error($lang['l_error_path'], $file)); } ob_start(); |
|
From: <ji...@us...> - 2008-12-28 19:30:47
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7568/functions/parse Modified Files: end_vevent.php parse_tzs.php recur_functions.php Log Message: fix misc bugs; rewrite some places where warnings squelched with @; require php5.1 or greater Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** end_vevent.php 27 Dec 2008 11:42:41 -0000 1.19 --- end_vevent.php 28 Dec 2008 19:30:41 -0000 1.20 *************** *** 178,183 **** } } if($current_view == 'search') $freq_type = 'none'; - # $recur is the recurrence info that goes into the master array for this VEVENT $recur = @$recur_array[($start_date)][($hour.$minute)][$uid]['recur']; --- 178,184 ---- } } + # convert wkst to a 3 char day for strtotime to work + $wkst3char = two2threeCharDays($wkst); if($current_view == 'search') $freq_type = 'none'; # $recur is the recurrence info that goes into the master array for this VEVENT $recur = @$recur_array[($start_date)][($hour.$minute)][$uid]['recur']; *************** *** 207,220 **** # conditions where we don't need to iterate over the whole range ! # if repeating without limit, and steps are by 1, don't go back before the mArray beginning. if($count == 1000000 && $interval == 1 && $mArray_begin > $next_range_unixtime) $next_range_unixtime = $mArray_begin; ! # if the beginning of our range is less than the start of the item, we may as well set the range to start at start_time if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime; ! # stop at the until limit if set if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime; ! # more adjustments switch ($freq_type){ case 'week': --- 208,221 ---- # conditions where we don't need to iterate over the whole range ! # if repeating without limit, and steps are by 1, don't go back before the mArray beginning. if($count == 1000000 && $interval == 1 && $mArray_begin > $next_range_unixtime) $next_range_unixtime = $mArray_begin; ! # if the beginning of our range is less than the start of the item, we may as well set the range to start at start_time if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime; ! # stop at the until limit if set if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime; ! # more adjustments switch ($freq_type){ case 'week': *************** *** 232,237 **** $count = 1; } - // convert wkst to a 3 char day for strtotime to work - $wkst3char = two2threeCharDays($wkst); /* The while loop below increments $next_range_time by $freq type. For the larger freq types, there is only --- 233,236 ---- Index: parse_tzs.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/parse_tzs.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** parse_tzs.php 28 Dec 2008 10:51:49 -0000 1.8 --- parse_tzs.php 28 Dec 2008 19:30:41 -0000 1.9 *************** *** 1,5 **** <?php $ifile = @fopen($filename, "r"); ! if ($ifile == FALSE) exit(error($lang['l_error_cantopen']." parse_tz", $filename)); $nextline = fgets($ifile); if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal'], $filename)); --- 1,5 ---- <?php $ifile = @fopen($filename, "r"); ! if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $filename)); $nextline = fgets($ifile); if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal'], $filename)); Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** recur_functions.php 28 Dec 2008 10:50:58 -0000 1.16 --- recur_functions.php 28 Dec 2008 19:30:41 -0000 1.17 *************** *** 1,3 **** ! <?php /* from the std --- 1,3 ---- ! <?php /* from the std *************** *** 29,32 **** --- 29,33 ---- foreach ($times as $time){ #echo "time:". date("Ymd",$time)."\n"; + if (!isset($time) || $time == '') continue; $date = date("Ymd",$time); $time = strtotime("$date 12:00:00"); |
|
From: <ji...@us...> - 2008-12-28 19:30:47
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7568 Modified Files: AUTHORS day.php preferences.php Log Message: fix misc bugs; rewrite some places where warnings squelched with @; require php5.1 or greater Index: AUTHORS =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/AUTHORS,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AUTHORS 20 Dec 2008 00:11:55 -0000 1.7 --- AUTHORS 28 Dec 2008 19:30:41 -0000 1.8 *************** *** 53,59 **** Portuguese Rui Costa <ruicosta at ubi dot pt> Luciano Antonio Costa <bits dot e dot bytes at gmail dot com> ! Slovak Jan Michalicka co...@ji... Spanish Javier Navarro <jnavarro at xips dot es> Luis Fernando Rocha <ludwig_von_rocht at yahoo dot com> ! Russian Sergey <1c@3555686 dot com> Swedish Jonas Hjelm <jonas at hnet dot se> --- 53,59 ---- Portuguese Rui Costa <ruicosta at ubi dot pt> Luciano Antonio Costa <bits dot e dot bytes at gmail dot com> ! Slovak Jan Michalicka <contact at jimi dot sk> Spanish Javier Navarro <jnavarro at xips dot es> Luis Fernando Rocha <ludwig_von_rocht at yahoo dot com> ! Russian Sergey <1c at 3555686 dot com> Swedish Jonas Hjelm <jonas at hnet dot se> Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.136 retrieving revision 1.137 diff -C2 -d -r1.136 -r1.137 *** day.php 20 Dec 2008 00:33:14 -0000 1.136 --- day.php 28 Dec 2008 19:30:41 -0000 1.137 *************** *** 87,91 **** 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! 'style_select' => @$style_select, 'l_goprint' => $lang['l_goprint'], 'l_preferences' => $lang['l_preferences'], --- 87,91 ---- 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! # 'style_select' => $style_select, 'l_goprint' => $lang['l_goprint'], 'l_preferences' => $lang['l_preferences'], Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** preferences.php 27 Dec 2008 23:49:39 -0000 1.67 --- preferences.php 28 Dec 2008 19:30:41 -0000 1.68 *************** *** 7,11 **** if ($phpiCal_config->allow_preferences != 'yes') { ! exit(error('Preferences are not available for this installation.', $cal)); } --- 7,11 ---- if ($phpiCal_config->allow_preferences != 'yes') { ! exit(error($lang['l_prefs_off'], $cal)); } *************** *** 31,34 **** --- 31,35 ---- $cookie_time = $_POST['cookie_time']; $cookie_endtime = $_POST['cookie_endtime']; + $cookie_timezone = $_POST['cookie_timezone']; $cookie_unset = @$_POST['unset']; $the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time","cookie_endtime" => "$cookie_endtime", "cookie_cpath"=>"$cookie_cpath", "cookie_timezone"=>"$cookie_timezone"); *************** *** 59,63 **** $cookie_time = $phpicalendar['cookie_time']; $cookie_endtime = $phpicalendar['cookie_endtime']; ! $cookie_endtime = $phpicalendar['cookie_timezone']; if ($cookie_unset) { unset ($cookie_language, $cookie_calendar, $cookie_view, $cookie_style,$cookie_startday); --- 60,64 ---- $cookie_time = $phpicalendar['cookie_time']; $cookie_endtime = $phpicalendar['cookie_endtime']; ! $cookie_timezone = $phpicalendar['cookie_timezone']; if ($cookie_unset) { unset ($cookie_language, $cookie_calendar, $cookie_view, $cookie_style,$cookie_startday); *************** *** 227,231 **** 'cal' => $cal, 'getdate' => $getdate, ! 'calendar_name' => $calendar_name, 'display_date' => $display_date, 'rss_powered' => $rss_powered, --- 228,232 ---- 'cal' => $cal, 'getdate' => $getdate, ! 'calendar_name' => $cal_displayname, 'display_date' => $display_date, 'rss_powered' => $rss_powered, |
|
From: <ji...@us...> - 2008-12-28 19:30:47
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7568/languages Modified Files: english.inc.php Log Message: fix misc bugs; rewrite some places where warnings squelched with @; require php5.1 or greater Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** english.inc.php 28 Dec 2008 00:46:50 -0000 1.69 --- english.inc.php 28 Dec 2008 19:30:41 -0000 1.70 *************** *** 205,208 **** --- 205,209 ---- $lang['l_error_window'] = 'There was an error!'; $lang['l_error_calendar'] = 'The calendar "%s" was being processed when this error occurred.'; + $lang['l_php_version_required'] = 'PHP version "%s" detected. PHP 5.1 or greater is required to run this version of phpicalendar.'; $lang['l_error_path'] = 'Unable to open the path: "%s"'; $lang['l_error_back'] = 'Please use the "Back" button to return.'; *************** *** 212,215 **** --- 213,217 ---- $lang['l_error_cantopen'] = 'Unable to open calendar.'; $lang['l_error_cache'] = 'Unable to write to cache directory. Please check your config.'; + $lang['l_prefs_off'] = 'Preferences are disabled on this installation.'; ?> \ No newline at end of file |
|
From: <ji...@us...> - 2008-12-28 11:58:50
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4045/functions Modified Files: init.inc.php Log Message: remove debug echo Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** init.inc.php 28 Dec 2008 11:55:43 -0000 1.118 --- init.inc.php 28 Dec 2008 11:58:46 -0000 1.119 *************** *** 128,133 **** $cal_displaynames[] = substr(basename($web_cal), 0, -4); - // FIXME - echo "$web_cal<br>"; if(in_array($web_cal, $list_webcals)){ $web_cal = md5($phpiCal_config->salt.$web_cal); --- 128,131 ---- |
|
From: <ji...@us...> - 2008-12-28 11:55:50
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3514 Modified Files: config.inc.php default_config.php Log Message: obfuscate list_webcals links to hide user:pass (bug 1819552) Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.195 retrieving revision 1.196 diff -C2 -d -r1.195 -r1.196 *** config.inc.php 28 Dec 2008 10:50:57 -0000 1.195 --- config.inc.php 28 Dec 2008 11:55:43 -0000 1.196 *************** *** 23,26 **** --- 23,28 ---- Note that the allow_webcals setting allows webcals to be passed as URLs. You do NOT need to override the default setting to list specific webcals for inclusion in the SPECIAL CALENDARS section below. + + The salt parameter is used to obfuscate things like webcal links that may have usernames and passwords. This should be changed. */ # 'calendar_path' => '/Library/WebServer/Documents/phpicalendar/calendars/recur_tests', *************** *** 31,34 **** --- 33,37 ---- # 'allow_webcals' => 'yes', # 'recursive_path' => 'yes', + # 'salt' => 'SaLt4', /* ** Timezones ** *************** *** 81,85 **** */ $list_webcals = array( ! # 'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics' ); $more_webcals['recur_tests'] = array(); --- 84,88 ---- */ $list_webcals = array( ! 'webcal://dimer.tamu.edu/calendars/seminars/Biochem.ics' ); $more_webcals['recur_tests'] = array(); Index: default_config.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** default_config.php 28 Dec 2008 10:50:57 -0000 1.9 --- default_config.php 28 Dec 2008 11:55:43 -0000 1.10 *************** *** 68,72 **** $this->ftp_port = '21'; // Only used if $this->auth_method='ftp'. The ftp port. '21' is the default for ftp servers. $this->ftp_calendar_path = ''; // Only used if $this->auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $this->calendar_path, but may not be accurate depending on ftp server config. ! // Calendar colors // --- 68,72 ---- $this->ftp_port = '21'; // Only used if $this->auth_method='ftp'. The ftp port. '21' is the default for ftp servers. $this->ftp_calendar_path = ''; // Only used if $this->auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $this->calendar_path, but may not be accurate depending on ftp server config. ! $this->salt = ''; // Calendar colors // |
|
From: <ji...@us...> - 2008-12-28 11:55:47
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3514/functions Modified Files: calendar_functions.php init.inc.php Log Message: obfuscate list_webcals links to hide user:pass (bug 1819552) Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** calendar_functions.php 28 Dec 2008 10:50:58 -0000 1.31 --- calendar_functions.php 28 Dec 2008 11:55:43 -0000 1.32 *************** *** 185,189 **** // $cals = The calendars (entire path, e.g. from availableCalendars). function display_ical_list($cals, $pick=FALSE) { ! global $cal, $current_view, $getdate, $lang, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames, $phpiCal_config; // Print each calendar option. $return = ''; --- 185,189 ---- // $cals = The calendars (entire path, e.g. from availableCalendars). function display_ical_list($cals, $pick=FALSE) { ! global $cal, $current_view, $getdate, $lang, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames, $list_webcals, $phpiCal_config; // Print each calendar option. $return = ''; *************** *** 194,198 **** // and remove the .ics suffix. $cal_displayname_tmp = getCalendarName($cal_tmp); ! $cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp); #overwrite the display name if we already have a real name if (is_numeric(array_search($cal_tmp, $cal_filelist))){ --- 194,198 ---- // and remove the .ics suffix. $cal_displayname_tmp = getCalendarName($cal_tmp); ! #$cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp); #overwrite the display name if we already have a real name if (is_numeric(array_search($cal_tmp, $cal_filelist))){ *************** *** 200,206 **** }else{ # pull the name from the $cal_tmp file ! $cal_tmp = str_replace('webcal://','http://',$cal_tmp); ! $ifile = @fopen($cal_tmp, "r"); if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp)); while (!feof($ifile)) { --- 200,206 ---- }else{ # pull the name from the $cal_tmp file ! $cal_tmp2 = str_replace('webcal://','http://',$cal_tmp); ! $ifile = @fopen($cal_tmp2, "r"); if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp)); while (!feof($ifile)) { *************** *** 242,246 **** // Encode the calendar path. $cal_encoded_tmp = urlencode($cal_tmp); ! // Display the option. // --- 242,248 ---- // Encode the calendar path. $cal_encoded_tmp = urlencode($cal_tmp); ! if(in_array($cal_tmp, $list_webcals)){ ! $cal_encoded_tmp = md5($phpiCal_config->salt.$cal_tmp);; ! } // Display the option. // Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** init.inc.php 28 Dec 2008 10:50:58 -0000 1.117 --- init.inc.php 28 Dec 2008 11:55:43 -0000 1.118 *************** *** 67,70 **** --- 67,74 ---- $local_cals = array(); foreach ($cal_filenames as $cal_filename) { + # substitute for md5-obscured list_webcals + foreach ($list_webcals as $tmp_cal){ + if($cal_filename == md5($phpiCal_config->salt.$tmp_cal)) $cal_filename = $tmp_cal; + } // If the calendar identifier begins with a web protocol, this is a web // calendar. *************** *** 108,112 **** $cal_httpsPrefix = str_replace('webcal://','https://',$web_cal); $cal_httpsPrefix = str_replace('http://','https://',$web_cal); - $web_cal = $cal_httpPrefix; // We can only include this web calendar if we allow all web calendars --- 112,115 ---- *************** *** 126,129 **** --- 129,136 ---- // FIXME + echo "$web_cal<br>"; + if(in_array($web_cal, $list_webcals)){ + $web_cal = md5($phpiCal_config->salt.$web_cal); + } $cals[] = urlencode($web_cal); //$filename = $cal_filename; *************** *** 131,134 **** --- 138,142 ---- // Add the webcal to the available calendars. + $web_cal = $cal_httpPrefix; $cal_filelist[] = $web_cal; } |
