Unify the welcome text.

diff --git a/koward/lib/Koward/Controller/Application.php b/koward/lib/Koward/Controller/Application.php
index 3705460..a52eaf4 100644 (file)
--- a/koward/lib/Koward/Controller/Application.php
+++ b/koward/lib/Koward/Controller/Application.php
@@ -2,6 +2,8 @@
 
 class Koward_Controller_Application extends Horde_Controller_Base
 {
+    protected $welcome;
+
     protected function _initializeApplication()
     {
         global $registry;
@@ -31,6 +33,8 @@ class Koward_Controller_Application extends Horde_Controller_Base
 
         $this->theme = isset($this->koward->conf['koward']['theme']) ? $this->koward->conf['koward']['theme'] : 'koward';
 
+        $this->welcome = isset($this->koward->conf['koward']['greeting']) ? $this->koward->conf['koward']['greeting'] : _("Welcome.");
+
     }
 
     /**

diff --git a/koward/lib/Koward/Controller/IndexController.php b/koward/lib/Koward/Controller/IndexController.php
index 67e6c93..43fd698 100644 (file)
--- a/koward/lib/Koward/Controller/IndexController.php
+++ b/koward/lib/Koward/Controller/IndexController.php
@@ -8,14 +8,11 @@
  */
 class IndexController extends Koward_Controller_Application
 {
-    protected $welcome;
-
     protected $auth_handler = 'login';
 
     public function index()
     {
         $this->title = _("Index");
-        $this->welcome = _("Welcome to the Koward administration interface");
     }
 
     public function login()
@@ -27,7 +24,6 @@ class IndexController extends Koward_Controller_Application
         }
 
         $this->title = _("Login");
-        $this->welcome = _("Welcome.");
 
         $this->post = $this->urlFor(array('controller' => 'index', 
                                           'action' => 'login'));