Convert vilma to Horde_Session

diff --git a/vilma/lib/Forms/EditDomainForm.php b/vilma/lib/Forms/EditDomainForm.php
index bbc2a55..f86f152 100644 (file)
--- a/vilma/lib/Forms/EditDomainForm.php
+++ b/vilma/lib/Forms/EditDomainForm.php
@@ -15,7 +15,7 @@ class EditDomainForm extends Horde_Form {
     {
         /* Check if a form is being edited. */
         $editing = $vars->exists('domain_id');
-        $domain = $_SESSION['vilma']['domain'];
+        $domain = $GLOBALS['session']->get('vilma', 'domain');
         parent::Horde_Form($vars, $editing ? _("Edit Domain") : _("New Domain"));
         if ($editing && !$this->isSubmitted()) {
             $domain = $GLOBALS['vilma_driver']->getDomain($vars->get('domain_id'));

diff --git a/vilma/lib/Vilma.php b/vilma/lib/Vilma.php
index df3d435..2ee06ab 100644 (file)
--- a/vilma/lib/Vilma.php
+++ b/vilma/lib/Vilma.php
@@ -106,9 +106,7 @@ class Vilma {
                 $domain = false;
             }
             Vilma::setCurDomain($domain);
-        } elseif (isset($_SESSION['vilma']['domain'])) {
-            $domain = $_SESSION['vilma']['domain'];
-        } else {
+        } elseif (!($domain = $GLOBALS['session']->get('vilma', 'domain'))) {
             $domain = false;
         }
 
@@ -120,7 +118,7 @@ class Vilma {
      */
     function setCurDomain($domain)
     {
-        $_SESSION['vilma']['domain'] = $domain;
+        $GLOBALS['session']->set('vilma', 'domain', $domain);
     }
 
     /**
@@ -173,7 +171,7 @@ class Vilma {
         $menu->add(Horde::url('domains/index.php'), _("_Domains"), 'domain.png');
 
         if (Vilma::getCurDomain()) {
-            $domain = $_SESSION['vilma']['domain'];
+            $domain = $GLOBALS['session']->get('vilma', 'domain');
             $url = Horde::url('users/index.php');
             $tmp = Horde_Util::addParameter($url, 'domain_id', $domain['domain_id']);
             $menu->add(Horde::url($tmp), _($domain['domain_name']), 'domain.png');

diff --git a/vilma/users/edit.php b/vilma/users/edit.php
index 9c3886a..e6700da 100644 (file)
--- a/vilma/users/edit.php
+++ b/vilma/users/edit.php
@@ -48,7 +48,7 @@ if (!$vars->exists('mode')) {
         $vars->set('mode', 'edit');
     } else {
         $vars->set('mode', 'new');
-        $domain_info = $_SESSION['vilma']['domain'];
+        $domain_info = $session->get('vilma', 'domain');
         $domain = $domain_info['domain_name'];
         $domain_id = $domain_info['domain_id'];
         $vars->set('domain', $domain);