added: db_reposition() (renumbering not tested)

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index f90ad17..ee5b942 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -87,8 +87,8 @@ function metaform() {
                tem_set('opt_listing', $GLOBALS['opt_listing']);
                $GLOBALS['opt_display'] = format_yesno($_REQUEST['opt_display']);
                tem_set('opt_display', $GLOBALS['opt_display']);
-               $GLOBALS['opt_http_pass'] = format_yesno($_REQUEST['opt_http_pass']);
-               tem_set('opt_http_pass', $GLOBALS['opt_http_pass']);
+               $GLOBALS['opt_pass'] = format_yesno($_REQUEST['opt_pass']);
+               tem_set('opt_pass', $GLOBALS['opt_pass']);
        }
 
        if(isset($_REQUEST['fields'])) {
@@ -200,7 +200,7 @@ function view_sql() {
 function find_always_field($fields) {
        foreach($fields as $field) {
                list($name, $type, $input, $format, $sql) = $field;
-               if($input != 'submit' && $input != 'checkbox' && $input != 'radio') {
+               if($input != 'submit' && $input != 'image' && $input != 'checkbox' && $input != 'radio') {
                        return $name;
                }
        }
@@ -434,12 +434,16 @@ function make_php() {
                $tem->show('opt_db_5');
        }
        if($GLOBALS['opt_email'] == 'Yes') {
+               $this_domain = $_SERVER['HTTP_HOST'];
+               if(substr($this_domain, -2) == '.l') {
+                       $this_domain = substr($this_domain, 0, -1) . 'com';
+               }
+               $tem->set('this_domain', $this_domain);
                $tem->show('opt_email_1');
                $tem->show('opt_email_2');
        }
-       if($GLOBALS['opt_http_pass'] == 'Yes') {
-               $tem->show('opt_http_pass_1');
-               $tem->show('opt_http_pass_2');
+       if($GLOBALS['opt_pass'] == 'Yes') {
+               $tem->show('opt_pass');
        }
        return $tem->run();
 }