+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018 |
+ | Copyright CiviCRM LLC (c) 2004-2019 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
*/
/**
}
}
+ /**
+ * Wrapper for customFormat that takes a timestamp
+ *
+ * @param int $timestamp
+ * Date and time in timestamp format.
+ * @param string $format
+ * The output format.
+ * @param array $dateParts
+ * An array with the desired date parts.
+ *
+ * @return string
+ * the $format-formatted $date
+ */
+ public static function customFormatTs($timestamp, $format = NULL, $dateParts = NULL) {
+ return CRM_Utils_Date::customFormat(date("Y-m-d H:i:s", $timestamp), $format, $dateParts);
+ }
+
/**
* Converts the date/datetime from MySQL format to ISO format
*
$now = self::isoToMysql($now);
}
- return ($mysqlDate >= $now) ? FALSE : TRUE;
+ return (strtotime($mysqlDate) >= strtotime($now)) ? FALSE : TRUE;
}
/**
$to['M'] = $now['mon'];
$to['Y'] = $now['year'] + 1;
break;
+
+ default:
+ if ($relativeTermPrefix === 'ending') {
+ $to['d'] = $now['mday'];
+ $to['M'] = $now['mon'];
+ $to['Y'] = $now['year'];
+ $to['H'] = 23;
+ $to['i'] = $to['s'] = 59;
+ $from = self::intervalAdd('year', -$relativeTermSuffix, $to);
+ $from = self::intervalAdd('second', 1, $from);
+ }
}
break;
$to = self::intervalAdd('day', 90, $from);
$to = self::intervalAdd('second', -1, $to);
break;
+
+ default:
+ if ($relativeTermPrefix === 'ending') {
+ $to['d'] = $now['mday'];
+ $to['M'] = $now['mon'];
+ $to['Y'] = $now['year'];
+ $to['H'] = 23;
+ $to['i'] = $to['s'] = 59;
+ $from = self::intervalAdd('month', -($relativeTermSuffix * 3), $to);
+ $from = self::intervalAdd('second', 1, $from);
+ }
}
break;
$to = self::intervalAdd('day', 60, $from);
$to = self::intervalAdd('second', -1, $to);
break;
+
+ default:
+ if ($relativeTermPrefix === 'ending') {
+ $to['d'] = $now['mday'];
+ $to['M'] = $now['mon'];
+ $to['Y'] = $now['year'];
+ $to['H'] = 23;
+ $to['i'] = $to['s'] = 59;
+ $from = self::intervalAdd($unit, -$relativeTermSuffix, $to);
+ $from = self::intervalAdd('second', 1, $from);
+ }
}
break;
$to = self::intervalAdd('day', 7, $from);
$to = self::intervalAdd('second', -1, $to);
break;
+
+ default:
+ if ($relativeTermPrefix === 'ending') {
+ $to['d'] = $now['mday'];
+ $to['M'] = $now['mon'];
+ $to['Y'] = $now['year'];
+ $to['H'] = 23;
+ $to['i'] = $to['s'] = 59;
+ $from = self::intervalAdd($unit, -$relativeTermSuffix, $to);
+ $from = self::intervalAdd('second', 1, $from);
+ }
}
break;
$from['Y'] = $to['Y'];
break;
+ default:
+ if ($relativeTermPrefix === 'ending') {
+ $to['d'] = $now['mday'];
+ $to['M'] = $now['mon'];
+ $to['Y'] = $now['year'];
+ $to['H'] = 23;
+ $to['i'] = $to['s'] = 59;
+ $from = self::intervalAdd($unit, -$relativeTermSuffix, $to);
+ $from = self::intervalAdd('second', 1, $from);
+ }
}
break;
}