X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=format.php;h=e0818fdb401c4d732cec27ee21f9d6712ab27d1f;hp=e34f4b3cda0f0d6310c3275ec56f504162e4090f;hb=eecd5e3576866afc8091abe9b74352130fd8e6cc;hpb=964ac22b28189d47aa7330dd3d93448b473bfdb9

diff --git a/format.php b/format.php
index e34f4b3..e0818fd 100644
--- a/format.php
+++ b/format.php
@@ -19,6 +19,7 @@
 # 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;
@@ -163,6 +164,7 @@ function format_image_w_h_thumb_w_h($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);
@@ -293,13 +295,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);
 }