metaform: fixed bug when first field was an image

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index 19e2168..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)'),
@@ -70,7 +68,7 @@ function metaform() {
        if(isset($_REQUEST['singular'])) {
                $GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
                $GLOBALS['table_name'] = format_varname($_REQUEST['table_name']);
-               $GLOBALS['plural'] = format_varname($_REQUEST['plural']);
+               $GLOBALS['plural'] = format_oneline($_REQUEST['plural']);
                # backwards compatibility:
                if(isset($_REQUEST['form_name'])) {
                        $GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname($_REQUEST['form_name']);
@@ -79,7 +77,7 @@ function metaform() {
                tem_set('table_name', $GLOBALS['table_name']);
                tem_set('plural', $GLOBALS['plural']);
 
-               $GLOBALS['singular'] = format_varname($_REQUEST['singular']);
+               $GLOBALS['singular'] = format_oneline($_REQUEST['singular']);
                tem_set('singular', $GLOBALS['singular']);
                $GLOBALS['opt_email'] = format_yesno($_REQUEST['opt_email']);
                tem_set('opt_email', $GLOBALS['opt_email']);
@@ -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();
 }
@@ -529,7 +526,7 @@ function download_tar() {
        $name = $GLOBALS['file_name'];
        $data = array(
                ".htaccess" => make_htaccess(),
-               "run.php ->" => 'code/wfpl/run.php',
+               #"run.php ->" => 'code/wfpl/run.php',
                "style.css" => read_whole_file('code/wfpl/metaform/style.css'),
                "$name.html" => make_html(),
                "$name.php" => make_php());