X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=f931cdd8c3fc6afebe277a129e8862795848686e;hb=608ecf965408645758cdca1e5f01ff5ac3eff166;hp=8035be44641afb928d3c6c88bfd7d32491c342e5;hpb=7dcbcb707e35c41d11266db7243416f86686dd79;p=wfpl.git

diff --git a/format.php b/format.php
index 8035be4..f931cdd 100644
--- a/format.php
+++ b/format.php
@@ -112,24 +112,50 @@ function format_filename($str, $allow_uppercase = false) {
 	return ereg_replace('^[.-]', '_', $str);
 }
 
+function format_path($str, $allow_uppercase = false) {
+	if(!$allow_uppercase) {
+		$str = strtolower($str);
+	}
+	$str = ereg_replace('[^a-zA-Z0-9_./-]', '_', $str);
+	return ereg_replace('^[.-]', '_', $str);
+}
+
 function client_path_to_filename($path) {
 	$filename = ereg_replace(".*[:/\\]", '', $path);
 	return format_filename($filename, true);
 }
 
 
-function format_h_w_image($str) {
+function format_image_w_h($str) {
 	$fields = explode(' ', $str);
 	if(count($fields) != 3) {
 		return '';
 	}
 
-	list($width, $height, $filename) = $fields;
+	list($filename, $width, $height) = $fields;
+	$filename = format_path($filename);
+	$width = format_int_0($width);
+	$height = format_int_0($height);
+
+	return "$filename $width $height";
+}
+
+function format_image_w_h_thumb_w_h($str) {
+	$fields = explode(' ', $str);
+	if(count($fields) != 6) {
+		die('count: ' . count($fields));
+		return '';
+	}
+
+	list($filename, $width, $height, $thumb_filename, $thumb_width, $thumb_height) = $fields;
+	$filename = format_path($filename);
 	$width = format_int_0($width);
 	$height = format_int_0($height);
-	$filename = format_filename($filename);
+	$thumb_filename = format_path($thumb_filename);
+	$thumb_width = format_int_0($thumb_width);
+	$thumb_height = format_int_0($thumb_height);
 
-	return "$width $height $filename";
+	return "$filename $width $height $thumb_filename $thumb_width $thumb_height";
 }
 
 function format_varname($str) {
@@ -218,6 +244,13 @@ function format_mdy_to_ymd($str) {
 	return mdy_to_ymd(format_oneline($str));
 }
 
+# date is yyyy-mm-dd
+function format_ymd($str) {
+	require_once('code/wfpl/time.php');
+	list($year, $month, $day) = ymd_clean($str);
+	return sprintf('%04u-%02u-%02u', $year, $month, $day);
+}
+
 # takes any of: HH  :MM  HH:MM
 # returns decimal number of hours
 #
@@ -253,6 +286,19 @@ function format_hours($str) {
 	}
 }
 
+# takes eg 12:23am
+# returns decimal number of hours since midnight
+function format_12hr_to_hours($str) {
+	if(eregi('noon', $str)) {
+		return 12;
+	}
+	$hours = format_hours($str);
+	if($hours < 12 && eregi('p', $str)) {
+		$hours += 12;
+	}
+	return $hours;
+}
+
 
 function format_phone($str) {
 	$str = ereg_replace('[^0-9]', '', $str);