[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.123.2.1,1.123.2.2

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv30270/phpgwapi/inc

Modified Files:
      Tag: Version-0_9_14-branch
        class.common.inc.php 
Log Message:
GNU Patch #325

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.123.2.1
retrieving revision 1.123.2.2
diff -C2 -r1.123.2.1 -r1.123.2.2
*** class.common.inc.php        10 Apr 2002 18:29:46 -0000      1.123.2.1
--- class.common.inc.php        9 Jun 2002 02:16:29 -0000       1.123.2.2
***************
*** 934,939 ****
                {
                        $GLOBALS['phpgw_info']['navbar']['home']['title'] = 
'Home';
!                       $GLOBALS['phpgw_info']['navbar']['home']['url']   = 
$GLOBALS['phpgw']->link('/index.php');
!                       $GLOBALS['phpgw_info']['navbar']['home']['icon']  = 
$this->image('phpgwapi',Array('home.gif','nonav.gif'));
                        $GLOBALS['phpgw_info']['navbar']['home']['icon_hover']  
= $this->image_on('phpgwapi',Array('home','nonav'),'-over');
  
--- 934,939 ----
                {
                        $GLOBALS['phpgw_info']['navbar']['home']['title'] = 
'Home';
!                       $GLOBALS['phpgw_info']['navbar']['home']['url']   = 
$GLOBALS['phpgw']->link('/home.php');
!                       $GLOBALS['phpgw_info']['navbar']['home']['icon']  = 
$this->image('phpgwapi',Array('home','nonav'));
                        $GLOBALS['phpgw_info']['navbar']['home']['icon_hover']  
= $this->image_on('phpgwapi',Array('home','nonav'),'-over');
  
***************
*** 984,988 ****
  //                                    
if($GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] == '')
  //                                    {
! //                                            
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']  = 
$this->image('phpgwapi','nonav.gif');
  //                                    }
                                }
--- 984,988 ----
  //                                    
if($GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon'] == '')
  //                                    {
! //                                            
$GLOBALS['phpgw_info']['navbar'][$permission[0]]['icon']  = 
$this->image('phpgwapi','nonav');
  //                                    }
                                }
***************
*** 1210,1220 ****
                function show_date($t = '', $format = '')
                {
!                       if (! $t)
                        {
!                               $t = time();
                        }
  
!                       $t = $t + ((60*60) * 
$GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']);
! 
                        if (! $format)
                        {
--- 1210,1225 ----
                function show_date($t = '', $format = '')
                {
!                       if (!$t)
                        {
!                               if(!is_object($GLOBALS['phpgw']->datetime))
!                               {
!                                       $GLOBALS['phpgw']->datetime = 
createobject('phpgwapi.datetime');
!                               }
!                               $t = $GLOBALS['phpgw']->datetime->gmtnow;
                        }
  
!                       //  + (date('I') == 1?3600:0)
!                       $t += (3600 * 
intval($GLOBALS['phpgw_info']['user']['preferences']['common']['tz_offset']));
!                       
                        if (! $format)
                        {