phpicalendar-commits Mailing List for PHP iCalendar (Page 2)

Brought to you by: clittle, jimhu, parasytic

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

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2003	Jan (5)	Feb (25)	Mar (18)	Apr	May (26)	Jun (14)	Jul (1)	Aug (5)	Sep (82)	Oct (3)	Nov (130)	Dec (9)
2004	Jan (4)	Feb (62)	Mar	Apr (3)	May (100)	Jun	Jul (6)	Aug (49)	Sep (33)	Oct (47)	Nov (2)	Dec (1)
2005	Jan	Feb (4)	Mar (1)	Apr (8)	May (17)	Jun	Jul (1)	Aug (2)	Sep (26)	Oct (18)	Nov (37)	Dec (14)
2006	Jan (2)	Feb (18)	Mar (34)	Apr (52)	May (7)	Jun (3)	Jul (2)	Aug (10)	Sep	Oct	Nov (18)	Dec (4)
2007	Jan	Feb (7)	Mar (7)	Apr (6)	May (52)	Jun	Jul (1)	Aug	Sep	Oct (15)	Nov	Dec (1)
2008	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (250)
2009	Jan (35)	Feb (45)	Mar	Apr (4)	May (35)	Jun (13)	Jul (49)	Aug	Sep	Oct	Nov	Dec (11)
2010	Jan (3)	Feb (30)	Mar	Apr (35)	May (12)	Jun (2)	Jul	Aug	Sep	Oct	Nov	Dec (4)

Flat | Threaded

<< < 1 2 3 4 .. 61 > >> (Page 2 of 61)

[PHPiCalendar-Commits] phpicalendar/functions draw_functions.php, 1.10, 1.11

From: <par...@us...> - 2010-04-15 20:36:23

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21961/functions

Modified Files:
	draw_functions.php 
Log Message:
Fix overlapping events, Bug #2968512

Index: draw_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/draw_functions.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** draw_functions.php	8 Jul 2009 18:28:13 -0000	1.10
--- draw_functions.php	15 Apr 2010 20:36:14 -0000	1.11
***************
*** 32,36 ****
  		}
  	}
! 	$draw_len = ($end_h * 60 + $end_min) - ($sta_h * 60 + $sta_min);
  
  	return array ("draw_start" => ($sta_h . $sta_min), "draw_end" => ($end_h . $end_min), "draw_length" => $draw_len);
--- 32,41 ----
  		}
  	}
! 	$sta = ($sta_h * 60 + $sta_min);
! 	$end = ($end_h * 60 + $end_min);
! 	if ($sta < $end)
! 		$draw_len = $end - $sta;
! 	else
! 		$draw_len = $sta - $end;
  
  	return array ("draw_start" => ($sta_h . $sta_min), "draw_end" => ($end_h . $end_min), "draw_length" => $draw_len);

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.259, 1.260

From: <par...@us...> - 2010-04-15 19:40:02

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3184/functions

Modified Files:
	ical_parser.php 
Log Message:
Fix undefined index warning

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.259
retrieving revision 1.260
diff -C2 -d -r1.259 -r1.260
*** ical_parser.php	15 Apr 2010 17:53:18 -0000	1.259
--- ical_parser.php	15 Apr 2010 19:39:54 -0000	1.260
***************
*** 64,68 ****
  						$parse_file = false;
  						$calendar_name = $master_array['calendar_name'];
! 						$calendar_tz = $master_array['calendar_tz'];
  					}
  				}
--- 64,69 ----
  						$parse_file = false;
  						$calendar_name = $master_array['calendar_name'];
! 						if (isset($master_array['calendar_tz']))
! 							$calendar_tz = $master_array['calendar_tz'];
  					}
  				}
***************
*** 95,99 ****
  						$parse_file = false;
  						$calendar_name = $master_array['calendar_name'];
! 						$calendar_tz = $master_array['calendar_tz'];
  					}
  				}
--- 96,101 ----
  						$parse_file = false;
  						$calendar_name = $master_array['calendar_name'];
! 						if (isset($master_array['calendar_tz']))
! 							$calendar_tz = $master_array['calendar_tz'];
  					}
  				}

[PHPiCalendar-Commits] phpicalendar README,1.121,1.122

From: <par...@us...> - 2010-04-15 19:40:01

Update of /cvsroot/phpicalendar/phpicalendar
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3184

Modified Files:
	README 
Log Message:
Fix undefined index warning

Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** README	9 Feb 2010 15:40:18 -0000	1.121
--- README	15 Apr 2010 19:39:53 -0000	1.122
***************
*** 94,97 ****
--- 94,99 ----
  	Bug fixes:
  		Webcal caching now works like local caching with save_parsed_cals
+ 		Performance improvements with remote calendars; reducing the number
+ 			of file reads/HTTP requests made for each calendar
  		Print view missing some events
  		Setting time format in preferences page
***************
*** 105,110 ****
--- 107,114 ----
  		Better handling of URLs and email addresses in event descriptions
  		Navigation forms breaking PHP transparent SID
+ 		Fix strange characters displayed in Locations with % characters
  	New features:
  		Event information displayed with Nice Titles
+ 			Fixes line breaks and some HTML in event tooltips
  		Attendee/organizer parsing and email address hyperlinking
  		Better display of tabs/line breaks in calendar events

[PHPiCalendar-Commits] phpicalendar/functions/parse parse_tzs.php, 1.11, NONE

From: <par...@us...> - 2010-04-15 18:47:27

Update of /cvsroot/phpicalendar/phpicalendar/functions/parse
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21856/functions/parse

Removed Files:
	parse_tzs.php 
Log Message:
Remove unused parse_tzs.php (since the previous performance improvement patch)

--- parse_tzs.php DELETED ---

[PHPiCalendar-Commits] phpicalendar day.php, 1.139, 1.140 month.php, 1.154, 1.155 week.php, 1.139, 1.140 year.php, 1.53, 1.54

From: <par...@us...> - 2010-04-15 18:44:00

Update of /cvsroot/phpicalendar/phpicalendar
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20867

Modified Files:
	day.php month.php week.php year.php 
Log Message:
Another additional performance improvement: Call availableCalendars() only once

Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** day.php	22 Jun 2009 14:31:03 -0000	1.139
--- day.php	15 Apr 2010 18:43:53 -0000	1.140
***************
*** 37,41 ****
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
--- 37,42 ----
  
  // select for calendars
! $available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
! $list_icals 	= display_ical_list($available);
  $list_years 	= list_years();
  $list_months 	= list_months();
***************
*** 43,47 ****
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
--- 44,48 ----
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list($available, TRUE);
  
  // login/logout

Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.154
retrieving revision 1.155
diff -C2 -d -r1.154 -r1.155
*** month.php	7 Jul 2009 14:48:28 -0000	1.154
--- month.php	15 Apr 2010 18:43:53 -0000	1.155
***************
*** 47,51 ****
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
--- 47,52 ----
  
  // select for calendars
! $available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
! $list_icals 	= display_ical_list($available);
  $list_years 	= list_years();
  $list_months 	= list_months();
***************
*** 53,57 ****
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
--- 54,58 ----
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list($available, TRUE);
  
  // login/logout

Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** week.php	22 Jun 2009 14:31:03 -0000	1.139
--- week.php	15 Apr 2010 18:43:53 -0000	1.140
***************
*** 38,42 ****
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
--- 38,43 ----
  
  // select for calendars
! $available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
! $list_icals 	= display_ical_list($available);
  $list_years 	= list_years();
  $list_months 	= list_months();
***************
*** 44,48 ****
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
--- 45,49 ----
  $list_jumps 	= list_jumps();
  $list_calcolors = list_calcolors();
! $list_icals_pick = display_ical_list($available, TRUE);
  
  // login/logout

Index: year.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** year.php	7 Jul 2009 14:48:28 -0000	1.53
--- year.php	15 Apr 2010 18:43:53 -0000	1.54
***************
*** 24,28 ****
  
  // select for calendars
! $list_icals 	= display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED));
  $list_years 	= list_years();
  $list_months 	= list_months();
--- 24,29 ----
  
  // select for calendars
! $available		= availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED);
! $list_icals 	= display_ical_list($available);
  $list_years 	= list_years();
  $list_months 	= list_months();
***************
*** 32,36 ****
  <img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0" />'.$lang['l_event']."<br>"; 
  ;
! $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE);
  
  // login/logout
--- 33,37 ----
  <img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0" />'.$lang['l_event']."<br>"; 
  ;
! $list_icals_pick = display_ical_list($available, TRUE);
  
  // login/logout

[PHPiCalendar-Commits] phpicalendar/functions calendar_functions.php, 1.39, 1.40

From: <par...@us...> - 2010-04-15 18:39:34

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19694/functions

Modified Files:
	calendar_functions.php 
Log Message:
Additional performance improvement: Don't re-parse ICS files to get the calendar name

Index: calendar_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** calendar_functions.php	7 Jul 2009 14:48:29 -0000	1.39
--- calendar_functions.php	15 Apr 2010 18:39:26 -0000	1.40
***************
*** 86,90 ****
  			// we have to append '.ics' to the passed in calendar names.
  			foreach ($cal_filename_local as $filename) {
! 				array_push($files, "$search_path/$filename".".ics");
  			}
  		}
--- 86,90 ----
  			// we have to append '.ics' to the passed in calendar names.
  			foreach ($cal_filename_local as $filename) {
! 				array_push($files, "$search_path/$filename.ics");
  			}
  		}
***************
*** 176,180 ****
  	
  	// At this point, just pull the name off the file.
! 	return str_replace(".ics", '', basename($cal_path));
  }
  
--- 176,186 ----
  	
  	// At this point, just pull the name off the file.
! 	$name = str_replace(".ics", '', basename($cal_path));
! 	if ((substr($cal_path, 0, 7) == 'http://') ||
! 		(substr($cal_path, 0, 8) == 'https://') ||
! 		(substr($cal_path, 0, 9) == 'webcal://')) {
! 		$name = urldecode($name);
! 	}
! 	return $name;
  }
  
***************
*** 185,189 ****
  // $cals	= The calendars (entire path, e.g. from availableCalendars).
  function display_ical_list($cals, $pick=FALSE) {
! 	global $cal, $current_view, $getdate, $lang, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames, $list_webcals, $phpiCal_config;
  	// Print each calendar option.
  	$return = '';
--- 191,195 ----
  // $cals	= The calendars (entire path, e.g. from availableCalendars).
  function display_ical_list($cals, $pick=FALSE) {
! 	global $cal, $current_view, $getdate, $lang, $calendar_lang, $all_cal_comb_lang, $cal_filelist, $cal_displaynames, $list_webcals, $phpiCal_config, $master_array;
  	// Print each calendar option.
  	$return = '';
***************
*** 195,210 ****
  		// Format the calendar path for display.
  		//
! 		// Only display the calendar name, replace all instances of "32" with " ",
! 		// and remove the .ics suffix.
! 		$cal_displayname_tmp = getCalendarName($cal_tmp);
! 		#$cal_displayname_tmp = str_replace("32", " ", $cal_displayname_tmp);
! 		#overwrite the display name if we already have a real name
! 		if (is_numeric(array_search($cal_tmp, $cal_filelist))){
! 			$cal_displayname_tmp = $cal_displaynames[array_search($cal_tmp,$cal_filelist)];
! 		}else{
  			# pull the name from the $cal_tmp file
! 			$cal_tmp2 = str_replace('webcal://','http://',$cal_tmp);
! 
! 			$ifile = @fopen($cal_tmp2, "r");
  			if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp));
  			while (!feof($ifile)) {
--- 201,226 ----
  		// Format the calendar path for display.
  		//
! 		$cal_displayname_tmp = '';
! 		$search_idx = array_search($cal_tmp, $cal_filelist);
! 		if (is_numeric($search_idx)) {
! 			$cal_displayname_tmp = $cal_displaynames[$search_idx];
! 		}
! 		else if ((substr($cal_tmp, 0, 7) == 'http://') ||
! 			(substr($cal_tmp, 0, 8) == 'https://') ||
! 			(substr($cal_tmp, 0, 9) == 'webcal://')) {
! 			$cal_tmp2 = str_replace('webcal://', 'http://', $cal_tmp);
! 			$cal_tmp2 = str_replace('https://',  'http://', $cal_tmp2);
! 			$num = 1;
! 			foreach ($master_array[-4] as $master_cal) {
! 				if ($master_cal['filename'] == $cal_tmp2) {
! 					$cal_displayname_tmp = $master_array[-3][$num];
! 					break;
! 				}
! 				$num++;
! 			}
! 		}
! 		else {
  			# pull the name from the $cal_tmp file
! 			$ifile = @fopen($cal_tmp, 'r');
  			if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp));
  			while (!feof($ifile)) {
***************
*** 226,230 ****
  				if ($line == "BEGIN:VTIMEZONE" ||$line == "BEGIN:VEVENT") break;
  			}
! 
  		}
  
--- 242,252 ----
  				if ($line == "BEGIN:VTIMEZONE" ||$line == "BEGIN:VEVENT") break;
  			}
! 			@fclose($ifile);
! 		}
! 		if (empty($cal_displayname_tmp)) {
! 			// Only display the calendar name, replace all instances of "32" with " ",
! 			// and remove the .ics suffix.
! 			$cal_displayname_tmp = getCalendarName($cal_tmp);
! 			#$cal_displayname_tmp = str_replace('32', ' ', $cal_displayname_tmp);
  		}

[PHPiCalendar-Commits] phpicalendar/functions date_functions.php, 1.58, 1.59 ical_parser.php, 1.258, 1.259

From: <par...@us...> - 2010-04-15 17:53:26

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8424/functions

Modified Files:
	date_functions.php ical_parser.php 
Log Message:
Performance improvements (especially for remote calendars) and some style cleanups

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** date_functions.php	13 Apr 2010 15:45:47 -0000	1.58
--- date_functions.php	15 Apr 2010 17:53:18 -0000	1.59
***************
*** 5,30 ****
  
  
! // get remote file last modification date (returns unix timestamp)
! function remote_filemtime($url) {
! 	$fp = fopen($url, 'r');
! 	if (!$fp) return 0;
! 	$metadata = stream_get_meta_data($fp);
! 	fclose($fp);
  
! 	$unixtime = 0;
! 	foreach ($metadata['wrapper_data'] as $response) {
! 		// case: redirection
! 		// WARNING: does not handle relative redirection
! 		if (substr(strtolower($response), 0, 10) == 'location: ') {
! 			return GetRemoteLastModified(substr($response, 10));
! 		}
! 		// case: last-modified
! 		else if (substr(strtolower($response), 0, 15) == 'last-modified: ') {
! 			$unixtime = strtotime(substr($response, 15));
! 			break;
  		}
  	}
  
! 	return $unixtime;
  }
  
--- 5,103 ----
  
  
! /*
!  * Get remote file last modification date (returns unix timestamp)
!  * Supports HTTPS, HTTP basic authentication, and location: redirects
!  * FIXME: Basic auth should not be sent over unencrypted connections
!  * 	 unless an HTTP 401 Unauthorized is returned
!  */
! function remote_filemtime($url, $recurse = 0) {
! 	// We hate infinite loops!
! 	if (++$recurse > 5) return 0;
! 	
! 	// Caching the remote mtime is a Really Good Idea.
! 	static $remote_files = array();
! 	if (isset($remote_files[$url])) return $remote_files[$url];
  
! 	$uri = parse_url($url);
! 	$uri['proto'] = (
! 		(isset($uri['proto']) && ($uri['proto'] == 'https')) ?
! 		'ssl://' :
! 		''
! 	);
! 	$uri['port'] = isset($uri['port']) ? $uri['port'] : 80;
! 	$path = (
! 		(isset($uri['path']) || isset($uri['query'])) ?
! 		(@$uri['path'] . @$uri['query']) :
! 		'/'
! 	);
! 	$auth = (
! 		(isset($uri['user']) || isset($uri['pass'])) ?
! 		('Authentication: Basic ' . base64_encode(@$uri['user'] . ':' . @$uri['pass']) . "\r\n") :
! 		''
! 	);
! 
! 	$handle = @fsockopen($uri['proto'] . $uri['host'], $uri['port']);
! 	if (!$handle) {
! 		$remote_files[$url] = 0;
! 		return 0;
! 	}
! 
! 	fputs($handle, "HEAD {$path} HTTP/1.1\r\nHost: {$uri['host']}\r\n{$auth}Connection: close\r\n\r\n");
! 	$headers = array();
! 	while (!feof($handle)) {
! 		$line = trim(fgets($handle, 1024));
! 		if (empty($line)) break;
! 		$headers[] = $line;
! 	}
! 	fclose($handle);
! 
! 	$result = 0;
! 	array_shift($headers);
! 	foreach ($headers as $header) {
! 		list($key, $value) = explode(':', $header, 2);
! 		$value = trim($value);
! 		
! 		switch (strtolower(trim($key))) {
! 			case 'location': // Redirect
! 				$result = remote_filemtime(resolve_path($url, $value), $recurse);
! 				break;
! 			
! 			case 'last-modified': // Got it!
! 				$result = strtotime($value);
! 				break;
  		}
  	}
  
! 	$remote_files[$url] = $result;
! 	return $result;
! }
! 
! /*
!  * Resolve relative paths
!  * Utility function for remote_filemtime()
!  */
! function resolve_path($url, $rel_path) {
! 	$uri = parse_url($url);
! 
! 	$uri['proto']	= (isset($uri['proto'])	? $uri['proto']			: 'http://');
! 	$uri['port']	= (isset($uri['port'])	? (':' . $uri['port'])	: '');
! 	$auth = (
! 		(isset($uri['user']) || isset($uri['pass'])) ?
! 		(urlencode(@$uri['user']) . ':' . urlencode(@$uri['pass']) . '@') :
! 		''
! 	);
! 
! 	if (parse_url($rel_path) === false) {
! 		// Path is relative to this domain
! 		$rel_path = str_replace('\\', '/', $rel_path);
! 
! 		if ($rel_path{0} == '/')
! 			return $uri['proto'] . '://' . $auth . $uri['host'] . $uri['port'] . $rel_path;
! 
! 		return $uri['proto'] . '://' . $auth . $uri['host'] . $uri['port'] . $uri['path'] . '/' . $rel_path;
! 	}
! 
! 	// Path is absolute
! 	return $rel_path;
  }
  
***************
*** 236,243 ****
  	if (ereg('<([[:alpha:]]+://)([^<>[:space:]]+)>',$event_text,$matches)) {
  		$full_event_text = $matches[1] . $matches[2];
! 		$event_text      = $matches[2];
  	} else {
  		$full_event_text = $event_text;
! 		$event_text      = strip_tags($event_text, '<b><i><u><img>');
  	}
  	
--- 309,316 ----
  	if (ereg('<([[:alpha:]]+://)([^<>[:space:]]+)>',$event_text,$matches)) {
  		$full_event_text = $matches[1] . $matches[2];
! 		$event_text = $matches[2];
  	} else {
  		$full_event_text = $event_text;
! 		$event_text = strip_tags($event_text, '<b><i><u><img>');
  	}
  	

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.258
retrieving revision 1.259
diff -C2 -d -r1.258 -r1.259
*** ical_parser.php	13 Apr 2010 20:13:51 -0000	1.258
--- ical_parser.php	15 Apr 2010 17:53:18 -0000	1.259
***************
*** 9,15 ****
  
  // reading the file if it's allowed
  $parse_file = true;
! if ($phpiCal_config->save_parsed_cals == 'yes') {	
  	if (sizeof ($cal_filelist) > 1) {
  		$parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$phpiCal_config->ALL_CALENDARS_COMBINED).'-'.$this_year;
  		if (file_exists($parsedcal)) {
--- 9,17 ----
  
  // reading the file if it's allowed
+ $realcal_mtime = time();
  $parse_file = true;
! if ($phpiCal_config->save_parsed_cals == 'yes') {
  	if (sizeof ($cal_filelist) > 1) {
+ 		// This is a special case for "all calendars combined"
  		$parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$phpiCal_config->ALL_CALENDARS_COMBINED).'-'.$this_year;
  		if (file_exists($parsedcal)) {
***************
*** 18,43 ****
  			fclose($fd);
  			$master_array = unserialize($contents);
- 			$z=1;
  			$y=0;
  			if (sizeof($master_array['-4']) == (sizeof($cal_filelist))) {
  				foreach ($master_array['-4'] as $temp_array) {
! 					$mtime = $master_array['-4'][$z]['mtime'];
! 					$fname = $master_array['-4'][$z]['filename'];
! 					$wcalc = $master_array['-4'][$z]['webcal'];
! 					
! 					if ($wcalc == 'no') $realcal_mtime = filemtime($fname);
! 					else $realcal_mtime = remote_filemtime($fname);
  					
! 					if ($mtime == $realcal_mtime) {
  						$y++;
  					}
- 					$z++;
  				}
  				foreach ($master_array['-3'] as $temp_array) {
  					if (isset($temp_array) && $temp_array !='') $caldisplaynames[] = $temp_array;
  				}
  
  				if ($y == sizeof($cal_filelist)) {
  					if ($master_array['-1'] == 'valid cal file') {
  						$parse_file = false;
  						$calendar_name = $master_array['calendar_name'];
--- 20,65 ----
  			fclose($fd);
  			$master_array = unserialize($contents);
  			$y=0;
+ 			// Check the calendars' last-modified time to determine if any need to be re-parsed
  			if (sizeof($master_array['-4']) == (sizeof($cal_filelist))) {
  				foreach ($master_array['-4'] as $temp_array) {
! 					$mtime = $temp_array['mtime'];
! 					$fname = $temp_array['filename'];
! 					$wcalc = $temp_array['webcal'];
! 
! 					if ($wcalc == 'no') {
! 						/*
! 						 * Getting local file mtime is "fairly cheap"
! 						 * (disk I/O is expensive, but *much* cheaper than going to the network for remote files)
! 						 */
! 						$realcal_mtime = filemtime($fname);
! 					}
! 					else if ((time() - $mtime) >= $phpiCal_config->webcal_hours * 60 * 60) {
! 						/*
! 						 * We limit remote file mtime checks based on the magic webcal_hours config variable
! 						 * This allows highly volatile web calendars to be cached for a period of time before
! 						 * downloading them again
! 						 */
! 						$realcal_mtime = remote_filemtime($fname);
! 					}
! 					else {
! 						// This is our fallback, for the case where webcal_hours is taking effect
! 						$realcal_mtime = $mtime;
! 					}
  					
! 					// If this calendar is up-to-date, the $y magic number will be incremented...
! 					if ($mtime >= $realcal_mtime) {
  						$y++;
  					}
  				}
+ 
  				foreach ($master_array['-3'] as $temp_array) {
  					if (isset($temp_array) && $temp_array !='') $caldisplaynames[] = $temp_array;
  				}
  
+ 				// And the $y magic number is used here to determine if all calendars are up-to-date
  				if ($y == sizeof($cal_filelist)) {
  					if ($master_array['-1'] == 'valid cal file') {
+ 						// At this point, all calendars are up-to-date, so we can simply used the pre-parsed data
  						$parse_file = false;
  						$calendar_name = $master_array['calendar_name'];
***************
*** 47,64 ****
  			}
  		}
! 		if ($parse_file == true) unset($master_array);
  	} else {
  		foreach ($cal_filelist as $filename) {
- 			if (substr($filename, 0, 7) == 'http://' || substr($filename, 0, 8) == 'https://' || substr($filename, 0, 9) == 'webcal://') {
- 				$realcal_mtime = remote_filemtime($filename);
- 			}
- 			else {
- 				$realcal_mtime = filemtime($filename);
- 			}
- 
  			$parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
  			if (file_exists($parsedcal)) {
  				$parsedcal_mtime = filemtime($parsedcal);
! 				if ($realcal_mtime == $parsedcal_mtime) {
  					$fd = fopen($parsedcal, 'r');
  					$contents = fread($fd, filesize($parsedcal));
--- 69,91 ----
  			}
  		}
! 		if ($parse_file == true) {
! 			// We need to re-parse at least one calendar, so unset master_array
! 			unset($master_array);
! 		}
  	} else {
  		foreach ($cal_filelist as $filename) {
  			$parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
  			if (file_exists($parsedcal)) {
  				$parsedcal_mtime = filemtime($parsedcal);
! 
! 				if (((time() - $parsedcal_mtime) >= $phpiCal_config->webcal_hours * 60 * 60) &&
! 					(substr($filename, 0, 7) == 'http://' || substr($filename, 0, 8) == 'https://' || substr($filename, 0, 9) == 'webcal://')) {
! 					$realcal_mtime = remote_filemtime($filename);
! 				}
! 				else {
! 					$realcal_mtime = $parsedcal_mtime;
! 				}
! 
! 				if ($parsedcal_mtime >= $realcal_mtime) {
  					$fd = fopen($parsedcal, 'r');
  					$contents = fread($fd, filesize($parsedcal));
***************
*** 96,108 ****
  			$filename = $cal_httpPrefix;
  			$master_array['-4'][$calnumber]['webcal'] = 'yes';
! 			$actual_mtime = @remote_filemtime($filename);
  		} else {
! 			$actual_mtime = @filemtime($filename);
  		}
  
! 		include(BASE.'functions/parse/parse_tzs.php');
  
  		
! 		$ifile = @fopen($filename, "r");
  		if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $filename));
  		$nextline = fgets($ifile, 1024);
--- 123,136 ----
  			$filename = $cal_httpPrefix;
  			$master_array['-4'][$calnumber]['webcal'] = 'yes';
! 			$actual_mtime = remote_filemtime($filename);
  		} else {
! 			$actual_mtime = filemtime($filename);
  		}
  
! 		$is_std = false;
! 		$is_daylight = false;
  
  		
! 		$ifile = @fopen($filename, 'r');
  		if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $filename));
  		$nextline = fgets($ifile, 1024);
***************
*** 121,135 ****
  			$line = $nextline;
  			$nextline = fgets($ifile, 1024);
! 			$nextline = ereg_replace("[\r\n]", "", $nextline);
  			#handle continuation lines that start with either a space or a tab (MS Outlook)
! 			while (isset($nextline{0}) && ($nextline{0} == " " || $nextline{0} == "\t")) { 
  				$line = $line . substr($nextline, 1);
  				$nextline = fgets($ifile, 1024);
! 				$nextline = ereg_replace("[\r\n]", "", $nextline);
  			}
! 			$line = str_replace('\n',"\n",$line);
! 			$line = str_replace('\t',"\t",$line);
  			$line = trim(stripslashes($line));
  			switch ($line) {
  				case 'BEGIN:VFREEBUSY':
  				case 'BEGIN:VEVENT':
--- 149,201 ----
  			$line = $nextline;
  			$nextline = fgets($ifile, 1024);
! 			$nextline = ereg_replace("[\r\n]", '', $nextline);
  			#handle continuation lines that start with either a space or a tab (MS Outlook)
! 			while (isset($nextline{0}) && ($nextline{0} == ' ' || $nextline{0} == "\t")) {
  				$line = $line . substr($nextline, 1);
  				$nextline = fgets($ifile, 1024);
! 				$nextline = ereg_replace("[\r\n]", '', $nextline);
  			}
! 			$line = str_replace('\n', "\n", $line);
! 			$line = str_replace('\t', "\t", $line);
  			$line = trim(stripslashes($line));
  			switch ($line) {
+ 				// Begin VTIMEZONE Parsing
+ 				//
+ 				case 'BEGIN:VTIMEZONE':
+ 					unset($tz_name, $offset_from, $offset_to, $tz_id);
+ 					break;
+ 				case 'BEGIN:STANDARD':
+ 					unset ($offset_s);
+ 					$is_std = true;
+ 					$is_daylight = false;
+ 					break;
+ 				case 'END:STANDARD':
+ 					$offset_s = $offset_to;
+ 					$is_std = false;
+ 					break;
+ 				case 'BEGIN:DAYLIGHT':
+ 					unset ($offset_d);
+ 					$is_daylight = true;
+ 					$is_std = false;
+ 					break;
+ 				case 'END:DAYLIGHT':
+ 					$offset_d = $offset_to;
+ 					$is_daylight = false;
+ 					break;
+ 				case 'END:VTIMEZONE':
+ 					if (!isset($offset_d) && isset($offset_s)) $offset_d = $offset_s;
+ 					$tz_array[$tz_id] = array(
+ 						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>";
+ 					break;
+ 
+ 				// Begin VFREEBUSY/VEVENT Parsing
+ 				//
  				case 'BEGIN:VFREEBUSY':
  				case 'BEGIN:VEVENT':
***************
*** 176,181 ****
  				case 'END:VFREEBUSY':
  				case 'END:VEVENT':
! 					include BASE."functions/parse/end_vevent.php";			
  					break;
  				case 'END:VTODO':
  					if (($vtodo_priority == '') && ($status == 'COMPLETED')) {
--- 242,250 ----
  				case 'END:VFREEBUSY':
  				case 'END:VEVENT':
! 					include BASE.'functions/parse/end_vevent.php';
  					break;
+ 
+ 				// Begin VTODO Parsing
+ 				//
  				case 'END:VTODO':
  					if (($vtodo_priority == '') && ($status == 'COMPLETED')) {
***************
*** 234,237 ****
--- 303,309 ----
  					$description = '';
  					break;
+ 
+ 				// Begin VALARM Parsing
+ 				//
  				case 'BEGIN:VALARM':
  					$valarm_set = TRUE;
***************
*** 252,256 ****
  					
  					switch ($property) {
! 						
  						// Start VTODO Parsing
  						//
--- 324,345 ----
  					
  					switch ($property) {
! 						// Start TZ Parsing
! 						//
! 						case 'TZID':
! 							$tz_id = $data;
! 							break;
! 						case 'TZOFFSETFROM':
! 							$offset_from = $data;
! 							break;
! 						case 'TZOFFSETTO':
! 							$offset_to = $data;
! 							break;
! 						case 'TZNAME':
! 							if ($is_std) $st_name = $data;
! 							if ($is_daylight) $dt_name = $data;
! 							break;
! 						//
! 						// End TZ Parsing
! 
  						// Start VTODO Parsing
  						//
***************
*** 287,291 ****
  							break;
  						//
! 						// End VTODO Parsing				
  							
  						case 'DTSTART':
--- 376,380 ----
  							break;
  						//
! 						// End VTODO Parsing
  							
  						case 'DTSTART':
***************
*** 293,303 ****
  							$start_unixtime = $datetime[0];
  							$start_date = $datetime[1];
! 							$start_time = $datetime[2];
! 							$allday_start = $datetime[3];
! 							$start_tz = $datetime[4];
! 							preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
! 							$vevent_start_date = $regs[1] . $regs[2] . $regs[3];
! 							$day_offset = dayCompare($start_date, $vevent_start_date);
! 							#echo date("Ymd Hi", $start_unixtime)." $start_date $start_time $vevent_start_date $day_offset<br>";
  							break;
  							
--- 382,399 ----
  							$start_unixtime = $datetime[0];
  							$start_date = $datetime[1];
! 							if ($is_std || $is_daylight) {
! 								$year = substr($start_date, 0, 4);
! 								if ($is_std) $begin_std[$year] = $data;
! 								if ($is_daylight) $begin_daylight[$year] = $data;
! 							}
! 							else {
! 								$start_time = $datetime[2];
! 								$allday_start = $datetime[3];
! 								$start_tz = $datetime[4];
! 								preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})/', $data, $regs);
! 								$vevent_start_date = $regs[1] . $regs[2] . $regs[3];
! 								$day_offset = dayCompare($start_date, $vevent_start_date);
! 								#echo date("Ymd Hi", $start_unixtime)." $start_date $start_time $vevent_start_date $day_offset<br>";
! 							}
  							break;
  							
***************
*** 311,315 ****
  							
  						case 'EXDATE':
! 							$data = split(",", $data);
  							foreach ($data as $exdata) {
  								$exdata = str_replace('T', '', $exdata);
--- 407,411 ----
  							
  						case 'EXDATE':
! 							$data = split(',', $data);
  							foreach ($data as $exdata) {
  								$exdata = str_replace('T', '', $exdata);
***************
*** 425,433 ****
  							break;
  						case 'ATTENDEE':
! 							$email		= preg_match("/mailto:(.*)/i", $data, $matches1);
! 							$name		= preg_match("/CN=([^;]*)/i", $field, $matches2);
! 							$rsvp 		= preg_match("/RSVP=([^;]*)/i", $field, $matches3);
! 							$partstat	= preg_match("/PARTSTAT=([^;]*)/i", $field, $matches4);
! 							$role		= preg_match("/ROLE=([^;]*)/i", $field, $matches5);
  
  							$email		= ($email ? $matches1[1] : '');
--- 521,529 ----
  							break;
  						case 'ATTENDEE':
! 							$email		= preg_match('/mailto:(.*)/i', $data, $matches1);
! 							$name		= preg_match('/CN=([^;]*)/i', $field, $matches2);
! 							$rsvp 		= preg_match('/RSVP=([^;]*)/i', $field, $matches3);
! 							$partstat	= preg_match('/PARTSTAT=([^;]*)/i', $field, $matches4);
! 							$role		= preg_match('/ROLE=([^;]*)/i', $field, $matches5);
  
  							$email		= ($email ? $matches1[1] : '');
***************
*** 448,453 ****
  							break;
  						case 'ORGANIZER':
! 							$email		= preg_match("/mailto:(.*)/i", $data, $matches1);
! 							$name		= preg_match("/CN=([^;]*)/i", $field, $matches2);
  
  							$email		= ($email ? $matches1[1] : '');
--- 544,549 ----
  							break;
  						case 'ORGANIZER':
! 							$email		= preg_match('/mailto:(.*)/i', $data, $matches1);
! 							$name		= preg_match('/CN=([^;]*)/i', $field, $matches2);
  
  							$email		= ($email ? $matches1[1] : '');

[PHPiCalendar-Commits] phpicalendar default_config.php,1.24,1.25

From: <par...@us...> - 2010-04-15 17:53:26

Update of /cvsroot/phpicalendar/phpicalendar
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv8424

Modified Files:
	default_config.php 
Log Message:
Performance improvements (especially for remote calendars) and some style cleanups

Index: default_config.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/default_config.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** default_config.php	25 Jan 2010 18:13:51 -0000	1.24
--- default_config.php	15 Apr 2010 17:53:18 -0000	1.25
***************
*** 56,59 ****
--- 56,60 ----
  		$this->save_parsed_cals 		= 'no';				// Saves a copy of the cal in /tmp after it's been parsed. Improves performance.
  		$this->tmp_dir					= '/tmp';			// The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X). Any php-writable folder works.
+ 		$this->webcal_hours				= '24';				// Number of hours to cache webcals. Setting to '0' will always re-parse webcals if they've been modified.
  
  		// Webdav style publishing

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.257, 1.258

From: <par...@us...> - 2010-04-13 20:14:00

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv14523/functions

Modified Files:
	ical_parser.php 
Log Message:
Fix missing urlencode() when parsing Location attributes

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.257
retrieving revision 1.258
diff -C2 -d -r1.257 -r1.258
*** ical_parser.php	24 Dec 2009 17:41:02 -0000	1.257
--- ical_parser.php	13 Apr 2010 20:13:51 -0000	1.258
***************
*** 460,467 ****
  							break;
  						case 'LOCATION':
! 							$data = str_replace("\\n", "<br />", $data);
! 							$data = str_replace("\\t", "&nbsp;", $data);
! 							$data = str_replace("\\r", "<br />", $data);
  							$data = stripslashes($data);
  							$location = $data;
  							break;
--- 460,466 ----
  							break;
  						case 'LOCATION':
! 							$data = str_replace('$', '&#36;', $data);
  							$data = stripslashes($data);
+ 							$data = htmlentities(urlencode($data));
  							$location = $data;
  							break;

[PHPiCalendar-Commits] phpicalendar/functions date_functions.php, 1.57, 1.58

From: <par...@us...> - 2010-04-13 15:45:55

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv16185/functions

Modified Files:
	date_functions.php 
Log Message:
Properly sanitize dollar signs in event text (regression from new sanitize code in 2.4)

Index: date_functions.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** date_functions.php	7 Jul 2009 14:48:29 -0000	1.57
--- date_functions.php	13 Apr 2010 15:45:47 -0000	1.58
***************
*** 223,232 ****
  function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
  	global $cpath, $timeFormat, $dateFormat_week;
  	$return = '';
! 	$event_text = stripslashes(urldecode($arr["event_text"]));
  	# build tooltip
  	$title = makeTitle($arr, $time);
  	# for iCal pseudo tag <http> comptability
! 	if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$matches)) {
  		$full_event_text = $matches[1] . $matches[2];
  		$event_text      = $matches[2];
--- 223,238 ----
  function openevent($event_date, $time, $uid, $arr, $lines = 0, $length = 0, $link_class = '', $pre_text = '', $post_text = '') {
  	global $cpath, $timeFormat, $dateFormat_week;
+ 
+ 	# Strip all dollar signs from printable array entries; regex functions will mutilate them
+ 	foreach ($arr as $key => $val) {
+ 		$arr[$key] = str_replace('$', '&#36;', $val);
+ 	}
+ 
  	$return = '';
! 	$event_text = stripslashes(urldecode($arr['event_text']));
  	# build tooltip
  	$title = makeTitle($arr, $time);
  	# for iCal pseudo tag <http> comptability
! 	if (ereg('<([[:alpha:]]+://)([^<>[:space:]]+)>',$event_text,$matches)) {
  		$full_event_text = $matches[1] . $matches[2];
  		$event_text      = $matches[2];
***************
*** 239,248 ****
  
  	if (!empty($event_text)) {
! 		$title = strip_tags(str_replace("<br />","\n",$title));
  		if ($lines > 0) {
  			$event_text = word_wrap($event_text, $length, $lines);
  		}
  
! 		if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $full_event_text, $res))) || ($arr['description'])) {
  			$escaped_date = addslashes($event_date);
  			$escaped_time = addslashes($time);
--- 245,254 ----
  
  	if (!empty($event_text)) {
! 		$title = strip_tags(str_replace('<br />',"\n",$title));
  		if ($lines > 0) {
  			$event_text = word_wrap($event_text, $length, $lines);
  		}
  
! 		if ((!(ereg('([[:alpha:]]+://[^<>[:space:]]+)', $full_event_text, $res))) || ($arr['description'])) {
  			$escaped_date = addslashes($event_date);
  			$escaped_time = addslashes($time);

[PHPiCalendar-Commits] phpicalendar/functions/init sanitize.php, 1.6, 1.7

From: <par...@us...> - 2010-04-13 15:45:55

Update of /cvsroot/phpicalendar/phpicalendar/functions/init
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv16185/functions/init

Modified Files:
	sanitize.php 
Log Message:
Properly sanitize dollar signs in event text (regression from new sanitize code in 2.4)

Index: sanitize.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/sanitize.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sanitize.php	27 May 2009 17:21:01 -0000	1.6
--- sanitize.php	13 Apr 2010 15:45:47 -0000	1.7
***************
*** 54,57 ****
--- 54,58 ----
      $string = preg_replace('/<br\s*\/?>/', "\n", $string);
  
+     $string = str_replace('&#36;', '$', $string);
      $string = str_replace('&', '&amp;', $string);
      $string = str_replace('<', '&lt;', $string);
***************
*** 59,62 ****
--- 60,64 ----
      $string = str_replace('\'', '&#39;', $string);
      $string = str_replace('"', '&#34;', $string);
+     $string = str_replace('$', '&#36;', $string);
  
      $string = str_replace("\n", '<br />', $string);

[PHPiCalendar-Commits] phpicalendar/nicetitle nicetitle.css, NONE, 1.1.2.2 nicetitle.js, NONE, 1.4.2.2 ntbg.png, NONE, 1.1.2.2

From: <par...@us...> - 2010-04-12 19:16:35

Update of /cvsroot/phpicalendar/phpicalendar/nicetitle
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv27429/nicetitle

Added Files:
      Tag: phpicalendar-editor
	nicetitle.css nicetitle.js ntbg.png 
Log Message:
Re-merge; missed some updates

--- NEW FILE: nicetitle.css ---
div.nicetitle {
    position: absolute;
    padding: 4px;
    top: 0px;
    left: 0px;
    color: white;
    font-size: 12px;
    font-family: Verdana, Helvetica, Arial, sans-serif;
    font-weight: bold;
    width: 25em;
    background: url(ntbg.png);

    -moz-border-radius: 5px;
    -webkit-border-radius: 5px;
    border-radius: 5px;
    text-shadow: black 1px 1px 1px;
}
div.nicetitle p {
    margin: 0;
    padding: 0 3px;
}
div.nicetitle p.destination {
    font-size: 9px;
    text-align: left;
    padding-top: 3px;
}

@media print {
    div.nicetitle {
        display: none;
    }
}

--- NEW FILE: nicetitle.js ---
/*
 * Based on NiceTitle, by Stuart Langridge
 * http://www.kryogenix.org/code/browser/nicetitle/
 */


// Start configuration
var SHOW_LINKS = false; // Set to false to disable showing link URLs
var FOLLOW_MOUSE = true; // Set to false to disable title follows mouse

var MIN_WIDTH = 100; // Min/Max width/height of title
var MAX_WIDTH = 600;
var MIN_HEIGHT = 25;

var SNAP_LENGTH = 25; // Define the length from the edge of the window to snap to
var MOUSE_OFFSET = 15; // Define the distance to place the title from the mouse
// End configuration


// Let the magic begin...
addEvent(window, "load", makeNiceTitles);

// Get script self directory
var src = document.getElementById("nicetitle").src.split("/");
src.pop();
src = src.join("/");

// Pre-load background PNG
(new Image()).src = src + "/ntbg.png";

var XHTMLNS = "http://www.w3.org/1999/xhtml";
var CURRENT_NICE_TITLE;

function makeNiceTitles() {
    if (!document.createElement || !document.getElementsByTagName) return;
    // add namespace methods to HTML DOM; this makes the script work in both
    // HTML and XML contexts.
    if (!document.createElementNS) {
        document.createElementNS = function(ns,elt) {
            return document.createElement(elt);
        }
    }

    if (!document.links) {
        document.links = document.getElementsByTagName("a");
    }
    for (var ti = 0; ti < document.links.length; ti++) {
        var lnk = document.links[ti];
        if (lnk.title) {
            lnk.setAttribute("nicetitle", lnk.title);
            lnk.removeAttribute("title");
            addEvent(lnk, "mouseover", showNiceTitle);
            addEvent(lnk, "mouseover", moveNiceTitle);
            addEvent(lnk, "mouseout", hideNiceTitle);
            addEvent(lnk, "mousemove", moveNiceTitle);
            addEvent(lnk, "mousedown", hideNiceTitle);
            /*
             * Focus and blur events are not quite right. In Mozilla, titles do not show on keyboard focus.
             * This may present an accessibility issue, but it doesn't currently play nice
             * with FOLLOW_MOUSE=true, or mousedown events.
             */
//            addEvent(lnk, "focus", showNiceTitle);
//            addEvent(lnk, "blur", hideNiceTitle);
        }
    }
    var instags = document.getElementsByTagName("ins");
    if (instags) {
        for (var ti = 0; ti < instags.length; ti++) {
            var instag = instags[ti];
            if (instag.dateTime) {
                var strDate = instag.dateTime;
                var dtIns = new Date(
                    strDate.substring(0, 4),
                    parseInt(strDate.substring(4, 6) - 1),
                    strDate.substring(6, 8),
                    strDate.substring(9, 11),
                    strDate.substring(11, 13),
                    strDate.substring(13, 15)
                );
                instag.setAttribute("nicetitle", "Added on " + dtIns.toString());
                addEvent(instag, "mouseover", showNiceTitle);
                addEvent(instag, "mouseover", moveNiceTitle);
                addEvent(instag, "mouseout", hideNiceTitle);
                addEvent(instag, "mousemove", moveNiceTitle);
                addEvent(instag, "mousedown", hideNiceTitle);
//                addEvent(instag, "focus", showNiceTitle);
//                addEvent(instag, "blur", hideNiceTitle);
            }
        }
    }
}

function findPosition(oLink) {
    if (oLink.offsetParent) {
        for (var posX = 0, posY = 0; oLink.offsetParent; oLink = oLink.offsetParent) {
            posX += oLink.offsetLeft;
            posY += oLink.offsetTop;
        }
        return [posX, posY];
    } else {
        return [oLink.x, oLink.y];
    }
}

function get_longest(ary) {
    var l = 0;
    ary.forEach(function(el) {
        if (el.length > l) l = el.length;
    });

    return l;
}

function moveNiceTitle(e) {
    if (!CURRENT_NICE_TITLE) return;
    var d = CURRENT_NICE_TITLE;
    if (e && e.currentTarget && (typeof(e.currentTarget) != "undefined")) {
        var el = e.currentTarget
    }
    else if (window.event && window.event.srcElement) {
        var el = window.event.srcElement
    }

    // Browser size
    var xy = getWindowSize();
    var ww = xy[0];
    var wh = xy[1];

    // Title width and height
    var w = (d.offsetWidth || MIN_WIDTH);
    var h = (d.offsetHeight || MIN_HEIGHT);

    if (FOLLOW_MOUSE) {
        // Mouse position within document (not window)
        var xy = getMousePosition(e);
        var mx = xy[0];
        var my = xy[1];

        // Document scroll position within window
        var xy = getScrollPosition();
        var sx = xy[0];
        var sy = xy[1];

        // Title element position within document
        var x = mx + MOUSE_OFFSET;
        var y = my + MOUSE_OFFSET;
    }
    else {
        // Document scroll position within window
        // Unused
        var sx = 0;
        var sy = 0;

        // Title element position within document
        var elPos = findPosition(el);
        var x = elPos[0];
        var y = elPos[1] + el.offsetHeight + MOUSE_OFFSET;
    }

    // Find out if we've already snapped
    var SNAP_RIGHT = false;
    var SNAP_BOTTOM = false;

    // Snap title to the right side of the window
    if ((x + w + SNAP_LENGTH) >= (ww + sx)) {
        x = ((ww + sx) - w - SNAP_LENGTH);
        SNAP_RIGHT = true;
    }

    // Snap title to the bottom of the window
    if ((y + h + SNAP_LENGTH) >= (wh + sy)) {
        y = ((wh + sy) - h - SNAP_LENGTH);
        SNAP_BOTTOM = true;
    }

    // Ensure mouse can never enter the title in the lower right corner of the window
    if (FOLLOW_MOUSE && SNAP_RIGHT && SNAP_BOTTOM) {
        y = (my - MOUSE_OFFSET - h);
    }
    else if (!FOLLOW_MOUSE && SNAP_BOTTOM) {
        y = elPos[1] - h - MOUSE_OFFSET;
    }

    d.style.left = x + "px";
    d.style.top = y + "px";
}

function showNiceTitle(e) {
    if (CURRENT_NICE_TITLE) hideNiceTitle(CURRENT_NICE_TITLE);
    if (!document.getElementsByTagName) return;
    if (e && e.currentTarget && (typeof(e.currentTarget) != "undefined")) {
        var lnk = e.currentTarget
    }
    else if (window.event && window.event.srcElement) {
        var lnk = window.event.srcElement
    }

    if (!lnk) return;
    if (lnk.nodeName.toUpperCase() != "A") {
        // lnk is not actually the link -- ascend parents until we hit a link
        lnk = getParent(lnk, "A");
    }
    if (!lnk) return;
    var nicetitle = lnk.getAttribute("nicetitle");

    var d = document.createElementNS(XHTMLNS, "div");
    d.style.display = "none";
    d.className = "nicetitle";

    var nicetitle_parts = nicetitle.split("\n");
    nicetitle_parts.forEach(function(textpart) {
        var pat = document.createElementNS(XHTMLNS, "p");
        pat.className = "titletext";
        var tnt = document.createTextNode(textpart);
        pat.appendChild(tnt);
        var brk = document.createElementNS(XHTMLNS, "br");
        pat.appendChild(brk);
        d.appendChild(pat);
    });

    if (lnk.href && SHOW_LINKS) {
        var tnd = document.createTextNode(lnk.href);
        pad = document.createElementNS(XHTMLNS, "p");
        pad.className = "destination";
        pad.appendChild(tnd);
        d.appendChild(pad);
    }

    var l = get_longest(nicetitle_parts);

    // Approximate pixel width of longest line in the title
    var w = ((lnk.href && SHOW_LINKS) ? lnk.href.length : 0) * 6;
    var t = (l ? l : 0) * 8;

    // Use the greatest width: title text, link URL, or MIN_WIDTH. Limited to MAX_WIDTH
    w = ((w > MIN_WIDTH) ? w : MIN_WIDTH);
    w = ((w > t) ? w : t);
    w = ((w > MAX_WIDTH) ? MAX_WIDTH : w);
    d.style.width = w + "px";

    document.getElementsByTagName("body")[0].appendChild(d);
    d.style.display = "block";

    CURRENT_NICE_TITLE = d;
    moveNiceTitle(e);
}

function hideNiceTitle(e) {
    if (!document.getElementsByTagName) return;
    if (CURRENT_NICE_TITLE) {
        document.getElementsByTagName("body")[0].removeChild(CURRENT_NICE_TITLE);
        CURRENT_NICE_TITLE = null;
    }
}

// Add an eventListener to browsers that can do it somehow.
// Originally by the amazing Scott Andrew.
function addEvent(obj, evType, fn) {
    if (obj.addEventListener) {
        obj.addEventListener(evType, fn, false);
        return true;
    } else if (obj.attachEvent) {
        return obj.attachEvent("on" + evType, fn);
    } else {
        return false;
    }
}

function getParent(el, pTagName) {
	if (el == null) return null;
	else if (el.nodeType == 1 && el.tagName.toLowerCase() == pTagName.toLowerCase())
		return el;
	else
		return getParent(el.parentNode, pTagName);
}

function getMousePosition(e) {
    var x = 0;
    var y = 0;

    if (e && (typeof(window.scrollX) != "undefined")) {
        x = e.clientX + window.scrollX;
        y = e.clientY + window.scrollY;
    }
    else if (window.event) {
        x = window.event.clientX + document.documentElement.scrollLeft;
        y = window.event.clientY + document.documentElement.scrollTop;
    }

    return [x, y];
}

function getScrollPosition() {
    var x = 0;
    var y = 0;

    if ((typeof(window.scrollX) != "undefined") &&
        (typeof(window.scrollY) != "undefined")) {
        x = window.scrollX;
        y = window.scrollY;
    }
    else if ((typeof(document.documentElement.scrollLeft) != "undefined") &&
             (typeof(document.documentElement.scrollTop) != "undefined")) {
        x = document.documentElement.scrollLeft;
        y = document.documentElement.scrollTop;
    }

    return [x, y];
}

function getWindowSize() {
    var x = 0;
    var y = 0;

    if ((typeof(window.innerWidth) != "undefined") &&
        (typeof(window.innerHeight) != "undefined")) {
        x = window.innerWidth;
        y = window.innerHeight;
    }
    else if ((typeof(document.documentElement.clientWidth) != "undefined") &&
             (typeof(document.documentElement.clientHeight) != "undefined")) {
        x = document.documentElement.clientWidth;
        y = document.documentElement.clientHeight;
    }

    return [x, y];
}

// IE does not support the Array.forEach() method... Try to approximate it
if (!Array.prototype.forEach) {
    Array.prototype.forEach = function(action, context) {
        var len = this.length;
        for (var i = 0; i < len; i++) {
            if (this[i] != undefined) action(this[i], context);
        }
    };
}

--- NEW FILE: ntbg.png ---
(This appears to be a binary file; contents omitted.)

[PHPiCalendar-Commits] phpicalendar/images longevent_end.gif, NONE, 1.1.2.2 longevent_mid.gif, NONE, 1.1.2.2 longevent_start.gif, NONE, 1.1.2.2

From: <par...@us...> - 2010-04-12 18:58:55

Update of /cvsroot/phpicalendar/phpicalendar/images
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20875/images

Added Files:
      Tag: phpicalendar-editor
	longevent_end.gif longevent_mid.gif longevent_start.gif 
Log Message:
merge with HEAD

--- NEW FILE: longevent_end.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: longevent_mid.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: longevent_start.gif ---
(This appears to be a binary file; contents omitted.)

[PHPiCalendar-Commits] phpicalendar/functions/init date_range.php, 1.10, 1.10.2.1 sanitize.php, 1.1.2.1, 1.1.2.2