X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=a4a7872b66c945c698ea7ad4c38bac1f229f1693;hb=fb2d0e47e11293f8b2a98d13a76d19b6e6a4f77d;hp=c5c8189bc46a19d8000be153fbd3b89340f44680;hpb=bec27c6cdc0ac4b18024d82a4fdefd6708b59ba6;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index c5c8189..a4a7872 100644
--- a/metaform.php
+++ b/metaform.php
@@ -46,10 +46,8 @@ $GLOBALS['types'] = array(
 	'html' =>       array('html',        'unix',       'text'),
 	'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
 	'radio' =>      array('radio',       'oneline',    'varchar(200)'),
-	'checkbox' =>   array('leftcheck',   'bool',       'int(1)'),
-	'rightcheck' => array('checkbox',    'bool',       'int(1)'),
-	'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
-	'yesno' =>      array('leftcheck',   'yesno',      'varchar(3)'),
+	'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
+	'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
 	'image' =>      array('image',       'oneline',    'varchar(120)'),
 	'thumb' =>      array('image',       'oneline',    'varchar(240)'),
@@ -89,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'])) {
@@ -202,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;
 		}
 	}
@@ -249,7 +247,6 @@ function make_html($whole_file = true) {
 					$tem->show('display_image');
 				break;
 				case 'checkbox':
-				case 'leftcheck':
 					$tem->show('display_yesno');
 				break;
 				case 'date':
@@ -304,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') {
@@ -361,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) {
@@ -373,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') {
@@ -399,7 +392,6 @@ function make_php() {
 				}
 				$tem->show('formats');
 			}
-			$tem->show('tem_sets');
 		}
 
 		if($GLOBALS['opt_listing'] == 'Yes') {
@@ -416,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');
@@ -427,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');
@@ -437,12 +427,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();
 }