X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=metaform.php;h=1bdd940d996969ba6dc6123cba9d34ec88c4ffb7;hb=83825f3ade87a6432b63e64b39725f68b03afee8;hp=81ac452a16ecc3d84db9b416b4654443874b2090;hpb=b54ae765dff4e8a1b3c9a8d1f342ecc497ce95b4;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 81ac452..1bdd940 100644
--- a/metaform.php
+++ b/metaform.php
@@ -37,7 +37,7 @@ $GLOBALS['types'] = array(
 	'phone' =>      array('textbox',     'phone',      'varchar(32)'),
 	'state' =>      array('states',      'oneline',    'varchar(2)'),
 	'money' =>      array('textbox',     'money',      'varchar(32)'),
-	'date' =>       array('textbox',     'mdy_to_ymd', 'char(10)'),
+	'date' =>       array('date',        'mdy_to_ymd', 'char(10)'),
 	'dollars' =>    array('textbox',     'dollars',    'varchar(32)'),
 	'url' =>        array('textbox',     'url',        'varchar(200)'),
 	'hidden' =>     array('hidden',      'unix',       'varchar(200)'),
@@ -45,45 +45,68 @@ $GLOBALS['types'] = array(
 	'textarea' =>   array('textarea',    'unix',       'text'),
 	'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)'),
+	'radio' =>      array('radio',       'options',    'varchar(100)'),
+	'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
+	'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
-	'image' =>      array('image',       'oneline',    'varchar(200)'),
+	'image' =>      array('image',       'oneline',    'varchar(120)'),
+	'thumb' =>      array('image',       'oneline',    'varchar(240)'),
+	'file' =>       array('file',        'oneline',    'varchar(100)'),
 	'submit' =>     array('submit',      'oneline',    'n/a')
 );
 
 function list_available_types() {
-	$types = '';
+	ksort($GLOBALS['types']);
 	foreach($GLOBALS['types'] as $key => $value) {
-		if($types) {
-			$types .= ', ';
-		}
-		$types .= $key;
+		tem_set('type', $key);
+		tem_show('types');
+		tem_show('types_sep');
 	}
-	tem_set('available_types', $types);
 }
 
 
+function tem_set_globals(&$tem) {
+	$vars = array(
+		'file_name',
+		'table_name',
+		'plural',
+		'singular');
+	foreach($vars as $var) {
+		$tem->set($var, $GLOBALS[$var]);
+	}
+
+	$bools = array(
+		'opt_email',
+		'opt_db',
+		'opt_listing',
+		'opt_display',
+		'opt_pass');
+	foreach($bools as $bool) {
+		if(format_bool($GLOBALS[$bool])) {
+			$tem->set($bool);
+		}
+	}
+}
+
 function metaform() {
-	if(isset($_REQUEST['form_name'])) {
-		$GLOBALS['form_name'] = format_varname($_REQUEST['form_name']);
-		$GLOBALS['singular'] = format_varname($_REQUEST['singular']);
-		tem_set('singular', $GLOBALS['singular']);
+	if(isset($_REQUEST['singular'])) {
+		$GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
+		$GLOBALS['table_name'] = format_varname($_REQUEST['table_name']);
+		$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']);
+		}
+
+		$GLOBALS['singular'] = format_oneline($_REQUEST['singular']);
 		$GLOBALS['opt_email'] = format_yesno($_REQUEST['opt_email']);
-		tem_set('opt_email', $GLOBALS['opt_email']);
 		$GLOBALS['opt_db'] = format_yesno($_REQUEST['opt_db']);
-		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 {
-		$GLOBALS['form_name'] = 'some_form';
+		$GLOBALS['opt_pass'] = format_yesno($_REQUEST['opt_pass']);
+
+		tem_init();
+		tem_set_globals($GLOBALS['wfpl_template']);
 	}
 
 	if(isset($_REQUEST['fields'])) {
@@ -107,7 +130,6 @@ function metaform() {
 			exit();
 		} elseif(isset($_REQUEST['edit'])) {
 			tem_set('fields', $_REQUEST['fields']);
-			tem_set('form_name', $GLOBALS['form_name']);
 			# fall through
 		} else {
 			die("Sorry... couldn't tell which button you pressed");
@@ -116,8 +138,9 @@ function metaform() {
 
 
 	set_form_action();
+	tem_load('code/wfpl/metaform/main.html');
 	list_available_types();
-	tem_output('code/wfpl/metaform/main.html');
+	tem_output();
 }
 
 
@@ -165,7 +188,7 @@ function view_headers() {
 function make_sql() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.sql');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	tem_set_globals($tem);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -195,7 +218,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 != 'file' && $input != 'checkbox' && $input != 'radio') {
 			return $name;
 		}
 	}
@@ -207,85 +230,98 @@ function find_always_field($fields) {
 
 # pass false if you want to exclude the <head> and <body> tag etc.
 function make_html($whole_file = true) {
-	$uploads_output_already = false;
 	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.html');
-	$tem->set('form_name', $GLOBALS['form_name']);
-	$tem->set('singular', $GLOBALS['singular']);
+	tem_set_globals($tem);
 	$fields = get_fields();
 	$tem->set('always_field', find_always_field($fields));
+	$hidden_fields = array();
+	$visible_fields = array();
+	$display_fields = array();
+	$listing_headers = array();
+	$listing_fields = array();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
-		$tem->set('name', $name);
-		$tem->set('caption', format_caption($name));
-		$tem->show($input);
-		if($input != 'hidden') {
-			$tem->show('row');
+		if($input == 'hidden') {
+			$hidden_fields[] = array('name' => $name);
+		} else {
+			$visible_fields[] = array($input => array(
+				'name' => $name,
+				'caption' => format_caption($name)));
 		}
-		if($input == 'image' && !$uploads_output_already) {
-			$tem->show('uploads');
+
+		if($input == 'image' || $input == 'file') {
+			$tem->set('uploads');
 			$tem->set('enctype_attr', '" enctype="multipart/form-data');
-			$uploads_output_already = true;
 		} elseif($input == 'html') {
 			$has_html_editors = true;
 			$tem->set('html_field_name', $name);
-			$tem->show('replace_textarea');
+			$tem->set('replace_textarea');
+		}
+
+		switch($input) {
+			case 'image':
+			case 'checkbox':
+			case 'date':
+			case 'textarea':
+			case 'html':
+				$display_type = $input;
+			break;
+			default:
+				$display_type = 'short';
 		}
-		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');
+		$display_fields[] = array($display_type => array(
+			'name' => $name, 'caption' => format_caption($name)));
+
+		if(show_in_listing($type, $input, $format, $sql)) {
+			$listing_headers[] = array('caption' => format_caption($name));
+			$listing_field = array('name' => $name);
+			if($format == 'bool' || $format == 'yesno') {
+				$listing_field['enc'] = 'yesno';
+			} elseif($input == 'date') {
+				$listing_field['enc'] = 'mmddyyyy';
+			} elseif($type == 'thumb') {
+				$listing_field['thumb'] = true;
+			} else {
+				$listing_field['enc'] = 'html';
 			}
-			$tem->show('display_row');
+			$listing_fields[] = $listing_field;
 		}
 	}
 
-	if($GLOBALS['opt_db'] == 'Yes') {
-		$tem->show('opt_db_1');
-		$tem->show('opt_db_2');
+	# Submit/Send button
+	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
+		$visible_fields[] = array('submit' => array(
+			'name' => 'send',
+			'caption' => 'Send'));
 	} else {
-		$tem->show('opt_db_1_else');
+		$visible_fields[] = array('submit' => array(
+			'name' => 'save',
+			'caption' => 'Save'));
 	}
 
-	if($GLOBALS['opt_listing'] == 'Yes') {
-		if($GLOBALS['opt_display'] != 'Yes') {
-			$tem->show('opt_display_a_else');
-		}
-		$tem->show('opt_listing_1');
-	}
+	$tem->set('form', array(
+		'visible_fields' => $visible_fields,
+		'hidden_fields' => $hidden_fields));
 
-	if($GLOBALS['opt_display'] == 'Yes') {
-		$tem->show('opt_display_1');
-		$tem->show('opt_display_2');
-	}
+	# opt_display and opt_listing control whether these are actually displayed
+	$tem->set('display_fields', $display_fields);
+	$tem->set('listing_headers', $listing_headers);
+	$tem->set('listing_fields', $listing_fields);
 
-	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
-		$tem->set('name', 'send');
-		$tem->set('caption', 'Send');
-	} else {
-		$tem->set('name', 'save');
-		$tem->set('caption', 'Save');
-	}
-	$tem->show('submit');
-	$tem->show('row');
-
-	$tem->show('form');
 
 	if($has_html_editors) {
-		$tem->show('html_editor_headers');
+		$tem->set('html_editor_headers');
 	}
 
 	if($whole_file) {
 		return $tem->run();
 	} else {
-		return $tem->get('form');
+		$tem2 = new tem();
+		$tem2->load_str('<!--~form~-->');
+		$tem2->merge($tem);
+		return $tem2->run();
 	}
 }
 
@@ -294,15 +330,29 @@ function view_html() {
 	echo make_html();
 }
 
+function show_in_listing($type, $input, $format, $sql) {
+	switch($input) {
+		case 'submit':
+		case 'hidden':
+		case 'password':
+		case 'textarea':
+		case 'html':
+			return false;
+	}
+	if($type == 'image') {
+		return false;
+	}
+
+	return true;
+}
 
 function make_php() {
+	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.php');
-	$tem->set('form_name', $GLOBALS['form_name']);
-	$tem->set('singular', $GLOBALS['singular']);
+	tem_set_globals($tem);
 	$fields = get_fields();
 	$db_fields = '';
-	$php_fields = '';
 	$always_field = find_always_field($fields);
 	$image_included_yet = false;
 	foreach($fields as $field) {
@@ -314,58 +364,58 @@ 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') {
-				$tem->show('image_upload');
-				$tem->show('image_db');
-				if(!$image_included_yet) {
-					$tem->show('image_include');
-					$tem->show('upload_max');
-					$tem->show('upload_settings');
-					$image_included_yet = true;
+				if($type == 'thumb') {
+					$tem->show('thumb_settings');
+					$tem->show('thumb_upload_params');
+					$tem->show('thumb_w_h');
 				}
+				$tem->show('image_settings');
+				$tem->show('image_upload');
+				$has_uploads = true;
+			} else if($input == 'file') {
+				$tem->show('file_settings');
+				$tem->show('file_upload');
+				$has_uploads = true;
 			} else {
-				if($input == 'pulldown') {
+				if($input == 'html') {
+					$has_html_editors = true;
+				} elseif($input == 'pulldown' || $input == 'radio') {
 					$tem->show('pulldowns');
 					$tem->show('pulldown_format_extra');
 				}
 				$tem->show('formats');
 			}
-			$tem->show('tem_sets');
 		}
+
+		if($GLOBALS['opt_listing'] == 'Yes') {
+			if(show_in_listing($type, $input, $format, $sql)) {
+				$tem->show('listing_fields_1');
+				$tem->show('listing_fields_2');
+			}
+		}
+	}
+	if($has_uploads) {
+		$tem->show('uploads_include');
+		$tem->show('upload_max');
+		$tem->show('upload_settings');
+		$image_included_yet = true;
+	}
+
+	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);
 	$tem->set('metaform_url', edit_url());
-	if($GLOBALS['opt_listing'] == 'Yes') {
-		$tem->show('opt_listing_1');
-		$tem->show('opt_listing_2');
-	}
-	if($GLOBALS['opt_display'] == 'Yes') {
-		$tem->show('opt_display_1');
-		$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');
-		$tem->show('opt_db_2');
-		$tem->show('opt_db_3');
-		$tem->show('opt_db_4');
-		$tem->show('opt_db_5');
-	}
 	if($GLOBALS['opt_email'] == 'Yes') {
-		$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');
+		$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);
 	}
 	return $tem->run();
 }
@@ -385,16 +435,15 @@ function view_php() {
 	echo make_php();
 }
 
-
 function make_email() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.email.txt');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	tem_set_globals($tem);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
 		$tem->set('name', $name);
-		$tem->set('caption', $name); # fixme
+		$tem->set('caption', format_caption($name));
 		if($type == 'textarea') {
 			$tem->show('multi_line');
 		} elseif($type == 'checkbox') {
@@ -409,7 +458,7 @@ function make_email() {
 
 function make_htaccess() {
 	$tem = new tem();
-	$tem->set('form', $GLOBALS['form_name']);
+	$tem->set('form', $GLOBALS['file_name']);
 	return $tem->run('code/wfpl/metaform/htaccess');
 }
 
@@ -418,10 +467,9 @@ function view_email() {
 	echo make_email();
 }
 
-
 function preview() {
 	tem_load('code/wfpl/metaform/preview.html');
-	tem_set('form_name', $GLOBALS['form_name']);
+	tem_set_globals($GLOBALS['wfpl_template']);
 	tem_set('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
 	$preview_tem->load_str(make_html(false));
@@ -431,7 +479,7 @@ function preview() {
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
-		if($type == 'pulldown') {
+		if($type == 'pulldown' || $type == 'radio') {
 			pulldown($name, array('option 1', 'option 2', 'option 3'));
 		}
 	}
@@ -445,10 +493,11 @@ function preview() {
 }
 
 function download_tar() {
-	$name = $GLOBALS['form_name'];
+	$name = $GLOBALS['file_name'];
 	$data = array(
+		"INSTALL" => read_whole_file('code/wfpl/metaform/INSTALL'),
 		".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());
@@ -464,5 +513,3 @@ function download_tar() {
 
 metaform();
 exit();
-
-?>