X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=ee5b9422cc115c2dd5f7f7ec75b3777c6a6f04c0;hb=3f276370f699ae7ed6df930818d8e6c765d856f4;hp=04e786a0459d0723bfd223e5fe47337c59d2aae5;hpb=423f31ad0add74bbb6066d3c9f760ad0a5580cda;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 04e786a..ee5b942 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)'),
@@ -70,7 +68,7 @@ function metaform() {
 	if(isset($_REQUEST['singular'])) {
 		$GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
 		$GLOBALS['table_name'] = format_varname($_REQUEST['table_name']);
-		$GLOBALS['plural'] = format_varname($_REQUEST['plural']);
+		$GLOBALS['plural'] = format_oneline($_REQUEST['plural']);
 		# backwards compatibility:
 		if(isset($_REQUEST['form_name'])) {
 			$GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname($_REQUEST['form_name']);
@@ -79,7 +77,7 @@ function metaform() {
 		tem_set('table_name', $GLOBALS['table_name']);
 		tem_set('plural', $GLOBALS['plural']);
 
-		$GLOBALS['singular'] = format_varname($_REQUEST['singular']);
+		$GLOBALS['singular'] = format_oneline($_REQUEST['singular']);
 		tem_set('singular', $GLOBALS['singular']);
 		$GLOBALS['opt_email'] = format_yesno($_REQUEST['opt_email']);
 		tem_set('opt_email', $GLOBALS['opt_email']);
@@ -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':
@@ -268,9 +265,6 @@ function make_html($whole_file = true) {
 		}
 
 		if($GLOBALS['opt_listing'] == 'Yes') {
-			if($GLOBALS['opt_display'] != 'Yes') {
-				$tem->show('opt_display_a_else');
-			}
 			if(show_in_listing($type, $input, $format, $sql)) {
 				if($format == 'bool' || $format == 'yesno') {
 					$tem->set('listing_enc', 'yesno');
@@ -284,6 +278,10 @@ function make_html($whole_file = true) {
 					$tem->set('listing_enc', 'html');
 					$tem->show('listing_value_enc');
 				}
+
+				if($GLOBALS['opt_display'] != 'Yes') {
+					$tem->show('opt_display_a_else');
+				}
 				$tem->show('listing_head_col');
 				$tem->show('listing_row_col');
 			}
@@ -351,6 +349,7 @@ function show_in_listing($type, $input, $format, $sql) {
 }
 
 function make_php() {
+	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.php');
 	$tem->set('file_name', $GLOBALS['file_name']);
@@ -389,7 +388,9 @@ function make_php() {
 					$image_included_yet = true;
 				}
 			} else {
-				if($input == 'pulldown') {
+				if($input == 'html') {
+					$has_html_editors = true;
+				} elseif($input == 'pulldown') {
 					$tem->show('pulldowns');
 					$tem->show('pulldown_format_extra');
 				}
@@ -406,6 +407,10 @@ function make_php() {
 		}
 	}
 
+	if($has_html_editors) {
+		$tem->show('show_extra_headers');
+	}
+
 	$tem->set('always_field', $always_field);
 	$tem->set('db_fields', $db_fields);
 	$tem->set('php_fields', $php_fields);
@@ -429,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();
 }
@@ -521,7 +530,7 @@ function download_tar() {
 	$name = $GLOBALS['file_name'];
 	$data = array(
 		".htaccess" => make_htaccess(),
-		"run.php ->" => 'code/wfpl/run.php',
+		#"run.php ->" => 'code/wfpl/run.php',
 		"style.css" => read_whole_file('code/wfpl/metaform/style.css'),
 		"$name.html" => make_html(),
 		"$name.php" => make_php());