From c63498c465bec640bbd8a521216aa37ba178b821 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Mon, 4 May 2009 03:13:06 -0400
Subject: [PATCH] allowed file name and table name and pretty-print plural to
 differ

---
 metaform.php                |   41 ++++++++++++++------
 metaform/main.html          |    9 ++++-
 metaform/preview.html       |    4 +-
 metaform/template.email.txt |    2 +-
 metaform/template.html      |   20 +++++-----
 metaform/template.php       |   90 +++++++++++++++++++++----------------------
 metaform/template.sql       |    4 +-
 7 files changed, 96 insertions(+), 74 deletions(-)

diff --git a/metaform.php b/metaform.php
index ecde564..a556f1a 100644
--- a/metaform.php
+++ b/metaform.php
@@ -66,8 +66,18 @@ function list_available_types() {
 
 
 function metaform() {
-	if(isset($_REQUEST['form_name'])) {
-		$GLOBALS['form_name'] = format_varname($_REQUEST['form_name']);
+	if(isset($_REQUEST['singular'])) {
+		$GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
+		$GLOBALS['table_name'] = format_varname($_REQUEST['table_name']);
+		$GLOBALS['plural'] = format_varname($_REQUEST['plural']);
+		# backwards compatibility:
+		if(isset($_REQUEST['form_name'])) {
+			$GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname($_REQUEST['form_name']);
+		}
+		tem_set('file_name', $GLOBALS['file_name']);
+		tem_set('table_name', $GLOBALS['table_name']);
+		tem_set('plural', $GLOBALS['plural']);
+
 		$GLOBALS['singular'] = format_varname($_REQUEST['singular']);
 		tem_set('singular', $GLOBALS['singular']);
 		$GLOBALS['opt_email'] = format_yesno($_REQUEST['opt_email']);
@@ -80,8 +90,6 @@ function metaform() {
 		tem_set('opt_display', $GLOBALS['opt_display']);
 		$GLOBALS['opt_http_pass'] = format_yesno($_REQUEST['opt_http_pass']);
 		tem_set('opt_http_pass', $GLOBALS['opt_http_pass']);
-	} else {
-		$GLOBALS['form_name'] = 'some_form';
 	}
 
 	if(isset($_REQUEST['fields'])) {
@@ -105,7 +113,6 @@ function metaform() {
 			exit();
 		} elseif(isset($_REQUEST['edit'])) {
 			tem_set('fields', $_REQUEST['fields']);
-			tem_set('form_name', $GLOBALS['form_name']);
 			# fall through
 		} else {
 			die("Sorry... couldn't tell which button you pressed");
@@ -164,7 +171,7 @@ function view_headers() {
 function make_sql() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.sql');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -210,8 +217,10 @@ function make_html($whole_file = true) {
 	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.html');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('file_name', $GLOBALS['file_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
 	$tem->set('singular', $GLOBALS['singular']);
+	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	$tem->set('always_field', find_always_field($fields));
 	foreach($fields as $field) {
@@ -331,8 +340,10 @@ function show_in_listing($type, $input, $format, $sql) {
 function make_php() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.php');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('file_name', $GLOBALS['file_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
 	$tem->set('singular', $GLOBALS['singular']);
+	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	$db_fields = '';
 	$php_fields = '';
@@ -429,7 +440,10 @@ function view_php() {
 function make_email() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.email.txt');
-	$tem->set('form_name', $GLOBALS['form_name']);
+	$tem->set('file_name', $GLOBALS['file_name']);
+	$tem->set('table_name', $GLOBALS['table_name']);
+	$tem->set('singular', $GLOBALS['singular']);
+	$tem->set('plural', $GLOBALS['plural']);
 	$fields = get_fields();
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -449,7 +463,7 @@ function make_email() {
 
 function make_htaccess() {
 	$tem = new tem();
-	$tem->set('form', $GLOBALS['form_name']);
+	$tem->set('form', $GLOBALS['file_name']);
 	return $tem->run('code/wfpl/metaform/htaccess');
 }
 
@@ -461,7 +475,10 @@ function view_email() {
 
 function preview() {
 	tem_load('code/wfpl/metaform/preview.html');
-	tem_set('form_name', $GLOBALS['form_name']);
+	tem_set('file_name', $GLOBALS['file_name']);
+	tem_set('table_name', $GLOBALS['table_name']);
+	tem_set('singular', $GLOBALS['singular']);
+	tem_set('plural', $GLOBALS['plural']);
 	tem_set('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
 	$preview_tem->load_str(make_html(false));
@@ -485,7 +502,7 @@ function preview() {
 }
 
 function download_tar() {
-	$name = $GLOBALS['form_name'];
+	$name = $GLOBALS['file_name'];
 	$data = array(
 		".htaccess" => make_htaccess(),
 		"run.php ->" => 'code/wfpl/run.php',
diff --git a/metaform/main.html b/metaform/main.html
index ed6b0c4..650269d 100644
--- a/metaform/main.html
+++ b/metaform/main.html
@@ -11,9 +11,14 @@
   <form action="~metaform_name~" method="get">
     <p>The form name should not contain any capitals or symbols (besides underscore)</p>
 
-    <p>Page/table name: <input type="text" name="form_name" value="~form_name.attr~" /></p>
+    <p>File name: <input type="text" name="file_name" value="~file_name.attr~" />.html</p>
+
+    <p>DB table: <input type="text" name="table_name" value="~table_name.attr~" /></p>
+
+    <p>Printable singular: <input type="text" name="singular" value="~singular.attr~" /></p>
+
+    <p>Printable plural: <input type="text" name="plural" value="~plural.attr~" /></p>
 
-    <p>Same as above but singular: <input type="text" name="singular" value="~singular.attr~" /> (Used in messages and headers.)</p>
 
 	<h3>Features</h3>
 
diff --git a/metaform/preview.html b/metaform/preview.html
index 8bd5656..98c0109 100644
--- a/metaform/preview.html
+++ b/metaform/preview.html
@@ -11,10 +11,10 @@
   <h1 class="first">PREVIEW</h1>
 ~preview~
   </div>
-    <p><form action="~form_name~.tgz" method="get">~hiddens~<input type="submit" name="download_tar" value="Download tarball" /></form></p>
+    <p><form action="~file_name~.tgz" method="get">~hiddens~<input type="submit" name="download_tar" value="Download tarball" /></form></p>
 
   <form action="~metaform_name~" method="get">
-  	<p><!--~hiddens start~--><input type="hidden" name="form_name" value="~form_name.attr~" /><input type="hidden" name="singular" value="~singular.attr~" /><input type="hidden" name="opt_email" value="~opt_email.attr~" /><input type="hidden" name="opt_db" value="~opt_db.attr~" /><input type="hidden" name="opt_listing" value="~opt_listing.attr~" /><input type="hidden" name="opt_display" value="~opt_display.attr~" /><input type="hidden" name="opt_http_pass" value="~opt_http_pass.attr~" /><input type="hidden" name="fields" value="~fields.attr~" /><!--~end~--><input type="submit" name="edit" value="Back to editing" /></p>
+  	<p><!--~hiddens start~--><input type="hidden" name="file_name" value="~file_name.attr~" /><input type="hidden" name="table_name" value="~table_name.attr~" /><input type="hidden" name="singular" value="~singular.attr~" /><input type="hidden" name="plural" value="~plural.attr~" /><input type="hidden" name="opt_email" value="~opt_email.attr~" /><input type="hidden" name="opt_db" value="~opt_db.attr~" /><input type="hidden" name="opt_listing" value="~opt_listing.attr~" /><input type="hidden" name="opt_display" value="~opt_display.attr~" /><input type="hidden" name="opt_http_pass" value="~opt_http_pass.attr~" /><input type="hidden" name="fields" value="~fields.attr~" /><!--~end~--><input type="submit" name="edit" value="Back to editing" /></p>
 
     <p><input type="submit" name="view_sql" value="View SQL" /></p>
 
diff --git a/metaform/template.email.txt b/metaform/template.email.txt
index c61be5f..bc13503 100644
--- a/metaform/template.email.txt
+++ b/metaform/template.email.txt
@@ -1,4 +1,4 @@
-~form_name~ form submitted with the following:
+The following new ~singular~ was just received:
 <!--~fields start~--><!--~normal start~-->
 ~caption~: ~~~name~~~<!--~end~--><!--~checkbox start~-->
 ~caption~: ~~~name~.yesno~~<!--~end~--><!--~multi_line start~-->
diff --git a/metaform/template.html b/metaform/template.html
index 2206620..3dd3abb 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -2,7 +2,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <title>~form_name.cap~</title>
+  <title>~plural.cap~</title>
   <link rel="stylesheet" href="style.css" type="text/css" /><!--~html_editor_headers start~-->
   <script type="text/javascript" src="code/tiny_mce/tiny_mce.js"></script>
   <script language="javascript" type="text/javascript">
@@ -63,15 +63,15 @@
 <!--~end~--><!--~end~-->
     </table>
 
-    <p><a href="~form_name~?~form_name~_edit_id=~~id.attr~~">Edit</a></p>
+    <p><a href="~file_name~?~file_name~_edit_id=~~id.attr~~">Edit</a></p>
 <!--~~end~~-->
 
 <!--~~edit_body start~~-->
 <!--~end~-->
 <!--~~form start~~--><!--~form start~-->
-  <h2><!--~opt_db_1 start~--><!--~~new_msg start~~-->Add a new ~singular~<!--~~end~~--><!--~~edit_msg start~~-->Edit ~singular~ "~~~always_field~.html~~"<!--~~end~~--><!--~end~--><!--~opt_db_1_else start~-->~form_name.cap~ form<!--~end~--></h2>
+  <h2><!--~opt_db_1 start~--><!--~~new_msg start~~-->Add a new ~singular~<!--~~end~~--><!--~~edit_msg start~~-->Edit ~singular~ "~~~always_field~.html~~"<!--~~end~~--><!--~end~--><!--~opt_db_1_else start~-->Submit a ~singular~<!--~end~--></h2>
 
-  <form action="~form_name~" method="post~enctype_attr~"><!--~opt_db_2 start~--><!--~~editing start~~--><div style="display: none"><input type="hidden" name="~form_name~_edit_id" value="~~~form_name~_edit_id.attr~~" /></div><!--~~end~~--><!--~end~--><!--~uploads start~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~" /><!--~end~-->
+  <form action="~file_name~" method="post~enctype_attr~"><!--~opt_db_2 start~--><!--~~editing start~~--><div style="display: none"><input type="hidden" name="~file_name~_edit_id" value="~~~file_name~_edit_id.attr~~" /></div><!--~~end~~--><!--~end~--><!--~uploads start~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~" /><!--~end~-->
     <table cellspacing="0" cellpadding="4" border="0" summary=""><!--~row start~-->
 
       <tr><!--~image start~--><td class="caption">~caption.html~: </td><td class="field"><input type="file" name="~name~" /><input type="hidden" name="old_~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td class="field"><input type="text" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~date start~--><td class="caption">~caption.html~: </td><td class="field"><input type="text" name="~name~" value="~~~name~.mmddyyyy.attr~~" /> mm/dd/yyyy</td><!--~end~--><!--~password start~--><td class="caption">~caption.html~: </td><td class="field"><input type="password" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textarea start~--><td class="caption">~caption.html~: </td><td class="field"><textarea rows="9" cols="22" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~html start~--><td class="caption">~caption.html~: </td><td></td></tr><tr><td colspan="2"><textarea class="html_editor" rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~pulldown start~--><td class="caption">~caption.html~: </td><td class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.options~~--></select></td><!--~end~--><!--~states start~--><td class="caption">~caption.html~: </td><td class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.states~~--></select></td><!--~end~--><!--~radio start~--><td class="caption">~caption.html~: </td><td class="field"><input type="radio" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~checkbox start~--><td class="caption">~caption.html~? </td><td class="field"><input type="checkbox" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~leftcheck start~--><td class="caption"><input type="checkbox" name="~name~~~~name~.checked~~" /></td><td class="right_caption">~caption.html~?</td><!--~end~--><!--~submit start~--><td class="submit_row" colspan="2"><input type="submit" name="~name~" value="~caption.attr~" /></td><!--~end~--></tr><!--~end~-->
@@ -79,25 +79,25 @@
   </form>
 <!--~end~--><!--~~end~~-->
 <!--~opt_listing_1 start~--><!--~~listings start~~-->
-  <h2>~form_name.cap~ Listing</h2>
+  <h2>~plural.cap~ Listing</h2>
 
   <!--~~populated_listing start~~-->
-  <p><a href="~form_name~?~form_name~_new=1">[Add a new ~singular~]</a></p>
+  <p><a href="~file_name~?~file_name~_new=1">[Add a new ~singular~]</a></p>
 
   <table cellspacing="0" cellpadding="4" border="1" summary="">
     <!--~listing_head_col start~--><th>~caption~</th><!--~end~--><th></th><!--~~listing_row start~~-->
     <tr><!--~listing_row_col start~-->
-      <td class="listing"><a href="~form_name~?~form_name~_<!--~opt_display_a_else start~-->edit_<!--~end~-->id=~~id~~">~~~name~.~listing_enc~~~</a></td><!--~end~-->
-      <td><a href="~form_name~?~form_name~_delete_id=~~id~~" onclick="return confirm('Permanently delete?')">[delete this ~singular~]</a></td>
+      <td class="listing"><a href="~file_name~?~file_name~_<!--~opt_display_a_else start~-->edit_<!--~end~-->id=~~id~~">~~~name~.~listing_enc~~~</a></td><!--~end~-->
+      <td><a href="~file_name~?~file_name~_delete_id=~~id~~" onclick="return confirm('Permanently delete?')">[delete this ~singular~]</a></td>
     </tr><!--~~end~~-->
 
   </table>
   <!--~~end~~-->
   <!--~~empty_listing start~~-->
-    <p>No ~form_name~ in database.</p>
+    <p>No ~plural~ in database.</p>
   <!--~~end~~-->
 
-  <p><a href="~form_name~?~form_name~_new=1">[Add a new ~singular~]</a></p>
+  <p><a href="~file_name~?~file_name~_new=1">[Add a new ~singular~]</a></p>
 <!--~~end~~--><!--~end~-->
 <!--~opt_display_2 start~-->
 
diff --git a/metaform/template.php b/metaform/template.php
index b9c1097..bdd7da1 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -11,23 +11,23 @@
 # SETUP
 <!--~opt_email_1 start~-->
 # To send results by e-mail, all you have to do is set your e-mail address here:
-$GLOBALS['~form_name~_form_recipient'] = "fixme@example.com";
+$GLOBALS['~file_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 the file
+# To save results to a database, you'll need to create the ~table_name~ table
+# (the file ~file_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:
 
-define('~form_name.upper~_DB_FIELDS', '~db_fields~');
+define('~file_name.upper~_DB_FIELDS', '~db_fields~');
 <!--~end~--><!--~upload_settings start~-->
 # Set this to the path to your uploads directory. It can be relative to the
 # location of this script. IT MUST END WITH A SLASH
 $GLOBALS['upload_directory'] = 'uploads/';
 <!--~end~--><!--~opt_http_pass_1 start~-->
 # Define the username and password required to view this form:
-define('AUTH_REALM', '~form_name~ administration area');
+define('AUTH_REALM', '~file_name~ administration area');
 define('AUTH_USER', 'fixme');
 define('AUTH_PASS', 'fixme');
 <!--~end~-->
@@ -39,7 +39,7 @@ require_once('code/wfpl/email.php');<!--~opt_db_2 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~-->
+function ~file_name~_get_fields() {<!--~formats start~-->
 	$~name~ = format_~format~($_REQUEST['~name~']<!--~pulldown_format_extra start~-->, '~name~'<!--~end~-->);<!--~end~--><!--~image_upload start~-->
 	if($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
 		$~name~ = substr(save_uploaded_image('~name~', $GLOBALS['upload_directory']), strlen($GLOBALS['upload_directory']));
@@ -51,18 +51,18 @@ function ~form_name~_get_fields() {<!--~formats start~-->
 		}
 	}<!--~end~-->
 
-	~form_name~_tem_sets(~php_fields~);
+	~file_name~_tem_sets(~php_fields~);
 
 	return array(~php_fields~);
 }
 
-function ~form_name~_tem_sets(~php_fields~) {<!--~tem_sets start~-->
+function ~file_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<!--~listing_fields_1 start~-->,~name~<!--~end~-->', $where);
+function ~file_name~_display_listing($where = 'order by ~always_field~ limit 100') {
+	$rows = db_get_rows('~table_name~', 'id<!--~listing_fields_1 start~-->,~name~<!--~end~-->', $where);
 	if($rows == false || count($rows) == 0) {
 		tem_show('empty_listing');
 		tem_show('listings');
@@ -75,7 +75,7 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100
 		if($~always_field~ == '') {
 			$~always_field~ = '--';
 		}
-		~form_name~_tem_sets(~php_fields~);
+		~file_name~_tem_sets(~php_fields~);
 		tem_show('listing_row');
 	}
 	tem_show('populated_listing');
@@ -83,22 +83,22 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100
 	return true;
 }
 <!--~end~-->
-function ~form_name~_main() {<!--~opt_display_1 start~-->
-	if(isset($_REQUEST['~form_name~_id'])) {
-		$ret = ~form_name~_display_main();
+function ~file_name~_main() {<!--~opt_display_1 start~-->
+	if(isset($_REQUEST['~file_name~_id'])) {
+		$ret = ~file_name~_display_main();
 		if($ret) {
 			return $ret;
 		}
 		tem_show('display_body');
 	} else {
-		$ret = ~form_name~_edit_main();
+		$ret = ~file_name~_edit_main();
 		if($ret) {
 			return $ret;
 		}
 		tem_show('edit_body');
 	}
 <!--~end~--><!--~opt_display_1_else start~-->
-	$ret = _~form_name~_main();
+	$ret = _~file_name~_main();
 	if($ret) {
 		return $ret;
 	}
@@ -107,27 +107,27 @@ function ~form_name~_main() {<!--~opt_display_1 start~-->
 	tem_show('main_body');
 }<!--~opt_display_2 start~-->
 
-function ~form_name~_display_main() {
-	$id = format_int($_REQUEST['~form_name~_id']);
-	unset($_REQUEST['~form_name~_id']);
+function ~file_name~_display_main() {
+	$id = format_int($_REQUEST['~file_name~_id']);
+	unset($_REQUEST['~file_name~_id']);
 	if(!$id) {
 		message('Error: Broken link');
-		return './~form_name~';
+		return './~file_name~';
 	}
-	$row = db_get_row('~form_name~', ~form_name.upper~_DB_FIELDS, 'where id=%i', $id);
+	$row = db_get_row('~table_name~', ~file_name.upper~_DB_FIELDS, 'where id=%i', $id);
 	if(!$row) {
 		message('Error: ~singular.cap~ not found');
-		return './~form_name~';
+		return './~file_name~';
 	}
 	list(~php_fields~) = $row;
-	~form_name~_tem_sets(~php_fields~);
+	~file_name~_tem_sets(~php_fields~);
 	tem_set('id', $id);
 }
 
-function ~form_name~_edit_main() {<!--~end~--><!--~opt_display_2_else start~-->
+function ~file_name~_edit_main() {<!--~end~--><!--~opt_display_2_else start~-->
 
 
-function _~form_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
+function _~file_name~_main() {<!--~end~--><!--~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 . '"');
@@ -138,26 +138,26 @@ function _~form_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 <!--~end~--><!--~pulldowns start~-->
 	pulldown('~name~', array('option 1', 'option 2', 'option 3'));
 <!--~end~--><!--~opt_db_3 start~-->
-	$edit_id = format_int($_REQUEST['~form_name~_edit_id']);
-	unset($_REQUEST['~form_name~_edit_id']);
+	$edit_id = format_int($_REQUEST['~file_name~_edit_id']);
+	unset($_REQUEST['~file_name~_edit_id']);
 	if($edit_id) {
 		# add hidden field for database id of row we're editing
-		tem_set('~form_name~_edit_id', $edit_id);
+		tem_set('~file_name~_edit_id', $edit_id);
 		tem_show('editing');
 	}
 
-	$delete_id = format_int($_REQUEST['~form_name~_delete_id']);
-	unset($_REQUEST['~form_name~_delete_id']);
+	$delete_id = format_int($_REQUEST['~file_name~_delete_id']);
+	unset($_REQUEST['~file_name~_delete_id']);
 	if($delete_id) {
-		db_delete('~form_name~', 'where id=%i', $delete_id);
+		db_delete('~table_name~', 'where id=%i', $delete_id);
 		message('~singular.cap~ deleted.');
 
-		return './~form_name~';
+		return './~file_name~';
 	}
 
 	if(!$edit_id) {<!--~opt_listing_1 start~-->
-		if(!isset($_REQUEST['~form_name~_new']) && !isset($_REQUEST['~always_field~'])) {
-			~form_name~_display_listing();
+		if(!isset($_REQUEST['~file_name~_new']) && !isset($_REQUEST['~always_field~'])) {
+			~file_name~_display_listing();
 			return;
 		}
 <!--~end~-->
@@ -165,18 +165,18 @@ function _~form_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 	}<!--~end~-->
 
 	if(isset($_POST['~always_field~'])) {
-		list(~php_fields~) = ~form_name~_get_fields();
+		list(~php_fields~) = ~file_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);
+				db_update('~table_name~', ~file_name.upper~_DB_FIELDS, ~php_fields~, 'where id=%i', $edit_id);
 				message('~singular.cap~ updated.');
 			} else {
-				db_insert('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~);
+				db_insert('~table_name~', ~file_name.upper~_DB_FIELDS, ~php_fields~);
 				message('~singular.cap~ saved.');
 			}<!--~end~--><!--~opt_email_2 start~-->
-			if($GLOBALS['~form_name~_form_recipient'] != "fixme@example.com") {
-				$to = $GLOBALS['~form_name~_form_recipient'];
+			if($GLOBALS['~file_name~_form_recipient'] != "fixme@example.com") {
+				$to = $GLOBALS['~file_name~_form_recipient'];
 				$from = $to;
 				$reply_to = '';
 				if(isset($_REQUEST['email']) and valid_email($_REQUEST['email'])) {
@@ -185,8 +185,8 @@ function _~form_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 						$reply_to = "$_REQUEST[name] <$reply_to>";
 					}
 				}
-				$subject = '~form_name~ form submitted';
-				$message = tem_run('~form_name~.email.txt');
+				$subject = '~plural.cap~ form submitted';
+				$message = tem_run('~file_name~.email.txt');
 				$cc = '';
 				$bcc = '';
 				if(email($from, $to, $subject, $message, $reply_to, $cc, $bcc)) {
@@ -197,17 +197,17 @@ function _~form_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 				}
 			}<!--~end~-->
 			if($error !== true) {
-				return './~form_name~'; # FIXME is this the page you want to go to after successful form submission?
+				return './~file_name~'; # FIXME is this the page you want to go to after successful form submission?
 			}
 		}
-		# otherwise, we display the form again. ~form_name~_get_fields() has
+		# otherwise, we display the form again. ~file_name~_get_fields() has
 		# already put the posted values back into the template engine, so they will
 		# show up in the form fields. You should add some message asking people to
 		# fix their entry in whatever way you require.<!--~opt_db_5 start~-->
 	} elseif($edit_id) {
 		# we've recieved an edit id, but no data. So we grab the values to be edited from the database
-		list(~php_fields~) = db_get_row('~form_name~', ~form_name.upper~_DB_FIELDS, 'where id=%i', $edit_id);
-		~form_name~_tem_sets(~php_fields~);<!--~end~-->
+		list(~php_fields~) = db_get_row('~table_name~', ~file_name.upper~_DB_FIELDS, 'where id=%i', $edit_id);
+		~file_name~_tem_sets(~php_fields~);<!--~end~-->
 	} else {
 		# form not submitted, you can set default values like so:
 		#tem_set('~always_field~', 'Yes');
diff --git a/metaform/template.sql b/metaform/template.sql
index eee20b3..85686f8 100644
--- a/metaform/template.sql
+++ b/metaform/template.sql
@@ -1,5 +1,5 @@
-drop table if exists ~form_name~;
-create table ~form_name~ (
+drop table if exists ~table_name~;
+create table ~table_name~ (
     id int unique auto_increment<!--~column start~-->,
     ~name~ ~type~ not null default ~default~<!--~end~-->
 );
-- 
1.7.10.4