From cd825b3bf636ca2f5dd389df11d549adc646a9f5 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 8 Dec 2010 19:21:06 +0100
Subject: [PATCH] Fix variable name.

---
 vilma/lib/Forms/DeleteDomainForm.php | 2 +-
 vilma/lib/Forms/EditAliasForm.php    | 2 --
 vilma/lib/Forms/EditDomainForm.php   | 2 +-
 vilma/lib/Forms/EditForwardForm.php  | 2 --
 vilma/lib/Forms/EditUserForm.php     | 4 +---
 vilma/scripts/create_mailboxes.php   | 9 +++------
 6 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/vilma/lib/Forms/DeleteDomainForm.php b/vilma/lib/Forms/DeleteDomainForm.php
index ad8cacee8..ff50da74d 100644
--- a/vilma/lib/Forms/DeleteDomainForm.php
+++ b/vilma/lib/Forms/DeleteDomainForm.php
@@ -14,7 +14,7 @@ class DeleteDomainForm extends Horde_Form {
     {
         parent::Horde_Form($vars, _("Delete Domain"));
 
-        $domain_record = $GLOBALS['vilma_driver']->getDomain($vars->get('domain_id'));
+        $domain_record = $GLOBALS['vilma']->driver->getDomain($vars->get('domain_id'));
         if (is_a($domain_record, 'PEAR_Error')) {
             return $domain_record;
         }
diff --git a/vilma/lib/Forms/EditAliasForm.php b/vilma/lib/Forms/EditAliasForm.php
index e5c1c450a..f3e1ddf48 100644
--- a/vilma/lib/Forms/EditAliasForm.php
+++ b/vilma/lib/Forms/EditAliasForm.php
@@ -13,8 +13,6 @@ class EditAliasForm extends Horde_Form {
 
     function EditAliasForm(&$vars)
     {
-        global $vilma_driver;
-
         $type = $vars->get('type');
         $editing = ($vars->get('mode') == 'edit');
         if ($editing) {
diff --git a/vilma/lib/Forms/EditDomainForm.php b/vilma/lib/Forms/EditDomainForm.php
index f86f15262..550ba2aa6 100644
--- a/vilma/lib/Forms/EditDomainForm.php
+++ b/vilma/lib/Forms/EditDomainForm.php
@@ -18,7 +18,7 @@ class EditDomainForm extends Horde_Form {
         $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'));
+            $domain = $GLOBALS['vilma']->driver->getDomain($vars->get('domain_id'));
             if (is_a($domain, 'PEAR_Error')) {
                 return $domain;
             }
diff --git a/vilma/lib/Forms/EditForwardForm.php b/vilma/lib/Forms/EditForwardForm.php
index 7fc2e6ecf..cd3a4f3f4 100644
--- a/vilma/lib/Forms/EditForwardForm.php
+++ b/vilma/lib/Forms/EditForwardForm.php
@@ -13,8 +13,6 @@ class EditForwardForm extends Horde_Form {
 
     function EditForwardForm(&$vars)
     {
-        global $vilma_driver;
-
         $type = $vars->get('type');
         $editing = ($vars->get('mode') == 'edit');
         if ($editing) {
diff --git a/vilma/lib/Forms/EditUserForm.php b/vilma/lib/Forms/EditUserForm.php
index a4e4d488e..e04f30127 100644
--- a/vilma/lib/Forms/EditUserForm.php
+++ b/vilma/lib/Forms/EditUserForm.php
@@ -13,8 +13,6 @@ class EditUserForm extends Horde_Form {
 
     function EditUserForm(&$vars)
     {
-        global $vilma_driver;
-
         $type = $vars->get('type');
         $editing = ($vars->get('mode') == 'edit');
         if ($editing) {
@@ -53,7 +51,7 @@ class EditUserForm extends Horde_Form {
             $this->addVariable(_("Password"), 'password', 'passwordconfirm', true);
         }
         $this->addVariable(_("Full Name"), 'user_full_name', 'text', true);
-        $attrs = $vilma_driver->getUserFormAttributes();
+        $attrs = $GLOBALS['vilma']->driver->getUserFormAttributes();
         foreach ($attrs as $attr) {
             $v = &$this->addVariable($attr['label'], $attr['name'],
                                 $attr['type'], $attr['required'],
diff --git a/vilma/scripts/create_mailboxes.php b/vilma/scripts/create_mailboxes.php
index e5e34e103..b3199f009 100644
--- a/vilma/scripts/create_mailboxes.php
+++ b/vilma/scripts/create_mailboxes.php
@@ -5,11 +5,8 @@
  * system for any new users. A cron job can be set up to run this periodically.
  */
 
-// No auth.
-@define('AUTH_HANDLER', true);
-
-@define('VILMA_BASE', dirname(__FILE__) . '/..');
-require_once VILMA_BASE . '/lib/base.php';
+require_once dirname(__FILE__) . '/../lib/Application.php';
+$vilma = Horde_Registry::appInit('vilma', array('authentication' => 'none'));
 
 // Make sure no one runs this from the web.
 if (!Horde_Cli::runningFromCLI()) {
@@ -23,7 +20,7 @@ Horde_Cli::init();
 /* Make sure there's no compression. */
 @ob_end_clean();
 
-$users_by_domain = $vilma_driver->getAllUsers();
+$users_by_domain = $vilma->driver->getAllUsers();
 
 foreach ($users_by_domain as $domain => $users) {
     foreach ($users as $user) {
-- 
2.11.0