[Fmsystem-commits] [6648] bookingfrontend: display reprensented organisation when logged in

[Sigurd Nes]

Revision: 6648
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6648
Author:   sigurdne
Date:     2010-12-07 08:29:18 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
bookingfrontend: display reprensented organisation when logged in

Modified Paths:
--------------
    trunk/bookingfrontend/inc/class.bouser.inc.php
    trunk/phpgwapi/templates/bkbooking/head.inc.php

Modified: trunk/bookingfrontend/inc/class.bouser.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.bouser.inc.php      2010-12-06 14:05:15 UTC 
(rev 6647)
+++ trunk/bookingfrontend/inc/class.bouser.inc.php      2010-12-07 08:29:18 UTC 
(rev 6648)
@@ -3,9 +3,11 @@
        {
                const ORGNR_SESSION_KEY = 'orgnr';
                
+               public
+                       $orgnr = null;
+
                protected
                        $default_module = 'bookingfrontend',
-                       $orgnr = null,
                        $module;
                
                /**

Modified: trunk/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.inc.php     2010-12-06 14:05:15 UTC 
(rev 6647)
+++ trunk/phpgwapi/templates/bkbooking/head.inc.php     2010-12-07 08:29:18 UTC 
(rev 6648)
@@ -132,7 +132,7 @@
        $bouser = CreateObject('bookingfrontend.bouser');
        if($bouser->is_logged_in())
        {
-               $tpl_vars['login_text'] = lang('Logout');
+               $tpl_vars['login_text'] = $bouser->orgnr . ' :: ' . 
lang('Logout');
                $tpl_vars['login_url'] = 'logout.php';
        }
        else