X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=dc5173b3eee342ff1f3df4ae50601d4df4e4ed1b;hb=240620295349badc59c1252f49b6a6a1c0609e0c;hp=e490f378d5354f2e40a8e5d13f340bf823bf80b0;hpb=a72cc638463765aa10fc4b106efce295d7d44457;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index e490f37..dc5173b 100644
--- a/metaform.php
+++ b/metaform.php
@@ -84,7 +84,7 @@ function tem_set_globals(&$tem) {
 		'opt_display',
 		'opt_pass');
 	foreach($bools as $bool) {
-		if(format_bool($GLOBALS[$bool])) {
+		if($GLOBALS[$bool]) {
 			$tem->set($bool);
 		}
 	}
@@ -101,11 +101,11 @@ function metaform() {
 		}
 
 		$GLOBALS['singular'] = format_oneline($_REQUEST['singular']);
-		$GLOBALS['opt_email'] = format_yesno($_REQUEST['opt_email']);
-		$GLOBALS['opt_db'] = format_yesno($_REQUEST['opt_db']);
-		$GLOBALS['opt_listing'] = format_yesno($_REQUEST['opt_listing']);
-		$GLOBALS['opt_display'] = format_yesno($_REQUEST['opt_display']);
-		$GLOBALS['opt_pass'] = format_yesno($_REQUEST['opt_pass']);
+		$GLOBALS['opt_email'] = format_bool($_REQUEST['opt_email']);
+		$GLOBALS['opt_db'] = format_bool($_REQUEST['opt_db']);
+		$GLOBALS['opt_listing'] = format_bool($_REQUEST['opt_listing']);
+		$GLOBALS['opt_display'] = format_bool($_REQUEST['opt_display']);
+		$GLOBALS['opt_pass'] = format_bool($_REQUEST['opt_pass']);
 
 		tem_init();
 		tem_set_globals($GLOBALS['wfpl_template']);
@@ -307,7 +307,7 @@ function make_html($whole_file = true) {
 	}
 
 	# Submit/Send button
-	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
+	if($GLOBALS['opt_email'] == 'Yes' && !$GLOBALS['opt_db']) {
 		$visible_fields[] = array('submit' => array(
 			'name' => 'send',
 			'caption' => 'Send'));
@@ -426,7 +426,7 @@ function make_php() {
 			}
 		}
 
-		if($GLOBALS['opt_listing'] == 'Yes') {
+		if($GLOBALS['opt_listing']) {
 			if(show_in_listing($type, $input, $format, $sql)) {
 				$tem->show('listing_fields_1');
 				$tem->show('listing_fields_2');
@@ -447,7 +447,7 @@ function make_php() {
 	$tem->set('always_field', $always_field);
 	$tem->set('db_fields', $db_fields);
 	$tem->set('metaform_url', edit_url());
-	if($GLOBALS['opt_email'] == 'Yes') {
+	if($GLOBALS['opt_email']) {
 		$this_domain = $_SERVER['HTTP_HOST'];
 		if(substr($this_domain, -2) == '.l') {
 			$this_domain = substr($this_domain, 0, -1) . 'com';
@@ -510,7 +510,7 @@ function preview() {
 	tem_set('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
 	$preview_tem->load_str(make_html(false));
-	if($GLOBALS['opt_db'] == 'Yes') {
+	if($GLOBALS['opt_db']) {
 		$preview_tem->show('new_msg');
 	}
 	$fields = get_fields();
@@ -538,10 +538,10 @@ function download_tar() {
 		"style.css" => read_whole_file('code/wfpl/metaform/style.css'),
 		"$name.html" => make_html(),
 		"$name.php" => make_php());
-	if($GLOBALS['opt_db'] == 'Yes') {
+	if($GLOBALS['opt_db']) {
 		$data["$name.sql"] = make_sql();
 	}
-	if($GLOBALS['opt_email'] == 'Yes') {
+	if($GLOBALS['opt_email']) {
 		$data["$name.email.txt"] = make_email();
 	}
 	make_tar($name, $data);