Merge branch 'master' of /home/jason/dev/git/wfpl

[wfpl.git] / encode.php

diff --git a/encode.php b/encode.php
index 1cbac74..175e1a7 100644 (file)
--- a/encode.php
+++ b/encode.php
@@ -50,18 +50,24 @@ function enc_html($str) {
        return $str;
 }
 
-
-# Encode for output in html. Converts newlines to <br />
+# Encode for output in html. Convert newlines to <br />
 #
 # Example: <p>~foo.html~</p>
 function enc_htmlbr($str) {
-       $str = str_replace('&', '&amp;', $str);
-       $str = str_replace('<', '&lt;', $str);
-       $str = str_replace('>', '&gt;', $str);
+       $str = enc_html($str);
        $str = str_replace("\n", "<br />\n", $str);
        return $str;
 }
 
+# Encode for output in html. Spaces converted to &nbsp;
+#
+# Example: <option value="12">~foo.htmlnbsp~</option>
+function enc_htmlnbsp($str) {
+       $str = enc_html($str);
+       $str = str_replace(' ', '&nbsp;', $str);
+       return $str;
+}
+
 
 # HTML attribute.
 #
@@ -79,6 +85,14 @@ function enc_url_val($str) {
        return rawurlencode($str);
 }
 
+# FIXME
+function enc_url_path($str) {
+       $str = rawurlencode($str);
+       $str = str_replace('%2F', '/', $str);
+       return $str;
+}
+
+
 # This is a hack to work around html's stupid syntax for checkboxes.
 #
 # Place the template marker just before a " somewhere.
@@ -111,6 +125,10 @@ function enc_upper($str) {
        return strtoupper($str);
 }
 
+function enc_ddmmyyyyhhmm($seconds) {
+       return date('m/d/Y g:ia', (int)$seconds);
+}
+
 
 # display <option>s
 function enc_states($str) {
@@ -134,27 +152,27 @@ function enc_provinces($str) {
 
 define('PULLDOWN_ARRAY', 0); define('PULLDOWN_HASH', 1); define('PULLDOWN_2D', 2);
 
-function pulldown_options_to_hash($options, $keys_from) {
+function pulldown_options_to_2d($options, $keys_from) {
        # convert other types of input to value=>display hash
        switch($keys_from) {
                case PULLDOWN_HASH:
-                       return $options;
-               case PULLDOWN_ARRAY:
                        $new_options = array();
-                       foreach($options as $opt) {
-                               $new_options[$opt] = $opt;
+                       foreach($options as $value => $display) {
+                               $new_options[] = array($value, $display);
                        }
                        return $new_options;
-               break;
-               case PULLDOWN_2D:
+               case PULLDOWN_ARRAY:
                        $new_options = array();
                        foreach($options as $opt) {
-                               $new_options[$opt[0]] = $opt[1];
+                               $new_options[] = array($opt, $opt);
                        }
                        return $new_options;
                break;
+               case PULLDOWN_2D:
+                       return $options;
+               break;
                default:
-                       die('unknown value: "' . print_r($keys_from) . '" passed in $keys_from parameter');
+                       die('pulldown_options_to_2d(): unknown value: "' . print_r($keys_from) . '" passed in $keys_from parameter');
        }
 }
 
@@ -178,7 +196,7 @@ function pulldown_options_to_hash($options, $keys_from) {
 #   multiple: UNTESTED set to true for multiple-select boxes. 
 
 function pulldown($name, $options, $keys_from = PULLDOWN_ARRAY, $multiple = false) {
-       $options = pulldown_options_to_hash($options, $keys_from);
+       $options = pulldown_options_to_2d($options, $keys_from);
        $GLOBALS[$name . '_options'] = array();
        $GLOBALS[$name . '_options']['options'] = $options;
        $GLOBALS[$name . '_options']['multiple'] = $multiple;
@@ -192,7 +210,7 @@ function enc_options($values, $name) {
        if($GLOBALS[$name . '_options']['multiple']) { # FIXME test this
                $values = explode(', ', $values);
        }
-       return encode_options($values, $GLOBALS[$name . '_options']['options'], PULLDOWN_HASH);
+       return encode_options($values, $GLOBALS[$name . '_options']['options'], PULLDOWN_2D);
 }
 
 # use this function along with a special template to generate the html for pulldowns and multiple select boxes.
@@ -207,10 +225,13 @@ function encode_options($selected, $options, $keys_from) {
                $selected = array($selected);
        }
 
-       $options = pulldown_options_to_hash($options, $keys_from);
+       if($keys_from != PULLDOWN_2D) {
+               $options = pulldown_options_to_2d($options, $keys_from);
+       }
 
        $out = '';
-       foreach($options as $value => $display) {
+       foreach($options as $valdisp) {
+               list($value, $display) = $valdisp;
                $out .= '<option';
 
                if(in_array($value, $selected)) {
@@ -225,7 +246,7 @@ function encode_options($selected, $options, $keys_from) {
                        
                $out .= '>';
 
-               $out .= enc_html($display);
+               $out .= enc_htmlnbsp($display);
 
                $out .= "</option>\n";
        }