Operator: Fix references to operator driver

diff --git a/operator/lib/Form/SearchCDR.php b/operator/lib/Form/SearchCDR.php
index 7342194..e04537a 100644 (file)
--- 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 a882ce9..90dbbaa 100644 (file)
--- 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 8f31a5a..30e7cc5 100644 (file)
--- 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 fe36c5d..e9e1430 100644 (file)
--- 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);