X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=ee5b9422cc115c2dd5f7f7ec75b3777c6a6f04c0;hb=6d9765bdf97af8351ed09c4187869cf05e74e2af;hp=f90ad17927b786e2258344fd123383fabd9ed82a;hpb=c02c8c04539722915a769ff580eb392ba967deee;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index f90ad17..ee5b942 100644
--- a/metaform.php
+++ b/metaform.php
@@ -87,8 +87,8 @@ function metaform() {
 		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']);
+		$GLOBALS['opt_pass'] = format_yesno($_REQUEST['opt_pass']);
+		tem_set('opt_pass', $GLOBALS['opt_pass']);
 	}
 
 	if(isset($_REQUEST['fields'])) {
@@ -200,7 +200,7 @@ function view_sql() {
 function find_always_field($fields) {
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
-		if($input != 'submit' && $input != 'checkbox' && $input != 'radio') {
+		if($input != 'submit' && $input != 'image' && $input != 'checkbox' && $input != 'radio') {
 			return $name;
 		}
 	}
@@ -434,12 +434,16 @@ function make_php() {
 		$tem->show('opt_db_5');
 	}
 	if($GLOBALS['opt_email'] == 'Yes') {
+		$this_domain = $_SERVER['HTTP_HOST'];
+		if(substr($this_domain, -2) == '.l') {
+			$this_domain = substr($this_domain, 0, -1) . 'com';
+		}
+		$tem->set('this_domain', $this_domain);
 		$tem->show('opt_email_1');
 		$tem->show('opt_email_2');
 	}
-	if($GLOBALS['opt_http_pass'] == 'Yes') {
-		$tem->show('opt_http_pass_1');
-		$tem->show('opt_http_pass_2');
+	if($GLOBALS['opt_pass'] == 'Yes') {
+		$tem->show('opt_pass');
 	}
 	return $tem->run();
 }