diff options
author | jim-p <jimp@pfsense.org> | 2011-06-28 11:21:28 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2011-06-28 11:21:28 -0400 |
commit | 3062d6f7e454a261858cfc8934ad1cd9b45d7870 (patch) | |
tree | 108bc775c4292ee54bdf73d9262441d378979773 | |
parent | 8a385f42742b9f1da57f53639436f7bea0c5ada1 (diff) | |
parent | e8c8891d0c787f656bc5147b4fac21f3e2746b8a (diff) | |
download | pfsense-3062d6f7e454a261858cfc8934ad1cd9b45d7870.zip pfsense-3062d6f7e454a261858cfc8934ad1cd9b45d7870.tar.gz |
Merge remote branch 'upstream/master'
-rw-r--r-- | etc/inc/filter.inc | 5 | ||||
-rw-r--r-- | usr/local/www/diag_packet_capture.php | 4 | ||||
-rw-r--r-- | usr/local/www/diag_routes.php | 2 | ||||
-rwxr-xr-x | usr/local/www/diag_traceroute.php | 4 | ||||
-rwxr-xr-x | usr/local/www/interfaces_vlan_edit.php | 10 | ||||
-rwxr-xr-x | usr/local/www/services_captiveportal_hostname_edit.php | 12 | ||||
-rw-r--r-- | usr/local/www/system_advanced_admin.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_advanced_misc.php | 2 | ||||
-rw-r--r-- | usr/local/www/system_authservers.php | 6 | ||||
-rw-r--r-- | usr/local/www/system_certmanager.php | 2 |
10 files changed, 25 insertions, 24 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 7d39662..240c252 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -277,8 +277,6 @@ function filter_configure_sync() { $rules .= "set limit table-entries {$config['system']['maximumtableentries']}\n"; } - //$rules .= discover_pkg_rules("pfearly"); - // Configure flowtable support if enabled. flowtable_configure(); @@ -2156,7 +2154,7 @@ function filter_rules_generate() { $pptpdcfg = $config['pptpd']; $ipfrules = ""; - //$ipfrules .= discover_pkg_rules("filter"); + $ipfrules .= discover_pkg_rules("pfearly"); /* relayd */ $ipfrules .= "anchor \"relayd/*\"\n"; @@ -2531,6 +2529,7 @@ EOD; $rule_arr = array_merge($rule_arr1,$rule_arr2); $ipfrules .= "\n# User-defined rules follow\n"; + $ipfrules .= "\nanchor \"userrules/*\"\n"; /* Generate user rule lines */ foreach($rule_arr as $rule) { if(isset($rule['disabled'])) diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index 2ffba1d..df482e2 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -35,6 +35,9 @@ ##|*MATCH=diag_packet_capture.php* ##|-PRIV +if ($_POST['downloadbtn'] == gettext("Download Capture")) + $nocsrf = true; + $pgtitle = array(gettext("Diagnostics"), gettext("Packet Capture")); require_once("guiconfig.inc"); require_once("pfsense-utils.inc"); @@ -92,6 +95,7 @@ if ($_POST) { header("Content-Disposition: attachment; filename=$fn"); header("Content-Length: $fs"); readfile($fp.$fn); + exit; } } else { $do_tcpdump = false; diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php index f8e2926..2a61223 100644 --- a/usr/local/www/diag_routes.php +++ b/usr/local/www/diag_routes.php @@ -86,7 +86,7 @@ include('head.inc'); $name = ($tabindex == 0 ? 'IPv4' : 'IPv6'); ?> <table class="tabcont" width="100%" cellspacing="0" cellpadding="6" border="0"> -<tr><td class="listbg" colspan="<?=$elements?>"><strong><?=$name;?></strong></font></td></tr> +<tr><td class="listtopic" colspan="<?=$elements?>"><strong><?=$name;?></strong></font></td></tr> <?php foreach (explode("\n", $table) as $i => $line) { if ($i == 0) continue; diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php index 5a94f4c..dc44f6b 100755 --- a/usr/local/www/diag_traceroute.php +++ b/usr/local/www/diag_traceroute.php @@ -114,7 +114,7 @@ if (!isset($do_traceroute)) { </tr> <tr> <td valign="top" colspan="2"> - <p><span class="vexpl"><span class="red"><b><?=gettext("Note:");?></b></span><?=gettext("Traceroute may take a while to complete. You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?><p> + <p><span class="vexpl"><span class="red"><b><?=gettext("Note: ");?></b></span><?=gettext("Traceroute may take a while to complete. You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?></span><p> <? if ($do_traceroute) { echo "<font face='terminal' size='2'>"; echo("<br><strong>" . gettext("Traceroute output:") . "</strong><br>"); @@ -134,7 +134,7 @@ if (!isset($do_traceroute)) { <tr> <td width="22%" valign="top"> </td> <td width="78%"> - <span class="vexpl"><b><?=gettext("Note:");?></b></span><?=gettext("Multi-wan is not supported from this utility currently.");?> + <span class="vexpl"><b><?=gettext("Note: ");?></b><?=gettext("Multi-wan is not supported from this utility currently.");?></span> </td> </tr> </table> diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php index 08f1a53..b6cea47 100755 --- a/usr/local/www/interfaces_vlan_edit.php +++ b/usr/local/www/interfaces_vlan_edit.php @@ -98,11 +98,16 @@ if ($_POST) { if (!$input_errors) { if (isset($id) && $a_vlans[$id]) { if (($a_vlans[$id]['if'] != $_POST['if']) || ($a_vlans[$id]['tag'] != $_POST['tag'])) { - if (!empty($a_vlans[$id]['vlanif'])) + if (!empty($a_vlans[$id]['vlanif'])) { + $confif = convert_real_interface_to_friendly_interface_name($vlan['vlanif']); // Destroy previous vlan pfSense_interface_destroy($a_vlans[$id]['vlanif']); - else + } else { pfSense_interface_destroy("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}"); + $confif = convert_real_interface_to_friendly_interface_name("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}"); + } + if ($confif <> "") + $config['interfaces'][$confif]['if'] = "{$_POST['if']}_vlan{$_POST['tag']}"; } } $vlan = array(); @@ -122,7 +127,6 @@ if ($_POST) { write_config(); - $confif = convert_real_interface_to_friendly_interface_name($vlan['vlanif']); if ($confif <> "") interface_configure($confif); diff --git a/usr/local/www/services_captiveportal_hostname_edit.php b/usr/local/www/services_captiveportal_hostname_edit.php index a199341..cc09459 100755 --- a/usr/local/www/services_captiveportal_hostname_edit.php +++ b/usr/local/www/services_captiveportal_hostname_edit.php @@ -118,17 +118,11 @@ if ($_POST) { $ip['bw_up'] = $_POST['bw_up']; if ($_POST['bw_down']) $ip['bw_down'] = $_POST['bw_down']; - if (isset($id) && $a_allowedhostnames[$id]) { - $oldip = $a_allowedhostnames[$id]['hostname']; - if (!empty($a_allowedhostnames[$id]['sn'])) - $oldip .= "/{$a_allowedhostnames[$id]['sn']}"; + if (isset($id) && $a_allowedhostnames[$id]) $a_allowedhostnames[$id] = $ip; - } else { - $oldip = $ip['hostname']; - if (!empty($$ip['sn'])) - $oldip .= "/{$$ip['sn']}"; + else $a_allowedhostnames[] = $ip; - } + allowedhostnames_sort(); write_config(); diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index 4965fb9..d1150a2 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -267,7 +267,7 @@ function prot_change() { <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong><?=gettext("NOTE:"); ?> </strong> + <strong><?=gettext("Note:"); ?> </strong> </span> <?=gettext("The options on this page are intended for use by advanced users only."); ?> <br/> diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index 2264365..c31bc92 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -339,7 +339,7 @@ function maxmss_checked(obj) { <td colspan="2" valign="top" class="listtopic"><?=gettext("IP Security"); ?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell"><?=gettext("Security Assocications"); ?></td> + <td width="22%" valign="top" class="vncell"><?=gettext("Security Associations"); ?></td> <td width="78%" class="vtable"> <input name="preferoldsa_enable" type="checkbox" id="preferoldsa_enable" value="yes" <?php if ($pconfig['preferoldsa_enable']) echo "checked"; ?> /> <strong><?=gettext("Prefer older IPsec SAs"); ?></strong> diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php index fad6b34..b6b1097 100644 --- a/usr/local/www/system_authservers.php +++ b/usr/local/www/system_authservers.php @@ -543,9 +543,9 @@ function select_clicked() { <td> <input name="ldapauthcontainers" type="text" class="formfld unknown" id="ldapauthcontainers" size="40" value="<?=htmlspecialchars($pconfig['ldap_authcn']);?>"/> <input type="button" onClick="select_clicked();" value="<?=gettext("Select");?>"> - <br /><?=gettext("NOTE: Semi-Colon separated. This will be prepended to the search base dn above or you can specify full container path.");?> - <br /><?=gettext("EXAMPLE: CN=Users;DC=example");?> - <br /><?=gettext("EXAMPLE: CN=Users,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com ");?> + <br /><?=gettext("Note: Semi-Colon separated. This will be prepended to the search base dn above or you can specify full container path.");?> + <br /><?=gettext("Example: CN=Users;DC=example");?> + <br /><?=gettext("Example: CN=Users,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com ");?> </td> </tr> </table> diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php index 355621b..6b0d81e 100644 --- a/usr/local/www/system_certmanager.php +++ b/usr/local/www/system_certmanager.php @@ -955,7 +955,7 @@ function internalca_change() { </tr> <tr> <td> </td> - <td colspan="3">NOTE: You can only delete a certificate if it is not currently in use.</td> + <td colspan="3"><?=gettext("Note: You can only delete a certificate if it is not currently in use.");?></td> </tr> </table> |