tem_run() (and tem::run()) doesn't overwrite the template stored in the class with...

[wfpl.git] / metaform / template.php

diff --git a/metaform/template.php b/metaform/template.php
index 84755d4..537c22f 100644 (file)
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -8,6 +8,7 @@
 #
 # ~metaform_url~
 
+
 # SETUP
 <!--~opt_email_1 start~-->
 # To send results by e-mail, all you have to do is set your e-mail address here:
@@ -21,6 +22,11 @@ $GLOBALS['~form_name~_form_recipient'] = "fixme@example.com";
 # Set this to the path to your uploads directory. It can be relative to the
 # location of this script. IT MUST END WITH A SLASH
 $GLOBALS['upload_directory'] = 'uploads/';
+<!--~end~--><!--~opt_http_pass_1 start~-->
+# Define the username and password required to view this form:
+define('AUTH_REALM', '~form_name~ administration area');
+define('AUTH_USER', 'fixme');
+define('AUTH_PASS', 'fixme');
 <!--~end~-->
 
 if(!file_exists('code/wfpl/template.php')) { die('This form requires <a href="http://jasonwoof.org/wfpl">wfpl</a>.'); }
@@ -44,7 +50,15 @@ function ~form_name~_get_fields() {<!--~formats start~-->
        return array(~php_fields~);
 }
 
-function ~form_name~() {<!--~opt_db_3 start~-->
+function ~form_name~() {<!--~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 . '"');
+               header('HTTP/1.0 401 Unauthorized');
+               echo '401 Unauthorized';
+               exit;
+       }
+       <!--~end~--><!--~opt_db_3 start~-->
        $edit_id = format_int($_REQUEST['~form_name~_edit_id']);
        unset($_REQUEST['~form_name~_edit_id']);
        if($edit_id) {
@@ -102,8 +116,7 @@ function ~form_name~() {<!--~opt_db_3 start~-->
                                $cc = '';
                                $bcc = '';
                                if(email($from, $to, $subject, $message, $cc, $bcc)) {
-                                       tem_set('error_message', 'Due to an internal error, your message could not be sent. Please try again later.');
-                                       tem_sub('error');
+                                       message('Due to an internal error, your message could not be sent. Please try again later.');
                                        $error = true;
                                }
                        }<!--~end~-->
@@ -129,6 +142,7 @@ function ~form_name~() {<!--~opt_db_3 start~-->
 
        tem_set('upload_max_filesize', upload_max_filesize());<!--~end~-->
 
+       display_messages();
        tem_sub('form');
 }