* db.php (db_get_row, db_get_rows): drop result type arg (conflicts with optional...

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index 04e786a..c5c8189 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -70,7 +70,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 +79,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']);
@@ -268,9 +268,6 @@ function make_html($whole_file = true) {
                }
 
                if($GLOBALS['opt_listing'] == 'Yes') {
-                       if($GLOBALS['opt_display'] != 'Yes') {
-                               $tem->show('opt_display_a_else');
-                       }
                        if(show_in_listing($type, $input, $format, $sql)) {
                                if($format == 'bool' || $format == 'yesno') {
                                        $tem->set('listing_enc', 'yesno');
@@ -284,6 +281,10 @@ function make_html($whole_file = true) {
                                        $tem->set('listing_enc', 'html');
                                        $tem->show('listing_value_enc');
                                }
+
+                               if($GLOBALS['opt_display'] != 'Yes') {
+                                       $tem->show('opt_display_a_else');
+                               }
                                $tem->show('listing_head_col');
                                $tem->show('listing_row_col');
                        }
@@ -351,6 +352,7 @@ function show_in_listing($type, $input, $format, $sql) {
 }
 
 function make_php() {
+       $has_html_editors = false;
        $tem = new tem();
        $tem->load('code/wfpl/metaform/template.php');
        $tem->set('file_name', $GLOBALS['file_name']);
@@ -389,7 +391,9 @@ function make_php() {
                                        $image_included_yet = true;
                                }
                        } else {
-                               if($input == 'pulldown') {
+                               if($input == 'html') {
+                                       $has_html_editors = true;
+                               } elseif($input == 'pulldown') {
                                        $tem->show('pulldowns');
                                        $tem->show('pulldown_format_extra');
                                }
@@ -406,6 +410,10 @@ function make_php() {
                }
        }
 
+       if($has_html_editors) {
+               $tem->show('show_extra_headers');
+       }
+
        $tem->set('always_field', $always_field);
        $tem->set('db_fields', $db_fields);
        $tem->set('php_fields', $php_fields);
@@ -521,7 +529,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());