From ad92ef19c455e643b84f302afce993aa76ee3e2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 27 May 2010 19:26:43 +0000
Subject: [PATCH] Fix: Export ical was broken

---
 htdocs/comm/action/actioncomm.class.php |  8 +++---
 htdocs/public/agenda/agendaexport.php   | 33 +++++++++++++------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/action/actioncomm.class.php b/htdocs/comm/action/actioncomm.class.php
index 72db58899d8..383f80a9b6f 100644
--- a/htdocs/comm/action/actioncomm.class.php
+++ b/htdocs/comm/action/actioncomm.class.php
@@ -654,7 +654,7 @@ class ActionComm
 				{
 					$login=$value;
 					$userforfilter=new User($this->db);
-					$userforfilter->fetch($value);
+					$result=$userforfilter->fetch('',$value);
 					$sql.= " AND (";
 					$sql.= " a.fk_user_author = ".$userforfilter->id;
 					$sql.= " OR a.fk_user_action = ".$userforfilter->id;
@@ -665,21 +665,21 @@ class ActionComm
 				{
 					$logina=$value;
 					$userforfilter=new User($this->db);
-					$userforfilter->fetch($value);
+					$result=$userforfilter->fetch('',$value);
 					$sql.= " AND a.fk_user_author = ".$userforfilter->id;
 				}
 				if ($key == 'logint')
 				{
 					$logint=$value;
 					$userforfilter=new User($this->db);
-					$userforfilter->fetch($value);
+					$result=$userforfilter->fetch('',$value);
 					$sql.= " AND a.fk_user_action = ".$userforfilter->id;
 				}
 				if ($key == 'logind')
 				{
 					$logind=$value;
 					$userforfilter=new User($this->db);
-					$userforfilter->fetch($value);
+					$result=$userforfilter->fetch('',$value);
 					$sql.= " AND a.fk_user_done = ".$userforfilter->id;
 				}
 			}
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index afc0a93fae5..e0cff8fa2f5 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -79,13 +79,24 @@ if (empty($_GET["exportkey"]) || $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY != $_
 
 
 // Define filename with prefix on filters predica (each predica set must have on cache file)
-$filename='';
-$shortfilename='';
-if ($format == 'vcal') $shortfilename='dolibarrcalendar.vcs';
-if ($format == 'ical') $shortfilename='dolibarrcalendar.ics';
-if ($format == 'rss')  $shortfilename='dolibarrcalendar.rss';
+$shortfilename='dolibarrcalendar';
 $filename=$shortfilename;
-if (! $filename)
+// Complete long filename
+foreach ($filters as $key => $value)
+{
+	if ($key == 'year')     $filename.='-year'.$value;
+	if ($key == 'idaction') $filename.='-id'.$value;
+	if ($key == 'login')	$filename.='-login'.$value;
+	if ($key == 'logina')	$filename.='-logina'.$value;	// Author
+	if ($key == 'logind')	$filename.='-logind'.$value;	// Affected to
+	if ($key == 'logint')	$filename.='-logint'.$value;	// Done by
+}
+// Add extension
+if ($format == 'vcal') { $shortfilename.='.vcs'; $filename.='.vcs'; }
+if ($format == 'ical') { $shortfilename.='.ics'; $filename.='.ics'; }
+if ($format == 'rss')  { $shortfilename.='.rss'; $filename.='.rss'; }
+
+if ($shortfilename=='dolibarrcalendar')
 {
 	$langs->load("main");
 	$langs->load("errors");
@@ -94,16 +105,6 @@ if (! $filename)
 	llxFooterVierge('$Date$ - $Revision$');
 	exit;
 }
-foreach ($filters as $key => $value)
-{
-	if ($key == 'year')     $filename.='.year'.$value;
-	if ($key == 'idaction') $filename.='.id'.$value;
-	if ($key == 'login')	$filename.='.login'.$value;
-	if ($key == 'logina')	$filename.='.logina'.$value;
-	if ($key == 'logind')	$filename.='.logind'.$value;
-	if ($key == 'logint')	$filename.='.logint'.$value;
-}
-
 
 $agenda=new ActionComm($db);