metaform: can set options for pulldown/radio

[wfpl.git] / metaform / template.php

diff --git a/metaform/template.php b/metaform/template.php
index 7b278af..d8f663b 100644 (file)
--- 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~', ~pulldown_options~);
 <!--~}~--><!--~opt_db {~-->
        $edit_id = format_int($_REQUEST['~file_name~_edit_id']);
        unset($_REQUEST['~file_name~_edit_id']);