Bug:

Submitted by:
Merge after:
Auth:: -> Horde_Auth::

What was that noise?  That was the sound of this commit (possibly)destroying
your ability to login to Horde.  You have been warned.

diff --git a/lib/Driver.php b/lib/Driver.php
index c4627d1..b8b2896 100644 (file)
--- a/lib/Driver.php
+++ b/lib/Driver.php
@@ -3,7 +3,7 @@
  * Operator_Driver:: defines an API for implementing storage backends for
  * Operator.
  *
- * $Horde: incubator/operator/lib/Driver.php,v 1.6 2009/05/31 22:20:06 bklang Exp $
+ * $Horde: incubator/operator/lib/Driver.php,v 1.7 2009/07/08 18:29:18 slusarz Exp $
  *
  * Copyright 2007-2009 The Horde Project (http://www.horde.org/)
  *
@@ -29,11 +29,11 @@ class Operator_Driver {
         } else {
             $permentry = 'operator:accountcodes:' . $accountcode;
         }
-        if (Auth::isAdmin() ||
+        if (Horde_Auth::isAdmin() ||
             $GLOBALS['perms']->hasPermission('operator:accountcodes',
-                                              Auth::getAuth(),
+                                              Horde_Auth::getAuth(),
                                               PERMS_READ) ||
-            $GLOBALS['perms']->hasPermission($permentry, Auth::getAuth(),
+            $GLOBALS['perms']->hasPermission($permentry, Horde_Auth::getAuth(),
                                               PERMS_READ)) {
             return $this->_getRecords($start, $end, $accountcode, $dcontext,
                                       $rowstart, $rowlimit);
@@ -66,11 +66,11 @@ class Operator_Driver {
         } else {
             $permentry = 'operator:accountcodes:' . $accountcode;
         }
-        if (Auth::isAdmin() ||
+        if (Horde_Auth::isAdmin() ||
             $GLOBALS['perms']->hasPermission('operator:accountcodes',
-                                              Auth::getAuth(),
+                                              Horde_Auth::getAuth(),
                                               PERMS_READ) ||
-            $GLOBALS['perms']->hasPermission($permentry, Auth::getAuth(), 
+            $GLOBALS['perms']->hasPermission($permentry, Horde_Auth::getAuth(), 
                                               PERMS_READ)) {
             return $this->_getMonthlyCallStats($start, $end, $accountcode,
                                                $dcontext);

diff --git a/lib/Operator.php b/lib/Operator.php
index 327d24d..788ca13 100644 (file)
--- a/lib/Operator.php
+++ b/lib/Operator.php
@@ -2,7 +2,7 @@
 /**
  * Operator Base Class.
  *
- * $Horde: incubator/operator/lib/Operator.php,v 1.16 2009/06/10 06:07:34 slusarz Exp $
+ * $Horde: incubator/operator/lib/Operator.php,v 1.17 2009/07/08 18:29:18 slusarz Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -92,16 +92,16 @@ class Operator {
 
         $accountcodes = $operator_driver->getAccountCodes();
 
-        if (Auth::isAdmin() || 
+        if (Horde_Auth::isAdmin() || 
             $GLOBALS['perms']->hasPermission('operator:accountcodes',
-                                             Auth::getAuth(),
+                                             Horde_Auth::getAuth(),
                                              PERMS_READ)) {
             $permfilter = false;
         }
 
         if (!$permfilter ||
             $GLOBALS['perms']->hasPermission('operator:accountcodes:%',
-                                             Auth::geAuth(), 
+                                             Horde_Auth::geAuth(), 
                                              PERMS_READ)) {
 
             // Add an option to select all accounts
@@ -127,9 +127,9 @@ class Operator {
                     $permitem = 'operator:accountcodes:' . $accountcode;
                 }
 
-                if (Auth::isAdmin() ||
+                if (Horde_Auth::isAdmin() ||
                     $GLOBALS['perms']->hasPermission($permitem,
-                                                     Auth::getAuth(),
+                                                     Horde_Auth::getAuth(),
                                                      PERMS_SHOW)) {
                     $accountcodes[$accountcode] = $values[$index];
                 }