[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php,1.16,1.17 init.inc.php,1.78,1.79

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19031/phpicalendar/functions

Modified Files:
	calendar_functions.php init.inc.php 
Log Message:
init.inc.php - strip . from cpath, change time calc, calendar_functions.php  change in getCalendarname to not truncate names not ending in .ics

Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** calendar_functions.php	24 Nov 2005 04:28:34 -0000	1.16
--- calendar_functions.php	29 Nov 2005 08:35:48 -0000	1.17
***************
*** 197,201 ****
  	
  	// At this point, just pull the name off the file.
! 	return substr(basename($cal_path), 0, -4);
  }
  
--- 197,201 ----
  	
  	// At this point, just pull the name off the file.
! 	return basename($cal_path,".ics");
  }
  

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** init.inc.php	27 Nov 2005 07:56:31 -0000	1.78
--- init.inc.php	29 Nov 2005 08:35:48 -0000	1.79
***************
*** 27,40 ****
  	if (isset($phpicalendar['cookie_time']))		$day_start			= $phpicalendar['cookie_time'];
  }
  if($_REQUEST['cpath']){
! 	$cpath 	= $_REQUEST['cpath'];				
  	$calendar_path 	.= "/$cpath";				
  	$tmp_dir 	.= "/$cpath";				
  }elseif(isset($default_cpath_check)){
! 	$cpath 	= $default_cpath_check;				
  	$calendar_path 	.= "/$cpath";				
  	$tmp_dir 	.= "/$cpath";
  }
- 
  #these need cpath to be set
  include_once(BASE.'functions/calendar_functions.php');
--- 27,40 ----
  	if (isset($phpicalendar['cookie_time']))		$day_start			= $phpicalendar['cookie_time'];
  }
+ #cpath modifies the calendar path based on the url or cookie values.  This allows you to run multiple calendar subsets from a single phpicalendar installation. Operations on cpath are largely hidden from the end user.
  if($_REQUEST['cpath']){
! 	$cpath 	= str_replace('.','',$_REQUEST['cpath']);				
  	$calendar_path 	.= "/$cpath";				
  	$tmp_dir 	.= "/$cpath";				
  }elseif(isset($default_cpath_check)){
! 	$cpath 	= str_replace('.','',$default_cpath_check);				
  	$calendar_path 	.= "/$cpath";				
  	$tmp_dir 	.= "/$cpath";
  }
  #these need cpath to be set
  include_once(BASE.'functions/calendar_functions.php');
***************
*** 76,80 ****
  		$getdate = $_GET['getdate'];
  	} else {
! 		$getdate = date('Ymd', strtotime("now + $second_offset seconds"));
  	}
  }
--- 76,80 ----
  		$getdate = $_GET['getdate'];
  	} else {
! 		$getdate = date('Ymd', time() + $second_offset);
  	}
  }