X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=format.php;h=81878eb7813abaed483f084b000998c237678ad0;hb=221302d28938beadeda16a48363ed36b1d66aab1;hp=5d7c2bb0af35a875a9de4a931fc623ef886b638d;hpb=d8e80aeb824feeb439a51e6a40d862c6e630d6a0;p=wfpl.git

diff --git a/format.php b/format.php
index 5d7c2bb..81878eb 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
@@ -162,10 +163,19 @@ 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("/['‘’]/", '', $str);
+	$str = preg_replace('/[^a-z0-9_]+/', '_', $str);
+	return preg_replace('/^([^a-z_])/', "_\\1", $str);
 }
 
 function format_oneline($str) {
@@ -293,13 +303,13 @@ function format_dollars($str) {
 # date is edited as mm/dd/yyyy but stored as yyyy-mm-dd
 function format_mdy_to_ymd($str) {
 	if($str == '') return '';
-	require_once('code/wfpl/time.php');
+	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);
 }