diff --git a/application/modules/opac/controllers/AuthController.php b/application/modules/opac/controllers/AuthController.php index 53c1857d8b3d1c0583386755ee021b59207bc8c4..c42e77bf2bf9e7a4bafbbb47a020840a5455c650 100644 --- a/application/modules/opac/controllers/AuthController.php +++ b/application/modules/opac/controllers/AuthController.php @@ -127,7 +127,7 @@ class AuthController extends ZendAfi_Controller_Action { function boiteLoginAction() { - $this->view->preferences = Class_Profil::getCurrentProfil()->getModuleAccueilPreferencesByType('auth'); + $this->view->preferences = Class_Profil::getCurrentProfil()->getModuleAccueilPreferencesByType('LOGIN'); $strategy = Auth_Strategy_Abstract::strategyForController($this); $strategy->setDefaultUrl($this->_request->getServer('HTTP_REFERER')); $strategy->processLogin(); diff --git a/application/modules/opac/views/scripts/auth/boite-login.phtml b/application/modules/opac/views/scripts/auth/boite-login.phtml index 977403089cfde414bae988d14c8f1585696945b3..551cb06a023febc74a90292afc81a2a280162152 100644 --- a/application/modules/opac/views/scripts/auth/boite-login.phtml +++ b/application/modules/opac/views/scripts/auth/boite-login.phtml @@ -1,7 +1,7 @@ <div class="form"> <?php if($user = Class_Users::getLoader()->getIdentity()) { - echo sprintf("<div class='welcome'>%s %s </div>", $this->_($this->preferences['message_connecte']), $user->getNomAff()); + echo sprintf("<div class='welcome'>%s %s </div>", $this->preferences['message_connecte'], $user->getNomAff()); echo sprintf('<a href="%s" target="_parent" class="account-link">%s</a>', $this->url(['controller'=>'abonne', 'action'=>'fiche', diff --git a/application/modules/telephone/controllers/AuthController.php b/application/modules/telephone/controllers/AuthController.php index 403e32575f1848ae38ce676239f36410896230a0..44132c8a9337361fd429a2c5ccf3009215ae5763 100644 --- a/application/modules/telephone/controllers/AuthController.php +++ b/application/modules/telephone/controllers/AuthController.php @@ -70,7 +70,8 @@ class Telephone_AuthController extends AuthController { protected function _getFormLogin() { - $settings = array_merge(['indentifiant_exemple' => $this->view->_('N° de carte'), + + $settings = array_merge(['identifiant_exemple' => $this->view->_('N° de carte'), 'mot_de_passe_exemple' => $this->view->_('Mot de passe ou date de naissance')], Class_Profil::getPortail()->getModuleAccueilPreferencesByType('LOGIN')); diff --git a/library/Class/Profil.php b/library/Class/Profil.php index 5ddb12ae60de71a4ce6565ce43d32bdbf3fd028e..015947891d9415e9e4271e59a6d966c996032bf8 100644 --- a/library/Class/Profil.php +++ b/library/Class/Profil.php @@ -521,7 +521,7 @@ class Class_Profil extends Storm_Model_Abstract { return $module; } - return null; + return []; } /* @@ -543,7 +543,7 @@ class Class_Profil extends Storm_Model_Abstract { } } } - return null; + return []; } @@ -1749,7 +1749,7 @@ class Class_Profil extends Storm_Model_Abstract { public function hasBoite($type) { - return 0 < $this->getBoiteId($type); + return $this->getBoiteId($type)!=null; } @@ -1762,7 +1762,7 @@ class Class_Profil extends Storm_Model_Abstract { foreach($cfgAccueilArray as $key => $value) { $current_key=$key; $current_value = $value; - if($boite===$value OR (is_array($value) && $this->recursive_array_search_boite($boite,$value) !== false)) { + if($boite===$value OR (is_array($value) && $this->recursive_array_search_boite($boite,$value) !== null)) { return key_exists('id_module',$current_value['preferences']) ? $current_value['preferences']['id_module'] : $current_key; } } @@ -1773,7 +1773,7 @@ class Class_Profil extends Storm_Model_Abstract { public function recursive_array_search_boite($boite,$cfgAccueilArray) { foreach($cfgAccueilArray as $key => $value) { $current_key=$key; - if($boite===$value OR (is_array($value) && $this->recursive_array_search_boite($boite,$value) !== false)) { + if($boite===$value OR (is_array($value) && $this->recursive_array_search_boite($boite,$value) !== null)) { return $current_key; } } diff --git a/library/ZendAfi/View/Helper/Accueil/Base.php b/library/ZendAfi/View/Helper/Accueil/Base.php index 7d9670bfe0ec5c362c656de652849595debf0342..f9f676d3ab56ad95481a162e5b1738b565f147ff 100644 --- a/library/ZendAfi/View/Helper/Accueil/Base.php +++ b/library/ZendAfi/View/Helper/Accueil/Base.php @@ -339,7 +339,7 @@ class ZendAfi_View_Helper_Accueil_Base extends ZendAfi_View_Helper_ModuleAbstrac public static function getModuleHelperFromParams($id_module, $module_params, $view) { - $type_module=$module_params["type_module"]; + $type_module=isset($module_params["type_module"]) ? $module_params["type_module"] : null; if (!$type_module) return null; $classname = self::getModuleHelperClass($type_module);