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

Remove phraseanet services, update configuration

Browse Source
This commit is contained in:
Romain Neutron
2013-06-11 11:57:43 +02:00
parent 8ecc97e94e
commit 32c2d6154a
99 changed files with 1545 additions and 5049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/API/V1/adapter.php
View File

@@ -313,10 +313,10 @@ class API_V1_adapter extends API_V1_Abstract
);
$ret['phraseanet']['environment'] = $app->getEnvironment();
$ret['phraseanet']['debug'] = $app['phraseanet.configuration']->isDebug();
$ret['phraseanet']['maintenance'] = $app['phraseanet.configuration']->isMaintained();
$ret['phraseanet']['errorsLog'] = $app['phraseanet.configuration']->isDisplayingErrors();
$ret['phraseanet']['serverName'] = $app['phraseanet.configuration']->getPhraseanet()->get('servername');
$ret['phraseanet']['debug'] = $app['debug'];
$ret['phraseanet']['maintenance'] = $app['phraseanet.configuration']['main']['maintenance'];
$ret['phraseanet']['errorsLog'] = $app['debug'];
$ret['phraseanet']['serverName'] = $app['phraseanet.configuration']['main']['servername'];
return $ret;
}
@@ -343,7 +343,7 @@ class API_V1_adapter extends API_V1_Abstract
'httpServer' => array(
'logErrors' => $app['phraseanet.registry']->get('GV_log_errors'),
'phpTimezone' => ini_get('date.timezone'),
'siteId' => $app['phraseanet.registry']->get('GV_sit'),
'siteId' => $app['phraseanet.configuration']['main']['key'],
'staticUrl' => $app['phraseanet.registry']->get('GV_STATIC_URL'),
'defaultLanguage' => $app['phraseanet.registry']->get('id_GV_default_lng'),
'allowIndexing' => $app['phraseanet.registry']->get('GV_allow_search_engine'),

4
lib/classes/API/V1/result.php
View File

@@ -198,9 +198,9 @@ class API_V1_result
$this->app['dispatcher']->dispatch(PhraseaEvents::API_RESULT, new ApiResultEvent());
$conf = $this->app['phraseanet.configuration']->getPhraseanet();
$conf = $this->app['phraseanet.configuration'];
if ($conf->has('api-timers') && true === $conf->get('api-timers')) {
if (isset($conf['main']['api-timers']) && true === $conf['main']['api-timers']) {
$ret['timers'] = $this->app['api.timers']->toArray();
}