From 83ce00d64fc03b96995e7666cc6be09eea35f96f Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Sun, 10 Jan 2010 13:25:51 -0500
Subject: [PATCH] Operator: Fix references to operator driver

---
 operator/lib/Form/SearchCDR.php | 2 --
 operator/lib/Operator.php       | 4 ++--
 operator/search.php             | 2 +-
 operator/viewgraph.php          | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/operator/lib/Form/SearchCDR.php b/operator/lib/Form/SearchCDR.php
index 73421943b..e04537a5c 100644
--- a/operator/lib/Form/SearchCDR.php
+++ b/operator/lib/Form/SearchCDR.php
@@ -17,8 +17,6 @@ class SearchCDRForm extends Horde_Form {
 
     function SearchCDRForm($title, &$vars)
     {
-        global $operator_driver;
-
         parent::Horde_Form($vars, $title);
 
         // FIXME: Generate a list of clients from Turba?
diff --git a/operator/lib/Operator.php b/operator/lib/Operator.php
index a882ce9e6..90dbbaa3c 100644
--- a/operator/lib/Operator.php
+++ b/operator/lib/Operator.php
@@ -88,9 +88,9 @@ class Operator {
      */
     function getAccountCodes($permfilter = false)
     {
-        global $operator_driver;
+        global $operator;
 
-        $accountcodes = $operator_driver->getAccountCodes();
+        $accountcodes = $operator->driver->getAccountCodes();
 
         if (Horde_Auth::isAdmin() || 
             $GLOBALS['perms']->hasPermission('operator:accountcodes',
diff --git a/operator/search.php b/operator/search.php
index 8f31a5adc..30e7cc5aa 100644
--- a/operator/search.php
+++ b/operator/search.php
@@ -46,7 +46,7 @@ if ($form->isSubmitted() && $form->validate($vars, true)) {
     if (is_a($start, 'PEAR_Error') || is_a($end, 'PEAR_Error')) {
         $notification->push(_("Invalid date requested."));
     } else {
-        $data = $operator_driver->getRecords($start, $end, $accountcode,
+        $data = $operator->driver->getRecords($start, $end, $accountcode,
                                              $dcontext, $rowstart, $numrows);
         if (is_a($data, 'PEAR_Error')) {
             $notification->push($data);
diff --git a/operator/viewgraph.php b/operator/viewgraph.php
index fe36c5d74..e9e1430a4 100644
--- a/operator/viewgraph.php
+++ b/operator/viewgraph.php
@@ -43,7 +43,7 @@ if ($form->isSubmitted() && $form->validate($vars, true)) {
         // the object.
         $stats = $cache->get($cachekey, 0);
         if ($stats === false) {
-            $stats = $operator_driver->getMonthlyCallStats($start,
+            $stats = $operator->driver->getMonthlyCallStats($start,
                                                            $end,
                                                            $accountcode,
                                                            $dcontext);
-- 
2.11.0