From fbc2b127cba657034658b739a265ec8895da363c Mon Sep 17 00:00:00 2001 From: messju Date: Sat, 11 Oct 2003 09:33:50 +0000 Subject: [PATCH] tightened check for YYYYMMDDHHMMSS-format. thanks konstantin for pointing this out. removed a few tabs. --- libs/plugins/shared.make_timestamp.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/plugins/shared.make_timestamp.php b/libs/plugins/shared.make_timestamp.php index c6520374..acdd7773 100644 --- a/libs/plugins/shared.make_timestamp.php +++ b/libs/plugins/shared.make_timestamp.php @@ -23,7 +23,7 @@ function smarty_make_timestamp($string) return $time; // is mysql timestamp format of YYYYMMDDHHMMSS? - if (is_numeric($string) && strlen($string) == 14) { + if (preg_match('/^\d{14}$/', $string)) { $time = 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)); @@ -33,9 +33,9 @@ function smarty_make_timestamp($string) // couldn't recognize it, try to return a time $time = (int) $string; if ($time > 0) - return $time; - else - return time(); + return $time; + else + return time(); } /* vim: set expandtab: */