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

Merge pull request #792 from romainneutron/configuration

Browse Source 
[3.9] Move registry to configuration
This commit is contained in:
Romain Neutron
2013-12-20 08:44:10 -08:00
parent 40a14074d2 64456a8964
commit bb9eff5935
165 changed files with 2925 additions and 2101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -631,7 +631,7 @@ class module_report
$this->report['dbname'] = $this->dbname;
$this->report['dmin'] = $this->dmin;
$this->report['dmax'] = $this->dmax;
$this->report['server'] = $this->app['phraseanet.registry']->get('GV_ServerName');
$this->report['server'] = $this->app['conf']->get('servername');
$this->report['filter'] = $this->tab_filter;
$this->report['posting_filter'] = $this->posting_filter;
$this->report['active_column'] = $this->active_column;

6
lib/classes/module/report/dashboard/feed.php
View File

@@ -141,7 +141,7 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
$this->report['nb_conn'] = module_report_connexion::getNbConn(
$this->app, $this->dminsql, $this->dmaxsql, $this->sbasid, $this->collection
);
if ($this->app['phraseanet.registry']->get('GV_anonymousReport') == false) {
if ($this->app['conf']->get(['registry', 'modules', 'anonymous-report']) == false) {
/**
* get Top ten user of
* number of dl doc, prev
@@ -176,7 +176,7 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
$this->report['top_dl_preview'] = $topdl['preview'];
$this->report['top_dl_document'] = $topdl['document'];
if ($this->app['phraseanet.registry']->get('GV_anonymousReport') == false) {
if ($this->app['conf']->get(['registry', 'modules', 'anonymous-report']) == false) {
// get users that ask the most questions
$this->report['ask'] = module_report_activity::activityQuestion(
$this->app, $this->dminsql, $this->dmaxsql, $this->sbasid, $this->collection
@@ -200,7 +200,7 @@ class module_report_dashboard_feed implements module_report_dashboard_componentI
$this->report['activity_edited'] = module_report_activity::activiteEditedDocument(
$this->app, $this->dminsql, $this->dmaxsql, $this->sbasid, $this->collection
);
if ($this->app['phraseanet.registry']->get('GV_anonymousReport') == false) {
if ($this->app['conf']->get(['registry', 'modules', 'anonymous-report']) == false) {
//get users that add the most documents
$this->report['top_ten_added'] = module_report_activity::activiteAddedTopTenUser(
$this->app, $this->dminsql, $this->dmaxsql, $this->sbasid, $this->collection