Convert operator to Horde_Session

diff --git a/operator/export.php b/operator/export.php
index 498ef3d..7cbb678 100644 (file)
--- a/operator/export.php
+++ b/operator/export.php
@@ -16,7 +16,6 @@ require_once OPERATOR_BASE . '/lib/Form/SearchCDR.php';
 $cache = $GLOBALS['cache'];
 $renderer = new Horde_Form_Renderer();
 $vars = Horde_Variables::getDefaultVariables();
-$data = array();
 
 if (!$vars->exists('rowstart')) {
     $rowstart = 0;
@@ -25,19 +24,18 @@ if (!$vars->exists('rowstart')) {
     $rowstart = 0;
 }
 
-if (isset($_SESSION['operator']['lastdata'])) {
-    $data = $_SESSION['operator']['lastdata'];
-}
+$data = $session->get('operator', 'lastdata', Horde_Session::TYPE_ARRAY);
 
 $form = new ExportCDRForm(_("Export Call Detail Records"), $vars);
 if ($form->isSubmitted() && $form->validate($vars, true)) {
     try {
-        $_SESSION['operator']['lastsearch']['params'] = array(
+        $session->set('operator', 'lastsearch/params', array(
             'accountcode' => $vars->get('accountcode'),
             'dcontext' => $vars->get('dcontext'),
             'startdate' => $vars->get('startdate'),
-            'enddate' => $vars->get('enddate'));
-        $_SESSION['operator']['lastdata'] = $data;
+            'enddate' => $vars->get('enddate')
+        ));
+        $session->set('operator', 'lastdata', $data);
 
         $form->execute();
 
@@ -47,10 +45,8 @@ if ($form->isSubmitted() && $form->validate($vars, true)) {
         $data = array();
     }
 } else {
-    if (isset($_SESSION['operator']['lastsearch']['params'])) {
-        foreach($_SESSION['operator']['lastsearch']['params'] as $var => $val) {
-            $vars->set($var, $val);
-        }
+    foreach($session->get('operator', 'lastsearch/params', Horde_Session::TYPE_ARRAY) as $var => $val) {
+        $vars->set($var, $val);
     }
 }
 

diff --git a/operator/search.php b/operator/search.php
index 2f6f07a..ea02185 100644 (file)
--- a/operator/search.php
+++ b/operator/search.php
@@ -16,7 +16,6 @@ require_once OPERATOR_BASE . '/lib/Form/SearchCDR.php';
 $cache = $GLOBALS['cache'];
 $renderer = new Horde_Form_Renderer();
 $vars = Horde_Variables::getDefaultVariables();
-$data = array();
 
 if (!$vars->exists('rowstart')) {
     $rowstart = 0;
@@ -25,9 +24,7 @@ if (!$vars->exists('rowstart')) {
     $rowstart = 0;
 }
 
-if (isset($_SESSION['operator']['lastdata'])) {
-    $data = $_SESSION['operator']['lastdata'];
-}
+$data = $session->get('operator', 'lastdata', Horde_Session::TYPE_ARRAY);
 
 $form = new SearchCDRForm(_("Search Call Detail Records"), $vars);
 if ($form->isSubmitted() && $form->validate($vars, true)) {
@@ -45,12 +42,13 @@ if ($form->isSubmitted() && $form->validate($vars, true)) {
                                                             $dcontext, $rowstart,
                                                             $GLOBALS['conf']['storage']['searchlimit']);
 
-        $_SESSION['operator']['lastsearch']['params'] = array(
+        $session->set('operator', 'lastsearch/params', array(
             'accountcode' => $vars->get('accountcode'),
             'dcontext' => $vars->get('dcontext'),
             'startdate' => $vars->get('startdate'),
-            'enddate' => $vars->get('enddate'));
-        $_SESSION['operator']['lastdata'] = $data;
+            'enddate' => $vars->get('enddate')
+        ));
+        $session->set('operator', 'lastdata', $data);
 
     } catch (Exception $e) {
         //$notification->push(_("Invalid date requested."));
@@ -58,10 +56,8 @@ if ($form->isSubmitted() && $form->validate($vars, true)) {
         $data = array();
     }
 } else {
-    if (isset($_SESSION['operator']['lastsearch']['params'])) {
-        foreach($_SESSION['operator']['lastsearch']['params'] as $var => $val) {
-            $vars->set($var, $val);
-        }
+    foreach($session->get('operator', 'lastsearch/params', Horde_Session::TYPE_ARRAY) as $var => $val) {
+        $vars->set($var, $val);
     }
 }
 

diff --git a/operator/viewgraph.php b/operator/viewgraph.php
index 59c34e9..6263120 100644 (file)
--- a/operator/viewgraph.php
+++ b/operator/viewgraph.php
@@ -58,11 +58,12 @@ if ($form->isSubmitted() && $form->validate($vars, true)) {
                 // Cached data is stored serialized
                 $stats = unserialize($stats);
             }
-            $_SESSION['operator']['lastsearch']['params'] = array(
+            $session->set('operator', 'lastsearch/params', array(
                 'accountcode' => $vars->get('accountcode'),
                 'dcontext' => $vars->get('dcontext'),
                 'startdate' => $vars->get('startdate'),
-                'enddate' => $vars->get('enddate'));
+                'enddate' => $vars->get('enddate')
+            ));
         }
     } catch (Horde_Exception $e) {
         //$notification->push(_("Invalid dates requested."));
@@ -70,14 +71,10 @@ if ($form->isSubmitted() && $form->validate($vars, true)) {
         $stats = array();
     }
 } else {
-    if (isset($_SESSION['operator']['lastsearch']['params'])) {
-        foreach($_SESSION['operator']['lastsearch']['params'] as $var => $val) {
-            $vars->set($var, $val);
-        }
-    }
-    if (isset($_SESSION['operator']['lastsearch']['data'])) {
-        $data = $_SESSION['operator']['lastsearch']['data'];
+    foreach ($session->get('operator', 'lastsearch/params', Horde_Session::TYPE_ARRAY) as $var => $val) {
+        $vars->set($var, $val);
     }
+    $data = $session->get('operator', 'lastsearch/data', Horde_Session::TYPE_ARRAY);
 }
 
 $graphs = array();
@@ -107,4 +104,4 @@ if (!empty($stats) && !empty($graphs[$curgraph])) {
 require $registry->get('templates', 'horde') . '/common-footer.inc';
 
 // Don't leave stale stats lying about
-unset($_SESSION['operator']['stats']);
+$session->remove('operator', 'stats');