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

Use configuration property accessor

Browse Source
This commit is contained in:
Romain Neutron
2013-11-18 18:45:25 +01:00
parent 94be7c5498
commit 7e0a3c7338
87 changed files with 209 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/module/console/checkExtension.php
View File

@@ -167,7 +167,7 @@ class module_console_checkExtension extends Command
, $base["sbas_id"]
, $base["searchcoll"]
, $base["arrayq"]
, $this->container['configuration']['main']['key']
, $this->container['conf']->get(['main', 'key'])
, $usrId
, false
, PHRASEA_MULTIDOC_DOCONLY

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

@@ -624,7 +624,7 @@ class module_report_activity extends module_report
$result['top_ten_poiddoc'] = [];
$result['top_ten_poidprev'] = [];
$params = [':site_id' => $app['configuration']['main']['key']];
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$params = array_merge($params, $datefilter['params']);
@@ -704,7 +704,7 @@ class module_report_activity extends module_report
$collfilter =
module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = [':site_id' => $app['configuration']['main']['key']];
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
$sql = "
@@ -751,7 +751,7 @@ class module_report_activity extends module_report
$collfilter =
module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = [':site_id' => $app['configuration']['main']['key']];
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
$sql = "
@@ -792,7 +792,7 @@ class module_report_activity extends module_report
$collfilter =
module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = [':site_id' => $app['configuration']['main']['key']];
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
$sql = "
@@ -832,7 +832,7 @@ class module_report_activity extends module_report
$collfilter =
module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = [':site_id' => $app['configuration']['main']['key']];
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
$sql = "

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

@@ -141,7 +141,7 @@ class module_report_connexion extends module_report
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = array_merge([
':site_id' => $app['configuration']['main']['key']
':site_id' => $app['conf']->get(['main', 'key'])
],
$datefilter['params'],
$collfilter['params']

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

@@ -174,7 +174,7 @@ class module_report_download extends module_report
{
$conn = connection::getPDOConnection($app, $sbas_id);
$params = [':site_id' => $app['configuration']['main']['key']];
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = array_merge($params, $datefilter['params'], $collfilter['params']);
@@ -210,7 +210,7 @@ class module_report_download extends module_report
$databox = $app['phraseanet.appbox']->get_databox((int) $sbas_id);
$conn = $databox->get_connection();
$params = [':site_id' => $app['configuration']['main']['key']];
$params = [':site_id' => $app['conf']->get(['main', 'key'])];
$datefilter = module_report_sqlfilter::constructDateFilter($dmin, $dmax);
$collfilter = module_report_sqlfilter::constructCollectionFilter($app, $list_coll_id);
$params = array_merge($params, $datefilter['params'], $collfilter['params']);

4
lib/classes/module/report/sqlfilter.php
View File

@@ -64,7 +64,7 @@ class module_report_sqlfilter
{
$finalfilter = '';
$params = [':log_site' => $this->app['configuration']['main']['key']];
$params = [':log_site' => $this->app['conf']->get(['main', 'key'])];
if ($this->filter['date']) {
$finalfilter .= $this->filter['date']['sql'] . ' AND ';
@@ -88,7 +88,7 @@ class module_report_sqlfilter
$params = [];
$sql = 'log.site = :log_site_gv_filter';
$params[':log_site_gv_filter'] = $this->app['configuration']['main']['key'];
$params[':log_site_gv_filter'] = $this->app['conf']->get(['main', 'key']);
return ['sql' => $sql, 'params' => $params];
}