Convert hermes to Horde_Session

diff --git a/hermes/lib/Api.php b/hermes/lib/Api.php
index 60a3399..d311150 100644 (file)
--- a/hermes/lib/Api.php
+++ b/hermes/lib/Api.php
@@ -112,8 +112,8 @@ class Hermes_Api extends Horde_Registry_Api
             }
 
             $subtotal_column = null;
-            if (isset($_SESSION['hermes_search_mode'])) {
-                switch ($_SESSION['hermes_search_mode']) {
+            if ($search_mode = $GLOBALS['session']->get('hermes', 'search_mode')) {
+                switch ($search_mode) {
                 case 'date':
                     $subtotal_column = 'date';
                     break;

diff --git a/hermes/lib/Hermes.php b/hermes/lib/Hermes.php
index 12bd3aa..66c428f 100644 (file)
--- a/hermes/lib/Hermes.php
+++ b/hermes/lib/Hermes.php
@@ -226,12 +226,11 @@ class Hermes {
         $tabs->addTab(_("By Job Type"), $sUrl, 'jobtype');
         $tabs->addTab(_("By Cost Object"), $sUrl, 'costobject');
         if ($mode = Horde_Util::getFormData('search_mode')) {
-            $_SESSION['hermes_search_mode'] = $mode;
+            $GLOBALS['session']->set('hermes', 'search_mode', $mode);
+        } elseif (!$GLOBALS['session']->exists('hermes', 'search_mode')) {
+            $GLOBALS['session']->set('hermes', 'search_mode', 'summary');
         }
-        if (!isset($_SESSION['hermes_search_mode'])) {
-            $_SESSION['hermes_search_mode'] = 'summary';
-        }
-        return $tabs->render($_SESSION['hermes_search_mode']);
+        return $tabs->render($GLOBALS['session']->get('hermes', 'search_mode'));
     }
 
 }

diff --git a/hermes/search.php b/hermes/search.php
index 6df9de5..1f73a28 100644 (file)
--- a/hermes/search.php
+++ b/hermes/search.php
@@ -38,17 +38,16 @@ case 'searchform':
     $form->validate($vars);
     $criteria = $form->getSearchCriteria($vars);
     if (is_null($criteria)) {
-        unset($_SESSION['hermes_search_criteria']);
+        $session->remove('hermes', 'search_criteria');
     } else {
-        $_SESSION['hermes_search_criteria'] = serialize($vars);
+        $session->set('hermes', 'search_criteria', $vars);
     }
     break;
 
 case 'exportform':
-    if (!isset($_SESSION['hermes_search_criteria'])) {
+    if (!($searchVars = $session->get('hermes', 'search_criteria'))) {
         $notification->push(_("No search to export!"), 'horde.error');
     } else {
-        $searchVars = unserialize($_SESSION['hermes_search_criteria']);
         $searchForm = new SearchForm($searchVars);
         $criteria = $searchForm->getSearchCriteria($searchVars);
         if (is_null($criteria)) {
@@ -91,9 +90,7 @@ if (!$print_view) {
 }
 require HERMES_TEMPLATES . '/common-header.inc';
 
-if (isset($_SESSION['hermes_search_criteria'])) {
-    $searchVars = unserialize($_SESSION['hermes_search_criteria']);
-} else {
+if (!($searchVars = $session->get('hermes', 'search_criteria'))) {
     $searchVars = $vars;
 }
 $form = new SearchForm($searchVars);
@@ -103,7 +100,7 @@ require HERMES_TEMPLATES . '/menu.inc';
 $form->renderActive(new Horde_Form_Renderer(), $searchVars, 'search.php', 'post');
 echo '<br />';
 
-if (isset($_SESSION['hermes_search_criteria'])) {
+if ($session->exists('hermes', 'search_criteria')) {
     echo Hermes::tabs();
 
     if (is_null($criteria)) {