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

[<ze...@us...>]

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

Modified Files:
	class.Settings.php class.Vtimezone.php class.Standard.php 
	class.Vfreebusy.php class.iCalObj.php class.Parser.php 
	class.Vtodo.php class.Valarm.php class.Daylight.php 
	init.inc.php class.Vevent.php class.Vcalendar.php 
	class.Vjournal.php 
Log Message:
Changed/added documentation comments as per PHPdocumentor specs (http://www.phpdoc.org).  Added skeletons of documentation comments for all files, classes, and functions where none existed before.  

Minor code style adjustments:
	* added space before opening braces
	* moved closing php tag "?>" to the same line as the closing brace of the class, since version3 of this project is OO and has only one class per file

Index: class.Settings.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Settings.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Settings.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Settings.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,15 ****
  <?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'
--- 1,30 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  * @todo	Add methods to: 1) overwrite from config.inc.php; 2) read from 
!  *			cookie; and 3) set cookie
!  */
! /**
!  * [Optional short description of this class]
!  * 
!  * [Optional long description of this class]
!  *
!  */
! class Settings {
  		
! 	/**
! 	 * Constructs a new Settings object with defaults.
! 	 * 
! 	 * Optional long description.
! 	 *
! 	 * @access public
! 	 */
! 	function Settings() {
  		$this->template 				= 'default';						// Template support
  		$this->default_view 			= 'day';							// Default view for calendars = 'day', 'week', 'month', 'year'
***************
*** 78,81 ****
--- 93,97 ----
  		
  		// 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
***************
*** 88,99 ****
  		$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
! ?>
\ No newline at end of file
--- 104,118 ----
  		$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
  	}
  	
  	
+ 	/**
+ 	 * Sets the language.
+ 	 *
+ 	 * @access public
+ 	 */
+ 	function setLang() {
+ 		
  	}
  
! } ?>
\ No newline at end of file

Index: class.Vtimezone.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Vtimezone.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Vtimezone.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Vtimezone.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,14 ****
  <?php
! /*=====================class.Vtimezone.php=====================
! 
! This class is for calendars.
! 
! */
  class Vtimezone extends iCalObj{
- 
- 	function Vtimezone(){
  	
! 	}
  
! }
! ?>
\ No newline at end of file
--- 1,24 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * This class is for calendars.
!  */
  class Vtimezone extends iCalObj{
  	
! 	
! 	/**
! 	 * Creates a new Vtimezone object.
! 	 *
! 	 * @access public
! 	 */
! 	function Vtimezone() {}
  
! } ?>
\ No newline at end of file

Index: class.Standard.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Standard.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Standard.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Standard.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,14 ****
  <?php
! /*=====================class.Standard.php=====================
! 
! This class is for calendars.
! 
! */
! class Standard extends Vtimezone{
! 
! 	function Standard(){
  	
  	}
  
! }
! ?>
\ No newline at end of file
--- 1,30 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * This class is for calendars.
!  * 
!  * [Optional long description of this class]
!  *
!  */
! class Standard extends Vtimezone {
! 	
! 	/**
! 	 * Constructs a new Standard object.
! 	 * 
! 	 * Optional long description.
! 	 *
! 	 * @access public
! 	 */
! 	function Standard() {
  	
  	}
  
! } ?>
\ No newline at end of file

Index: class.Vfreebusy.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Vfreebusy.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Vfreebusy.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Vfreebusy.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,14 ****
  <?php
! /*=====================class.Vfreebusy.php=====================
! 
! This class is for calendars.
! 
! */
! class Vfreebusy extends iCalObj{
  
- 	function Vfreebusy(){
  	
! 	}
  
! }
! ?>
\ No newline at end of file
--- 1,27 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * This class is for calendars.
!  * 
!  * [Optional long description of this class]
!  *
!  */
! class Vfreebusy extends iCalObj {
  
  	
! 	/**
! 	 * Creates a new Vfreebusy object.
! 	 *
! 	 * @access public
! 	 */
! 	function Vfreebusy() {}
  
! } ?>
\ No newline at end of file

Index: class.iCalObj.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.iCalObj.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.iCalObj.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.iCalObj.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,10 ****
  <?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
--- 1,21 ----
  <?php
! /**
!  * Refactoring of the ical parser in phpicalendar to make the code more maintainable
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * Base class for icalendar objects. Some methods used by all, others only for timed events.
!  * 
!  * [Optional long description of this class]
!  *
!  * @todo Since version3 of this project is OO, is it necessary for this class
!  *		to have the 'Obj' suffix at the end of its name?   
!  *
!  */
! class iCalObj {
  
  #	var $var; # comment
***************
*** 12,34 ****
  		$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 '':
  		
--- 23,59 ----
  		$children; # comment
  
! 	/** 
! 	 * Creates a new iCalObj.
! 	 * 
! 	 * @access public
! 	 */
! 	function iCalObj() {
  		$this->children = array();
  	}
  	
! 	/**
! 	 * Process a line.
! 	 *
! 	 * The parser makes passes as follows:
! 	 * 
! 	 *		key - everything before the first colon or semicolon
! 	 *		line - the whole line
! 	 * 
! 	 * From the icalendar spec page 13:
! 	 * contentline        = name *(";" param ) ":" value CRLF
! 	 *
! 	 * @example
! 	 * 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.
! 	 *
! 	 * @access public
! 	 */
! 	function process_line($key, $line) {
  		echo "\tfeed key= $key line=$line to the object of type ".get_class($this)."\n";
  		
! 		switch ($key)
! 		{
  			case '':
  		
***************
*** 37,54 ****
  				$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);
--- 62,96 ----
  				$varname = strtolower($key);
  				$this->$varname = $this->clean_string($line);
! 		}	
  	}
! 	
! 	
! 	/**
! 	 * @access public
! 	 */
! 	function process_child($obj) {
  		echo "\t".get_class($this)." object processing child of type ".get_class($obj)."\n";
  		$this->children[] = $obj;
  	}
  	
+ 	
+ 	/**
+ 	 * Writes a string which "tells" the calling object to finish and pop it from the stack.
+ 	 *
+ 	 * @access public
+ 	 */
+ 	function finish() {
+ 		echo "END:tell the ".get_class($this)." object to finish up, pop it off the stack.\n";
  	}
! 	
! 	
! 	/**
! 	 * Cleans a string for use as HTML.
! 	 *
! 	 * @access public
! 	 * @param string $data The data to be transformed to HTML.
! 	 * @return string The $data with several HTML search-and-replacements performed.
! 	 */
! 	function clean_string($data) {
  		$data = str_replace("\\n", "<br />", $data);
  		$data = str_replace("\\t", "&nbsp;", $data);
***************
*** 58,63 ****
  		return $data;
  	}
- }
  
! 
! ?>
\ No newline at end of file
--- 100,103 ----
  		return $data;
  	}
  
! } ?>
\ No newline at end of file

Index: class.Parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Parser.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Parser.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Parser.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,17 ****
  <?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 
--- 1,27 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * 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 
***************
*** 21,135 ****
  		$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
! ?>
\ No newline at end of file
--- 31,218 ----
  		$mArray;	#	temporary master array entries
  		
! 	
! 	/**
! 	 * Constructs a new Parser object.
! 	 * 
! 	 * Optional long description.
! 	 *
! 	 * @access public
! 	 */
! 	function Parser() {
  		$this->lookahead = '';
! 	} // end constructor
  	
! 	
! 	/**
! 	 * Sets the calendar to be parsed.
! 	 *
! 	 * @access public
! 	 */
! 	function set_cal($cal) {
  		$this->cal = $cal;
! 	} // end function set_cal()
  
! 
! 	/**
! 	 * Processes the calendar set for the calling Parser object.
! 	 *
! 	 * @access public
! 	 */
! 	function process_cal() {
  		process_file($this->cal->filename);
! 	} // end function process_cal()
! 	
! 	
! 	/**
! 	 * Processes the specified file.
! 	 * 
! 	 * 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.
! 	 *
! 	 * @access public
! 	 * @param string $filename The name of the file to be processed.
! 	 * @return mixed
! 	 *		Returns true if file was processed successfully, or
! 	 *		an error string. 
! 	 *				
! 	 * @todo	Instead of returning an error string, implement Exception handling.
! 	 */ 
! 	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;
! 	} // end function process_file()
  	
! 	
! 	/**
! 	 * Opens a file.
! 	 *
! 	 * @access public
! 	 * @return bool Returns whether or not the file handle was opened successfully.
! 	 */
! 	function open_file($filename) {
  		$this->fh = fopen("./".$filename, "r");
! 		return ($this->fh == FALSE) ? false : true;
! 	} // end function open_file() 
  	
! 	
! 	/**
! 	 * Takes a filehandle and folds multiple line input to $this->line.
! 	 *
! 	 * @access public
! 	 * @return string A trim()ed $tmp_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 function read_line()
  
! } ?>
\ No newline at end of file

Index: class.Vtodo.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Vtodo.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Vtodo.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Vtodo.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,14 ****
  <?php
! /*=====================class.Vtodo.php=====================
! 
! This class is for calendars.
! 
! */
! class Vtodo extends iCalObj{
  
- 	function Vtodo(){
  	
! 	}
  
! }
! ?>
\ No newline at end of file
--- 1,24 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * This class is for calendars.
!  */
! class Vtodo extends iCalObj {
  
  	
! 	/**
! 	 * Creates a new Vtodo object.
! 	 * 
! 	 * @access public 
! 	 */
! 	function Vtodo() {}
  
! } ?>
\ No newline at end of file

Index: class.Valarm.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Valarm.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Valarm.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Valarm.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,14 ****
  <?php
! /*=====================class.Valarm.php=====================
! 
! This class is for events.
! 
! */
! class Valarm extends iCalObj{
! 
! 	function Valarm(){
  	
  	}
  
! }
! ?>
\ No newline at end of file
--- 1,30 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * This class is for events.
!  * 
!  * [Optional long description of this class]
!  *
!  */
! class Valarm extends iCalObj {
! 	
! 	/**
! 	 * Constructs a new Valarm object.
! 	 * 
! 	 * Optional long description.
! 	 *
! 	 * @access public
! 	 */
! 	function Valarm() {
  	
  	}
  
! } ?>
\ No newline at end of file

Index: class.Daylight.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Daylight.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Daylight.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Daylight.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,14 ****
  <?php
! /*=====================class.Daylight.php=====================
! 
! This class is for calendars.
! 
! */
! class Daylight extends Vtimezone{
! 
! 	function Daylight(){
  	
  	}
  
! }
! ?>
\ No newline at end of file
--- 1,31 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.  This class is for calendars.
!  *
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * [Optional short description of this class]
!  * 
!  * [Optional long description of this class]
!  *
!  */
! class Daylight extends Vtimezone {
! 	
! 	/**
! 	 * Constructs a new Daylight object.
! 	 * 
! 	 * Optional long description.
! 	 *
! 	 * @access public
! 	 */
! 	function Daylight() {
  	
  	}
  
! } ?>
\ No newline at end of file

Index: init.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/init.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** init.inc.php	16 Mar 2007 02:36:05 -0000	1.1
--- init.inc.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,19 ****
  <?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
! 
! */
! 
! 
  
  
--- 1,16 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.  An optional short description should go here.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  * 
!  * @todo Need to set configurations (paths, languages, templates, behaviors)
!  * @todo calendar list
!  * @todo range of dates to process
!  */
  
  

Index: class.Vevent.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Vevent.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Vevent.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Vevent.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,14 ****
  <?php
! /*=====================class.Vevent.php=====================
! 
! This class is for events.
! 
! */
! class Vevent extends iCalObj{
! 
! 	function Vevent(){
  	
! 	}
  
! }
! ?>
\ No newline at end of file
--- 1,27 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * This class is for Events.
!  * 
!  * [Optional long description of this class]
!  *
!  */
! class Vevent extends iCalObj {
  	
! 	
! 	/**
! 	 * Creates a new Vevent object.
! 	 * 
! 	 * @access public
! 	 */
! 	function Vevent() {}
  
! } ?>
\ No newline at end of file

Index: class.Vcalendar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Vcalendar.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Vcalendar.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Vcalendar.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,14 ****
  <?php
! /*=====================class.Vcalendar.php=====================
! 
! This class is for calendars.
! 
! */
! class Vcalendar extends iCalObj{
! 
! 	function Vcalendar(){
  	
  	}
  
! }
! ?>
\ No newline at end of file
--- 1,30 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * This class is for calendars.
!  * 
!  * [Optional long description of this class]
!  *
!  */
! class Vcalendar extends iCalObj {
! 	
! 	/**
! 	 * Constructs a new Vcalendar object.
! 	 * 
! 	 * Optional long description.
! 	 *
! 	 * @access public
! 	 */
! 	function Vcalendar() {
  	
  	}
  
! } ?>
\ No newline at end of file

Index: class.Vjournal.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar3/functions/class.Vjournal.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** class.Vjournal.php	16 Mar 2007 02:30:35 -0000	1.1
--- class.Vjournal.php	9 Apr 2007 13:02:13 -0000	1.2
***************
*** 1,14 ****
  <?php
! /*=====================class.Vjournal.php=====================
! 
! This class is for calendars.
! 
! */
! class Vjournal extends iCalObj{
  
- 	function Vjournal(){
  	
! 	}
  
! }
! ?>
\ No newline at end of file
--- 1,27 ----
  <?php
! /**
!  * File DocBlock.  Documentation here applies to classes, functions, etc. contained in this file,
!  * unless overridden below.
!  * 
!  * @author
!  * @since
!  * @package		
!  * @subpackage
!  */
! /**
!  * This class is for calendars.
!  * 
!  * [Optional long description of this class]
!  *
!  */
! class Vjournal extends iCalObj {
  
  	
! 	/**
! 	 * Creates a new Vjournal object.
! 	 * 
! 	 * @access public
! 	 */
! 	function Vjournal() {}
  
! } ?>
\ No newline at end of file