From 6b038bb1556e1b9790a49834817d0bdef530bfde Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Thu, 12 Feb 2009 22:13:20 -0500
Subject: [PATCH 01/16] metaform: default listing page now contains all
 non-huge failds

---
 metaform.php           |   37 +++++++++++++++++++++++++++++++++----
 metaform/template.html |    8 ++++++--
 metaform/template.php  |    6 +++---
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/metaform.php b/metaform.php
index f89e720..06bb7dd 100644
--- a/metaform.php
+++ b/metaform.php
@@ -222,6 +222,7 @@ function make_html($whole_file = true) {
 		if($input != 'hidden') {
 			$tem->show('row');
 		}
+
 		if($input == 'image' && !$uploads_output_already) {
 			$tem->show('uploads');
 			$tem->set('enctype_attr', '" enctype="multipart/form-data');
@@ -231,7 +232,8 @@ function make_html($whole_file = true) {
 			$tem->set('html_field_name', $name);
 			$tem->show('replace_textarea');
 		}
-		if($GLOBALS['opt_display']) {
+
+		if($GLOBALS['opt_display'] == 'Yes') {
 			switch($input) {
 				case 'checkbox':
 				case 'leftcheck':
@@ -251,6 +253,16 @@ function make_html($whole_file = true) {
 			}
 			$tem->show('display_row');
 		}
+
+		if($GLOBALS['opt_listing'] == 'Yes') {
+			if($GLOBALS['opt_display'] != 'Yes') {
+				$tem->show('opt_display_a_else');
+			}
+			if(show_in_listing($type, $input, $format, $sql)) {
+				$tem->show('listing_head_col');
+				$tem->show('listing_row_col');
+			}
+		}
 	}
 
 	if($GLOBALS['opt_db'] == 'Yes') {
@@ -261,9 +273,6 @@ function make_html($whole_file = true) {
 	}
 
 	if($GLOBALS['opt_listing'] == 'Yes') {
-		if($GLOBALS['opt_display'] != 'Yes') {
-			$tem->show('opt_display_a_else');
-		}
 		$tem->show('opt_listing_1');
 	}
 
@@ -300,6 +309,19 @@ function view_html() {
 	echo make_html();
 }
 
+function show_in_listing($type, $input, $format, $sql) {
+	switch($input) {
+		case 'submit':
+		case 'hidden':
+		case 'password':
+		case 'textarea':
+		case 'html':
+			return false;
+		default:
+			return true;
+	}
+}
+
 
 function make_php() {
 	$tem = new tem();
@@ -341,6 +363,13 @@ function make_php() {
 			}
 			$tem->show('tem_sets');
 		}
+
+		if($GLOBALS['opt_listing'] == 'Yes') {
+			if(show_in_listing($type, $input, $format, $sql)) {
+				$tem->show('listing_fields_1');
+				$tem->show('listing_fields_2');
+			}
+		}
 	}
 
 	$tem->set('always_field', $always_field);
diff --git a/metaform/template.html b/metaform/template.html
index de12f03..dbb1d8d 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -84,8 +84,12 @@
   <!--~~populated_listing start~~-->
   <p><a href="~form_name~?~form_name~_new=1">[Add a new ~singular~]</a></p>
 
-  <table cellspacing="0" cellpadding="4" border="1" summary=""><!--~~listing_row start~~-->
-  <tr><td class="listing"><a href="~form_name~?~form_name~_<!--~opt_display_a_else start~-->edit_<!--~end~-->id=~~id~~">~~~always_field~.html~~</a></td><td><a href="~form_name~?~form_name~_delete_id=~~id~~" onclick="return confirm('Permanently delete?')">[delete this ~singular~]</a></td></tr><!--~~end~~-->
+  <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~.html~~</a></td><!--~end~-->
+      <td><a href="~form_name~?~form_name~_delete_id=~~id~~" onclick="return confirm('Permanently delete?')">[delete this ~singular~]</a></td>
+    </tr><!--~~end~~-->
 
   </table>
   <!--~~end~~-->
diff --git a/metaform/template.php b/metaform/template.php
index be61e2f..b9c1097 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -62,7 +62,7 @@ function ~form_name~_tem_sets(~php_fields~) {<!--~tem_sets start~-->
 <!--~opt_listing_2 start~-->
 # You may pass a "where clause" for the db query.
 function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100') {
-	$rows = db_get_rows('~form_name~', 'id,~always_field~', $where);
+	$rows = db_get_rows('~form_name~', 'id<!--~listing_fields_1 start~-->,~name~<!--~end~-->', $where);
 	if($rows == false || count($rows) == 0) {
 		tem_show('empty_listing');
 		tem_show('listings');
@@ -70,12 +70,12 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100
 	}
 
 	foreach($rows as $row) {
-		list($id, $~always_field~) = $row;
+		list($id<!--~listing_fields_2 start~-->, $~name~<!--~end~-->) = $row;
 		tem_set('id', $id);
 		if($~always_field~ == '') {
 			$~always_field~ = '--';
 		}
-		tem_set('~always_field~', $~always_field~);
+		~form_name~_tem_sets(~php_fields~);
 		tem_show('listing_row');
 	}
 	tem_show('populated_listing');
-- 
1.7.10.4


From 48bc8c7ca2448555a225b5996effcc9d41bdcfed Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Thu, 12 Feb 2009 23:00:33 -0500
Subject: [PATCH 02/16] metaform: added pretty-printing for checkboxes and
 dates to listing

---
 metaform.php           |    5 +++++
 metaform/template.html |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/metaform.php b/metaform.php
index 06bb7dd..ecde564 100644
--- a/metaform.php
+++ b/metaform.php
@@ -259,6 +259,11 @@ function make_html($whole_file = true) {
 				$tem->show('opt_display_a_else');
 			}
 			if(show_in_listing($type, $input, $format, $sql)) {
+				if($format == 'bool' || $format == 'yesno') {
+					$tem->set('listing_enc', 'yesno');
+				} elseif($input == 'date') {
+					$tem->set('listing_enc', 'mmddyyyy');
+				}
 				$tem->show('listing_head_col');
 				$tem->show('listing_row_col');
 			}
diff --git a/metaform/template.html b/metaform/template.html
index dbb1d8d..8f0890c 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -87,7 +87,7 @@
   <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~.html~~</a></td><!--~end~-->
+      <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>
     </tr><!--~~end~~-->
 
-- 
1.7.10.4


From 2deeeff570acf50071180f79040b9f685aea7603 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Fri, 13 Feb 2009 15:07:53 -0500
Subject: [PATCH 03/16] metaform: fixed typo (display of date format hint was
 wrong)

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

diff --git a/metaform/template.html b/metaform/template.html
index 8f0890c..2206620 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -74,7 +74,7 @@
   <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~-->
     <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~~" /> dd/mm/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~-->
+      <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~-->
     </table>
   </form>
 <!--~end~--><!--~~end~~-->
-- 
1.7.10.4


From 88edfcf26c7b4cdbd083dede0834de5cf6f16999 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Wed, 11 Mar 2009 21:25:21 -0400
Subject: [PATCH 04/16] added http_cache_forever()

---
 http.php |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/http.php b/http.php
index b82e3d1..1abd50b 100644
--- a/http.php
+++ b/http.php
@@ -92,4 +92,11 @@ function redirect($url, $status = '302 Moved Temporarily', $message = '') {
 	exit();
 }
 
+# output http headers to allow caching of this page forever
+function http_cache_forever($cache_control = 'public') {
+	header('Last-Modified: '.gmdate('D, d M Y H:i:s', 5025) . ' GMT'); # long time ago
+	header("Cache-Control: $cache_control");
+	header('Expires: ' . gmdate('D, d M Y H:i:s',time()+31536000) . ' GMT'); # rfc 2616 says not to go more than a year in the future
+}
+
 ?>
-- 
1.7.10.4


From bf91aed8316e74c8d80c1c4b5e4645eeb6ba9dcd Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Thu, 19 Mar 2009 04:22:08 -0400
Subject: [PATCH 05/16] CONFLICT WARNING: added: logged_in() and
 logged_in_as_admin()

---
 session.php |   21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/session.php b/session.php
index b36af68..9dc3f4e 100644
--- a/session.php
+++ b/session.php
@@ -125,8 +125,13 @@ function session_exists() {
 	return true;
 }
 
-# return username if a session exists and is authenticated
+# depricated
 function session_exists_and_authed() {
+	return logged_in();
+}
+
+# return username if a session exists and is authenticated
+function logged_in() {
 	if(!session_exists()) {
 		return false;
 	}
@@ -135,6 +140,20 @@ function session_exists_and_authed() {
 }
 
 
+
+# return username if a session exists and is authenticated
+function logged_in_as_admin() {
+	if(!session_exists()) {
+		return false;
+	}
+
+	if(session_get('auth_admin')) {
+		return true;
+	}
+	return false;
+}
+
+
 # find existing session, or make one
 function init_session() {
 	if(!session_exists()) {
-- 
1.7.10.4


From 7596b1ca035ff09e584e915a6e5572ffb46d7625 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Fri, 10 Apr 2009 01:12:54 -0400
Subject: [PATCH 06/16] API CHANGE for cms integration. Instead of calling
 cms_get() which should return a hash, we create the
 template from template.html and pass that to
 cms_display()

---
 run.php |   33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/run.php b/run.php
index b5b91a1..09b51b5 100644
--- a/run.php
+++ b/run.php
@@ -84,12 +84,24 @@ function run_php($dest = false) {
 	$html_exists = file_exists($html_file);
 	$php_exists = file_exists($php_file);
 
+	if(file_exists('template.html')) {
+		$GLOBALS['wfpl_main_template'] = new tem();
+		$GLOBALS['wfpl_main_template']->load("template.html");
+		$GLOBALS['wfpl_main_template']->set('basename', $basename);
+
+		# This helps put in a stylesheet link if you have pages with custom css
+		if(file_exists("$basename.css")) {
+			$GLOBALS['wfpl_main_template']->set('css_link', "$basename.css");
+			$GLOBALS['wfpl_main_template']->sub('css_links');
+		}
+	}
+
 	# cms_get can return one of:
 	# 1) false to indicate that there's no cms content for this basename
 	# 2) a string to indicate a soft/full redirect just as foo_main()
 	# 3) a hash of key/value pairs to be tem_set(key,value) on the template
-	if(function_exists('cms_get')) {
-		$cms_content = cms_get($basename);
+	if(function_exists('cms_display')) {
+		$cms_content = cms_display($basename, $GLOBALS['wfpl_main_template']);
 		if(is_string($cms_content)) {
 			run_php($cms_content);
 			return;
@@ -134,24 +146,13 @@ function run_php($dest = false) {
 
 	# 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();
-			$tem->load("template.html");
-			$tem->set('basename', $basename);
-			if($cms_content) foreach($cms_content as $name => $val) {
-				$tem->append($name, $val);
-			}
+		if(isset($GLOBALS['wfpl_main_template'])) {
 			$sections = tem_top_subs();
 			if($sections) foreach($sections as $name => $val) {
-				$tem->append($name, $val);
-			}
-
-			if(file_exists("$basename.css")) {
-				$tem->set('css_link', "$basename.css");
-				$tem->sub('css_links');
+				$GLOBALS['wfpl_main_template']->append($name, $val);
 			}
 
-			$GLOBALS['wfpl_template'] = $tem;
+			$GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
 		}
 
 		if(function_exists('display_messages')) {
-- 
1.7.10.4


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 07/16] 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


From de71c4c4768f8f464ff61cfda3f8e31d20d2b0b0 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Wed, 6 May 2009 14:17:19 -0400
Subject: [PATCH 08/16] run.php sets GLOBALS[basename] and handles 404 better

---
 run.php |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/run.php b/run.php
index 09b51b5..bbf2ce6 100644
--- a/run.php
+++ b/run.php
@@ -78,6 +78,8 @@ function run_php($dest = false) {
 		}
 	}
 
+	$GLOBALS['basename'] = $basename;
+
 	$html_file = "$basename.html";
 	$php_file = "$basename.php";
 
@@ -112,11 +114,13 @@ function run_php($dest = false) {
 
 	if(!$php_exists && !$html_exists && !$cms_content) {
 		header('HTTP/1.0 404 File Not Found');
-		if(file_exists('404.php') || file_exists('404.html')) {
-			run_php('404');
+		if(file_exists('error_404.php') || file_exists('error_404.html')) {
+			$GLOBALS['error_basename'] = $basename;
+			run_php('error_404');
 			return;
 		} 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>';
+			exit();
 		}
 	}
 
-- 
1.7.10.4


From f22b600c925131bb767db73d77dc595f18a1406a Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Tue, 5 May 2009 12:59:39 -0400
Subject: [PATCH 09/16] fixed metaform so the variables in the generated html
 template for the listing are encoded properly

---
 metaform.php           |    2 ++
 metaform/template.html |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/metaform.php b/metaform.php
index a556f1a..b2d3c21 100644
--- a/metaform.php
+++ b/metaform.php
@@ -272,6 +272,8 @@ function make_html($whole_file = true) {
 					$tem->set('listing_enc', 'yesno');
 				} elseif($input == 'date') {
 					$tem->set('listing_enc', 'mmddyyyy');
+				} else {
+					$tem->set('listing_enc', 'html');
 				}
 				$tem->show('listing_head_col');
 				$tem->show('listing_row_col');
diff --git a/metaform/template.html b/metaform/template.html
index 3dd3abb..68dac08 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -85,7 +85,7 @@
   <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~~-->
+    <!--~listing_head_col start~--><th>~caption~</th><!--~end~--><th>&nbsp;</th><!--~~listing_row start~~-->
     <tr><!--~listing_row_col start~-->
       <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>
-- 
1.7.10.4


From 423f31ad0add74bbb6066d3c9f760ad0a5580cda Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Thu, 28 May 2009 06:25:22 -0400
Subject: [PATCH 10/16] revamped uploaded image handling, added thumbnailing
 support to metaform

---
 encode.php             |   29 +++++++-
 format.php             |   34 ++++++++-
 metaform.php           |   30 +++++---
 metaform/template.html |    6 +-
 metaform/template.php  |   12 ++-
 upload.php             |  194 ++++++++++++++++++++++++++++++++++++++----------
 6 files changed, 248 insertions(+), 57 deletions(-)

diff --git a/encode.php b/encode.php
index 273d026..9aa09a6 100644
--- a/encode.php
+++ b/encode.php
@@ -342,4 +342,31 @@ function enc_evenodd($values, $name) {
 	}
 }
 
-?>
+function enc_image_src($str) {
+	list($src, $width, $height, $a, $b, $c) = explode(' ', $str);
+	return $src;
+}
+
+function enc_image_width($str) {
+	list($src, $width, $height, $a, $b, $c) = explode(' ', $str);
+	return $width;
+}
+
+function enc_image_height($str) {
+	list($src, $width, $height, $a, $b, $c) = explode(' ', $str);
+	return $height;
+}
+
+function enc_thumb_src($str) {
+	list($a, $b, $c, $src, $width, $height) = explode(' ', $str);
+	return $src;
+}
+
+function enc_thumb_width($str) {
+	list($a, $b, $c, $src, $width, $height) = explode(' ', $str);
+	return $width;
+}
+function enc_thumb_height($str) {
+	list($a, $b, $c, $src, $width, $height) = explode(' ', $str);
+	return $height;
+}
diff --git a/format.php b/format.php
index f90fc1f..f931cdd 100644
--- a/format.php
+++ b/format.php
@@ -112,24 +112,50 @@ function format_filename($str, $allow_uppercase = false) {
 	return ereg_replace('^[.-]', '_', $str);
 }
 
+function format_path($str, $allow_uppercase = false) {
+	if(!$allow_uppercase) {
+		$str = strtolower($str);
+	}
+	$str = ereg_replace('[^a-zA-Z0-9_./-]', '_', $str);
+	return ereg_replace('^[.-]', '_', $str);
+}
+
 function client_path_to_filename($path) {
 	$filename = ereg_replace(".*[:/\\]", '', $path);
 	return format_filename($filename, true);
 }
 
 
-function format_h_w_image($str) {
+function format_image_w_h($str) {
 	$fields = explode(' ', $str);
 	if(count($fields) != 3) {
 		return '';
 	}
 
-	list($width, $height, $filename) = $fields;
+	list($filename, $width, $height) = $fields;
+	$filename = format_path($filename);
+	$width = format_int_0($width);
+	$height = format_int_0($height);
+
+	return "$filename $width $height";
+}
+
+function format_image_w_h_thumb_w_h($str) {
+	$fields = explode(' ', $str);
+	if(count($fields) != 6) {
+		die('count: ' . count($fields));
+		return '';
+	}
+
+	list($filename, $width, $height, $thumb_filename, $thumb_width, $thumb_height) = $fields;
+	$filename = format_path($filename);
 	$width = format_int_0($width);
 	$height = format_int_0($height);
-	$filename = format_filename($filename);
+	$thumb_filename = format_path($thumb_filename);
+	$thumb_width = format_int_0($thumb_width);
+	$thumb_height = format_int_0($thumb_height);
 
-	return "$width $height $filename";
+	return "$filename $width $height $thumb_filename $thumb_width $thumb_height";
 }
 
 function format_varname($str) {
diff --git a/metaform.php b/metaform.php
index b2d3c21..04e786a 100644
--- a/metaform.php
+++ b/metaform.php
@@ -51,7 +51,8 @@ $GLOBALS['types'] = array(
 	'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
 	'yesno' =>      array('leftcheck',   'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
-	'image' =>      array('image',       'oneline',    'varchar(200)'),
+	'image' =>      array('image',       'oneline',    'varchar(120)'),
+	'thumb' =>      array('image',       'oneline',    'varchar(240)'),
 	'submit' =>     array('submit',      'oneline',    'n/a')
 );
 
@@ -244,6 +245,9 @@ function make_html($whole_file = true) {
 
 		if($GLOBALS['opt_display'] == 'Yes') {
 			switch($input) {
+				case 'image':
+					$tem->show('display_image');
+				break;
 				case 'checkbox':
 				case 'leftcheck':
 					$tem->show('display_yesno');
@@ -270,10 +274,15 @@ function make_html($whole_file = true) {
 			if(show_in_listing($type, $input, $format, $sql)) {
 				if($format == 'bool' || $format == 'yesno') {
 					$tem->set('listing_enc', 'yesno');
+					$tem->show('listing_value_enc');
 				} elseif($input == 'date') {
 					$tem->set('listing_enc', 'mmddyyyy');
+					$tem->show('listing_value_enc');
+				} elseif($type == 'thumb') {
+					$tem->show('listing_value_thumb');
 				} else {
 					$tem->set('listing_enc', 'html');
+					$tem->show('listing_value_enc');
 				}
 				$tem->show('listing_head_col');
 				$tem->show('listing_row_col');
@@ -333,11 +342,13 @@ function show_in_listing($type, $input, $format, $sql) {
 		case 'textarea':
 		case 'html':
 			return false;
-		default:
-			return true;
 	}
-}
+	if($type == 'image') {
+		return false;
+	}
 
+	return true;
+}
 
 function make_php() {
 	$tem = new tem();
@@ -364,8 +375,13 @@ function make_php() {
 				$php_fields .= '$' . $name;
 			}
 			if($input == 'image') {
+				if($type == 'thumb') {
+					$tem->show('thumb_settings');
+					$tem->show('thumb_upload_params');
+					$tem->show('thumb_w_h');
+				}
+				$tem->show('image_settings');
 				$tem->show('image_upload');
-				$tem->show('image_db');
 				if(!$image_included_yet) {
 					$tem->show('image_include');
 					$tem->show('upload_max');
@@ -438,7 +454,6 @@ function view_php() {
 	echo make_php();
 }
 
-
 function make_email() {
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.email.txt');
@@ -474,7 +489,6 @@ function view_email() {
 	echo make_email();
 }
 
-
 function preview() {
 	tem_load('code/wfpl/metaform/preview.html');
 	tem_set('file_name', $GLOBALS['file_name']);
@@ -523,5 +537,3 @@ function download_tar() {
 
 metaform();
 exit();
-
-?>
diff --git a/metaform/template.html b/metaform/template.html
index 68dac08..0c5c774 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -49,7 +49,9 @@
 <!--~~display_body start~~-->
   <h2>~singular.cap~ details</h2>
     <table border="0" cellpadding="3" cellspacing="0" summary="">
-<!--~display_row start~--><!--~display_yesno start~-->
+<!--~display_row start~--><!--~display_image start~-->
+      <tr><td class="caption">~caption.html~:</td><td><img src="~~~name~.image_src~~" width="~~~name~.image_width~~" height="~~~name~.image_height~~" alt="" /></td></tr>
+<!--~end~--><!--~display_yesno start~-->
       <tr><td class="caption">~caption.html~:</td><td>~~~name~.yesno~~</td></tr>
 <!--~end~--><!--~display_date start~-->
       <tr><td class="caption">~caption.html~:</td><td>~~~name~.mmddyyyy~~</td></tr>
@@ -87,7 +89,7 @@
   <table cellspacing="0" cellpadding="4" border="1" summary="">
     <!--~listing_head_col start~--><th>~caption~</th><!--~end~--><th>&nbsp;</th><!--~~listing_row start~~-->
     <tr><!--~listing_row_col start~-->
-      <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 class="listing"><a href="~file_name~?~file_name~_<!--~opt_display_a_else start~-->edit_<!--~end~-->id=~~id~~"><!--~listing_value_enc start~-->~~~name~.~listing_enc~~~<!--~end~--><!--~listing_value_thumb start~--><img src="~~~name~.thumb_src~~" width="~~~name~.thumb_width~~" height="~~~name~.thumb_height~~" alt="" /><!--~end~--></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~~-->
 
diff --git a/metaform/template.php b/metaform/template.php
index bdd7da1..1822ff3 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -25,7 +25,13 @@ define('~file_name.upper~_DB_FIELDS', '~db_fields~');
 # 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~-->
+<!--~end~--><!--~image_settings start~-->
+$GLOBALS['~name~_max_width'] = '400';
+$GLOBALS['~name~_max_height'] = '400';<!--~thumb_settings start~-->
+$GLOBALS['~name~_thumb_max_width'] = '70';
+$GLOBALS['~name~_thumb_max_height'] = '70';
+$GLOBALS['~name~_file_name'] = uniqid() . getmypid() . '.jpg'; # comment this out to use uploader's filename
+<!--~end~--><!--~end~--><!--~opt_http_pass_1 start~-->
 # Define the username and password required to view this form:
 define('AUTH_REALM', '~file_name~ administration area');
 define('AUTH_USER', 'fixme');
@@ -42,12 +48,12 @@ require_once('code/wfpl/upload.php');<!--~end~-->
 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']));
+		$~name~ = convert_uploaded_image('~name~', $GLOBALS['upload_directory'] . $GLOBALS['~name~_file_name'], $GLOBALS['~name~_max_width'], $GLOBALS['~name~_max_height']<!--~thumb_upload_params start~-->, $GLOBALS['~name~_thumb_max_width'], $GLOBALS['~name~_thumb_max_height']<!--~end~-->);
 	} else {
 		if($_REQUEST['delete_~name~'] == 'Yes') {
 			$~name~ = '';
 		} else {
-			$~name~ = format_filename($_REQUEST['old_~name~']);
+			$~name~ = format_image_w_h<!--~thumb_w_h start~-->_thumb_w_h<!--~end~-->($_REQUEST['old_~name~']);
 		}
 	}<!--~end~-->
 
diff --git a/upload.php b/upload.php
index 1bca71a..f52f0cf 100644
--- a/upload.php
+++ b/upload.php
@@ -116,12 +116,18 @@ function generate_filename($path, $mime = 'text/plain') {
 	# remove dots from the beginning (no invisible files)
 	$filename = ereg_replace('^\.*', '', $filename);
 
+	if(strlen($filename > 80)) {
+		$filename = substr($filename, -80);
+	}
+
 	# fix extension
 	$last_dot = strrpos($filename, '.');
 	if($last_dot === false) {
 		#no extension
 		if(isset($GLOBALS['mime_to_ext'][$mime])) {
 			$filename .= '.' . $GLOBALS['mime_to_ext'][$mime];
+		} else {
+			$filename .= '.bin';
 		}
 	} else {
 		$basename = substr($filename, 0, $last_dot);
@@ -138,15 +144,27 @@ function generate_filename($path, $mime = 'text/plain') {
 
 # Move uploaded file, and return the new filename.
 #
-# Pass in the index into the $_FILES array (the name of the html input tag) and
-# the path to the folder you'd like it saved to. If path ends with a slash this
-# function will generate a filename based on the client's name, otherwise it'll
-# name the file that.
+# $key: Pass in the index into the $_FILES array (the name of the html input tag) and
+# the path to the folder you'd like it saved to.
 #
-# example: save_uploaded_file('pdf', 'uploaded_pdfs/');
-# example: save_uploaded_file('resume', "/www/example.com/remumes/$user_id.txt");
+# $path: If path ends with a slash this function will generate a filename based
+# on the client's name. If it ends with a period, the dot will be removed and
+# the client's name appended. Otherwise $path will be used as the filename
+# exactly as is, even if extensions differ between the client's name and $path.
+#
+# where user uploads "c:\foo\Bar baz.PDF" at <input name="in" type="file" />
+#    save_uploaded_file('in', 'uploaded_pdfs/'); yeilds:
+#       "uploaded_pdfs/bar_baz.pdf"
+#    save_uploaded_file('in', 'uploaded_pdfs/prefix.'); yeilds:
+#       "uploaded_pdfs/prefixbar_baz.pdf"
+#    save_uploaded_file('in', 'uploaded_pdfs/qux.pdf'); yeilds:
+#       "uploaded_pdfs/qux.pdf"
 function save_uploaded_file($key, $path) {
-	if(substr($path, -1) == '/') {
+	$end = substr($path, -1);
+	if($end == '.' || $end == '/') {
+		if($end == '.') {
+			$path = substr($path, 0, -1);
+		}
 		$filename = $path . generate_filename($_FILES[$key]['name'], $_FILES[$key]['type']);
 	} else {
 		$filename = $path;
@@ -206,14 +224,8 @@ function gif_to_png($filename, $new_filename = 'just change extension') {
 		$new_filename .= '.png';
 	}
 
-	$convert = path_to('convert');
-
-	$command = "$convert " . escapeshellarg($filename) . ' ' . escapeshellarg($new_filename);
+	imagemagick_convert($filename, $new_filename, "$convert -colorspace RGB", 'GIF to PNG conversion');
 
-	exec($command, $dummy, $ret);
-	if($ret != 0) {
-		die("image conversion failed. convert did exit($ret)");
-	}
 	unlink($filename);
 	return $new_filename;
 }
@@ -235,26 +247,56 @@ function make_thumbnail($filename, $max_width = '70', $max_height = '70') {
 	$thumb .= '_thumb';
 	$thumb .= substr($filename, $last_dot);
 
-	$convert = path_to('convert');
+	$max_width = format_int_70($max_width);
+	$height_width = format_int_70($height_width);
 
-	# can't be too careful
-	$max_width = ereg_replace('[^0-9]', '', $max_width);
-	if($max_width == '') {
-		$max_width = '70';
-	}
-	$max_height = ereg_replace('[^0-9]', '', $max_height);
-	if($max_height == '') {
-		$max_height = '70';
-	}
+	imagemagick_convert($filename, $thumb, "-geometry ${max_width}x$max_height", 'Thumbnail creation');
 	
-	$command = "$convert -geometry ${max_width}x$max_height " . escapeshellarg($filename) . ' ' . escapeshellarg($thumb);
+	return $thumb;
+}
 
+function exec_or_die($command, $doing_what) {
 	exec($command, $dummy, $ret);
 	if($ret != 0) {
-		die("Thumbnail creation failed. Convert called exit($ret)");
+		$base = basename(ereg_replace(' .*', '', $command));
+		die("$doing_what failed. $base called exit($ret)");
 	}
+}
 
-	return $thumb;
+# exec convert from imagemagick.
+function imagemagick_convert($in_filename, $out_filename, $args, $doing_what = "Image conversion") {
+	$in = escapeshellarg($in_filename);
+	$out = escapeshellarg($out_filename);
+	$command = path_to('convert') . " $in $args $out";
+
+	exec_or_die($command, $doing_what);
+}
+
+# exec mogrify from imagemagick.
+function imagemagick_mogrify($in_filename, $args, $doing_what = "Image conversion") {
+	$command = path_to('mogrify') . " $args " . escapeshellarg($in_filename);
+
+	exec_or_die($command, $doing_what);
+}
+
+function format_int_70($str) {
+	$str = ereg_replace('[^0-9]', '', $str);
+	if($str == '') {
+		$str = '70';
+	}
+	return $str;
+}
+	
+
+# Resize image.
+#
+# The image will retain aspect ratio, and be either $max_width wide or
+# $max_height tall (or, if the aspect is just right, both)
+function resize_image($filename, $max_width = '70', $max_height = '70') {
+	$max_width = format_int_70($max_width);
+	$height_width = format_int_70($height_width);
+	
+	imagimagick_mogrify($filename, "-geometry ${max_width}x$max_height");
 }
 
 # Argument: path to image file
@@ -273,19 +315,95 @@ function image_dimensions($image) {
 	}
 }
 
-# like save_uploaded_file() (above) except it converts gifs to pngs.
+# return an array of the width and height of the image passed.
+# calls die() if this can't be done for any reason.
+function image_w_h_or_die($filename) {
+	$wxh = image_dimensions($filename);
+	if($wxh == false) {
+		die("couldn't git image dimensions of $filename");
+	}
+	$wh = explode('x', $wxh);
+	if(count($wh) != 2) {
+		die("image $filename seems to have " . count($wh) . ' dimensions');
+	}
+	return $wh;
+}
+
+
+# Like save_uploaded_file() (above) except that it converts all images to PNG
+# or JPEG, converts to RGB colorspace, and optionally scales and/or creates a
+# thumbnail. And, if $path ends with a period, the correct extension will be
+# appended.
 #
-# FIXME: if a filename is passed in the end of path, we should check if the file type matches, and if not run convert.
-function save_uploaded_image($key, $path) {
-	if(substr($path, -1) == '/') {
-		$filename = save_uploaded_file($key, $path);
-		if(substr($filename, -4) == '.gif') {
-			$filename = gif_to_png($filename);
-		}
-		return $filename;
+# You are encouraged to use convert_uploaded_image() instead of this function,
+# because it has a more useful return value.
+#
+# If the image_width and image_height parameters are above zero, then the image
+# will be scaled (see below).
+#
+# If the thumb_width and thumb_height parameters are above zero, then a 2nd
+# image will be created and scaled (see below) with the same name, except
+# having "_thumb" added before the extension.
+#
+# Scaling: images are scaled (maintaining the aspect ratio) so they are as big
+# as possible without either dimension being larger than what you specify.
+#
+# This function just returns the name of the main image. To get the dimensions
+# and names, call convert_uploaded_image().
+function save_uploaded_image($key, $path, $image_width = 0, $image_height = 0, $thumbnail_width = 0, $thumbnail_height = 0) {
+     $image_w_h_thumb_w_h = convert_uploaded_image($key, $path, $image_width, $image_height, $thumbnail_width, $thumbnail_height);
+     return ereg_replace(' .*', '', $image_w_h_thumb_w_h);
+}
+
+function ext_to_web_image_ext($in) {
+	if($in == 'png' || $in == 'gif') {
+		return 'png';
 	} else {
-		return save_uploaded_file($key, $path);
+		return 'jpg';
 	}
 }
 
-?>
+# this function is just like save_uploaded_image() above except that the return
+# value is a string like "filename width height" or (if you specified both
+# thumbnail dimensions) "image_filename image_width image_height thumb_filename
+# thumb_width thumb_height"
+#
+#
+# examples:
+#    convert_uploaded_image('image', 'uploads/', 500, 500);
+# 	    might return: "uploads/foo.jpg 500 400"
+#    convert_uploaded_image('image', 'uploads/', 500, 500, 70, 70);
+# 	    might return: "uploads/foo.jpg 500 400 uploads/foo_thumb.jpg 70 56"
+function convert_uploaded_image($key, $path, $image_width = 0, $image_height = 0, $thumb_width = 0, $thumb_height = 0) {
+	$ret = '';
+	$tmp_filename = save_uploaded_file($key, $path . '__.');
+	$ext_rpos = strrpos($tmp_filename, '.');
+	if($ext_rpos === false) {
+		die('save_uploaded_file() gave us a filename with no extension.');
+	}
+	$tmp_base = substr($tmp_filename, 0, $ext_rpos);
+	$tmp_ext = substr($tmp_filename, $ext_rpos + 1);
+	if(substr($path, -1) == '/') {
+		$filename = $path . substr($tmp_base, strlen($path) + 2);
+		$filename .= '.' . ext_to_web_image_ext($tmp_ext);
+	} elseif(substr($path, -1) == '.') {
+		$filename = $path . ext_to_web_image_ext($tmp_ext);
+	} else {
+		$filename = $path;
+	}
+
+	$convert_params = '-colorspace RGB';
+	if($image_width > 0 && $image_height > 0) {
+		$convert_params .= " -geometry ${image_width}x$image_height";
+	}
+	imagemagick_convert($tmp_filename, $filename, $convert_params);
+	unlink($tmp_filename);
+	list($w, $h) = image_w_h_or_die($filename);
+	$ret = "$filename $w $h";
+	if($thumb_width > 0 && $thumb_height > 0) {
+		$thumb_name = make_thumbnail($filename, $thumb_width, $thumb_height);
+		list($w, $h) = image_w_h_or_die($thumb_name);
+		$ret .= " $thumb_name $w $h";
+	}
+	return $ret;
+}
-- 
1.7.10.4


From 1920aba45e9151c51e555709e0d05da9aac01fc3 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Thu, 28 May 2009 06:27:07 -0400
Subject: [PATCH 11/16] fix run.php for case where [basename].php and
 template.html exist, but not [basename].html

---
 run.php |   23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/run.php b/run.php
index bbf2ce6..52aac2e 100644
--- a/run.php
+++ b/run.php
@@ -149,19 +149,32 @@ function run_php($dest = false) {
 	}
 
 	# Check for $GLOBALS['wfpl_template'] because it might have been set (or unset) by the php script.
-	if($GLOBALS['wfpl_template']) {
-		if(isset($GLOBALS['wfpl_main_template'])) {
-			$sections = tem_top_subs();
-			if($sections) foreach($sections as $name => $val) {
-				$GLOBALS['wfpl_main_template']->append($name, $val);
+	if($GLOBALS['wfpl_template'] || $GLOBALS['wfpl_main_template']) {
+		if($GLOBALS['wfpl_main_template']) {
+			# if there was a template for that page, and one for the whole
+			# site, copy all template sections that have been show()n to the
+			# site-wide template
+			if($GLOBALS['wfpl_template']) {
+				$sections = tem_top_subs();
+				if($sections) foreach($sections as $name => $val) {
+					$GLOBALS['wfpl_main_template']->append($name, $val);
+				}
 			}
 
 			$GLOBALS['wfpl_template'] = $GLOBALS['wfpl_main_template'];
 		}
 
+		# If you have a site-wide template (template.html) then messages will
+		# be displayed there. If you instead want messages displayed on your
+		# page, call display_messages() from your page_main().
+		#
+		# Either way, you'll need to require_once('code/wfpl/messages.php')
+		# or require_once('code/wfpl/session_messages.php'). code/config.php
+		# is a nice place to do this.
 		if(function_exists('display_messages')) {
 			display_messages();
 		}
+
 		tem_output();
 	}
 }
-- 
1.7.10.4


From 37e83a7d771b652435ae2a57efb0aeb988484642 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Fri, 29 May 2009 05:09:59 -0400
Subject: [PATCH 12/16] metaform: in generated php file: template sub-section
 html-editor so it propogates to template.html and
 only displays when the form does

---
 metaform.php           |    9 ++++++++-
 metaform/template.html |    4 ++--
 metaform/template.php  |    3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/metaform.php b/metaform.php
index 04e786a..ebd1f99 100644
--- a/metaform.php
+++ b/metaform.php
@@ -351,6 +351,7 @@ function show_in_listing($type, $input, $format, $sql) {
 }
 
 function make_php() {
+	$has_html_editors = false;
 	$tem = new tem();
 	$tem->load('code/wfpl/metaform/template.php');
 	$tem->set('file_name', $GLOBALS['file_name']);
@@ -389,7 +390,9 @@ function make_php() {
 					$image_included_yet = true;
 				}
 			} else {
-				if($input == 'pulldown') {
+				if($input == 'html') {
+					$has_html_editors = true;
+				} elseif($input == 'pulldown') {
 					$tem->show('pulldowns');
 					$tem->show('pulldown_format_extra');
 				}
@@ -406,6 +409,10 @@ function make_php() {
 		}
 	}
 
+	if($has_html_editors) {
+		$tem->show('show_extra_headers');
+	}
+
 	$tem->set('always_field', $always_field);
 	$tem->set('db_fields', $db_fields);
 	$tem->set('php_fields', $php_fields);
diff --git a/metaform/template.html b/metaform/template.html
index 0c5c774..473db8b 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title>~plural.cap~</title>
-  <link rel="stylesheet" href="style.css" type="text/css" /><!--~html_editor_headers start~-->
+  <link rel="stylesheet" href="style.css" type="text/css" /><!--~html_editor_headers start~--><!--~~extra_headers start~~-->
   <script type="text/javascript" src="code/tiny_mce/tiny_mce.js"></script>
   <script language="javascript" type="text/javascript">
 //<![CDATA[
@@ -29,7 +29,7 @@
       height: '550',
     });
 //]]>
-  </script><!--~end~-->
+  </script><!--~~end~~--><!--~end~-->
 </head>
 
 <body>
diff --git a/metaform/template.php b/metaform/template.php
index 1822ff3..9742f4e 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -226,7 +226,8 @@ function _~file_name~_main() {<!--~end~--><!--~opt_http_pass_2 start~-->
 		tem_show('edit_msg');
 	}
 
-	tem_show('form');
+	tem_show('form');<!--~show_extra_headers start~-->
+	tem_show('extra_headers');<!--~end~-->
 }
 
 ?>
-- 
1.7.10.4


From 7f42492ea33a8d43ee12089b97bd8c0693b293e0 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Tue, 2 Jun 2009 07:19:12 -0400
Subject: [PATCH 13/16] added enc_s()

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

diff --git a/encode.php b/encode.php
index 9aa09a6..cd1e0b4 100644
--- a/encode.php
+++ b/encode.php
@@ -370,3 +370,12 @@ function enc_thumb_height($str) {
 	list($a, $b, $c, $src, $width, $height) = explode(' ', $str);
 	return $height;
 }
+
+# example template: Length: ~length.html~ day~length.s~
+function enc_s($str) {
+	if($str == '1') {
+		return '';
+	}
+
+	return 's';
+}
-- 
1.7.10.4


From 608ecf965408645758cdca1e5f01ff5ac3eff166 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason@jasonwoof.com>
Date: Tue, 2 Jun 2009 11:15:39 -0400
Subject: [PATCH 14/16] cleaned up README a little

---
 README |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index f501698..61ebc9a 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
-WFPL (Well Factored PHP Library)
+wfpl (Well Factored PHP Library)
 
 wfpl is a collection of php functions that make it easy to create websites,
 including things that are tricky to do from scratch like editing databases.
 
 It includes:
 
-* A templating system (so all your data/markup can be in the .html file)
+* A templating system (so all your data/markup can be in html files)
 
 * An easy and secure database API
 
@@ -13,10 +13,10 @@ It includes:
   data.
 
 * metaform (early development) a page to auto-generate code for forms (html
-  template, php code, SQL code and even an e-mail template.)
+  template, PHP code, SQL code and even an e-mail template.)
 
 * Easy soft redirects (meaning that in your php code, you can easily specify
   that you'd like a different php file to handle this request.)
 
 
-wfpl is released under the Gnu GPL v3 or greater.
+wfpl is released under the GNU GPL v3 or greater.
-- 
1.7.10.4


From 28ea182162da1c22d16f93bc2cb5619c14e222a7 Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason@jasonwoof.com>
Date: Wed, 3 Jun 2009 01:00:35 -0400
Subject: [PATCH 15/16] added new_readable_password()

---
 misc.php    |    5 +----
 session.php |   18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/misc.php b/misc.php
index 1737a86..857f6db 100644
--- a/misc.php
+++ b/misc.php
@@ -67,15 +67,12 @@ function exec_pipe($command, $stdin) {
 }
 
 
-
-
-
-
 function unix_newlines($str) {
 	$str = str_replace("\r\n", "\n", $str);
 	return str_replace("\r", "\n", $str);
 }
 
+
 # return current year (all 4 digits)
 function this_year() {
 	return strftime('%Y');
diff --git a/session.php b/session.php
index 9dc3f4e..26523c2 100644
--- a/session.php
+++ b/session.php
@@ -26,7 +26,7 @@
 # GLOSSARY
 #
 # session_key  16 digit string identifying the session
-# session_id   integer id of the record in the "sessions" table of the database
+# session_id   integer id of the record in the "wfpl_sessions" table of the database
 # UNTIL_CLOSE  a constant passed as session length to indicate "until browser window closes"
 
 
@@ -130,6 +130,22 @@ function session_exists_and_authed() {
 	return logged_in();
 }
 
+
+# generate a random password using only letters and numbers that look
+# particularly unique
+function new_readable_password($length = 8) {
+	$character_set = "ABCDEFHJKLMNPQRTUVWXY34789";
+	$code = "";
+
+	# PHP 4.2.0 and up seed the random number generator for you.
+	# Lets hope that it seeds with something harder to guess than the clock.
+	while($length--) {
+		$code .= $character_set{mt_rand(0, 25)}; # inclusive
+	}
+
+	return $code;
+}
+
 # return username if a session exists and is authenticated
 function logged_in() {
 	if(!session_exists()) {
-- 
1.7.10.4


From 85176c05d844a9b3c693e3436d358cc1bf30b1eb Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason@jasonwoof.com>
Date: Sun, 14 Jun 2009 12:38:06 -0400
Subject: [PATCH 16/16] metaform: fixed bug with listing but no display page
 (some links got an extra _edit in them)

---
 metaform.php |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/metaform.php b/metaform.php
index ebd1f99..19e2168 100644
--- a/metaform.php
+++ b/metaform.php
@@ -268,9 +268,6 @@ function make_html($whole_file = true) {
 		}
 
 		if($GLOBALS['opt_listing'] == 'Yes') {
-			if($GLOBALS['opt_display'] != 'Yes') {
-				$tem->show('opt_display_a_else');
-			}
 			if(show_in_listing($type, $input, $format, $sql)) {
 				if($format == 'bool' || $format == 'yesno') {
 					$tem->set('listing_enc', 'yesno');
@@ -284,6 +281,10 @@ function make_html($whole_file = true) {
 					$tem->set('listing_enc', 'html');
 					$tem->show('listing_value_enc');
 				}
+
+				if($GLOBALS['opt_display'] != 'Yes') {
+					$tem->show('opt_display_a_else');
+				}
 				$tem->show('listing_head_col');
 				$tem->show('listing_row_col');
 			}
-- 
1.7.10.4