X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=4e8d49f90a9e0702253e1878874a1fa911243600;hb=66b97fc1bbcae31d1f503d491cb23d01659b7b4b;hp=34ac04d39a3324a88b91f0295755b87ddb8ca359;hpb=bbfb0a3f7e6345dc34e0711ba208592528d296e8;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 34ac04d..4e8d49f 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -86,7 +86,7 @@ function ~public_file_name~_main() {~opt_public_display {~
 }~}~
 
 
-function ~file_name~_main(~opt_display unset {~~opt_public_form {~$new_only = false~}~~}~) {~opt_pass {~
+function ~file_name~_main() {~opt_pass {~
 	if(logged_in_as_admin()) {
 		tem_set('admin_privs');
 	} else {
@@ -151,12 +151,7 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 	pulldown('~name~', ~pulldown_options~);~}~~has_pulldowns {~
 ~}~~opt_db {~
 	if($id) {
-		# add hidden field for database id of row we're editing
 		tem_set('id', $id);
-		tem_set('editing');
-		tem_set('edit_msg');
-	} else {
-		tem_set('new_msg');
 	}
 ~}~
 	if(isset($_POST['~always_field~'])) {
@@ -174,10 +169,10 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 				$to = $GLOBALS['~file_name~_form_recipient'];
 				$from = 'noreply@~this_domain~';
 				$reply_to = $to;
-				if(isset($_REQUEST['email']) and valid_email($_REQUEST['email'])) {
-					$reply_to = $_REQUEST['email'];
-					if($_REQUEST['name'] and ereg('^[a-zA-Z0-9_\' -]*$', $_REQUEST['name']) !== false) {
-						$reply_to = "$_REQUEST[name] <$reply_to>";
+				if(isset($data['email']) and valid_email($data['email'])) {
+					$reply_to = $data['email'];
+					if($data['name'] and ereg('^[a-zA-Z0-9_\' -]*$', $data['name']) !== false) {
+						$reply_to = "$data[name] <$reply_to>";
 					}
 				}
 				$subject = '~plural cap~ form submitted';
@@ -221,5 +216,5 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 	tem_set('upload_max_filesize', upload_max_filesize());~}~
 
 	tem_set('form', $data);~show_extra_headers {~
-	tem_set('extra_headers');~}~
+	tem_set('$head');~}~
 }