X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=encode.php;h=b73a0ecb430fb9f5577b5dabd66859c0bff2cc89;hb=23ac7dc3675119a6f7a3876837bd6c656b0d2cce;hp=123fcc9c47af4b0b45b89a1dc2257f52e7e38d0b;hpb=6c27f346217f7b4b8b24064371f2461cf57c6167;p=wfpl.git

diff --git a/encode.php b/encode.php
index 123fcc9..b73a0ec 100644
--- 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.
 #
@@ -121,38 +130,31 @@ function enc_ddmmyyyyhhmm($seconds) {
 }
 
 
-# display <option>s
-function enc_states($str) {
-	$states_assoc = array("AL" => "Alabama", "AK" => "Alaska", "AZ" => "Arizona", "AR" => "Arkansas", "CA" => "California", "CO" => "Colorado", "CT" => "Connecticut", "DE" => "Delaware", "FL" => "Florida", "GA" => "Georgia", "HI" => "Hawaii", "ID" => "Idaho", "IL" => "Illinois", "IN" => "Indiana", "IA" => "Iowa", "KS" => "Kansas", "KY" => "Kentucky", "LA" => "Louisiana", "ME" => "Maine", "MD" => "Maryland", "MA" => "Massachusetts", "MI" => "Michigan", "MN" => "Minnesota", "MS" => "Mississippi", "MO" => "Missouri", "MT" => "Montana", "NE" => "Nebraska", "NV" => "Nevada", "NH" => "New Hampshire", "NJ" => "New Jersey", "NM" => "New Mexico", "NY" => "New York", "NC" => "North Carolina", "ND" => "North Dakota", "OH" => "Ohio", "OK" => "Oklahoma", "OR" => "Oregon", "PA" => "Pennsylvania", "RI" => "Rhode Island", "SC" => "South Carolina", "SD" => "South Dakota", "TN" => "Tennessee", "TX" => "Texas", "UT" => "Utah", "VT" => "Vermont", "VA" => "Virginia", "WA" => "Washington", "DC" => "Washington, DC", "WV" => "West Virginia", "WI" => "Wisconsin", "WY" => "Wyoming");
-	$ret = '';
-
-	return encode_options($str, $states_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 +178,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 +192,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 +207,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 +228,7 @@ function encode_options($selected, $options, $keys_from) {
 			
 		$out .= '>';
 
-		$out .= enc_html($display);
+		$out .= enc_htmlnbsp($display);
 
 		$out .= "</option>\n";
 	}
@@ -231,4 +236,37 @@ function encode_options($selected, $options, $keys_from) {
 	return $out;
 }
 
+$GLOBALS['wfpl_states_assoc'] = array("AL" => "Alabama", "AK" => "Alaska", "AZ" => "Arizona", "AR" => "Arkansas", "CA" => "California", "CO" => "Colorado", "CT" => "Connecticut", "DE" => "Delaware", "FL" => "Florida", "GA" => "Georgia", "HI" => "Hawaii", "ID" => "Idaho", "IL" => "Illinois", "IN" => "Indiana", "IA" => "Iowa", "KS" => "Kansas", "KY" => "Kentucky", "LA" => "Louisiana", "ME" => "Maine", "MD" => "Maryland", "MA" => "Massachusetts", "MI" => "Michigan", "MN" => "Minnesota", "MS" => "Mississippi", "MO" => "Missouri", "MT" => "Montana", "NE" => "Nebraska", "NV" => "Nevada", "NH" => "New Hampshire", "NJ" => "New Jersey", "NM" => "New Mexico", "NY" => "New York", "NC" => "North Carolina", "ND" => "North Dakota", "OH" => "Ohio", "OK" => "Oklahoma", "OR" => "Oregon", "PA" => "Pennsylvania", "RI" => "Rhode Island", "SC" => "South Carolina", "SD" => "South Dakota", "TN" => "Tennessee", "TX" => "Texas", "UT" => "Utah", "VT" => "Vermont", "VA" => "Virginia", "WA" => "Washington", "DC" => "Washington, DC", "WV" => "West Virginia", "WI" => "Wisconsin", "WY" => "Wyoming");
+
+# display <option>s
+function enc_states($str) {
+	$ret = '';
+
+	return encode_options($str, $GLOBALS['wfpl_states_assoc'], PULLDOWN_HASH);
+}
+
+$GLOBALS['wfpl_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");
+
+# display <option>s
+function enc_provinces($str) {
+	$ret = '';
+
+	return encode_options($str, $GLOBALS['wfpl_provinces_assoc'], PULLDOWN_HASH);
+}
+
+# returns "odd", then "even", then "odd" etc.
+function enc_evenodd($values, $name) {
+	if(!isset($GLOBALS['wfpl_even_odds'])) {
+		$GLOBALS['wfpl_even_odds'] = array();
+	}
+
+	if($GLOBALS['wfpl_even_odds'][$name]) {
+		$GLOBALS['wfpl_even_odds'][$name] = false;
+		return 'even';
+	} else {
+		$GLOBALS['wfpl_even_odds'][$name] = true;
+		return 'odd';
+	}
+}
+
 ?>