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

[wfpl.git] / encode.php

diff --git a/encode.php b/encode.php
index 123fcc9..175e1a7 100644 (file)
--- a/encode.php
+++ b/encode.php
@@ -50,7 +50,7 @@ function enc_html($str) {
        return $str;
 }
 
-# Encode for output in html. converts \n to <br />
+# Encode for output in html. Convert newlines to <br />
 #
 # Example: <p>~foo.html~</p>
 function enc_htmlbr($str) {
@@ -59,6 +59,15 @@ function enc_htmlbr($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.
 #
@@ -129,30 +138,41 @@ function enc_states($str) {
        return encode_options($str, $states_assoc, $use_keys = true);
 }
 
+# display <option>s
+function enc_provinces($str) {
+       $provinces_assoc = array("AB" => "Alberta", "BC" => "British Columbia", "MB" => "Manitoba", "NF" => "Newfoundland", "NB" => "New Brunswick", "NS" => "Nova Scotia", "NT" => "Northwest Territories", "NU" => "Nunavut", "ON" => "Ontario", "PE" => "Prince Edward Island", "QC" => "Quebec", "SK" => "Saskatchewan", "YT" => "Yukon Territory");
+       $ret = '';
+
+       return encode_options($str, $provinces_assoc, $use_keys = true);
+}
+
+
+
+
 
 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');
        }
 }
 
@@ -176,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;
@@ -190,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.
@@ -205,13 +225,16 @@ 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, $strict = true)) {
+               if(in_array($value, $selected)) {
                        $out .= ' selected="selected"';
                }
 
@@ -223,7 +246,7 @@ function encode_options($selected, $options, $keys_from) {
                        
                $out .= '>';
 
-               $out .= enc_html($display);
+               $out .= enc_htmlnbsp($display);
 
                $out .= "</option>\n";
        }