X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=f7a5740797f3b6b82c416faa279183b9a227e6d0;hb=3746445139a650d2ffdc9fc8099af9645fcb2308;hp=e6e4123becdbe5b00cb56d4b91a31a8280589758;hpb=d98d81886649a863d0e902f7c4e63b1257217e1f;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index e6e4123..f7a5740 100644
--- a/metaform.php
+++ b/metaform.php
@@ -29,6 +29,7 @@ require_once('code/wfpl/format.php');
 # see code/wfpl/metaform/template.html for the html templates for these elements
 $GLOBALS['types'] = array(
 #    type                  input          format        sql     
+	'varname' =>    array('textbox',     'varname',    'varchar(50)'),
 	'name' =>       array('textbox',     'oneline',    'varchar(200)'),
 	'textbox' =>    array('textbox',     'oneline',    'varchar(200)'),
 	'int' =>        array('textbox',     'int',        'int'),
@@ -39,6 +40,7 @@ $GLOBALS['types'] = array(
 	'phone' =>      array('textbox',     'phone',      'varchar(32)'),
 	'state' =>      array('states',      'oneline',    'varchar(2)'),
 	'money' =>      array('textbox',     'money',      'varchar(32)'),
+	'date' =>       array('textbox',     'mdy_to_ymd', 'char(10)'),
 	'dollars' =>    array('textbox',     'dollars',    'varchar(32)'),
 	'url' =>        array('textbox',     'url',        'varchar(200)'),
 	'hidden' =>     array('hidden',      'unix',       'varchar(200)'),
@@ -48,7 +50,7 @@ $GLOBALS['types'] = array(
 	'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
 	'radio' =>      array('radio',       'oneline',    'varchar(200)'),
 	'leftcheck' =>  array('leftcheck',   'yesno',      'varchar(3)'),
-	'checkbox' =>   array('checkbox',    'yesno',      'varchar(3)'),
+	'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
 	'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
 	'image' =>      array('image',       'oneline',    'varchar(200)'),
@@ -170,10 +172,12 @@ function make_sql() {
 			$tem->set('type', $sql);
 			if($sql == 'int') {
 				$tem->set('default', '0');
+			} elseif($format == 'yesno') {
+				$tem->set('default', '"No"');
 			} else {
 				$tem->set('default', '""');
 			}
-			$tem->sub('column');
+			$tem->show('column');
 		}
 	}
 	view_headers();
@@ -212,32 +216,32 @@ function make_html($whole_file = true) {
 		list($name, $type, $input, $format, $sql) = $field;
 		$tem->set('name', $name);
 		$tem->set('caption', format_caption($name));
-		$tem->sub($input);
+		$tem->show($input);
 		if($input != 'hidden') {
-			$tem->sub('row');
+			$tem->show('row');
 		}
 		if($input == 'image' && !$uploads_output_already) {
-			$tem->sub('uploads');
+			$tem->show('uploads');
 			$tem->set('enctype_attr', '" enctype="multipart/form-data');
 			$uploads_output_already = true;
 		} elseif($input == 'html') {
 			$has_html_editors = true;
 			$tem->set('html_field_name', $name);
-			$tem->sub('replace_textarea');
+			$tem->show('replace_textarea');
 		}
 	}
 
 	if($GLOBALS['opt_db'] == 'Yes') {
-		$tem->sub('opt_db_1');
-		$tem->sub('opt_db_2');
+		$tem->show('opt_db_1');
+		$tem->show('opt_db_2');
 	} else {
-		$tem->sub('opt_db_1_else');
+		$tem->show('opt_db_1_else');
 	}
 
 	if($GLOBALS['opt_listing'] == 'Yes') {
-		$tem->sub('opt_listing_1');
+		$tem->show('opt_listing_1');
 	} else {
-		$tem->sub('opt_listing_1_else');
+		$tem->show('opt_listing_1_else');
 	}
 
 	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
@@ -247,13 +251,13 @@ function make_html($whole_file = true) {
 		$tem->set('name', 'save');
 		$tem->set('caption', 'Save');
 	}
-	$tem->sub('submit');
-	$tem->sub('row');
+	$tem->show('submit');
+	$tem->show('row');
 
-	$tem->sub('form');
+	$tem->show('form');
 
 	if($has_html_editors) {
-		$tem->sub('html_editor_headers');
+		$tem->show('html_editor_headers');
 	}
 
 	if($whole_file) {
@@ -291,22 +295,22 @@ function make_php() {
 				$php_fields .= '$' . $name;
 			}
 			if($input == 'image') {
-				$tem->sub('image_upload');
-				$tem->sub('image_db');
+				$tem->show('image_upload');
+				$tem->show('image_db');
 				if(!$image_included_yet) {
-					$tem->sub('image_include');
-					$tem->sub('upload_max');
-					$tem->sub('upload_settings');
+					$tem->show('image_include');
+					$tem->show('upload_max');
+					$tem->show('upload_settings');
 					$image_included_yet = true;
 				}
 			} else {
 				if($input == 'pulldown') {
-					$tem->sub('pulldowns');
-					$tem->sub('pulldown_format_extra');
+					$tem->show('pulldowns');
+					$tem->show('pulldown_format_extra');
 				}
-				$tem->sub('formats');
+				$tem->show('formats');
 			}
-			$tem->sub('tem_sets');
+			$tem->show('tem_sets');
 		}
 	}
 
@@ -315,28 +319,26 @@ function make_php() {
 	$tem->set('php_fields', $php_fields);
 	$tem->set('metaform_url', edit_url());
 	if($GLOBALS['opt_listing'] == 'Yes') {
-		$tem->sub('opt_listing_1');
-		$tem->sub('opt_listing_2');
-		$tem->sub('opt_listing_3');
-		$tem->sub('opt_listing_4');
+		$tem->show('opt_listing_1');
+		$tem->show('opt_listing_2');
+		$tem->show('opt_listing_4');
 	} else {
-		$tem->sub('opt_listing_3_else');
-		$tem->sub('opt_listing_4_else');
+		$tem->show('opt_listing_4_else');
 	}
 	if($GLOBALS['opt_db'] == 'Yes') {
-		$tem->sub('opt_db_1');
-		$tem->sub('opt_db_2');
-		$tem->sub('opt_db_3');
-		$tem->sub('opt_db_4');
-		$tem->sub('opt_db_5');
+		$tem->show('opt_db_1');
+		$tem->show('opt_db_2');
+		$tem->show('opt_db_3');
+		$tem->show('opt_db_4');
+		$tem->show('opt_db_5');
 	}
 	if($GLOBALS['opt_email'] == 'Yes') {
-		$tem->sub('opt_email_1');
-		$tem->sub('opt_email_2');
+		$tem->show('opt_email_1');
+		$tem->show('opt_email_2');
 	}
 	if($GLOBALS['opt_http_pass'] == 'Yes') {
-		$tem->sub('opt_http_pass_1');
-		$tem->sub('opt_http_pass_2');
+		$tem->show('opt_http_pass_1');
+		$tem->show('opt_http_pass_2');
 	}
 	return $tem->run();
 }
@@ -367,10 +369,13 @@ function make_email() {
 		$tem->set('name', $name);
 		$tem->set('caption', $name); # fixme
 		if($type == 'textarea') {
-			$tem->sub('multi_line');
+			$tem->show('multi_line');
+		} elseif($type == 'checkbox') {
+			$tem->show('checkbox');
 		} else {
-			$tem->sub('fields');
+			$tem->show('normal');
 		}
+		$tem->show('fields');
 	}
 	return $tem->run();
 }
@@ -394,7 +399,7 @@ function preview() {
 	$preview_tem = new tem();
 	$preview_tem->load_str(make_html(false));
 	if($GLOBALS['opt_db'] == 'Yes') {
-		$preview_tem->sub('new_msg');
+		$preview_tem->show('new_msg');
 	}
 	$fields = get_fields();
 	foreach($fields as $field) {
@@ -405,6 +410,7 @@ function preview() {
 	}
 	$preview = $preview_tem->run();
 	unset($preview_tem);
+	$preview = ereg_replace('type="submit"', 'type="submit" disabled="disabled"', $preview);
 	tem_set('preview', $preview);
 	set_form_action();
 	tem_output();