diff --git a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php index da6f04a25c..204f67de93 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php @@ -25,9 +25,19 @@ class RegistrationServiceProvider implements ServiceProviderInterface }); $app['registration.enabled'] = $app->share(function (Application $app){ - $login = new \login(); + require_once __DIR__ . '/../../../../classes/deprecated/inscript.api.php'; - return $login->register_enabled($app); + $bases = giveMeBases($app); + + if ($bases) { + foreach ($bases as $base) { + if ($base['inscript']) { + return true; + } + } + } + + return false; }); $app['registration.optional-fields'] = $app->share(function (Application $app) { diff --git a/lib/classes/eventsmanager/notify/autoregister.php b/lib/classes/eventsmanager/notify/autoregister.php index 73279d370d..e9b2c62977 100644 --- a/lib/classes/eventsmanager/notify/autoregister.php +++ b/lib/classes/eventsmanager/notify/autoregister.php @@ -220,9 +220,8 @@ class eventsmanager_notify_autoregister extends eventsmanager_notifyAbstract public function is_available() { $bool = false; - $login = new \login(); - if ( ! $this->app['authentication']->isAuthenticated() || ! $login->register_enabled($this->app)) { + if ( ! $this->app['authentication']->isAuthenticated() || ! $this->app['registration.enabled']) { return false; } diff --git a/lib/classes/eventsmanager/notify/register.php b/lib/classes/eventsmanager/notify/register.php index d735d35d26..32522e58c7 100644 --- a/lib/classes/eventsmanager/notify/register.php +++ b/lib/classes/eventsmanager/notify/register.php @@ -199,9 +199,8 @@ class eventsmanager_notify_register extends eventsmanager_notifyAbstract public function is_available() { $bool = false; - $login = new \login(); - if ( !$this->app['authentication']->isAuthenticated() || ! $login->register_enabled($this->app)) { + if ( !$this->app['authentication']->isAuthenticated() || ! $this->app['registration.enabled']) { return false; } diff --git a/lib/classes/login.php b/lib/classes/login.php index fa46656c4c..21459468fe 100644 --- a/lib/classes/login.php +++ b/lib/classes/login.php @@ -9,21 +9,4 @@ class login { return databox_cgu::getHome($app); } - - public function register_enabled(Application $app) - { - require_once __DIR__ . '/deprecated/inscript.api.php'; - - $bases = giveMeBases($app); - - if ($bases) { - foreach ($bases as $base) { - if ($base['inscript']) { - return true; - } - } - } - - return false; - } }