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

Update Admin/Dashboard controller

Browse Source
This commit is contained in:
Romain Neutron
2012-09-13 13:03:34 +02:00
parent f28f216380
commit 00026fd26d
2 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Alchemy/Phrasea/Controller/Admin/Dashboard.php
View File

@@ -29,7 +29,7 @@ class Dashboard implements ControllerProviderInterface
$controllers = $app['controllers_factory'];
$controllers->before(function(Request $request) use ($app) {
return $app['phraseanet.core']['Firewall']->requireAdmin($app);
return $app['firewall']->requireAdmin($app);
});
/**
@@ -134,7 +134,7 @@ class Dashboard implements ControllerProviderInterface
}
try {
$engine = new \searchEngine_adapter($app['phraseanet.core']['Registry']);
$engine = new \searchEngine_adapter($app);
$searchEngineStatus = $engine->get_status();
} catch (\Exception $e) {
$searchEngineStatus = null;
@@ -146,8 +146,8 @@ class Dashboard implements ControllerProviderInterface
'email_status' => $emailStatus,
'search_engine_status' => $searchEngineStatus,
'php_version_constraints' => \setup::check_php_version(),
'writability_constraints' => \setup::check_writability($app['phraseanet.core']['Registry']),
'binaries_constraints' => \setup::check_binaries($app['phraseanet.core']['Registry']),
'writability_constraints' => \setup::check_writability($app['phraseanet.registry']),
'binaries_constraints' => \setup::check_binaries($app['phraseanet.registry']),
'php_extension_constraints' => \setup::check_php_extension(),
'cache_constraints' => \setup::check_cache_server(),
'phrasea_constraints' => \setup::check_phrasea(),
@@ -155,7 +155,7 @@ class Dashboard implements ControllerProviderInterface
'php_configuration_constraints' => \setup::check_php_configuration(),
);
return new Response($app['phraseanet.core']['Twig']->render('admin/dashboard.html.twig', $parameters));
return new Response($app['twig']->render('admin/dashboard.html.twig', $parameters));
}
/**
@@ -167,7 +167,7 @@ class Dashboard implements ControllerProviderInterface
*/
public function flush(Application $app, Request $request)
{
if ($app['phraseanet.core']['CacheService']->flushAll()) {
if ($app['phraseanet.cache-service']->flushAll()) {
return $app->redirect('/admin/dashboard/?flush_cache=ok');
}
@@ -188,7 +188,7 @@ class Dashboard implements ControllerProviderInterface
$app->abort(400, 'Bad request missing email parameter');
};
if (\mail::mail_test($mail)) {
if (\mail::mail_test($app, $mail)) {
return $app->redirect('/admin/dashboard/?email=sent');
}
@@ -205,7 +205,7 @@ class Dashboard implements ControllerProviderInterface
*/
public function resetAdminRights(Application $app, Request $request)
{
\User_Adapter::reset_sys_admins_rights();
\User_Adapter::reset_sys_admins_rights($app);
return $app->redirect('/admin/dashboard/');
}
@@ -219,7 +219,7 @@ class Dashboard implements ControllerProviderInterface
*/
public function addAdmins(Application $app, Request $request)
{
$user = $app['phraseanet.core']->getAuthenticatedUser();
$user = $app['phraseanet.user'];
if (count($admins = $request->request->get('admins', array())) > 0) {
@@ -228,8 +228,8 @@ class Dashboard implements ControllerProviderInterface
}
if ($admins > 0) {
\User_Adapter::set_sys_admins(array_filter($admins));
\User_Adapter::reset_sys_admins_rights();
\User_Adapter::set_sys_admins($app, array_filter($admins));
\User_Adapter::reset_sys_admins_rights($app);
}
}