X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=metaform.php;h=381cb65a18a11ef7f72f1f322fb09f6f5a0e2f8a;hb=2c5828c320cc7a3dfd47559dfe1dd1bde76c1b10;hp=4217a5537d41fd0332d75172c49ce50652a41867;hpb=900e09b8300463e3dd42e89c21de181520513e95;p=wfpl.git

diff --git a/metaform.php b/metaform.php
index 4217a55..381cb65 100644
--- 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,22 +87,22 @@ 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']) {
@@ -163,7 +163,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);