revamp metaform so php holds db/form data as hash

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index f90ad17..a4a7872 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;
                }
        }
@@ -301,7 +301,6 @@ function make_html($whole_file = true) {
 
        if($GLOBALS['opt_display'] == 'Yes') {
                $tem->show('opt_display_1');
-               $tem->show('opt_display_2');
        }
 
        if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
@@ -358,7 +357,6 @@ function make_php() {
        $tem->set('plural', $GLOBALS['plural']);
        $fields = get_fields();
        $db_fields = '';
-       $php_fields = '';
        $always_field = find_always_field($fields);
        $image_included_yet = false;
        foreach($fields as $field) {
@@ -370,8 +368,6 @@ function make_php() {
                        if($sql != 'n/a') {
                                if($db_fields != '') $db_fields .= ',';
                                $db_fields .= $name;
-                               if($php_fields != '') $php_fields .= ', ';
-                               $php_fields .= '$' . $name;
                        }
                        if($input == 'image') {
                                if($type == 'thumb') {
@@ -396,7 +392,6 @@ function make_php() {
                                }
                                $tem->show('formats');
                        }
-                       $tem->show('tem_sets');
                }
 
                if($GLOBALS['opt_listing'] == 'Yes') {
@@ -413,7 +408,6 @@ function make_php() {
 
        $tem->set('always_field', $always_field);
        $tem->set('db_fields', $db_fields);
-       $tem->set('php_fields', $php_fields);
        $tem->set('metaform_url', edit_url());
        if($GLOBALS['opt_listing'] == 'Yes') {
                $tem->show('opt_listing_1');
@@ -424,7 +418,6 @@ function make_php() {
                $tem->show('opt_display_2');
        } else {
                $tem->show('opt_display_1_else');
-               $tem->show('opt_display_2_else');
        }
        if($GLOBALS['opt_db'] == 'Yes') {
                $tem->show('opt_db_1');
@@ -434,12 +427,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();
 }