Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29867/functions
Modified Files:
ical_parser.php init.inc.php
Log Message:
Fixed error messages for 2.0
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.173
retrieving revision 1.174
diff -C2 -d -r1.173 -r1.174
*** ical_parser.php 30 Jul 2004 01:16:26 -0000 1.173
--- ical_parser.php 7 Aug 2004 06:36:49 -0000 1.174
***************
*** 101,107 ****
$ifile = @fopen($filename, "r");
! if ($ifile == FALSE) exit(error($error_invalidcal_lang, $filename));
$nextline = fgets($ifile, 1024);
! if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($error_invalidcal_lang, $filename));
//Mod time
--- 101,107 ----
$ifile = @fopen($filename, "r");
! if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $filename));
$nextline = fgets($ifile, 1024);
! if (trim($nextline) != 'BEGIN:VCALENDAR') exit(error($lang['l_error_invalidcal'], $filename));
//Mod time
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** init.inc.php 25 May 2004 23:29:49 -0000 1.62
--- init.inc.php 7 Aug 2004 06:36:49 -0000 1.63
***************
*** 105,109 ****
}
! if ($is_webcal) {
if ($allow_webcals == 'yes' || in_array($cal_webcalPrefix, $list_webcals) || in_array($cal_httpPrefix, $list_webcals) || in_array($cal_httpsPrefix, $list_webcals)) {
$cal_displayname = substr(str_replace('32', ' ', basename($cal_filename)), 0, -4);
--- 105,109 ----
}
! if ($is_webcal == TRUE) {
if ($allow_webcals == 'yes' || in_array($cal_webcalPrefix, $list_webcals) || in_array($cal_httpPrefix, $list_webcals) || in_array($cal_httpsPrefix, $list_webcals)) {
$cal_displayname = substr(str_replace('32', ' ', basename($cal_filename)), 0, -4);
***************
*** 115,119 ****
array_push($cal_filelist,$filename);
} else {
! exit(error($error_remotecal_lang, $HTTP_GET_VARS['cal']));
}
} else {
--- 115,119 ----
array_push($cal_filelist,$filename);
} else {
! exit(error($lang['l_error_remotecal'], $HTTP_GET_VARS['cal']));
}
} else {
***************
*** 121,125 ****
$cal = urlencode($cal_filename);
if (in_array($cal_filename, $blacklisted_cals)) {
! exit(error($error_restrictedcal_lang, $cal_filename));
} else {
if (!isset($filename)) {
--- 121,125 ----
$cal = urlencode($cal_filename);
if (in_array($cal_filename, $blacklisted_cals)) {
! exit(error($lang['l_error_restrictedcal'], $cal_filename));
} else {
if (!isset($filename)) {
|
