lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Export ical was broken

Browse Source
This commit is contained in:
Laurent Destailleur 2010-05-27 19:26:43 +00:00
parent 9df4363287
commit ad92ef19c4
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/comm/action/actioncomm.class.php
View File

@ -654,7 +654,7 @@ class ActionComm
{ {
$login=$value; $login=$value;
$userforfilter=new User($this->db); $userforfilter=new User($this->db);
$userforfilter->fetch($value); $result=$userforfilter->fetch('',$value);
$sql.= " AND ("; $sql.= " AND (";
$sql.= " a.fk_user_author = ".$userforfilter->id; $sql.= " a.fk_user_author = ".$userforfilter->id;
$sql.= " OR a.fk_user_action = ".$userforfilter->id; $sql.= " OR a.fk_user_action = ".$userforfilter->id;
@ -665,21 +665,21 @@ class ActionComm
{ {
$logina=$value; $logina=$value;
$userforfilter=new User($this->db); $userforfilter=new User($this->db);
$userforfilter->fetch($value); $result=$userforfilter->fetch('',$value);
$sql.= " AND a.fk_user_author = ".$userforfilter->id; $sql.= " AND a.fk_user_author = ".$userforfilter->id;
} }
if ($key == 'logint') if ($key == 'logint')
{ {
$logint=$value; $logint=$value;
$userforfilter=new User($this->db); $userforfilter=new User($this->db);
$userforfilter->fetch($value); $result=$userforfilter->fetch('',$value);
$sql.= " AND a.fk_user_action = ".$userforfilter->id; $sql.= " AND a.fk_user_action = ".$userforfilter->id;
} }
if ($key == 'logind') if ($key == 'logind')
{ {
$logind=$value; $logind=$value;
$userforfilter=new User($this->db); $userforfilter=new User($this->db);
$userforfilter->fetch($value); $result=$userforfilter->fetch('',$value);
$sql.= " AND a.fk_user_done = ".$userforfilter->id; $sql.= " AND a.fk_user_done = ".$userforfilter->id;
} }
} }

33
htdocs/public/agenda/agendaexport.php
View File

@ -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) // Define filename with prefix on filters predica (each predica set must have on cache file)
$filename=''; $shortfilename='dolibarrcalendar';
$shortfilename='';
if ($format == 'vcal') $shortfilename='dolibarrcalendar.vcs';
if ($format == 'ical') $shortfilename='dolibarrcalendar.ics';
if ($format == 'rss') $shortfilename='dolibarrcalendar.rss';
$filename=$shortfilename; $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("main");
$langs->load("errors"); $langs->load("errors");
@ -94,16 +105,6 @@ if (! $filename)
llxFooterVierge('$Date$ - $Revision$'); llxFooterVierge('$Date$ - $Revision$');
exit; 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); $agenda=new ActionComm($db);