X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=b9c1097c545ce57679358574db84c5269aa88664;hb=88edfcf26c7b4cdbd083dede0834de5cf6f16999;hp=3c5e6cc359ff0dcd93838f71f4899805799d4600;hpb=8ef1f36849dc9f50ad2d5c19bef126ab3c9e454b;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 3c5e6cc..b9c1097 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -62,7 +62,7 @@ function ~form_name~_tem_sets(~php_fields~) {<!--~tem_sets start~-->
 <!--~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);
+	$rows = db_get_rows('~form_name~', 'id<!--~listing_fields_1 start~-->,~name~<!--~end~-->', $where);
 	if($rows == false || count($rows) == 0) {
 		tem_show('empty_listing');
 		tem_show('listings');
@@ -70,12 +70,12 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100
 	}
 
 	foreach($rows as $row) {
-		list($id, $~always_field~) = $row;
+		list($id<!--~listing_fields_2 start~-->, $~name~<!--~end~-->) = $row;
 		tem_set('id', $id);
 		if($~always_field~ == '') {
 			$~always_field~ = '--';
 		}
-		tem_set('~always_field~', $~always_field~);
+		~form_name~_tem_sets(~php_fields~);
 		tem_show('listing_row');
 	}
 	tem_show('populated_listing');
@@ -116,7 +116,7 @@ function ~form_name~_display_main() {
 	}
 	$row = db_get_row('~form_name~', ~form_name.upper~_DB_FIELDS, 'where id=%i', $id);
 	if(!$row) {
-		message('Error: Not found');
+		message('Error: ~singular.cap~ not found');
 		return './~form_name~';
 	}
 	list(~php_fields~) = $row;
@@ -135,9 +135,9 @@ function _~form_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 		echo '401 Unauthorized';
 		exit;
 	}
-	<!--~end~--><!--~pulldowns start~-->
+<!--~end~--><!--~pulldowns start~-->
 	pulldown('~name~', array('option 1', 'option 2', 'option 3'));
-	<!--~end~--><!--~opt_db_3 start~-->
+<!--~end~--><!--~opt_db_3 start~-->
 	$edit_id = format_int($_REQUEST['~form_name~_edit_id']);
 	unset($_REQUEST['~form_name~_edit_id']);
 	if($edit_id) {
@@ -150,9 +150,9 @@ function _~form_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 	unset($_REQUEST['~form_name~_delete_id']);
 	if($delete_id) {
 		db_delete('~form_name~', 'where id=%i', $delete_id);
-		message('Entry deleted.');
+		message('~singular.cap~ deleted.');
 
-		return './~form_name~.html';
+		return './~form_name~';
 	}
 
 	if(!$edit_id) {<!--~opt_listing_1 start~-->
@@ -160,20 +160,20 @@ function _~form_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 			~form_name~_display_listing();
 			return;
 		}
-		<!--~end~-->
+<!--~end~-->
 		tem_show('new_msg');
 	}<!--~end~-->
 
-	if(isset($_REQUEST['~always_field~'])) {
+	if(isset($_POST['~always_field~'])) {
 		list(~php_fields~) = ~form_name~_get_fields();
 
 		if("you're happy with the POSTed values") {<!--~opt_db_4 start~-->
 			if($edit_id) {
 				db_update('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~, 'where id=%i', $edit_id);
-				message('Updated.');
+				message('~singular.cap~ updated.');
 			} else {
 				db_insert('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~);
-				message('Saved.');
+				message('~singular.cap~ saved.');
 			}<!--~end~--><!--~opt_email_2 start~-->
 			if($GLOBALS['~form_name~_form_recipient'] != "fixme@example.com") {
 				$to = $GLOBALS['~form_name~_form_recipient'];