mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix #6195: Allow to change NAT Outbound mode"

Browse Source 
This reverts commit bdaa5235d4.
This commit is contained in:
Renato Botelho do Couto 2019-09-11 10:59:05 -03:00
parent ce76d1e41b
commit c244b2be98
6 changed files with 19 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/etc/phpshellsessions/enableallowallwan
View File

@ -35,10 +35,6 @@ $config["filter"]["rule"][] = array(
"source" => array("any" => ""),
"destination" => array("any" => ""),
"descr" => "Allow all ipv4+ipv6 via pfSsh.php",
/*
* Do not translate this, it's considered a username which cannot
* contain international characters
*/
"created" => make_config_revision_entry(null, "pfSsh.php added allow all wan rule")
);

7
src/usr/local/www/firewall_nat_edit.php
View File

@ -482,12 +482,7 @@ if ($_POST['save']) {
if ($_POST['filter-rule-association'] == 'add-associated') {
$filterent['associated-rule-id'] = $natent['associated-rule-id'] = get_unique_id();
$filterent['tracker'] = (int)microtime(true);
/*
* Do not translate this, it's considered a
* username which cannot contain international
* characters
*/
$filterent['created'] = make_config_revision_entry(null, "NAT Port Forward");
$filterent['created'] = make_config_revision_entry(null, gettext("NAT Port Forward"));
$config['filter']['rule'][] = $filterent;
}

7
src/usr/local/www/firewall_nat_out.php
View File

@ -108,12 +108,7 @@ if ($_POST['save']) {
$natent['descr'] .= sprintf(gettext(' - %1$s to %2$s'),
$tonathost['descr'],
convert_real_interface_to_friendly_descr($natent['interface']));
/*
* Do not translate this, it's considered a
* username which cannot contain international
* characters
*/
$natent['created'] = make_config_revision_entry(null, "Manual Outbound NAT Switch");
$natent['created'] = make_config_revision_entry(null, gettext("Manual Outbound NAT Switch"));
/* Try to detect already auto created rules and avoid duplicating them */
$found = false;

12
src/usr/local/www/wizards/openvpn_wizard.inc
View File

@ -673,11 +673,7 @@ function step12_submitphpaction() {
$rule['type'] = "pass";
$rule['enabled'] = "on";
$rule['tracker'] = $tracker++;
/*
* Do not translate this, it's considered a username which
* cannot contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "OpenVPN Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("OpenVPN Wizard"));
$config['filter']['rule'][] = $rule;
}
@ -694,11 +690,7 @@ function step12_submitphpaction() {
$rule['type'] = "pass";
$rule['enabled'] = "on";
$rule['tracker'] = $tracker++;
/*
* Do not translate this, it's considered a username which
* cannot contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "OpenVPN Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("OpenVPN Wizard"));
$config['filter']['rule'][] = $rule;
}

45
src/usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc
View File

@ -1493,11 +1493,7 @@ function apply_all_chosen_items() {
$rule['floating'] = "yes";
$rule['wizard'] = "yes";
$rule['enabled'] = "on";
/*
* Do not translate this, it's considered a username
* which cannot contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
}
@ -1518,11 +1514,7 @@ function apply_all_chosen_items() {
$rule['floating'] = "yes";
$rule['wizard'] = "yes";
$rule['enabled'] = "on";
/*
* Do not translate this, it's considered a username
* which cannot contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
@ -1537,11 +1529,7 @@ function apply_all_chosen_items() {
$rule['floating'] = "yes";
$rule['wizard'] = "yes";
$rule['enabled'] = "on";
/*
* Do not translate this, it's considered a username
* which cannot contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
@ -1559,11 +1547,7 @@ function apply_all_chosen_items() {
$rule['floating'] = "yes";
$rule['wizard'] = "yes";
$rule['enabled'] = "on";
/*
* Do not translate this, it's considered a username
* which cannot contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
@ -1583,12 +1567,7 @@ function apply_all_chosen_items() {
$rule['destination']['port'] = $voip[2]."-".$voip[3];
if ($voip[1] != '')
$rule['protocol'] = $voip[1];
/*
* Do not translate this, it's considered a
* username which cannot contain international
* characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
}
@ -1613,12 +1592,7 @@ function apply_all_chosen_items() {
$rule['destination']['port'] = $p2pclient[2]."-".$p2pclient[3];
if ($p2pclient[1] != '')
$rule['protocol'] = $p2pclient[1];
/*
* Do not translate this, it's considered a
* username which cannot contain international
* characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
}
@ -1698,12 +1672,7 @@ function apply_all_chosen_items() {
}
if ($otherclient[1] != '')
$rule['protocol'] = $otherclient[1];
/*
* Do not translate this, it's
* considered a username which cannot
* contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
}

58
src/usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc
View File

@ -1579,11 +1579,7 @@ function apply_all_chosen_items() {
$rule['floating'] = "yes";
$rule['wizard'] = "yes";
$rule['enabled'] = "on";
/*
* Do not translate this, it's considered a username
* which cannot contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
@ -1605,12 +1601,7 @@ function apply_all_chosen_items() {
$rule['floating'] = "yes";
$rule['wizard'] = "yes";
$rule['enabled'] = "on";
/*
* Do not translate this, it's
* considered a username which cannot
* contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
@ -1625,12 +1616,7 @@ function apply_all_chosen_items() {
$rule['floating'] = "yes";
$rule['wizard'] = "yes";
$rule['enabled'] = "on";
/*
* Do not translate this, it's
* considered a username which cannot
* contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
@ -1648,12 +1634,7 @@ function apply_all_chosen_items() {
$rule['floating'] = "yes";
$rule['wizard'] = "yes";
$rule['enabled'] = "on";
/*
* Do not translate this, it's
* considered a username which cannot
* contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
@ -1673,13 +1654,7 @@ function apply_all_chosen_items() {
$rule['destination']['port'] = $voip[2]."-".$voip[3];
if ($voip[1] != '')
$rule['protocol'] = $voip[1];
/*
* Do not translate this, it's
* considered a username which
* cannot contain international
* characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
}
@ -1704,13 +1679,7 @@ function apply_all_chosen_items() {
$rule['destination']['port'] = $p2pclient[2]."-".$p2pclient[3];
if ($p2pclient[1] != '')
$rule['protocol'] = $p2pclient[1];
/*
* Do not translate this, it's
* considered a username which
* cannot contain international
* characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
}
@ -1738,13 +1707,7 @@ function apply_all_chosen_items() {
$rule['destination']['port'] = $Gameclient[2]."-".$Gameclient[3];
if ($Gameclient[1] != '')
$rule['protocol'] = $Gameclient[1];
/*
* Do not translate this, it's
* considered a username which
* cannot contain international
* characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
}
@ -1798,12 +1761,7 @@ function apply_all_chosen_items() {
}
if ($otherclient[1] != '')
$rule['protocol'] = $otherclient[1];
/*
* Do not translate this, it's
* considered a username which cannot
* contain international characters
*/
$rule['created'] = make_config_revision_entry(null, "Traffic Shaper Wizard");
$rule['created'] = make_config_revision_entry(null, gettext("Traffic Shaper Wizard"));
$rule['tracker'] = $tracker++;
$config['filter']['rule'][] = $rule;
}