merge_templates now merges to any level, new api

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index c5c8189..3d66baf 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -46,10 +46,8 @@ $GLOBALS['types'] = array(
        'html' =>       array('html',        'unix',       'text'),
        'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
        'radio' =>      array('radio',       'oneline',    'varchar(200)'),
-       'checkbox' =>   array('leftcheck',   'bool',       'int(1)'),
-       'rightcheck' => array('checkbox',    'bool',       'int(1)'),
-       'rightyesno' => array('checkbox',    'yesno',      'varchar(3)'),
-       'yesno' =>      array('leftcheck',   'yesno',      'varchar(3)'),
+       'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
+       'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
        'delete' =>     array('checkbox',    'yesno',      'n/a'),
        'image' =>      array('image',       'oneline',    'varchar(120)'),
        'thumb' =>      array('image',       'oneline',    'varchar(240)'),
@@ -89,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'])) {
@@ -202,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;
                }
        }
@@ -249,7 +247,6 @@ function make_html($whole_file = true) {
                                        $tem->show('display_image');
                                break;
                                case 'checkbox':
-                               case 'leftcheck':
                                        $tem->show('display_yesno');
                                break;
                                case 'date':
@@ -440,9 +437,9 @@ function make_php() {
                $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');
+               $tem->show('opt_pass');
        }
        return $tem->run();
 }