fixed this_url() for https

[wfpl.git] / metaform / template.php

diff --git a/metaform/template.php b/metaform/template.php
index 76ce31f..e62b1d7 100644 (file)
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -1,10 +1,9 @@
 <?php
 
-# This form requires wfpl. If you didn't recieve wfpl along with this file,
-# see: http://jasonwoof.org/wfpl
+# This form requires wfpl. See: http://jasonwoof.org/wfpl
 
-# This form was auto-generated. If you would like to alter the parameters and
-# generate a new one try this URL:
+# This form was initially auto-generated. If you would like to alter the
+# parameters and generate a new one try this URL:
 #
 # ~metaform_url~
 
@@ -33,7 +32,6 @@ 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>.'); }
 require_once('code/wfpl/template.php');
 require_once('code/wfpl/format.php');
 require_once('code/wfpl/messages.php');
@@ -47,7 +45,7 @@ function ~form_name~_get_fields() {<!--~formats start~-->
                $~name~ = substr(save_uploaded_image('~name~', $GLOBALS['upload_directory']), strlen($GLOBALS['upload_directory']));
        } else {
                if($_REQUEST['delete_~name~'] == 'Yes') {
-                       $name = '';
+                       $~name~ = '';
                } else {
                        $~name~ = format_filename($_REQUEST['old_~name~']);
                }
@@ -66,6 +64,8 @@ function ~form_name~_tem_sets(~php_fields~) {<!--~tem_sets start~-->
 function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100') {
        $rows = db_get_rows('~form_name~', 'id,~always_field~', $where);
        if($rows == false || count($rows) == 0) {
+               tem_show('empty_listing');
+               tem_show('listings');
                return false;
        }
 
@@ -76,9 +76,10 @@ 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('populated_listing');
+       tem_show('listings');
        return true;
 }
 <!--~end~-->
@@ -87,7 +88,7 @@ function ~form_name~_main() {
        if($ret) {
                return $ret;
        }
-       display_messages();
+       tem_show('main_body');
 }
 
 function _~form_name~_main() {<!--~opt_http_pass_2 start~-->
@@ -106,32 +107,25 @@ function _~form_name~_main() {<!--~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']);
        unset($_REQUEST['~form_name~_delete_id']);
        if($delete_id) {
                db_delete('~form_name~', 'where id=%i', $delete_id);
-               message('Entry deleted.');<!--~opt_listing_3 start~-->
+               message('Entry deleted.');
 
-               if(~form_name~_display_listing()) {
-                       return;
-               }
-               unset($delete_id);<!--~end~--><!--~opt_listing_3_else start~-->
-
-               # FIXME: what to do after delete?
-               return;<!--~end~-->
+               return './~form_name~.html';
        }
 
        if(!$edit_id) {<!--~opt_listing_1 start~-->
                if(!isset($_REQUEST['~form_name~_new']) && !isset($_REQUEST['~always_field~'])) {
-                       if(~form_name~_display_listing()) {
-                               return;
-                       }
+                       ~form_name~_display_listing();
+                       return;
                }
                <!--~end~-->
-               tem_sub('new_msg');
+               tem_show('new_msg');
        }<!--~end~-->
 
        if(isset($_REQUEST['~always_field~'])) {
@@ -166,7 +160,7 @@ function _~form_name~_main() {<!--~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;
                        }
                }
@@ -187,10 +181,10 @@ function _~form_name~_main() {<!--~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');
 }
 
 ?>