X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=metaform.php;h=e31a9a4bf435e3e86a2d9844733b8bc3903a0ffb;hp=f8112aacb0679f8a3c824b153170c9a0c87bb39f;hb=HEAD;hpb=196deb2416748b09200f620247a344563dff4c38

diff --git a/metaform.php b/metaform.php
index f8112aa..e31a9a4 100644
--- a/metaform.php
+++ b/metaform.php
@@ -1,19 +1,9 @@
 <?php
 
-#  Copyright (C) 2006 Jason Woofenden
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#  
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#  
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# This program is in the public domain within the United States. Additionally,
+# we waive copyright and related rights in the work worldwide through the CC0
+# 1.0 Universal public domain dedication, which can be found at
+# http://creativecommons.org/publicdomain/zero/1.0/
 
 
 # This file writes the code for you (sql, php, html, email) to handle a form.
@@ -89,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);
 		}
 	}
@@ -97,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();
@@ -173,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);
@@ -476,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') {