From d0b973cf6aed4a7cb705f706624d25b31d19ed52 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 18 Sep 2008 07:54:14 -0400
Subject: [PATCH] Bind cookie gotten over HTTPS to HTTPS only (#1485336).
---
program/lib/MDB2/Date.php | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/program/lib/MDB2/Date.php b/program/lib/MDB2/Date.php
old mode 100755
new mode 100644
index df3af2c..ce84654
--- a/program/lib/MDB2/Date.php
+++ b/program/lib/MDB2/Date.php
@@ -2,7 +2,7 @@
// +----------------------------------------------------------------------+
// | PHP versions 4 and 5 |
// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2004 Manuel Lemos, Tomas V.V.Cox, |
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox, |
// | Stig. S. Bakken, Lukas Smith |
// | All rights reserved. |
// +----------------------------------------------------------------------+
@@ -42,7 +42,7 @@
// | Author: Lukas Smith <smith@pooteeweet.org> |
// +----------------------------------------------------------------------+
//
-// $Id$
+// $Id: Date.php,v 1.10 2006/03/01 12:15:32 lsmith Exp $
//
/**
@@ -53,7 +53,7 @@
/**
* Several methods to convert the MDB2 native timestamp format (ISO based)
- * to and from data structures that are convienient to worth with in side of php.
+ * to and from data structures that are convenient to worth with in side of php.
* For more complex date arithmetic please take a look at the Date package in PEAR
*
* @package MDB2
@@ -74,8 +74,8 @@
{
return date('Y-m-d H:i:s');
}
-
// }}}
+
// {{{ mdbToday()
/**
@@ -88,8 +88,8 @@
{
return date('Y-m-d');
}
-
// }}}
+
// {{{ mdbTime()
/**
@@ -102,19 +102,20 @@
{
return date('H:i:s');
}
-
// }}}
+
// {{{ date2Mdbstamp()
/**
* convert a date into a MDB2 timestamp
*
- * @param integer $hour hour of the date
- * @param integer $minute minute of the date
- * @param integer $second second of the date
- * @param integer $month month of the date
- * @param integer $day day of the date
- * @param integer $year year of the date
+ * @param int hour of the date
+ * @param int minute of the date
+ * @param int second of the date
+ * @param int month of the date
+ * @param int day of the date
+ * @param int year of the date
+ *
* @return string a valid MDB2 timestamp
* @access public
*/
@@ -123,14 +124,15 @@
{
return MDB2_Date::unix2Mdbstamp(mktime($hour, $minute, $second, $month, $day, $year, -1));
}
-
// }}}
+
// {{{ unix2Mdbstamp()
/**
* convert a unix timestamp into a MDB2 timestamp
*
- * @param integer $unix_timestamp a valid unix timestamp
+ * @param int a valid unix timestamp
+ *
* @return string a valid MDB2 timestamp
* @access public
*/
@@ -138,15 +140,16 @@
{
return date('Y-m-d H:i:s', $unix_timestamp);
}
-
// }}}
+
// {{{ mdbstamp2Unix()
/**
* convert a MDB2 timestamp into a unix timestamp
*
- * @param integer $mdb_timestamp a valid MDB2 timestamp
+ * @param int a valid MDB2 timestamp
* @return string unix timestamp with the time stored in the MDB2 format
+ *
* @access public
*/
function mdbstamp2Unix($mdb_timestamp)
@@ -154,16 +157,17 @@
$arr = MDB2_Date::mdbstamp2Date($mdb_timestamp);
return mktime($arr['hour'], $arr['minute'], $arr['second'], $arr['month'], $arr['day'], $arr['year'], -1);
- }
-
+ }
// }}}
+
// {{{ mdbstamp2Date()
/**
* convert a MDB2 timestamp into an array containing all
* values necessary to pass to php's date() function
*
- * @param integer $mdb_timestamp a valid MDB2 timestamp
+ * @param int a valid MDB2 timestamp
+ *
* @return array with the time split
* @access public
*/
@@ -173,7 +177,6 @@
sscanf($mdb_timestamp, "%04u-%02u-%02u %02u:%02u:%02u");
return $arr;
}
-
// }}}
}
--
Gitblit v1.9.1