diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-02-05 07:48:35 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-02-05 07:48:35 -0200 |
| commit | 8f637a0c4e323fe48f910aabf8e1662c307ac564 (patch) | |
| tree | f73c70342b42bdc69af6a2c3d826883bcbdbb919 /usr/local | |
| parent | 68f7662be7afa78590cde6af4996e437391dae32 (diff) | |
| parent | ee874f47823b0677ae129ca7c206e59433f8d536 (diff) | |
| download | pfsense-8f637a0c4e323fe48f910aabf8e1662c307ac564.zip pfsense-8f637a0c4e323fe48f910aabf8e1662c307ac564.tar.gz | |
Merge pull request #1455 from xbipin/patch-2
Diffstat (limited to 'usr/local')
| -rw-r--r-- | usr/local/pkg/miniupnpd.inc | 9 | ||||
| -rw-r--r-- | usr/local/pkg/miniupnpd.xml | 39 |
2 files changed, 17 insertions, 31 deletions
diff --git a/usr/local/pkg/miniupnpd.inc b/usr/local/pkg/miniupnpd.inc index 4cad0e5..34fab47 100644 --- a/usr/local/pkg/miniupnpd.inc +++ b/usr/local/pkg/miniupnpd.inc @@ -98,7 +98,8 @@ $input_errors[] = 'You must specify a valid traffic shaping queue.'; /* user permissions validation */ - for($i=1; $i<=4; $i++) { + $j = substr_count(implode(array_keys($post)), "permuser"); + for ($i=0; $i<$j; $i++){ if($post["permuser{$i}"]) { $perm = explode(' ',$post["permuser{$i}"]); /* should explode to 4 args */ @@ -209,9 +210,9 @@ $config_text .= "model_number=".file_get_contents("/etc/version")."\n"; /* upnp access restrictions */ - for($i=1; $i<=4; $i++) { - if($upnp_config["permuser{$i}"]) - $config_text .= "{$upnp_config["permuser{$i}"]}\n"; + foreach($upnp_config['row'] as $row){ + if($row['permuser']) + $config_text .= "{$row["permuser"]}\n"; } if($upnp_config['permdefault']) diff --git a/usr/local/pkg/miniupnpd.xml b/usr/local/pkg/miniupnpd.xml index 9153e53..c26587b 100644 --- a/usr/local/pkg/miniupnpd.xml +++ b/usr/local/pkg/miniupnpd.xml @@ -35,13 +35,13 @@ <field> <name>UPnP & NAT-PMP Settings</name> <type>listtopic</type> - <enablefields>enable_upnp,enable_natpmp,iface_array,overridewanip,upnpqueue,logpackets,sysuptime,permdefault,permuser1,permuser2,permuser3,permuser4</enablefields> + <enablefields>enable_upnp,enable_natpmp,ext_iface,iface_array,download,upload,overridewanip,upnpqueue,logpackets,sysuptime,permdefault</enablefields> </field> <field> <fielddescr>Enable UPnP & NAT-PMP</fielddescr> <fieldname>enable</fieldname> <type>checkbox</type> - <enablefields>enable_upnp,enable_natpmp,iface_array,overridewanip,upnpqueue,logpackets,sysuptime,permdefault,permuser1,permuser2,permuser3,permuser4</enablefields> + <enablefields>enable_upnp,enable_natpmp,ext_iface,iface_array,download,upload,overridewanip,upnpqueue,logpackets,sysuptime,permdefault</enablefields> </field> <field> <fielddescr>Allow UPnP Port Mapping</fielddescr> @@ -116,34 +116,19 @@ <type>checkbox</type> </field> <field> - <fielddescr>User specified permissions 1</fielddescr> - <fieldname>permuser1</fieldname> + <fielddescr>User specified permissions</fielddescr> + <fieldname>none</fieldname> <description>Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/CIDR] [int port or range] <br />Example: allow 1024-65535 192.168.0.0/24 1024-65535</description> - <type>input</type> - <size>60</size> + <type>rowhelper</type> + <rowhelper> + <rowhelperfield> + <fieldname>permuser</fieldname> + <type>input</type> + <size>60</size> + </rowhelperfield> + </rowhelper> </field> - <field> - <fielddescr>User specified permissions 2</fielddescr> - <fieldname>permuser2</fieldname> - <description>Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/CIDR] [int port or range]</description> - <type>input</type> - <size>60</size> - </field> - <field> - <fielddescr>User specified permissions 3</fielddescr> - <fieldname>permuser3</fieldname> - <description>Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/CIDR] [int port or range]</description> - <type>input</type> - <size>60</size> - </field> - <field> - <fielddescr>User specified permissions 4</fielddescr> - <fieldname>permuser4</fieldname> - <description>Format: [allow or deny] [ext port or range] [int ipaddr or ipaddr/CIDR] [int port or range]</description> - <type>input</type> - <size>60</size> - </field> </fields> <custom_php_command_before_form> before_form_miniupnpd($pkg); |
