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

[PHPiCalendar-Commits] phpicalendar/calendars publish.ical.php, 1.4, NONE publish.mozilla.php, 1.3, NONE

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

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

Removed Files:
	publish.ical.php publish.mozilla.php 
Log Message:
Remove old and insecure versions of publish

--- publish.ical.php DELETED ---

--- publish.mozilla.php DELETED ---

[PHPiCalendar-Commits] phpicalendar/functions template.php, 1.87, 1.88

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

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

Modified Files:
	template.php 
Log Message:
Change print and month view listings to omit duplicates

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** template.php	5 Dec 2006 08:40:18 -0000	1.87
--- template.php	8 Apr 2007 01:41:55 -0000	1.88
***************
*** 63,67 ****
  		$parse_month 	= date ("Ym", strtotime($getdate));
  		$parse_year 	= date ("Y", strtotime($getdate));
! 		
  		foreach($master_array as $key => $val) {
  			preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs);
--- 63,68 ----
  		$parse_month 	= date ("Ym", strtotime($getdate));
  		$parse_year 	= date ("Y", strtotime($getdate));
! 
! 		$seen_events = array();
  		foreach($master_array as $key => $val) {
  			preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs);
***************
*** 72,79 ****
  				$events_tmp = $loop_event;
  				$day_tmp	= $loop_day;
! 				
  				// Pull out each day
  				foreach ($val as $new_val) {
  					foreach ($new_val as $new_key2 => $new_val2) {
  					if ($new_val2['event_text']) {	
  						$event_text 	= stripslashes(urldecode($new_val2['event_text']));
--- 73,86 ----
  				$events_tmp = $loop_event;
  				$day_tmp	= $loop_day;
! 				$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['event_text'] .= " second instance of ".$new_key2;
+ 							continue;
+ 						}
+ 						$seen_events["$new_key2"] = 1;
+ 						$day_events++;
  					if ($new_val2['event_text']) {	
  						$event_text 	= stripslashes(urldecode($new_val2['event_text']));
***************
*** 91,94 ****
--- 98,102 ----
  								$event_end 		= date ($timeFormat, strtotime ($event_end));
  								$event_start 	= $event_start .' - '.$event_end;
+ 								if (date("Ymd", $new_val2['start_unixtime']) != date("Ymd", $new_val2['end_unixtime'])) $event_start .= " ".localizeDate($dateFormat_day, $new_val2['end_unixtime']);
  							}
  						}
***************
*** 109,112 ****
--- 117,121 ----
  					}
  				}
+ 				if ($day_events == 0) continue;
  				$day_tmp  = str_replace('{DAYOFMONTH}', $dayofmonth, $day_tmp);
  				$final   .= $day_tmp.$some_events;
***************
*** 986,989 ****
--- 995,999 ----
  		$u_start = strtotime($m_start);
  		$i=0;
+ 		$seen_events = array();
  		do {
  			if (isset($master_array[$m_start])) {
***************
*** 992,995 ****
--- 1002,1007 ----
  					$switch['START_DATE'] 	= localizeDate ($dateFormat_week_list, $u_start);
  					foreach ($event_times as $uid => $val) {
+ 						if (isset($seen_events[$uid])) continue;
+ 						$seen_events[$uid] = 1;
  						$switch['CALNAME'] 	= $val['calname'];
  						if (!isset($val['event_start'])) {

[PHPiCalendar-Commits] phpicalendar README,1.106,1.107

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

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

Modified Files:
	README 
Log Message:
Change print and month view listings to omit duplicates

Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** README	5 Dec 2006 06:50:42 -0000	1.106
--- README	8 Apr 2007 01:41:55 -0000	1.107
***************
*** 83,86 ****
--- 83,89 ----
  --------
  cvs
+ 	Change template.php display in print and month views of events that span multiple days to not repeat listing
+ 	Fix (I hope) utf-8 rendering problems in event.php
+ 	Allow admins to set whether link from rss feed goes to day.php or event.php
  	Patch to allow parsing of MS-Outlook generated ics files where line continuation uses tab instead of space.
  2.23rc1

[PHPiCalendar-Commits] phpicalendar3/calendars - New directory

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

Update of /cvsroot/phpicalendar/phpicalendar3/calendars
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25191/calendars

Log Message:
Directory /cvsroot/phpicalendar/phpicalendar3/calendars added to the repository

[PHPiCalendar-Commits] phpicalendar3/functions init.inc.php, NONE, 1.1

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

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

Added Files:
	init.inc.php 
Log Message:
init.inc.php from phpicalendar 2.23rc1

--- NEW FILE: init.inc.php ---
<?php
/*=====================init.inc.php=====================
For phpicalendar 3

Need to set:

1. configurations
	paths
	languages
	templates
	behaviors
2. calendar list
3. range of dates to process

*/




?>

[PHPiCalendar-Commits] phpicalendar3/functions class.Daylight.php, NONE, 1.1 class.Parser.php, NONE, 1.1 class.Settings.php, NONE, 1.1 class.Standard.php, NONE, 1.1 class.Valarm.php, NONE, 1.1 class.Vcalendar.php, NONE, 1.1 class.Vevent.php, NONE, 1.1 class.Vfreebusy.php, NONE, 1.1 class.Vjournal.php, NONE, 1.1 class.Vtimezone.php, NONE, 1.1 class.Vtodo.php, NONE, 1.1 class.iCalObj.php, NONE, 1.1

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

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

Added Files:
	class.Daylight.php class.Parser.php class.Settings.php 
	class.Standard.php class.Valarm.php class.Vcalendar.php 
	class.Vevent.php class.Vfreebusy.php class.Vjournal.php 
	class.Vtimezone.php class.Vtodo.php class.iCalObj.php 
Log Message:
ical parser class files

--- NEW FILE: class.Daylight.php ---
<?php
/*=====================class.Daylight.php=====================

This class is for calendars.

*/
class Daylight extends Vtimezone{

	function Daylight(){
	
	}

}
?>
--- NEW FILE: class.Parser.php ---
<?php
/*=====================class.Parser.php=====================
Refactoring of the ical parser in phpicalendar to make the code more maintainable
gets a calendar object and creates a series of event objects.

This object should probably only be invoked in situations where the input is an ics file,
either a local cal or a webcal.  Unserializing a saved cal should go somewhere else.

The function process_file is the meat of the operation.  Note that Parser determines the kind of object
that should handle a content line, but delegates further parsing of that content-line to the object.
In other words, the Parser class just deals with BEGIN and END events, which are involved in creating and
organizing objects.
*/

class Parser{

	var 
		$cal,		#	calendar object
		$fh, 		# 	filehandle for the calendar file being parsed
		$lookahead,	#	buffer for last line read by read_line lookahead
		$mArray;	#	temporary master array entries
		
		
	function Parser(){
		$this->lookahead = '';
	}
	
	function set_cal($cal){
		$this->cal = $cal;
	}

	function process_cal(){
	
		process_file($this->cal->filename);
	}
/*
The structure of an ics file is somewhat like xml.  Objects are hierarchical
The top level object is VCALENDAR, which has children including VTIMEZONE, VEVENT, VTODO etc.
Each of these has child objects, such as DAYLIGHT and STANDARD in VTIMEZONE, DTSTART in the others, etc.
We will use this hiearchy, but not to full granularity.
*/	
	function process_file($filename){
		$obj = null;
		$obj_stack = array();
		if (!$this->open_file($filename)) return "can't open file"; 
		$i = 0;
		while (!feof($this->fh)){
			$line = $this->read_line();
			# echo "$i:$line\n";$i++;
			if($line){
				$tmp = explode(":",	$line);
				$tmp2 = explode(";", $tmp[0]);
				$key = $tmp2[0]; #want the first string before either a colon or semicolon
				# echo "key:$key\n";
				switch ($key){
					case 'BEGIN':
						$type = ucfirst(strtolower($tmp[1]));
						if($type == 'Vcalendar'){
							if (!is_object($this->cal)) $this->cal = new Vcalendar; echo "Make vcal obj\n";
							$obj = $this->cal;
							$obj_stack[] = $obj;
							# echo "BEGIN: make new obj of type ".get_class($obj)." and push it onto the stack\n";
						}elseif(in_array($type, array('Vtimezone','Daylight','Standard','Vevent','Vtodo','Vfreebusy'))){
							$obj = new $type; # 
							$obj_stack[] = $obj;
							# echo "BEGIN: make new obj of type ".get_class($obj)." and push it onto the stack\n";
						}else{
							# Handle BEGIN for undefined object types
							# Parser delegates further parsing to the object
							if(is_object($obj)) $obj->process_line($key,$line);
						}
						break;
					case 'END':
						$obj = array_pop($obj_stack);
						if(is_object(end($obj_stack))){
							$parent_obj = end($obj_stack);
							$parent_obj->process_child($obj); # let the parent object set whatever it needs from the child
						}	
						if(is_object($obj)) $obj->finish();
						# "make the working object the last one on the stack\n";
						if(is_object(end($obj_stack))){
							$obj = $parent_obj;
						}
						break;
					default:
						# Parser delegates further parsing to the object				
						if(is_object($obj)) $obj->process_line($key,$line);
				}
		#	print_r($obj_stack);
			}
		}
		# "finished stack on line:$line.  Lookahead:$this->lookahead\n";
		#deal with possible lack of \n at eof
		if(trim($this->lookahead) != ""  && is_object($obj)){
			$obj = array_pop($obj_stack);
			if(is_object(end($obj_stack))){
				$parent_obj = end($obj_stack);
				$parent_obj->process_child($obj); # let the parent object set whatever it 
			}	
			$obj->finish();
			if(is_object($parent_obj)) $parent_obj->finish();

		}
		print_r($this->cal);
		return true;
	}
	
	function open_file($filename){
		$this->fh = fopen("./".$filename, "r");
		if ($this->fh == FALSE) return false;
		return true;
	}
	
	# takes a filehandle and folds multiple line input to $this->line
	function read_line(){
		if (feof($this->fh)){ 
			return;
		}
		$tmp_line = $this->lookahead;
		$read_more = true;
		do { 
			$this->lookahead = fgets($this->fh, 1024); 
			$this->lookahead = ereg_replace("[\r\n]", "", $this->lookahead);

			if (($this->lookahead !='' && ($this->lookahead{0} == " " || $this->lookahead{0} == "\t")) || $tmp_line == '' || $tmp_line == "\n"){
				$tmp_line = rtrim($tmp_line) . str_replace("\t"," ", $this->lookahead);
			}else{
				$read_more = false;
			}
		}while ($read_more & !feof($this->fh)); 
		return trim($tmp_line);
	}

} # end class parser
?>
--- NEW FILE: class.Settings.php ---
<?php
/*=====================class.Settings.php=====================
Settings for phpicalendar 3
New creates an object with default settings
Methods to 
	overwrite from config.inc.php 
	read from cookie
	set cookie
*/

class Settings{
		
	function Settings(){
		$this->template 				= 'default';						// Template support
		$this->default_view 			= 'day';							// Default view for calendars = 'day', 'week', 'month', 'year'
		$this->minical_view 			= 'current';						// Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current'
		$this->default_cal 				= $this->ALL_CALENDARS_COMBINED;	// 
		$this->language 				= 'English';						// Language support 
		$this->week_start_day 			= 'Sunday';		// Day of the week your week starts on
		$this->week_length				= '7';			// Number of days to display in the week view
		$this->day_start 				= '0700';		// Start time for day grid
		$this->day_end					= '2300';		// End time for day grid
		$this->gridLength 				= '15';			// Grid distance in minutes for day view, multiples of 15 preferred
		$this->num_years 				= '1';			// Number of years (up and back) to display in 'Jump to'
		$this->month_event_lines 		= '1';			// Number of lines to wrap each event title in month view, 0 means display all lines.
		$this->tomorrows_events_lines 	= '1';			// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
		$this->allday_week_lines 		= '1';			// Number of lines to wrap each event title in all-day events in week view, 0 means display all lines.
		$this->week_events_lines 		= '1';			// Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines.
		$this->timezone 				= '';			// Set timezone. Read TIMEZONES file for more information
		$this->calendar_path 			= '';			// Leave this blank on most installs
		$this->second_offset			= '';			// The time in seconds between your time and your server's time.
		$this->bleed_time				= '-1';			// Allows events past midnight to just be displayed on the starting date, only good up to 24 hours. 
														// Range from '0000' to '2359', or '-1' for no bleed time.
		$this->cookie_uri				= ''; 			// The HTTP URL to the PHP iCalendar directory, 
														// ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
		$this->download_uri				= ''; 			// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars 
														// -- AUTO SETTING -- Only set if you are having subscribe issues.
		$this->default_path				= ''; 			// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
		$this->charset					= 'UTF-8';		// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
		
		// Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
		$this->allow_webcals 			= 'no';			// Allow http:// and webcal:// 
		$this->this_months_events 		= 'yes';		// Display "This month's events" at the bottom off the month page.
		$this->enable_rss				= 'yes';		// Enable RSS access to your calendars (good thing).
		$this->show_search				= 'yes';		// Show the search box in the sidebar.
		$this->allow_preferences		= 'yes';		// Allow visitors to change various preferences via cookies.
		$this->printview_default		= 'no';			// Set print view as the default view. 
		$this->show_todos				= 'yes';		// Show your todo list on the side of day and week view.
		$this->show_completed			= 'yes';		// Show completed todos on your todo list.
		$this->allow_login				= 'yes';		// Set to yes to prompt for login to unlock calendars.
		$this->login_cookies			= 'no';			// Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions.
		$this->support_ical				= 'no';			// Set to yes to support the Apple iCal calendar database structure.
		$this->recursive_path			= 'no';			// Set to yes to recurse into subdirectories of the calendar path.
		
		// Calendar Caching (decreases page load times)
		$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 for saving parsed cals
		$this->webcal_hours				= '24';			// Number of hours to cache webcals. Setting to '0' will always re-parse webcals.
		
		// Webdav style publishing
		$this->phpicalendar_publishing = '';			// Set to '1' to enable remote webdav style publish. See 'calendars/publish.php' for complete information;
		
		// Administration settings (/admin/)
		$this->allow_admin				= 'yes';		// Set to yes to allow the admin page 
														// - remember to change the default password if using 'internal' as the $this->auth_method			
		$this->auth_method				= 'internal';	// Valid values are: 'ftp', 'internal', or 'none'. 
														// 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files.
														// 'internal' uses $this->auth_internal_username and $this->auth_internal_password defined below 
														// - CHANGE the password. 
														// 'none' uses NO authentication - meant to be used with another form of authentication such as http basic.
		$this->auth_internal_username	= 'admin';		// Only used if $this->auth_method='internal'. The username for the administrator.
		$this->auth_internal_password	= 'admin';		// Only used if $this->auth_method='internal'. The password for the administrator.
		$this->ftp_server				= 'localhost';	// Only used if $this->auth_method='ftp'. The ftp server name. 'localhost' will work for most servers.
		$this->ftp_port					= '21';			// Only used if $this->auth_method='ftp'. The ftp port. '21' is the default for ftp servers.
		$this->ftp_calendar_path		= '';			// Only used if $this->auth_method='ftp'. The full path to the calendar directory on the ftp server. 
														// If = '', will attempt to deduce the path based on $this->calendar_path, 
														// but may not be accurate depending on ftp server config.
		
		// Calendar colors
		// You can increase the number of unique colors by adding additional images (monthdot_n.gif) 
		// and in the css file (default.css) classes .alldaybg_n, .eventbg_n and .eventbg2_n
		// Colors will repeat from the beginning for calendars past $this->unique_colors (7 by default), with no limit.
		$this->unique_colors			= '7';
		$this->blacklisted_cals 		= array();
		$this->list_webcals 			= array();
		#$this->more_webcals['cpath'][] = ''			//add webcals that will show up only for a particular cpath.
		$this->locked_cals 				= array();		// Fill in-between the quotes the names of the calendars you wish to hide
		$this->locked_map				= array();		// Map username:password accounts to locked calendars that should be		
		$this->apache_map		 		= array();		// Map HTTP authenticated users to specific calendars. Users listed here and
			

	}
	
	function setLang(){
	
	}

} # end class Settings
?>
--- NEW FILE: class.Standard.php ---
<?php
/*=====================class.Standard.php=====================

This class is for calendars.

*/
class Standard extends Vtimezone{

	function Standard(){
	
	}

}
?>
--- NEW FILE: class.Valarm.php ---
<?php
/*=====================class.Valarm.php=====================

This class is for events.

*/
class Valarm extends iCalObj{

	function Valarm(){
	
	}

}
?>
--- NEW FILE: class.Vcalendar.php ---
<?php
/*=====================class.Vcalendar.php=====================

This class is for calendars.

*/
class Vcalendar extends iCalObj{

	function Vcalendar(){
	
	}

}
?>
--- NEW FILE: class.Vevent.php ---
<?php
/*=====================class.Vevent.php=====================

This class is for events.

*/
class Vevent extends iCalObj{

	function Vevent(){
	
	}

}
?>
--- NEW FILE: class.Vfreebusy.php ---
<?php
/*=====================class.Vfreebusy.php=====================

This class is for calendars.

*/
class Vfreebusy extends iCalObj{

	function Vfreebusy(){
	
	}

}
?>
--- NEW FILE: class.Vjournal.php ---
<?php
/*=====================class.Vjournal.php=====================

This class is for calendars.

*/
class Vjournal extends iCalObj{

	function Vjournal(){
	
	}

}
?>
--- NEW FILE: class.Vtimezone.php ---
<?php
/*=====================class.Vtimezone.php=====================

This class is for calendars.

*/
class Vtimezone extends iCalObj{

	function Vtimezone(){
	
	}

}
?>
--- NEW FILE: class.Vtodo.php ---
<?php
/*=====================class.Vtodo.php=====================

This class is for calendars.

*/
class Vtodo extends iCalObj{

	function Vtodo(){
	
	}

}
?>
--- NEW FILE: class.iCalObj.php ---
<?php
/*=====================class.iCalObj.php=====================
Refactoring of the ical parser in phpicalendar to make the code more maintainable

Base class for icalendar objects. Some methods used by all, others only for timed events
*/

class iCalObj{

#	var $var; # comment
	var 
		$children; # comment

	function iCalObj(){
		$this->children = array();
	}
	
	/* Parser passes 
		key - everything before the first colon or semicolon
		line - the whole line
		From the icalendar spec page 13:
		    	contentline        = name *(";" param ) ":" value CRLF
		    examples:
		    	ATTENDEE;CUTYPE=GROUP:MAILTO:iet...@im...
		    	RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1
		    	
		Thus, note that key and value are both complex entities that can have multipart info   	
	*/
	function process_line($key, $line){
		echo "\tfeed key= $key line=$line to the object of type ".get_class($this)."\n";
		
		switch ($key){
			case '':
		
			default:
				$line = str_replace("$key:","",$line);
				$varname = strtolower($key);
				$this->$varname = $this->clean_string($line);
		
		}
		
			
	}
	function process_child($obj){
		echo "\t".get_class($this)." object processing child of type ".get_class($obj)."\n";
		$this->children[] = $obj;
	}
	function finish(){
		echo "END:tell the ".get_class($this)." object to finish up, pop it off the stack\n";
	
	}
	function clean_string($data){
		$data = str_replace("\\n", "<br />", $data);
		$data = str_replace("\\t", "&nbsp;", $data);
		$data = str_replace("\\r", "<br />", $data);
		$data = str_replace('$', '&#36;', $data);
		$data = stripslashes($data);
		return $data;
	}
}


?>

[PHPiCalendar-Commits] phpicalendar3/functions - New directory

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

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

Log Message:
Directory /cvsroot/phpicalendar/phpicalendar3/functions added to the repository

[PHPiCalendar-Commits] phpicalendar3 parser_tests.php,NONE,1.1

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

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

Added Files:
	parser_tests.php 
Log Message:


--- NEW FILE: parser_tests.php ---
<?php
if (!defined('BASE')) define('BASE', './');

# autoload
function __autoload($class_name) {
 require_once (BASE.'functions/class.'.$class_name . '.php');
}
echo "Starting...<pre>";

require_once (BASE.'functions/init.inc.php');

$settings = new Settings;
$calendar = new Vcalendar;
#print_r($settings);

$parser = new Parser;

# test line folder
if (!$parser->process_file('calendars/Deutsche_Feiertage.ics')) echo 'failed open';

$start = 42929730712;
echo "start:".date("Ymd",strtotime($start))."\n";
echo "end:".date("Ymd", strtotime('+1 day', $start))."\n";


echo "</pre><br>Done!";

?>

[PHPiCalendar-Commits] CVSROOT modules,1.3,1.4

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

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

Modified Files:
	modules 
Log Message:
Added phpicalendar3 module

Index: modules
===================================================================
RCS file: /cvsroot/phpicalendar/CVSROOT/modules,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** modules	15 Mar 2007 05:39:43 -0000	1.3
--- modules	15 Mar 2007 05:40:54 -0000	1.4
***************
*** 26,28 ****
  # spread out over the entire source repository.
  PHPiCalendar phpicalendar/
! PHPiCalendar phpicalendar3/
--- 26,28 ----
  # spread out over the entire source repository.
  PHPiCalendar phpicalendar/
! PHPiCalendar3 phpicalendar3/

[PHPiCalendar-Commits] CVSROOT modules,1.2,1.3

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

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

Modified Files:
	modules 
Log Message:
Added phpicalendar3 module

Index: modules
===================================================================
RCS file: /cvsroot/phpicalendar/CVSROOT/modules,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** modules	20 Jan 2003 04:25:32 -0000	1.2
--- modules	15 Mar 2007 05:39:43 -0000	1.3
***************
*** 26,27 ****
--- 26,28 ----
  # spread out over the entire source repository.
  PHPiCalendar phpicalendar/
+ PHPiCalendar phpicalendar3/

[PHPiCalendar-Commits] phpicalendar/rss rss.php, 1.48, 1.49 rss1.0.php, 1.5, 1.6 rss2.0.php, 1.4, 1.5

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

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

Modified Files:
	rss.php rss1.0.php rss2.0.php 
Log Message:
allow rss link to event popup option

Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** rss.php	16 Feb 2007 06:34:10 -0000	1.48
--- rss.php	16 Feb 2007 07:54:44 -0000	1.49
***************
*** 190,196 ****
  				$rss_title		= urldecode ("$dayofweek: $event_text");
  
! 				if (isset($rss_link_to_event) && $$rss_link_to_event == 'yes'){
! 					$event_data = serialize($val);
! 					$rss_link		= "$default_path/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
  				}else{
  					$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");
--- 190,197 ----
  				$rss_title		= urldecode ("$dayofweek: $event_text");
  
! 				$urlcal 		= rawurlencode ("$cal");
! 				if (isset($rss_link_to_event) && $rss_link_to_event == 'yes'){
! 					$event_data = urlencode(serialize($val));
! 					$rss_link		= "$default_path/includes/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
  				}else{
  					$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");

Index: rss1.0.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss1.0.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** rss1.0.php	16 Feb 2007 06:34:10 -0000	1.5
--- rss1.0.php	16 Feb 2007 07:54:44 -0000	1.6
***************
*** 199,204 ****
  				
  				if (isset($rss_link_to_event) && $$rss_link_to_event == 'yes'){
! 					$event_data = serialize($val);
! 					$rss_link		= "$default_path/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
  				}else{
  					$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");
--- 199,204 ----
  				
  				if (isset($rss_link_to_event) && $$rss_link_to_event == 'yes'){
! 					$event_data = urlencode(serialize($val));
! 					$rss_link		= "$default_path/includes/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
  				}else{
  					$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");

Index: rss2.0.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss2.0.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rss2.0.php	16 Feb 2007 06:34:10 -0000	1.4
--- rss2.0.php	16 Feb 2007 07:54:44 -0000	1.5
***************
*** 201,206 ****
  				$urlcal 		= rawurlencode ("$cal");
  				if (isset($rss_link_to_event) && $$rss_link_to_event == 'yes'){
! 					$event_data = serialize($val);
! 					$rss_link		= "$default_path/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
  				}else{
  					$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");
--- 201,206 ----
  				$urlcal 		= rawurlencode ("$cal");
  				if (isset($rss_link_to_event) && $$rss_link_to_event == 'yes'){
! 					$event_data = urlencode(serialize($val));
! 					$rss_link		= "$default_path/includes/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
  				}else{
  					$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");

[PHPiCalendar-Commits] phpicalendar/includes event.php,1.40,1.41

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

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

Modified Files:
	event.php 
Log Message:
allow rss link to event popup option

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** event.php	16 Feb 2007 06:25:42 -0000	1.40
--- event.php	16 Feb 2007 07:54:43 -0000	1.41
***************
*** 12,17 ****
  }
  
  #$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']);
--- 12,19 ----
  }
  
+ 
+ 
  #$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']);

[PHPiCalendar-Commits] phpicalendar/rss rss.php, 1.47, 1.48 rss1.0.php, 1.4, 1.5 rss2.0.php, 1.3, 1.4

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

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

Modified Files:
	rss.php rss1.0.php rss2.0.php 
Log Message:
allow rss link to event popup option

Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** rss.php	16 Feb 2007 06:25:42 -0000	1.47
--- rss.php	16 Feb 2007 06:34:10 -0000	1.48
***************
*** 189,195 ****
  
  				$rss_title		= urldecode ("$dayofweek: $event_text");
! 				$event_data = serialize($val);
! 				$rss_link		= "$default_path/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
  				if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath";
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
  				
--- 189,202 ----
  
  				$rss_title		= urldecode ("$dayofweek: $event_text");
! 
! 				if (isset($rss_link_to_event) && $$rss_link_to_event == 'yes'){
! 					$event_data = serialize($val);
! 					$rss_link		= "$default_path/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
! 				}else{
! 					$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");
! 
! 				}
  				if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath";
+ 
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
  				

Index: rss1.0.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss1.0.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rss1.0.php	14 Aug 2006 05:57:32 -0000	1.4
--- rss1.0.php	16 Feb 2007 06:34:10 -0000	1.5
***************
*** 197,205 ****
  				/*  Add %20's for spaces for the calendar links to make them valid url's */
  				$urlcal 		= rawurlencode ("$cal");
! 				$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");
! 				if (isset($cpath) && $cpath !=''){
! 					$rss_link .= "&cpath=$cpath";
  				}
  				/* End link modification */
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
  				
--- 197,211 ----
  				/*  Add %20's for spaces for the calendar links to make them valid url's */
  				$urlcal 		= rawurlencode ("$cal");
! 				
! 				if (isset($rss_link_to_event) && $$rss_link_to_event == 'yes'){
! 					$event_data = serialize($val);
! 					$rss_link		= "$default_path/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
! 				}else{
! 					$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");
! 
  				}
+ 				if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath";
  				/* End link modification */
+ 
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
  				

Index: rss2.0.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss2.0.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rss2.0.php	14 Aug 2006 04:48:40 -0000	1.3
--- rss2.0.php	16 Feb 2007 06:34:10 -0000	1.4
***************
*** 200,207 ****
  				/*  Add %20's for spaces for the calendar links to make them valid url's */
  				$urlcal 		= rawurlencode ("$cal");
! 				$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");
! 				if (isset($cpath) && $cpath !=''){
! 					$rss_link .= "&cpath=$cpath";
  				}
  				/* End link modification */
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
--- 200,211 ----
  				/*  Add %20's for spaces for the calendar links to make them valid url's */
  				$urlcal 		= rawurlencode ("$cal");
! 				if (isset($rss_link_to_event) && $$rss_link_to_event == 'yes'){
! 					$event_data = serialize($val);
! 					$rss_link		= "$default_path/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
! 				}else{
! 					$rss_link		=  ("$default_path/day.php?getdate=$thisdate&cal=$urlcal");
! 
  				}
+ 				if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath";
  				/* End link modification */
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.178,1.179

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

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

Modified Files:
	config.inc.php 
Log Message:
allow rss link to event popup option

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** config.inc.php	16 Feb 2007 06:25:42 -0000	1.178
--- config.inc.php	16 Feb 2007 06:34:10 -0000	1.179
***************
*** 27,31 ****
  $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
  $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
! $default_path			= 'http://localhost/phpicalendar'; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
  $charset				= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
  
--- 27,31 ----
  $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
  $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
! $default_path			= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
  $charset				= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
  
***************
*** 34,37 ****
--- 34,38 ----
  $this_months_events 	= 'yes';			// Display "This month's events" at the bottom off the month page.
  $enable_rss				= 'yes';			// Enable RSS access to your calendars (good thing).
+ $rss_link_to_event		= '';				// Set to yes to have links in the feed popup an event window.  Default is to link to day.php
  $show_search			= 'yes';			// Show the search box in the sidebar.
  $allow_preferences		= 'yes';			// Allow visitors to change various preferences via cookies.

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.177,1.178

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

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

Modified Files:
	config.inc.php 
Log Message:
fixes for 1634128 and allow passing event data via request instead of just post

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -d -r1.177 -r1.178
*** config.inc.php	5 Dec 2006 06:27:48 -0000	1.177
--- config.inc.php	16 Feb 2007 06:25:42 -0000	1.178
***************
*** 27,31 ****
  $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
  $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
! $default_path			= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
  $charset				= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
  
--- 27,31 ----
  $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar -- AUTO SETTING -- Only set if you are having cookie issues.
  $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars -- AUTO SETTING -- Only set if you are having subscribe issues.
! $default_path			= 'http://localhost/phpicalendar'; 				// The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar
  $charset				= 'UTF-8';			// Character set your calendar is in, suggested UTF-8, or iso-8859-1 for most languages.
  

[PHPiCalendar-Commits] phpicalendar/includes event.php,1.39,1.40

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

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

Modified Files:
	event.php 
Log Message:
fixes for 1634128 and allow passing event data via request instead of just post

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** event.php	28 Jun 2006 23:30:47 -0000	1.39
--- event.php	16 Feb 2007 06:25:42 -0000	1.40
***************
*** 12,19 ****
  }
  
- 
- 
  #$event 			= $master_array[$_POST['date']][$_POST['time']][decode_popup($_POST['uid'])];
! $event 			= unserialize(stripslashes($_POST['event_data']));
  $organizer 		= unserialize($event['organizer']);
  $attendee 		= unserialize($event['attendee']);
--- 12,17 ----
  }
  
  #$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']);
***************
*** 27,32 ****
  }
  
! $event['description'] 	= stripslashes(urldecode($event['description']));
! $event['event_text'] 	= stripslashes(urldecode($event['event_text']));
  
  if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);
--- 25,31 ----
  }
  
! $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'])));
  
  if ($event['description']) $event['description'] = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$event['description']);

[PHPiCalendar-Commits] phpicalendar/rss rss.php,1.46,1.47

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

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

Modified Files:
	rss.php 
Log Message:
fixes for 1634128 and allow passing event data via request instead of just post

Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** rss.php	14 Nov 2006 07:01:53 -0000	1.46
--- rss.php	16 Feb 2007 06:25:42 -0000	1.47
***************
*** 189,193 ****
  
  				$rss_title		= urldecode ("$dayofweek: $event_text");
! 				$rss_link		= "$default_path/day.php?getdate=$thisdate&cal=$cal";
  				if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath";
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");
--- 189,194 ----
  
  				$rss_title		= urldecode ("$dayofweek: $event_text");
! 				$event_data = serialize($val);
! 				$rss_link		= "$default_path/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data";
  				if (isset($cpath) && $cpath !='') $rss_link.="&cpath=$cpath";
  				$rss_description	= htmlspecialchars ("$dayofweek $event_start: $description");

[PHPiCalendar-Commits] phpicalendar/functions template.php, 1.86, 1.87

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

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

Modified Files:
	template.php 
Log Message:
fix display of status and recur icons

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** template.php	14 Aug 2006 05:57:32 -0000	1.86
--- template.php	5 Dec 2006 08:40:18 -0000	1.87
***************
*** 447,453 ****
   								$event_calno  	= $this_time_arr[$uid]['calnumber'];
   								$event_status	= strtolower($this_time_arr[$uid]['status']);
  								$event_calno = (($event_calno - 1) % $unique_colors) + 1;
  								if ($event_status != '') {
! 						  			$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
  						  		}
  								$colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth);
--- 447,456 ----
   								$event_calno  	= $this_time_arr[$uid]['calnumber'];
   								$event_status	= strtolower($this_time_arr[$uid]['status']);
+  								$event_recur = $this_time_arr[$uid]['recur'];
  								$event_calno = (($event_calno - 1) % $unique_colors) + 1;
+ 								$confirmed = '';
+ 						  		if (is_array($event_recur)) $confirmed .= '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
  								if ($event_status != '') {
! 						  			$confirmed .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
  						  		}
  								$colspan_width = round((80 / $nbrGridCols[$thisday]) * $drawWidth);
***************
*** 667,675 ****
   						  $event_status = strtolower($this_time_arr[$uid]['status']);
  						  $event_calno  = (($event_calno - 1) % $unique_colors) + 1;
! 						  if ($event_status != '') {
! 						  	$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
! 						  } elseif (is_array($event_recur)) {
! 						  	$confirmed = '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
! 						  }
  						  $colspan_width = round((460 / $nbrGridCols) * $drawWidth);
  						  $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" width="'.$colspan_width.'" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
--- 670,676 ----
   						  $event_status = strtolower($this_time_arr[$uid]['status']);
  						  $event_calno  = (($event_calno - 1) % $unique_colors) + 1;
! 						  $confirmed = '';
! 						  if (is_array($event_recur)) $confirmed .= '<img src="images/recurring.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
! 						  if ($event_status != '') $confirmed .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0" />&nbsp;';
  						  $colspan_width = round((460 / $nbrGridCols) * $drawWidth);
  						  $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" width="'.$colspan_width.'" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";

[PHPiCalendar-Commits] phpicalendar README,1.105,1.106

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

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

Modified Files:
	README 
Log Message:
update README

Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** README	14 Nov 2006 07:05:07 -0000	1.105
--- README	5 Dec 2006 06:50:42 -0000	1.106
***************
*** 83,86 ****
--- 83,88 ----
  --------
  cvs
+ 	Patch to allow parsing of MS-Outlook generated ics files where line continuation uses tab instead of space.
+ 2.23rc1
  	Change parsing of timezones to accommodate extra text from Mozilla and other calendars
  	Move getdate to init.inc.php.

[PHPiCalendar-Commits] phpicalendar/functions ical_parser.php, 1.217, 1.218

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

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

Modified Files:
	ical_parser.php 
Log Message:
patch for MS outlook line continuations

Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.217
retrieving revision 1.218
diff -C2 -d -r1.217 -r1.218
*** ical_parser.php	14 Nov 2006 07:00:51 -0000	1.217
--- ical_parser.php	5 Dec 2006 06:40:44 -0000	1.218
***************
*** 134,138 ****
  			$nextline = fgets($ifile, 1024);
  			$nextline = ereg_replace("[\r\n]", "", $nextline);
! 			while (substr($nextline, 0, 1) == " ") {
  				$line = $line . substr($nextline, 1);
  				$nextline = fgets($ifile, 1024);
--- 134,139 ----
  			$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 ($nextline{0} == " " || $nextline{0} == "\t") { 
  				$line = $line . substr($nextline, 1);
  				$nextline = fgets($ifile, 1024);

[PHPiCalendar-Commits] phpicalendar config.inc.php,1.176,1.177

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

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

Modified Files:
	config.inc.php 
Log Message:
synch with jh local copy

Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** config.inc.php	11 Nov 2006 20:25:36 -0000	1.176
--- config.inc.php	5 Dec 2006 06:27:48 -0000	1.177
***************
*** 1,5 ****
  <?php
  
! // Configuration file for PHP iCalendar 2.0
  //
  // To set values, change the text between the single quotes
--- 1,5 ----
  <?php
  
! // Configuration file for PHP iCalendar 2.23rc1
  //
  // To set values, change the text between the single quotes

[PHPiCalendar-Commits] phpicalendar/functions init.inc.php, 1.105, 1.106

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

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

Modified Files:
	init.inc.php 
Log Message:
fix bug 1558936

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** init.inc.php	14 Nov 2006 07:00:51 -0000	1.105
--- init.inc.php	14 Nov 2006 07:38:14 -0000	1.106
***************
*** 50,54 ****
  #set up specific webcals for a particular cpath
  if (is_array($more_webcals[$cpath])){
! 	array_merge($list_webcals, $more_webcals["$cpath"]);
  }
  include_once(BASE.'error.php');
--- 50,54 ----
  #set up specific webcals for a particular cpath
  if (is_array($more_webcals[$cpath])){
! 	$list_webcals = array_merge($list_webcals, $more_webcals["$cpath"]);
  }
  include_once(BASE.'error.php');

[PHPiCalendar-Commits] phpicalendar/languages slovensko.inc.php, NONE, 1.1

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

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

Added Files:
	slovensko.inc.php 
Log Message:
add slovene language file

--- NEW FILE: slovensko.inc.php ---
<?php

// English language include
// For version 2.0 PHP iCalendar
//
// Translation by Mitja podpecan (mi...@ha...)
//
// Submit new translations to php...@gm...

$lang['l_day'] 				= 'Dan';
$lang['l_week'] 			= 'Teden';
$lang['l_month'] 			= 'Mesec';
$lang['l_year'] 			= 'Leto';
$lang['l_calendar'] 		= 'Koledar';
$lang['l_next_day'] 		= 'Naslednji dan';
$lang['l_next_month'] 		= 'Naslednji mesec';
$lang['l_next_week'] 		= 'Naslednji teden';
$lang['l_next_year'] 		= 'Naslednje leto';
$lang['l_last_day'] 		= 'Prejšnji dan';
$lang['l_last_month'] 		= 'Prejšnji mesec';
$lang['l_last_week'] 		= 'Prejšnji teden';
$lang['l_last_year'] 		= 'Prejšnje leto';
$lang['l_subscribe'] 		= 'Naroči se';
$lang['l_download'] 		= 'Prenesi';
$lang['l_powered_by'] 		= 'Poganja';
$lang['l_event'] 			= 'Dogodek';
$lang['l_event_start'] 		= 'Pričetek ob';
$lang['l_event_end'] 		= 'Konec ob';
$lang['l_this_months'] 		= 'Dogodki v tem mesecu';
$lang['l_date'] 			= 'Datum';
$lang['l_summary'] 			= 'Povzetek';
$lang['l_all_day'] 			= 'Celodnevni dogodek';
$lang['l_notes'] 			= 'Beležke';
$lang['l_this_years'] 		= 'Letošnji dogodki';
$lang['l_today'] 			= 'Danes';
$lang['l_this_week'] 		= 'Ta teden';
$lang['l_this_month'] 		= 'Ta mesec';
$lang['l_jump'] 			= 'Skoči na';
$lang['l_tomorrows'] 		= 'Jutrišnji dogodki';
$lang['l_goday'] 			= 'Pojdi na dan';
$lang['l_goweek'] 			= 'Pojdi na ta teden';
$lang['l_gomonth'] 			= 'Pojdi na ta mesec';
$lang['l_goyear'] 			= 'Pojdi na to leto';
$lang['l_search'] 			= 'Išči'; // the verb
$lang['l_results'] 			= 'Rezultati iskanja';
$lang['l_pick_multiple'] 	= 'Izberi več';
$lang['l_query'] 			= 'Niz'; // will be followed by the search query
$lang['l_no_results'] 		= 'Ni dogodkov';
$lang['l_goprint'] 			= 'Natisni';
$lang['l_time'] 			= 'Čas';
$lang['l_summary'] 			= 'Povezetek';
$lang['l_description'] 		= 'Opis';
$lang['l_this_site_is']		= 'Ta spletna stran podpira';
$lang['l_no_events_day']	= 'Danes ni dogodkov.';
$lang['l_no_events_week']	= 'V tem tednu ni dogodkov.';
$lang['l_no_events_month']	= 'V tem mesecu ni dogodkov.';
$lang['l_rss_day_date']		= 'G:i';  // Lists just the time
$lang['l_rss_week_date	']	= '%e. %b';  // Lists just the day
$lang['l_rss_month_date	']	= '%e. %b';  // Lists just the day
$lang['l_rss_language']		= 'sl-SL';
$lang['l_search_took']		= 'Iskanje je trajalo %s sekund';
$lang['l_recurring_event']	= 'Ponavljajoč dogodek';
$lang['l_exception']		= 'Izjema';
$lang['l_no_query']			= 'Niz ni vnešen';
$lang['l_preferences']		= 'Nastavitve';
$lang['l_printer']			= 'Tiskalnik';
$lang['l_select_lang']		= 'Izberi privzeti jezik';
$lang['l_select_cal']		= 'Izberi privzeti koledar';
$lang['l_select_view']		= 'Izberi privzeti prikaz';
$lang['l_select_time']		= 'Izberi pričetek dneva';
$lang['l_select_day']		= 'Izberi pričetek tedna';
$lang['l_select_style']		= 'Izberi privzeti stil';
$lang['l_set_prefs']		= 'Shrani';
$lang['l_completed_date']	= 'Dokončano dne';
$lang['l_completed']		= 'Dokončano';
$lang['l_created']			= 'Ustvarjeno';
$lang['l_due']				= 'Zapade';
$lang['l_priority']			= 'Prioriteta';
$lang['l_priority_high']	= 'Visoka';
$lang['l_priority_low']		= 'Nizka';
$lang['l_priority_medium']	= 'Srednja';
$lang['l_priority_none']	= 'Brez';
$lang['l_status']			= 'Stanje';
$lang['l_status_confirmed'] = 'POTRJENO' ; 
$lang['l_status_cancelled'] = 'PREKLICANO'; 
$lang['l_status_tentative'] = 'NEPOTRJENO'; 
$lang['l_todo']				= 'Opravki';
$lang['l_unfinished']		= 'Neopravljeno';
$lang['l_prefs_set'] 		= 'Nastavitve so shranjene.';
$lang['l_prefs_unset'] 		= 'Nastavitve bodo učinkovale ob osvežitvi strani';
$lang['l_unset_prefs'] 		= 'Nastavitve odstranjene.';
$lang['l_organizer']		= 'Osebni koledar';
$lang['l_attendee']			= 'Udeleženec';
$lang['l_location']			= 'Kraj';
$lang['l_admin_header']		= 'PHP iCalendar administracijna';
$lang['l_username']			= 'Uporabniško ime';
$lang['l_password']			= 'Geslo';
$lang['l_login']			= 'Prijava';
$lang['l_invalid_login']	= 'Napačno porabniško ime ali geslo.';
$lang['l_addupdate_cal']	= 'Dodaj ali osveži koledar';
$lang['l_addupdate_desc']	= 'Dodaj ali osveži koledar s prenosom datoteke na strežnik.';
$lang['l_delete_cal']		= 'Odstrani koledar';
$lang['l_logout']			= 'Odjava';
$lang['l_cal_file']			= 'Koledar datoteka';
$lang['l_php_error']		= 'PHP napaka';
$upload_error_gen_lang		= 'Napaka pri prenosu na strežnik.';
$upload_error_lang[0]		= 'Napaka pri prenosu na strežnik.';
$upload_error_lang[1]		= 'Datoteka, ki jo poskušate prenesti je prevelika.';
$upload_error_lang[2]		= 'Datoteka, ki jo poskušate prenesti je prevelika.';
$upload_error_lang[3]		= 'Datoteka je bila le delno prenešena.';
$upload_error_lang[4]		= 'Izberite datoteko za prenos.';
$lang['l_upload_error_type'] = 'Prenesti je mogoče le .ics datoteke.';
$lang['l_copy_error']			= 'Napaka pri kopiranju datoteke.';
$lang['l_delete_error']			= 'Napaka  pri odstranjevanju datoteke.';
$lang['l_delete_success']		= 'je bila uspešno izbrisana.';
$lang['l_action_success']		= 'Dejanje je bilo uspešno izvršeno.';
$lang['l_submit']				= 'Pošlji';
$lang['l_delete']				= 'Odstrani';
$all_cal_comb_lang			= 'Vsi koledarji';

// New for 2.0
$lang['l_legend']			= 'Legenda';
$lang['l_admin_subhead']	= 'Urejaj koledarje s te strani';
$lang['l_prefs_subhead']	= 'Določi piškotek za obiskovanje te strani';
$lang['l_rss_info']			= 'RSS informacije';
$lang['l_rss_subhead']		= 'Osnovna RSS podaja na voljo za vsak koledar';
$lang['l_rss_enabled']	= 'RSS omogočen';
$lang['l_rss_notenabled']	= 'RSS za to stran ni omogočen';

// - navigation
$lang['l_back'] 		= 'Nazaj';
$lang['l_next'] 		= 'Naprej';
$lang['l_prev'] 		= 'Prejšnji';
$lang['l_day_view'] 	= 'Pokaži dan';
$lang['l_week_view'] 	= 'Pokaži teden';
$lang['l_month_view'] 	= 'Pokaži mesec';
$lang['l_year_view'] 	= 'Pokaži leto';

// ---------------------------------


// $format_recur, items enclosed in % will be substituted with variables
$format_recur_lang['delimiter']	= ', ';								// ie, 'one, two, three'

$format_recur_lang['yearly']		= array('leto','let');		// for these, put singular
$format_recur_lang['monthly']		= array('mesec','mesecev');		// and plural forms
$format_recur_lang['weekly']		= array('teden','tednov');		// these will be %freq%
$format_recur_lang['daily']			= array('dan','dni');			// in the replacement below
$format_recur_lang['hourly']		= array('uro','ur');
$format_recur_lang['minutely']		= array('minuta','minut');
$format_recur_lang['secondly']		= array('sekunda','sekund');

$format_recur_lang['start']			= 'Vsak %int% %freq% %for%';	// ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
$format_recur_lang['until']			= 'do %date%';				// ie, 'until January 4'
$format_recur_lang['count']			= '%int%';		// ie, 'for 5 times'

$format_recur_lang['bymonth']		= 'V mesecih: %list%';			// ie, 'In months: January, February, March'
$format_recur_lang['bymonthday']	= 'Na datum: %list%';			// ie, 'On dates: 1, 2, 3, 4'
$format_recur_lang['byday']			= 'Na dan: %list%';			// ie, 'On days: Mon, Tues, Wed, Thurs'

// ---------------------------------

$daysofweek_lang			= array ('nedelja','ponedeljek','torek','sreda','četrtek','petek','sobota');
$daysofweekshort_lang		= array ('ned','pon','tor','sre','čet','pet','sob');
$daysofweekreallyshort_lang	= array ('n','p','t','s','č','p','s');
$monthsofyear_lang			= array ('januar','februar','marec','april','maj','junij','julij','avgust','september','oktober','november','december');
$monthsofyearshort_lang		= array ('jan','feb','mar','apr','maj','jun','jul','avg','sep','okt','nov','dec');

// 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, %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_*
	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'] 			= 'Napaka!';
$lang['l_error_window'] 		= 'Prišlo je do napake!';
$lang['l_error_calendar'] 		= 'Do napake je prišlo pri delu s koledarjem "%s".';
$lang['l_error_path'] 			= 'Nemogoče odpreti pot: "%s"';
$lang['l_error_back'] 			= 'Prosim uporabite gumb "Nazaj", da bi poskusili znova.';
$lang['l_error_remotecal'] 		= 'Strežnik blokira koledarje, ki niso bili odobreni.';
$lang['l_error_restrictedcal'] 	= 'Nimate dostopa do tega koledarja.';
$lang['l_error_invalidcal'] 	= 'Naveljavna koledar datoteka. Poskusite drug koledar.';
$lang['l_error_cantopen'] 		= 'Ni mogoče odpreti koledarja.';
$lang['l_error_cache']			= 'Ni mogoče pisati v mapo trenutneka pomnilnika. Preverite konfiguracijo.';

?>

[PHPiCalendar-Commits] phpicalendar README,1.104,1.105

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

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

Modified Files:
	README 
Log Message:
update README

Index: README
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/README,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** README	12 Nov 2006 08:12:21 -0000	1.104
--- README	14 Nov 2006 07:05:07 -0000	1.105
***************
*** 83,87 ****
  --------
  cvs
! 	Fix parsing of timezones to accommodate extra text from Mozilla and other calendars
  	Bug fixes
  		Fixed error in german language file
--- 83,89 ----
  --------
  cvs
! 	Change parsing of timezones to accommodate extra text from Mozilla and other calendars
! 	Move getdate to init.inc.php.
! 	Change date calcs so that rss feeds can list events across more than one year.
  	Bug fixes
  		Fixed error in german language file

[PHPiCalendar-Commits] phpicalendar/rss rss.php,1.45,1.46

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

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

Modified Files:
	rss.php 
Log Message:
rollback rss.php error introduced in debugging

Index: rss.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** rss.php	14 Nov 2006 07:00:51 -0000	1.45
--- rss.php	14 Nov 2006 07:01:53 -0000	1.46
***************
*** 112,116 ****
  }	
  $filemodtime = date("r", $filemod);
! /*
  //send relevant headers
  header ("Last-Modified: $filemodtime");
--- 112,116 ----
  }	
  $filemodtime = date("r", $filemod);
! 
  //send relevant headers
  header ("Last-Modified: $filemodtime");