Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21128/functions
Modified Files:
ical_parser.php init.inc.php
Log Message:
Minor E_NOTICE fixes.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** ical_parser.php 23 May 2004 08:23:45 -0000 1.168
--- ical_parser.php 25 May 2004 23:29:49 -0000 1.169
***************
*** 159,162 ****
--- 159,164 ----
if (!isset($master_array[-4][$calnumber]['mtime'])) $master_array[-4][$calnumber]['mtime'] = $actual_mtime;
if (!isset($master_array[-4][$calnumber]['filename'])) $master_array[-4][$calnumber]['filename'] = $filename;
+ if (!isset($url)) $url = '';
+ if (!isset($type)) $type = '';
// Handle DURATION
***************
*** 516,519 ****
--- 518,522 ----
if (!isset($bymonth)) $bymonth = array(1,2,3,4,5,6,7,8,9,10,11,12);
$next_range_time = strtotime(date('Y-m-01', $next_range_time));
+ $next_date_time = $next_date_time;
if ((isset($bymonthday)) && (!isset($byday))) {
foreach($bymonthday as $day) {
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** init.inc.php 22 May 2004 23:51:03 -0000 1.61
--- init.inc.php 25 May 2004 23:29:49 -0000 1.62
***************
*** 129,142 ****
// Sets the download and subscribe paths from the config if present.
! if ($download_uri == '' && preg_match('/(^\/|\.\.\/)/', $filename) == 0) {
! $subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
! $download_filename = $filename;
! } elseif ($download_uri != '') {
! $newurl = eregi_replace("^(http://)", "", $download_uri);
! $subscribe_path = 'webcal://'.$newurl.'/'.$cal_filename.'.ics';
! $download_filename = $download_uri.'/'.$cal_filename.'.ics';
! } else {
! $subscribe_path = '';
! $download_filename = '';
}
}
--- 129,144 ----
// Sets the download and subscribe paths from the config if present.
! if (isset($filename)) {
! if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) {
! $subscribe_path = 'webcal://'.$HTTP_SERVER_VARS['SERVER_NAME'].dirname($HTTP_SERVER_VARS['PHP_SELF']).'/'.$filename;
! $download_filename = $filename;
! } elseif ($download_uri != '') {
! $newurl = eregi_replace("^(http://)", "", $download_uri);
! $subscribe_path = 'webcal://'.$newurl.'/'.$cal_filename.'.ics';
! $download_filename = $download_uri.'/'.$cal_filename.'.ics';
! } else {
! $subscribe_path = '';
! $download_filename = '';
! }
}
}
|
