[Phpgroupware-cvs] calendar index.php inc/class.boicalendar.inc.ph...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    calendar
Changes by:     Sigurd Nes <sigurdne>   06/11/10 13:34:30

Modified files:
        .              : index.php 
        inc            : class.boicalendar.inc.php 
                         class.calendar_holiday.inc.php 
                         class.socalendar.inc.php hook_home.inc.php 

Log message:
        In PHP 5.2 there is an object named DateTime -so phpgwapi.datetime is 
renamed to avoid redelaration of the class

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/index.php?cvsroot=phpgroupware&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.boicalendar.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.calendar_holiday.inc.php?cvsroot=phpgroupware&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/hook_home.inc.php?cvsroot=phpgroupware&r1=1.44&r2=1.45

Patches:
Index: index.php
===================================================================
RCS file: /sources/phpgroupware/calendar/index.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- index.php   23 Oct 2005 12:57:16 -0000      1.50
+++ index.php   10 Nov 2006 13:34:30 -0000      1.51
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: index.php,v 1.50 2005/10/23 12:57:16 skwashd Exp $ */
+       /* $Id: index.php,v 1.51 2006/11/10 13:34:30 sigurdne Exp $ */
 
        $GLOBALS['phpgw_info']['flags'] = Array
                (
@@ -27,7 +27,7 @@
 
        if ( !isset($GLOBALS['phpgw']->datetime) || 
!is_object($GLOBALS['phpgw']->datetime) )
        {
-               $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.datetime');
+               $GLOBALS['phpgw']->datetime = 
CreateObject('phpgwapi.datetimefunctions');
        }
        
        $cal = createObject('calendar.uicalendar');

Index: inc/class.boicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.boicalendar.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- inc/class.boicalendar.inc.php       5 Jun 2006 12:11:03 -0000       1.34
+++ inc/class.boicalendar.inc.php       10 Nov 2006 13:34:30 -0000      1.35
@@ -10,7 +10,7 @@
  *  option) any later version.                                              *
  \**************************************************************************/
 
-/* $Id: class.boicalendar.inc.php,v 1.34 2006/06/05 12:11:03 skwashd Exp $ */
+/* $Id: class.boicalendar.inc.php,v 1.35 2006/11/10 13:34:30 sigurdne Exp $ */
 
 define('FOLD_LENGTH',75);
 
@@ -1594,7 +1594,7 @@
 
                if(!is_object($GLOBALS['phpgw']->datetime))
                {
-                       $GLOBALS['phpgw']->datetime = 
createobject('phpgwapi.datetime');
+                       $GLOBALS['phpgw']->datetime = 
createobject('phpgwapi.datetimefunctions');
                }
        }
 

Index: inc/class.calendar_holiday.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.calendar_holiday.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- inc/class.calendar_holiday.inc.php  15 May 2005 06:57:37 -0000      1.26
+++ inc/class.calendar_holiday.inc.php  10 Nov 2006 13:34:30 -0000      1.27
@@ -10,7 +10,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.calendar_holiday.inc.php,v 1.26 2005/05/15 06:57:37 
skwashd Exp $ */
+       /* $Id: class.calendar_holiday.inc.php,v 1.27 2006/11/10 13:34:30 
sigurdne Exp $ */
 
 class calendar_holiday
 {
@@ -26,7 +26,7 @@
        {
                global $phpgw, $phpgw_info;
 
-               $this->datetime = CreateObject('phpgwapi.datetime');
+               $this->datetime = CreateObject('phpgwapi.datetimefunctions');
                $this->db = $phpgw->db;
                if(@$phpgw_info['user']['preferences']['common']['country'])
                {

Index: inc/class.socalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.socalendar.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- inc/class.socalendar.inc.php        7 Jan 2006 11:14:56 -0000       1.32
+++ inc/class.socalendar.inc.php        10 Nov 2006 13:34:30 -0000      1.33
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: class.socalendar.inc.php,v 1.32 2006/01/07 11:14:56 skwashd Exp $ */
+  /* $Id: class.socalendar.inc.php,v 1.33 2006/11/10 13:34:30 sigurdne Exp $ */
 
        class socalendar
        {
@@ -32,7 +32,7 @@
                        $this->db = $GLOBALS['phpgw']->db;
                        if(!is_object($GLOBALS['phpgw']->datetime))
                        {
-                               $GLOBALS['phpgw']->datetime = 
createobject('phpgwapi.datetime');
+                               $GLOBALS['phpgw']->datetime = 
createobject('phpgwapi.datetimefunctions');
                        }
 
                        $this->owner = (!isset($param['owner']) || 
$param['owner'] == 
0?$GLOBALS['phpgw_info']['user']['account_id']:$param['owner']);

Index: inc/hook_home.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/hook_home.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- inc/hook_home.inc.php       10 Sep 2006 01:47:44 -0000      1.44
+++ inc/hook_home.inc.php       10 Nov 2006 13:34:30 -0000      1.45
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: hook_home.inc.php,v 1.44 2006/09/10 01:47:44 skwashd Exp $ */
+  /* $Id: hook_home.inc.php,v 1.45 2006/11/10 13:34:30 sigurdne Exp $ */
 
 
        if ( 
isset($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'])
@@ -22,7 +22,7 @@
                if ( !isset($GLOBALS['phpgw']->datetime)
                        || !is_object($GLOBALS['phpgw']->datetime) )
                {
-                       $GLOBALS['phpgw']->datetime = 
CreateObject('phpgwapi.datetime');
+                       $GLOBALS['phpgw']->datetime = 
CreateObject('phpgwapi.datetimefunctions');
                }
 
                $GLOBALS['date'] = 
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);