hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +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

62
lib/classes/module/report/activity.php
View File

@@ -93,9 +93,9 @@ class module_report_activity extends module_report
$this->result = array();
$this->title = _('report:: activite par heure');
$s = new module_report_sql($this->app, $this);
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $s->getFilters()->getReportFilter();
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge(array(), $filter['params']);
$sql = "
@@ -109,7 +109,7 @@ class module_report_activity extends module_report
GROUP BY tt.heures
ORDER BY tt.heures ASC";
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -152,9 +152,9 @@ class module_report_activity extends module_report
{
$result = array();
$s = new module_report_sql($this->app, $this);
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $s->getFilters()->getReportFilter();
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge(array(':main_value' => $value), $filter['params']);
$sql = "
@@ -167,14 +167,14 @@ class module_report_activity extends module_report
AND log.`" . $what . "` = :main_value
ORDER BY date ";
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$s->setTotalrows($stmt->rowCount());
$sqlBuilder->setTotalrows($stmt->rowCount());
$stmt->closeCursor();
$sql .= $s->getFilters()->getLimitFilter();
$sql .= $sqlBuilder->getFilters()->getLimitFilter();
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -206,8 +206,8 @@ class module_report_activity extends module_report
$this->report['value'] = array();
$this->report['value2'] = array();
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters()->getReportFilter();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge(array(), $filter['params']);
($no_answer) ? $this->title = _('report:: questions sans reponses') : $this->title = _('report:: questions les plus posees');
@@ -228,7 +228,7 @@ class module_report_activity extends module_report
$sql .= !$no_answer ? ' LIMIT ' . $this->nb_top : '';
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -269,8 +269,8 @@ class module_report_activity extends module_report
public function getAllDownloadByUserBase($usr, $config = false)
{
$result = array();
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters()->getReportFilter();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge(array(), $filter['params']);
$databox = $this->app['phraseanet.appbox']->get_databox($this->sbas_id);
@@ -283,14 +283,14 @@ class module_report_activity extends module_report
WHERE (". $filter['sql'] .") AND log_docs.action = 'download'
ORDER BY date DESC";
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$s->setTotalrows($stmt->rowCount());
$sqlBuilder->setTotalrows($stmt->rowCount());
$stmt->closeCursor();
$sql .= $s->getFilters()->getLimitFilter() ?: '';
$sql .= $sqlBuilder->getFilters()->getLimitFilter() ?: '';
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -329,8 +329,8 @@ class module_report_activity extends module_report
{
$this->title = _('report:: telechargements par jour');
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters()->getReportFilter();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge(array(), $filter['params']);
$sql = "
@@ -350,7 +350,7 @@ class module_report_activity extends module_report
GROUP BY tt.final, ddate
ORDER BY tt.the_date DESC";
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -390,9 +390,9 @@ class module_report_activity extends module_report
}
$nb_row = $i + 1;
$s->setTotalrows($nb_row);
$sqlBuilder->setTotalrows($nb_row);
if ($s->getTotalRows() > 0) {
if ($sqlBuilder->getTotalRows() > 0) {
$this->result[$nb_row]['ddate'] = '<b>TOTAL</b>';
$this->result[$nb_row]['document'] = '<b>' . $total['tot_doc'] . '</b>';
$this->result[$nb_row]['preview'] = '<b>' . $total['tot_prev'] . '</b>';
@@ -418,8 +418,8 @@ class module_report_activity extends module_report
$on = "user";
}
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters()->getReportFilter();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge(array(), $filter['params']);
$this->req = "
@@ -436,14 +436,14 @@ class module_report_activity extends module_report
GROUP BY tt.usrid
ORDER BY connexion DESC ";
$stmt = $s->getConnBas()->prepare($this->req);
$stmt = $sqlBuilder->getConnBas()->prepare($this->req);
$stmt->execute($params);
$s->setTotalrows($stmt->rowCount());
$sqlBuilder->setTotalrows($stmt->rowCount());
$stmt->closeCursor();
$this->enable_limit ? $this->req .= "LIMIT 0," . $this->nb_record : "";
$stmt = $s->getConnBas()->prepare($this->req);
$stmt = $sqlBuilder->getConnBas()->prepare($this->req);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -506,8 +506,8 @@ class module_report_activity extends module_report
//set title
$this->title = _('report:: Detail des telechargements');
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters()->getReportFilter();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters()->getReportFilter();
$params = array_merge(array(), $filter['params']);
$sql = "
@@ -526,7 +526,7 @@ class module_report_activity extends module_report
GROUP BY " . $on . ", usrid
ORDER BY nb DESC;";
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();

14
lib/classes/module/report/add.php
View File

@@ -53,20 +53,20 @@ class module_report_add extends module_report
*/
protected function buildReq($groupby = false, $on = false)
{
$s = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
$sqlBuilder = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
->setAction('add')->buildSql();
$this->req = $s->getSql();
$this->params = $s->getParams();
$this->total = $s->getTotalRows();
$this->req = $sqlBuilder->getSql();
$this->params = $sqlBuilder->getParams();
$this->total = $sqlBuilder->getTotalRows();
}
public function colFilter($field, $on = false)
{
$s = $this->sqlBuilder('action')->setAction('add');
$var = $s->sqlDistinctValByField($field);
$sqlBuilder = $this->sqlBuilder('action')->setAction('add');
$var = $sqlBuilder->sqlDistinctValByField($field);
$sql = $var['sql'];
$params = $var['params'];
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();

40
lib/classes/module/report/connexion.php
View File

@@ -14,17 +14,17 @@ use Alchemy\Phrasea\Application;
class module_report_connexion extends module_report
{
protected $cor_query = array(
'user' => 'log.user'
, 'usrid' => 'log.usrid'
, 'ddate' => 'log.date'
, 'societe' => 'log.societe'
, 'pays' => 'log.pays'
, 'activite' => 'log.activite'
, 'fonction' => 'log.fonction'
, 'site' => 'log.site'
, 'sit_session' => 'log.sit_session'
, 'appli' => 'log.appli'
, 'ip' => 'log.ip'
'user' => 'log.user',
'usrid' => 'log.usrid',
'ddate' => 'log.date',
'societe' => 'log.societe',
'pays' => 'log.pays',
'activite' => 'log.activite',
'fonction' => 'log.fonction',
'site' => 'log.site',
'sit_session' => 'log.sit_session',
'appli' => 'log.appli',
'ip' => 'log.ip'
);
/**
@@ -65,12 +65,12 @@ class module_report_connexion extends module_report
public function colFilter($field)
{
$ret = array();
$s = $this->sqlBuilder('connexion');
$var = $s->sqlDistinctValByField($field);
$sqlBuilder = $this->sqlBuilder('connexion');
$var = $sqlBuilder->sqlDistinctValByField($field);
$sql = $var['sql'];
$params = $var['params'];
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -100,8 +100,10 @@ class module_report_connexion extends module_report
$i = 0;
foreach ($rs as $row) {
if ($this->enable_limit && ($i > $this->nb_record))
if ($this->enable_limit && ($i > $this->nb_record)) {
break;
}
foreach ($this->champ as $key => $value) {
if ( ! isset($row[$value])) {
$this->result[$i][$value] = '<i>' . _('report:: non-renseigne') . '</i>';
@@ -138,8 +140,12 @@ class module_report_connexion extends module_report
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = array(':site_id' => $app['phraseanet.registry']->get('GV_sit'));
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
$params = array_merge(array(
':site_id' => $app['phraseanet.registry']->get('GV_sit')
),
$datefilter['params'],
$collfilter['params']
);
$finalfilter = $datefilter['sql'] . ' AND ';
$finalfilter .= $collfilter['sql'] . ' AND ';

6
lib/classes/module/report/download.php
View File

@@ -66,12 +66,12 @@ class module_report_download extends module_report
public function colFilter($field, $on = false)
{
$ret = array();
$s = $this->sqlBuilder('download');
$var = $s->sqlDistinctValByField($field);
$sqlBuilder = $this->sqlBuilder('download');
$var = $sqlBuilder->sqlDistinctValByField($field);
$sql = $var['sql'];
$params = $var['params'];
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();

14
lib/classes/module/report/edit.php
View File

@@ -53,21 +53,21 @@ class module_report_edit extends module_report
*/
protected function buildReq($groupby = false, $on = false)
{
$s = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
$sqlBuilder = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
->setAction('edit')->buildSql();
$this->req = $s->getSql();
$this->params = $s->getParams();
$this->total = $s->getTotalRows();
$this->req = $sqlBuilder->getSql();
$this->params = $sqlBuilder->getParams();
$this->total = $sqlBuilder->getTotalRows();
}
public function colFilter($field, $on = false)
{
$s = $this->sqlBuilder('action')->setAction('edit');
$var = $s->sqlDistinctValByField($field);
$sqlBuilder = $this->sqlBuilder('action')->setAction('edit');
$var = $sqlBuilder->sqlDistinctValByField($field);
$sql = $var['sql'];
$params = $var['params'];
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();

40
lib/classes/module/report/nav.php
View File

@@ -53,8 +53,8 @@ class module_report_nav extends module_report
private function setTotalPourcent()
{
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters();
$report_filter = $filter->getReportFilter();
$params = array_merge(array(), $report_filter['params']);
@@ -67,7 +67,7 @@ class module_report_nav extends module_report
WHERE ' . $report_filter['sql'] . ' AND nav != ""
) AS tt';
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$row = $stmt->fetch(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -98,8 +98,8 @@ class module_report_nav extends module_report
{
$i = 0;
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters();
$this->title = _('report:: navigateur');
$this->total_pourcent = $this->setTotalPourcent();
@@ -124,7 +124,7 @@ class module_report_nav extends module_report
$this->initialize();
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -156,8 +156,8 @@ class module_report_nav extends module_report
*/
public function buildTabOs($tab = false)
{
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters();
$i = 0;
$this->title = _('report:: Plateforme');
@@ -183,7 +183,7 @@ class module_report_nav extends module_report
$this->initialize();
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -214,8 +214,8 @@ class module_report_nav extends module_report
*/
public function buildTabRes($tab = false)
{
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters();
$this->title = _('report:: resolution');
$i = 0;
@@ -242,7 +242,7 @@ class module_report_nav extends module_report
$this->initialize();
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -274,8 +274,8 @@ class module_report_nav extends module_report
*/
public function buildTabCombo($tab = false)
{
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters();
$this->title = _('report:: navigateurs et plateforme');
$i = 0;
@@ -302,7 +302,7 @@ class module_report_nav extends module_report
$this->initialize();
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -335,8 +335,8 @@ class module_report_nav extends module_report
public function buildTabModule($tab = false)
{
$this->initialize();
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters();
$this->title = _('report:: modules');
$x = array();
$tab_appli = array();
@@ -362,7 +362,7 @@ class module_report_nav extends module_report
$this->initialize();
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();
@@ -546,8 +546,8 @@ class module_report_nav extends module_report
$conn = connection::getPDOConnection($this->app, $this->sbas_id);
$this->title = sprintf(
_('report:: Information sur le navigateur %s'), $navigator);
$s = new module_report_sql($this->app, $this);
$filter = $s->getFilters();
$sqlBuilder = new module_report_sql($this->app, $this);
$filter = $sqlBuilder->getFilters();
$params = array(':browser' => $navigator);
$report_filter = $filter->getReportFilter();

14
lib/classes/module/report/push.php
View File

@@ -53,21 +53,21 @@ class module_report_push extends module_report
*/
protected function buildReq($groupby = false, $on = false)
{
$s = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
$sqlBuilder = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
->setAction('push')->buildSql();
$this->req = $s->getSql();
$this->params = $s->getParams();
$this->total = $s->getTotalRows();
$this->req = $sqlBuilder->getSql();
$this->params = $sqlBuilder->getParams();
$this->total = $sqlBuilder->getTotalRows();
}
public function colFilter($field, $on = false)
{
$s = $this->sqlBuilder('action')->setAction('push');
$var = $s->sqlDistinctValByField($field);
$sqlBuilder = $this->sqlBuilder('action')->setAction('push');
$var = $sqlBuilder->sqlDistinctValByField($field);
$sql = $var['sql'];
$params = $var['params'];
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();

30
lib/classes/module/report/question.php
View File

@@ -14,18 +14,18 @@ use Alchemy\Phrasea\Application;
class module_report_question extends module_report
{
protected $cor_query = array(
'user' => 'log.user'
, 'usrid' => 'log.usrid'
, 'ddate' => 'log_search.date'
, 'date' => 'log_search.date'
, 'societe' => 'log.societe'
, 'pays' => 'log.pays'
, 'activite' => 'log.activite'
, 'fonction' => 'log.fonction'
, 'site' => 'log.site'
, 'sit_session' => 'log.sit_session'
, 'appli' => 'log.appli'
, 'ip' => 'log.ip'
'user' => 'log.user',
'usrid' => 'log.usrid',
'ddate' => 'log_search.date',
'date' => 'log_search.date',
'societe' => 'log.societe',
'pays' => 'log.pays',
'activite' => 'log.activite',
'fonction' => 'log.fonction',
'site' => 'log.site',
'sit_session' => 'log.sit_session',
'appli' => 'log.appli',
'ip' => 'log.ip'
);
/**
@@ -59,11 +59,11 @@ class module_report_question extends module_report
public function colFilter($field)
{
$ret = array();
$s = $this->sqlBuilder('question');
$var = $s->sqlDistinctValByField($field);
$sqlBuilder = $this->sqlBuilder('question');
$var = $sqlBuilder->sqlDistinctValByField($field);
$sql = $var['sql'];
$params = $var['params'];
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();

2
lib/classes/module/report/sqlReportInterface.php
View File

@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
interface module_report_sqlReportinterface
interface module_report_sqlReportInterface
{
public function buildSql();

14
lib/classes/module/report/validate.php
View File

@@ -53,21 +53,21 @@ class module_report_validate extends module_report
*/
protected function buildReq($groupby = false, $on = false)
{
$s = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
$sqlBuilder = $this->sqlBuilder('action')->setGroupBy($groupby)->setOn($on)
->setAction('validate')->buildSql();
$this->req = $s->getSql();
$this->params = $s->getParams();
$this->total = $s->getTotalRows();
$this->req = $sqlBuilder->getSql();
$this->params = $sqlBuilder->getParams();
$this->total = $sqlBuilder->getTotalRows();
}
public function colFilter($field, $on = false)
{
$s = $this->sqlBuilder('action')->setAction('validate');
$var = $s->sqlDistinctValByField($field);
$sqlBuilder = $this->sqlBuilder('action')->setAction('validate');
$var = $sqlBuilder->sqlDistinctValByField($field);
$sql = $var['sql'];
$params = $var['params'];
$stmt = $s->getConnBas()->prepare($sql);
$stmt = $sqlBuilder->getConnBas()->prepare($sql);
$stmt->execute($params);
$rs = $stmt->fetchAll(PDO::FETCH_ASSOC);
$stmt->closeCursor();