phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.180,1.181

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12670

Added Files:
	config.inc.php 
Log Message:
add comments to  config.inc.php

[PHPiCalendar-Commits] phpicalendar/templates/default event.tpl, 1.9, 1.10

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/default
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10015/templates/default

Modified Files:
	event.tpl 
Log Message:
modify event.php

Index: event.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/event.tpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** event.tpl	16 May 2005 19:15:01 -0000	1.9
--- event.tpl	20 Dec 2008 09:35:44 -0000	1.10
***************
*** 16,22 ****
  			<td align="left" class="V12">
  				<div style="margin-left: 10px; margin-bottom:10px;">
! 					<p>{EVENT_TEXT} - <span class="V9">(<i>{EVENT_TIMES}</i>)</span></p>
  					<!-- switch description on -->
! 					<p>{DESCRIPTION}</p>
  					<!-- switch description off -->
  					<p>
--- 16,22 ----
  			<td align="left" class="V12">
  				<div style="margin-left: 10px; margin-bottom:10px;">
! 					<p><b>{L_SUMMARY}</b>:{EVENT_TEXT} - <span class="V9">(<i>{EVENT_TIMES}</i>)</span></p>
  					<!-- switch description on -->
! 					<p><b>{L_DESCRIPTION}</b>:{DESCRIPTION}</p>
  					<!-- switch description off -->
  					<p>

[PHPiCalendar-Commits] phpicalendar/includes event.php,1.43,1.44

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

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10015/includes

Modified Files:
	event.php 
Log Message:
modify event.php

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** event.php	20 Dec 2008 03:22:54 -0000	1.43
--- event.php	20 Dec 2008 09:35:44 -0000	1.44
***************
*** 2,20 ****
  $current_view = "event";
  define('BASE', '../');
- #$getdate = $_POST['date'];
  include_once(BASE.'functions/init.inc.php'); 
- #include_once(BASE.'functions/ical_parser.php'); 
  require_once(BASE.'functions/template.php');
  
! function decode_popup ($item) {
! 	$item = stripslashes(rawurldecode($item));
! 	$item = str_replace('\\','',$item);
! 	return $item;
! }
! 
! 
! 
! #$event 			= $master_array[$_POST['date']][$_POST['time']][decode_popup($_POST['uid'])];
! $event			= unserialize(stripslashes($_REQUEST['event_data']));
  $organizer 		= unserialize($event['organizer']);
  $attendee 		= unserialize($event['attendee']);
--- 2,12 ----
  $current_view = "event";
  define('BASE', '../');
  include_once(BASE.'functions/init.inc.php'); 
  require_once(BASE.'functions/template.php');
  
! # information for the popup is sent via $_POST by a javascript snippet in 
! # in function openevent() from functions/date_functions.php
! # character encoding has been problematic with popups.
! $event			= unserialize($_POST['event_data']);
  $organizer 		= unserialize($event['organizer']);
  $attendee 		= unserialize($event['attendee']);
***************
*** 28,56 ****
  }
  
! $event['description'] 	= stripslashes(utf8_decode(urldecode($event['description'])));
! $event['event_text'] = stripslashes(utf8_decode(urldecode($event['event_text'])));
! $event['location'] = stripslashes(utf8_decode(urldecode($event['location'])));
  $display ='';
  if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
  
- $organizer = '';
  if (isset($organizer) && is_array($organizer)) {
  	$i=0;
  	$display .= $lang['l_organizer'] . ' - ';
  	foreach ($organizer as $val) {	
! 		$organizers .= $organizer[$i]["name"] . ', ';
  		$i++;
  	}
! 	$organizer = substr($organizers,0,-2);
  }
- $attendees = '';
  if (isset($attendee) && is_array($attendee)) {
  	$i=0;
  	$display .= $lang['l_attendee'] . ' - ';
  	foreach ($attendee as $val) {	
! 		$attendees .= $attendee[$i]["name"] . ', ';
  		$i++;
  	}
! 	$attendee = substr($attendees,0,-2);
  }
  
--- 20,46 ----
  }
  
! $event['event_text'] = stripslashes(urldecode($event['event_text']));
! $event['description'] 	= stripslashes(urldecode($event['description']));
! $event['location'] = stripslashes(urldecode($event['location']));
  $display ='';
  if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
  
  if (isset($organizer) && is_array($organizer)) {
  	$i=0;
  	$display .= $lang['l_organizer'] . ' - ';
  	foreach ($organizer as $val) {	
! 		$organizers[] = $organizer[$i]["name"];
  		$i++;
  	}
! 	$organizer = implode(', ',$organizers);
  }
  if (isset($attendee) && is_array($attendee)) {
  	$i=0;
  	$display .= $lang['l_attendee'] . ' - ';
  	foreach ($attendee as $val) {	
! 		$attendees[] .= $attendee[$i]["name"];
  		$i++;
  	}
! 	$attendee = implode(', ',$attendees);
  }
  
***************
*** 97,100 ****
--- 87,92 ----
  	'cal_title_full'	=> $event['calname'].' '.$lang['l_calendar'],
  	'template'			=> $phpiCal_config->template,
+ 	'l_summary' 		=> $lang['l_summary'],
+ 	'l_description'		=> $lang['l_description'],
  	'l_organizer'		=> $lang['l_organizer'],
  	'l_attendee'		=> $lang['l_attendee'],

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.228, 1.229

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17150/functions

Modified Files:
	ical_parser.php 
Log Message:
add default_path to search.php

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.228
retrieving revision 1.229
diff -C2 -d -r1.228 -r1.229
*** ical_parser.php	20 Dec 2008 03:22:54 -0000	1.228
--- ical_parser.php	20 Dec 2008 05:05:25 -0000	1.229
***************
*** 389,393 ****
  						case 'DURATION':
  							if (($first_duration == TRUE) && (!stristr($field, '=DURATION'))) {
! 								ereg ('^P([0-9]{1,2}[W])?([0-9]{1,2}[D])?([T]{0,1})?([0-9]{1,2}[H])?([0-9]{1,2}[M])?([0-9]{1,2}[S])?', $data, $duration); 
  								$weeks 			= str_replace('W', '', $duration[1]); 
  								$days 			= str_replace('D', '', $duration[2]); 
--- 389,393 ----
  						case 'DURATION':
  							if (($first_duration == TRUE) && (!stristr($field, '=DURATION'))) {
! 								ereg ('^P([0-9]{1,2}[W])?([0-9]{1,3}[D])?([T]{0,1})?([0-9]{1,2}[H])?([0-9]{1,2}[M])?([0-9]{1,2}[S])?', $data, $duration); 
  								$weeks 			= str_replace('W', '', $duration[1]); 
  								$days 			= str_replace('D', '', $duration[2]); 

[PHPiCalendar-Commits] phpicalendar search.php,1.41,1.42

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17150

Modified Files:
	search.php 
Log Message:
add default_path to search.php

Index: search.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** search.php	28 Jun 2006 23:43:32 -0000	1.41
--- search.php	20 Dec 2008 05:05:25 -0000	1.42
***************
*** 3,11 ****
  define('BASE','./');
  $current_view = 'search';
- $display_date = $lang['l_results'];
  require_once(BASE.'functions/ical_parser.php');
  require_once(BASE.'functions/list_functions.php');
  require_once(BASE.'functions/template.php');
! header("Content-Type: text/html; charset=$charset");
  
  if (isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != '') {
--- 3,11 ----
  define('BASE','./');
  $current_view = 'search';
  require_once(BASE.'functions/ical_parser.php');
  require_once(BASE.'functions/list_functions.php');
  require_once(BASE.'functions/template.php');
! header("Content-Type: text/html; charset=$phpiCal_config->charset");
! $display_date = $lang['l_results'];
  
  if (isset($_SERVER['HTTP_REFERER']) && $_SERVER['HTTP_REFERER'] != '') {
***************
*** 28,32 ****
  	'<input type="hidden" name="getdate" value="'.$getdate.'">'."\n".
  	'<input type="text" size="15" name="query" value="'.$query.'">'."\n".
!         '<INPUT type="image" src="templates/'.$template.'/images/search.gif" border=0 height="19" width="18" name="submit" value="Search">'."\n".
  	'</form>';
  
--- 28,32 ----
  	'<input type="hidden" name="getdate" value="'.$getdate.'">'."\n".
  	'<input type="text" size="15" name="query" value="'.$query.'">'."\n".
!         '<INPUT type="image" src="templates/'.$phpiCal_config->template.'/images/search.gif" border=0 height="19" width="18" name="submit" value="Search">'."\n".
  	'</form>';
  
***************
*** 278,282 ****
  
  
! $page = new Page(BASE.'templates/'.$template.'/search.tpl');
  
  $page->draw_search($page);
--- 278,282 ----
  
  
! $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/search.tpl');
  
  $page->draw_search($page);
***************
*** 284,290 ****
  	
  $page->replace_files(array(
! 	'header'			=> BASE.'templates/'.$template.'/header.tpl',
! 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
! 	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl',
  	'event_js'			=> BASE.'functions/event.js',
  	));
--- 284,290 ----
  	
  $page->replace_files(array(
! 	'header'			=> BASE.'templates/'.$phpiCal_config->template.'/header.tpl',
! 	'footer'			=> BASE.'templates/'.$phpiCal_config->template.'/footer.tpl',
! 	'sidebar'			=> BASE.'templates/'.$phpiCal_config->template.'/sidebar.tpl',
  	'event_js'			=> BASE.'functions/event.js',
  	));
***************
*** 292,296 ****
  
  $page->replace_tags(array(
! 	'version'			=> $phpicalendar_version,
  	'formatted_search'	=> $formatted_search,
  	'l_results'			=> $lang['l_results'],
--- 292,297 ----
  
  $page->replace_tags(array(
! 	'version'			=> $phpiCal_config->phpicalendar_version,
! 	'default_path'		=> $phpiCal_config->default_path,
  	'formatted_search'	=> $formatted_search,
  	'l_results'			=> $lang['l_results'],
***************
*** 304,309 ****
  	'l_no_results'		=> $lang['l_no_results'],
  	'search_box'		=> $search_box,
! 	'charset'			=> $charset,
! 	'template'			=> $template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
--- 305,310 ----
  	'l_no_results'		=> $lang['l_no_results'],
  	'search_box'		=> $search_box,
! 	'charset'			=> $phpiCal_config->charset,
! 	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
***************
*** 312,316 ****
  	'display_date'		=> $display_date,
  	'rss_powered'	 	=> $rss_powered,
- 	'default_path'		=> '',
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',
--- 313,316 ----
***************
*** 353,355 ****
  #print_r($the_arr);
  #echo "</pre>";
! ?>
--- 353,355 ----
  #print_r($the_arr);
  #echo "</pre>";
! ?>
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar/languages english.inc.php, 1.63, 1.64

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

Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11521/languages

Modified Files:
	english.inc.php 
Log Message:
misc error warnings and notices

Index: english.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** english.inc.php	21 Mar 2006 09:52:29 -0000	1.63
--- english.inc.php	20 Dec 2008 04:24:42 -0000	1.64
***************
*** 208,210 ****
  $lang['l_error_cache']			= 'Unable to write to cache directory. Please check your config.';
  
! ?>
--- 208,210 ----
  $lang['l_error_cache']			= 'Unable to write to cache directory. Please check your config.';
  
! ?>
\ No newline at end of file

[PHPiCalendar-Commits] phpicalendar preferences.php,1.63,1.64

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11521

Modified Files:
	preferences.php 
Log Message:
misc error warnings and notices

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** preferences.php	13 Dec 2008 23:42:31 -0000	1.63
--- preferences.php	20 Dec 2008 04:24:42 -0000	1.64
***************
*** 1,8 ****
  <?php
- 
  define('BASE','./');
  require_once(BASE.'functions/ical_parser.php');
  require_once(BASE.'functions/template.php');
! $display_date = $preferences_lang;
  
  if ($phpiCal_config->allow_preferences != 'yes') {
--- 1,8 ----
  <?php
  define('BASE','./');
+ $current_view = 'preferences';
  require_once(BASE.'functions/ical_parser.php');
  require_once(BASE.'functions/template.php');
! $display_date = $lang['l_preferences'];
  
  if ($phpiCal_config->allow_preferences != 'yes') {
***************
*** 11,15 ****
  
  $current_view = "preferences";
! $back_page = BASE.$default_view.'.php?cal='.$cal.'&amp;getdate='.$getdate.'&amp;cpath='.$cpath;
  if ($phpiCal_config->allow_preferences == 'no') header("Location: $back_page");
  
--- 11,15 ----
  
  $current_view = "preferences";
! $back_page = BASE.$phpiCal_config->default_view.'.php?cal='.$cal.'&amp;getdate='.$getdate.'&amp;cpath='.$cpath;
  if ($phpiCal_config->allow_preferences == 'no') header("Location: $back_page");
  
***************
*** 21,25 ****
  
  $startdays = array ('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday');
- $cpath = $_REQUEST['cpath'];
  
  if ($action == 'setcookie') { 
--- 21,24 ----
***************
*** 31,35 ****
  	$cookie_startday	= $_POST['cookie_startday'];
  	$cookie_time		= $_POST['cookie_time'];
! 	$cookie_unset		= $_POST['unset'];
  	$the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time", "cookie_cpath"=>"$cookie_cpath");
  	$the_cookie 		= serialize($the_cookie);
--- 30,34 ----
  	$cookie_startday	= $_POST['cookie_startday'];
  	$cookie_time		= $_POST['cookie_time'];
! 	$cookie_unset		= @$_POST['unset'];
  	$the_cookie = array ("cookie_language" => "$cookie_language", "cookie_calendar" => "$cookie_calendar", "cookie_view" => "$cookie_view", "cookie_startday" => "$cookie_startday", "cookie_style" => "$cookie_style", "cookie_time" => "$cookie_time", "cookie_cpath"=>"$cookie_cpath");
  	$the_cookie 		= serialize($the_cookie);
***************
*** 86,89 ****
--- 85,89 ----
  $dir_handle = @opendir(BASE.'languages/');
  $tmp_pref_language = urlencode(ucfirst($language));
+ $language_select = '';
  while ($file = readdir($dir_handle)) {
  	if (substr($file, -8) == ".inc.php") {
***************
*** 99,111 ****
  
  // select for calendars
! $calendar_select = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED),TRUE);
  $calendar_select .="<option value=\"$phpiCal_config->ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>";
  $calendar_select = str_replace("<option value=\"$cookie_calendar\">","<option value=\"$cookie_calendar\" selected='selected'>",$calendar_select);
  // select for dayview
! $view_select 	= ($default_view == 'day') ? '<option value="day" selected="selected">{L_DAY}</option>' : '<option value="day">{L_DAY}</option>';
! $view_select    .= ($default_view == 'week') ? '<option value="week" selected="selected">{L_WEEK}</option>' : '<option value="week">{L_WEEK}</option>';
! $view_select    .= ($default_view == 'month') ? '<option value="month" selected="selected">{L_MONTH}</option>' : '<option value="month">{L_MONTH}</option>';
  
  // select for time
  for ($i = 000; $i <= 1200; $i += 100) {
  	$s = sprintf("%04d", $i);
--- 99,112 ----
  
  // select for calendars
! $calendar_select = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED),TRUE);
  $calendar_select .="<option value=\"$phpiCal_config->ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>";
  $calendar_select = str_replace("<option value=\"$cookie_calendar\">","<option value=\"$cookie_calendar\" selected='selected'>",$calendar_select);
  // select for dayview
! $view_select 	= ($phpiCal_config->default_view == 'day') ? '<option value="day" selected="selected">{L_DAY}</option>' : '<option value="day">{L_DAY}</option>';
! $view_select    .= ($phpiCal_config->default_view == 'week') ? '<option value="week" selected="selected">{L_WEEK}</option>' : '<option value="week">{L_WEEK}</option>';
! $view_select    .= ($phpiCal_config->default_view == 'month') ? '<option value="month" selected="selected">{L_MONTH}</option>' : '<option value="month">{L_MONTH}</option>';
  
  // select for time
+ $time_select = '';
  for ($i = 000; $i <= 1200; $i += 100) {
  	$s = sprintf("%04d", $i);
***************
*** 119,122 ****
--- 120,124 ----
  // select for day of week
  $i=0;
+ $startday_select = '';
  foreach ($daysofweek_lang as $daysofweek) {
  	if ($startdays[$i] == $cookie_startday) {
***************
*** 129,132 ****
--- 131,135 ----
  
  $dir_handle = @opendir(BASE.'templates/');
+ $style_select = '';
  while ($file = readdir($dir_handle)) {
  	if (($file != ".") && ($file != "..") && ($file != "CVS")) {
***************
*** 153,157 ****
  	'charset'			=> $phpiCal_config->charset,
  	'template'			=> $phpiCal_config->template,
! 	'default_path'		=> '',
  	'cpath'				=> $cpath,
  	'cal'				=> $cal,
--- 156,160 ----
  	'charset'			=> $phpiCal_config->charset,
  	'template'			=> $phpiCal_config->template,
! 	'default_path'		=> $phpiCal_config->default_path,
  	'cpath'				=> $cpath,
  	'cal'				=> $cal,

[PHPiCalendar-Commits] phpicalendar/rss index.php, 1.44, 1.45 rss.php, 1.50, 1.51 rss1.0.php, 1.8, 1.9 rss2.0.php, 1.7, 1.8 rss_common.php, 1.2, 1.3

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

Update of /cvsroot/phpicalendar/phpicalendar/rss
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5363/rss

Modified Files:
	index.php rss.php rss1.0.php rss2.0.php rss_common.php 
Log Message:
misc error warnings and notices

Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** index.php	11 Dec 2008 21:54:53 -0000	1.44
--- index.php	20 Dec 2008 03:22:54 -0000	1.45
***************
*** 1,7 ****
  <?php
  
! /* Rewritten by J. Hu 4/2/06
! */
! 
  define('BASE','../');
  require_once(BASE.'functions/ical_parser.php');
--- 1,6 ----
  <?php
  
! /* Rewritten by J. Hu 4/2/06*/
! $current_view = 'rss';
  define('BASE','../');
  require_once(BASE.'functions/ical_parser.php');
***************
*** 13,17 ****
  
  if (empty($default_path)) {
! 	if (isset($_SERVER['HTTPS']) || strtolower($_SERVER['HTTPS']) == 'on' ) {
  		$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
  	} else {
--- 12,16 ----
  
  if (empty($default_path)) {
! 	if (isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) {
  		$default_path = 'https://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].substr($_SERVER['PHP_SELF'],0,strpos($_SERVER['PHP_SELF'],'/rss/'));
  	} else {
***************
*** 41,59 ****
  /* Changed to show links without urlencode, but links valid urls */
  	$rss_list .= "<td>".$lang['l_day']."</td>";
! 	$rss_list .= '<td><a href='.$default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 0.91</td>';
! 	$rss_list .= '<td><a href='.$default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 1.0</td>';
! 	$rss_list .= '<td><a href='.$default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 2.0</td></tr>';
  
  	$rss_list .= "<td>".$lang['l_week']."</td>";
! 	$rss_list .= '<td><a href='.$default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 0.91</td>';
! 	$rss_list .= '<td><a href='.$default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 1.0</td>';
! 	$rss_list .= '<td><a href='.$default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 2.0</td></tr>';
  
  	$rss_list .= "<td>".$lang['l_month']."</td>";
! 	$rss_list .= '<td><a href='.$default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 0.91</td>';
! 	$rss_list .= '<td><a href='.$default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 1.0</td>';
! 	$rss_list .= '<td><a href='.$default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 2.0</td></tr>';
  
! 	$footer_check = $default_path.'/rss/rss.php?cal%3D'.rawurlencode($file.'&amp;cpath='.$cpath.'&amp;rssview='.$default_view);
  	$validrss_check = str_replace('%', '%25', $footer_check);
  	$rss_list .= "<tr><td>&nbsp;</td></tr>\n";
--- 40,58 ----
  /* Changed to show links without urlencode, but links valid urls */
  	$rss_list .= "<td>".$lang['l_day']."</td>";
! 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 0.91</td>';
! 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 1.0</td>';
! 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=day>'.$xml_icon.'</a> RSS 2.0</td></tr>';
  
  	$rss_list .= "<td>".$lang['l_week']."</td>";
! 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 0.91</td>';
! 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 1.0</td>';
! 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=week>'.$xml_icon.'</a> RSS 2.0</td></tr>';
  
  	$rss_list .= "<td>".$lang['l_month']."</td>";
! 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 0.91</td>';
! 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss1.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 1.0</td>';
! 	$rss_list .= '<td><a href='.$phpiCal_config->default_path.'/rss/rss2.0.php?cal='.rawurlencode($file).'&amp;cpath='.$cpath.'&amp;rssview=month>'.$xml_icon.'</a> RSS 2.0</td></tr>';
  
! 	$footer_check = $phpiCal_config->default_path.'/rss/rss.php?cal%3D'.rawurlencode($file.'&amp;cpath='.$cpath.'&amp;rssview='.$phpiCal_config->default_view);
  	$validrss_check = str_replace('%', '%25', $footer_check);
  	$rss_list .= "<tr><td>&nbsp;</td></tr>\n";
***************
*** 66,81 ****
  
  
! $page = new Page(BASE.'templates/'.$template.'/rss_index.tpl');
  
  $page->replace_files(array(
! 	'header'			=> BASE.'templates/'.$template.'/header.tpl',
! 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
  	'event_js'			=> ''
  	));
  
  $page->replace_tags(array(
! 	'version'			=> $phpicalendar_version,
! 	'default_path'		=> $default_path.'/',
! 	'template'			=> $template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
--- 65,80 ----
  
  
! $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/rss_index.tpl');
  
  $page->replace_files(array(
! 	'header'			=> BASE.'templates/'.$phpiCal_config->template.'/header.tpl',
! 	'footer'			=> BASE.'templates/'.$phpiCal_config->template.'/footer.tpl',
  	'event_js'			=> ''
  	));
  
  $page->replace_tags(array(
! 	'version'			=> $phpiCal_config->phpicalendar_version,
! 	'default_path'		=> $phpiCal_config->default_path.'/',
! 	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
***************
*** 83,90 ****
  	'display_date'		=> $display_date,
  	'current_view'		=> $current_view,
! 	'sidebar_date'		=> $sidebar_date,
  	'rss_powered'	 	=> $rss_powered,
  	'rss_list'	 		=> $rss_list,
! 	'charset'	 		=> $charset,
  	'rss_available' 	=> '',
  	'rssdisable'	 	=> '',
--- 82,89 ----
  	'display_date'		=> $display_date,
  	'current_view'		=> $current_view,
! 	'sidebar_date'		=> @$sidebar_date,
  	'rss_powered'	 	=> $rss_powered,
  	'rss_list'	 		=> $rss_list,
! 	'charset'	 		=> $phpiCal_config->charset,
  	'rss_available' 	=> '',
  	'rssdisable'	 	=> '',
***************
*** 93,97 ****
  /* Replaces footer.tpl {validrss_check} with $validrss_check */	
  	'validrss_check'	=> $validrss_check,
! 	'show_search' 		=> $show_search,
  	'l_rss_info'		=> $lang['l_rss_info'],
  	'l_rss_subhead'		=> $lang['l_rss_subhead'],
--- 92,96 ----
  /* Replaces footer.tpl {validrss_check} with $validrss_check */	
  	'validrss_check'	=> $validrss_check,
! 	'show_search' 		=> $phpiCal_config->show_search,
  	'l_rss_info'		=> $lang['l_rss_info'],
  	'l_rss_subhead'		=> $lang['l_rss_subhead'],

Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** rss.php	11 Dec 2008 21:54:53 -0000	1.50
--- rss.php	20 Dec 2008 03:22:54 -0000	1.51
***************
*** 21,25 ****
  	$rss .= "</title>\n";
  	
! 	$rss .= '<link>'.htmlspecialchars("$default_path").'</link>'."\n";
  	if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath";
  	$rss .= "<link>$rss_link</link>\n";
--- 21,25 ----
  	$rss .= "</title>\n";
  	
! 	$rss .= '<link>'.htmlspecialchars("$phpiCal_config->default_path").'</link>'."\n";
  	if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath";
  	$rss .= "<link>$rss_link</link>\n";

Index: rss1.0.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss1.0.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rss1.0.php	20 Dec 2008 00:11:56 -0000	1.8
--- rss1.0.php	20 Dec 2008 03:22:54 -0000	1.9
***************
*** 20,24 ****
  		xmlns="http://purl.org/rss/1.0/">'."\n";
  	
! 	$rss .= '<channel rdf:about="'.$default_path.'/rss/rss.php/';
  	if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath";
  	$rss .='">'."\n";
--- 20,24 ----
  		xmlns="http://purl.org/rss/1.0/">'."\n";
  	
! 	$rss .= '<channel rdf:about="'.$phpiCal_config->default_path.'/rss/rss.php/';
  	if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath";
  	$rss .='">'."\n";
***************
*** 49,54 ****
  	/* End guid modification */
  	$rss_item .= '<title>'.$rss_title.'</title>'."\n";
! 	$rss .= '<ev:startdate>'.date("Y-m-d\TH:i:s", $val["start_unixtime"]).'</ev:startdate>'."\n";
! 	$rss .= '<ev:enddate>'.date("Y-m-d\TH:i:s", $val["end_unixtime"]).'</ev:enddate>'."\n";
  
  	$rss_item .= '<link>'.$rss_link.'</link>'."\n";
--- 49,54 ----
  	/* End guid modification */
  	$rss_item .= '<title>'.$rss_title.'</title>'."\n";
! 	$rss .= '<ev:startdate>'.date("Y-m-d\TH:i:s", @$val["start_unixtime"]).'</ev:startdate>'."\n";
! 	$rss .= '<ev:enddate>'.date("Y-m-d\TH:i:s", @$val["end_unixtime"]).'</ev:enddate>'."\n";
  
  	$rss_item .= '<link>'.$rss_link.'</link>'."\n";

Index: rss2.0.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss2.0.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rss2.0.php	20 Dec 2008 00:11:56 -0000	1.7
--- rss2.0.php	20 Dec 2008 03:22:54 -0000	1.8
***************
*** 38,42 ****
  	$rss .= "</title>\n";
  	
! 	$rss .= '<link>'.$default_path.'/rss/rss2.0.php/';
  	if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath";
  	$rss .='</link>'."\n";
--- 38,42 ----
  	$rss .= "</title>\n";
  	
! 	$rss .= '<link>'.$phpiCal_config->default_path.'/rss/rss2.0.php/';
  	if (isset($cpath) && $cpath !='') $rss_link.="?cpath=$cpath";
  	$rss .='</link>'."\n";
***************
*** 61,66 ****
  	/* End guid modification */
  	$rss .= '<title>'.$rss_title.'</title>'."\n";
! 	$rss .= '<ev:startdate>'.date("Y-m-d\TH:i:s", $val["start_unixtime"]).'</ev:startdate>'."\n";
! 	$rss .= '<ev:enddate>'.date("Y-m-d\TH:i:s", $val["end_unixtime"]).'</ev:enddate>'."\n";
  
  	$rss .= '<link>'.$rss_link.'</link>'."\n";
--- 61,66 ----
  	/* End guid modification */
  	$rss .= '<title>'.$rss_title.'</title>'."\n";
! 	$rss .= '<ev:startdate>'.date("Y-m-d\TH:i:s", @$val["start_unixtime"]).'</ev:startdate>'."\n";
! 	$rss .= '<ev:enddate>'.date("Y-m-d\TH:i:s", @$val["end_unixtime"]).'</ev:enddate>'."\n";
  
  	$rss .= '<link>'.$rss_link.'</link>'."\n";

Index: rss_common.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss_common.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rss_common.php	20 Dec 2008 00:11:56 -0000	1.2
--- rss_common.php	20 Dec 2008 03:22:54 -0000	1.3
***************
*** 22,26 ****
     Additional mods by J. Hu
  */
!    
  require(BASE.'functions/init.inc.php');
  
--- 22,26 ----
     Additional mods by J. Hu
  */
! $current_view = 'rss';   
  require(BASE.'functions/init.inc.php');
  
***************
*** 123,127 ****
  // stuff, if so be nice and send back a 304 and exit.
  
! if ( ($_SERVER['HTTP_IF_MODIFIED_SINCE'] == $filemodtime) || ($_SERVER['HTTP_IF_NONE_MATCH'] == $filemodtime)){
  	header ("HTTP/1.1 304 Not Modified");
  	exit;
--- 123,127 ----
  // stuff, if so be nice and send back a 304 and exit.
  
! if ( (@$_SERVER['HTTP_IF_MODIFIED_SINCE'] == $filemodtime) || (@$_SERVER['HTTP_IF_NONE_MATCH'] == $filemodtime)){
  	header ("HTTP/1.1 304 Not Modified");
  	exit;
***************
*** 155,159 ****
  			foreach ($event_times as $uid=>$val) {
  				#handle multiday all day events
! 				if(!$val["event_start"]){
  					if (isset($uid_arr[$uid])){
  						$uid_arr[$uid] .= "+$dayofweek" ;
--- 155,159 ----
  			foreach ($event_times as $uid=>$val) {
  				#handle multiday all day events
! 				if(!isset($val["event_start"])){
  					if (isset($uid_arr[$uid])){
  						$uid_arr[$uid] .= "+$dayofweek" ;

[PHPiCalendar-Commits] phpicalendar/functions/init date_range.php, 1.4, 1.5

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

Update of /cvsroot/phpicalendar/phpicalendar/functions/init
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5363/functions/init

Modified Files:
	date_range.php 
Log Message:
misc error warnings and notices

Index: date_range.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/date_range.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** date_range.php	20 Dec 2008 00:33:14 -0000	1.4
--- date_range.php	20 Dec 2008 03:22:54 -0000	1.5
***************
*** 4,8 ****
  		$getdate = $_GET['getdate'];
  	} else {
! 		$getdate = date('Ymd', time() + $phpIcal_config->second_offset);
  	}
  }
--- 4,8 ----
  		$getdate = $_GET['getdate'];
  	} else {
! 		$getdate = date('Ymd', time() + $phpiCal_config->second_offset);
  	}
  }

[PHPiCalendar-Commits] phpicalendar/includes event.php, 1.42, 1.43 todo.php, 1.19, 1.20

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

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5363/includes

Modified Files:
	event.php todo.php 
Log Message:
misc error warnings and notices

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** event.php	17 Dec 2008 09:58:30 -0000	1.42
--- event.php	20 Dec 2008 03:22:54 -0000	1.43
***************
*** 1,3 ****
--- 1,4 ----
  <?php 
+ $current_view = "event";
  define('BASE', '../');
  #$getdate = $_POST['date'];
***************
*** 30,39 ****
  $event['event_text'] = stripslashes(utf8_decode(urldecode($event['event_text'])));
  $event['location'] = stripslashes(utf8_decode(urldecode($event['location'])));
! 
  if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
  
! if (is_array($organizer)) {
  	$i=0;
! 	$display .= $organizer_lang . ' - ';
  	foreach ($organizer as $val) {	
  		$organizers .= $organizer[$i]["name"] . ', ';
--- 31,41 ----
  $event['event_text'] = stripslashes(utf8_decode(urldecode($event['event_text'])));
  $event['location'] = stripslashes(utf8_decode(urldecode($event['location'])));
! $display ='';
  if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
  
! $organizer = '';
! if (isset($organizer) && is_array($organizer)) {
  	$i=0;
! 	$display .= $lang['l_organizer'] . ' - ';
  	foreach ($organizer as $val) {	
  		$organizers .= $organizer[$i]["name"] . ', ';
***************
*** 42,48 ****
  	$organizer = substr($organizers,0,-2);
  }
! if (is_array($attendee)) {
  	$i=0;
! 	$display .= $attendee_lang . ' - ';
  	foreach ($attendee as $val) {	
  		$attendees .= $attendee[$i]["name"] . ', ';
--- 44,51 ----
  	$organizer = substr($organizers,0,-2);
  }
! $attendees = '';
! if (isset($attendee) && is_array($attendee)) {
  	$i=0;
! 	$display .= $lang['l_attendee'] . ' - ';
  	foreach ($attendee as $val) {	
  		$attendees .= $attendee[$i]["name"] . ', ';
***************
*** 52,56 ****
  }
  
! if ($event['location']) {
  	if ($event['url'] != '') $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.stripslashes($event['location']).'</a>';
  }else{
--- 55,59 ----
  }
  
! if (isset($event['location'])) {
  	if ($event['url'] != '') $event['location'] = '<a href="'.$event['url'].'" target="_blank">'.stripslashes($event['location']).'</a>';
  }else{
***************
*** 58,62 ****
  }
  
! if (!$event['location'] && $event['url']) {
  	$event['location'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>';
  	$lang['l_location'] = 'URL';
--- 61,65 ----
  }
  
! if (!isset($event['location']) && isset($event['url'])) {
  	$event['location'] = '<a href="'.$event['url'].'" target="_blank">'.$event['url'].'</a>';
  	$lang['l_location'] = 'URL';
***************
*** 80,87 ****
  }
  
! $page = new Page(BASE.'templates/'.$template.'/event.tpl');
  
  $page->replace_tags(array(
! 	'charset'			=> $charset,
  	'cal' 				=> $event['calname'],
  	'event_text' 		=> $event['event_text'],
--- 83,90 ----
  }
  
! $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/event.tpl');
  
  $page->replace_tags(array(
! 	'charset'			=> $phpiCal_config->charset,
  	'cal' 				=> $event['calname'],
  	'event_text' 		=> $event['event_text'],
***************
*** 93,97 ****
  	'location' 			=> stripslashes($event['location']),
  	'cal_title_full'	=> $event['calname'].' '.$lang['l_calendar'],
! 	'template'			=> $template,
  	'l_organizer'		=> $lang['l_organizer'],
  	'l_attendee'		=> $lang['l_attendee'],
--- 96,100 ----
  	'location' 			=> stripslashes($event['location']),
  	'cal_title_full'	=> $event['calname'].' '.$lang['l_calendar'],
! 	'template'			=> $phpiCal_config->template,
  	'l_organizer'		=> $lang['l_organizer'],
  	'l_attendee'		=> $lang['l_attendee'],

Index: todo.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/todo.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** todo.php	19 May 2007 16:18:13 -0000	1.19
--- todo.php	20 Dec 2008 03:22:54 -0000	1.20
***************
*** 5,9 ****
  include_once(BASE.'functions/date_functions.php');
  require_once(BASE.'functions/template.php');
! 
  $vtodo_array = unserialize(urldecode(base64_decode($_REQUEST['todo_data'])));
  
--- 5,9 ----
  include_once(BASE.'functions/date_functions.php');
  require_once(BASE.'functions/template.php');
! $current_view = 'todo';
  $vtodo_array = unserialize(urldecode(base64_decode($_REQUEST['todo_data'])));
  
***************
*** 26,32 ****
  	$status = $lang['l_completed_date'] . ' ' . $completed_date;
  } elseif ($status == "COMPLETED") {
! 	$status = $completed_lang;
  } else {
! 	$status = $unfinished_lang;
  }
  
--- 26,32 ----
  	$status = $lang['l_completed_date'] . ' ' . $completed_date;
  } elseif ($status == "COMPLETED") {
! 	$status = $lang['l_completed'];
  } else {
! 	$status = $lang['l_unfinished'];
  }
  
***************
*** 44,48 ****
  
  $page->replace_tags(array(
! 	'charset'			=> $charset,
  	'cal' 				=> $cal_title_full,
  	'vtodo_text' 		=> $vtodo_text,
--- 44,48 ----
  
  $page->replace_tags(array(
! 	'charset'			=> $phpiCal_config->charset,
  	'cal' 				=> $cal_title_full,
  	'vtodo_text' 		=> $vtodo_text,
***************
*** 53,57 ****
  	'due_date' 			=> $due_date,
  	'cal_title_full'	=> $cal_title_full,
! 	'template'			=> $template,
  	'l_created'			=> $lang['l_created'],
  	'l_priority'		=> $lang['l_priority'],
--- 53,57 ----
  	'due_date' 			=> $due_date,
  	'cal_title_full'	=> $cal_title_full,
! 	'template'			=> $phpiCal_config->template,
  	'l_created'			=> $lang['l_created'],
  	'l_priority'		=> $lang['l_priority'],

[PHPiCalendar-Commits] phpicalendar/functions draw_functions.php, 1.6, 1.7 ical_parser.php, 1.227, 1.228 template.php, 1.98, 1.99

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5363/functions

Modified Files:
	draw_functions.php ical_parser.php template.php 
Log Message:
misc error warnings and notices

Index: draw_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/draw_functions.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** draw_functions.php	11 Dec 2008 21:54:52 -0000	1.6
--- draw_functions.php	20 Dec 2008 03:22:54 -0000	1.7
***************
*** 6,11 ****
  	$gridLength = $phpiCal_config->gridLength;
  	preg_match ('/([0-9]{2})([0-9]{2})/', $start, $time);
! 	$sta_h = $time[1];
! 	$sta_min = $time[2];
  	$sta_min = sprintf("%02d", floor($sta_min / $gridLength) * $gridLength);
  	if ($sta_min == 60) {
--- 6,11 ----
  	$gridLength = $phpiCal_config->gridLength;
  	preg_match ('/([0-9]{2})([0-9]{2})/', $start, $time);
! 	$sta_h = @$time[1];
! 	$sta_min = @$time[2];
  	$sta_min = sprintf("%02d", floor($sta_min / $gridLength) * $gridLength);
  	if ($sta_min == 60) {
***************
*** 15,20 ****
  	
  	preg_match ('/([0-9]{2})([0-9]{2})/', $end, $time);
! 	$end_h = $time[1];
! 	$end_min = $time[2];
  	$end_min = sprintf("%02d", floor($end_min / $gridLength) * $gridLength);
  	if ($end_min == 60) {
--- 15,20 ----
  	
  	preg_match ('/([0-9]{2})([0-9]{2})/', $end, $time);
! 	$end_h = @$time[1];
! 	$end_min = @$time[2];
  	$end_min = sprintf("%02d", floor($end_min / $gridLength) * $gridLength);
  	if ($end_min == 60) {

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.227
retrieving revision 1.228
diff -C2 -d -r1.227 -r1.228
*** ical_parser.php	20 Dec 2008 00:11:56 -0000	1.227
--- ical_parser.php	20 Dec 2008 03:22:54 -0000	1.228
***************
*** 136,140 ****
  						$beginning, $start_of_vevent, $url, 
  						$valarm_description, $start_unixtime, $end_unixtime, $display_end_tmp, $end_time_tmp1, 
! 						$recurrence_id, $uid, $rrule, $abs_until, $until_check,
  						$until, $byweek, $byweekno, 
  						$byminute, $byhour, $bysecond
--- 136,140 ----
  						$beginning, $start_of_vevent, $url, 
  						$valarm_description, $start_unixtime, $end_unixtime, $display_end_tmp, $end_time_tmp1, 
! 						$recurrence_id, $uid, $rrule, $until_check,
  						$until, $byweek, $byweekno, 
  						$byminute, $byhour, $bysecond
***************
*** 171,177 ****
  					break;
  				case 'END:VTODO':
! 					if ((!$vtodo_priority) && ($status == 'COMPLETED')) {
  						$vtodo_sort = 11;
! 					} elseif (!$vtodo_priority) { 
  						$vtodo_sort = 10;
  					} else {
--- 171,177 ----
  					break;
  				case 'END:VTODO':
! 					if (($vtodo_priority == '') && ($status == 'COMPLETED')) {
  						$vtodo_sort = 11;
! 					} elseif ($vtodo_priority == '') { 
  						$vtodo_sort = 10;
  					} else {
***************
*** 210,213 ****
--- 210,223 ----
  				case 'BEGIN:VTODO':
  					$vtodo_set = TRUE;
+ 					$summary = '';
+ 					$due_date = '';
+ 					$due_time = '';
+ 					$completed_date = '';
+ 					$completed_time = '';
+ 					$vtodo_priority = '';
+ 					$vtodo_categories = '';
+ 					$status = '';
+ 					$class = '';
+ 					$description = '';
  					break;
  				case 'BEGIN:VALARM':
***************
*** 288,292 ****
  								$except_dates[] = $regs[1] . $regs[2] . $regs[3];
  								// Added for Evolution, since they dont think they need to tell me which time to exclude.
! 								if (($regs[4] == '') && ($start_time != '')) { 
  									$except_times[] = $start_time;
  								} else {
--- 298,302 ----
  								$except_dates[] = $regs[1] . $regs[2] . $regs[3];
  								// Added for Evolution, since they dont think they need to tell me which time to exclude.
! 								if ($regs[4] == '' && isset($start_time) && $start_time != '') { 
  									$except_times[] = $start_time;
  								} else {
***************
*** 357,361 ****
  								$offset_tmp = $chooseOffset($recur_unixtime);
  							}
! 							$recur_unixtime = calcTime($offset_tmp, $server_offset_tmp, $recur_unixtime);
  							$recurrence_id['date'] = date('Ymd', $recur_unixtime);
  							$recurrence_id['time'] = date('Hi', $recur_unixtime);
--- 367,371 ----
  								$offset_tmp = $chooseOffset($recur_unixtime);
  							}
! 							$recur_unixtime = calcTime($offset_tmp, @$server_offset_tmp, $recur_unixtime);
  							$recurrence_id['date'] = date('Ymd', $recur_unixtime);
  							$recurrence_id['time'] = date('Hi', $recur_unixtime);

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** template.php	18 Dec 2008 09:22:23 -0000	1.98
--- template.php	20 Dec 2008 03:22:54 -0000	1.99
***************
*** 65,72 ****
  
  		$seen_events = array();
  		foreach($master_array as $key => $val) {
  			preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs);
! 			if ((($regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week')) || ((substr($regs[1],0,4) == $parse_year) && ($printview == 'year'))) {
! 				$events_week++;
  				$dayofmonth = strtotime ($key);
  				$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
--- 65,73 ----
  
  		$seen_events = array();
+ 		$final = '';
  		foreach($master_array as $key => $val) {
  			preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs);
! 			if (((@$regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week')) || ((substr(@$regs[1],0,4) == $parse_year) && ($printview == 'year'))) {
! 				@$events_week++;
  				$dayofmonth = strtotime ($key);
  				$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
***************
*** 75,81 ****
  				$day_events = 0;
  				// Pull out each day
  				foreach ($val as $new_val) {
  					foreach ($new_val as $new_key2 => $new_val2) {
! 						if (isset($seen_events["$new_key2"]) && $new_val2['spans_day'] == 1){
  							$new_val2['event_text'] .= " second instance of ".$new_key2;
  							continue;
--- 76,83 ----
  				$day_events = 0;
  				// Pull out each day
+ 				$some_events = '';
  				foreach ($val as $new_val) {
  					foreach ($new_val as $new_key2 => $new_val2) {
! 						if (isset($seen_events["$new_key2"]) && isset($new_val2['spans_day']) && $new_val2['spans_day'] == 1){
  							$new_val2['event_text'] .= " second instance of ".$new_key2;
  							continue;
***************
*** 83,94 ****
  						$seen_events["$new_key2"] = 1;
  						$day_events++;
! 					if ($new_val2['event_text']) {	
  						$event_text 	= stripslashes(urldecode($new_val2['event_text']));
! 						$location 	= stripslashes(urldecode($new_val2['location']));
! 						$description 	= stripslashes(urldecode($new_val2['description']));
! 						$event_start 	= $new_val2['event_start'];
! 						$event_end 		= $new_val2['event_end'];
  						if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end'];
! 							if (!$new_val2['event_start']) { 
  								$event_start = $lang['l_all_day'];
  								$event_start2 = '';
--- 85,96 ----
  						$seen_events["$new_key2"] = 1;
  						$day_events++;
! 					if (isset($new_val2['event_text'])) {	
  						$event_text 	= stripslashes(urldecode($new_val2['event_text']));
! 						$location 	= stripslashes(urldecode(@$new_val2['location']));
! 						$description 	= stripslashes(urldecode(@$new_val2['description']));
! 						$event_start 	= @$new_val2['event_start'];
! 						$event_end 		= @$new_val2['event_end'];
  						if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end'];
! 							if (!isset($new_val2['event_start'])) { 
  								$event_start = $lang['l_all_day'];
  								$event_start2 = '';
***************
*** 120,124 ****
  				$day_tmp  = str_replace('{DAYOFMONTH}', $dayofmonth, $day_tmp);
  				$final   .= $day_tmp.$some_events;
! 				unset ($day_tmp, $some_events);
  			}
  		}
--- 122,127 ----
  				$day_tmp  = str_replace('{DAYOFMONTH}', $dayofmonth, $day_tmp);
  				$final   .= $day_tmp.$some_events;
! 				unset ($day_tmp);
! 				$some_events = '';
  			}
  		}
***************
*** 280,288 ****
  		$loop_begin = trim($match2[1]);
  		$loop_end 	= trim($match3[1]);
  		foreach ($weekarray as $get_date) {
  			$replace 	= $loop_begin;
  			$colspan	= 'colspan="'.$nbrGridCols[$get_date].'"';
  			$replace 	= str_replace('{COLSPAN}', $colspan, $replace);
! 			if (is_array($master_array[$get_date]['-1']) && !empty($master_array[$get_date]['-1']) ) {
  				foreach ($master_array[$get_date]['-1'] as $uid => $allday) {
  					$event_calno  	= $allday['calnumber'];
--- 283,292 ----
  		$loop_begin = trim($match2[1]);
  		$loop_end 	= trim($match3[1]);
+ 		$weekreplace = '';
  		foreach ($weekarray as $get_date) {
  			$replace 	= $loop_begin;
  			$colspan	= 'colspan="'.$nbrGridCols[$get_date].'"';
  			$replace 	= str_replace('{COLSPAN}', $colspan, $replace);
! 			if (isset($master_array[$get_date]['-1']) && is_array($master_array[$get_date]['-1']) && !empty($master_array[$get_date]['-1']) ) {
  				foreach ($master_array[$get_date]['-1'] as $uid => $allday) {
  					$event_calno  	= $allday['calnumber'];
***************
*** 351,354 ****
--- 355,359 ----
  			$thisdate = ($thisdate + (25 * 60 * 60));
  		}
+ 		$weekdisplay = '';
  		foreach ($day_array as $key) {
  			$cal_time = $key;	
***************
*** 468,472 ****
  								// Start drawing the event
  								$event_temp   = $loop_event;
! 								$event 		  = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $week_events_lines, 25, 'ps');
  								$event_temp   = str_replace('{EVENT}', $event, $event_temp);
  								$event_temp   = str_replace('{EVENT_START}', $event_start, $event_temp);
--- 473,477 ----
  								// Start drawing the event
  								$event_temp   = $loop_event;
! 								$event 		  = openevent($thisday, $cal_time, $uid, $this_time_arr[$uid], $phpiCal_config->week_events_lines, 25, 'ps');
  								$event_temp   = str_replace('{EVENT}', $event, $event_temp);
  								$event_temp   = str_replace('{EVENT_START}', $event_start, $event_temp);
***************
*** 739,746 ****
  		$loop_t_ad 	= trim($match1[1]);
  		$loop_t_e 	= trim($match2[1]);
  		$return_adtmp	= '';
  		$return_etmp	= '';
  
! 		if (is_array($master_array[$next_day]) && sizeof($master_array[$next_day]) > 0) {
  			foreach ($master_array[$next_day] as $cal_time => $event_times) {
  				foreach ($event_times as $uid => $val) {
--- 744,753 ----
  		$loop_t_ad 	= trim($match1[1]);
  		$loop_t_e 	= trim($match2[1]);
+ 		$replace_ad	= '';
+ 		$replace_e	= '';
  		$return_adtmp	= '';
  		$return_etmp	= '';
  
! 		if (isset($master_array[$next_day]) && is_array($master_array[$next_day]) && sizeof($master_array[$next_day]) > 0) {
  			foreach ($master_array[$next_day] as $cal_time => $event_times) {
  				foreach ($event_times as $uid => $val) {
***************
*** 812,816 ****
  						// --></script>";
  
! 						$todo .= '<a class="psf" title="'.$title.'" href="#" onclick="openTodoInfo('.$todo_popup_data_index.'); return false;">';
  						$todo_popup_data_index++;
  						$vtodo_array = $todo;
--- 819,823 ----
  						// --></script>";
  
! 						$todo .= '<a class="psf" title="'.@$title.'" href="#" onclick="openTodoInfo('.$todo_popup_data_index.'); return false;">';
  						$todo_popup_data_index++;
  						$vtodo_array = $todo;
***************
*** 1016,1020 ****
  					$start_date 	= localizeDate ($dateFormat_week_list, $u_start);
  					foreach ($event_times as $uid => $val) {
! 						if (isset($seen_events[$uid]) && $val['spans_day'] == 1) continue;
  						$seen_events[$uid] = 1;
  						$switch['CAL'] 			= $cal;
--- 1023,1027 ----
  					$start_date 	= localizeDate ($dateFormat_week_list, $u_start);
  					foreach ($event_times as $uid => $val) {
! 						if (isset($seen_events[$uid]) && @$val['spans_day'] == 1) continue;
  						$seen_events[$uid] = 1;
  						$switch['CAL'] 			= $cal;

[PHPiCalendar-Commits] phpicalendar month.php, 1.147, 1.148 print.php, 1.41, 1.42 week.php, 1.136, 1.137 year.php, 1.50, 1.51

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5363

Modified Files:
	month.php print.php week.php year.php 
Log Message:
misc error warnings and notices

Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.147
retrieving revision 1.148
diff -C2 -d -r1.147 -r1.148
*** month.php	19 Dec 2008 21:15:53 -0000	1.147
--- month.php	20 Dec 2008 03:22:54 -0000	1.148
***************
*** 74,78 ****
  	'display_date'		=> $display_date,
  	'rss_powered'	 	=> $rss_powered,
! 	'default_path'		=> '',
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',
--- 74,78 ----
  	'display_date'		=> $display_date,
  	'rss_powered'	 	=> $rss_powered,
! 	'default_path'		=> $phpiCal_config->default_path,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',

Index: print.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** print.php	20 Dec 2008 00:33:14 -0000	1.41
--- print.php	20 Dec 2008 03:22:54 -0000	1.42
***************
*** 4,8 ****
  require_once(BASE.'functions/date_functions.php');
  require_once(BASE.'functions/init.inc.php');
! $start_week_time 	= strtotime(dateOfWeek($getdate, $week_start_day));
  $end_week_time 		= $start_week_time + (6 * 25 * 60 * 60);
  $parse_month 		= date ("Ym", strtotime($getdate));
--- 4,8 ----
  require_once(BASE.'functions/date_functions.php');
  require_once(BASE.'functions/init.inc.php');
! $start_week_time 	= strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
  $end_week_time 		= $start_week_time + (6 * 25 * 60 * 60);
  $parse_month 		= date ("Ym", strtotime($getdate));
***************
*** 42,46 ****
  require_once(BASE.'functions/list_functions.php');
  require_once(BASE.'functions/template.php');
! header("Content-Type: text/html; charset=$charset");
  
  
--- 42,46 ----
  require_once(BASE.'functions/list_functions.php');
  require_once(BASE.'functions/template.php');
! header("Content-Type: text/html; charset=$phpiCal_config->charset");
  
  
***************
*** 65,83 ****
      'printview'         => $printview,
  	'display_date'		=> $display_date,
! 	'sidebar_date'		=> $sidebar_date,
  	'rss_powered'	 	=> $rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',
  	'show_search' 		=> '',
! 	'next_day' 			=> $next_day,
! 	'prev_day'	 		=> $prev_day,
  	'show_goto' 		=> '',
  	'is_logged_in' 		=> '',
! 	'list_icals' 		=> $list_icals,
! 	'list_years' 		=> $list_years,
! 	'list_months' 		=> $list_months,
! 	'list_weeks' 		=> $list_weeks,
! 	'list_jumps' 		=> $list_jumps,
! 	'legend'	 		=> $list_calcolors,
  	'style_select' 		=> @$style_select,
  	'l_time'			=> $lang['l_time'],
--- 65,83 ----
      'printview'         => $printview,
  	'display_date'		=> $display_date,
! 	'sidebar_date'		=> @$sidebar_date,
  	'rss_powered'	 	=> $rss_powered,
  	'rss_available' 	=> '',
  	'rss_valid' 		=> '',
  	'show_search' 		=> '',
! 	'next_day' 			=> @$next_day,
! 	'prev_day'	 		=> @$prev_day,
  	'show_goto' 		=> '',
  	'is_logged_in' 		=> '',
! 	'list_icals' 		=> @$list_icals,
! 	'list_years' 		=> @$list_years,
! 	'list_months' 		=> @$list_months,
! 	'list_weeks' 		=> @$list_weeks,
! 	'list_jumps' 		=> @$list_jumps,
! 	'legend'	 		=> @$list_calcolors,
  	'style_select' 		=> @$style_select,
  	'l_time'			=> $lang['l_time'],

Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.136
retrieving revision 1.137
diff -C2 -d -r1.136 -r1.137
*** week.php	20 Dec 2008 00:33:14 -0000	1.136
--- week.php	20 Dec 2008 03:22:54 -0000	1.137
***************
*** 57,61 ****
  	'version'			=> $phpiCal_config->phpicalendar_version,
  	'charset'			=> $phpiCal_config->charset,
! 	'default_path'		=> '',
  	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
--- 57,61 ----
  	'version'			=> $phpiCal_config->phpicalendar_version,
  	'charset'			=> $phpiCal_config->charset,
! 	'default_path'		=> $phpiCal_config->default_path,
  	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,

Index: year.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** year.php	19 Dec 2008 21:15:53 -0000	1.50
--- year.php	20 Dec 2008 03:22:54 -0000	1.51
***************
*** 58,62 ****
  	'template'			=> $phpiCal_config->template,
  	'charset'			=> $phpiCal_config->charset,
! 	'default_path'		=> '',
  	'cal'				=> $cal,
  	'getcpath'			=> "&cpath=$cpath",
--- 58,62 ----
  	'template'			=> $phpiCal_config->template,
  	'charset'			=> $phpiCal_config->charset,
! 	'default_path'		=> $phpiCal_config->default_path,
  	'cal'				=> $cal,
  	'getcpath'			=> "&cpath=$cpath",
***************
*** 72,79 ****
  	'event_js' 			=> '',
  	'this_year'			=> $this_year,
! 	'next_day' 			=> $next_day,
! 	'next_week' 		=> $next_week,
! 	'prev_day'	 		=> $prev_day,
! 	'prev_week'	 		=> $prev_week,
  	'next_year'			=> $next_year,
  	'prev_year'			=> $prev_year,
--- 72,79 ----
  	'event_js' 			=> '',
  	'this_year'			=> $this_year,
! 	'next_day' 			=> @$next_day,
! 	'next_week' 		=> @$next_week,
! 	'prev_day'	 		=> @$prev_day,
! 	'prev_week'	 		=> @$prev_week,
  	'next_year'			=> $next_year,
  	'prev_year'			=> $prev_year,
***************
*** 92,96 ****
  	'list_jumps' 		=> $list_jumps,
  	'legend'	 		=> $list_calcolors,
! 	'style_select' 		=> $style_select,
  	'l_goprint'			=> $lang['l_goprint'],
  	'l_preferences'		=> $lang['l_preferences'],
--- 92,96 ----
  	'list_jumps' 		=> $list_jumps,
  	'legend'	 		=> $list_calcolors,
! 	'style_select' 		=> @$style_select,
  	'l_goprint'			=> $lang['l_goprint'],
  	'l_preferences'		=> $lang['l_preferences'],

[PHPiCalendar-Commits] phpicalendar/functions/parse end_vevent.php, 1.9, 1.10 recur_functions.php, 1.8, 1.9

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

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5363/functions/parse

Modified Files:
	end_vevent.php recur_functions.php 
Log Message:
misc error warnings and notices

Index: end_vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** end_vevent.php	18 Dec 2008 09:22:23 -0000	1.9
--- end_vevent.php	20 Dec 2008 03:22:54 -0000	1.10
***************
*** 12,15 ****
--- 12,17 ----
  */
  
+ if (!isset($start_date)) echo "no start date for $summary<br>";
+ 
  // Handle DURATION
  if (!isset($end_unixtime)) {
***************
*** 133,137 ****
  			$until = str_replace('Z', '', $until);
  			if (strlen($until) == 8) $until = $until.'235959';
- 			$abs_until = $until;
  			ereg ('([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})', $until, $regs);
  			$until_unixtime = mktime($regs[4],$regs[5],@$regs[6],$regs[2],$regs[3],$regs[1]);
--- 135,138 ----
***************
*** 331,335 ****
  				// Let's double check the until to not write past it
  				$until_check = $start_date_tmp.$time_tmp.'00'; 
! 				if ($abs_until > $until_check) {
  					$master_array[$start_date_tmp][$time_tmp][$uid] = array (
  						'event_start' => $start_time_tmp, 
--- 332,336 ----
  				// Let's double check the until to not write past it
  				$until_check = $start_date_tmp.$time_tmp.'00'; 
! 				if (@$until > $until_check) {
  					$master_array[$start_date_tmp][$time_tmp][$uid] = array (
  						'event_start' => $start_time_tmp, 

Index: recur_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** recur_functions.php	18 Dec 2008 09:22:23 -0000	1.8
--- recur_functions.php	20 Dec 2008 03:22:54 -0000	1.9
***************
*** 58,62 ****
  function expand_bymonth($time){
  	global $bymonth, $byweekno, $bymonthday, $year, $start_unixtime, $freq_type;
! 	if(!empty($byweekno)) return $times;
  	if(empty($bymonth)) $bymonth = array(date("m", $start_unixtime)); 
  	$d = date("d",$start_unixtime);
--- 58,62 ----
  function expand_bymonth($time){
  	global $bymonth, $byweekno, $bymonthday, $year, $start_unixtime, $freq_type;
! 	if(!empty($byweekno)) return $time;
  	if(empty($bymonth)) $bymonth = array(date("m", $start_unixtime)); 
  	$d = date("d",$start_unixtime);

[PHPiCalendar-Commits] phpicalendar/templates/tan header.tpl, 1.1, 1.2

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/tan
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25593/templates/tan

Modified Files:
	header.tpl 
Log Message:
misc minor fixes

Index: header.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/tan/header.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** header.tpl	18 May 2007 19:03:09 -0000	1.1
--- header.tpl	20 Dec 2008 00:33:14 -0000	1.2
***************
*** 5,9 ****
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
--- 5,9 ----
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
***************
*** 19,20 ****
--- 19,24 ----
    <input type="hidden" name="event_data" id="event_data" value="" />
  </form>
+ <form name="todoPopupForm" id="todoPopupForm" method="post" action="includes/todo.php" style="display: none;">
+   <input type="hidden" name="todo_data" id="todo_data" value="" />
+   <input type="hidden" name="todo_text" id="todo_text" value="" />
+ </form>

[PHPiCalendar-Commits] phpicalendar/templates/red header.tpl, 1.1, 1.2

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/red
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25593/templates/red

Modified Files:
	header.tpl 
Log Message:
misc minor fixes

Index: header.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/red/header.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** header.tpl	18 May 2007 19:03:08 -0000	1.1
--- header.tpl	20 Dec 2008 00:33:14 -0000	1.2
***************
*** 5,9 ****
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
--- 5,9 ----
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
***************
*** 19,20 ****
--- 19,24 ----
    <input type="hidden" name="event_data" id="event_data" value="" />
  </form>
+ <form name="todoPopupForm" id="todoPopupForm" method="post" action="includes/todo.php" style="display: none;">
+   <input type="hidden" name="todo_data" id="todo_data" value="" />
+   <input type="hidden" name="todo_text" id="todo_text" value="" />
+ </form>

[PHPiCalendar-Commits] phpicalendar/templates/default header.tpl, 1.15, 1.16

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/default
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25593/templates/default

Modified Files:
	header.tpl 
Log Message:
misc minor fixes

Index: header.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/header.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** header.tpl	19 May 2007 16:18:13 -0000	1.15
--- header.tpl	20 Dec 2008 00:33:14 -0000	1.16
***************
*** 5,9 ****
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
--- 5,9 ----
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">

[PHPiCalendar-Commits] phpicalendar/templates/grey header.tpl, 1.1, 1.2

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/grey
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25593/templates/grey

Modified Files:
	header.tpl 
Log Message:
misc minor fixes

Index: header.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/grey/header.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** header.tpl	18 May 2007 19:03:08 -0000	1.1
--- header.tpl	20 Dec 2008 00:33:14 -0000	1.2
***************
*** 5,9 ****
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
--- 5,9 ----
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
***************
*** 19,20 ****
--- 19,24 ----
    <input type="hidden" name="event_data" id="event_data" value="" />
  </form>
+ <form name="todoPopupForm" id="todoPopupForm" method="post" action="includes/todo.php" style="display: none;">
+   <input type="hidden" name="todo_data" id="todo_data" value="" />
+   <input type="hidden" name="todo_text" id="todo_text" value="" />
+ </form>

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

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25593/functions

Modified Files:
	list_functions.php 
Log Message:
misc minor fixes

Index: list_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** list_functions.php	16 Dec 2008 15:46:24 -0000	1.19
--- list_functions.php	20 Dec 2008 00:33:14 -0000	1.20
***************
*** 2,8 ****
  
  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>';
  	$return .= '<option value="day.php?cal='.$calName.'&amp;getdate='.$today.'">'.$lang['l_goday'].'</option>';
--- 2,8 ----
  
  function list_jumps() {
! 	global $phpiCal_config, $lang, $cal;
  	$calName = join(',', array_map("getCalendarName", split(',', $cal)));
! 	$today = date('Ymd', time() + $phpiCal_config->second_offset);
  	$return = '<option value="#">'.$lang['l_jump'].'</option>';
  	$return .= '<option value="day.php?cal='.$calName.'&amp;getdate='.$today.'">'.$lang['l_goday'].'</option>';

[PHPiCalendar-Commits] phpicalendar/functions/init date_range.php, 1.3, 1.4

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

Update of /cvsroot/phpicalendar/phpicalendar/functions/init
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25593/functions/init

Modified Files:
	date_range.php 
Log Message:
misc minor fixes

Index: date_range.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/date_range.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** date_range.php	17 Dec 2008 06:58:53 -0000	1.3
--- date_range.php	20 Dec 2008 00:33:14 -0000	1.4
***************
*** 4,8 ****
  		$getdate = $_GET['getdate'];
  	} else {
! 		$getdate = date('Ymd', time() + $second_offset);
  	}
  }
--- 4,8 ----
  		$getdate = $_GET['getdate'];
  	} else {
! 		$getdate = date('Ymd', time() + $phpIcal_config->second_offset);
  	}
  }

[PHPiCalendar-Commits] phpicalendar day.php, 1.135, 1.136 print.php, 1.40, 1.41 week.php, 1.135, 1.136

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

Update of /cvsroot/phpicalendar/phpicalendar
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25593

Modified Files:
	day.php print.php week.php 
Log Message:
misc minor fixes

Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** day.php	15 Dec 2008 17:25:27 -0000	1.135
--- day.php	20 Dec 2008 00:33:14 -0000	1.136
***************
*** 20,24 ****
  $weekstart 		= 1;
  $unix_time 		= strtotime($getdate);
! $today_today 	= date('Ymd', time() + $second_offset);  
  $next_day		= date('Ymd', strtotime("+1 day",  $unix_time));
  $prev_day 		= date('Ymd', strtotime("-1 day",  $unix_time));
--- 20,24 ----
  $weekstart 		= 1;
  $unix_time 		= strtotime($getdate);
! $today_today 	= date('Ymd', time() + $phpiCal_config->second_offset);  
  $next_day		= date('Ymd', strtotime("+1 day",  $unix_time));
  $prev_day 		= date('Ymd', strtotime("-1 day",  $unix_time));
***************
*** 87,91 ****
  	'list_jumps' 		=> $list_jumps,
  	'legend'	 		=> $list_calcolors,
! 	'style_select' 		=> $style_select,
  	'l_goprint'			=> $lang['l_goprint'],
  	'l_preferences'		=> $lang['l_preferences'],
--- 87,91 ----
  	'list_jumps' 		=> $list_jumps,
  	'legend'	 		=> $list_calcolors,
! 	'style_select' 		=> @$style_select,
  	'l_goprint'			=> $lang['l_goprint'],
  	'l_preferences'		=> $lang['l_preferences'],

Index: print.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** print.php	12 Oct 2007 06:41:33 -0000	1.40
--- print.php	20 Dec 2008 00:33:14 -0000	1.41
***************
*** 48,67 ****
  
  $page->replace_files(array(
! 	'header'			=> BASE.'templates/'.$template.'/header.tpl',
! 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
! 	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl'
  	));
  
  $page->replace_tags(array(
! 	'version'			=> $phpicalendar_version,
  	'event_js'			=> '',
! 	'charset'			=> $charset,
! 	'default_path'		=> '',
! 	'template'			=> $template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
  	'calendar_name'		=> $cal_displayname,
  	'current_view'		=> $current_view,
!         'printview'          => $printview,
  	'display_date'		=> $display_date,
  	'sidebar_date'		=> $sidebar_date,
--- 48,67 ----
  
  $page->replace_files(array(
! 	'header'			=> BASE.'templates/'.$phpiCal_config->template.'/header.tpl',
! 	'footer'			=> BASE.'templates/'.$phpiCal_config->template.'/footer.tpl',
! 	'sidebar'			=> BASE.'templates/'.$phpiCal_config->template.'/sidebar.tpl'
  	));
  
  $page->replace_tags(array(
! 	'version'			=> $phpiCal_config->phpicalendar_version,
  	'event_js'			=> '',
! 	'charset'			=> $phpiCal_config->charset,
! 	'default_path'		=> $phpiCal_config->default_path,
! 	'template'			=> $phpiCal_config->template,
  	'cal'				=> $cal,
  	'getdate'			=> $getdate,
  	'calendar_name'		=> $cal_displayname,
  	'current_view'		=> $current_view,
!     'printview'         => $printview,
  	'display_date'		=> $display_date,
  	'sidebar_date'		=> $sidebar_date,
***************
*** 80,84 ****
  	'list_jumps' 		=> $list_jumps,
  	'legend'	 		=> $list_calcolors,
! 	'style_select' 		=> $style_select,
  	'l_time'			=> $lang['l_time'],
  	'l_summary'			=> $lang['l_summary'],
--- 80,84 ----
  	'list_jumps' 		=> $list_jumps,
  	'legend'	 		=> $list_calcolors,
! 	'style_select' 		=> @$style_select,
  	'l_time'			=> $lang['l_time'],
  	'l_summary'			=> $lang['l_summary'],
***************
*** 89,93 ****
  	'l_month'			=> $lang['l_month'],
  	'l_year'			=> $lang['l_year'],
! 	'l_location'			=> $lang['l_location'],	
  	'l_subscribe'		=> $lang['l_subscribe'],
  	'l_download'		=> $lang['l_download'],
--- 89,93 ----
  	'l_month'			=> $lang['l_month'],
  	'l_year'			=> $lang['l_year'],
! 	'l_location'		=> $lang['l_location'],	
  	'l_subscribe'		=> $lang['l_subscribe'],
  	'l_download'		=> $lang['l_download'],

Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** week.php	15 Dec 2008 17:25:27 -0000	1.135
--- week.php	20 Dec 2008 00:33:14 -0000	1.136
***************
*** 11,15 ****
  $weekstart 			= 1;
  $unix_time 			= strtotime($getdate);
! $today_today        = date('Ymd', time() + $second_offset); 
  $next_week 			= date("Ymd", strtotime("+1 week",  $unix_time));
  $prev_week 			= date("Ymd", strtotime("-1 week",  $unix_time));
--- 11,15 ----
  $weekstart 			= 1;
  $unix_time 			= strtotime($getdate);
! $today_today        = date('Ymd', time() + $phpiCal_config->second_offset); 
  $next_week 			= date("Ymd", strtotime("+1 week",  $unix_time));
  $prev_week 			= date("Ymd", strtotime("-1 week",  $unix_time));

[PHPiCalendar-Commits] phpicalendar/functions/parse parse_tzs.php, 1.3, 1.4

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

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25593/functions/parse

Modified Files:
	parse_tzs.php 
Log Message:
misc minor fixes

Index: parse_tzs.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/parse_tzs.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** parse_tzs.php	15 Dec 2008 17:25:28 -0000	1.3
--- parse_tzs.php	20 Dec 2008 00:33:14 -0000	1.4
***************
*** 47,54 ****
  				0	=> $offset_s, 
  				1	=> $offset_d,
! 				'dt_start' => $begin_daylight,
! 				'st_start' => $begin_std,
! 				'st_name'	=> $st_name,
! 				'dt_name'	=> $dt_name
  				
  				); #echo "<pre>$tz_id"; print_r($tz_array[$tz_id]);echo"</pre>";
--- 47,54 ----
  				0	=> $offset_s, 
  				1	=> $offset_d,
! 				'dt_start' => @$begin_daylight,
! 				'st_start' => @$begin_std,
! 				'st_name'	=> @$st_name,
! 				'dt_name'	=> @$dt_name
  				
  				); #echo "<pre>$tz_id"; print_r($tz_array[$tz_id]);echo"</pre>";

[PHPiCalendar-Commits] phpicalendar/templates/green header.tpl, 1.1, 1.2

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

Update of /cvsroot/phpicalendar/phpicalendar/templates/green
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25593/templates/green

Modified Files:
	header.tpl 
Log Message:
misc minor fixes

Index: header.tpl
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/templates/green/header.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** header.tpl	18 May 2007 19:03:07 -0000	1.1
--- header.tpl	20 Dec 2008 00:33:14 -0000	1.2
***************
*** 5,9 ****
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
--- 5,9 ----
  	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
  	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
!   	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
  	<!-- switch rss_available on -->
  	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
***************
*** 19,20 ****
--- 19,24 ----
    <input type="hidden" name="event_data" id="event_data" value="" />
  </form>
+ <form name="todoPopupForm" id="todoPopupForm" method="post" action="includes/todo.php" style="display: none;">
+   <input type="hidden" name="todo_data" id="todo_data" value="" />
+   <input type="hidden" name="todo_text" id="todo_text" value="" />
+ </form>

[PHPiCalendar-Commits] phpicalendar/functions/init cpaths.php, 1.3, 1.4

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

Update of /cvsroot/phpicalendar/phpicalendar/functions/init
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22048/functions/init

Modified Files:
	cpaths.php 
Log Message:
fix rss link and dates

Index: cpaths.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/cpaths.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cpaths.php	18 Dec 2008 09:22:23 -0000	1.3
--- cpaths.php	20 Dec 2008 00:11:56 -0000	1.4
***************
*** 2,6 ****
  # adjust paths in case they are incorrect
  if ($phpiCal_config->default_path == '') {
! 	$phpiCal_config->setProperty('default_path', BASE);
  }
  
--- 2,7 ----
  # adjust paths in case they are incorrect
  if ($phpiCal_config->default_path == '') {
! 	$p = str_replace("/rss","","http://".$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']) );
! 	$phpiCal_config->setProperty('default_path', $p);
  }
  

[PHPiCalendar-Commits] phpicalendar/languages danish.inc.php, 1.27, 1.28 spanish.inc.php, 1.20, 1.21

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

Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22048/languages

Modified Files:
	danish.inc.php spanish.inc.php 
Log Message:
fix rss link and dates

Index: danish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/danish.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** danish.inc.php	21 Mar 2006 09:52:29 -0000	1.27
--- danish.inc.php	20 Dec 2008 00:11:56 -0000	1.28
***************
*** 1,137 ****
  <?php
  
! // Danish language include
! // For version 1.0 PHP iCalendar
  //
! // Translation by Henrik H�jmark (st...@wo...)
! //            and Jakob Peterh�nsel (ma...@cr...)
  //
! // Submit new translations to ch...@ch...
  
! $day_lang			= 'Dag';
! $week_lang			= 'Uge';
! $month_lang			= 'M&aring;ned';
! $year_lang			= '&Aring;r';
! $calendar_lang		= 'kalender';
! $next_day_lang		= 'N&aelig;ste dag';
! $next_month_lang	= 'N&aelig;ste m&aring;ned';
! $next_week_lang		= 'N&aelig;ste uge';
! $next_year_lang		= 'N&aelig;ste &aring;r';
! $last_day_lang		= 'Forrige dag';
! $last_month_lang	= 'Forrige m&aring;ned';
! $last_week_lang		= 'Forrige uge';
! $last_year_lang		= 'Forrige &aring;r';
! $subscribe_lang		= 'Abonn&eacute;r';
! $download_lang		= 'Hent';
! $powered_by_lang 	= 'Drevet af';
! $event_lang			= 'Aftale';
! $event_start_lang	= 'Start tidspunkt';
! $event_end_lang		= 'Slut tidspunkt';
! $this_months_lang	= 'Denne m&aring;neds aftaler';
! $date_lang			= 'Dato';
! $summary_lang		= 'Opsummering';
! $all_day_lang		= 'Heldags aftale';
! $notes_lang			= 'Noter';
! $this_years_lang	= 'Dette &aring;s aftaler';
! $today_lang			= 'I dag';
! $this_week_lang		= 'Denne uge';
! $this_month_lang	= 'Denne m&aring;ned';
! $jump_lang			= 'G&aring; til';
! $tomorrows_lang		= 'N&aelig;ste dags aftaler';
! $goday_lang			= 'G&aring; til i dag';
! $goweek_lang		= 'G&aring; til denne uge';
! $gomonth_lang		= 'G&aring; til denne m&aring;ned';
! $goyear_lang		= 'G&aring; til dette &aring;r';
! $search_lang		= 'S&oslash;g'; // the verb
! $results_lang		= 'S&oskash;ge resultater';
! $query_lang			= 'S&oslash;gekriterier: '; // will be followed by the search query
! $no_results_lang	= 'Der er ikke fundet nogen aftaler';
! $goprint_lang		= 'Udskriftsvenligt';
! $time_lang			= 'Tid';
! $summary_lang		= 'Opsummering';
! $description_lang	= 'Beskrivelse';
! $this_site_is_lang		= 'Denne webadresse er';
! $no_events_day_lang		= 'Ingen aftaler i dag.';
! $no_events_week_lang	= 'Ingen aftaler i denne uge.';
! $no_events_month_lang	= 'Ingen aftaler i denne m&aring;ned.';
! $rss_day_date			= 'g:i A';  // Lists just the time
! $rss_week_date			= '%b %e';  // Lists just the day
! $rss_month_date			= '%b %e';  // Lists just the day
! $search_took_lang		= 'S&oslash;gningen tog %s sekunder';
! $recurring_event_lang	= 'Gentagen aftale';
! $exception_lang			= 'Undtagelse';
! $no_query_lang			= 'Der er ingen forsp&oslash;rgsel';
! $preferences_lang		= 'Indstillinger';
! $printer_lang			= 'Printer';
! $select_lang_lang		= 'V&aelig;lg sprog:';
! $select_cal_lang		= 'V&aelig;lg kalender:';
! $select_view_lang		= 'V&aelig;lg visning:';
! $select_time_lang		= 'V&aelig;lg starttidspunkt :';
! $select_day_lang		= 'V&aelig;lg startdag:';
! $select_style_lang		= 'V&aelig;lg stil :';
! $set_prefs_lang			= 'Gem indstillinger';
! $completed_date_lang	= 'Afsluttet p&aring;';
! $completed_lang			= 'Afsluttet';
! $created_lang			= 'Lavet:';
! $due_lang				= 'Klar:';
! $priority_lang			= 'Prioritet:';
! $priority_high_lang		= 'H&oslash;j';
! $priority_low_lang		= 'Lav';
! $priority_medium_lang	= 'Medium';
! $priority_none_lang		= 'Ingen';
! $status_lang			= 'Status';
! $todo_lang				= 'Ting der skal g&oslash;res';
! $unfinished_lang		= 'Uafsluttet';
! $prefs_set_lang 		= 'Dine indstillinger er gemt.'; //Your preferences have been set.
! $prefs_unset_lang 		= 'Indstillinger fjernet. &AElig;ndringer er synlig ved n&aelig;ste sidevisning.'; //Preferences unset. Changes will take place next page load.
! $unset_prefs_lang 		= 'Unset preferences:';
! $organizer_lang			= 'Organizer';
! $attendee_lang			= 'Attendee';
! $location_lang			= 'Location';
! $admin_header_lang		= 'PHP iCalendar Administration';
! $username_lang			= 'Username';
! $password_lang			= 'Password';
! $login_lang				= 'Login';
! $invalid_login_lang		= 'Wrong username or password.';
! $addupdate_cal_lang		= 'Add or Update a Calendar';
! $addupdate_desc_lang	= 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.';
! $delete_cal_lang		= 'Delete a Calendar';
! $logout_lang			= 'Logout';
! $cal_file_lang			= 'Calendar File';
! $php_error_lang			= 'PHP Error';
! $upload_error_gen_lang	= 'There was a problem with your upload.';
! $upload_error_lang[0]	= 'There was a problem with your upload.';
! $upload_error_lang[1]	= 'The file you are trying to upload is too big.';
! $upload_error_lang[2]	= 'The file you are trying to upload is too big.';
! $upload_error_lang[3]	= 'The file you are trying upload was only partially uploaded.';
! $upload_error_lang[4]	= 'You must select a file for upload.';
! $upload_error_type_lang = 'Only .ics files may be uploaded.';
! $copy_error_lang		= 'Failed to copy file';
! $delete_error_lang		= 'Failed to delete file';
! $delete_success_lang	= 'was deleted successfully.';
! $action_success_lang	= 'Your action was successful.';
! $submit_lang			= 'Submit';
! $delete_lang			= 'Delete';
  
! // ----- New for 1.0
! $all_cal_comb_lang		= 'All calendars combined';
  
  // - navigation
! $back_lang = 'Tilbage';
! $next_lang = 'N&aelig;ste';
! $prev_lang = 'Forrige';
! $day_view_lang = 'Vis Dag';
! $week_view_lang = 'Vis Uge';
! $month_view_lang = 'Vis M&aring;ned';
! $year_view_lang = 'Vis &Aring;r';
  
  // ---------------------------------
  
  // $format_recur, items enclosed in % will be substituted with variables
! $format_recur_lang['delimiter']		= ', ';							// ie, 'one, two, three'
  
! $format_recur_lang['yearly']		= array('&aring;r','&aring;r');	// for these, put singular
! $format_recur_lang['monthly']		= array('m&aring;ned','m&aring;neder');		// and plural forms
! $format_recur_lang['weekly']		= array('uge','uger');			// these will be %freq%
  $format_recur_lang['daily']			= array('dag','dage');			// in the replacement below
  $format_recur_lang['hourly']		= array('time','timer');
--- 1,148 ----
  <?php
  
! // English language include
! // For version 2.0 PHP iCalendar
  //
! // Translation by Chad Little (ch...@ch...)
  //
! // Submit new translations to php...@gm...
  
! $lang['l_day'] 				= 'Dag';
! $lang['l_week'] 			= 'Uge';
! $lang['l_month'] 			= 'M&aring;ned';
! $lang['l_year'] 			= '&Aring;r';
! $lang['l_calendar'] 		= 'Kalender';
! $lang['l_next_day'] 		= 'N&aelig;ste dag';
! $lang['l_next_month'] 		= 'N&aelig;ste m&aring;ned';
! $lang['l_next_week'] 		= 'N&aelig;ste uge';
! $lang['l_next_year'] 		= 'N&aelig;ste &aring;r';
! $lang['l_last_day'] 		= 'Forrige dag';
! $lang['l_last_month'] 		= 'Forrige m&aring;ned';
! $lang['l_last_week'] 		= 'Forrige uge';
! $lang['l_last_year'] 		= 'Forrige &Aring;r';
! $lang['l_subscribe'] 		= 'Abonn&eacute;r';
! $lang['l_download'] 		= 'Download';
! $lang['l_powered_by'] 		= 'Powered by';
! $lang['l_event'] 			= 'Event';
! $lang['l_event_start'] 		= 'Starttid';
! $lang['l_event_end'] 		= 'Sluttid';
! $lang['l_this_months'] 		= 'Denne m&aring;neds events';
! $lang['l_date'] 			= 'Dato';
! $lang['l_summary'] 			= 'Summary';
! $lang['l_all_day'] 			= 'Heldags-event';
! $lang['l_notes'] 			= 'Noter';
! $lang['l_this_years'] 		= 'Dette &aring;rs events';
! $lang['l_today'] 			= 'Idag';
! $lang['l_this_week'] 		= 'Denne uge';
! $lang['l_this_month'] 		= 'Denne m&aring;ned';
! $lang['l_jump'] 			= 'G&aring; til';
! $lang['l_tomorrows'] 		= 'Events imorgen';
! $lang['l_goday'] 			= 'G&aring; til idag';
! $lang['l_goweek'] 			= 'G&aring; til denne uge';
! $lang['l_gomonth'] 			= 'G&aring; til denne m&aring;ned';
! $lang['l_goyear'] 			= 'G&aring; til dette &aring;r';
! $lang['l_search'] 			= 'S&oslash;g'; // the verb
! $lang['l_results'] 			= 'S&oslash;geresultater';
! $lang['l_pick_multiple'] 	= 'V&aelig;lg flere';
! $lang['l_query'] 			= 'Kriterie'; // will be followed by the search query
! $lang['l_no_results'] 		= 'Ingen events fundet';
! $lang['l_goprint'] 			= 'Printervenlig';
! $lang['l_time'] 			= 'Tid';
! $lang['l_summary'] 			= 'Summary';
! $lang['l_description'] 		= 'Beskrivelse';
! $lang['l_this_site_is']		= 'Dette site er';
! $lang['l_no_events_day']	= 'Ingen events idag.';
! $lang['l_no_events_week']	= 'Ingen events denne uge.';
! $lang['l_no_events_month']	= 'Ingen events denne m&aring;ned.';
! $lang['l_rss_day_date']		= 'g:i A';  // Lists just the time
! $lang['l_rss_week_date	']	= '%b %e';  // Lists just the day
! $lang['l_rss_month_date	']	= '%b %e';  // Lists just the day
! $lang['l_rss_language']		= 'en-us';
! $lang['l_search_took']		= 'S&oslash;gning tog %s sekunder';
! $lang['l_recurring_event']	= 'Tilbagevendende event';
! $lang['l_exception']		= 'Undtagelse';
! $lang['l_no_query']			= 'Ingen kriterier angivet';
! $lang['l_preferences']		= 'Indstillinger';
! $lang['l_printer']			= 'Printer';
! $lang['l_select_lang']		= 'V&aelig;lg dit standard-sprog';
! $lang['l_select_cal']		= 'V&aelig;lg din standard-kalender';
! $lang['l_select_view']		= 'V&aelig;lg dit standard-view';
! $lang['l_select_time']		= 'V&aelig;lg din standard-starttid';
! $lang['l_select_day']		= 'V&aelig;lg din f&oslash;rste dag i ugen';
! $lang['l_select_style']		= 'V&aelig;lg din standard-stil';
! $lang['l_set_prefs']		= 'Indstillinger';
! $lang['l_completed_date']	= 'Afsluttet d.';
! $lang['l_completed']		= 'Afsluttet';
! $lang['l_created']			= 'Oprettet';
! $lang['l_due']				= 'Forfald';
! $lang['l_priority']			= 'Prioritet';
! $lang['l_priority_high']	= 'H&oslash;j';
! $lang['l_priority_low']		= 'Lav';
! $lang['l_priority_medium']	= 'Medium';
! $lang['l_priority_none']	= 'Ingen';
! $lang['l_status']			= 'Status';
! $lang['l_status_confirmed'] = 'BEKR&AElig;FTET' ; 
! $lang['l_status_cancelled'] = 'ANNULLERET'; 
! $lang['l_status_tentative'] = 'TENTATIV'; 
! $lang['l_todo']				= 'Todo-items';
! $lang['l_unfinished']		= 'Ikke afsluttet';
! $lang['l_prefs_set'] 		= 'Dine indstillinger er gemt.';
! $lang['l_prefs_unset'] 		= 'Indstillinger nulstillet.  &AElig;ndringer vil tr&aelig;de i kraft n&aelig;ste gang siden indl&aelig;ses.';
! $lang['l_unset_prefs'] 		= 'Nulstil indstillinger';
! $lang['l_organizer']		= 'Organizer';
! $lang['l_attendee']			= 'Tilstede';
! $lang['l_location']			= 'Location';
! $lang['l_admin_header']		= 'PHP iCalendar-administration';
! $lang['l_username']			= 'Brugernavn';
! $lang['l_password']			= 'Password';
! $lang['l_login']			= 'Login';
! $lang['l_invalid_login']	= 'Forkert brugernavn eller password.';
! $lang['l_addupdate_cal']	= 'Tilf&oslash;j eller opdat&eacute;r en kalender';
! $lang['l_addupdate_desc']	= 'Tilf&oslash;j en kalender ved at uploade en ny fil.  Opdat&eacute;r en kalender ved at uploade en fil med samme navn.';
! $lang['l_delete_cal']		= 'Slet en kalender';
! $lang['l_logout']			= 'Logout';
! $lang['l_cal_file']			= 'Kalenderfil';
! $lang['l_php_error']		= 'PHP-fejl';
! $upload_error_gen_lang		= 'Der opstod et problem med din upload.';
! $upload_error_lang[0]		= 'Der opstod et problem med din upload.';
! $upload_error_lang[1]		= 'Den fil du fors&oslash;ger at uploade er for stor.';
! $upload_error_lang[2]		= 'Den fil du fors&oslash;ger at uploade er for stor.';
! $upload_error_lang[3]		= 'Den fil du fors&oslash;ger at uploade blev kun delvist uploaded.';
! $upload_error_lang[4]		= 'Du skal v&aelig;lge en fil at uploade..';
! $lang['l_upload_error_type'] = 'Kun .ics-filer kan uploades.';
! $lang['l_copy_error']			= 'Kunne ikke kopiere fil';
! $lang['l_delete_error']			= 'Kunne ikke slette fil';
! $lang['l_delete_success']		= 'er blevet slettet.';
! $lang['l_action_success']		= 'Gennemf&oslash;rt.';
! $lang['l_submit']				= 'Submit';
! $lang['l_delete']				= 'Slet';
! $all_cal_comb_lang			= 'Alle kombineret';
  
! // New for 2.0
! $lang['l_legend']			= 'Signaturer';
! $lang['l_admin_subhead']	= 'Administr&eacute;r dine kalendre fra denne side';
! $lang['l_prefs_subhead']	= 'Gemmer en cookie n&aring;r du beg&oslash;ger dette site';
! $lang['l_rss_info']			= 'RSS-information';
! $lang['l_rss_subhead']		= 'RSS-feeds for hver enkelt kalender';
! $lang['l_rss_notenabled']	= 'RSS er ikke tilg&aelig;ngeligt p&aring; dette site';
  
  // - navigation
! $lang['l_back'] 		= 'Tilbage';
! $lang['l_next'] 		= 'N&aelig;ste';
! $lang['l_prev'] 		= 'Forrige';
! $lang['l_day_view'] 	= 'Dag-view';
! $lang['l_week_view'] 	= 'Uge-iew';
! $lang['l_month_view'] 	= 'M&aring;ned-view';
! $lang['l_year_view'] 	= '&Aring;r-view';
  
  // ---------------------------------
  
+ 
  // $format_recur, items enclosed in % will be substituted with variables
! $format_recur_lang['delimiter']	= ', ';								// ie, 'one, two, three'
  
! $format_recur_lang['yearly']		= array('&aring;r','&aring;r');		// for these, put singular
! $format_recur_lang['monthly']		= array('m^aring;ned','m&aring;neder');		// and plural forms
! $format_recur_lang['weekly']		= array('uge','uger');		// these will be %freq%
  $format_recur_lang['daily']			= array('dag','dage');			// in the replacement below
  $format_recur_lang['hourly']		= array('time','timer');
***************
*** 140,149 ****
  
  $format_recur_lang['start']			= 'Hver %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
! $format_recur_lang['until']			= 'Indtil %date%';				// ie, 'until January 4'
! $format_recur_lang['count']			= '%int% gange';				// ie, 'for 5 times'
  
! $format_recur_lang['bymonth']		= 'I m&aring;nderne: %list%';	// ie, 'In months: January, February, March'
! $format_recur_lang['bymonthday']	= 'P&aring; datoerne: %list%';	// ie, 'On dates: 1, 2, 3, 4'
! $format_recur_lang['byday']			= 'P&aring; dagene: %list%';	// ie, 'On days: Mon, Tues, Wed, Thurs'
  
  // ---------------------------------
--- 151,160 ----
  
  $format_recur_lang['start']			= 'Hver %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
! $format_recur_lang['until']			= 'indtil %date%';				// ie, 'until January 4'
! $format_recur_lang['count']			= '%int% gange';		// ie, 'for 5 times'
  
! $format_recur_lang['bymonth']		= 'I m&aring;neder: %list%';			// ie, 'In months: January, February, March'
! $format_recur_lang['bymonthday']	= 'P&aring; datoer: %list%';			// ie, 'On dates: 1, 2, 3, 4'
! $format_recur_lang['byday']			= 'P&aring; dage: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'
  
  // ---------------------------------
***************
*** 156,171 ****
  
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
! $timeFormat = 'H:i';
! $timeFormat_small = 'H:i';
  
  // For date formatting, see note below
! $dateFormat_day = '%A, %e %B';
! $dateFormat_week = '%e %B';
! $dateFormat_week_list = '%a, %e %b';
! $dateFormat_week_jump = '%e %b';
  $dateFormat_month = '%B %Y';
! $dateFormat_month_list = '%A, %e %B';
  $dateFormat_year = '%Y';
  
  /*
  Notes about dateFormat_*
--- 167,184 ----
  
  // For time formatting, check out: http://www.php.net/manual/en/function.date.php
! $timeFormat = 'G:i';
! $timeFormat_small = 'G:i';
  
  // For date formatting, see note below
! $dateFormat_day = '%A, %B %e';
! $dateFormat_week = '%B %e';
! //$dateFormat_week_list = '%a, %b %e';
! $dateFormat_week_list = '%a %e. %b';
! $dateFormat_week_jump = '%e. %b';
  $dateFormat_month = '%B %Y';
! $dateFormat_month_list = '%A, %e. %B';
  $dateFormat_year = '%Y';
  
+ 
  /*
  Notes about dateFormat_*
***************
*** 185,197 ****
  
  // Error messages - %s will be replaced with a variable
! $error_title_lang = 'Fejl!';
! $error_window_lang = 'Der opstod en fejl!';
! $error_calendar_lang = 'Kalenderen "%s" blev benyttet da fejlen opstod.';
! $error_path_lang = 'Kan ikke &aring;bne stien : "%s"';
! $error_back_lang = 'Brug venligst "Tilbage" knappen for at g&aring; tilbage.';
! $error_remotecal_lang = 'Denne server blokerer for eksterne kalendere der ikke er blevet godkendt';
! $error_restrictedcal_lang = 'Du har fors&oslash;gt at f&aring; adgang til en beskyttet kalender p&aring; denne server.';
! $error_invalidcal_lang = 'Kalenderen kan ikke l&aelig;ses. Pr&oslash;v en anden kalender.';
! 
  
  ?>
--- 198,211 ----
  
  // Error messages - %s will be replaced with a variable
! $lang['l_error_title'] 			= 'Fejl!';
! $lang['l_error_window'] 		= 'Der opstod en fejl!';
! $lang['l_error_calendar'] 		= 'Kalenderen "%s" var under behandling da denne fejl opstod.';
! $lang['l_error_path'] 			= 'Kan ikke &aring;bne sti: "%s"';
! $lang['l_error_back'] 			= 'Brug "Tilbage"-knappen for at komme retur.';
! $lang['l_error_remotecal'] 		= 'Denne server blokerer remote-kalendre der ikke er godkendt.';
! $lang['l_error_restrictedcal'] 	= 'Du har ford&oslash;gt at tilg&aring; en kalender der er begr&arlig;nset adgang til p&aring; denne server.';
! $lang['l_error_invalidcal'] 	= 'Ugyldig kalender-fil.  Pr&oslash;v venligst en anden kalender.';
! $lang['l_error_cantopen'] 		= 'Kan ikke &aring;bne kalender.';
! $lang['l_error_cache']			= 'Kan ikke skrive til cache-folder.  Kontroll&eacute;r venligst ops&aelig;tningen.';
  
  ?>

Index: spanish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/spanish.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** spanish.inc.php	21 Mar 2006 09:52:29 -0000	1.20
--- spanish.inc.php	20 Dec 2008 00:11:56 -0000	1.21
***************
*** 1,208 ****
! <?php
! 
! // English language include
! // For version 2.0 PHP iCalendar
! //
! // Translation by Juan carlos Negron(car...@ho...)
! //
! 
! $lang['l_day'] 			= 'D&iacute;a';
! $lang['l_week'] 			= 'Semana';
! $lang['l_month'] 			= 'Mes';
! $lang['l_year'] 			= 'A&ntilde;o';
! $lang['l_calendar'] 		= 'Calendario';
! $lang['l_next_day'] 		= 'D&iacute;a siguiente';
! $lang['l_next_month'] 		= 'Mes siguiente';
! $lang['l_next_week'] 		= 'Semana siguiente';
! $lang['l_next_year'] 		= 'A&ntilde;o siguiente';
! $lang['l_last_day'] 		= 'D&iacute;a anterior';
! $lang['l_last_month'] 		= 'Mes anterior';
! $lang['l_last_week'] 		= 'Semana anterior';
! $lang['l_last_year'] 		= 'A&ntilde;o anterior';
! $lang['l_subscribe'] 		= 'Suscribir';
! $lang['l_download'] 		= 'Descargar';
! $lang['l_powered_by'] 		= 'Powered by';
! $lang['l_event'] 			= 'Evento';
! $lang['l_event_start'] 		= 'Inicio';
! $lang['l_event_end'] 		= 'Fin';
! $lang['l_this_months'] 		= 'Eventos de este mes';
! $lang['l_date'] 			= 'Fecha';
! $lang['l_summary'] 		= 'Descripci&oacute;n';
! $lang['l_all_day'] 		= 'todo el d&iacute;a';
! $lang['l_notes'] 			= 'Notas';
! $lang['l_this_years'] 		= 'Eventos de este a&ntilde;o';
! $lang['l_today'] 			= 'Hoy';
! $lang['l_this_week'] 		= 'Esta semana';
! $lang['l_this_month'] 		= 'Este mes';
! $lang['l_jump'] 			= 'Ir a';
! $lang['l_tomorrows'] 		= 'Eventos de ma&ntilde;ana';
! $lang['l_goday'] 			= 'Ir a Hoy';
! $lang['l_goweek'] 			= 'Ir a esta semana';
! $lang['l_gomonth'] 			= 'Ir a este Mes';
! $lang['l_goyear'] 			= 'Ir a este A&ntilde;o';
! $lang['l_search'] 			= 'Buscar'; // the verb
! $lang['l_results'] 			= 'Resultados de la b&uacute;squeda';
! $lang['l_pick_multiple'] 	= 'Pick multiple';
! $lang['l_query'] 			= 'Consulta: '; // will be followed by the search query
! $lang['l_no_results'] 		= 'Ning&uacute;n evento encontrado';
! $lang['l_goprint'] 		= 'Formato de impresi&oacute;n';
! $lang['l_time'] 			= 'Hora';
! $lang['l_summary'] 		= 'Resumen';
! $lang['l_description'] 		= 'Descripci&oacute;n';
! $lang['l_this_site_is']		= 'Esta p&aacute;gina es';
! $lang['l_no_events_day']	= 'No hay eventos para hoy.';
! $lang['l_no_events_week']	= 'No hay eventos para esta semana.';
! $lang['l_no_events_month']	= 'No hay eventos para este mes.';
! $lang['l_rss_day_date']		= 'g:i A';  // Lists just the time
! $lang['l_rss_week_date	']	= '%e de %b';  // Lists just the day
! $lang['l_rss_month_date	']	= '%e de %b';  // Lists just the day
! $lang['l_rss_language']		= 'es-es';
! $lang['l_search_took']		= 'La busqeda tard&oacute; %s segundos';
! $lang['l_recurring_event']	= 'Evento peri&ocaute;dico';
! $lang['l_exception']		= 'Excepci&oacute;n';
! $lang['l_no_query']		= 'falta la consulta';
! $lang['l_preferences']		= 'Preferencias';
! $lang['l_printer']		= 'Impresora';
! $lang['l_select_lang']		= 'Escoja su idioma por defecto:';
! $lang['l_select_cal']		= 'Escoja su calendario por defecto:';
! $lang['l_select_view']		= 'Elija su vista por defecto:';
! $lang['l_select_time']		= 'Elija su hora de inicio por defecto:';
! $lang['l_select_day']		= 'Escoja su d&aacute;a de la semana de inicio:';
! $lang['l_select_style']		= 'Seleccione su estilo por defecto:';
! $lang['l_set_prefs']		= 'Guardar preferencias';
! $lang['l_completed_date']	= 'Finalizado el';
! $lang['l_completed']		= 'Finalizado';
! $lang['l_created']			= 'Creado:';
! $lang['l_due']				= 'Fecha limite:';
! $lang['l_priority']			= 'Prioridad:';
! $lang['l_priority_high']	= 'Alta';
! $lang['l_priority_low']		= 'Baja';
! $lang['l_priority_medium']	= 'Media';
! $lang['l_priority_none']	= 'Ninguna';
! $lang['l_status']			= 'Estado';
! $lang['l_status_confirmed'] = 'CONFIRMED' ; 
! $lang['l_status_cancelled'] = 'CANCELLED'; 
! $lang['l_status_tentative'] = 'TENTATIVE'; 
! $lang['l_todo']			= 'Por hacer';
! $lang['l_unfinished']		= 'Sin terminar';
! $lang['l_prefs_set'] 		= 'Sus preferencias han sido guardadas.';
! $lang['l_prefs_unset'] 		= 'Preferencias no activas. Los cambios se activaran al recargar la p&aacute;gina.';
! $lang['l_unset_prefs'] 		= 'Preferencias sin activar:';
! $lang['l_organizer']		= 'Organizador';
! $lang['l_attendee']		= 'Participante';
! $lang['l_location']		= 'Lugar';
! $lang['l_admin_header']		= 'Administraci&oacute;n de PHP iCalendar';
! $lang['l_username']			= 'Usuario';
! $lang['l_password']			= 'Contrase&ntilde;a';
! $lang['l_login']			= 'Registro';
! $lang['l_invalid_login']	= 'Usuario o contrase&ntilde;a incorrectos.';
! $lang['l_addupdate_cal']	= 'Agregar o actualizar un calendario';
! $lang['l_addupdate_desc']	= 'Agrega un calendario, enviando un archivo nuevo. Actualiza un calendario reemplazandolo con un archivo con el mismo nombre.';
! $lang['l_delete_cal']		= 'Borra un calendario';
! $lang['l_logout']			= 'Salir';
! $lang['l_cal_file']		= 'Archivo de Calendario';
! $lang['l_php_error']		= 'Error PHP';
! $upload_error_gen_lang		= 'Hubo un problema con su env&iacute;o.';
! $upload_error_lang[0]		= 'Hubo un problema con su env&iacute;o.';
! $upload_error_lang[1]		= 'El archivo que intenta enviar es demasiado grande.';
! $upload_error_lang[2]		= 'El archivo que intenta enviar es demasiado grande.';
! $upload_error_lang[3]		= 'Solamente ha recibido una parte del archivo que intentaba enviar.';
! $upload_error_lang[4]		= 'Debe elegir un archivo para enviar.';
! $lang['l_upload_error_type'] = 'Solo se aceptan archivos de calendario (.ics).';
! $lang['l_copy_error']		= 'Fall&oacute; la copia del archivo';
! $lang['l_delete_error']		= 'Fall&oacute; el borrado del archivo';
! $lang['l_delete_success']	= 'fue borrado exitosamente.';
! $lang['l_action_success']	= 'Su acci&oacute;n se realiz&oacute; con &eacute;xito.';
! $lang['l_submit']			= 'Enviar';
! $lang['l_delete']			= 'Borrar';
! $all_cal_comb_lang		= 'Todos los calendarios combinados';
! 
! // New for 2.0
! $lang['l_legend']			= 'Leyenda';
! $lang['l_admin_subhead']	= 'Administra los calendarios desde esta p&aacute;gina';
! $lang['l_prefs_subhead']	= 'Establece una cookie por vistar este sitio';
! $lang['l_rss_info']			= 'Informaci&oacute;n sobre RSS';
! $lang['l_rss_subhead']		= 'Fuentes RSS b&aacute;sicas estan disponibles para cada calendario';
! $lang['l_rss_notenabled']	= 'RSS no est&aacute; disponible en este sitio';
! 
! // - navigation
! $lang['l_back'] 		= 'Atr&aacute;s';
! $lang['l_next'] 		= 'Siguiente';
! $lang['l_prev'] 		= 'Anterior';
! $lang['l_day_view'] 	= 'Vista diaria';
! $lang['l_week_view'] 	= 'Vista semanal';
! $lang['l_month_view'] 	= 'Vista mensual';
! $lang['l_year_view'] 	= 'Vista anual';
! 
! // ---------------------------------
! 
! 
! // $format_recur, items enclosed in % will be substituted with variables
! $format_recur_lang['delimiter']	= ', ';							// ie, 'one, two, three'
! 
! $format_recur_lang['yearly']		= array('a&ntilde;o','a&ntilde;os');		// for these, put singular
! $format_recur_lang['monthly']		= array('mes','meses');					// and plural forms
! $format_recur_lang['weekly']		= array('semana','semanas');				// these will be %freq%
! $format_recur_lang['daily']		= array('d&iacute;a','dias');				// in the replacement below
! $format_recur_lang['hourly']		= array('hora','horas');
! $format_recur_lang['minutely']		= array('minuto','minutos');
! $format_recur_lang['secondly']		= array('segundo','segundos');
! 
! $format_recur_lang['start']			= 'Cada %int% %freq% %for%';		// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
! $format_recur_lang['until']			= 'hasta %date%';				// ie, 'until January 4'
! $format_recur_lang['count']			= 'durante %int% veces';		// ie, 'for 5 times'
! 
! $format_recur_lang['bymonth']		= 'En los meses: %list%';			// ie, 'In months: January, February, March'
! $format_recur_lang['bymonthday']	= 'En los dias: %list%';			// ie, 'On dates: 1, 2, 3, 4'
! $format_recur_lang['byday']		= 'En los dias de la semana: %list%';	// ie, 'On days: Mon, Tues, Wed, Thurs'
! 
! // ---------------------------------
! 
! $daysofweek_lang			= array ('Domingo','Lunes','Martes','Mi&eacute;rcoles','Jueves','Viernes','S&aacute;bado');
! $daysofweekshort_lang		= array ('Dom','Lun','Mar','Mie','Jue','Vie','Sab');
! $daysofweekreallyshort_lang	= array ('D','L','M','X','J','V','S');
! $monthsofyear_lang		= array ('Enero','Febrero','Marzo','Abril','Mayo','Junio','Julio','Agosto','Septiembre','Octubre','Noviembre','Diciembre');
! $monthsofyearshort_lang		= array ('Ene','Feb','Mar','Abr','May','Jun','Jul','Ago','Sep','Oct','Nov','Dic');
! 
! // For time formatting, check out: http://www.php.net/manual/en/function.date.php
! $timeFormat = 'g:i A';
! $timeFormat_small = 'g:i';
! 
! // For date formatting, see note below
! $dateFormat_day = '%A, %e de %B';
! $dateFormat_week = '%e de %B';
! $dateFormat_week_list = '%a, %e de %b';
! $dateFormat_week_jump = '%e de %b';
! $dateFormat_month = '%B de %Y';
! $dateFormat_month_list = '%A, %e de %B';
! $dateFormat_year = '%Y';
! 
! /*
! Notes about dateFormat_*
! 	The pieces are similar to that of the PHP function strftime(), 
! 	however only the following is supported at this time:
! 	
! 	%A - the full week day name as specified in $daysofweek_lang
! 	%a - the shortened week day name as specified in $daysofweekshort_lang
! 	%B - the full month name as specified in $monthsofyear_lang
! 	%b - the shortened month name as specified in $monthsofyearshort_lang
! 	%e - the day of the month as a decimal number (1 to 31)
! 	%Y - the 4-digit year
! 
! 	If this causes problems with representing your language accurately, let
! 	us know. We will be happy to modify this if needed.
! */
! 
! // Error messages - %s will be replaced with a variable
! $lang['l_error_title'] 			= '&iexcl;Error!';
! $lang['l_error_window'] 		= '&iexcl;Hubo un error!';
! $lang['l_error_calendar'] 		= 'Cuando se produjo este error, se procesaba "%s" del calendario.';
! $lang['l_error_path'] 			= 'Incapaz de abrir la ruta a: "%s"';
! $lang['l_error_back'] 			= 'Por favor, use el bot&oacute;n "Atr&aacute;s" para volver.';
! $lang['l_error_remotecal'] 		= 'Este servidor bloquea calendarios remotos que no han sido aprobados.';
! $lang['l_error_restrictedcal'] 	= 'Usted ha intentado accesar a un calendario restringido en este servidor.';
! $lang['l_error_invalidcal'] 		= 'Archivo de calendario inv&aacute;lido. Por favor, pruebe con otro calendario.';
! $lang['l_error_cantopen'] 		= 'Unable to open calendar.';
! $lang['l_error_cache']			= 'Unable to write to cache directory. Please check your config.';
! 
! ?>
--- 1,209 ----
! <?php
! 
! // Spanish language include
! // For version 2.0 PHP iCalendar
! //
! // Translation by Juan carlos Negron(car...@ho...)
! // Translation by Luis Fernando Rocha (lud...@ya...)
! //
! 
! $lang['l_day'] 			= 'D&iacute;a';
! $lang['l_week'] 			= 'Semana';
! $lang['l_month'] 			= 'Mes';
! $lang['l_year'] 			= 'A&ntilde;o';
! $lang['l_calendar'] 		= 'Calendario';
! $lang['l_next_day'] 		= 'D&iacute;a siguiente';
! $lang['l_next_month'] 		= 'Mes siguiente';
! $lang['l_next_week'] 		= 'Semana siguiente';
! $lang['l_next_year'] 		= 'A&ntilde;o siguiente';
! $lang['l_last_day'] 		= 'D&iacute;a anterior';
! $lang['l_last_month'] 		= 'Mes anterior';
! $lang['l_last_week'] 		= 'Semana anterior';
! $lang['l_last_year'] 		= 'A&ntilde;o anterior';
! $lang['l_subscribe'] 		= 'Suscribir';
! $lang['l_download'] 		= 'Descargar';
! $lang['l_powered_by'] 		= 'Operaci&oacute;n por';  // Changed
! $lang['l_event'] 			= 'Evento';
! $lang['l_event_start'] 		= 'Inicio';
! $lang['l_event_end'] 		= 'Fin';
! $lang['l_this_months'] 		= 'Eventos de este mes';
! $lang['l_date'] 			= 'Fecha';
! $lang['l_summary'] 		= 'Descripci&oacute;n';
! $lang['l_all_day'] 		= 'todo el d&iacute;a';
! $lang['l_notes'] 			= 'Notas';
! $lang['l_this_years'] 		= 'Eventos de este a&ntilde;o';
! $lang['l_today'] 			= 'Hoy';
! $lang['l_this_week'] 		= 'Esta semana';
! $lang['l_this_month'] 		= 'Este mes';
! $lang['l_jump'] 			= 'Ir a';
! $lang['l_tomorrows'] 		= 'Eventos de ma&ntilde;ana';
! $lang['l_goday'] 			= 'Ir a Hoy';
! $lang['l_goweek'] 			= 'Ir a esta semana';
! $lang['l_gomonth'] 			= 'Ir a este Mes';
! $lang['l_goyear'] 			= 'Ir a este A&ntilde;o';
! $lang['l_search'] 			= 'Buscar'; // the verb
! $lang['l_results'] 			= 'Resultados de la b&uacute;squeda';
! $lang['l_pick_multiple'] 	= 'Seleccionar multiples';  // Changed
! $lang['l_query'] 			= 'Consulta: '; // will be followed by the search query
! $lang['l_no_results'] 		= 'Ning&uacute;n evento encontrado';
! $lang['l_goprint'] 		= 'Formato de impresi&oacute;n';
! $lang['l_time'] 			= 'Hora';
! $lang['l_summary'] 		= 'Resumen';
! $lang['l_description'] 		= 'Descripci&oacute;n';
! $lang['l_this_site_is']		= 'Esta p&aacute;gina es';
! $lang['l_no_events_day']	= 'No hay eventos para hoy.';
! $lang['l_no_events_week']	= 'No hay eventos para esta semana.';
! $lang['l_no_events_month']	= 'No hay eventos para este mes.';
! $lang['l_rss_day_date']		= 'g:i A';  // Lists just the time
! $lang['l_rss_week_date	']	= '%e de %b';  // Lists just the day
! $lang['l_rss_month_date	']	= '%e de %b';  // Lists just the day
! $lang['l_rss_language']		= 'es-es';
! $lang['l_search_took']		= 'La busqeda tard&oacute; %s segundos';
! $lang['l_recurring_event']	= 'Evento peri&ocaute;dico';
! $lang['l_exception']		= 'Excepci&oacute;n';
! $lang['l_no_query']		= 'falta la consulta';
! $lang['l_preferences']		= 'Preferencias';
! $lang['l_printer']		= 'Impresora';
! $lang['l_select_lang']		= 'Escoja su idioma principal:';  // Changed
! $lang['l_select_cal']		= 'Escoja su calendario principal:';  // Changed
! $lang['l_select_view']		= 'Elija su vista por defecto:';  // Changed
! $lang['l_select_time']		= 'Elija su hora de inicio principal:';  // Changed
! $lang['l_select_day']		= 'Escoja d&aacute;a para iniciar semana:';  // Changed
! $lang['l_select_style']		= 'Seleccione su estilo principal:';  // Changed
! $lang['l_set_prefs']		= 'Guardar preferencias';
! $lang['l_completed_date']	= 'Finalizado el';
! $lang['l_completed']		= 'Finalizado';
! $lang['l_created']			= 'Creado:';
! $lang['l_due']				= 'Fecha limite:';
! $lang['l_priority']			= 'Prioridad:';
! $lang['l_priority_high']	= 'Alta';
! $lang['l_priority_low']		= 'Baja';
! $lang['l_priority_medium']	= 'Media';
! $lang['l_priority_none']	= 'Ninguna';
! $lang['l_status']			= 'Estado';
! $lang['l_status_confirmed'] = 'CONFIRMADO' ;   // Changed
! $lang['l_status_cancelled'] = 'CANCELADO';   // Changed
! $lang['l_status_tentative'] = 'PENDIENTE';   // Changed
! $lang['l_todo']			= 'Por hacer';
! $lang['l_unfinished']		= 'Sin terminar';
! $lang['l_prefs_set'] 		= 'Sus preferencias han sido guardadas.';
! $lang['l_prefs_unset'] 		= 'Preferencias no activas. Los cambios se activaran al recargar la p&aacute;gina.';
! $lang['l_unset_prefs'] 		= 'Preferencias sin activar:';
! $lang['l_organizer']		= 'Organizador';
! $lang['l_attendee']		= 'Participante';
! $lang['l_location']		= 'Lugar';
! $lang['l_admin_header']		= 'Administraci&oacute;n de PHP iCalendar';
! $lang['l_username']			= 'Usuario';
! $lang['l_password']			= 'Contrase&ntilde;a';
! $lang['l_login']			= 'Registro';
! $lang['l_invalid_login']	= 'Usuario o contrase&ntilde;a incorrectos.';
! $lang['l_addupdate_cal']	= 'Agregar o actualizar un calendario';
! $lang['l_addupdate_desc']	= 'Agrega un calendario, enviando un archivo nuevo. Actualiza un calendario reemplazandolo con un archivo con el mismo nombre.';
! $lang['l_delete_cal']		= 'Borra un calendario';
! $lang['l_logout']			= 'Salir';
! $lang['l_cal_file']		= 'Archivo de Calendario';
! $lang['l_php_error']		= 'Error PHP';
! $upload_error_gen_lang		= 'Hubo un problema con su env&iacute;o.';
! $upload_error_lang[0]		= 'Hubo un problema con su env&iacute;o.';
! $upload_error_lang[1]		= 'El archivo que intenta enviar es demasiado grande.';
! $upload_error_lang[2]		= 'El archivo que intenta enviar es demasiado grande.';
! $upload_error_lang[3]		= 'Solamente ha recibido una parte del archivo que intentaba enviar.';
! $upload_error_lang[4]		= 'Debe elegir un archivo para enviar.';
! $lang['l_upload_error_type'] = 'Solo se aceptan archivos de calendario (.ics).';
! $lang['l_copy_error']		= 'Fall&oacute; la copia del archivo';
! $lang['l_delete_error']		= 'Fall&oacute; el borrado del archivo';
! $lang['l_delete_success']	= 'fue borrado exitosamente.';
! $lang['l_action_success']	= 'Su acci&oacute;n se realiz&oacute; con &eacute;xito.';
! $lang['l_submit']			= 'Enviar';
! $lang['l_delete']			= 'Borrar';
! $all_cal_comb_lang		= 'Todos los calendarios combinados';
! 
! // New for 2.0
! $lang['l_legend']			= 'Leyenda';
! $lang['l_admin_subhead']	= 'Administra los calendarios desde esta p&aacute;gina';
! $lang['l_prefs_subhead']	= 'Establece una cookie por vistar este sitio';
! $lang['l_rss_info']			= 'Informaci&oacute;n sobre RSS';
! $lang['l_rss_subhead']		= 'Fuentes RSS b&aacute;sicas estan disponibles para cada calendario';
! $lang['l_rss_notenabled']	= 'RSS no est&aacute; disponible en este sitio';
! 
! // - navigation
! $lang['l_back'] 		= 'Atr&aacute;s';
! $lang['l_next'] 		= 'Siguiente';
! $lang['l_prev'] 		= 'Anterior';
! $lang['l_day_view'] 	= 'Vista diaria';
! $lang['l_week_view'] 	= 'Vista semanal';
! $lang['l_month_view'] 	= 'Vista mensual';
! $lang['l_year_view'] 	= 'Vista anual';
! 
! // ---------------------------------
! 
! 
! // $format_recur, items enclosed in % will be substituted with variables
! $format_recur_lang['delimiter']	= ', ';							// ie, 'one, two, three'
! 
! $format_recur_lang['yearly']		= array('a&ntilde;o','a&ntilde;os');		// for these, put singular
! $format_recur_lang['monthly']		= array('mes','meses');					// and plural forms
! $format_recur_lang['weekly']		= array('semana','semanas');				// these will be %freq%
! $format_recur_lang['daily']		= array('d&iacute;a','dias');				// in the replacement below
! $format_recur_lang['hourly']		= array('hora','horas');
! $format_recur_lang['minutely']		= array('minuto','minutos');
! $format_recur_lang['secondly']		= array('segundo','segundos');
! 
! $format_recur_lang['start']			= 'Cada %int% %freq% %for%';		// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
! $format_recur_lang['until']			= 'hasta %date%';				// ie, 'until January 4'
! $format_recur_lang['count']			= 'durante %int% veces';		// ie, 'for 5 times'
! 
! $format_recur_lang['bymonth']		= 'En los meses: %list%';			// ie, 'In months: January, February, March'
! $format_recur_lang['bymonthday']	= 'En los dias: %list%';			// ie, 'On dates: 1, 2, 3, 4'
! $format_recur_lang['byday']		= 'En los dias de la semana: %list%';	// ie, 'On days: Mon, Tues, Wed, Thurs'
! 
! // ---------------------------------
! 
! $daysofweek_lang			= array ('Domingo','Lunes','Martes','Mi&eacute;rcoles','Jueves','Viernes','S&aacute;bado');
! $daysofweekshort_lang		= array ('Dom','Lun','Mar','Mie','Jue','Vie','Sab');
! $daysofweekreallyshort_lang	= array ('D','L','M','X','J','V','S');
! $monthsofyear_lang		= array ('Enero','Febrero','Marzo','Abril','Mayo','Junio','Julio','Agosto','Septiembre','Octubre','Noviembre','Diciembre');
! $monthsofyearshort_lang		= array ('Ene','Feb','Mar','Abr','May','Jun','Jul','Ago','Sep','Oct','Nov','Dic');
! 
! // For time formatting, check out: http://www.php.net/manual/en/function.date.php
! $timeFormat = 'g:i A';
! $timeFormat_small = 'g:i';
! 
! // For date formatting, see note below
! $dateFormat_day = '%A, %e de %B';
! $dateFormat_week = '%e de %B';
! $dateFormat_week_list = '%a, %e de %b';
! $dateFormat_week_jump = '%e de %b';
! $dateFormat_month = '%B de %Y';
! $dateFormat_month_list = '%A, %e de %B';
! $dateFormat_year = '%Y';
! 
! /*
! Notes about dateFormat_*
! 	The pieces are similar to that of the PHP function strftime(), 
! 	however only the following is supported at this time:
! 	
! 	%A - the full week day name as specified in $daysofweek_lang
! 	%a - the shortened week day name as specified in $daysofweekshort_lang
! 	%B - the full month name as specified in $monthsofyear_lang
! 	%b - the shortened month name as specified in $monthsofyearshort_lang
! 	%e - the day of the month as a decimal number (1 to 31)
! 	%Y - the 4-digit year
! 
! 	If this causes problems with representing your language accurately, let
! 	us know. We will be happy to modify this if needed.
! */
! 
! // Error messages - %s will be replaced with a variable
! $lang['l_error_title'] 			= '&iexcl;Error!';
! $lang['l_error_window'] 		= '&iexcl;Hubo un error!';
! $lang['l_error_calendar'] 		= 'Cuando se produjo este error, se procesaba "%s" del calendario.';
! $lang['l_error_path'] 			= 'Incapaz de abrir la ruta a: "%s"';
! $lang['l_error_back'] 			= 'Por favor, use el bot&oacute;n "Atr&aacute;s" para volver.';
! $lang['l_error_remotecal'] 		= 'Este servidor bloquea calendarios remotos que no han sido aprobados.';
! $lang['l_error_restrictedcal'] 	= 'Usted ha intentado accesar un calendario restringido en este servidor.';  // Changed
! $lang['l_error_invalidcal'] 		= 'Archivo de calendario inv&aacute;lido. Por favor, pruebe con otro calendario.';
! $lang['l_error_cantopen'] 		= 'Incapaz de abrir el calendario.';  // Changed
! $lang['l_error_cache']			= 'Incapaz de escribir al directorio de memoria. Verifique su configuraci&oacute;.';  // Changed
! 
! ?>

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.226, 1.227

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

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22048/functions

Modified Files:
	ical_parser.php 
Log Message:
fix rss link and dates

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.226
retrieving revision 1.227
diff -C2 -d -r1.226 -r1.227
*** ical_parser.php	18 Dec 2008 09:22:23 -0000	1.226
--- ical_parser.php	20 Dec 2008 00:11:56 -0000	1.227
***************
*** 464,468 ****
  
  //If you want to see the values in the arrays, uncomment below.
! //print '<pre>';
  //print_r($master_array);
  //print_r($overlap_array);
--- 464,469 ----
  
  //If you want to see the values in the arrays, uncomment below.
! #print '<pre>';
! #var_dump($phpiCal_config);
  //print_r($master_array);
  //print_r($overlap_array);
***************
*** 474,477 ****
  //print_r($cal_filelist);
  //print_r($tz_array);
! //print '</pre>';
  ?>
\ No newline at end of file
--- 475,478 ----
  //print_r($cal_filelist);
  //print_r($tz_array);
! #print '</pre>';
  ?>
\ No newline at end of file