hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CS

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-01-23 15:46:03 +01:00
parent 197acb312a
commit 43be8b7586
15 changed files with 307 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/classes/module/report/sqlaction.php
View File

@@ -43,15 +43,15 @@ class module_report_sqlaction extends module_report_sql implements module_report
if ($this->groupby == false) {
$this->sql = "
SELECT tt.usrid, tt.user, tt.final AS getter, tt.record_id, tt.date, tt.mime, tt.file
FROM (
SELECT DISTINCT(log.id), log.usrid, log.user, d.final, d.record_id, d.date, record.mime, record.originalname as file
FROM (log_docs AS d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (record.record_id = d.record_id)
WHERE (" . $filter['sql'] . ") AND (d.action = :action)
) AS tt";
SELECT tt.usrid, tt.user, tt.final AS getter, tt.record_id, tt.date, tt.mime, tt.file
FROM (
SELECT DISTINCT(log.id), log.usrid, log.user, d.final, d.record_id, d.date, record.mime, record.originalname as file
FROM (log_docs AS d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (record.record_id = d.record_id)
WHERE (" . $filter['sql'] . ") AND (d.action = :action)
) AS tt";
$stmt = $this->getConnBas()->prepare($this->sql);
$stmt->execute($this->params);
@@ -62,19 +62,19 @@ class module_report_sqlaction extends module_report_sql implements module_report
$this->sql .= $this->filter->getLimitFilter() ? : '';
} else {
$this->sql = "
SELECT " . $this->groupby . ", SUM(1) AS nombre
FROM (
SELECT DISTINCT(log.id), TRIM(" . $this->getTransQuery($this->groupby) . ") AS " . $this->groupby . " , log.usrid , d.final, d.record_id, d.date
FROM (log_docs as d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (record.record_id = d.record_id)
WHERE (" . $filter['sql'] . ") AND (d.action = :action)
) AS tt
LEFT JOIN subdef AS s ON (s.record_id=tt.record_id)
WHERE s.name='document'
GROUP BY " . $this->groupby . "
ORDER BY nombre";
SELECT " . $this->groupby . ", SUM(1) AS nombre
FROM (
SELECT DISTINCT(log.id), TRIM(" . $this->getTransQuery($this->groupby) . ") AS " . $this->groupby . " , log.usrid , d.final, d.record_id, d.date
FROM (log_docs as d)
INNER JOIN log FORCE INDEX (date_site) ON (log.id = d.log_id)
INNER JOIN log_colls FORCE INDEX (couple) ON (log.id = log_colls.log_id)
INNER JOIN record ON (record.record_id = d.record_id)
WHERE (" . $filter['sql'] . ") AND (d.action = :action)
) AS tt
LEFT JOIN subdef AS s ON (s.record_id=tt.record_id)
WHERE s.name='document'
GROUP BY " . $this->groupby . "
ORDER BY nombre";
$stmt = $this->getConnBas()->prepare($this->sql);
$stmt->execute($this->params);