X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform%2Ftemplate.php;h=086c642f5139fe4524ad4dbbee4a2eec25ff9fc9;hb=d3416270f26f08e34ff1748e1ee1fef7a15e79db;hp=7b278af626235f88b43ce4f9f3eb2abde8b99ddf;hpb=773f0503acf641558ed477ff8447118c67c0c179;p=wfpl.git

diff --git a/metaform/template.php b/metaform/template.php
index 7b278af..086c642 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -35,11 +35,8 @@ $GLOBALS['~name~_thumb_max_height'] = '70';
 $GLOBALS['~name~_file_name'] = uniqid() . getmypid() . '.jpg'; # comment this out to use uploader's filename
 <!--~}~--><!--~}~-->
 
-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 {~-->
-require_once('code/db_connect.php');<!--~}~--><!--~uploads_include {~-->
+require_once('code/wfpl/email.php');<!--~uploads_include {~-->
 require_once('code/wfpl/upload.php');<!--~}~-->
 
 function ~file_name~_get_fields() {
@@ -95,7 +92,7 @@ function ~file_name~_display_listing($where = 'order by ~always_field~ limit 100
 <!--~}~-->
 function ~file_name~_main() {<!--~opt_pass {~-->
 	if(!logged_in_as_admin()) {
-		$GLOBALS['url'] = this_url();
+		$_REQUEST['url'] = this_url();
 		return 'admin_login';
 	}
 <!--~}~--><!--~opt_display {~-->
@@ -122,7 +119,7 @@ function ~file_name~_display_main() {
 }
 
 function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
-	pulldown('~name~', array('option 1', 'option 2', 'option 3'));
+	pulldown('~name~', array(array('op1', 'Option One'), array('op2', 'Option Two'), 'n/a'));
 <!--~}~--><!--~opt_db {~-->
 	$edit_id = format_int($_REQUEST['~file_name~_edit_id']);
 	unset($_REQUEST['~file_name~_edit_id']);