X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=4858e4dd8393394901f9771435d9c54674f57b33;hb=532d75b922c5e4e2e39172b6fe3c4b2153ffc28d;hp=890c49b63a0b10341f4bc3014435991365788f51;hpb=7add2ea3f61e40c5f0f5539ac6e02533c9390db4;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 890c49b..4858e4d 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -15,8 +15,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:
@@ -38,15 +38,19 @@ 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('code/wfpl/db.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~);
@@ -57,8 +61,36 @@ function ~form_name~_get_fields() {<!--~formats start~-->
 function ~form_name~_tem_sets(~php_fields~) {<!--~tem_sets start~-->
 	tem_set('~name~', $~name~);<!--~end~-->
 }
+<!--~opt_listing_2 start~-->
+# You may pass a "where clause" for the db query.
+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) {
+		return false;
+	}
 
-function ~form_name~() {<!--~opt_http_pass_2 start~-->
+	foreach($rows as $row) {
+		list($id, $~always_field~) = $row;
+		tem_set('id', $id);
+		if($~always_field~ == '') {
+			$~always_field~ = '--';
+		}
+		tem_set('~always_field~', $~always_field~);
+		tem_show('listing_row');
+	}
+	tem_show('listings');
+	return true;
+}
+<!--~end~-->
+function ~form_name~_main() {
+	$ret = _~form_name~_main();
+	if($ret) {
+		return $ret;
+	}
+	display_messages();
+}
+
+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 . '"');
@@ -74,42 +106,44 @@ 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_sub('edit_msg');
+		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.');
+		message('Entry deleted.');<!--~opt_listing_3 start~-->
+
+		if(~form_name~_display_listing()) {
+			return;
+		}
+		unset($delete_id);<!--~end~--><!--~opt_listing_3_else start~-->
 
 		# FIXME: what to do after delete?
-		return;
+		return;<!--~end~-->
 	}
 
-	if(!$edit_id && !$delet_id) {
-		tem_sub('new_msg');
+	if(!$edit_id) {<!--~opt_listing_1 start~-->
+		if(!isset($_REQUEST['~form_name~_new']) && !isset($_REQUEST['~always_field~'])) {
+			if(~form_name~_display_listing()) {
+				return;
+			}
+		}
+		<!--~end~-->
+		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(file_exists($db_connector = 'db_connect.php') || file_exists($db_connector = 'code/db_connect.php')) {
-				require_once($db_connector);
-				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~-->
-					db_update('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~, 'where id=%i', $edit_id);
-					message('Entry updated.');
-				} else {
-					db_insert('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~);
-					message('Entry saved.');
-				}
+			if($edit_id) {
+				db_update('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~, 'where id=%i', $edit_id);
+				message('Entry updated.');
+			} else {
+				db_insert('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~);
+				message('Entry saved.');
 			}<!--~end~--><!--~opt_email_2 start~-->
 			if($GLOBALS['~form_name~_form_recipient'] != "fixme@example.com") {
 				$to = $GLOBALS['~form_name~_form_recipient'];
@@ -130,11 +164,10 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 					$error = true;
 				}
 			}<!--~end~-->
-			if($error !== true) {
-				tem_load('~form_name~.html');
-				tem_sub('thankyou');
-				tem_output();
-				exit();
+			if($error !== true) {<!--~opt_listing_4 start~-->
+				~form_name~_display_listing();<!--~end~--><!--~opt_listing_4_else start~-->
+				tem_show('thankyou');<!--~end~-->
+				return;
 			}
 		}
 		# otherwise, we display the form again. ~form_name~_get_fields() has
@@ -152,8 +185,12 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 
 	tem_set('upload_max_filesize', upload_max_filesize());<!--~end~-->
 
-	display_messages();
-	tem_sub('form');
+	# this has to be later in the file because it requres that ~always_field~ be set already
+	if($edit_id) {
+		tem_show('edit_msg');
+	}
+
+	tem_show('form');
 }
 
 ?>