metaform: textarea is smaller, s/tem_sub/tem_show/

[wfpl.git] / metaform / template.php

diff --git a/metaform/template.php b/metaform/template.php
index 48fb37f..4858e4d 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~);
@@ -72,13 +76,21 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100
                        $~always_field~ = '--';
                }
                tem_set('~always_field~', $~always_field~);
-               tem_sub('listing_row');
+               tem_show('listing_row');
        }
-       tem_sub('listings');
+       tem_show('listings');
        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 . '"');
@@ -94,7 +106,7 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
        if($edit_id) {
                # add hidden field for database id of row we're editing
                tem_set('~form_name~_edit_id', $edit_id);
-               tem_sub('editing');
+               tem_show('editing');
        }
 
        $delete_id = format_int($_REQUEST['~form_name~_delete_id']);
@@ -112,26 +124,21 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
                return;<!--~end~-->
        }
 
-       if(!$edit_id && !$delet_id) {<!--~opt_listing_1 start~-->
+       if(!$edit_id) {<!--~opt_listing_1 start~-->
                if(!isset($_REQUEST['~form_name~_new']) && !isset($_REQUEST['~always_field~'])) {
                        if(~form_name~_display_listing()) {
                                return;
                        }
                }
                <!--~end~-->
-               tem_sub('new_msg');
+               tem_show('new_msg');
        }<!--~end~-->
 
        if(isset($_REQUEST['~always_field~'])) {
                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 {
@@ -159,7 +166,7 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
                        }<!--~end~-->
                        if($error !== true) {<!--~opt_listing_4 start~-->
                                ~form_name~_display_listing();<!--~end~--><!--~opt_listing_4_else start~-->
-                               tem_sub('thankyou');<!--~end~-->
+                               tem_show('thankyou');<!--~end~-->
                                return;
                        }
                }
@@ -180,10 +187,10 @@ function ~form_name~() {<!--~opt_http_pass_2 start~-->
 
        # this has to be later in the file because it requres that ~always_field~ be set already
        if($edit_id) {
-               tem_sub('edit_msg');
+               tem_show('edit_msg');
        }
 
-       tem_sub('form');
+       tem_show('form');
 }
 
 ?>