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
add enc_mtime
[wfpl.git]
/
format.php
diff --git
a/format.php
b/format.php
index
85a90a2
..
17d0461
100644
(file)
--- a/
format.php
+++ b/
format.php
@@
-21,7
+21,7
@@
function format_caption($str) {
$str = str_replace('_', ' ', $str);
$str = ucwords($str);
function format_caption($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
@@
-37,7
+37,7
@@
function format_options($str, $name) {
}
}
}
}
- return $str;
+ return '';
}
function format_int($str) {
}
function format_int($str) {
@@
-72,8
+72,8
@@
function _format_positive_decimal($str) {
function format_positive_decimal($str) {
$str = _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;
}
}
return $str;
}
@@
-178,7
+178,7
@@
function format_unix($str) {
}
function format_bool($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;
return 1;
} else {
return 0;
@@
-186,7
+186,7
@@
function format_bool($str) {
}
function format_yesno($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';
return 'Yes';
} else {
return 'No';
@@
-292,13
+292,14
@@
function format_dollars($str) {
# date is edited as mm/dd/yyyy but stored as yyyy-mm-dd
function format_mdy_to_ymd($str) {
# 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) {
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);
}