X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=metaform%2Ftemplate.php;h=7697c483cb0a0d1ae36a64e569dce82dde035024;hb=185eecff52ed662395ac4846bd7ec579b26a2880;hp=e86d791bf4f7f082fe71ce55167e34ded3236867;hpb=989e37568c7ac1cbab5baf8993cd7babcb0b87e9;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index e86d791..7697c48 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -1,10 +1,9 @@
 <?php
 
-# This form requires wfpl. If you didn't recieve wfpl along with this file,
-# see: http://jasonwoof.org/wfpl
+# This form requires wfpl. See: http://jasonwoof.org/wfpl
 
-# This form was auto-generated. If you would like to alter the parameters and
-# generate a new one try this URL:
+# This form was initially auto-generated. If you would like to alter the
+# parameters and generate a new one try this URL:
 #
 # ~metaform_url~
 
@@ -15,8 +14,8 @@
 $GLOBALS['~form_name~_form_recipient'] = "fixme@example.com";
 <!--~end~--><!--~opt_db_1 start~-->
 # To save results to a database, you'll need to create the ~form_name~ table
-# (the file ~form_name~.sql should help with this), and create a file called
-# 'db_connect.php' or 'code/db_connect.php' which calls db_connect() see:
+# (the file ~form_name~.sql should help with this), and create the file
+# 'code/db_connect.php' which calls db_connect() see:
 # code/wfpl/examples/db_connect.php
 #
 # if you rename any of the database fields, you'll need to update this:
@@ -33,20 +32,23 @@ define('AUTH_USER', 'fixme');
 define('AUTH_PASS', 'fixme');
 <!--~end~-->
 
-if(!file_exists('code/wfpl/template.php')) { die('This form requires <a href="http://jasonwoof.org/wfpl">wfpl</a>.'); }
 require_once('code/wfpl/template.php');
 require_once('code/wfpl/format.php');
 require_once('code/wfpl/messages.php');
 require_once('code/wfpl/email.php');<!--~opt_db_2 start~-->
-require_once('db_connect.php');<!--~end~--><!--~image_include start~-->
+require_once('code/db_connect.php');<!--~end~--><!--~image_include start~-->
 require_once('code/wfpl/upload.php');<!--~end~-->
 
 function ~form_name~_get_fields() {<!--~formats start~-->
 	$~name~ = format_~format~($_REQUEST['~name~']<!--~pulldown_format_extra start~-->, '~name~'<!--~end~-->);<!--~end~--><!--~image_upload start~-->
-	if($_FILE['~name~'] && $_FILE['~name~']['error'] == 0) {
+	if($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
 		$~name~ = substr(save_uploaded_image('~name~', $GLOBALS['upload_directory']), strlen($GLOBALS['upload_directory']));
 	} else {
-		$~name~ = format_filename($_REQUEST['old_~name~']);
+		if($_REQUEST['delete_~name~'] == 'Yes') {
+			$~name~ = '';
+		} else {
+			$~name~ = format_filename($_REQUEST['old_~name~']);
+		}
 	}<!--~end~-->
 
 	~form_name~_tem_sets(~php_fields~);
@@ -62,6 +64,8 @@ function ~form_name~_tem_sets(~php_fields~) {<!--~tem_sets start~-->
 function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100') {
 	$rows = db_get_rows('~form_name~', 'id,~always_field~', $where);
 	if($rows == false || count($rows) == 0) {
+		tem_show('empty_listing');
+		tem_show('listings');
 		return false;
 	}
 
@@ -72,13 +76,24 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100
 			$~always_field~ = '--';
 		}
 		tem_set('~always_field~', $~always_field~);
-		tem_sub('listing_row');
+		tem_show('listing_row');
 	}
-	tem_sub('listings');
+	tem_show('populated_listing');
+	tem_show('listings');
 	return true;
 }
 <!--~end~-->
-function ~form_name~() {<!--~opt_http_pass_2 start~-->
+function ~form_name~_main() {
+	$ret = _~form_name~_main();
+	if($ret) {
+		return $ret;
+	}
+
+	# sections displayed with tem_show() will be coppied to the main template if you have one.
+	tem_show('main_body');
+}
+
+function _~form_name~_main() {<!--~opt_http_pass_2 start~-->
 	# To remove password protection, just delete this block:
 	if (!isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER'] != AUTH_USER || $_SERVER['PHP_AUTH_PW'] != AUTH_PASS) {
 		header('WWW-Authenticate: Basic realm="' . AUTH_REALM . '"');
@@ -94,44 +109,32 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 	if($edit_id) {
 		# add hidden field for database id of row we're editing
 		tem_set('~form_name~_edit_id', $edit_id);
-		tem_sub('editing');
+		tem_show('editing');
 	}
 
 	$delete_id = format_int($_REQUEST['~form_name~_delete_id']);
 	unset($_REQUEST['~form_name~_delete_id']);
 	if($delete_id) {
 		db_delete('~form_name~', 'where id=%i', $delete_id);
-		message('Entry deleted.');<!--~opt_listing_3 start~-->
-
-		if(~form_name~_display_listing()) {
-			return;
-		}
-		unset($delete_id);<!--~end~--><!--~opt_listing_3_else start~-->
+		message('Entry deleted.');
 
-		# FIXME: what to do after delete?
-		return;<!--~end~-->
+		return './~form_name~.html';
 	}
 
 	if(!$edit_id) {<!--~opt_listing_1 start~-->
 		if(!isset($_REQUEST['~form_name~_new']) && !isset($_REQUEST['~always_field~'])) {
-			if(~form_name~_display_listing()) {
-				return;
-			}
+			~form_name~_display_listing();
+			return;
 		}
 		<!--~end~-->
-		tem_sub('new_msg');
+		tem_show('new_msg');
 	}<!--~end~-->
 
 	if(isset($_REQUEST['~always_field~'])) {
 		list(~php_fields~) = ~form_name~_get_fields();
 
 		if("you're happy with the POSTed values") {<!--~opt_db_4 start~-->
-			if($edit_id) {<!--~image_db start~-->
-				# uploading nothing means leaving it as is.
-				if(!$~name~ && $delete_~name~ != 'Yes') {
-					$~name~ = db_get_value('~form_name~', '~name~', 'where id=%i', $edit_id);
-				}
-				<!--~end~-->
+			if($edit_id) {
 				db_update('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~, 'where id=%i', $edit_id);
 				message('Entry updated.');
 			} else {
@@ -140,26 +143,26 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 			}<!--~end~--><!--~opt_email_2 start~-->
 			if($GLOBALS['~form_name~_form_recipient'] != "fixme@example.com") {
 				$to = $GLOBALS['~form_name~_form_recipient'];
+				$from = $to;
+				$reply_to = '';
 				if(isset($_REQUEST['email']) and valid_email($_REQUEST['email'])) {
-					$from = $_REQUEST['email'];
+					$reply_to = $_REQUEST['email'];
 					if($_REQUEST['name'] and ereg('^[a-zA-Z0-9_\' -]*$', $_REQUEST['name']) !== false) {
-						$from = "$_REQUEST[name] <$from>";
+						$reply_to = "$_REQUEST[name] <$reply_to>";
 					}
-				} else {
-					$from = $to;
 				}
 				$subject = '~form_name~ form submitted';
 				$message = tem_run('~form_name~.email.txt');
 				$cc = '';
 				$bcc = '';
-				if(email($from, $to, $subject, $message, $cc, $bcc)) {
+				if(email($from, $to, $subject, $message, $reply_to, $cc, $bcc)) {
 					message('Due to an internal error, your message could not be sent. Please try again later.');
 					$error = true;
 				}
 			}<!--~end~-->
 			if($error !== true) {<!--~opt_listing_4 start~-->
 				~form_name~_display_listing();<!--~end~--><!--~opt_listing_4_else start~-->
-				tem_sub('thankyou');<!--~end~-->
+				tem_show('thankyou');<!--~end~-->
 				return;
 			}
 		}
@@ -180,10 +183,10 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 
 	# this has to be later in the file because it requres that ~always_field~ be set already
 	if($edit_id) {
-		tem_sub('edit_msg');
+		tem_show('edit_msg');
 	}
 
-	tem_sub('form');
+	tem_show('form');
 }
 
 ?>