X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=fdd1ad39eb66a734a3b6d2b375c064a4ed03c797;hb=4109b1932d56b8a509d746c25dfeaf6e8a5f6537;hp=ed10c8d242affeb81635f0e0d2b11ab2bbe26b50;hpb=a6f8b885180ef3e009e28d723dd05734eb0d4ef5;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index ed10c8d..fdd1ad3 100644
--- a/metaform.php
+++ b/metaform.php
@@ -51,6 +51,7 @@ $GLOBALS['types'] = array(
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
 	'image' =>      array('image',       'oneline',    'varchar(120)'),
 	'thumb' =>      array('image',       'oneline',    'varchar(240)'),
+	'file' =>       array('file',        'oneline',    'varchar(100)'),
 	'submit' =>     array('submit',      'oneline',    'n/a')
 );
 
@@ -64,6 +65,29 @@ function list_available_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['singular'])) {
 		$GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
@@ -73,22 +97,16 @@ function metaform() {
 		if(isset($_REQUEST['form_name'])) {
 			$GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname($_REQUEST['form_name']);
 		}
-		tem_set('file_name', $GLOBALS['file_name']);
-		tem_set('table_name', $GLOBALS['table_name']);
-		tem_set('plural', $GLOBALS['plural']);
 
 		$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']);
 		$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_pass'] = format_yesno($_REQUEST['opt_pass']);
-		tem_set('opt_pass', $GLOBALS['opt_pass']);
+
+		tem_init();
+		tem_set_globals($GLOBALS['wfpl_template']);
 	}
 
 	if(isset($_REQUEST['fields'])) {
@@ -170,7 +188,7 @@ function view_headers() {
 function make_sql() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.sql');
-	$tem->set('table_name', $GLOBALS['table_name']);
+	tem_set_globals($tem);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -200,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 != 'image' && $input != 'checkbox' && $input != 'radio') {
+		if($input != 'submit' && $input != 'image' && $input != 'file' && $input != 'checkbox' && $input != 'radio') {
 			return $name;
 		}
 	}
@@ -216,10 +234,7 @@ function make_html($whole_file = true) {
 	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.html');
-	$tem->set('file_name', $GLOBALS['file_name']);
-	$tem->set('table_name', $GLOBALS['table_name']);
-	$tem->set('singular', $GLOBALS['singular']);
-	$tem->set('plural', $GLOBALS['plural']);
+	tem_set_globals($tem);
 	$fields = get_fields();
 	$tem->set('always_field', find_always_field($fields));
 	foreach($fields as $field) {
@@ -231,7 +246,7 @@ function make_html($whole_file = true) {
 			$tem->show('row');
 		}
 
-		if($input == 'image' && !$uploads_output_already) {
+		if(($input == 'image' || $input == 'file') && !$uploads_output_already) {
 			$tem->show('uploads');
 			$tem->set('enctype_attr', '" enctype="multipart/form-data');
 			$uploads_output_already = true;
@@ -279,30 +294,12 @@ function make_html($whole_file = true) {
 					$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');
 			}
 		}
 	}
 
-	if($GLOBALS['opt_db'] == 'Yes') {
-		$tem->show('opt_db_1');
-		$tem->show('opt_db_2');
-	} else {
-		$tem->show('opt_db_1_else');
-	}
-
-	if($GLOBALS['opt_listing'] == 'Yes') {
-		$tem->show('opt_listing_1');
-	}
-
-	if($GLOBALS['opt_display'] == 'Yes') {
-		$tem->show('opt_display_1');
-	}
-
 	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
 		$tem->set('name', 'send');
 		$tem->set('caption', 'Send');
@@ -351,10 +348,7 @@ function make_php() {
 	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.php');
-	$tem->set('file_name', $GLOBALS['file_name']);
-	$tem->set('table_name', $GLOBALS['table_name']);
-	$tem->set('singular', $GLOBALS['singular']);
-	$tem->set('plural', $GLOBALS['plural']);
+	tem_set_globals($tem);
 	$fields = get_fields();
 	$db_fields = '';
 	$always_field = find_always_field($fields);
@@ -377,12 +371,11 @@ function make_php() {
 				}
 				$tem->show('image_settings');
 				$tem->show('image_upload');
-				if(!$image_included_yet) {
-					$tem->show('image_include');
-					$tem->show('upload_max');
-					$tem->show('upload_settings');
-					$image_included_yet = true;
-				}
+				$has_uploads = true;
+			} else if($input == 'file') {
+				$tem->show('file_settings');
+				$tem->show('file_upload');
+				$has_uploads = true;
 			} else {
 				if($input == 'html') {
 					$has_html_editors = true;
@@ -401,6 +394,12 @@ function make_php() {
 			}
 		}
 	}
+	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');
@@ -409,34 +408,12 @@ function make_php() {
 	$tem->set('always_field', $always_field);
 	$tem->set('db_fields', $db_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');
-	}
-	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') {
 		$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_pass'] == 'Yes') {
-		$tem->show('opt_pass');
 	}
 	return $tem->run();
 }
@@ -459,10 +436,7 @@ function view_php() {
 function make_email() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.email.txt');
-	$tem->set('file_name', $GLOBALS['file_name']);
-	$tem->set('table_name', $GLOBALS['table_name']);
-	$tem->set('singular', $GLOBALS['singular']);
-	$tem->set('plural', $GLOBALS['plural']);
+	tem_set_globals($tem);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -493,10 +467,7 @@ function view_email() {
 
 function preview() {
 	tem_load('code/wfpl/metaform/preview.html');
-	tem_set('file_name', $GLOBALS['file_name']);
-	tem_set('table_name', $GLOBALS['table_name']);
-	tem_set('singular', $GLOBALS['singular']);
-	tem_set('plural', $GLOBALS['plural']);
+	tem_set_globals($GLOBALS['wfpl_template']);
 	tem_set('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
 	$preview_tem->load_str(make_html(false));
@@ -522,6 +493,7 @@ function preview() {
 function download_tar() {
 	$name = $GLOBALS['file_name'];
 	$data = array(
+		"INSTALL" => read_whole_file('code/wfpl/metaform/INSTALL'),
 		".htaccess" => make_htaccess(),
 		#"run.php ->" => 'code/wfpl/run.php',
 		"style.css" => read_whole_file('code/wfpl/metaform/style.css'),