X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=734d8fc91b759a38128e1d283524871a675e320e;hb=8ef1f36849dc9f50ad2d5c19bef126ab3c9e454b;hp=65343ea5d7004e72f69a6212fa37050e880f49ac;hpb=856f805c6cbb6e712c662214f3b5821442f808a0;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 65343ea..734d8fc 100644
--- a/metaform.php
+++ b/metaform.php
@@ -46,9 +46,10 @@ $GLOBALS['types'] = array(
 	'html' =>       array('html',        'unix',       'text'),
 	'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
 	'radio' =>      array('radio',       'oneline',    'varchar(200)'),
-	'leftcheck' =>  array('leftcheck',   'yesno',      'varchar(3)'),
-	'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
-	'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
+	'checkbox' =>   array('leftcheck',   'bool',       'int(1)'),
+	'rightcheck' => array('checkbox',    'bool',       'int(1)'),
+	'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
+	'yesno' =>      array('leftcheck',   'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
 	'image' =>      array('image',       'oneline',    'varchar(200)'),
 	'submit' =>     array('submit',      'oneline',    'n/a')
@@ -75,6 +76,8 @@ function metaform() {
 		tem_set('opt_db', $GLOBALS['opt_db']);
 		$GLOBALS['opt_listing'] = format_yesno($_REQUEST['opt_listing']);
 		tem_set('opt_listing', $GLOBALS['opt_listing']);
+		$GLOBALS['opt_display'] = format_yesno($_REQUEST['opt_display']);
+		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 {
@@ -226,6 +229,19 @@ function make_html($whole_file = true) {
 			$tem->set('html_field_name', $name);
 			$tem->show('replace_textarea');
 		}
+		if($GLOBALS['opt_display']) {
+			switch($input) {
+				case 'textarea':
+					$tem->show('display_multiline');
+				break;
+				case 'html':
+					$tem->show('display_html');
+				break;
+				default:
+					$tem->show('display_short');
+			}
+			$tem->show('display_row');
+		}
 	}
 
 	if($GLOBALS['opt_db'] == 'Yes') {
@@ -236,9 +252,15 @@ 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');
-	} else {
-		$tem->show('opt_listing_1_else');
+	}
+
+	if($GLOBALS['opt_display'] == 'Yes') {
+		$tem->show('opt_display_1');
+		$tem->show('opt_display_2');
 	}
 
 	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
@@ -318,9 +340,13 @@ function make_php() {
 	if($GLOBALS['opt_listing'] == 'Yes') {
 		$tem->show('opt_listing_1');
 		$tem->show('opt_listing_2');
-		$tem->show('opt_listing_4');
+	}
+	if($GLOBALS['opt_display'] == 'Yes') {
+		$tem->show('opt_display_1');
+		$tem->show('opt_display_2');
 	} else {
-		$tem->show('opt_listing_4_else');
+		$tem->show('opt_display_1_else');
+		$tem->show('opt_display_2_else');
 	}
 	if($GLOBALS['opt_db'] == 'Yes') {
 		$tem->show('opt_db_1');
@@ -427,7 +453,7 @@ function download_tar() {
 	if($GLOBALS['opt_email'] == 'Yes') {
 		$data["$name.email.txt"] = make_email();
 	}
-	make_wfpl_tar($name, $data);
+	make_tar($name, $data);
 }