[Phpgroupware-cvs] [19007] Fix the name display for templates, and remove a read_repository call in linux-at-work.de template, remove the idsociety/navbar.inc.php being binary

[Caeies]

Revision: 19007
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=19007
Author:   Caeies
Date:     2008-12-10 11:56:17 +0000 (Wed, 10 Dec 2008)

Log Message:
-----------
Fix the name display for templates, and remove a read_repository call in 
linux-at-work.de template, remove the idsociety/navbar.inc.php being binary

Modified Paths:
--------------
    core/trunk/phpgwapi/templates/desktop/navbar.inc.php
    core/trunk/phpgwapi/templates/idots/navbar.inc.php
    core/trunk/phpgwapi/templates/idsociety/navbar.inc.php
    core/trunk/phpgwapi/templates/linux-at-work.de/head.inc.php
    core/trunk/phpgwapi/templates/linux-at-work.de/navbar.inc.php
    core/trunk/phpgwapi/templates/probusiness/navbar.inc.php
    core/trunk/phpgwapi/templates/simple/navbar.inc.php
    core/trunk/phpgwapi/templates/verdilak/navbar.inc.php

Property Changed:
----------------
    core/trunk/phpgwapi/templates/idsociety/navbar.inc.php

Modified: core/trunk/phpgwapi/templates/desktop/navbar.inc.php
===================================================================
--- core/trunk/phpgwapi/templates/desktop/navbar.inc.php        2008-12-09 
18:29:58 UTC (rev 19006)
+++ core/trunk/phpgwapi/templates/desktop/navbar.inc.php        2008-12-10 
11:56:17 UTC (rev 19007)
@@ -85,7 +85,7 @@
                                . '"> ' . lang('Current users') . ': ' . 
$GLOBALS['phpgw']->session->total() . '</a>';
                }
                $now = time();
-               $var['user_info'] = 
$GLOBALS['phpgw']->common->display_fullname() . ' - '
+               $var['user_info'] = $GLOBALS['phpgw']->accounts->read() . ' - '
                                . 
lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
                                . 
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
 

Modified: core/trunk/phpgwapi/templates/idots/navbar.inc.php
===================================================================
--- core/trunk/phpgwapi/templates/idots/navbar.inc.php  2008-12-09 18:29:58 UTC 
(rev 19006)
+++ core/trunk/phpgwapi/templates/idots/navbar.inc.php  2008-12-10 11:56:17 UTC 
(rev 19007)
@@ -87,7 +87,7 @@
                }
 
                $now = time();
-               $var['user_info'] = 
'<b>'.$GLOBALS['phpgw']->common->display_fullname() .'</b>'. ' - '
+               $var['user_info'] = '<b>'.$GLOBALS['phpgw']->accounts->read() 
.'</b>'. ' - '
                . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
                . $GLOBALS['phpgw']->common->show_date($now, 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
 

Modified: core/trunk/phpgwapi/templates/idsociety/navbar.inc.php
===================================================================
(Binary files differ)


Property changes on: core/trunk/phpgwapi/templates/idsociety/navbar.inc.php
___________________________________________________________________
Name: svn:mime-type
   - application/octet-stream

Modified: core/trunk/phpgwapi/templates/linux-at-work.de/head.inc.php
===================================================================
--- core/trunk/phpgwapi/templates/linux-at-work.de/head.inc.php 2008-12-09 
18:29:58 UTC (rev 19006)
+++ core/trunk/phpgwapi/templates/linux-at-work.de/head.inc.php 2008-12-10 
11:56:17 UTC (rev 19007)
@@ -8,7 +8,7 @@
 * @version $Id$
 */
        $p = createobject('phpgwapi.preferences');
-       $preferences = $p->read_repository();
+       $preferences = $p->read();
        if (isset 
($preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime']))
        {
                $refreshTime = 
$preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime'] * 60;

Modified: core/trunk/phpgwapi/templates/linux-at-work.de/navbar.inc.php
===================================================================
--- core/trunk/phpgwapi/templates/linux-at-work.de/navbar.inc.php       
2008-12-09 18:29:58 UTC (rev 19006)
+++ core/trunk/phpgwapi/templates/linux-at-work.de/navbar.inc.php       
2008-12-10 11:56:17 UTC (rev 19007)
@@ -97,7 +97,7 @@
                        $tpl->set_var($var);
                }
 
-               $var['user_info_name'] = 
$GLOBALS['phpgw']->common->display_fullname();
+               $var['user_info_name'] = 
(string)$GLOBALS['phpgw']->accounts->read();
                $var['user_info_date'] =
                                  
lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
                                . 
lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '

Modified: core/trunk/phpgwapi/templates/probusiness/navbar.inc.php
===================================================================
--- core/trunk/phpgwapi/templates/probusiness/navbar.inc.php    2008-12-09 
18:29:58 UTC (rev 19006)
+++ core/trunk/phpgwapi/templates/probusiness/navbar.inc.php    2008-12-10 
11:56:17 UTC (rev 19007)
@@ -144,7 +144,7 @@
                }
 
                $now = time();
-               $var['user_info'] = 
$GLOBALS['phpgw']->common->display_fullname() . ' - '
+               $var['user_info'] = $GLOBALS['phpgw']->accounts->read() . ' - '
                                . 
lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
                                . 
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
 

Modified: core/trunk/phpgwapi/templates/simple/navbar.inc.php
===================================================================
--- core/trunk/phpgwapi/templates/simple/navbar.inc.php 2008-12-09 18:29:58 UTC 
(rev 19006)
+++ core/trunk/phpgwapi/templates/simple/navbar.inc.php 2008-12-10 11:56:17 UTC 
(rev 19007)
@@ -108,7 +108,7 @@
                                        . '">&nbsp;' . lang('Current users') . 
': ' . $GLOBALS['phpgw']->session->total() . '</a>';
                        }
                        $now = time();
-                       $var['user_info'] = 
$GLOBALS['phpgw']->common->display_fullname() . ' - '
+                       $var['user_info'] = $GLOBALS['phpgw']->accounts->read() 
. ' - '
                                        . 
lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
                                        . 
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                        $tpl->set_var($var);

Modified: core/trunk/phpgwapi/templates/verdilak/navbar.inc.php
===================================================================
--- core/trunk/phpgwapi/templates/verdilak/navbar.inc.php       2008-12-09 
18:29:58 UTC (rev 19006)
+++ core/trunk/phpgwapi/templates/verdilak/navbar.inc.php       2008-12-10 
11:56:17 UTC (rev 19007)
@@ -90,7 +90,7 @@
                                . lang('Current users') . ': ' . 
$GLOBALS['phpgw']->session->total() . '</a>';
                }
                $now = time();
-               $var['user_info'] = 
$GLOBALS['phpgw']->common->display_fullname() . ' - '
+               $var['user_info'] = $GLOBALS['phpgw']->accounts->read() . ' - '
                        . lang($GLOBALS['phpgw']->common->show_date($now,'l')) 
. ' '
                        . 
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
 //                     . lang($GLOBALS['phpgw']->common->show_date($now,'F')) 
. ' '
@@ -174,7 +174,7 @@
                                . '<font color="white">'.lang('Current users') 
. ': ' . $GLOBALS['phpgw']->session->total() . '</font></a>';
                }
                $now = time();
-               $var['user_info'] = 
$GLOBALS['phpgw']->common->display_fullname() . ' - '
+               $var['user_info'] = $GLOBALS['phpgw']->accounts->read() . ' - '
                        . lang($GLOBALS['phpgw']->common->show_date($now,'l')) 
. ' '
                        . 
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                $var['powered_by'] = lang('Powered by phpGroupWare version 
%1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);