X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FTime.php;h=6d1962a523495084280ac7b4a268e2552b75efc6;hb=9f7b401dfb7fa7cd52ecd4d8bcab3d7b1422ebd2;hp=41aee4c25fb94069f9c31764117e1552017128e2;hpb=c90a093af5607c80a76a7af50f76d2c1d5bf4f37;p=civicrm-core.git

diff --git a/CRM/Utils/Time.php b/CRM/Utils/Time.php
index 41aee4c25f..6d1962a523 100644
--- a/CRM/Utils/Time.php
+++ b/CRM/Utils/Time.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -44,47 +44,65 @@ class CRM_Utils_Time {
   static private $_delta = 0;
 
   /**
-   * get the time
+   * Get the time.
    *
-   * @param string $returnFormat format in which date is to be retrieved
+   * @param string $returnFormat
+   *   Format in which date is to be retrieved.
    *
    * @return date
    *
-   * @static
    */
-  static function getTime($returnFormat = 'YmdHis') {
+  public static function getTime($returnFormat = 'YmdHis') {
     return date($returnFormat, self::getTimeRaw());
   }
 
   /**
-   * Get the time
+   * Get the time.
    *
    * @return int, seconds since epoch
    */
-  static function getTimeRaw() {
+  public static function getTimeRaw() {
     return time() + self::$_delta;
   }
 
   /**
-   * set the given time
+   * Set the given time.
    *
-   * @param string $newDateTime  a date formatted with strtotime
-   * @param string $returnFormat format in which date is to be retrieved
+   * @param string $newDateTime
+   *   A date formatted with strtotime.
+   * @param string $returnFormat
+   *   Format in which date is to be retrieved.
    *
    * @return date
    *
-   * @static
    */
-  static function setTime($newDateTime, $returnFormat = 'YmdHis') {
+  public static function setTime($newDateTime, $returnFormat = 'YmdHis') {
     self::$_delta = strtotime($newDateTime) - time();
     return self::getTime($returnFormat);
   }
 
   /**
-   * Remove any time overrides
+   * Remove any time overrides.
    */
-  static function resetTime() {
+  public static function resetTime() {
     self::$_delta = 0;
   }
-}
 
+  /**
+   * Approximate time-comparison. $a and $b are considered equal if they
+   * are within $threshold seconds of each other.
+   *
+   * @param string $a
+   *   Time which can be parsed by strtotime.
+   * @param string $b
+   *   Time which can be parsed by strtotime.
+   * @param int $threshold
+   *   Maximum allowed difference (in seconds).
+   * @return bool
+   */
+  public static function isEqual($a, $b, $threshold = 0) {
+    $diff = strtotime($b) - strtotime($a);
+    return (abs($diff) <= $threshold);
+  }
+
+}