aboutsummaryrefslogtreecommitdiffstats
path: root/include/smarty/libs/plugins/shared.make_timestamp.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2013-06-20 03:38:47 +0000
committerrvelices <rv-github@modusoptimus.com>2013-06-20 03:38:47 +0000
commit6fc07742f8fca9d32db23243d374ea27e8ee4c1e (patch)
treebc7240c53a1c6bdff6c785153deb6306585c4062 /include/smarty/libs/plugins/shared.make_timestamp.php
parent9843eb362dd7d1b9d762871777ef76fa84e8202a (diff)
smarty 3 - first pass for tests
git-svn-id: http://piwigo.org/svn/trunk@23384 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/smarty/libs/plugins/shared.make_timestamp.php')
-rw-r--r--include/smarty/libs/plugins/shared.make_timestamp.php36
1 files changed, 16 insertions, 20 deletions
diff --git a/include/smarty/libs/plugins/shared.make_timestamp.php b/include/smarty/libs/plugins/shared.make_timestamp.php
index b42eb11d8..5d7c97e91 100644
--- a/include/smarty/libs/plugins/shared.make_timestamp.php
+++ b/include/smarty/libs/plugins/shared.make_timestamp.php
@@ -1,46 +1,42 @@
<?php
/**
* Smarty shared plugin
+ *
* @package Smarty
- * @subpackage plugins
+ * @subpackage PluginsShared
*/
-
/**
* Function: smarty_make_timestamp<br>
- * Purpose: used by other smarty functions to make a timestamp
- * from a string.
+ * Purpose: used by other smarty functions to make a timestamp from a string.
+ *
* @author Monte Ohrt <monte at ohrt dot com>
- * @param string
- * @return string
+ * @param DateTime|int|string $string date object, timestamp or string that can be converted using strtotime()
+ * @return int
*/
function smarty_make_timestamp($string)
{
- if(empty($string)) {
+ if (empty($string)) {
// use "now":
- $time = time();
-
- } elseif (preg_match('/^\d{14}$/', $string)) {
- // it is mysql timestamp format of YYYYMMDDHHMMSS?
- $time = mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
+ return time();
+ } elseif ($string instanceof DateTime) {
+ return $string->getTimestamp();
+ } elseif (strlen($string) == 14 && ctype_digit($string)) {
+ // it is mysql timestamp format of YYYYMMDDHHMMSS?
+ return mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
-
} elseif (is_numeric($string)) {
// it is a numeric string, we handle it as timestamp
- $time = (int)$string;
-
+ return (int) $string;
} else {
// strtotime should handle it
$time = strtotime($string);
if ($time == -1 || $time === false) {
// strtotime() was not able to parse $string, use "now":
- $time = time();
+ return time();
}
+ return $time;
}
- return $time;
-
}
-/* vim: set expandtab: */
-
?>