Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10599/phpicalendar/functions
Modified Files:
init.inc.php
Log Message:
bug fixes to handle cpath better
Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** init.inc.php 5 Oct 2005 00:29:13 -0000 1.75
--- init.inc.php 16 Nov 2005 01:09:36 -0000 1.76
***************
*** 16,19 ****
--- 16,25 ----
include_once(BASE.'config.inc.php');
include_once(BASE.'error.php');
+ if($_REQUEST['cpath']){
+ $cpath = $_REQUEST['cpath'];
+ $calendar_path .= "/$cpath";
+ $tmp_dir .= "/$cpath";
+ }
+
include_once(BASE.'functions/calendar_functions.php');
include_once(BASE.'functions/userauth_functions.php');
***************
*** 70,78 ****
}
! if($_REQUEST['cpath']){
! $cpath = $_REQUEST['cpath'];
! $calendar_path .= "/$cpath";
! $tmp_dir .= "/$cpath";
! }
if ($calendar_path == '') {
--- 76,80 ----
}
!
if ($calendar_path == '') {
***************
*** 86,90 ****
$_GET['cal'] = explode(",", $_GET['cal']);
}
! //if we have an array of calendard, decode each (though I'm not sure this is necessary)
if(is_array($_GET['cal'])) {
$cal_filename = array();
--- 88,92 ----
$_GET['cal'] = explode(",", $_GET['cal']);
}
! //if we have an array of calendars, decode each (though I'm not sure this is necessary)
if(is_array($_GET['cal'])) {
$cal_filename = array();
***************
*** 92,97 ****
$cal_filename[] = urldecode($c);
}
! }
! else {
$cal_filename = urldecode($_GET['cal']);
}
--- 94,98 ----
$cal_filename[] = urldecode($c);
}
! }else {
$cal_filename = urldecode($_GET['cal']);
}
|
