Fix db_get_value after mysql->mysqli upgrade

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index 4217a55..e31a9a4 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -79,7 +79,7 @@ function tem_set_globals(&$tem) {
                'opt_public_display',
                'opt_public_something');
        foreach($bools as $bool) {
-               if($GLOBALS[$bool]) {
+               if(isset($GLOBALS[$bool]) && $GLOBALS[$bool]) {
                        $tem->set($bool);
                }
        }
@@ -87,27 +87,29 @@ function tem_set_globals(&$tem) {
 
 function metaform_main() {
        if(isset($_REQUEST['singular'])) {
-               $GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
-               $GLOBALS['table_name'] = format_varname($_REQUEST['table_name']);
-               $GLOBALS['plural'] = format_oneline($_REQUEST['plural']);
+               $GLOBALS['file_name'] = format_varname(_REQUEST_cut('file_name'));
+               $GLOBALS['table_name'] = format_varname(_REQUEST_cut('table_name'));
+               $GLOBALS['plural'] = format_oneline(_REQUEST_cut('plural'));
                # backwards compatibility:
                if(isset($_REQUEST['form_name'])) {
-                       $GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname($_REQUEST['form_name']);
+                       $GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname(_REQUEST_cut('form_name'));
                }
 
-               $GLOBALS['singular'] = format_oneline($_REQUEST['singular']);
-               $GLOBALS['opt_email'] = format_bool($_REQUEST['opt_email']);
-               $GLOBALS['opt_db'] = format_bool($_REQUEST['opt_db']);
-               $GLOBALS['opt_listing'] = format_bool($_REQUEST['opt_listing']);
-               $GLOBALS['opt_display'] = format_bool($_REQUEST['opt_display']);
-               $GLOBALS['opt_pass'] = format_bool($_REQUEST['opt_pass']);
-               $GLOBALS['opt_public_form'] = format_bool($_REQUEST['opt_public_form']);
-               $GLOBALS['opt_public_display'] = format_bool($_REQUEST['opt_public_display']);
+               $GLOBALS['singular'] = format_oneline(_REQUEST_cut('singular'));
+               $GLOBALS['opt_email'] = format_bool(_REQUEST_cut('opt_email'));
+               $GLOBALS['opt_db'] = format_bool(_REQUEST_cut('opt_db'));
+               $GLOBALS['opt_listing'] = format_bool(_REQUEST_cut('opt_listing'));
+               $GLOBALS['opt_display'] = format_bool(_REQUEST_cut('opt_display'));
+               $GLOBALS['opt_pass'] = format_bool(_REQUEST_cut('opt_pass'));
+               $GLOBALS['opt_public_form'] = format_bool(_REQUEST_cut('opt_public_form'));
+               $GLOBALS['opt_public_display'] = format_bool(_REQUEST_cut('opt_public_display'));
 
                $GLOBALS['public_file_name'] = $GLOBALS['file_name'];
                if($GLOBALS['opt_public_form'] || $GLOBALS['opt_public_display']) {
                        $GLOBALS['opt_public_something'] = 1;
                        $GLOBALS['file_name'] = $GLOBALS['file_name'] . _admin;
+               } else {
+                       $GLOBALS['opt_public_something'] = 0;
                }
 
                tem_init();
@@ -163,7 +165,7 @@ function get_fields() {
        $fields_str = unix_newlines($_REQUEST['fields']);
        $GLOBALS['gotten_fields'] = array();
        $fields_str = rtrim($fields_str);
-       $fields = split("\n", $fields_str);
+       $fields = explode("\n", $fields_str);
        foreach($fields as $field) {
                $first_char = substr($field, 0, 1);
                $field = trim($field);
@@ -466,6 +468,7 @@ function make_php() {
        $always_field = find_always_field($fields);
        $image_included_yet = false;
        $name_to_caption = array();
+       $has_uploads = false;
        foreach($fields as $field) {
                $name_to_caption[] = array('name' => $field['name'], 'caption' => $field['caption']);
                if($field['input'] != 'submit') {