From 2a01cd71f3808507b569caa4b53518f0ea83be6e Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Tue, 9 Mar 2010 19:41:53 +0100
Subject: [PATCH] Simplify

---
 framework/LoginTasks/lib/Horde/LoginTasks/Task.php | 10 +++++++++
 .../LoginTasks/lib/Horde/LoginTasks/Tasklist.php   | 25 +++++++---------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/framework/LoginTasks/lib/Horde/LoginTasks/Task.php b/framework/LoginTasks/lib/Horde/LoginTasks/Task.php
index 95c8417f7..7b279d7e7 100644
--- a/framework/LoginTasks/lib/Horde/LoginTasks/Task.php
+++ b/framework/LoginTasks/lib/Horde/LoginTasks/Task.php
@@ -86,6 +86,16 @@ abstract class Horde_LoginTasks_Task
     }
 
     /**
+     * Does the task require to be displayed?
+     *
+     * @return boolean True in case the task should be displayed.
+     */
+    public function needsDisplay()
+    {
+        return $this->display != Horde_LoginTasks::DISPLAY_NONE;
+    }
+
+    /**
      * Indicates if the display of the current task should be joined with the
      * given previous task.
      *
diff --git a/framework/LoginTasks/lib/Horde/LoginTasks/Tasklist.php b/framework/LoginTasks/lib/Horde/LoginTasks/Tasklist.php
index 0c54e686d..5790df738 100644
--- a/framework/LoginTasks/lib/Horde/LoginTasks/Tasklist.php
+++ b/framework/LoginTasks/lib/Horde/LoginTasks/Tasklist.php
@@ -54,22 +54,13 @@ class Horde_LoginTasks_Tasklist
      */
     public function addTask($task)
     {
-        $tmp = array(
-            'display' => false,
-            'task' => $task
-        );
-
-        if ($task->display != Horde_LoginTasks::DISPLAY_NONE) {
-            $tmp['display'] = true;
-        }
-
         switch ($task->priority) {
         case Horde_LoginTasks::PRIORITY_HIGH:
-            array_unshift($this->_tasks, $tmp);
+            array_unshift($this->_tasks, $task);
             break;
 
         case Horde_LoginTasks::PRIORITY_NORMAL:
-            $this->_tasks[] = $tmp;
+            $this->_tasks[] = $task;
             break;
         }
     }
@@ -87,10 +78,10 @@ class Horde_LoginTasks_Tasklist
 
         reset($this->_tasks);
         while (list($k, $v) = each($this->_tasks)) {
-            if ($v['display'] && ($k >= $this->_ptr)) {
+            if ($v->needsDisplay() && ($k >= $this->_ptr)) {
                 break;
             }
-            $tmp[] = $v['task'];
+            $tmp[] = $v;
         }
 
         if ($advance) {
@@ -115,12 +106,12 @@ class Horde_LoginTasks_Tasklist
 
         reset($this->_tasks);
         while (list($k, $v) = each($this->_tasks)) {
-            if (!$v['display'] ||
-                (!is_null($previous) && !$v['task']->joinDisplayWith($previous))) {
+            if (!$v->needsDisplay() ||
+                (!is_null($previous) && !$v->joinDisplayWith($previous))) {
                 break;
             }
-            $tmp[] = $v['task'];
-            $previous = $v['task'];
+            $tmp[] = $v;
+            $previous = $v;
         }
 
         if ($advance) {
-- 
2.11.0