Please, when refactoring, update *all* modules.

diff --git a/lib/Driver.php b/lib/Driver.php
index b8b2896..59b6d52 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.7 2009/07/08 18:29:18 slusarz Exp $
+ * $Horde: incubator/operator/lib/Driver.php,v 1.8 2009/12/01 12:52:49 jan Exp $
  *
  * Copyright 2007-2009 The Horde Project (http://www.horde.org/)
  *
@@ -32,9 +32,9 @@ class Operator_Driver {
         if (Horde_Auth::isAdmin() ||
             $GLOBALS['perms']->hasPermission('operator:accountcodes',
                                               Horde_Auth::getAuth(),
-                                              PERMS_READ) ||
+                                              Horde_Perms::READ) ||
             $GLOBALS['perms']->hasPermission($permentry, Horde_Auth::getAuth(),
-                                              PERMS_READ)) {
+                                              Horde_Perms::READ)) {
             return $this->_getRecords($start, $end, $accountcode, $dcontext,
                                       $rowstart, $rowlimit);
         }
@@ -69,9 +69,9 @@ class Operator_Driver {
         if (Horde_Auth::isAdmin() ||
             $GLOBALS['perms']->hasPermission('operator:accountcodes',
                                               Horde_Auth::getAuth(),
-                                              PERMS_READ) ||
+                                              Horde_Perms::READ) ||
             $GLOBALS['perms']->hasPermission($permentry, Horde_Auth::getAuth(), 
-                                              PERMS_READ)) {
+                                              Horde_Perms::READ)) {
             return $this->_getMonthlyCallStats($start, $end, $accountcode,
                                                $dcontext);
         }

diff --git a/lib/Operator.php b/lib/Operator.php
index 788ca13..a882ce9 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.17 2009/07/08 18:29:18 slusarz Exp $
+ * $Horde: incubator/operator/lib/Operator.php,v 1.18 2009/12/01 12:52:49 jan Exp $
  *
  * Copyright 2008-2009 The Horde Project (http://www.horde.org/)
  *
@@ -95,14 +95,14 @@ class Operator {
         if (Horde_Auth::isAdmin() || 
             $GLOBALS['perms']->hasPermission('operator:accountcodes',
                                              Horde_Auth::getAuth(),
-                                             PERMS_READ)) {
+                                             Horde_Perms::READ)) {
             $permfilter = false;
         }
 
         if (!$permfilter ||
             $GLOBALS['perms']->hasPermission('operator:accountcodes:%',
                                              Horde_Auth::geAuth(), 
-                                             PERMS_READ)) {
+                                             Horde_Perms::READ)) {
 
             // Add an option to select all accounts
             $keys = $accountcodes;
@@ -130,7 +130,7 @@ class Operator {
                 if (Horde_Auth::isAdmin() ||
                     $GLOBALS['perms']->hasPermission($permitem,
                                                      Horde_Auth::getAuth(),
-                                                     PERMS_SHOW)) {
+                                                     Horde_Perms::SHOW)) {
                     $accountcodes[$accountcode] = $values[$index];
                 }
             } else {