metaform codegen: use tem_auto_unset()

[wfpl.git] / metaform / template.php

diff --git a/metaform/template.php b/metaform/template.php
index daf23ed..7b278af 100644 (file)
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -9,10 +9,10 @@
 
 
 # SETUP
-<!--~opt_email_1 {~-->
+<!--~opt_email {~-->
 # To send results by e-mail, all you have to do is set your e-mail address here:
 $GLOBALS['~file_name~_form_recipient'] = 'fixme@example.com';
-<!--~}~--><!--~opt_db_1 {~-->
+<!--~}~--><!--~opt_db {~-->
 # 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:
@@ -38,7 +38,7 @@ $GLOBALS['~name~_file_name'] = uniqid() . getmypid() . '.jpg'; # comment this ou
 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 {~-->
+require_once('code/wfpl/email.php');<!--~opt_db {~-->
 require_once('code/db_connect.php');<!--~}~--><!--~uploads_include {~-->
 require_once('code/wfpl/upload.php');<!--~}~-->
 
@@ -72,7 +72,7 @@ function ~file_name~_get_fields() {
        return $data;
 }
 
-<!--~opt_listing_2 {~-->
+<!--~opt_listing {~-->
 # You may pass a "where clause" for the db query.
 function ~file_name~_display_listing($where = 'order by ~always_field~ limit 100') {
        $rows = db_get_assocs('~table_name~', 'id<!--~listing_fields_1 {~-->,~name~<!--~}~-->', $where);
@@ -98,16 +98,13 @@ function ~file_name~_main() {<!--~opt_pass {~-->
                $GLOBALS['url'] = this_url();
                return 'admin_login';
        }
-<!--~}~--><!--~opt_display_1 {~-->
+<!--~}~--><!--~opt_display {~-->
        if(isset($_REQUEST['~file_name~_id'])) {
                return ~file_name~_display_main();
        } else {
                return ~file_name~_edit_main();
        }
-<!--~}~--><!--~opt_display_1_else {~-->
-       return ~file_name~_edit_main();
-<!--~}~-->
-}<!--~opt_display_2 {~-->
+}
 
 function ~file_name~_display_main() {
        $id = format_int($_REQUEST['~file_name~_id']);
@@ -122,11 +119,11 @@ function ~file_name~_display_main() {
                return './~file_name~';
        }
        tem_set('display', $row);
-}<!--~}~-->
+}
 
-function ~file_name~_edit_main() {<!--~pulldowns {~-->
+function ~file_name~_edit_main() {<!--~}~--><!--~pulldowns {~-->
        pulldown('~name~', array('option 1', 'option 2', 'option 3'));
-<!--~}~--><!--~opt_db_3 {~-->
+<!--~}~--><!--~opt_db {~-->
        $edit_id = format_int($_REQUEST['~file_name~_edit_id']);
        unset($_REQUEST['~file_name~_edit_id']);
        if($edit_id) {
@@ -145,26 +142,26 @@ function ~file_name~_edit_main() {<!--~pulldowns {~-->
                return './~file_name~';
        }
 
-       if(!$edit_id) {<!--~opt_listing_1 {~-->
+       if(!$edit_id) {<!--~opt_listing {~-->
                if(!isset($_REQUEST['~file_name~_new']) && !isset($_REQUEST['~always_field~'])) {
                        ~file_name~_display_listing();
                        return;
                }
 <!--~}~-->
                tem_set('new_msg', 'show');
-       }<!--~}~-->
-
+       }
+<!--~}~-->
        if(isset($_POST['~always_field~'])) {
                $data = ~file_name~_get_fields();
 
-               if("you're happy with the POSTed values") {<!--~opt_db_4 {~-->
+               if("you're happy with the POSTed values") {<!--~opt_db {~-->
                        if($edit_id) {
                                db_update_assoc('~table_name~', $data, 'where id=%i', $edit_id);
                                message('~singular cap~ updated.');
                        } else {
                                db_insert_assoc('~table_name~', $data);
                                message('~singular cap~ saved.');
-                       }<!--~}~--><!--~opt_email_2 {~-->
+                       }<!--~}~--><!--~opt_email {~-->
                        if($GLOBALS['~file_name~_form_recipient'] != 'fixme@example.com') {
                                $to = $GLOBALS['~file_name~_form_recipient'];
                                $from = 'noreply@~this_domain~';
@@ -196,7 +193,7 @@ function ~file_name~_edit_main() {<!--~pulldowns {~-->
                # 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 {~-->
+               # fix their entry in whatever way you require.<!--~opt_db {~-->
        } elseif($edit_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', $edit_id);<!--~}~-->