From f91c0d058e250c0e421c0f82a0263497ceefdab0 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 5 Aug 2009 21:30:29 -0600
Subject: [PATCH] Horde_Auth::authenticationFailureRedirect ->
 Horde_Auth::authenticateFailure

---
 ansel/faces/search/tabs.php    | 2 +-
 ansel/lib/base.php             | 2 +-
 babel/lib/base.php             | 2 +-
 chora/lib/base.php             | 2 +-
 crumb/lib/base.php             | 2 +-
 fima/lib/base.php              | 2 +-
 folks/edit/friends/approve.php | 2 +-
 folks/edit/friends/reject.php  | 2 +-
 folks/edit/tabs.php            | 2 +-
 folks/friends.php              | 2 +-
 folks/lib/base.php             | 2 +-
 gollem/lib/base.php            | 2 +-
 imp/lib/base.php               | 2 +-
 ingo/lib/base.php              | 2 +-
 jeta/lib/base.php              | 2 +-
 kastalia/download.php          | 2 +-
 kastalia/lib/base.php          | 2 +-
 kronolith/lib/base.php         | 2 +-
 nag/lib/base.php               | 2 +-
 news/add.php                   | 2 +-
 news/admin/tabs.php            | 2 +-
 news/lib/base.php              | 2 +-
 news/reads.php                 | 2 +-
 skoli/lib/base.php             | 2 +-
 timeobjects/lib/base.php       | 2 +-
 turba/lib/base.php             | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ansel/faces/search/tabs.php b/ansel/faces/search/tabs.php
index 4cee56f68..7b6f52e22 100644
--- a/ansel/faces/search/tabs.php
+++ b/ansel/faces/search/tabs.php
@@ -14,7 +14,7 @@ require_once dirname(__FILE__) . '/../../lib/base.php';
 $faces = Ansel_Faces::factory();
 /* Face search is allowed only to authenticated users */
 if (!Horde_Auth::isauthenticated()) {
-    Horde_Auth::authenticationFailureRedirect();
+    Horde_Auth::authenticateFailure();
 }
 
 /* Show tabs */
diff --git a/ansel/lib/base.php b/ansel/lib/base.php
index 3f0cd1018..53a07c702 100644
--- a/ansel/lib/base.php
+++ b/ansel/lib/base.php
@@ -33,7 +33,7 @@ $registry = Horde_Registry::singleton($s_ctrl);
 try {
     $registry->pushApp('ansel', array('check_perms' => (Horde_Util::nonInputVar('ansel_authentication') != 'none'), 'logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('ansel', $e);
+    Horde_Auth::authenticateFailure('ansel', $e);
 }
 $conf = $GLOBALS['conf'];
 define('ANSEL_TEMPLATES', $registry->get('templates'));
diff --git a/babel/lib/base.php b/babel/lib/base.php
index 8eccc3012..f0938a60a 100644
--- a/babel/lib/base.php
+++ b/babel/lib/base.php
@@ -32,7 +32,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('babel', array('logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('babel', $e);
+    Horde_Auth::authenticateFailure('babel', $e);
 }
 
 $conf = &$GLOBALS['conf'];
diff --git a/chora/lib/base.php b/chora/lib/base.php
index 38b156449..7b7435ca8 100644
--- a/chora/lib/base.php
+++ b/chora/lib/base.php
@@ -34,7 +34,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('chora', array('logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('chora', $e);
+    Horde_Auth::authenticateFailure('chora', $e);
 }
 $conf = &$GLOBALS['conf'];
 define('CHORA_TEMPLATES', $registry->get('templates'));
diff --git a/crumb/lib/base.php b/crumb/lib/base.php
index e0585eae0..c763eba80 100644
--- a/crumb/lib/base.php
+++ b/crumb/lib/base.php
@@ -24,7 +24,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('crumb', array('logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('crumb', $e);
+    Horde_Auth::authenticateFailure('crumb', $e);
 }
 $conf = &$GLOBALS['conf'];
 @define('CRUMB_TEMPLATES', $registry->get('templates'));
diff --git a/fima/lib/base.php b/fima/lib/base.php
index a44a14216..0fda30764 100644
--- a/fima/lib/base.php
+++ b/fima/lib/base.php
@@ -30,7 +30,7 @@ if ($session_control == 'none') {
 try {
     $registry->pushApp('fima', array('logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('fima', $e);
+    Horde_Auth::authenticateFailure('fima', $e);
 }
 $conf = &$GLOBALS['conf'];
 @define('FIMA_TEMPLATES', $registry->get('templates'));
diff --git a/folks/edit/friends/approve.php b/folks/edit/friends/approve.php
index 6d846e781..0b15d6e28 100644
--- a/folks/edit/friends/approve.php
+++ b/folks/edit/friends/approve.php
@@ -15,7 +15,7 @@ require_once dirname(__FILE__) . '/../../lib/base.php';
 require_once FOLKS_BASE . '/lib/Friends.php';
 
 if (!Horde_Auth::isAuthenticated()) {
-    Horde_Auth::authenticationFailureRedirect('folks');
+    Horde_Auth::authenticateFailure('folks');
 }
 
 $user = Horde_Util::getGet('user');
diff --git a/folks/edit/friends/reject.php b/folks/edit/friends/reject.php
index 70c81126c..9877584b5 100644
--- a/folks/edit/friends/reject.php
+++ b/folks/edit/friends/reject.php
@@ -15,7 +15,7 @@ require_once dirname(__FILE__) . '/../../lib/base.php';
 require_once FOLKS_BASE . '/lib/Friends.php';
 
 if (!Horde_Auth::isAuthenticated()) {
-    Horde_Auth::authenticationFailureRedirect('folks');
+    Horde_Auth::authenticateFailure('folks');
 }
 
 $user = Horde_Util::getGet('user');
diff --git a/folks/edit/tabs.php b/folks/edit/tabs.php
index 9b0a10c53..b21af4116 100644
--- a/folks/edit/tabs.php
+++ b/folks/edit/tabs.php
@@ -12,7 +12,7 @@
  */
 
 if (!Horde_Auth::isAuthenticated()) {
-    Horde_Auth::authenticationFailureRedirect('folks');
+    Horde_Auth::authenticateFailure('folks');
 }
 
 $vars = Horde_Variables::getDefaultVariables();
diff --git a/folks/friends.php b/folks/friends.php
index 862c3c46f..a5249ecdc 100644
--- a/folks/friends.php
+++ b/folks/friends.php
@@ -15,7 +15,7 @@ require_once dirname(__FILE__) . '/lib/base.php';
 require_once FOLKS_BASE . '/lib/Forms/Activity.php';
 
 if (!Horde_Auth::isAuthenticated()) {
-    Horde_Auth::authenticationFailureRedirect('folks');
+    Horde_Auth::authenticateFailure('folks');
 }
 
 $title = _("Friends");
diff --git a/folks/lib/base.php b/folks/lib/base.php
index 31ab5587d..a531353fc 100644
--- a/folks/lib/base.php
+++ b/folks/lib/base.php
@@ -22,7 +22,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('folks', array('check_perms' => (Horde_Util::nonInputVar('folks_authentication') != 'none'), 'logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('folks', $e);
+    Horde_Auth::authenticateFailure('folks', $e);
 }
 $conf = &$GLOBALS['conf'];
 define('FOLKS_TEMPLATES', $registry->get('templates'));
diff --git a/gollem/lib/base.php b/gollem/lib/base.php
index aa975bf85..b5a4e6835 100644
--- a/gollem/lib/base.php
+++ b/gollem/lib/base.php
@@ -34,7 +34,7 @@ if (Horde_Util::nonInputVar('gollem_session_control') == 'readonly') {
 try {
     $registry->pushApp('gollem', array('check_perms' => (Horde_Util::nonInputVar('gollem_authentication') != 'none'), 'logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('gollem', $e);
+    Horde_Auth::authenticateFailure('gollem', $e);
 }
 $conf = &$GLOBALS['conf'];
 define('GOLLEM_TEMPLATES', $registry->get('templates'));
diff --git a/imp/lib/base.php b/imp/lib/base.php
index 19cea7bfe..cc963e5cb 100644
--- a/imp/lib/base.php
+++ b/imp/lib/base.php
@@ -111,7 +111,7 @@ try {
         }
     }
 
-    Horde_Auth::authenticationFailureRedirect('imp', $e);
+    Horde_Auth::authenticateFailure('imp', $e);
 }
 
 // All other initialization occurs in IMP::initialize().
diff --git a/ingo/lib/base.php b/ingo/lib/base.php
index c29eaf398..5a29e3973 100644
--- a/ingo/lib/base.php
+++ b/ingo/lib/base.php
@@ -31,7 +31,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('ingo', array('check_perms' => (Horde_Util::nonInputVar('ingo_authentication') != 'none'), 'logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('ingo', $e);
+    Horde_Auth::authenticateFailure('ingo', $e);
 }
 $conf = &$GLOBALS['conf'];
 
diff --git a/jeta/lib/base.php b/jeta/lib/base.php
index bafb2ad83..7cb3f77f5 100644
--- a/jeta/lib/base.php
+++ b/jeta/lib/base.php
@@ -22,7 +22,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('jeta', array('logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('jeta', $e);
+    Horde_Auth::authenticateFailure('jeta', $e);
 }
 
 $conf = &$GLOBALS['conf'];
diff --git a/kastalia/download.php b/kastalia/download.php
index 85cef169c..16a657fd6 100755
--- a/kastalia/download.php
+++ b/kastalia/download.php
@@ -34,7 +34,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('kastalia', array('logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('kastalia', $e);
+    Horde_Auth::authenticateFailure('kastalia', $e);
 }
 //################### </MANUELLER ANMELDE CHECK (WENN base.php NICHT INCLUDIERT WIRD)> ###################
 
diff --git a/kastalia/lib/base.php b/kastalia/lib/base.php
index 1317f199c..f2ed453a7 100755
--- a/kastalia/lib/base.php
+++ b/kastalia/lib/base.php
@@ -24,7 +24,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('kastalia', array('logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('kastalia', $e);
+    Horde_Auth::authenticateFailure('kastalia', $e);
 }
 $conf = &$GLOBALS['conf'];
 @define('KASTALIA_TEMPLATES', $registry->get('templates'));
diff --git a/kronolith/lib/base.php b/kronolith/lib/base.php
index 5e40d5954..68ae6f515 100644
--- a/kronolith/lib/base.php
+++ b/kronolith/lib/base.php
@@ -41,7 +41,7 @@ $registry = Horde_Registry::singleton($s_ctrl);
 try {
     $registry->pushApp('kronolith', array('check_perms' => (Horde_Util::nonInputVar('kronolith_authentication') != 'none'), 'logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('kronolith', $e);
+    Horde_Auth::authenticateFailure('kronolith', $e);
 }
 $conf = &$GLOBALS['conf'];
 define('KRONOLITH_TEMPLATES', $registry->get('templates'));
diff --git a/nag/lib/base.php b/nag/lib/base.php
index 78317e80e..69c21f9a7 100644
--- a/nag/lib/base.php
+++ b/nag/lib/base.php
@@ -28,7 +28,7 @@ $registry = Horde_Registry::singleton($s_ctrl);
 try {
     $registry->pushApp('nag', array('check_perms' => (Horde_Util::nonInputVar('nag_authentication') != 'none'), 'logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('nag', $e);
+    Horde_Auth::authenticateFailure('nag', $e);
 }
 $conf = &$GLOBALS['conf'];
 @define('NAG_TEMPLATES', $registry->get('templates'));
diff --git a/news/add.php b/news/add.php
index 9a205dfc7..8c5fc354a 100644
--- a/news/add.php
+++ b/news/add.php
@@ -90,7 +90,7 @@ function _max_upload_size()
 // Is logged it?
 if (!Horde_Auth::isAuthenticated()) {
     $notification->push(_("Only authenticated users can post news."), 'horde.warning');
-    Horde_Auth::authenticationFailureRedirect('news');
+    Horde_Auth::authenticateFailure('news');
 }
 
 // Default vars
diff --git a/news/admin/tabs.php b/news/admin/tabs.php
index 8002fe1ab..0efc853a5 100644
--- a/news/admin/tabs.php
+++ b/news/admin/tabs.php
@@ -13,7 +13,7 @@
 /* Only admin should be using this. */
 if (!Horde_Auth::isAdmin('news:admin')) {
     $notification->push(_("You are not authorised for this action."), 'horde.warning');
-    Horde_Auth::authenticationFailureRedirect('news');
+    Horde_Auth::authenticateFailure('news');
 }
 
 $vars = Horde_Variables::getDefaultVariables();
diff --git a/news/lib/base.php b/news/lib/base.php
index 7dd89b7eb..7b0440131 100644
--- a/news/lib/base.php
+++ b/news/lib/base.php
@@ -27,7 +27,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('news', array('check_perms' => (Horde_Util::nonInputVar('news_authentication') != 'none'), 'logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('news', $e);
+    Horde_Auth::authenticateFailure('news', $e);
 }
 $conf = &$GLOBALS['conf'];
 define('NEWS_TEMPLATES', $registry->get('templates'));
diff --git a/news/reads.php b/news/reads.php
index e09bc8ec0..8a1c8b1a4 100644
--- a/news/reads.php
+++ b/news/reads.php
@@ -14,7 +14,7 @@
 require_once dirname(__FILE__) . '/lib/base.php';
 
 if (!Horde_Auth::isAuthenticated()) {
-    Horde_Auth::authenticationFailureRedirect('news');
+    Horde_Auth::authenticateFailure('news');
 }
 
 $id = Horde_Util::getFormData('id', 0);
diff --git a/skoli/lib/base.php b/skoli/lib/base.php
index 7e9de938e..751938f08 100644
--- a/skoli/lib/base.php
+++ b/skoli/lib/base.php
@@ -22,7 +22,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('skoli', array('check_perms' => (Horde_Util::nonInputVar('skoli_authentication') != 'none'), 'logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('skoli', $e);
+    Horde_Auth::authenticateFailure('skoli', $e);
 }
 $conf = &$GLOBALS['conf'];
 @define('SKOLI_TEMPLATES', $registry->get('templates'));
diff --git a/timeobjects/lib/base.php b/timeobjects/lib/base.php
index 4ecc30d2b..ed0b609ee 100644
--- a/timeobjects/lib/base.php
+++ b/timeobjects/lib/base.php
@@ -33,7 +33,7 @@ if ($session_control == 'none') {
 try {
     $registry->pushApp('timeobjects', array('logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('timeobjects', $e);
+    Horde_Auth::authenticateFailure('timeobjects', $e);
 }
 
 if (!defined('TIMEOBJECTS_BASE')) {
diff --git a/turba/lib/base.php b/turba/lib/base.php
index 47909166e..3d553584c 100644
--- a/turba/lib/base.php
+++ b/turba/lib/base.php
@@ -24,7 +24,7 @@ $registry = Horde_Registry::singleton();
 try {
     $registry->pushApp('turba', array('check_perms' => (Horde_Util::nonInputVar('turba_authentication') != 'none'), 'logintasks' => true));
 } catch (Horde_Exception $e) {
-    Horde_Auth::authenticationFailureRedirect('turba', $e);
+    Horde_Auth::authenticateFailure('turba', $e);
 }
 $conf = $GLOBALS['conf'];
 define('TURBA_TEMPLATES', $registry->get('templates'));
-- 
2.11.0