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

Add option to help debug of ical export

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-19 19:30:17 +00:00
parent 58a5a866f3
commit f3bedb2ddc
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -655,8 +655,10 @@ class ActionComm extends CommonObject
{ {
if ($key == 'notolderthan') $sql.=" AND a.datep >= '".$this->db->idate($now-($value*24*60*60))."'"; if ($key == 'notolderthan') $sql.=" AND a.datep >= '".$this->db->idate($now-($value*24*60*60))."'";
if ($key == 'year') $sql.=" AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value,1))."' AND '".$this->db->idate(dol_get_last_day($value,12))."'"; if ($key == 'year') $sql.=" AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value,1))."' AND '".$this->db->idate(dol_get_last_day($value,12))."'";
if ($key == 'id') $sql.=' AND a.id='.$value; if ($key == 'id') $sql.=" AND a.id=".(is_numeric($value)?$value:0);
if ($key == 'login') if ($key == 'idfrom') $sql.=" AND a.id >= ".(is_numeric($value)?$value:0);
if ($key == 'idto') $sql.=" AND a.id <= ".(is_numeric($value)?$value:0);
if ($key == 'login')
{ {
$login=$value; $login=$value;
$userforfilter=new User($this->db); $userforfilter=new User($this->db);

4
htdocs/lib/databases/pgsql.lib.php
View File

@ -504,14 +504,14 @@ class DoliDb
$ret = @pg_query($this->db, $query); $ret = @pg_query($this->db, $query);
//print $query; //print $query;
if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
{ {
// Si requete utilisateur, on la sauvegarde ainsi que son resultset
if (! $ret) if (! $ret)
{ {
$this->lastqueryerror = $query; $this->lastqueryerror = $query;
$this->lasterror = $this->error(); $this->lasterror = $this->error();
$this->lasterrno = $this->errno(); $this->lasterrno = $this->errno();
dol_syslog("Postgresql request error: ".$query, LOG_ERR);
//print "\n>> ".$query."<br>\n"; //print "\n>> ".$query."<br>\n";
//print '>> '.$this->lasterrno.' - '.$this->lasterror.' - '.$this->lastqueryerror."<br>\n"; //print '>> '.$this->lasterrno.' - '.$this->lasterror.' - '.$this->lastqueryerror."<br>\n";

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

@ -46,7 +46,9 @@ if (! empty($_GET["format"])) $format=$_GET["format"];
if (! empty($_GET["type"])) $type=$_GET["type"]; if (! empty($_GET["type"])) $type=$_GET["type"];
$filters=array(); $filters=array();
if (! empty($_GET["year"])) $filters['year']=$_GET["year"]; if (! empty($_GET["year"])) $filters['year']=$_GET["year"];
if (! empty($_GET["idaction"])) $filters['idaction']=$_GET["idaction"]; if (! empty($_GET["id"])) $filters['id']=$_GET["id"];
if (! empty($_GET["idfrom"])) $filters['idfrom']=$_GET["idfrom"];
if (! empty($_GET["idto"])) $filters['idto']=$_GET["idto"];
if (! empty($_GET["login"])) $filters['login']=$_GET["login"]; if (! empty($_GET["login"])) $filters['login']=$_GET["login"];
if (! empty($_GET["logina"])) $filters['logina']=$_GET["logina"]; if (! empty($_GET["logina"])) $filters['logina']=$_GET["logina"];
if (! empty($_GET["logint"])) $filters['logint']=$_GET["logint"]; if (! empty($_GET["logint"])) $filters['logint']=$_GET["logint"];
@ -85,8 +87,10 @@ $filename=$shortfilename;
foreach ($filters as $key => $value) foreach ($filters as $key => $value)
{ {
if ($key == 'year') $filename.='-year'.$value; if ($key == 'year') $filename.='-year'.$value;
if ($key == 'idaction') $filename.='-id'.$value; if ($key == 'id') $filename.='-id'.$value;
if ($key == 'login') $filename.='-login'.$value; if ($key == 'idfrom') $filename.='-idfrom'.$value;
if ($key == 'idto') $filename.='-idto'.$value;
if ($key == 'login') $filename.='-login'.$value;
if ($key == 'logina') $filename.='-logina'.$value; // Author if ($key == 'logina') $filename.='-logina'.$value; // Author
if ($key == 'logind') $filename.='-logind'.$value; // Affected to if ($key == 'logind') $filename.='-logind'.$value; // Affected to
if ($key == 'logint') $filename.='-logint'.$value; // Done by if ($key == 'logint') $filename.='-logint'.$value; // Done by