From: Gunnar Wrobel
Date: Wed, 10 Mar 2010 08:33:42 +0000 (+0100) Subject: Provide the backend with the tasks to be displayed when generating the X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=85824492aab31fea0ac53d04f3c28d0ab935fdec;p=horde.git Provide the backend with the tasks to be displayed when generating the URL to redirect to. This allows to use tasks that redirect to their own specific handler. --- diff --git a/framework/LoginTasks/lib/Horde/LoginTasks.php b/framework/LoginTasks/lib/Horde/LoginTasks.php index b2ab00544..38d1fcec4 100644 --- a/framework/LoginTasks/lib/Horde/LoginTasks.php +++ b/framework/LoginTasks/lib/Horde/LoginTasks.php @@ -274,7 +274,7 @@ class Horde_LoginTasks */ public function getLoginTasksUrl() { - return $this->_backend->getLoginTasksUrl(); + return $this->_backend->getLoginTasksUrl($this->_tasklist->needDisplay()); } /** diff --git a/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php b/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php index 93dc64ef0..3fa7c8b39 100644 --- a/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php +++ b/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php @@ -92,7 +92,9 @@ abstract class Horde_LoginTasks_Backend /** * Return the URL of the login tasks view. * + * @param array $tasks The tasks to be displayed next. + * * @return string The URL of the login tasks view */ - abstract public function getLoginTasksUrl(); + abstract public function getLoginTasksUrl(array $tasks = null); } \ No newline at end of file diff --git a/framework/LoginTasks/lib/Horde/LoginTasks/Backend/Horde.php b/framework/LoginTasks/lib/Horde/LoginTasks/Backend/Horde.php index 2fa88a8d1..1ec6eee90 100644 --- a/framework/LoginTasks/lib/Horde/LoginTasks/Backend/Horde.php +++ b/framework/LoginTasks/lib/Horde/LoginTasks/Backend/Horde.php @@ -184,9 +184,11 @@ extends Horde_LoginTasks_Backend /** * Return the URL of the login tasks view. * + * @param array $tasks The tasks to be displayed next. + * * @return string The URL of the login tasks view */ - public function getLoginTasksUrl() + public function getLoginTasksUrl(array $tasks = null) { return Horde::url(Horde_Util::addParameter($this->_registry->get('webroot', 'horde') . '/services/logintasks.php', array('app' => $this->_app)), true); }