diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php index 7a3204ddd16751709ecf5075c21cb172de1f98a4..ebcb15dad603042b85b684c9d6ff42bc94974671 100644 --- a/library/Class/AdminVar.php +++ b/library/Class/AdminVar.php @@ -72,6 +72,7 @@ class Class_AdminVar extends Storm_Model_Abstract { 'ARTE_VOD_SSO_KEY', 'BABELTHEQUE_JS', 'MULTIMEDIA_KEY', + 'WEBKIOSK_KEY', 'CSS_EDITOR', 'CMS_FORMULAIRES', 'MENU_BOITE', @@ -286,6 +287,13 @@ class Class_AdminVar extends Storm_Model_Abstract { return ('' != self::get('MULTIMEDIA_KEY')); } + /** + * @return bool + */ + public static function isWebkioskEnabled() { + return ('' != self::get('WEBKIOSK_KEY')); + } + /** * @return array diff --git a/library/Class/Users.php b/library/Class/Users.php index f6abbc0936587e75f7a9c7e0430676496c5f38bc..cb2170731bfc5453f8751aa585da0dc15658e18e 100644 --- a/library/Class/Users.php +++ b/library/Class/Users.php @@ -40,7 +40,7 @@ class UsersLoader extends Storm_Model_Loader { $like = strtolower($search).'%'; - $all_users = Class_Users::findAll(sprintf($sql_template, $by_right, $like)); + $all_users = $this->findAll(sprintf($sql_template, $by_right, $like)); if (!$by_right || count($all_users) >= $limit) return $all_users; @@ -71,7 +71,7 @@ class UsersLoader extends Storm_Model_Loader { public function findAllByRightDirigerFormation() { $users = array(); - $all_groups = Class_UserGroup::getLoader()->findAll(); + $all_groups = Class_UserGroup::findAll(); foreach ($all_groups as $group) { if ($group->hasRightDirigerFormation()) $users = array_merge($users , $group->getUsers()); @@ -141,6 +141,13 @@ class UsersLoader extends Storm_Model_Loader { return false; return $user->canAccessAllBibs(); } + + /** + * @return array + */ + public function getAllBorrowers(){ + return $this->findAllBy(['role_level' => 2]); + } }