X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=d45ade3b2444138c8d823526e261f8f16d65e9ec;hb=1a0e260f9a2c232864f79330c112512531cc6f42;hp=759adb9242f37fa6f1268c43423b1f0b292a002b;hpb=e057305351d93155bf9f0d2c664b6eb859d83bf4;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 759adb9..d45ade3 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -1,6 +1,6 @@
 <?php
 
-# This form requires wfpl. See: http://jasonwoof.org/wfpl
+# This form requires wfpl. See: http://sametwice.com/wfpl
 
 # This form was initially auto-generated. If you would like to alter the
 # parameters and generate a new one try this URL:
@@ -32,9 +32,9 @@ $GLOBALS['~name~_thumb_max_height'] = '70';
 $GLOBALS['~name~_file_name'] = uniqid() . getmypid() . '.jpg'; # comment this out to use uploader's filename
 ~}~~}~
 
-require_once(__DIR__.'/'.'code/wfpl/format.php');
-require_once(__DIR__.'/'.'code/wfpl/email.php');~uploads_include {~
-require_once(__DIR__.'/'.'code/wfpl/upload.php');~}~
+require_once(__DIR__.'/'.'inc/wfpl/format.php');~opt_email {~
+require_once(__DIR__.'/'.'inc/wfpl/email.php');~}~~uploads_include {~
+require_once(__DIR__.'/'.'inc/wfpl/upload.php');~}~
 
 $GLOBALS['~file_name~_field_to_caption'] = array(~name_to_caption {~
 	'~name~' => '~caption phpsq~'~ sep {~,~}~~}~
@@ -148,7 +148,7 @@ function ~file_name~_main_delete($id) {
 }~}~~opt_listing {~
 
 function ~file_name~_csv_download() {
-	require_once(__DIR__.'/'.'code/wfpl/csv.php');
+	require_once(__DIR__.'/'.'inc/wfpl/csv.php');
 	$rows = db_get_rows('~table_name~', 'id,'.~file_name upper~_DB_FIELDS, 'order by id');
 	$fields = explode(',', 'id,'.~file_name upper~_DB_FIELDS);
 	$header = array();
@@ -235,10 +235,7 @@ function ~file_name~_main_form($id = false) {~pulldowns {~
 				return './~file_name~~opt_db unset {~_thanks~}~';~}~
 			}
 		}
-		# otherwise, we display the form again. We've got the form field
-		# values in $data and will put those back in the filds below. You
-		# should add some message asking people to fix their entry in
-		# whatever way you require.~opt_db {~
+		# else fall through to display the form again. Field values are in $data~opt_db {~
 	} elseif ($id) {
 		# we've recieved an edit id, but no data. So we grab the values to be edited from the database
 		$data = db_get_assoc('~table_name~', ~file_name upper~_DB_FIELDS, 'where id=%i', $id);~}~