From 78a4cf2fa82d62b38b3733c155dfb4576f701778 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 3 Jan 2008 02:22:29 +0000
Subject: [PATCH] New: Ajout d'un lien export de l'agenda webcalendar au format
 ical et vcal

---
 htdocs/lib/xcal.lib.php        | 58 +++++++++++++++++++++++-----------
 htdocs/webcal/webcal.class.php |  7 +++-
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/htdocs/lib/xcal.lib.php b/htdocs/lib/xcal.lib.php
index ffa816b3be9..b555a9ea67e 100644
--- a/htdocs/lib/xcal.lib.php
+++ b/htdocs/lib/xcal.lib.php
@@ -51,12 +51,10 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile,$fi
 		fwrite($calfileh,"VERSION:2.0\n");
 		fwrite($calfileh,"METHOD:PUBLISH\n");
 		fwrite($calfileh,"PRODID:-//DOLIBARR ".DOL_VERSION."//EN\n");
+		fwrite($calfileh,"CALSCALE:GREGORIAN\n");
 		fwrite($calfileh,"X-WR-CALNAME:".utf8_encode($title)."\n");
 		fwrite($calfileh,"X-WR-CALDESC:".utf8_encode($desc)."\n");
-		/*
-		X-WR-TIMEZONE:Europe/Paris
-		CALSCALE:GREGORIAN
-		*/
+		//fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
 		
 		foreach ($events_array as $date => $event)
 		{
@@ -72,16 +70,17 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile,$fi
 			{
 				// See http://fr.wikipedia.org/wiki/ICalendar for format
 				//$uid 		= dolibarr_print_date($now,'dayhourxcard').'-'.$event['uid']."-export@".$_SERVER["SERVER_NAME"];
-				$uid 		= $event['uid'];
-				$type       = $event['type'];
-				$startdate	= $event['startdate'];
-				$duration	= $event['duration'];
-				$enddate	= $event['enddate'];
-				$summary	= $event['summary'];
-				$category	= $event['category'];
-				$location	= $event['location'];
-				$email 		= $event['email'];
-				$url		= $event['url'];
+				$uid 		  = $event['uid'];
+				$type         = $event['type'];
+				$startdate	  = $event['startdate'];
+				$duration	  = $event['duration'];
+				$enddate	  = $event['enddate'];
+				$summary  	  = $event['summary'];
+				$category	  = $event['category'];
+				$location	  = $event['location'];
+				$email 		  = $event['email'];
+				$url		  = $event['url'];
+				$transparency = $event['transparency'];
 				$description=eregi_replace('<br[ \/]?>',"\n",$event['desc']);
  				$description=clean_html($description,0);	// Remove html tags
 
@@ -114,11 +113,31 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile,$fi
 					
 					fwrite($calfileh,"SUMMARY:".$encoding.$summary."\n");
 					fwrite($calfileh,"DESCRIPTION:".$encoding.$description."\n");
-					//fwrite($calfileh,'STATUS:CONFIRMED'."\n");	// TENTATIVE, CONFIRMED, CANCELLED
-					fwrite($calfileh,"CATEGORIES:".$category."\n");
-					fwrite($calfileh,"LOCATION:".$location."\n");
-					fwrite($calfileh,"TRANSP:OPAQUE\n");
-					fwrite($calfileh,"CLASS:CONFIDENTIAL\n");
+					//fwrite($calfileh,'STATUS:CONFIRMED'."\n");
+					/*
+					statvalue  = "TENTATIVE"           ;Indicates event is
+				                                        ;tentative.
+				                / "CONFIRMED"           ;Indicates event is
+				                                        ;definite.
+				                / "CANCELLED"           ;Indicates event was
+				                                        ;cancelled.
+				        ;Status values for a "VEVENT"
+
+				     statvalue  =/ "NEEDS-ACTION"       ;Indicates to-do needs action.
+				                / "COMPLETED"           ;Indicates to-do completed.
+				                / "IN-PROCESS"          ;Indicates to-do in process of
+				                / "CANCELLED"           ;Indicates to-do was cancelled.
+				        ;Status values for "VTODO".
+
+				     statvalue  =/ "DRAFT"              ;Indicates journal is draft.
+				                / "FINAL"               ;Indicates journal is final.
+				                / "CANCELLED"           ;Indicates journal is removed.
+							;Status values for "VJOURNAL".
+					*/
+					if (! empty($category)) fwrite($calfileh,"CATEGORIES:".$category."\n");
+					if (! empty($location)) fwrite($calfileh,"LOCATION:".$location."\n");
+					//fwrite($calfileh,"TRANSP:".$transparency."\n");
+					//fwrite($calfileh,"CLASS:PUBLIC\n");				// PUBLIC, PRIVATE, CONFIDENTIAL
 					fwrite($calfileh,"DTSTAMP:".dolibarr_print_date($now,'dayhourxcard')."\n");
 					$startdatef = dolibarr_print_date($startdate,'dayhourxcard');
 					fwrite($calfileh,"DTSTART:".$startdatef."\n");
@@ -130,6 +149,7 @@ function build_calfile($format='vcal',$title,$desc,$events_array,$outputfile,$fi
 				
 				// Output the vCard/iCal VTODO object
 				// ...
+				//PERCENT-COMPLETE:39
 
 				// Output the vCard/iCal VJOURNAL object
 				if ($type == 'journal')
diff --git a/htdocs/webcal/webcal.class.php b/htdocs/webcal/webcal.class.php
index 160c4e18288..294f86cc2fe 100644
--- a/htdocs/webcal/webcal.class.php
+++ b/htdocs/webcal/webcal.class.php
@@ -234,7 +234,7 @@ class Webcal {
 					
 					// 'eid','startdate','duration','enddate','title','summary','category','email','url','desc','author'
 					$event=array();
-					$event['uid']='dolibarrwebcal-'.$this->localdb->database_name.'-'.$obj->cal_id."-export@".$_SERVER["SERVER_NAME"];
+					$event['uid']='dolibarrwebcal-'.$this->localdb->database_name.'-'.$obj->cal_id."@".$_SERVER["SERVER_NAME"];
 					$event['type']=$type;
 					$date=$obj->cal_date;
 					$time=$obj->cal_time;
@@ -260,6 +260,11 @@ class Webcal {
 					$event['summary']=$obj->cal_name;
 					$event['desc']=$obj->cal_description;
 					$event['author']=$obj->cal_create_by;
+					$event['transparency']='TRANSPARENT';		// TRANSPARENT or OPAQUE
+					$url=$conf->global->PHPWEBCALENDAR_URL;
+					if (! eregi('\/$',$url)) $url.='/';
+					$url.='view_entry.php?id='.$obj->cal_id;
+					$event['url']=$url;
 					
 					if ($qualified)
 					{