From 307c3b76ee89b37e48fbd04e606e2eb333822c66 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Fri, 5 Jan 2018 22:27:35 -0500 Subject: [PATCH] silence some notices --- metaform.php | 26 +++++++++++++------------- template.php | 5 +++-- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/metaform.php b/metaform.php index ecf13e0..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']) { diff --git a/template.php b/template.php index c1df1c1..1f2592a 100644 --- a/template.php +++ b/template.php @@ -424,7 +424,8 @@ function &tem_is_old_sub($name, &$template) { if($tem) return $tem; } } - return false; + $false = false; + return $false; } class tem { @@ -546,7 +547,7 @@ class tem { } function tem_init() { - if(!$GLOBALS['wfpl_template']) { + if(!isset($GLOBALS['wfpl_template']) || !$GLOBALS['wfpl_template']) { $GLOBALS['wfpl_template'] = new tem(); } } -- 1.7.10.4