X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=b2d3c21c4a8ae584289d33401ccadb890b6a749a;hb=f22b600c925131bb767db73d77dc595f18a1406a;hp=f89e720f356e426a11513fc5a983143290ac87a9;hpb=1ad4ac7890228dfd78064f5ef8925e325e9aba29;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index f89e720..b2d3c21 100644
--- a/metaform.php
+++ b/metaform.php
@@ -66,8 +66,18 @@ function list_available_types() {
 
 
 function metaform() {
-	if(isset($_REQUEST['form_name'])) {
-		$GLOBALS['form_name'] = format_varname($_REQUEST['form_name']);
+	if(isset($_REQUEST['singular'])) {
+		$GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
+		$GLOBALS['table_name'] = format_varname($_REQUEST['table_name']);
+		$GLOBALS['plural'] = format_varname($_REQUEST['plural']);
+		# backwards compatibility:
+		if(isset($_REQUEST['form_name'])) {
+			$GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname($_REQUEST['form_name']);
+		}
+		tem_set('file_name', $GLOBALS['file_name']);
+		tem_set('table_name', $GLOBALS['table_name']);
+		tem_set('plural', $GLOBALS['plural']);
+
 		$GLOBALS['singular'] = format_varname($_REQUEST['singular']);
 		tem_set('singular', $GLOBALS['singular']);
 		$GLOBALS['opt_email'] = format_yesno($_REQUEST['opt_email']);
@@ -80,8 +90,6 @@ function metaform() {
 		tem_set('opt_display', $GLOBALS['opt_display']);
 		$GLOBALS['opt_http_pass'] = format_yesno($_REQUEST['opt_http_pass']);
 		tem_set('opt_http_pass', $GLOBALS['opt_http_pass']);
-	} else {
-		$GLOBALS['form_name'] = 'some_form';
 	}
 
 	if(isset($_REQUEST['fields'])) {
@@ -105,7 +113,6 @@ function metaform() {
 			exit();
 		} elseif(isset($_REQUEST['edit'])) {
 			tem_set('fields', $_REQUEST['fields']);
-			tem_set('form_name', $GLOBALS['form_name']);
 			# fall through
 		} else {
 			die("Sorry... couldn't tell which button you pressed");
@@ -164,7 +171,7 @@ function view_headers() {
 function make_sql() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.sql');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -210,8 +217,10 @@ function make_html($whole_file = true) {
 	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.html');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('file_name', $GLOBALS['file_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
 	$tem->set('singular', $GLOBALS['singular']);
+	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	$tem->set('always_field', find_always_field($fields));
 	foreach($fields as $field) {
@@ -222,6 +231,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,7 +241,8 @@ 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':
@@ -251,6 +262,23 @@ 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');
+				} else {
+					$tem->set('listing_enc', 'html');
+				}
+				$tem->show('listing_head_col');
+				$tem->show('listing_row_col');
+			}
+		}
 	}
 
 	if($GLOBALS['opt_db'] == 'Yes') {
@@ -261,9 +289,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');
 	}
 
@@ -300,12 +325,27 @@ 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();
 	$tem->load('code/wfpl/metaform/template.php');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('file_name', $GLOBALS['file_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
 	$tem->set('singular', $GLOBALS['singular']);
+	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	$db_fields = '';
 	$php_fields = '';
@@ -341,6 +381,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);
@@ -395,7 +442,10 @@ function view_php() {
 function make_email() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.email.txt');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('file_name', $GLOBALS['file_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
+	$tem->set('singular', $GLOBALS['singular']);
+	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -415,7 +465,7 @@ function make_email() {
 
 function make_htaccess() {
 	$tem = new tem();
-	$tem->set('form', $GLOBALS['form_name']);
+	$tem->set('form', $GLOBALS['file_name']);
 	return $tem->run('code/wfpl/metaform/htaccess');
 }
 
@@ -427,7 +477,10 @@ function view_email() {
 
 function preview() {
 	tem_load('code/wfpl/metaform/preview.html');
-	tem_set('form_name', $GLOBALS['form_name']);
+	tem_set('file_name', $GLOBALS['file_name']);
+	tem_set('table_name', $GLOBALS['table_name']);
+	tem_set('singular', $GLOBALS['singular']);
+	tem_set('plural', $GLOBALS['plural']);
 	tem_set('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
 	$preview_tem->load_str(make_html(false));
@@ -451,7 +504,7 @@ function preview() {
 }
 
 function download_tar() {
-	$name = $GLOBALS['form_name'];
+	$name = $GLOBALS['file_name'];
 	$data = array(
 		".htaccess" => make_htaccess(),
 		"run.php ->" => 'code/wfpl/run.php',