X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=encode.php;h=b29cd091646b4b43086ac81ce2a4f73fe23c4c5a;hb=1b3ef2591aad28325486101883dd7c8a22d56670;hp=243b21f68bd7a990f77e1e9e923d4e8fb56e538e;hpb=d98d81886649a863d0e902f7c4e63b1257217e1f;p=wfpl.git

diff --git a/encode.php b/encode.php
index 243b21f..b29cd09 100644
--- a/encode.php
+++ b/encode.php
@@ -50,6 +50,15 @@ function enc_html($str) {
 	return $str;
 }
 
+# Encode for output in html. Convert newlines to <br />
+#
+# Example: <p>~foo.html~</p>
+function enc_htmlbr($str) {
+	$str = enc_html($str);
+	$str = str_replace("\n", "<br />\n", $str);
+	return $str;
+}
+
 
 # HTML attribute.
 #
@@ -67,6 +76,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.
@@ -99,6 +116,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) {
@@ -108,30 +129,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');
 	}
 }
 
@@ -155,7 +187,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;
@@ -169,7 +201,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.
@@ -184,10 +216,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)) {