Changeset 8222 for sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-time.inc.php

Timestamp:

09/26/13 15:41:49 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

File:

• sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-time.inc.php (modified) (21 diffs)

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/adodb-time.inc.php

@@ -74 +74 @@
 FUNCTION DESCRIPTIONS
 
+** FUNCTION adodb_time()
+
+Returns the current time measured in the number of seconds since the Unix Epoch (January 1 1970 00:00:00 GMT) as an unsigned integer.
 
 ** FUNCTION adodb_getdate($date=false)
@@ -242 +245 @@
 
 CHANGELOG
+- 16 Jan 2011 0.36
+Added adodb_time() which returns current time. If > 2038, will return as float
+
+- 7 Feb 2011 0.35
+Changed adodb_date to be symmetric with adodb_mktime. See $jan1_71. fix for bc. 
+
+- 13 July 2010 0.34
+Changed adodb_get_gm_diff to use DateTimeZone().
+
+- 11 Feb 2008 0.33
+* Bug in 0.32 fix for hour handling. Fixed.
+
+- 1 Feb 2008 0.32
+* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly. 
+
+- 10 Jan 2008 0.31
+* Now adodb_mktime(0,0,0,24,1,2037) works correctly.
+
+- 15 July 2007 0.30
+Added PHP 5.2.0 compatability fixes. 
+ * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
+ * timezone, otherwise we use the current year as the baseline to retrieve the timezone.
+ * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but 
+   in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
+ * 
+ 
 - 19 March 2006 0.24
 Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
@@ -369 +398 @@
         Version Number
 */
-define('ADODB_DATE_VERSION',0.24);
+define('ADODB_DATE_VERSION',0.35);
+
+$ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
 
 /*
@@ -388 +419 @@
 function adodb_date_test_date($y1,$m,$d=13)
 {
-        $t = adodb_mktime(0,0,0,$m,$d,$y1);
+        $h = round(rand()% 24);
+        $t = adodb_mktime($h,0,0,$m,$d,$y1);
         $rez = adodb_date('Y-n-j H:i:s',$t);
-        if ("$y1-$m-$d 00:00:00" != $rez) {
-                print "<b>$y1 error, expected=$y1-$m-$d 00:00:00, adodb=$rez</b><br>";
+        if ($h == 0) $h = '00';
+        else if ($h < 10) $h = '0'.$h;
+        if ("$y1-$m-$d $h:00:00" != $rez) {
+                print "<b>$y1 error, expected=$y1-$m-$d $h:00:00, adodb=$rez</b><br>";
                 return false;
         }
@@ -404 +438 @@
         if ($s1 == $s2) return true;
         
-        echo "error for $fmt,  strftime=$s1, $adodb=$s2<br>";
+        echo "error for $fmt,  strftime=$s1, adodb=$s2<br>";
         return false;
 }
@@ -410 +444 @@
 /**
          Test Suite
-*/
+*/      
 function adodb_date_test()
 {
+        
+        for ($m=-24; $m<=24; $m++)
+                echo "$m :",adodb_date('d-m-Y',adodb_mktime(0,0,0,1+$m,20,2040)),"<br>";
         
         error_reporting(E_ALL);
@@ -421 +458 @@
         // This flag disables calling of PHP native functions, so we can properly test the code
         if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
+        
+        $t = time();
+        
+        
+        $fmt = 'Y-m-d H:i:s';
+        echo '<pre>';
+        echo 'adodb: ',adodb_date($fmt,$t),'<br>';
+        echo 'php  : ',date($fmt,$t),'<br>';
+        echo '</pre>';
         
         adodb_date_test_strftime('%Y %m %x %X');
@@ -481 +527 @@
         // Test string formating
         print "<p>Testing date formating</p>";
+        
         $fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
         $s1 = date($fmt,0);
@@ -566 +613 @@
 }
 
+function adodb_time()
+{
+        $d = new DateTime();
+        return $d->format('U');
+}
+
 /**
         Returns day of week, 0 = Sunday,... 6=Saturday. 
@@ -658 +711 @@
 }
 
+function adodb_get_gmt_diff_ts($ts) 
+{
+        if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
+                $arr = getdate($ts);
+                $y = $arr['year'];
+                $m = $arr['mon'];
+                $d = $arr['mday'];
+                return adodb_get_gmt_diff($y,$m,$d);    
+        } else {
+                return adodb_get_gmt_diff(false,false,false);
+        }
+        
+}
+
 /**
- get local time zone offset from GMT
+ get local time zone offset from GMT. Does not handle historical timezones before 1970.
 */
-function adodb_get_gmt_diff() 
-{
-static $TZ;
-        if (isset($TZ)) return $TZ;
-        
-        $TZ = mktime(0,0,0,1,2,1970,0) - gmmktime(0,0,0,1,2,1970,0);
+function adodb_get_gmt_diff($y,$m,$d) 
+{
+static $TZ,$tzo;
+global $ADODB_DATETIME_CLASS;
+
+        if (!defined('ADODB_TEST_DATES')) $y = false;
+        else if ($y < 1970 || $y >= 2038) $y = false;
+
+        if ($ADODB_DATETIME_CLASS && $y !== false) {
+                $dt = new DateTime();
+                $dt->setISODate($y,$m,$d);
+                if (empty($tzo)) {
+                        $tzo = new DateTimeZone(date_default_timezone_get());
+                #       $tzt = timezone_transitions_get( $tzo );
+                }
+                return -$tzo->getOffset($dt);
+        } else {
+                if (isset($TZ)) return $TZ;
+                $y = date('Y');
+                /*
+                if (function_exists('date_default_timezone_get') && function_exists('timezone_offset_get')) {
+                        $tzonename = date_default_timezone_get();
+                        if ($tzonename) {
+                                $tobj = new DateTimeZone($tzonename);
+                                $TZ = -timezone_offset_get($tobj,new DateTime("now",$tzo));
+                        }
+                } 
+                */
+                if (empty($TZ)) $TZ = mktime(0,0,0,12,2,$y) - gmmktime(0,0,0,12,2,$y);
+        }
         return $TZ;
 }
@@ -713 +804 @@
 global $_month_table_normal,$_month_table_leaf;
 
-        if (_adodb_is_leap_year($y)) $marr =& $_month_table_leaf;
-        else $marr =& $_month_table_normal;
+        if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
+        else $marr = $_month_table_normal;
         
         if ($m > 12 || $m < 1) return false;
@@ -737 +828 @@
 global $_month_table_normal,$_month_table_leaf;
 
-        $d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff());
-        
+        $d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff_ts($origd));
         $_day_power = 86400;
         $_hour_power = 3600;
@@ -928 +1018 @@
         );
 }
+/*
+                if ($isphp5)
+                                $dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
+                        else
+                                $dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+                        break;*/
+function adodb_tz_offset($gmt,$isphp5)
+{
+        $zhrs = abs($gmt)/3600;
+        $hrs = floor($zhrs);
+        if ($isphp5) 
+                return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+        else
+                return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60); 
+}
+
 
 function adodb_gmdate($fmt,$d=false)
@@ -959 +1065 @@
 {
 static $daylight;
-
+global $ADODB_DATETIME_CLASS;
+static $jan1_1971;
+
+
+        if (!isset($daylight)) {
+                $daylight = function_exists('adodb_daylight_sv');
+                if (empty($jan1_1971)) $jan1_1971 = mktime(0,0,0,1,1,1971); // we only use date() when > 1970 as adodb_mktime() only uses mktime() when > 1970
+        }
+        
         if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
         if (!defined('ADODB_TEST_DATES')) {
                 if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-                        if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
+                
+                        if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= $jan1_1971) // if windows, must be +ve integer
                                 return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
 
@@ -972 +1087 @@
         $arr = _adodb_getdate($d,true,$is_gmt);
         
-        if (!isset($daylight)) $daylight = function_exists('adodb_daylight_sv');
         if ($daylight) adodb_daylight_sv($arr, $is_gmt);
         
@@ -993 +1107 @@
         for ($i=0; $i < $max; $i++) {
                 switch($fmt[$i]) {
-                case 'T': $dates .= date('T');break;
+                case 'e':
+                        $dates .= date('e');
+                        break;
+                case 'T': 
+                        if ($ADODB_DATETIME_CLASS) {
+                                $dt = new DateTime();
+                                $dt->SetDate($year,$month,$day);
+                                $dates .= $dt->Format('T');
+                        } else
+                                $dates .= date('T');
+                        break;
                 // YEAR
                 case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
@@ -1009 +1133 @@
                         if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
                         
-                        $gmt = adodb_get_gmt_diff();
-                        if ($isphp5) 
-                                $dates .= sprintf(' %s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
-                        else
-                                $dates .= sprintf(' %s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+                        $gmt = adodb_get_gmt_diff($year,$month,$day);
+                        
+                        $dates .= ' '.adodb_tz_offset($gmt,$isphp5);
                         break;
-                                
+                        
                 case 'Y': $dates .= $year; break;
                 case 'y': $dates .= substr($year,strlen($year)-2,2); break;
@@ -1042 +1164 @@
                 // HOUR
                 case 'Z':
-                        $dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff(); break;
+                        $dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
                 case 'O': 
-                        $gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff();
-                        
-                        if ($isphp5)
-                                $dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36); 
-                        else
-                                $dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); 
+                        $gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
+                        
+                        $dates .= adodb_tz_offset($gmt,$isphp5);
                         break;
                         
@@ -1131 +1250 @@
                 // for windows, we don't check 1970 because with timezone differences, 
                 // 1 Jan 1970 could generate negative timestamp, which is illegal
-                if (1971 < $year && $year < 2038
+                $usephpfns = (1970 < $year && $year < 2038
                         || !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
-                        ) {
+                        ); 
+                        
+                
+                if ($usephpfns && ($year + $mon/12+$day/365.25+$hr/(24*365.25) >= 2038)) $usephpfns = false;
+                        
+                if ($usephpfns) {
                                 return $is_gmt ?
                                         @gmmktime($hr,$min,$sec,$mon,$day,$year):
                                         @mktime($hr,$min,$sec,$mon,$day,$year);
-                        }
-        }
-        
-        $gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff();
+                }
+        }
+        
+        $gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$mon,$day);
 
         /*
@@ -1157 +1281 @@
 
         if ($mon > 12) {
-                $y = floor($mon / 12);
+                $y = floor(($mon-1)/ 12);
                 $year += $y;
                 $mon -= $y*12;
@@ -1333 +1457 @@
         return $ret;
 }
-
-
 ?>