X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=be218d43cacf11e2695a3fc9e96b2214c356b8a9;hb=d560c6ac16d16aa1a44b48bde8dca428c17ac738;hp=3d66baf4fa017d8db58633d31f6e063f70ea0e99;hpb=0c70f6a8cdf46b61c8d30f918833b8f2d8522009;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 3d66baf..be218d4 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')
 );
 
@@ -200,7 +201,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;
 		}
 	}
@@ -231,7 +232,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;
@@ -301,7 +302,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') {
@@ -358,7 +358,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) {
@@ -370,8 +369,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') {
@@ -381,12 +378,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;
@@ -396,7 +392,6 @@ function make_php() {
 				}
 				$tem->show('formats');
 			}
-			$tem->show('tem_sets');
 		}
 
 		if($GLOBALS['opt_listing'] == 'Yes') {
@@ -406,6 +401,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');
@@ -413,7 +414,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');
@@ -424,7 +424,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');
@@ -434,12 +433,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_pass'] == 'Yes') {
 		$tem->show('opt_pass');
-		$tem->show('opt_pass');
 	}
 	return $tem->run();
 }
@@ -470,7 +473,7 @@ function make_email() {
 	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') {
@@ -525,6 +528,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'),