diff options
| author | Evgeny Yurchenko <ey@tm-k.com> | 2011-06-02 18:03:29 -0400 |
|---|---|---|
| committer | Evgeny Yurchenko <ey@tm-k.com> | 2011-06-02 18:03:29 -0400 |
| commit | 67dde8b052369be24d25e94bc1d2070a08c56f2a (patch) | |
| tree | 2870ee7142eae6d9548ee921b49f7d6d26e54f11 /usr | |
| parent | b717f1bc62decb9a02404d427742c352b2b3fbec (diff) | |
| parent | f451ea09a29a7ba21bd67bdfbc8c66f89245f0a9 (diff) | |
| download | pfsense-67dde8b052369be24d25e94bc1d2070a08c56f2a.zip pfsense-67dde8b052369be24d25e94bc1d2070a08c56f2a.tar.gz | |
Merge remote branch 'origin/master'
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/diag_ipsec_sad.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/interfaces.php | 1 | ||||
| -rw-r--r-- | usr/local/www/system_advanced_misc.php | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index 7ee8b72..e08feba 100755 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -90,6 +90,7 @@ if ($_GET['act'] == "del") { <td nowrap class="listhdrr"><?=gettext("SPI");?></td> <td nowrap class="listhdrr"><?=gettext("Enc. alg.");?></td> <td nowrap class="listhdr"><?=gettext("Auth. alg.");?></td> + <td nowrap class="listhdr"><?=gettext("Data");?></td> <td nowrap class="list"></td> </tr> <?php foreach ($sad as $sa): ?> @@ -100,6 +101,7 @@ if ($_GET['act'] == "del") { <td class="listr"><?=htmlspecialchars($sa['spi']);?></td> <td class="listr"><?=htmlspecialchars($sa['ealgo']);?></td> <td class="listr"><?=htmlspecialchars($sa['aalgo']);?></td> + <td class="listr"><?=htmlspecialchars($sa['data']);?></td> <td class="list" nowrap> <?php $args = "src=" . rawurlencode($sa['src']); diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php index b3e7b0a..fc905b4 100755 --- a/usr/local/www/interfaces.php +++ b/usr/local/www/interfaces.php @@ -1192,6 +1192,7 @@ $types = array("none" => gettext("None"), "static" => gettext("Static"), "dhcp" if ($mediaopt_from_config == 'autoselect ' || $mediaopt_from_config == ' ') echo "style='display:none'>"; else echo '>'; echo '<select name="mediaopt" class="formselect" id="mediaopt">'; + print "<option value=\"\">Default</option>"; foreach($mediaopts_list as $mediaopt){ if ($mediaopt != rtrim($mediaopt_from_config)){ print "<option value=\"$mediaopt\">" . gettext("$mediaopt") . "</option>"; diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php index 21bff54..2264365 100644 --- a/usr/local/www/system_advanced_misc.php +++ b/usr/local/www/system_advanced_misc.php @@ -280,7 +280,7 @@ function maxmss_checked(obj) { <tr> <td width="22%" valign="top" class="vncell"><?=gettext("Load Balancing"); ?></td> <td width="78%" class="vtable"> - <input name="lb_use_sticky" type="checkbox" id="gw_switch_default" value="yes" <?php if ($pconfig['gw_switch_default']) echo "checked=\"checked\""; ?> /> + <input name="gw_switch_default" type="checkbox" id="gw_switch_default" value="yes" <?php if ($pconfig['gw_switch_default']) echo "checked=\"checked\""; ?> /> <strong><?=gettext("Allow default gateway switching"); ?></strong><br/> <?=gettext("If the link where the default gateway resides fails " . "switch the default gateway to another available one."); ?> |
