[Phpgroupware-cvs] property/inc class.botts.inc.php class.historyl...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/03/12 12:36:46

Modified files:
        inc            : class.botts.inc.php class.historylog.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.historylog.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15

Patches:
Index: class.botts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.botts.inc.php 26 Jan 2007 14:53:46 -0000      1.31
+++ class.botts.inc.php 12 Mar 2007 12:36:46 -0000      1.32
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage helpdesk
-       * @version $Id: class.botts.inc.php,v 1.31 2007/01/26 14:53:46 sigurdne 
Exp $
+       * @version $Id: class.botts.inc.php,v 1.32 2007/03/12 12:36:46 sigurdne 
Exp $
        */
 
        /**
@@ -279,7 +279,7 @@
                                        
$tickets[$i]['delay']=($tickets[$i]['finnish_date2']-$tickets[$i]['finnish_date'])/(24*3600);
                                        
$tickets[$i]['finnish_date']=$tickets[$i]['finnish_date2'];
                                }
-                               $tickets[$i]['finnish_date'] = 
(isset($tickets[$i]['finnish_date'])?$GLOBALS['phpgw']->common->show_date($tickets[$i]['finnish_date'],$this->dateformat):'');
+                               $tickets[$i]['finnish_date'] = 
(isset($tickets[$i]['finnish_date']) && $tickets[$i]['finnish_date'] ? 
$GLOBALS['phpgw']->common->show_date($tickets[$i]['finnish_date'],$this->dateformat):'');
 
                                if ($tickets[$i]['status'] == 'X')
                                {
@@ -314,7 +314,7 @@
                        $ticket['group_lid'] = 
$GLOBALS['phpgw']->accounts->id2name($ticket['group_id']);
 
 
-                       if($ticket['finnish_date2'])
+                       if(isset($ticket['finnish_date2']) && 
$ticket['finnish_date2'])
                        {
                                
$ticket['finnish_date']=$ticket['finnish_date2'];
                        }

Index: class.historylog.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.historylog.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.historylog.inc.php    26 Jan 2007 14:53:46 -0000      1.14
+++ class.historylog.inc.php    12 Mar 2007 12:36:46 -0000      1.15
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage core
-       * @version $Id: class.historylog.inc.php,v 1.14 2007/01/26 14:53:46 
sigurdne Exp $
+       * @version $Id: class.historylog.inc.php,v 1.15 2007/03/12 12:36:46 
sigurdne Exp $
        */
 
        /**
@@ -90,13 +90,7 @@
 
                        $this->appname = $appname;
 
-       //              $this->db      = $GLOBALS['phpgw']->db;
-                       $this->db = CreateObject('phpgwapi.db');
-                       $this->db->Host = 
$GLOBALS['phpgw_info']['server']['db_host'];
-                       $this->db->Type = 
$GLOBALS['phpgw_info']['server']['db_type'];
-                       $this->db->Database = 
$GLOBALS['phpgw_info']['server']['db_name'];
-                       $this->db->User = 
$GLOBALS['phpgw_info']['server']['db_user'];
-                       $this->db->Password = 
$GLOBALS['phpgw_info']['server']['db_pass'];
+                       $this->db      = clone($GLOBALS['phpgw']->db);
                }
 
                function delete($record_id,$attrib_id='')