fix enc_ functions for image/thumb parts

[wfpl.git] / time.php

diff --git a/time.php b/time.php
index cb9e7a8..f71d22a 100644 (file)
--- a/time.php
+++ b/time.php
@@ -18,6 +18,7 @@
 
 # This file contains functions to manipulate/calculate dates/times
 
+# FIXME make it so you can call this with a string YYYY-MM-DD
 function ymd_to_days($year, $month, $day) {
        return (int)(mktime(12,0,0,$month,$day, $year, 0) / 86400);
 }
@@ -75,8 +76,8 @@ function clean_ymd($year, $month, $day) {
 # pass date like 3/21/99
 # returns array(year, month, day)
 function mdy_clean($date) {
-       $date = ereg_replace('[^0-9/-]', '', $date);
-       $date = ereg_replace('-', '/', $date);
+       $date = preg_replace('|[^0-9/-]|', '', $date);
+       $date = preg_replace('|-|', '/', $date);
        $parts = explode('/', $date);
        switch(count($parts)) {
                case 1:
@@ -107,13 +108,13 @@ function mdy_to_ymd($date) {
 # pass date like 2008-11-21
 # returns array(year, month, day)
 function ymd_clean($date) {
-       $date = ereg_replace('[^0-9/-]', '', $date);
-       $date = ereg_replace('/', '-', $date);
+       $date = preg_replace('|[^0-9/-]|', '', $date);
+       $date = preg_replace('|/|', '-', $date);
        $parts = explode('-', $date);
        switch(count($parts)) {
                case 1:
                        $year = $parts[0];
-                       if(strlen($year) == 0) {
+                       if(strlen($year) == 0 || $year < 1971 || $year > 2050) {
                                list($year, $month, $day) = explode('-', date('Y-m-d'));
                        } else {
                                list($month, $day) = explode('-', date('m-d'));
@@ -135,12 +136,3 @@ function ymd_to_mdy($str) {
        list($year, $month, $day) = ymd_clean($str);
        return sprintf('%02u/%02u/%04u', $month, $day, $year);
 }
-
-function enc_mdy($str) {
-       return ymd_to_mdy($str);
-}
-
-function format_ymd($str) {
-       list($year, $month, $day) = ymd_clean($str);
-       return sprintf('%04u-%02u-%02u', $year, $month, $day);
-}