[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php,1.19,1.20 list_functions.php,1.15,1.16

[<jo...@us...>]

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

Modified Files:
	calendar_functions.php list_functions.php 
Log Message:
Fixed getCalendarName() return value so it removes .ics and not the last
four characters arbitrarily. Fixed the list_jumps() method so it only
passes in one calendar at a time to getCalendarName.


Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** calendar_functions.php	2 Dec 2005 17:25:08 -0000	1.19
--- calendar_functions.php	15 Dec 2005 03:26:31 -0000	1.20
***************
*** 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: list_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** list_functions.php	30 Nov 2005 02:20:32 -0000	1.15
--- list_functions.php	15 Dec 2005 03:26:31 -0000	1.16
***************
*** 3,7 ****
  function list_jumps() {
  	global $second_offset, $lang, $cal;
! 	$calName = getCalendarName($cal);
  	$today = date('Ymd', time() + $second_offset);
  	$return = '<option value="#">'.$lang['l_jump'].'</option>';
--- 3,7 ----
  function list_jumps() {
  	global $second_offset, $lang, $cal;
! 	$calName = join(',', array_map("getCalendarName", split(',', $cal)));
  	$today = date('Ymd', time() + $second_offset);
  	$return = '<option value="#">'.$lang['l_jump'].'</option>';