From 4f94560f060a7305ea791def3950adb1bda092ec Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Thu, 14 Jun 2007 07:41:00 -0400
Subject: [PATCH 01/16] fixed session_purge_old() and session_messages.php,
 redirect() can now take just a path

---
 http.php             |   26 ++++++++++++++++++++++++--
 session.php          |    6 +++++-
 session_messages.php |    8 ++++++--
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/http.php b/http.php
index c7c457a..94dbff1 100644
--- a/http.php
+++ b/http.php
@@ -19,8 +19,8 @@
 #  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-# return our best guess at the url used to access this page
-function this_url() {
+# return our best guess at the url used to access this page, without the path or query string
+function this_url_sans_path() {
 	list($protocol, $version) = explode('/', $_SERVER['SERVER_PROTOCOL']);
 	$url = strtolower($protocol);
 
@@ -42,15 +42,37 @@ function this_url() {
 		}
 	}
 
+	return $url;
+}
+
+# return our best guess at the url used to access this page
+function this_url() {
+	$url = this_url_sans_path();
+
 	$url .= $_SERVER['REQUEST_URI'];
 
 	return $url;
 }
 
+# sends an HTTP redirect
+#
+# $url can be:
+#   1) a full URL
+#   2) an absolute path
+#   3) a filename (you can pass a directory/file.html and such, but "../" prefix is not supported)
 function redirect($url, $status = '302 Moved Temporarily', $message = '') {
+	if(!strpos($url, ':')) {
+		if(substr($url, 0, 1) == '/') {
+			$url = this_url_sans_path() . $url;
+		} else {
+			$url = ereg_replace('/[^/]*([?].*)?$', "/$url", this_url());
+		}
+	}
+			
 	if(function_exists('session_save_messages')) {
 		session_save_messages();
 	}
+
 	header("HTTP/1.0 $status");
 	header("Location: $url");
 	echo($message);
diff --git a/session.php b/session.php
index c3be9e9..b04ed57 100644
--- a/session.php
+++ b/session.php
@@ -100,7 +100,7 @@ function _kill_session($id) {
 # delete expired sessions from database
 function session_purge_old() {
 	$now = time();
-	$exired_sessions = db_get_column('wfpl_sessions', 'id', 'where expires < %i', $now);
+	$expired_sessions = db_get_column('wfpl_sessions', 'id', 'where expires < %i', $now);
 	if($expired_sessions) foreach($expired_sessions as $expired_session) {
 		_kill_session($expired_session);
 	}
@@ -112,6 +112,10 @@ function session_exists() {
 		return false;
 	}
 
+	if(isset($GLOBALS['session_id'])) {
+		return true;
+	}
+
 	$session_key = ereg_replace('[^a-zA-Z0-9]', '', $_REQUEST['session_key']);
 
 	if(!strlen($session_key) == 16) {
diff --git a/session_messages.php b/session_messages.php
index 358994c..c3e16f0 100644
--- a/session_messages.php
+++ b/session_messages.php
@@ -39,18 +39,22 @@ function session_save_messages() {
 	}
 
 	init_session();
-	session_set('wfpl_messages', array_to_string($GLOBALS['wfpl_messages']);
+	session_set('wfpl_messages', array_to_string($GLOBALS['wfpl_messages']));
 }
 
 function session_restore_messages() {
-	if(!session()) {
+	if(!session_exists()) {
 		return false;
 	}
 	$messages = session_get('wfpl_messages');
 	if($messages !== false) {
 		$messages = string_to_array($messages);
+		if(!(isset($GLOBALS['wfpl_messages']) && is_array($GLOBALS['wfpl_messages']))) {
+			$GLOBALS['wfpl_messages'] = array();
+		}
 		# messages from the previous run happened first
 		$GLOBALS['wfpl_messages'] = array_merge($messages, $GLOBALS['wfpl_messages']);
+
 	}
 	session_clear('wfpl_messages');
 }
-- 
1.7.10.4


From 4aaf7daac479c97869e5e1ab9b8afc796043fb91 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Fri, 15 Jun 2007 03:53:30 -0400
Subject: [PATCH 02/16] metaform capitalizes default captions, added
 tem::load_str() metaform preview is passed through
 template engine properly

---
 format.php   |    5 +++++
 metaform.php |    8 ++++++--
 template.php |   14 +++++++++-----
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/format.php b/format.php
index 055e66d..8979b26 100644
--- a/format.php
+++ b/format.php
@@ -21,6 +21,11 @@
 
 # This file contains basic encodings
 
+function format_caption($str) {
+	$str = ucwords($str);
+	return str_replace('Email', 'E-mail', $str);
+}
+
 function format_int($str) {
 	$str = ereg_replace('[^0-9]', '', $str);
 	return ereg_replace('^0*([1-9])', '\1', $str);
diff --git a/metaform.php b/metaform.php
index 1119d0c..c8bb395 100644
--- a/metaform.php
+++ b/metaform.php
@@ -187,7 +187,7 @@ function make_html($whole_file = true) {
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
 		$tem->set('name', $name);
-		$tem->set('caption', $name); # fixme
+		$tem->set('caption', format_caption($name));
 		$tem->sub($input);
 		if($input != 'hidden') {
 			$tem->sub('row');
@@ -345,7 +345,11 @@ function preview() {
 	tem_set('form_name', $GLOBALS['form_name']);
 	tem_set('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
-	$preview = $preview_tem->run(make_html(false));
+	$preview_tem->load_str(make_html(false));
+	if($GLOBALS['opt_db'] == 'Yes') {
+		$preview_tem->sub('new_msg');
+	}
+	$preview = $preview_tem->run();
 	unset($preview_tem);
 	tem_set('preview', $preview);
 	set_form_action();
diff --git a/template.php b/template.php
index e386fe2..28b4814 100644
--- a/template.php
+++ b/template.php
@@ -130,16 +130,20 @@ class tem {
 		} #repeat
 	}
 
+	# like load() except you pass a string instead of a filename
+	function load_str($str) {
+		$this->template = '';
+		$parents = array('top_level_subs' => array());
+		$parent = 'top_level_subs';
+		$this->_load($str, $this->template, $parents, $parent);
+	}
+
 	# This is useful when you have sub-templates that you want to mess with
 	# before the main template is run. But can also be used to simply specify
 	# the filename ahead of time.
 	function load($filename) {
 		$this->filename = $filename;
-		$tmp = read_whole_file($filename);
-		$this->template = '';
-		$parents = array('top_level_subs' => array());
-		$parent = 'top_level_subs';
-		$this->_load($tmp, $this->template, $parents, $parent);
+		$this->load_str(read_whole_file($filename));
 	}
 		
 	# Run the template. Pass a filename, or a string, unless you've already
-- 
1.7.10.4


From 7add2ea3f61e40c5f0f5539ac6e02533c9390db4 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Fri, 15 Jun 2007 08:00:34 -0400
Subject: [PATCH 03/16] metaform: added pulldown support, added leftcheck
 metaform now ships a seperate stylesheet. metaform
 captions are cleaned up (underscores to spaces and
 capitalization) metaform's generated php has less
 duplication added enc_upper() enc_whatever functions
 can recieve the field name as the second parameter
 format_options() forces the value to be something in
 the options list metaform's auto-generated submit
 button says "Send" if it's e-mail only

---
 encode.php                 |  111 +++++++++++++++++++++++++++++++++++++++++---
 format.php                 |   14 ++++++
 metaform.php               |   39 +++++++++++++---
 metaform/htaccess          |    3 ++
 metaform/preview.html      |    4 +-
 metaform/style.css         |   18 +++++++
 metaform/template.htaccess |    3 --
 metaform/template.html     |    9 +---
 metaform/template.php      |   24 +++++++---
 template.php               |    2 +-
 10 files changed, 193 insertions(+), 34 deletions(-)
 create mode 100644 metaform/htaccess
 create mode 100644 metaform/style.css
 delete mode 100644 metaform/template.htaccess

diff --git a/encode.php b/encode.php
index a4c4587..38b09bd 100644
--- a/encode.php
+++ b/encode.php
@@ -89,20 +89,119 @@ function enc_tab($str) {
 	return substr($out, 0, -1);
 }
 
+function enc_upper($str) {
+	return strtoupper($str);
+}
+
 
 # display <option>s
 function enc_states($str) {
 	$states_assoc = array("AL" => "Alabama", "AK" => "Alaska", "AZ" => "Arizona", "AR" => "Arkansas", "CA" => "California", "CO" => "Colorado", "CT" => "Connecticut", "DE" => "Delaware", "FL" => "Florida", "GA" => "Georgia", "HI" => "Hawaii", "ID" => "Idaho", "IL" => "Illinois", "IN" => "Indiana", "IA" => "Iowa", "KS" => "Kansas", "KY" => "Kentucky", "LA" => "Louisiana", "ME" => "Maine", "MD" => "Maryland", "MA" => "Massachusetts", "MI" => "Michigan", "MN" => "Minnesota", "MS" => "Mississippi", "MO" => "Missouri", "MT" => "Montana", "NE" => "Nebraska", "NV" => "Nevada", "NH" => "New Hampshire", "NJ" => "New Jersey", "NM" => "New Mexico", "NY" => "New York", "NC" => "North Carolina", "ND" => "North Dakota", "OH" => "Ohio", "OK" => "Oklahoma", "OR" => "Oregon", "PA" => "Pennsylvania", "RI" => "Rhode Island", "SC" => "South Carolina", "SD" => "South Dakota", "TN" => "Tennessee", "TX" => "Texas", "UT" => "Utah", "VT" => "Vermont", "VA" => "Virginia", "WA" => "Washington", "DC" => "Washington, DC", "WV" => "West Virginia", "WI" => "Wisconsin", "WY" => "Wyoming");
 	$ret = '';
 
-	foreach($states_assoc as $code => $name) {
-		$ret .= "<option name=\"$code\"";
-		if($code == $str) {
-			$ret .= " selected";
+	return encode_options($str, $states_assoc, $use_keys = true);
+}
+
+
+define('PULLDOWN_ARRAY', 0); define('PULLDOWN_HASH', 1); define('PULLDOWN_2D', 2);
+
+function pulldown_options_to_hash($options, $keys_from) {
+	# convert other types of input to value=>display hash
+	switch($keys_from) {
+		case PULLDOWN_HASH:
+			return $options;
+		case PULLDOWN_ARRAY:
+			$new_options = array();
+			foreach($options as $opt) {
+				$new_options[$opt] = $opt;
+			}
+			return $new_options;
+		break;
+		case PULLDOWN_2D:
+			$new_options = array();
+			foreach($options as $opt) {
+				$new_options[$opt[0]] = $opt[1];
+			}
+			return $new_options;
+		break;
+		default:
+			die('unknown value: "' . print_r($keys_from) . '" passed in $keys_from parameter');
+	}
+}
+
+
+# call this function before you run() the template so enc_options() knows what
+# to do
+#
+# Parameters:
+#
+#   name: the name of the html control
+#
+#   options: an array of options to display in the pulldown/selectbox
+#
+#   keys_from: Set to one of:
+#        PULLDOWN_ARRAY: (default) values of $options are displayd and posted
+#        PULLDOWN_HASH: values of $options are display, keys are posted
+#        PULLDOWN_2D: $options is a 2 dimensional array.
+#                     $options[0][1] is displayed, $options[0][0] is posted.
+#                     $options[1][1] is displayed, $options[1][0] is posted.
+#
+#   multiple: UNTESTED set to true for multiple-select boxes. 
+
+function pulldown($name, $options, $keys_from = PULLDOWN_ARRAY, $multiple = false) {
+	$options = pulldown_options_to_hash($options, $keys_from);
+	$GLOBALS[$name . '_options'] = array();
+	$GLOBALS[$name . '_options']['options'] = $options;
+	$GLOBALS[$name . '_options']['multiple'] = $multiple;
+}
+
+# output a bunch of <option> tags
+function enc_options($values, $name) {
+	if(!isset($GLOBALS[$name . '_options'])) {
+		die('pulldown() must be called before this template can be run. See code/wfpl/encode.php');
+	}
+	if($GLOBALS[$name . '_options']['multiple']) { # FIXME test this
+		$values = explode(', ', $values);
+	}
+	return encode_options($values, $GLOBALS[$name . '_options']['options'], PULLDOWN_HASH);
+}
+
+# use this function along with a special template to generate the html for pulldowns and multiple select boxes.
+#
+# Parameters:
+#
+#    selected: can be a string or (for multiple-selects) an array
+#
+#    options, keys_from: see documentation for pulldown() above
+function encode_options($selected, $options, $keys_from) {
+	if(!is_array($selected)) {
+		$selected = array($selected);
+	}
+
+	$options = pulldown_options_to_hash($options, $keys_from);
+
+	$out = '';
+	foreach($options as $value => $display) {
+		$out .= '<option';
+
+		if(in_array($value, $selected, $strict = true)) {
+			$out .= ' selected="selected"';
+		}
+
+		if($value !== $display) {
+			$out .= ' value="';
+			$out .= enc_attr($value);
+			$out .= '"';
 		}
-		$ret .= ">$name</option>\n";
+			
+		$out .= '>';
+
+		$out .= enc_html($display);
+
+		$out .= "</option>\n";
 	}
-	return $ret;
+
+	return $out;
 }
 
 ?>
diff --git a/format.php b/format.php
index 8979b26..e158bb3 100644
--- a/format.php
+++ b/format.php
@@ -22,10 +22,24 @@
 # This file contains basic encodings
 
 function format_caption($str) {
+	$str = str_replace('_', ' ', $str);
 	$str = ucwords($str);
 	return str_replace('Email', 'E-mail', $str);
 }
 
+# This function makes sure that $str is in the list of options, and returns "" otherwise
+function format_options($str, $name) {
+	if(!isset($GLOBALS[$name . '_options'])) {
+		die("Couldn't find options for \"$name\". Be sure to call pulldown().");
+	}
+
+	if(!in_array($str, array_keys($GLOBALS[$name . '_options']['options']), $strict = true)) {
+		return '';
+	}
+
+	return $str;
+}
+
 function format_int($str) {
 	$str = ereg_replace('[^0-9]', '', $str);
 	return ereg_replace('^0*([1-9])', '\1', $str);
diff --git a/metaform.php b/metaform.php
index c8bb395..a473bbc 100644
--- a/metaform.php
+++ b/metaform.php
@@ -43,8 +43,9 @@ $GLOBALS['types'] = array(
 	'password' =>   array('password',    'oneline',    'varchar(200)'),
 	'textarea' =>   array('textarea',    'unix',       'text'),
 	'html' =>       array('html',        'unix',       'text'),
-	'pulldown' =>   array('pulldown',    'options',    'int'),
+	'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
 	'radio' =>      array('radio',       'oneline',    'varchar(200)'),
+	'leftcheck' =>  array('leftcheck',   'yesno',      'varchar(3)'),
 	'checkbox' =>   array('checkbox',    'yesno',      'varchar(3)'),
 	'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
@@ -117,8 +118,13 @@ function field_format($type) { return $GLOBALS['types'][$type][1]; }
 function field_sql($type)    { return $GLOBALS['types'][$type][2]; }
 
 function get_fields() {
+	# no sense in doing all this so many times
+	if(isset($GLOBALS['gotten_fields'])) {
+		return $GLOBALS['gotten_fields'];
+	}
+
 	$fields_str = unix_newlines($_REQUEST['fields']);
-	$ret = array();
+	$GLOBALS['gotten_fields'] = array();
 	$fields_str = rtrim($fields_str);
 	$fields = split("\n", $fields_str);
 	foreach($fields as $field) {
@@ -128,9 +134,9 @@ function get_fields() {
 		$input = field_input($type);
 		$format = field_format($type);
 		$sql = field_sql($type);
-		$ret[] = array($name, $type, $input, $format, $sql, $options);
+		$GLOBALS['gotten_fields'][] = array($name, $type, $input, $format, $sql, $options);
 	}
-	return $ret;
+	return $GLOBALS['gotten_fields'];
 }
 
 # this one, that you're using to create forms
@@ -209,10 +215,17 @@ function make_html($whole_file = true) {
 	} else {
 		$tem->sub('opt_db_1_else');
 	}
-	$tem->set('name', 'save');
-	$tem->set('caption', 'Save');
+
+	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
+		$tem->set('name', 'send');
+		$tem->set('caption', 'Send');
+	} else {
+		$tem->set('name', 'save');
+		$tem->set('caption', 'Save');
+	}
 	$tem->sub('submit');
 	$tem->sub('row');
+
 	$tem->sub('form');
 
 	if($has_html_editors) {
@@ -263,6 +276,10 @@ function make_php() {
 					$image_included_yet = true;
 				}
 			} else {
+				if($input == 'pulldown') {
+					$tem->sub('pulldowns');
+					$tem->sub('pulldown_format_extra');
+				}
 				$tem->sub('formats');
 			}
 			$tem->sub('tem_sets');
@@ -331,7 +348,7 @@ function make_email() {
 function make_htaccess() {
 	$tem = new tem();
 	$tem->set('form', $GLOBALS['form_name']);
-	return $tem->run('code/wfpl/metaform/template.htaccess');
+	return $tem->run('code/wfpl/metaform/htaccess');
 }
 
 function view_email() {
@@ -349,6 +366,13 @@ function preview() {
 	if($GLOBALS['opt_db'] == 'Yes') {
 		$preview_tem->sub('new_msg');
 	}
+	$fields = get_fields();
+	foreach($fields as $field) {
+		list($name, $type, $input, $format, $sql) = $field;
+		if($type == 'pulldown') {
+			pulldown($name, array('option 1', 'option 2', 'option 3'));
+		}
+	}
 	$preview = $preview_tem->run();
 	unset($preview_tem);
 	tem_set('preview', $preview);
@@ -361,6 +385,7 @@ function download_tar() {
 	$data = array(
 		".htaccess" => make_htaccess(),
 		"run.php ->" => 'code/wfpl/run.php',
+		"style.css" => read_whole_file('code/wfpl/metaform/style.css'),
 		"$name.html" => make_html(),
 		"$name.php" => make_php());
 	if($GLOBALS['opt_db'] == 'Yes') {
diff --git a/metaform/htaccess b/metaform/htaccess
new file mode 100644
index 0000000..eb2ad6d
--- /dev/null
+++ b/metaform/htaccess
@@ -0,0 +1,3 @@
+RewriteEngine  on
+RewriteRule    ^$  /~form~/run.php
+RewriteRule    ^[^/]*\.html$  /~form~/run.php
diff --git a/metaform/preview.html b/metaform/preview.html
index d9d0b6f..fd8f193 100644
--- a/metaform/preview.html
+++ b/metaform/preview.html
@@ -3,9 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>Meta Form</title>
-  <style type="text/css"><!--
-td.caption { text-align: right; font-weight: bold; }
---></style>
+  <link rel="stylesheet" href="code/wfpl/metaform/style.css" type="text/css" />
 </head>
 
 <body>
diff --git a/metaform/style.css b/metaform/style.css
new file mode 100644
index 0000000..006ccab
--- /dev/null
+++ b/metaform/style.css
@@ -0,0 +1,18 @@
+td.field, td.right_caption {
+	text-align: left;
+	vertical-align: bottom;
+}
+td.caption, td.errorcaption {
+	text-align: right;
+	vertical-align: top;
+}
+td.caption, td.errorcaption, td.right_caption {
+	font-weight: bold;
+}
+td.errorcaption { color: red; }
+div.error {
+	border: 2px solid red;
+	padding: 13px;
+	margin: 20px;
+	background: #fdd;
+}
diff --git a/metaform/template.htaccess b/metaform/template.htaccess
deleted file mode 100644
index eb2ad6d..0000000
--- a/metaform/template.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-RewriteEngine  on
-RewriteRule    ^$  /~form~/run.php
-RewriteRule    ^[^/]*\.html$  /~form~/run.php
diff --git a/metaform/template.html b/metaform/template.html
index 039eaea..22656fd 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -3,12 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>~form_name~ entry</title>
-  <style type="text/css"><!--
-td.field { vertical-align: bottom; }
-td.caption { text-align: right; vertical-align: top; font-weight: bold; }
-td.errorcaption { text-align: right; vertical-align: top; font-weight: bold; color: red; }
-div.error { border: 2px solid red; padding: 13px; margin: 20px; background: #ffdddd; }
---></style><!--~html_editor_headers start~-->
+  <link rel="stylesheet" href="style.css" type="text/css" /><!--~html_editor_headers start~-->
 <script type="text/javascript" src="fckeditor/fckeditor.js"></script>
   <script type="text/javascript" src="fckeditor/fckconfig.js"></script>
   <script type="text/javascript">
@@ -41,7 +36,7 @@ div.error { border: 2px solid red; padding: 13px; margin: 20px; background: #ffd
   <form action="~form_name~.html~enctype_attr~" method="post"><!--~opt_db_2 start~--><!--~~editing start~~--><input type="hidden" name="~form_name~_edit_id" value="~~~form_name~_edit_id.attr~~" /><!--~~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><input type="file" name="~name~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td><input type="text" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~password start~--><td class="caption">~caption.html~: </td><td><input type="password" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textarea start~--><td class="caption">~caption.html~: </td><td><textarea rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~html start~--><td class="caption">~caption.html~: </td><td></td></tr><tr><td colspan="2"><textarea rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></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><input type="checkbox" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~submit start~--><td class="submit_row" colspan="2"><input type="submit" name="~name~" value="~caption.attr~" /></td><!--~end~--></tr><!--~end~-->
+      <tr><!--~image start~--><td class="caption">~caption.html~: </td><td class="field"><input type="file" name="~name~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td class="field"><input type="text" name="~name~" value="~~~name~.attr~~" /></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="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~html start~--><td class="caption">~caption.html~: </td><td></td></tr><tr><td colspan="2"><textarea 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~--><!--~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~-->
     </table>
   </form>
 <!--~end~--><!--~~end~~-->
diff --git a/metaform/template.php b/metaform/template.php
index 537c22f..890c49b 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -18,6 +18,10 @@ $GLOBALS['~form_name~_form_recipient'] = "fixme@example.com";
 # (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:
 # 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~');
 <!--~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
@@ -38,18 +42,22 @@ require_once('code/wfpl/db.php');<!--~end~--><!--~image_include start~-->
 require_once('code/wfpl/upload.php');<!--~end~-->
 
 function ~form_name~_get_fields() {<!--~formats start~-->
-	$~name~ = format_~format~($_REQUEST['~name~']);<!--~end~--><!--~image_upload start~-->
+	$~name~ = format_~format~($_REQUEST['~name~']<!--~pulldown_format_extra start~-->, '~name~'<!--~end~-->);<!--~end~--><!--~image_upload start~-->
 	if($_FILE['~name~'] && $_FILE['~name~']['error'] == 0) {
 		$~name~ = substr(save_uploaded_image('~name~', $GLOBALS['upload_directory']), strlen($GLOBALS['upload_directory']));
 	} else {
 		$~name~ = format_filename($_REQUEST['old_~name~']);
 	}<!--~end~-->
-	<!--~tem_sets start~-->
-	tem_set('~name~', $~name~);<!--~end~-->
+
+	~form_name~_tem_sets(~php_fields~);
 
 	return array(~php_fields~);
 }
 
+function ~form_name~_tem_sets(~php_fields~) {<!--~tem_sets start~-->
+	tem_set('~name~', $~name~);<!--~end~-->
+}
+
 function ~form_name~() {<!--~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) {
@@ -58,6 +66,8 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 		echo '401 Unauthorized';
 		exit;
 	}
+	<!--~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']);
@@ -94,10 +104,10 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 						$~name~ = db_get_value('~form_name~', '~name~', 'where id=%i', $edit_id);
 					}
 					<!--~end~-->
-					db_update('~form_name~', '~db_fields~', ~php_fields~, 'where id=%i', $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~', '~db_fields~', ~php_fields~);
+					db_insert('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~);
 					message('Entry saved.');
 				}
 			}<!--~end~--><!--~opt_email_2 start~-->
@@ -133,8 +143,8 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 		# 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~', '~db_fields~', 'where id=%i', $edit_id);
-		~tem_sets.tab~<!--~end~-->
+		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~-->
 	} else {
 		# form not submitted, you can set default values like so:
 		#tem_set('~always_field~', 'Yes');
diff --git a/template.php b/template.php
index 28b4814..2425275 100644
--- a/template.php
+++ b/template.php
@@ -246,7 +246,7 @@ function template_filler($matches) {
 		foreach($encs as $enc) {
 			$enc = "enc_$enc";
 			if(function_exists($enc)) {
-				$value = $enc($value);
+				$value = $enc($value, $tag);
 			} else {
 				print "ERROR: encoder function '$enc' not found.<br>\n";
 				exit(1);
-- 
1.7.10.4


From 410481c790e47f6a8193a2f3eb67e09180be0339 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Mon, 25 Jun 2007 12:51:03 -0400
Subject: [PATCH 04/16] added: dwt_load_str() and enc_jsdq()

---
 dwt.php    |    8 ++++++--
 encode.php |    6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dwt.php b/dwt.php
index 6cd2d66..82629ff 100644
--- a/dwt.php
+++ b/dwt.php
@@ -32,11 +32,15 @@ function dwt_init() {
 	dwt_reset();
 }
 
-function dwt_load($filename) {
-	$GLOBALS['_dwt_template'] = read_whole_file($filename);
+function dwt_load_str($str) {
+	$GLOBALS['_dwt_template'] = $str;
 	dwt_init();
 }
 
+function dwt_load($filename) {
+	dwt_load_str(read_whole_file($filename));
+}
+
 function dwt_set_raw($name, $value) {
 	$GLOBALS['_dwt_keys'][] = $name;
 	$GLOBALS['_dwt_values'][] = $value;
diff --git a/encode.php b/encode.php
index 38b09bd..3f4119c 100644
--- a/encode.php
+++ b/encode.php
@@ -27,6 +27,12 @@
 # such as < will display properly.
 
 
+function enc_jsdq($str) {
+	$str = enc_sql($str);
+	$str = str_replace("\n", "\\n", $str);
+	return str_replace("\r", "\\r", $str);
+}
+
 # encode for putting within double-quotes in SQL
 function enc_sql($str) {
 	$str = str_replace("\\", "\\\\", $str);
-- 
1.7.10.4


From 4d68e21b12d8887935855ac9fe3117b0ee656c6f Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Mon, 25 Jun 2007 14:58:31 -0400
Subject: [PATCH 05/16] added days_to_ymd() and ymd_to_days()

---
 time.php |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 time.php

diff --git a/time.php b/time.php
new file mode 100644
index 0000000..501d89c
--- /dev/null
+++ b/time.php
@@ -0,0 +1,47 @@
+<?php
+
+#  Copyright (C) 2007 Jason Woofenden
+#
+#  This file is part of wfpl.
+#
+#  wfpl is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
+#
+#  wfpl is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
+#  more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
+#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+# This file contains functions to manipulate/calculate dates/times
+
+function ymd_to_days($year, $month, $day) {
+	return (int)(mktime(12,0,0,$month,$day, $year, 0) / 86400);
+}
+
+function days_to_ymd($days) {
+	return explode('-', date('Y-n-j', $days * 86400 + 43200));
+}
+
+function days_to_weekday_name($days) {
+	$day_names = array('Thursday', 'Friday', 'Saturday', 'Sunday', 'Monday', 'Tuesday', 'Wednesday');
+	return $day_names[$days % 7];
+}
+
+
+#function time_test() {
+#	for($i = 0; $i < 41 * 86400; $i += 86399) {
+#		echo "seconds: $i";
+#		$days = (int)($i / 86400);
+#		list($year, $month, $day) = days_to_ymd($days);
+#		echo ", days_to_ymd($days): $year-$month-$day";
+#		$days = ymd_to_days($year, $month, $day);
+#		echo ", ymd_to_days($year, $month, $day): $days\n<br>";
+#	}
+#}
-- 
1.7.10.4


From 83949aa6ed4f40e2f12a97cf8ffc68b1feb7f73f Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Fri, 29 Jun 2007 00:23:08 -0400
Subject: [PATCH 06/16] added format_int_0()

---
 format.php |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/format.php b/format.php
index e158bb3..c40f55e 100644
--- a/format.php
+++ b/format.php
@@ -45,6 +45,15 @@ function format_int($str) {
 	return ereg_replace('^0*([1-9])', '\1', $str);
 }
 
+# return 0 of there's no digits
+function format_int_0($str) {
+	$str = format_int($str);
+	if($str == '') {
+		return '0';
+	}
+	return $str;
+}
+
 function format_zip($str) {
 	return ereg_replace('[^0-9]', '', $str);
 }
-- 
1.7.10.4


From d98d81886649a863d0e902f7c4e63b1257217e1f Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Wed, 11 Jul 2007 18:04:33 -0400
Subject: [PATCH 07/16] fixed pulldowns, metaform suppors zip and decimal,
 run.php supports straight html files with a template

---
 encode.php             |    2 +-
 format.php             |   24 +++++++++++++--
 metaform.php           |   40 +++++++++++++++++++++----
 metaform/htaccess      |    2 +-
 metaform/main.html     |    2 ++
 metaform/preview.html  |    4 +--
 metaform/template.html |   18 ++++++++---
 metaform/template.php  |   78 +++++++++++++++++++++++++++++++++---------------
 run.php                |   59 +++++++++++++++++++++++-------------
 template.php           |   29 +++++++++++++++---
 10 files changed, 195 insertions(+), 63 deletions(-)

diff --git a/encode.php b/encode.php
index 3f4119c..243b21f 100644
--- a/encode.php
+++ b/encode.php
@@ -190,7 +190,7 @@ function encode_options($selected, $options, $keys_from) {
 	foreach($options as $value => $display) {
 		$out .= '<option';
 
-		if(in_array($value, $selected, $strict = true)) {
+		if(in_array($value, $selected)) {
 			$out .= ' selected="selected"';
 		}
 
diff --git a/format.php b/format.php
index c40f55e..e968158 100644
--- a/format.php
+++ b/format.php
@@ -33,7 +33,7 @@ function format_options($str, $name) {
 		die("Couldn't find options for \"$name\". Be sure to call pulldown().");
 	}
 
-	if(!in_array($str, array_keys($GLOBALS[$name . '_options']['options']), $strict = true)) {
+	if(!in_array($str, array_keys($GLOBALS[$name . '_options']['options']))) {
 		return '';
 	}
 
@@ -45,6 +45,22 @@ function format_int($str) {
 	return ereg_replace('^0*([1-9])', '\1', $str);
 }
 
+function format_decimal($str) {
+	$str = ereg_replace('[^0-9.]', '', $str);
+	$pos = strpos($str, '.');
+	if($pos !== false) {
+		$str = str_replace('.', '', $str);
+		if($pos == 0) {
+			return '0.' . $str;
+		} elseif($pos == strlen($str)) {
+			return $str;
+		} else {
+			return substr($str, 0, $pos) . '.' . substr($str, $pos);
+		}
+	}
+	return $str;
+}
+
 # return 0 of there's no digits
 function format_int_0($str) {
 	$str = format_int($str);
@@ -55,7 +71,11 @@ function format_int_0($str) {
 }
 
 function format_zip($str) {
-	return ereg_replace('[^0-9]', '', $str);
+	$str = ereg_replace('[^0-9]', '', $str);
+	if(strlen($str) > 5) {
+		return substr($str, 0, 5) . '-' . substr($str, 5);
+	}
+	return $str;
 }
 
 function format_filename($str) {
diff --git a/metaform.php b/metaform.php
index a473bbc..e6e4123 100644
--- a/metaform.php
+++ b/metaform.php
@@ -32,7 +32,9 @@ $GLOBALS['types'] = array(
 	'name' =>       array('textbox',     'oneline',    'varchar(200)'),
 	'textbox' =>    array('textbox',     'oneline',    'varchar(200)'),
 	'int' =>        array('textbox',     'int',        'int'),
+	'decimal' =>    array('textbox',     'decimal',    'decimal(12,12)'),
 	'bigint' =>     array('textbox',     'int',        'varchar(100)'), # up to 100 digits, stored as a string
+	'zip' =>        array('textbox',     'zip',        'varchar(20)'),
 	'email' =>      array('textbox',     'email',      'varchar(100)'),
 	'phone' =>      array('textbox',     'phone',      'varchar(32)'),
 	'state' =>      array('states',      'oneline',    'varchar(2)'),
@@ -72,6 +74,8 @@ function metaform() {
 		tem_set('opt_email', $GLOBALS['opt_email']);
 		$GLOBALS['opt_db'] = format_yesno($_REQUEST['opt_db']);
 		tem_set('opt_db', $GLOBALS['opt_db']);
+		$GLOBALS['opt_listing'] = format_yesno($_REQUEST['opt_listing']);
+		tem_set('opt_listing', $GLOBALS['opt_listing']);
 		$GLOBALS['opt_http_pass'] = format_yesno($_REQUEST['opt_http_pass']);
 		tem_set('opt_http_pass', $GLOBALS['opt_http_pass']);
 	} else {
@@ -180,6 +184,19 @@ function view_sql() {
 	view_headers();
 	echo make_sql();
 }
+
+# always_field is a form field that always submits (unlike say, checkboxes). It's used to detect if the form has submitted or not.
+function find_always_field($fields) {
+	foreach($fields as $field) {
+		list($name, $type, $input, $format, $sql) = $field;
+		if($input != 'submit' && $input != 'checkbox' && $input != 'radio') {
+			return $name;
+		}
+	}
+
+	return false;
+}
+	
 	
 
 # pass false if you want to exclude the <head> and <body> tag etc.
@@ -190,6 +207,7 @@ function make_html($whole_file = true) {
 	$tem->load('code/wfpl/metaform/template.html');
 	$tem->set('form_name', $GLOBALS['form_name']);
 	$fields = get_fields();
+	$tem->set('always_field', find_always_field($fields));
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
 		$tem->set('name', $name);
@@ -216,6 +234,12 @@ function make_html($whole_file = true) {
 		$tem->sub('opt_db_1_else');
 	}
 
+	if($GLOBALS['opt_listing'] == 'Yes') {
+		$tem->sub('opt_listing_1');
+	} else {
+		$tem->sub('opt_listing_1_else');
+	}
+
 	if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
 		$tem->set('name', 'send');
 		$tem->set('caption', 'Send');
@@ -252,7 +276,7 @@ function make_php() {
 	$fields = get_fields();
 	$db_fields = '';
 	$php_fields = '';
-	$always_field = false;
+	$always_field = find_always_field($fields);
 	$image_included_yet = false;
 	foreach($fields as $field) {
 		list($name, $type, $input, $format, $sql) = $field;
@@ -283,16 +307,22 @@ function make_php() {
 				$tem->sub('formats');
 			}
 			$tem->sub('tem_sets');
-			if(!$always_field and $input != 'checkbox' and $input != 'radio') {
-				$always_field = $name;
-			}
 		}
 	}
-	# always_field is a form field that always submits (unlike say, checkboxes). It's used to detect if the form has submitted or not.
+
 	$tem->set('always_field', $always_field);
 	$tem->set('db_fields', $db_fields);
 	$tem->set('php_fields', $php_fields);
 	$tem->set('metaform_url', edit_url());
+	if($GLOBALS['opt_listing'] == 'Yes') {
+		$tem->sub('opt_listing_1');
+		$tem->sub('opt_listing_2');
+		$tem->sub('opt_listing_3');
+		$tem->sub('opt_listing_4');
+	} else {
+		$tem->sub('opt_listing_3_else');
+		$tem->sub('opt_listing_4_else');
+	}
 	if($GLOBALS['opt_db'] == 'Yes') {
 		$tem->sub('opt_db_1');
 		$tem->sub('opt_db_2');
diff --git a/metaform/htaccess b/metaform/htaccess
index eb2ad6d..362282a 100644
--- a/metaform/htaccess
+++ b/metaform/htaccess
@@ -1,3 +1,3 @@
 RewriteEngine  on
-RewriteRule    ^$  /~form~/run.php
+RewriteRule    ^$  /run.php
 RewriteRule    ^[^/]*\.html$  /~form~/run.php
diff --git a/metaform/main.html b/metaform/main.html
index 5d0bc2e..fd70d42 100644
--- a/metaform/main.html
+++ b/metaform/main.html
@@ -19,6 +19,8 @@
 
     <p><input type="checkbox" name="opt_db~opt_db.checked~" value="Yes" /> Save form results to a database.</p>
 
+    <p><input type="checkbox" name="opt_listing~opt_listing.checked~" value="Yes" /> Provide a "Listing" page.</p>
+
     <p><input type="checkbox" name="opt_http_pass~opt_http_pass.checked~" value="Yes" /> Password protect this form (with HTTP authentication).</p>
 
 	<p>Below, specify the fields you'd like in your form, one field per line. After each field name, put at least one space, then the field type. The following field types are available: ~available_types.html~.</p>
diff --git a/metaform/preview.html b/metaform/preview.html
index fd8f193..2731e23 100644
--- a/metaform/preview.html
+++ b/metaform/preview.html
@@ -11,10 +11,10 @@
   <h1>This grey thing is a preview. It will NOT work. Don't click button(s) in it</h1>
 ~preview~
   </div>
-    <p><form action="~form_name~.tgz" method="get"><input type="hidden" name="form_name" value="~form_name.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_http_pass" value="~opt_http_pass.attr~" /><input type="hidden" name="fields" value="~fields.attr~" /><input type="submit" name="download_tar" value="Download tar ball" /></form></p>
+    <p><form action="~form_name~.tgz" method="get"><input type="hidden" name="form_name" value="~form_name.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_http_pass" value="~opt_http_pass.attr~" /><input type="hidden" name="fields" value="~fields.attr~" /><input type="submit" name="download_tar" value="Download tar ball" /></form></p>
 
   <form action="~metaform_name~" method="get">
-  	<p><input type="hidden" name="form_name" value="~form_name.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_http_pass" value="~opt_http_pass.attr~" /><input type="hidden" name="fields" value="~fields.attr~" /><input type="submit" name="edit" value="Back to editing" /></p>
+  	<p><input type="hidden" name="form_name" value="~form_name.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_http_pass" value="~opt_http_pass.attr~" /><input type="hidden" name="fields" value="~fields.attr~" /><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.html b/metaform/template.html
index 22656fd..a7d84d5 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -19,9 +19,6 @@
 </head>
 
 <body>
-<!--~~form start~~--><!--~form start~-->
-  <h2><!--~opt_db_1 start~--><!--~~new_msg start~~-->Add a new entry<!--~~end~~--><!--~~edit_msg start~~-->Edit entry "~~name.html~~"<!--~~end~~--><!--~end~--><!--~opt_db_1_else start~-->~form_name~ entry form<!--~end~--></h2>
-
   <!--~~message_container start~~-->
        <div style="border: 2px solid red; background: #fbb; padding: 5px; margin: 20px 0px">
        <!--~~message_box start~~-->
@@ -33,6 +30,9 @@
        </div>
   <!--~~end~~-->
 
+<!--~~form start~~--><!--~form start~-->
+  <h2><!--~opt_db_1 start~--><!--~~new_msg start~~-->Add a new entry<!--~~end~~--><!--~~edit_msg start~~-->Edit entry "~~~always_field~.html~~"<!--~~end~~--><!--~end~--><!--~opt_db_1_else start~-->~form_name~ entry form<!--~end~--></h2>
+
   <form action="~form_name~.html~enctype_attr~" method="post"><!--~opt_db_2 start~--><!--~~editing start~~--><input type="hidden" name="~form_name~_edit_id" value="~~~form_name~_edit_id.attr~~" /><!--~~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~-->
 
@@ -40,8 +40,18 @@
     </table>
   </form>
 <!--~end~--><!--~~end~~-->
+<!--~opt_listing_1 start~--><!--~~listings start~~-->
+  <h2>~form_name~ Listing</h2>
+
+  <table cellspacing="0" cellpadding="4" border="1" summary=""><!--~~listing_row start~~-->
+  <tr><td class="listing"><a href="~form_name~.html?~form_name~_edit_id=~~id~~">~~~always_field~.html~~</a></td><td><a href="~form_name~.html?~form_name~_delete_id=~~id~~" onclick="return confirm('Permanently delete?')">[delete this record]</a></td></tr><!--~~end~~-->
+
+  </table>
+
+  <p><a href="~form_name~.html?~form_name~_new=1">[Add a new record]</a></p>
+<!--~~end~~--><!--~end~--><!--~opt_listing_1_else start~-->
 <!--~~thankyou start~~-->
   <p>Thank you for taking the time to fill out this form.</p>
-<!--~~end~~-->
+<!--~~end~~--><!--~end~-->
 </body>
 </html>
diff --git a/metaform/template.php b/metaform/template.php
index 890c49b..48fb37f 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -38,7 +38,7 @@ 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('db_connect.php');<!--~end~--><!--~image_include start~-->
 require_once('code/wfpl/upload.php');<!--~end~-->
 
 function ~form_name~_get_fields() {<!--~formats start~-->
@@ -57,7 +57,27 @@ 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;
+	}
 
+	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_sub('listing_row');
+	}
+	tem_sub('listings');
+	return true;
+}
+<!--~end~-->
 function ~form_name~() {<!--~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) {
@@ -75,20 +95,30 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 		# 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');
 	}
 
 	$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) {
+	if(!$edit_id && !$delet_id) {<!--~opt_listing_1 start~-->
+		if(!isset($_REQUEST['~form_name~_new']) && !isset($_REQUEST['~always_field~'])) {
+			if(~form_name~_display_listing()) {
+				return;
+			}
+		}
+		<!--~end~-->
 		tem_sub('new_msg');
 	}<!--~end~-->
 
@@ -96,20 +126,17 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 		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) {<!--~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.');
 			}<!--~end~--><!--~opt_email_2 start~-->
 			if($GLOBALS['~form_name~_form_recipient'] != "fixme@example.com") {
 				$to = $GLOBALS['~form_name~_form_recipient'];
@@ -130,11 +157,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_sub('thankyou');<!--~end~-->
+				return;
 			}
 		}
 		# otherwise, we display the form again. ~form_name~_get_fields() has
@@ -152,7 +178,11 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 
 	tem_set('upload_max_filesize', upload_max_filesize());<!--~end~-->
 
-	display_messages();
+	# 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_sub('form');
 }
 
diff --git a/run.php b/run.php
index c5ae240..f77e7d0 100644
--- a/run.php
+++ b/run.php
@@ -59,6 +59,10 @@ require_once('code/wfpl/file_run.php');
 require_once('code/wfpl/http.php');
 require_once('code/wfpl/template.php');
 
+if(file_exists('code/config.php')) {
+	file_run('code/config.php');
+}
+
 function run_php($basename = false) {
 	if(!$basename) {
 		$basename = $_SERVER['REDIRECT_URL'];
@@ -72,36 +76,51 @@ function run_php($basename = false) {
 	$html_file = "$basename.html";
 	$php_file = "$basename.php";
 
-	if(!file_exists($php_file)) {
-		if(file_exists($html_file)) {
-			readfile($html_file);
+	$html_exists = file_exists($html_file);
+	$php_exists = file_exists($php_file);
+
+	if(!$php_exists && !$html_exists) {
+		header('HTTP/1.0 404 File Not Found');
+		if(file_exists('404.php') || file_exists('404.html')) {
+			run_php('404');
 		} else {
-			header('HTTP/1.0 404 File Not Found');
-			if(file_exists('404.php') || file_exists('404.html')) {
-				run_php('404');
-			} else {
-				echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>404</title></head><body><h1>404 File Not Found</h1></body></html>';
-			}
+			echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>404</title></head><body><h1>404 File Not Found</h1></body></html>';
 		}
+	}
+
+	# If there's no template.html we don't want to parse $html_file.
+	if($html_exists && !$php_exists && !file_exists('template.html')) {
+		readfile($html_file);
 		exit();
 	}
 
-	if(file_exists($html_file)) {
-		$GLOBALS['wfpl_template'] = new tem();
-		tem_load($html_file);
+	if($html_exists) {
+		tem_load_new($html_file);
 	}
 
-	# files can return a basename or URL of a page to be run/displayed
-	$other = file_run($php_file);
-	if($other) {
-		if(strpos($other, ':')) {
-			redirect($other);
-			exit();
+	if($php_exists) {
+		# files can return a basename or URL of a page to be run/displayed
+		$other = file_run($php_file);
+		if($other) {
+			if(strpos($other, ':')) {
+				redirect($other);
+				exit();
+			}
+			if(substr($other, 0, 2) == './') {
+				redirect(ereg_replace('/[^/]*$', substr($other, 1), this_url()));
+				exit();
+			}
+			run_php($other);
+			return;
+		}
+	} else {
+		$sub_names = tem_top_sub_names();
+		foreach($sub_names as $sub_name) {
+			tem_sub($sub_name);
 		}
-		run_php($other);
-		return;
 	}
 
+	# Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script.
 	if($GLOBALS['wfpl_template']) {
 		if(file_exists('template.html')) {
 			$tem = new tem();
diff --git a/template.php b/template.php
index 2425275..822738b 100644
--- a/template.php
+++ b/template.php
@@ -177,6 +177,15 @@ class tem {
 		print($this->run($templ));
 	}
 
+	# return the names of the top level subs, or an empty array
+	function top_sub_names() {
+		if(isset($this->sub_subs['top_level_subs'])) {
+			return $this->sub_subs['top_level_subs'];
+		} else {
+			return array();
+		}
+	}
+
 	# return the contents of the top-level sub-templates
 	#
 	# this does not run the sub-templates, so if you've not called tem_sub() on them, they will be blank.
@@ -186,10 +195,9 @@ class tem {
 	#     values: contents of said sub-template.
 	function top_subs() {
 		$ret = array();
-		if(isset($this->sub_subs['top_level_subs'])) {
-			foreach($this->sub_subs['top_level_subs'] as $name) {
-				$ret[$name] = $this->get($name);
-			}
+		$names = $this->top_sub_names();
+		foreach($names as $name) {
+			$ret[$name] = $this->get($name);
 		}
 		return $ret;
 	}
@@ -264,9 +272,22 @@ function template_run($template, &$keyval) {
 	return preg_replace_callback(array('|<!--~([^~]*)~-->|', '|~([^~]*)~|', '|<span class="template">([^<]*)</span>|', '|<p class="template">([^<]*)</p>|'), 'template_filler', $template);
 }
 
+function tem_top_sub_names() {
+	tem_init();
+	return $GLOBALS['wfpl_template']->top_sub_names();
+}
+
 function tem_top_subs() {
 	tem_init();
 	return $GLOBALS['wfpl_template']->top_subs();
 }
 
+# replaces currently set template, and returns the old.
+function tem_load_new($file) {
+	$old = $GLOBALS['wfpl_template'];
+	$GLOBALS['wfpl_template'] = new tem();
+	$GLOBALS['wfpl_template']->load($file);
+	return $old;
+}
+
 ?>
-- 
1.7.10.4


From 989e37568c7ac1cbab5baf8993cd7babcb0b87e9 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Fri, 13 Jul 2007 13:51:01 -0400
Subject: [PATCH 08/16] fixed typo

---
 metaform/template.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metaform/template.php b/metaform/template.php
index 48fb37f..e86d791 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -112,7 +112,7 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 		return;<!--~end~-->
 	}
 
-	if(!$edit_id && !$delet_id) {<!--~opt_listing_1 start~-->
+	if(!$edit_id) {<!--~opt_listing_1 start~-->
 		if(!isset($_REQUEST['~form_name~_new']) && !isset($_REQUEST['~always_field~'])) {
 			if(~form_name~_display_listing()) {
 				return;
-- 
1.7.10.4


From e57287b274cd1d031d2dd408c2fbb07b6c362cc5 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Tue, 17 Jul 2007 03:34:38 -0400
Subject: [PATCH 09/16] fixed typo (produced stupid looking code that worked)

---
 metaform/template.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metaform/template.php b/metaform/template.php
index 48fb37f..e86d791 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -112,7 +112,7 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 		return;<!--~end~-->
 	}
 
-	if(!$edit_id && !$delet_id) {<!--~opt_listing_1 start~-->
+	if(!$edit_id) {<!--~opt_listing_1 start~-->
 		if(!isset($_REQUEST['~form_name~_new']) && !isset($_REQUEST['~always_field~'])) {
 			if(~form_name~_display_listing()) {
 				return;
-- 
1.7.10.4


From 8355c5788f7179a3674ab1121c859530e838bb64 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Thu, 26 Jul 2007 04:23:03 -0400
Subject: [PATCH 10/16] added examples/session.sql, metaform: added varname

---
 examples/session.sql |   13 +++++++++++++
 metaform.php         |    1 +
 metaform/main.html   |    2 +-
 session.php          |    5 ++++-
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 examples/session.sql

diff --git a/examples/session.sql b/examples/session.sql
new file mode 100644
index 0000000..aa44c5a
--- /dev/null
+++ b/examples/session.sql
@@ -0,0 +1,13 @@
+drop table if exists wfpl_sessions;
+create table wfpl_sessions (
+	id int unique auto_increment,
+	session_key varchar(16),
+	length int,
+	expires int);
+
+drop table if exists wfpl_session_data;
+create table wfpl_session_data (
+	id int unique auto_increment,
+	session_id int,
+	name varchar(100),
+	value text);
diff --git a/metaform.php b/metaform.php
index e6e4123..6eaa7a8 100644
--- a/metaform.php
+++ b/metaform.php
@@ -29,6 +29,7 @@ require_once('code/wfpl/format.php');
 # see code/wfpl/metaform/template.html for the html templates for these elements
 $GLOBALS['types'] = array(
 #    type                  input          format        sql     
+	'varname' =>    array('textbox',     'varname',    'varchar(50)'),
 	'name' =>       array('textbox',     'oneline',    'varchar(200)'),
 	'textbox' =>    array('textbox',     'oneline',    'varchar(200)'),
 	'int' =>        array('textbox',     'int',        'int'),
diff --git a/metaform/main.html b/metaform/main.html
index fd70d42..df07379 100644
--- a/metaform/main.html
+++ b/metaform/main.html
@@ -11,7 +11,7 @@
   <form action="~metaform_name~" method="get">
     <p>The form name should not contain any capitals or symbols (besides underscore)</p>
 
-    <p>Form name: <input type="text" name="form_name" value="~form_name.attr~" /></p>
+    <p>Form name: <input type="text" name="form_name" value="~form_name.attr~" /> (This is used as the database table name (if any) and the basename of all the files.)</p>
 
 	<h3>Features</h3>
 
diff --git a/session.php b/session.php
index b04ed57..4bbaea9 100644
--- a/session.php
+++ b/session.php
@@ -18,7 +18,7 @@
 #  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
 #  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-# you'll need this file that calles db_connect()
+# you'll need this file that calls db_connect()
 if(!isset($GLOBALS['wfpl_db_handle'])) {
 	if(file_exists('db_connect.php')) {
 		require_once('db_connect.php');
@@ -32,6 +32,9 @@ if(!isset($GLOBALS['wfpl_db_handle'])) {
 # and these database tables:
 # create table wfpl_sessions (id int unique auto_increment, session_key varchar(16), length int, expires int);
 # create table wfpl_session_data (id int unique auto_increment, session_id int, name varchar(100), value text);
+# run this command to install/clear the tables:
+#   mysql DATABASE_NAME < code/wfpl/examples/session.sql
+# note: you may need these parameters for mysql:  -u USERNAME -p
 
 # GLOSSARY
 #
-- 
1.7.10.4


From 48805cdb3501fc558a68a31f2aed2f6ad716e297 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Fri, 14 Sep 2007 01:17:35 -0400
Subject: [PATCH 11/16] file_run() expects _main suffix. added: enc_htmlbr
 enc_provinces

---
 encode.php   |   23 +++++++++++++++++++++++
 file_run.php |   13 ++++++++-----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/encode.php b/encode.php
index 243b21f..1cbac74 100644
--- a/encode.php
+++ b/encode.php
@@ -51,6 +51,18 @@ function enc_html($str) {
 }
 
 
+# Encode for output in html. Converts newlines to <br />
+#
+# Example: <p>~foo.html~</p>
+function enc_htmlbr($str) {
+	$str = str_replace('&', '&amp;', $str);
+	$str = str_replace('<', '&lt;', $str);
+	$str = str_replace('>', '&gt;', $str);
+	$str = str_replace("\n", "<br />\n", $str);
+	return $str;
+}
+
+
 # HTML attribute.
 #
 # Example: <input name="foo" value="~foo.attr~">
@@ -108,6 +120,17 @@ function enc_states($str) {
 	return encode_options($str, $states_assoc, $use_keys = true);
 }
 
+# display <option>s
+function enc_provinces($str) {
+	$provinces_assoc = array("AB" => "Alberta", "BC" => "British Columbia", "MB" => "Manitoba", "NF" => "Newfoundland", "NB" => "New Brunswick", "NS" => "Nova Scotia", "NT" => "Northwest Territories", "NU" => "Nunavut", "ON" => "Ontario", "PE" => "Prince Edward Island", "QC" => "Quebec", "SK" => "Saskatchewan", "YT" => "Yukon Territory");
+	$ret = '';
+
+	return encode_options($str, $provinces_assoc, $use_keys = true);
+}
+
+
+
+
 
 define('PULLDOWN_ARRAY', 0); define('PULLDOWN_HASH', 1); define('PULLDOWN_2D', 2);
 
diff --git a/file_run.php b/file_run.php
index 409cb4b..bca5c18 100644
--- a/file_run.php
+++ b/file_run.php
@@ -32,15 +32,18 @@
 #
 # the file db_password.php would be like so:
 #
-#     function db_password() {
+#     function db_password_main() {
 #           return array('me', 'secret');
 #     }
 
 function file_run($filename) {
-    require_once($filename);
-    ereg_replace('.*/', '', $filename);
-    $func = basename($filename, '.php');
-    return $func();
+	require_once($filename);
+	$func = basename($filename, '.php') . '_main';
+	if(!function_exists($func)) {
+		$func = basename($filename, '.php');
+	}
+
+	return $func();
 }
 
 ?>
-- 
1.7.10.4


From 8abf94f3526d4c1a7fa846b72a0ce64e0d2d03db Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Fri, 14 Sep 2007 01:29:12 -0400
Subject: [PATCH 12/16] file_run now REQUIRES that the main function have
 _main suffix

---
 file_run.php |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/file_run.php b/file_run.php
index bca5c18..e177797 100644
--- a/file_run.php
+++ b/file_run.php
@@ -39,9 +39,6 @@
 function file_run($filename) {
 	require_once($filename);
 	$func = basename($filename, '.php') . '_main';
-	if(!function_exists($func)) {
-		$func = basename($filename, '.php');
-	}
 
 	return $func();
 }
-- 
1.7.10.4


From 6c27f346217f7b4b8b24064371f2461cf57c6167 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Mon, 17 Sep 2007 23:05:30 -0400
Subject: [PATCH 13/16] fixed file_run to use _main postfix, added
 enc_url_path(), enc_ddmmyyyhhmm(), allowed : in
 subjects

---
 email.php    |    2 +-
 encode.php   |   21 +++++++++++++++++++++
 file_run.php |    4 ++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/email.php b/email.php
index 8140ded..b3d4925 100644
--- a/email.php
+++ b/email.php
@@ -44,7 +44,7 @@ function email($from, $to, $subject, $message, $cc = '', $bcc = '') {
 	if($to   == '') { return 2; }
 
 	#FIXME should allow many more characters here
-	$subject = ereg_replace("[^a-zA-Z _'.-]", '_', $subject);
+	$subject = ereg_replace("[^a-zA-Z _'.:-]", '_', $subject);
 
 	$headers = "From: $from";
 	if($cc) {
diff --git a/encode.php b/encode.php
index 3f4119c..123fcc9 100644
--- a/encode.php
+++ b/encode.php
@@ -50,6 +50,15 @@ function enc_html($str) {
 	return $str;
 }
 
+# Encode for output in html. converts \n to <br />
+#
+# Example: <p>~foo.html~</p>
+function enc_htmlbr($str) {
+	$str = enc_html($str);
+	$str = str_replace("\n", "<br />\n", $str);
+	return $str;
+}
+
 
 # HTML attribute.
 #
@@ -67,6 +76,14 @@ function enc_url_val($str) {
 	return rawurlencode($str);
 }
 
+# FIXME
+function enc_url_path($str) {
+	$str = rawurlencode($str);
+	$str = str_replace('%2F', '/', $str);
+	return $str;
+}
+
+
 # This is a hack to work around html's stupid syntax for checkboxes.
 #
 # Place the template marker just before a " somewhere.
@@ -99,6 +116,10 @@ function enc_upper($str) {
 	return strtoupper($str);
 }
 
+function enc_ddmmyyyyhhmm($seconds) {
+	return date('m/d/Y g:ia', (int)$seconds);
+}
+
 
 # display <option>s
 function enc_states($str) {
diff --git a/file_run.php b/file_run.php
index 409cb4b..fd1d20f 100644
--- a/file_run.php
+++ b/file_run.php
@@ -32,14 +32,14 @@
 #
 # the file db_password.php would be like so:
 #
-#     function db_password() {
+#     function db_password_main() {
 #           return array('me', 'secret');
 #     }
 
 function file_run($filename) {
     require_once($filename);
     ereg_replace('.*/', '', $filename);
-    $func = basename($filename, '.php');
+    $func = basename($filename, '.php') . '_main';
     return $func();
 }
 
-- 
1.7.10.4


From 3f99dbe42925b8b208ae6e46db803c89fd7851c1 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Mon, 24 Sep 2007 00:28:19 -0400
Subject: [PATCH 14/16] updated coding conventions and fixed states pulldown

---
 metaform/template.html |    2 +-
 metaform/template.php  |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/metaform/template.html b/metaform/template.html
index a7d84d5..a4c088e 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -36,7 +36,7 @@
   <form action="~form_name~.html~enctype_attr~" method="post"><!--~opt_db_2 start~--><!--~~editing start~~--><input type="hidden" name="~form_name~_edit_id" value="~~~form_name~_edit_id.attr~~" /><!--~~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~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td class="field"><input type="text" name="~name~" value="~~~name~.attr~~" /></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="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~html start~--><td class="caption">~caption.html~: </td><td></td></tr><tr><td colspan="2"><textarea 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~--><!--~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~-->
+      <tr><!--~image start~--><td class="caption">~caption.html~: </td><td class="field"><input type="file" name="~name~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td class="field"><input type="text" name="~name~" value="~~~name~.attr~~" /></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="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~html start~--><td class="caption">~caption.html~: </td><td></td></tr><tr><td colspan="2"><textarea 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~-->
     </table>
   </form>
 <!--~end~--><!--~~end~~-->
diff --git a/metaform/template.php b/metaform/template.php
index e86d791..14f88f1 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,7 +38,7 @@ 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~-->
@@ -78,7 +78,7 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100
 	return true;
 }
 <!--~end~-->
-function ~form_name~() {<!--~opt_http_pass_2 start~-->
+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 . '"');
-- 
1.7.10.4


From 3d3f38fd9c635eb6f3692f9ef2edc73868d9b19f Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Mon, 24 Sep 2007 00:32:54 -0400
Subject: [PATCH 15/16] added Makefile to examples (for tags generation)

---
 examples/Makefile |    2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 examples/Makefile

diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644
index 0000000..ef83502
--- /dev/null
+++ b/examples/Makefile
@@ -0,0 +1,2 @@
+tags: *.php code/*.php code/wfpl/*.php
+	exuberant-ctags --append=yes $?
-- 
1.7.10.4


From 23c64154ddfa4a201580dcca00f38b5b637ede24 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason183@herkamire.com>
Date: Mon, 24 Sep 2007 00:35:14 -0400
Subject: [PATCH 16/16] ubuntu name for exuberant-ctags

---
 examples/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/Makefile b/examples/Makefile
index ef83502..7a3c515 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -1,2 +1,2 @@
 tags: *.php code/*.php code/wfpl/*.php
-	exuberant-ctags --append=yes $?
+	ctags-exuberant --append=yes $?
-- 
1.7.10.4