Updated smarty to recent 3.0.8

[gosa.git] / gosa-core / include / smarty / plugins / shared.make_timestamp.php

diff --git a/gosa-core/include/smarty/plugins/shared.make_timestamp.php b/gosa-core/include/smarty/plugins/shared.make_timestamp.php
index b42eb11d85d1b6f0a5a2064d88f102d958dfd302..9789f53f7f8d9505a2fadc04ad87174e262f9914 100644 (file)
--- a/gosa-core/include/smarty/plugins/shared.make_timestamp.php
+++ b/gosa-core/include/smarty/plugins/shared.make_timestamp.php
@@ -1,46 +1,43 @@
 <?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.
  * @author   Monte Ohrt <monte at ohrt dot com>
- * @param string
+ * @param string $string
  * @return string
  */
+
 function smarty_make_timestamp($string)
 {
     if(empty($string)) {
         // use "now":
-        $time = time();
-
-    } elseif (preg_match('/^\d{14}$/', $string)) {
+        return time();
+    } elseif ($string instanceof DateTime) {
+        return $string->getTimestamp();
+    } elseif (strlen($string)==14 && ctype_digit($string)) {
         // it is mysql timestamp format of YYYYMMDDHHMMSS?            
-        $time = mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
+        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: */
-
 ?>