Vilma: Horde::authenticationFailureRedirect() -> Horde_Auth::authenticateFailure()

diff --git a/vilma/domains/delete.php b/vilma/domains/delete.php
index f1bdd12..d711010 100644 (file)
--- a/vilma/domains/delete.php
+++ b/vilma/domains/delete.php
@@ -15,7 +15,7 @@ require_once VILMA_BASE . '/lib/Forms/DeleteDomainForm.php';
 
 /* Only admin should be using this. */
 if (!Vilma::hasPermission($domain)) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 
 $vars = Horde_Variables::getDefaultVariables();

diff --git a/vilma/domains/edit.php b/vilma/domains/edit.php
index fcee614..1fb4c5c 100644 (file)
--- a/vilma/domains/edit.php
+++ b/vilma/domains/edit.php
@@ -15,7 +15,7 @@ require_once VILMA_BASE . '/lib/Forms/EditDomainForm.php';
 
 /* Only admin should be using this. */
 if (!Vilma::hasPermission($domain)) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 
 //$domain_id = Horde_Util::getFormData('domain_id');

diff --git a/vilma/domains/index.php b/vilma/domains/index.php
index 14497cd..40c1d77 100644 (file)
--- a/vilma/domains/index.php
+++ b/vilma/domains/index.php
@@ -13,7 +13,7 @@ require_once VILMA_BASE . '/lib/base.php';
 
 /* Only admin should be using this. */
 if (!Vilma::hasPermission($domain)) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 
 // Having a current domain doesn't make sense on this page

diff --git a/vilma/lib/base.php b/vilma/lib/base.php
index 34a0c72..020d368 100644 (file)
--- a/vilma/lib/base.php
+++ b/vilma/lib/base.php
@@ -25,7 +25,7 @@ try {
     $registry->pushApp('vilma', !defined('AUTH_HANDLER'));
 } catch (Horde_Exception $e) {
     if ($e->getCode() == 'permission_denied') {
-        Horde::authenticationFailureRedirect();
+        Horde_Auth::authenticateFailure('vilma', $e);
     }
     Horde::fatal($e, __FILE__, __LINE__, false);
 }

diff --git a/vilma/users/delete.php b/vilma/users/delete.php
index d44ca5f..e6ce12b 100644 (file)
--- a/vilma/users/delete.php
+++ b/vilma/users/delete.php
@@ -14,7 +14,7 @@ require_once 'Horde/Form.php';
 
 /* Only admin should be using this. */
 if (!Vilma::hasPermission($domain)) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 
 $vars = Horde_Variables::getDefaultVariables();

diff --git a/vilma/users/edit.php b/vilma/users/edit.php
index 1da826f..dd2c9d7 100644 (file)
--- a/vilma/users/edit.php
+++ b/vilma/users/edit.php
@@ -19,7 +19,7 @@ require_once VILMA_BASE . '/lib/Forms/EditUserForm.php';
 
 /* Only admin should be using this. */
 if (!Vilma::hasPermission($domain)) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 $vars = Horde_Variables::getDefaultVariables();
 $address = $vars->get('address');

diff --git a/vilma/users/editAlias.php b/vilma/users/editAlias.php
index cac4600..6e9365f 100644 (file)
--- a/vilma/users/editAlias.php
+++ b/vilma/users/editAlias.php
@@ -19,7 +19,7 @@ require_once VILMA_BASE . '/lib/Forms/EditAliasForm.php';
 
 /* Only admin should be using this. */
 if (!Vilma::hasPermission($domain)) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 $vars = Variables::getDefaultVariables();
 

diff --git a/vilma/users/editForward.php b/vilma/users/editForward.php
index 8dbd31c..85af033 100644 (file)
--- a/vilma/users/editForward.php
+++ b/vilma/users/editForward.php
@@ -19,7 +19,7 @@ require_once VILMA_BASE . '/lib/Forms/EditForwardForm.php';
 
 /* Only admin should be using this. */
 if (!Vilma::hasPermission($domain)) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 $vars = Variables::getDefaultVariables();
 

diff --git a/vilma/users/index.php b/vilma/users/index.php
index a3438b7..1956ccf 100644 (file)
--- a/vilma/users/index.php
+++ b/vilma/users/index.php
@@ -15,7 +15,7 @@ require_once VILMA_BASE . '/lib/base.php';
 
 /* Only admin should be using this. */
 if (!Vilma::hasPermission($curdomain)) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 
 // Input validation: make sure we have a valid section

diff --git a/vilma/virtuals/delete.php b/vilma/virtuals/delete.php
index faa4615..3edf91b 100644 (file)
--- a/vilma/virtuals/delete.php
+++ b/vilma/virtuals/delete.php
@@ -14,7 +14,7 @@ require_once 'Horde/Form.php';
 
 /* Only admin should be using this. */
 if (!Horde_Auth::isAdmin()) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 
 $vars = Horde_Variables::getDefaultVariables();

diff --git a/vilma/virtuals/edit.php b/vilma/virtuals/edit.php
index 5129597..8980451 100644 (file)
--- a/vilma/virtuals/edit.php
+++ b/vilma/virtuals/edit.php
@@ -15,7 +15,7 @@ require_once 'Horde/Form/Action.php';
 
 /* Only admin should be using this. */
 if (!Horde_Auth::isAdmin() && !Vilma::isDomainAdmin()) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 
 $domain = Vilma::getDomain();

diff --git a/vilma/virtuals/index.php b/vilma/virtuals/index.php
index 21c3c36..e91ebd2 100644 (file)
--- a/vilma/virtuals/index.php
+++ b/vilma/virtuals/index.php
@@ -13,7 +13,7 @@ require_once VILMA_BASE . '/lib/base.php';
 
 /* Only admin should be using this. */
 if (!Horde_Auth::isAdmin() && !Vilma::isDomainAdmin()) {
-    Horde::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure('vilma', $e);
 }
 
 $user = Horde_Util::getFormData('user');