From 3b06c4dccb0788edaf549afa18be1561d769984f Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 2 Dec 2025 05:32:33 -0800
Subject: [PATCH] Revert "Fux subs to use local variable for parameters #2597"

This reverts commit 1e6611ade50fbe20f029383c971c26db3a0f9361.
---
 proftpd/mod_tls.pl | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/proftpd/mod_tls.pl b/proftpd/mod_tls.pl
index 213941cfa..4d8eded83 100644
--- a/proftpd/mod_tls.pl
+++ b/proftpd/mod_tls.pl
@@ -13,9 +13,8 @@ return &make_directives($rv, $_[0], "mod_tls");
 
 sub edit_TLSEngine
 {
-my ($p) = grep { defined $_} @_;
 return (2, $text{'mod_tls_engine'},
-	&choice_input($p->{'value'}, "TLSEngine", "",
+	&choice_input($_[0]->{'value'}, "TLSEngine", "",
 		      "$text{'yes'},on", "$text{'no'},off",
 		      "$text{'default'},"));
 }
@@ -26,9 +25,8 @@ return &parse_choice("TLSEngine", "");
 
 sub edit_TLSRequired
 {
-my ($p) = grep { defined $_} @_;
 return (2, $text{'mod_tls_required'},
-	&select_input($p->{'value'}, "TLSRequired", "",
+	&select_input($_[0]->{'value'}, "TLSRequired", "",
 		      "$text{'yes'},on", "$text{'no'},off",
 		      "$text{'mod_tls_ctrl'},ctrl",
 		      "$text{'mod_tls_auth'},auth",
@@ -42,16 +40,14 @@ return &parse_choice("TLSRequired", "");
 
 sub edit_TLSRSACertificateFile
 {
-my ($p) = grep { defined $_} @_;
-my $n = $p->{'name'};
+my $n = $_[0]->{'name'};
 return (2, $text{'mod_tls_file'},
-	&ui_opt_textbox($n, $p->{'value'}, 60, $text{'mod_tls_none'})." ".
+	&ui_opt_textbox($n, $_[0]->{'value'}, 60, $text{'mod_tls_none'})." ".
 	&file_chooser_button($n));
 }
 sub save_TLSRSACertificateFile
 {
-my ($p) = grep { defined $_} @_;
-my $n = $p->{'name'};
+my $n = $_[0]->{'name'};
 if ($in{$n."_def"}) {
 	return ( [ ] );
 	}
@@ -63,16 +59,14 @@ else {
 
 sub edit_TLSRSACertificateKeyFile
 {
-my ($p) = grep { defined $_} @_;
-my $n = $p->{'name'};
+my $n = $_[0]->{'name'};
 return (2, $text{'mod_tls_key'},
-	&ui_opt_textbox($n, $p->{'value'}, 60, $text{'mod_tls_none'})." ".
+	&ui_opt_textbox($n, $_[0]->{'value'}, 60, $text{'mod_tls_none'})." ".
 	&file_chooser_button($n));
 }
 sub save_TLSRSACertificateKeyFile
 {
-my ($p) = grep { defined $_} @_;
-my $n = $p->{'name'};
+my $n = $_[0]->{'name'};
 if ($in{$n."_def"}) {
 	return ( [ ] );
 	}
@@ -84,16 +78,14 @@ else {
 
 sub edit_TLSCACertificateFile
 {
-my ($p) = grep { defined $_} @_;
-my $n = $p->{'name'};
+my $n = $_[0]->{'name'};
 return (2, $text{'mod_tls_ca'},
-	&ui_opt_textbox($n, $p->{'value'}, 60, $text{'mod_tls_none'})." ".
+	&ui_opt_textbox($n, $_[0]->{'value'}, 60, $text{'mod_tls_none'})." ".
 	&file_chooser_button($n));
 }
 sub save_TLSCACertificateFile
 {
-my ($p) = grep { defined $_} @_;
-my $n = $p->{'name'};
+my $n = $_[0]->{'name'};
 if ($in{$n."_def"}) {
 	return ( [ ] );
 	}