X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=encode.php;h=c18f723ab6cce4e05cff3ebd9347948fe2f2c8cb;hb=b58414153a4f1b8107054ce17f2922e53bf14a26;hp=835f7cbbcaa638d3e906b778d591365fd7078176;hpb=83825f3ade87a6432b63e64b39725f68b03afee8;p=wfpl.git
diff --git a/encode.php b/encode.php
index 835f7cb..c18f723 100644
--- a/encode.php
+++ b/encode.php
@@ -138,24 +138,24 @@ function enc_yesno($str) {
}
-# add a tab at the begining of each non-empty line
+# add a tab at the begining of each line
function enc_tab($str) {
- $lines = explode("\n", $str);
- $out = '';
- foreach($lines as $line) {
- if($line) {
- $out .= "\t$line";
- }
- $out .= "\n";
+ if('' . $str === '') {
+ return '';
}
-
- # remove the extra newline added above
- return substr($out, 0, -1);
+ return "\t" . implode("\n\t", explode("\n", $str));
}
-function enc_upper($str) {
+function enc_uppercase($str) {
return strtoupper($str);
}
+function enc_upper($str) { # depricated
+ return enc_uppercase($str);
+}
+
+function enc_lowercase($str) {
+ return strtolower($str);
+}
# pass date in the form 2008-05-23
# ercodes date as 05/23/2008
@@ -174,11 +174,16 @@ function enc_mdy($str) {
return enc_mmddyyyy($str);
}
-function enc_mmddyyyyhhmm($seconds) {
- return date('m/d/Y g:ia', (int)$seconds);
+# pass unix timestamp or "2012-12-20 22:23:34"
+function enc_mmddyyyyhhmm($str) {
+ if(is_numeric($str)) {
+ return date('m/d/Y g:ia', (int)$str);
+ } else {
+ return enc_mmddyyyy(substr($str, 0, 10)) . substr($str, 10, 6);
+ }
}
-# takes decimal
+# takes decimal number of hours
# returns hh:mm
function enc_hhmm($str) {
if(strlen($str) == 0) {
@@ -190,7 +195,7 @@ function enc_hhmm($str) {
return $str;
}
-# takes decimal
+# takes decimal number of hours
# returns hh:mm followed by "am" or "pm" with no space
function enc_12hr($str) {
if(strlen($str) == 0) {
@@ -212,32 +217,8 @@ function enc_12hr($str) {
-
-define('PULLDOWN_ARRAY', 0); define('PULLDOWN_HASH', 1); define('PULLDOWN_2D', 2);
-
-function pulldown_options_to_2d($options, $keys_from) {
- # convert other types of input to value=>display hash
- switch($keys_from) {
- case PULLDOWN_HASH:
- $new_options = array();
- foreach($options as $value => $display) {
- $new_options[] = array($value, $display);
- }
- return $new_options;
- case PULLDOWN_ARRAY:
- $new_options = array();
- foreach($options as $opt) {
- $new_options[] = array($opt, $opt);
- }
- return $new_options;
- break;
- case PULLDOWN_2D:
- return $options;
- break;
- default:
- die('pulldown_options_to_2d(): unknown value: "' . print_r($keys_from) . '" passed in $keys_from parameter');
- }
-}
+# These are depricated! All but PULLDOWN_HASH still work, but you should update your code.
+define('PULLDOWN_AUTO', 0); define('PULLDOWN_ARRAY', 1); define('PULLDOWN_HASH', 2); define('PULLDOWN_2D', 3);
# call this function before you run() the template so enc_options() knows what
@@ -247,22 +228,33 @@ function pulldown_options_to_2d($options, $keys_from) {
#
# name: the name of the html control
#
-# options: an array of options to display in the pulldown/selectbox
-#
-# keys_from: Set to one of:
-# PULLDOWN_ARRAY: (default) values of $options are displayd and posted
-# PULLDOWN_HASH: values of $options are display, keys are posted
-# PULLDOWN_2D: $options is a 2 dimensional array.
-# $options[0][1] is displayed, $options[0][0] is posted.
-# $options[1][1] is displayed, $options[1][0] is posted.
+# options: an array of options to display in the pulldown/selectbox. Each
+# element can be either a string, or an array with two elements (first the
+# value to post, and second the value to display in the pulldown)
#
# multiple: UNTESTED set to true for multiple-select boxes.
-function pulldown($name, $options, $keys_from = PULLDOWN_ARRAY, $multiple = false) {
- $options = pulldown_options_to_2d($options, $keys_from);
- $GLOBALS[$name . '_options'] = array();
- $GLOBALS[$name . '_options']['options'] = $options;
- $GLOBALS[$name . '_options']['multiple'] = $multiple;
+function pulldown($name, $in_options, $multiple = false) {
+ if($multiple === PULLDOWN_HASH) {
+ die('Webmaster error: PULLDOWN_HASH is depricated. Pass array(a,b) not a=>b');
+ }
+ if($multiple !== true) {
+ # Probably due to API change (removing 3rd argument) but don't bother
+ # emitting a warning, because the above warning handles the only
+ # important case.
+ $multiple = false;
+ }
+ $options = array();
+ foreach($in_options as $option) {
+ if(is_array($option)) {
+ $options[] = $option;
+ } else {
+ $options[] = array($option, $option);
+ }
+ }
+ $GLOBALS[$name . '_options'] = array(
+ 'options' => $options,
+ 'multiple' => $multiple);
}
# output a bunch of