inserted missing ; in metaform php template

[wfpl.git] / metaform / template.php

diff --git a/metaform/template.php b/metaform/template.php
index e86d791..76ce31f 100644 (file)
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -15,8 +15,8 @@
 $GLOBALS['~form_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 a file called
-# 'db_connect.php' or 'code/db_connect.php' which calls db_connect() see:
+# (the file ~form_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:
@@ -38,15 +38,19 @@ 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 start~-->
-require_once('db_connect.php');<!--~end~--><!--~image_include 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~-->
        $~name~ = format_~format~($_REQUEST['~name~']<!--~pulldown_format_extra start~-->, '~name~'<!--~end~-->);<!--~end~--><!--~image_upload start~-->
-       if($_FILE['~name~'] && $_FILE['~name~']['error'] == 0) {
+       if($_FILES['~name~'] && $_FILES['~name~']['error'] == 0) {
                $~name~ = substr(save_uploaded_image('~name~', $GLOBALS['upload_directory']), strlen($GLOBALS['upload_directory']));
        } else {
-               $~name~ = format_filename($_REQUEST['old_~name~']);
+               if($_REQUEST['delete_~name~'] == 'Yes') {
+                       $name = '';
+               } else {
+                       $~name~ = format_filename($_REQUEST['old_~name~']);
+               }
        }<!--~end~-->
 
        ~form_name~_tem_sets(~php_fields~);
@@ -78,7 +82,15 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100
        return true;
 }
 <!--~end~-->
-function ~form_name~() {<!--~opt_http_pass_2 start~-->
+function ~form_name~_main() {
+       $ret = _~form_name~_main();
+       if($ret) {
+               return $ret;
+       }
+       display_messages();
+}
+
+function _~form_name~_main() {<!--~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 . '"');
@@ -126,12 +138,7 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
                list(~php_fields~) = ~form_name~_get_fields();
 
                if("you're happy with the POSTed values") {<!--~opt_db_4 start~-->
-                       if($edit_id) {<!--~image_db start~-->
-                               # uploading nothing means leaving it as is.
-                               if(!$~name~ && $delete_~name~ != 'Yes') {
-                                       $~name~ = db_get_value('~form_name~', '~name~', 'where id=%i', $edit_id);
-                               }
-                               <!--~end~-->
+                       if($edit_id) {
                                db_update('~form_name~', ~form_name.upper~_DB_FIELDS, ~php_fields~, 'where id=%i', $edit_id);
                                message('Entry updated.');
                        } else {