Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
metaform: spaces between "if" and "(" in generated code
[wfpl.git]
/
format.php
diff --git
a/format.php
b/format.php
index
5d7c2bb
..
e0818fd
100644
(file)
--- a/
format.php
+++ b/
format.php
@@
-19,9
+19,10
@@
# This file contains basic encodings
function format_caption($str) {
# 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);
$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
}
# This function makes sure that $str is in the list of options, and returns "" otherwise
@@
-163,6
+164,7
@@
function format_image_w_h_thumb_w_h($str) {
}
function format_varname($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 = 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 '';
# 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) {
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);
}
list($year, $month, $day) = ymd_clean($str);
return sprintf('%04u-%02u-%02u', $year, $month, $day);
}