X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=4e8d49f90a9e0702253e1878874a1fa911243600;hb=de27e8c238024aa05a21d8e4f8eaeadde9ae85bc;hp=4db9dad8df3b14cdb7609d659f6cc1f508136f06;hpb=96eb63cbbc2873d0f64979422a323e174a7d5f12;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 4db9dad..4e8d49f 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -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';