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

Fix: ical export can works if there is two parallele calls

Browse Source
This commit is contained in:
Laurent Destailleur 2010-01-17 20:56:33 +00:00
parent 48f3ca1afc
commit 7a0fcca684
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/actioncomm.class.php
View File

@ -590,14 +590,26 @@ class ActionComm
// Check parameters // Check parameters
if (empty($format)) return -1; if (empty($format)) return -1;
// Define prefix
$prefix='';
foreach ($filters as $key => $value)
{
if ($key == 'year') $prefix.='.year'.$value;
if ($key == 'idaction') $prefix.='.id'.$value;
if ($key == 'login') $prefix.='.login'.$value;
if ($key == 'logina') $prefix.='.logina'.$value;
if ($key == 'logind') $prefix.='.logind'.$value;
if ($key == 'logint') $prefix.='.logint'.$value;
}
// Clean parameters // Clean parameters
if (! $filename) if (! $filename)
{ {
$extension='vcs'; $extension='vcs';
if ($format == 'ical') $extension='ics'; if ($format == 'ical') $extension='ics';
$filename=$format.'.'.$extension; $filename=$format.$prefix.'.'.$extension;
} }
else $filename.=$prefix;
// Create dir and define output file (definitive and temporary) // Create dir and define output file (definitive and temporary)
$result=create_exdir($conf->agenda->dir_temp); $result=create_exdir($conf->agenda->dir_temp);
@ -644,7 +656,7 @@ class ActionComm
$sql.= " WHERE a.fk_action=c.id"; $sql.= " WHERE a.fk_action=c.id";
foreach ($filters as $key => $value) foreach ($filters as $key => $value)
{ {
if ($key == 'year') $sql.=' AND '; if ($key == 'year') $sql.=' AND a.datep BETWEEN ( )'; // TODO Put year range
if ($key == 'idaction') $sql.=' AND a.id='.$value; if ($key == 'idaction') $sql.=' AND a.id='.$value;
if ($key == 'login') if ($key == 'login')
{ {