X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=e62b1d7ec2f5b149ae97db698449121adbb8aadf;hb=702a6250f176b2e59ad0fe66a89cf72e570f8784;hp=14f88f11a5ab44a3aeb6f403126de68728d1ce7f;hpb=3f99dbe42925b8b208ae6e46db803c89fd7851c1;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 14f88f1..e62b1d7 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~
 
@@ -33,7 +32,6 @@ 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');
@@ -43,10 +41,14 @@ 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,22 @@ 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~_main() {<!--~opt_http_pass_2 start~-->
+function ~form_name~_main() {
+	$ret = _~form_name~_main();
+	if($ret) {
+		return $ret;
+	}
+	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 +107,32 @@ function ~form_name~_main() {<!--~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~-->
+		message('Entry deleted.');
 
-		if(~form_name~_display_listing()) {
-			return;
-		}
-		unset($delete_id);<!--~end~--><!--~opt_listing_3_else start~-->
-
-		# 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 {
@@ -159,7 +160,7 @@ function ~form_name~_main() {<!--~opt_http_pass_2 start~-->
 			}<!--~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 +181,10 @@ function ~form_name~_main() {<!--~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');
 }
 
 ?>