X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=ecde564b46b0f50fc9573bc9d9b3ba934336bd07;hb=7596b1ca035ff09e584e915a6e5572ffb46d7625;hp=62ef5069f8afd9c2eb6b25fe52e7e862ee87c99c;hpb=4a25d3b6318f7f361df3adfac17366452fe3ed49;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 62ef506..ecde564 100644
--- a/metaform.php
+++ b/metaform.php
@@ -222,6 +222,7 @@ function make_html($whole_file = true) {
 		if($input != 'hidden') {
 			$tem->show('row');
 		}
+
 		if($input == 'image' && !$uploads_output_already) {
 			$tem->show('uploads');
 			$tem->set('enctype_attr', '" enctype="multipart/form-data');
@@ -231,8 +232,16 @@ function make_html($whole_file = true) {
 			$tem->set('html_field_name', $name);
 			$tem->show('replace_textarea');
 		}
-		if($GLOBALS['opt_display']) {
+
+		if($GLOBALS['opt_display'] == 'Yes') {
 			switch($input) {
+				case 'checkbox':
+				case 'leftcheck':
+					$tem->show('display_yesno');
+				break;
+				case 'date':
+					$tem->show('display_date');
+				break;
 				case 'textarea':
 					$tem->show('display_multiline');
 				break;
@@ -244,6 +253,21 @@ function make_html($whole_file = true) {
 			}
 			$tem->show('display_row');
 		}
+
+		if($GLOBALS['opt_listing'] == 'Yes') {
+			if($GLOBALS['opt_display'] != 'Yes') {
+				$tem->show('opt_display_a_else');
+			}
+			if(show_in_listing($type, $input, $format, $sql)) {
+				if($format == 'bool' || $format == 'yesno') {
+					$tem->set('listing_enc', 'yesno');
+				} elseif($input == 'date') {
+					$tem->set('listing_enc', 'mmddyyyy');
+				}
+				$tem->show('listing_head_col');
+				$tem->show('listing_row_col');
+			}
+		}
 	}
 
 	if($GLOBALS['opt_db'] == 'Yes') {
@@ -254,9 +278,6 @@ function make_html($whole_file = true) {
 	}
 
 	if($GLOBALS['opt_listing'] == 'Yes') {
-		if($GLOBALS['opt_display'] != 'Yes') {
-			$tem->show('opt_display_a_else');
-		}
 		$tem->show('opt_listing_1');
 	}
 
@@ -293,6 +314,19 @@ function view_html() {
 	echo make_html();
 }
 
+function show_in_listing($type, $input, $format, $sql) {
+	switch($input) {
+		case 'submit':
+		case 'hidden':
+		case 'password':
+		case 'textarea':
+		case 'html':
+			return false;
+		default:
+			return true;
+	}
+}
+
 
 function make_php() {
 	$tem = new tem();
@@ -334,6 +368,13 @@ function make_php() {
 			}
 			$tem->show('tem_sets');
 		}
+
+		if($GLOBALS['opt_listing'] == 'Yes') {
+			if(show_in_listing($type, $input, $format, $sql)) {
+				$tem->show('listing_fields_1');
+				$tem->show('listing_fields_2');
+			}
+		}
 	}
 
 	$tem->set('always_field', $always_field);