Commit e9dc411d authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Correction clé "unicaen-auth"

parent 3715ca70
...@@ -63,7 +63,7 @@ return array( ...@@ -63,7 +63,7 @@ return array(
'unicaen-auth' => $settings, 'unicaen-auth' => $settings,
'view_manager' => array( 'view_manager' => array(
'template_path_stack' => array( 'template_path_stack' => array(
'unicaen-user' => __DIR__ . '/../view', 'unicaen-auth' => __DIR__ . '/../view',
), ),
), ),
'service_manager' => array( 'service_manager' => array(
...@@ -89,7 +89,7 @@ return array( ...@@ -89,7 +89,7 @@ return array(
'options' => array( 'options' => array(
'route' => '/utilisateur/generer-sesame', 'route' => '/utilisateur/generer-sesame',
'defaults' => array( 'defaults' => array(
'controller' => 'unicaen-user', 'controller' => 'unicaen-auth',
'action' => 'generer-sesame', 'action' => 'generer-sesame',
), ),
), ),
......
...@@ -14,10 +14,10 @@ class AdapterChainServiceFactory implements FactoryInterface ...@@ -14,10 +14,10 @@ class AdapterChainServiceFactory implements FactoryInterface
{ {
$chain = new AdapterChain; $chain = new AdapterChain;
$userService = $serviceLocator->get('unicaen-user_user_service'); $userService = $serviceLocator->get('unicaen-auth_user_service');
/* @var $options \UnicaenAuth\Options\ModuleOptions */ /* @var $options \UnicaenAuth\Options\ModuleOptions */
$options = $serviceLocator->get('unicaen-user_module_options'); $options = $serviceLocator->get('unicaen-auth_module_options');
if ($options->getCasAuthenticationActivated()) { if ($options->getCasAuthenticationActivated()) {
/* @var $casAdapter Cas */ /* @var $casAdapter Cas */
$casAdapter = $serviceLocator->get('UnicaenAuth\Authentication\Adapter\Cas'); $casAdapter = $serviceLocator->get('UnicaenAuth\Authentication\Adapter\Cas');
......
...@@ -98,7 +98,7 @@ class Db extends \ZfcUser\Authentication\Adapter\Db ...@@ -98,7 +98,7 @@ class Db extends \ZfcUser\Authentication\Adapter\Db
public function getUnicaenAuthOptions() public function getUnicaenAuthOptions()
{ {
if (!$this->unicaenUserOptions instanceof AuthenticationOptionsInterface) { if (!$this->unicaenUserOptions instanceof AuthenticationOptionsInterface) {
$this->setUnicaenAuthOptions($this->getServiceManager()->get('unicaen-user_module_options')); $this->setUnicaenAuthOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
} }
return $this->unicaenUserOptions; return $this->unicaenUserOptions;
} }
......
...@@ -198,7 +198,7 @@ class Ldap extends AbstractAdapter implements ServiceManagerAwareInterface, Even ...@@ -198,7 +198,7 @@ class Ldap extends AbstractAdapter implements ServiceManagerAwareInterface, Even
public function getOptions() public function getOptions()
{ {
if (!$this->options instanceof AuthenticationOptionsInterface) { if (!$this->options instanceof AuthenticationOptionsInterface) {
$this->setOptions($this->getServiceManager()->get('unicaen-user_module_options')); $this->setOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
} }
return $this->options; return $this->options;
} }
......
...@@ -188,7 +188,7 @@ class Ldap implements Storage\StorageInterface, ServiceManagerAwareInterface ...@@ -188,7 +188,7 @@ class Ldap implements Storage\StorageInterface, ServiceManagerAwareInterface
public function getOptions() public function getOptions()
{ {
if (!$this->options instanceof AuthenticationOptionsInterface) { if (!$this->options instanceof AuthenticationOptionsInterface) {
$this->setOptions($this->getServiceManager()->get('unicaen-user_module_options')); $this->setOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
} }
return $this->options; return $this->options;
} }
......
...@@ -185,7 +185,7 @@ class Mixed implements Storage\StorageInterface, ServiceManagerAwareInterface ...@@ -185,7 +185,7 @@ class Mixed implements Storage\StorageInterface, ServiceManagerAwareInterface
public function getOptions() public function getOptions()
{ {
if (!$this->options instanceof AuthenticationOptionsInterface) { if (!$this->options instanceof AuthenticationOptionsInterface) {
$this->setOptions($this->getServiceManager()->get('unicaen-user_module_options')); $this->setOptions($this->getServiceManager()->get('unicaen-auth_module_options'));
} }
return $this->options; return $this->options;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment