X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=format.php;h=c913864d87c73c7c4c43086ce3eca6370ce12f2e;hp=f931cdd8c3fc6afebe277a129e8862795848686e;hb=15459c86d0996ab3037b1738a8be6efd378c1258;hpb=423f31ad0add74bbb6066d3c9f760ad0a5580cda

diff --git a/format.php b/format.php
index f931cdd..c913864 100644
--- a/format.php
+++ b/format.php
@@ -19,9 +19,10 @@
 # This file contains basic encodings
 
 function format_caption($str) {
+	$str = preg_replace("/([a-z])([A-Z])/", "\\1 \\2", $str); # split words on camelCase
 	$str = str_replace('_', ' ', $str);
 	$str = ucwords($str);
-	return str_replace('Email', 'E-mail', $str);
+	return $str;
 }
 
 # This function makes sure that $str is in the list of options, and returns "" otherwise
@@ -37,7 +38,7 @@ function format_options($str, $name) {
 		}
 	}
 
-	return $str;
+	return '';
 }
 
 function format_int($str) {
@@ -45,9 +46,13 @@ function format_int($str) {
 	return ereg_replace('^0*([0-9])', '\1', $str);
 }
 
+# format the digits after the decimal point
 function format_decimals($str) {
 	$str = ereg_replace('[^0-9]', '', $str);
-	return ereg_replace('^([0-9])0*', '\1', $str);
+	if(strlen($str)) {
+		$str = substr($str, 0, 1) . ereg_replace('0*$', '', substr($str, 1));
+	}
+	return $str;
 }
 
 function _format_positive_decimal($str) {
@@ -68,8 +73,8 @@ function _format_positive_decimal($str) {
 
 function format_positive_decimal($str) {
 	$str = _format_positive_decimal($str);
-	if($str === '0.0') {
-		$str = '0';
+	if(substr($str, -2) === '.0') {
+		$str = substr($str, 0, -2);
 	}
 	return $str;
 }
@@ -96,6 +101,7 @@ function format_int_0($str) {
 	return $str;
 }
 
+# USA zip codes
 function format_zip($str) {
 	$str = ereg_replace('[^0-9]', '', $str);
 	if(strlen($str) > 5) {
@@ -143,7 +149,6 @@ function format_image_w_h($str) {
 function format_image_w_h_thumb_w_h($str) {
 	$fields = explode(' ', $str);
 	if(count($fields) != 6) {
-		die('count: ' . count($fields));
 		return '';
 	}
 
@@ -158,10 +163,18 @@ function format_image_w_h_thumb_w_h($str) {
 	return "$filename $width $height $thumb_filename $thumb_width $thumb_height";
 }
 
+function format_slug($str) {
+	$str = strtolower($str);
+	$str = str_replace("'", '', $str);
+	$str = preg_replace('/[^a-z0-9-]+/', '-', $str);
+	return trim($str, '-');
+}
+
 function format_varname($str) {
+	$str = preg_replace("/([a-z])([A-Z])/", "\\1_\\2", $str); # split words on camelCase
 	$str = strtolower($str);
-	$str = ereg_replace('[^a-z0-9_]', '_', $str);
-	return ereg_replace('^[0-9]*', '', $str);
+	$str = preg_replace('/[^a-z0-9_]+/', '_', $str);
+	return preg_replace('/^([^a-z_])/', "_\\1", $str);
 }
 
 function format_oneline($str) {
@@ -174,7 +187,7 @@ function format_unix($str) {
 }
 
 function format_bool($str) {
-	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
 		return 1;
 	} else {
 		return 0;
@@ -182,7 +195,7 @@ function format_bool($str) {
 }
 
 function format_yesno($str) {
-	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false') {
+	if($str && $str !== 'No' && $str !== 'False' && $str !== 'false' && $str !== 'no' && $str !== 'N' &&  $str !== 'n') {
 		return 'Yes';
 	} else {
 		return 'No';
@@ -205,48 +218,97 @@ function format_url($str) {
 	return $str;
 }
 
+# pass a string containing only numeric digits.
+# returns a string containing only numeric digits which is 1 greater.
+function strplusone($str) {
+	$ret = '';
+	$a = str_split($str);
+	$carry = 1;
+	while($a) {
+		$digit = array_pop($a);
+		$digit += $carry;
+		$carry = 0;
+		if($digit == 10) {
+			$carry = 1;
+			$digit = 0;
+		}
+		$ret = "$digit$ret";
+	}
+	if($carry) {
+		$ret = "$carry$ret";
+	}
+
+	return $ret;
+}
+
+# rounds properly to the nearest penny (or dollar if you pass false for the 2nd
+# parameter) and prints like so: $12,456.79 or $12,457
 function format_money($str, $display_cents = true) {
-	$str = ereg_replace('[^0-9.]', '', $str);
-	if($display_cents) {
-		$int = (int)($str * 100);
-		$cents = $int % 100;
-		$cents = sprintf('.%02d', $cents);
-		$int = (int)($str); # go from the source again, so we can print numbers above 2M without cents.
+	$str = format_decimal($str);
+	if($str == '') {
+		$str = '0';
+	}
+	if(strpos($str, '.')) {
+		list($int, $decimals) = explode('.', $str);
+		if(strlen($decimals) == 1) {
+			$decimals .= '0';
+		}
+		if($display_cents) {
+			if(strlen($decimals) > 2) {
+				# round up to the nearest penny
+				if(substr($decimals, 2, 1) >= 5) {
+					$decimals = strplusone(substr($decimals, 0, 2));
+					if($decimals == '100') {
+						$decimals = '00';
+						$int = strplusone($int);
+					}
+				} else {
+					$decimals = substr($decimals, 0, 2);
+				}
+			}
+			$cents = ".$decimals";
+		} else {
+			if(substr($decimals, 0, 1) >= 5) {
+				$int = strplusone($int);
+			}
+		}
 	} else {
-		$cents = '';
-		$int = round($str);
+		$int = $str;
+		if($display_cents) {
+			$cents = '.00';
+		}
 	}
-	$chars = (string)$int;
+	$chars = str_split($int);
 	$output = '';
 	$comma = 4;
-	$index = strlen($chars);
-	while($index) {
-		--$index;
+	while($chars) {
 		--$comma;
 		if($comma == 0) {
 			$comma = 3;
 			$output = ',' . $output;
 		}
-		$char = substr($chars, $index, 1);
+		$char = array_pop($chars);
 		$output = $char . $output;
 	}
 	$output = '$' . $output . $cents;
 	return $output;
 }
 
+
 function format_dollars($str) {
 	return format_money($str, false);
 }
 
 # date is edited as mm/dd/yyyy but stored as yyyy-mm-dd
 function format_mdy_to_ymd($str) {
-	require_once('code/wfpl/time.php');
+	if($str == '') return '';
+	require_once(__DIR__.'/'.'time.php');
 	return mdy_to_ymd(format_oneline($str));
 }
 
 # date is yyyy-mm-dd
 function format_ymd($str) {
-	require_once('code/wfpl/time.php');
+	require_once(__DIR__.'/'.'time.php');
 	list($year, $month, $day) = ymd_clean($str);
 	return sprintf('%04u-%02u-%02u', $year, $month, $day);
 }