X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=3e8c380eab4e30db757fbcfae52a16268adc2dfa;hb=67367ba59ba215d2c7bb1eccf01d68774b32039d;hp=ee5b9422cc115c2dd5f7f7ec75b3777c6a6f04c0;hpb=c8c3188b38830c22f77de3bb6ae035b26c481077;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index ee5b942..3e8c380 100644
--- a/metaform.php
+++ b/metaform.php
@@ -301,7 +301,6 @@ function make_html($whole_file = true) {
 
 	if($GLOBALS['opt_display'] == 'Yes') {
 		$tem->show('opt_display_1');
-		$tem->show('opt_display_2');
 	}
 
 	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
@@ -358,7 +357,6 @@ function make_php() {
 	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	$db_fields = '';
-	$php_fields = '';
 	$always_field = find_always_field($fields);
 	$image_included_yet = false;
 	foreach($fields as $field) {
@@ -370,8 +368,6 @@ function make_php() {
 			if($sql != 'n/a') {
 				if($db_fields != '') $db_fields .= ',';
 				$db_fields .= $name;
-				if($php_fields != '') $php_fields .= ', ';
-				$php_fields .= '$' . $name;
 			}
 			if($input == 'image') {
 				if($type == 'thumb') {
@@ -396,7 +392,6 @@ function make_php() {
 				}
 				$tem->show('formats');
 			}
-			$tem->show('tem_sets');
 		}
 
 		if($GLOBALS['opt_listing'] == 'Yes') {
@@ -413,7 +408,6 @@ function make_php() {
 
 	$tem->set('always_field', $always_field);
 	$tem->set('db_fields', $db_fields);
-	$tem->set('php_fields', $php_fields);
 	$tem->set('metaform_url', edit_url());
 	if($GLOBALS['opt_listing'] == 'Yes') {
 		$tem->show('opt_listing_1');
@@ -424,7 +418,6 @@ function make_php() {
 		$tem->show('opt_display_2');
 	} else {
 		$tem->show('opt_display_1_else');
-		$tem->show('opt_display_2_else');
 	}
 	if($GLOBALS['opt_db'] == 'Yes') {
 		$tem->show('opt_db_1');
@@ -474,7 +467,7 @@ function make_email() {
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
 		$tem->set('name', $name);
-		$tem->set('caption', $name); # fixme
+		$tem->set('caption', format_caption($name));
 		if($type == 'textarea') {
 			$tem->show('multi_line');
 		} elseif($type == 'checkbox') {
@@ -529,6 +522,7 @@ function preview() {
 function download_tar() {
 	$name = $GLOBALS['file_name'];
 	$data = array(
+		"INSTALL" => read_whole_file('code/wfpl/metaform/INSTALL'),
 		".htaccess" => make_htaccess(),
 		#"run.php ->" => 'code/wfpl/run.php',
 		"style.css" => read_whole_file('code/wfpl/metaform/style.css'),