From 570ebc8fd3a036955df5d1e7f80024d568e66dfe Mon Sep 17 00:00:00 2001 From: Ben Klang Date: Fri, 8 Jan 2010 12:41:29 -0500 Subject: [PATCH] Vilma: Horde::authenticationFailureRedirect() -> Horde_Auth::authenticateFailure() --- vilma/domains/delete.php | 2 +- vilma/domains/edit.php | 2 +- vilma/domains/index.php | 2 +- vilma/lib/base.php | 2 +- vilma/users/delete.php | 2 +- vilma/users/edit.php | 2 +- vilma/users/editAlias.php | 2 +- vilma/users/editForward.php | 2 +- vilma/users/index.php | 2 +- vilma/virtuals/delete.php | 2 +- vilma/virtuals/edit.php | 2 +- vilma/virtuals/index.php | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vilma/domains/delete.php b/vilma/domains/delete.php index f1bdd128e..d71101090 100644 --- 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 fcee6149a..1fb4c5c9b 100644 --- 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 14497cdfe..40c1d7760 100644 --- 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 34a0c7216..020d36807 100644 --- 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 d44ca5fd8..e6ce12b73 100644 --- 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 1da826fb2..dd2c9d7f4 100644 --- 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 cac4600d4..6e9365fb2 100644 --- 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 8dbd31cd4..85af03375 100644 --- 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 a3438b7d2..1956ccfd1 100644 --- 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 faa46157b..3edf91b4e 100644 --- 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 5129597d1..8980451a9 100644 --- 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 21c3c3661..e91ebd252 100644 --- 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'); -- 2.11.0