From 19d8a5dbe1a1d8cbccdf279d03e36e73a1e98ebe Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 14 Jan 2011 12:27:47 -0700
Subject: [PATCH] Create a generic admin check login task.

Disable this login task if not an admin
Move logger check into login task
---
 framework/Core/lib/Horde/Registry.php              | 10 --------
 .../Task/{TestScriptActive.php => AdminCheck.php}  | 28 ++++++++++++++++++----
 2 files changed, 23 insertions(+), 15 deletions(-)
 rename horde/lib/LoginTasks/Task/{TestScriptActive.php => AdminCheck.php} (51%)

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 19149b973..17474a583 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -2107,16 +2107,6 @@ class Horde_Registry
         $this->loadPrefs();
 
         $this->setLanguageEnvironment(isset($options['language']) ? $options['language'] : null, $app);
-
-        /* If an admin, check for logger errors. */
-        if ($this->isAdmin()) {
-            // Do this to ensure Logger object was initialized.
-            $injector->getInstance('Horde_Log_Logger');
-
-            if ($error = $injector->getInstance('Horde_Core_Factory_Logger')->error) {
-                $injector->getInstance('Horde_Notification')->push($error, 'horde.warning');
-            }
-        }
     }
 
     /**
diff --git a/horde/lib/LoginTasks/Task/TestScriptActive.php b/horde/lib/LoginTasks/Task/AdminCheck.php
similarity index 51%
rename from horde/lib/LoginTasks/Task/TestScriptActive.php
rename to horde/lib/LoginTasks/Task/AdminCheck.php
index b7716fd25..3f74c6182 100644
--- a/horde/lib/LoginTasks/Task/TestScriptActive.php
+++ b/horde/lib/LoginTasks/Task/AdminCheck.php
@@ -1,8 +1,9 @@
 <?php
 /**
- * Login task to check if the test script is active.
+ * Login task to check various Horde configuration/setup values, and then
+ * report failures to an admin via the notification system.
  *
- * Copyright 2010 The Horde Project (http://www.horde.org/)
+ * Copyright 2011 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you
  * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
@@ -12,7 +13,7 @@
  * @license  http://www.fsf.org/copyleft/lgpl.html LGPL
  * @package  Horde
  */
-class Horde_LoginTasks_Task_TestScriptActive extends Horde_LoginTasks_Task
+class Horde_LoginTasks_Task_AdminCheck extends Horde_LoginTasks_Task
 {
     /**
      * The interval at which to run the task.
@@ -29,14 +30,31 @@ class Horde_LoginTasks_Task_TestScriptActive extends Horde_LoginTasks_Task
     public $display = Horde_LoginTasks::DISPLAY_NONE;
 
     /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->active = $GLOBALS['registry']->isAdmin();
+    }
+
+    /**
      * Perform all functions for this task.
      */
     public function execute()
     {
-        if ($GLOBALS['registry']->isAdmin() &&
-            empty($GLOBALS['conf']['testdisable'])) {
+        /* Check if test script is active. */
+        if (empty($GLOBALS['conf']['testdisable'])) {
             $GLOBALS['notification']->push(_("The test script is currently enabled. For security reasons, disable test scripts when you are done testing (see horde/docs/INSTALL)."), 'horde.warning');
         }
+
+        /* Check that logger configuration is correct. */
+
+        // Ensure Logger object was initialized.
+        $GLOBALS['injector']->getInstance('Horde_Log_Logger');
+
+        if ($error = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Logger')->error) {
+            $GLOBALS['notification']->push($error, 'horde.warning');
+        }
     }
 
 }
-- 
2.11.0