[Fmsystem-commits] [6649] merge 6647:6648 from trunk

[Sigurd Nes]

Revision: 6649
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6649
Author:   sigurdne
Date:     2010-12-07 08:30:55 +0000 (Tue, 07 Dec 2010)
Log Message:
-----------
merge 6647:6648 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/bookingfrontend/inc/class.bouser.inc.php
    branches/Version-1_0-branch/phpgwapi/templates/bkbooking/head.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648

Modified: branches/Version-1_0-branch/bookingfrontend/inc/class.bouser.inc.php
===================================================================
--- branches/Version-1_0-branch/bookingfrontend/inc/class.bouser.inc.php        
2010-12-07 08:29:18 UTC (rev 6648)
+++ branches/Version-1_0-branch/bookingfrontend/inc/class.bouser.inc.php        
2010-12-07 08:30:55 UTC (rev 6649)
@@ -3,9 +3,11 @@
        {
                const ORGNR_SESSION_KEY = 'orgnr';
                
+               public
+                       $orgnr = null;
+
                protected
                        $default_module = 'bookingfrontend',
-                       $orgnr = null,
                        $module;
                
                /**

Modified: branches/Version-1_0-branch/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/bkbooking/head.inc.php       
2010-12-07 08:29:18 UTC (rev 6648)
+++ branches/Version-1_0-branch/phpgwapi/templates/bkbooking/head.inc.php       
2010-12-07 08:30:55 UTC (rev 6649)
@@ -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