User the Injector to get Horde_Auth instances

diff --git a/hermes/lib/Forms/Search.php b/hermes/lib/Forms/Search.php
index e8f9b24..0dd4005 100644 (file)
--- a/hermes/lib/Forms/Search.php
+++ b/hermes/lib/Forms/Search.php
@@ -164,8 +164,8 @@ class SearchForm extends Horde_Form {
         $criteria = array();
         if ($perms->hasPermission('hermes:review', $GLOBALS['registry']->getAuth(), Horde_Perms::SHOW)) {
             if (!empty($info['employees'])) {
-                $auth = Horde_Auth::singleton($GLOBALS['conf']['auth']['driver']);
-                if (!$auth->capabilities['list']) {
+                $auth = $GLOBALS['injector']->getInstance('Horde_Auth')->getAuth();
+                if (!$auth->hasCapability('list')) {
                     $criteria['employee'] = explode(',', $info['employees']);
                 } else {
                     $criteria['employee'] = $info['employees'];

diff --git a/hermes/lib/Forms/Time.php b/hermes/lib/Forms/Time.php
index b12661f..f74ba01 100644 (file)
--- a/hermes/lib/Forms/Time.php
+++ b/hermes/lib/Forms/Time.php
@@ -285,7 +285,7 @@ class TimeReviewForm extends TimeForm {
         $employees = array();
 
         require_once 'Horde/Identity.php';
-        $auth = Horde_Auth::singleton($conf['auth']['driver']);
+        $auth = $GLOBALS['injector']->getInstance('Horde_Auth')->getAuth();
         $users = $auth->listUsers();
         if (!is_a($users, 'PEAR_Error')) {
             foreach ($users as $user) {