diff options
author | Renato Botelho <renato@netgate.com> | 2015-12-07 15:22:35 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-12-07 15:22:35 -0200 |
commit | c63bbd9ffc727ad6ed7d1079eeb43e10409e7f2a (patch) | |
tree | a81f8681fb260fdcb9fc1878804117ec297fd0b2 /src/usr | |
parent | f708dec69439f0f2c02dd98d3960863bb3bfdbe2 (diff) | |
parent | 0cd42f9baa86277072092d295bfb9de021f1fce0 (diff) | |
download | pfsense-c63bbd9ffc727ad6ed7d1079eeb43e10409e7f2a.zip pfsense-c63bbd9ffc727ad6ed7d1079eeb43e10409e7f2a.tar.gz |
Merge pull request #2179 from phil-davis/IPsec
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/vpn_ipsec.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_keys.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_keys_edit.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_mobile.php | 6 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_phase1.php | 10 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_phase2.php | 10 | ||||
-rw-r--r-- | src/usr/local/www/vpn_ipsec_settings.php | 6 |
7 files changed, 23 insertions, 19 deletions
diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index b437e41..6087ec9 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -250,14 +250,14 @@ if ($_POST) { } } -$pgtitle = array(gettext("VPN"), gettext("IPsec")); +$pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Tunnels")); $shortcut_section = "ipsec"; include("head.inc"); $tab_array = array(); $tab_array[] = array(gettext("Tunnels"), true, "vpn_ipsec.php"); -$tab_array[] = array(gettext("Mobile clients"), false, "vpn_ipsec_mobile.php"); +$tab_array[] = array(gettext("Mobile Clients"), false, "vpn_ipsec_mobile.php"); $tab_array[] = array(gettext("Pre-Shared Keys"), false, "vpn_ipsec_keys.php"); $tab_array[] = array(gettext("Advanced Settings"), false, "vpn_ipsec_settings.php"); display_top_tabs($tab_array); diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index 0e8f894..7dbd8e7 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -102,7 +102,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Keys")); +$pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Pre-Shared Keys")); $shortcut_section = "ipsec"; include("head.inc"); @@ -121,7 +121,7 @@ if (is_subsystem_dirty('ipsec')) <?php $tab_array = array(); $tab_array[0] = array(gettext("Tunnels"), false, "vpn_ipsec.php"); - $tab_array[1] = array(gettext("Mobile clients"), false, "vpn_ipsec_mobile.php"); + $tab_array[1] = array(gettext("Mobile Clients"), false, "vpn_ipsec_mobile.php"); $tab_array[2] = array(gettext("Pre-Shared Keys"), true, "vpn_ipsec_keys.php"); $tab_array[3] = array(gettext("Advanced Settings"), false, "vpn_ipsec_settings.php"); display_top_tabs($tab_array); diff --git a/src/usr/local/www/vpn_ipsec_keys_edit.php b/src/usr/local/www/vpn_ipsec_keys_edit.php index a55a728..981e3a7 100644 --- a/src/usr/local/www/vpn_ipsec_keys_edit.php +++ b/src/usr/local/www/vpn_ipsec_keys_edit.php @@ -152,7 +152,7 @@ if ($_POST) { } } -$pgtitle = gettext("VPN: IPsec: Edit Pre-Shared Key"); +$pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Pre-Shared Key"), gettext("Edit")); $shortcut_section = "ipsec"; include("head.inc"); diff --git a/src/usr/local/www/vpn_ipsec_mobile.php b/src/usr/local/www/vpn_ipsec_mobile.php index 9d7f524..974e452 100644 --- a/src/usr/local/www/vpn_ipsec_mobile.php +++ b/src/usr/local/www/vpn_ipsec_mobile.php @@ -336,7 +336,7 @@ if ($_POST['save']) { } } -$pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Mobile")); +$pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Mobile Clients")); $shortcut_section = "ipsec"; include("head.inc"); @@ -443,8 +443,8 @@ if ($input_errors) $tab_array = array(); $tab_array[0] = array(gettext("Tunnels"), false, "vpn_ipsec.php"); -$tab_array[1] = array(gettext("Mobile clients"), true, "vpn_ipsec_mobile.php"); -$tab_array[2] = array(gettext("Pre-Shared Key"), false, "vpn_ipsec_keys.php"); +$tab_array[1] = array(gettext("Mobile Clients"), true, "vpn_ipsec_mobile.php"); +$tab_array[2] = array(gettext("Pre-Shared Keys"), false, "vpn_ipsec_keys.php"); $tab_array[3] = array(gettext("Advanced Settings"), false, "vpn_ipsec_settings.php"); display_top_tabs($tab_array); diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php index 70bd951..703a993 100644 --- a/src/usr/local/www/vpn_ipsec_phase1.php +++ b/src/usr/local/www/vpn_ipsec_phase1.php @@ -626,9 +626,11 @@ function build_eal_list() { } if ($pconfig['mobile']) { - $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Edit Phase 1"), gettext("Mobile Client")); + $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Mobile Client"), gettext("Edit Phase 1")); + $editing_mobile = true; } else { - $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Edit Phase 1")); + $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Tunnel"), gettext("Edit Phase 1")); + $editing_mobile = false; } $shortcut_section = "ipsec"; @@ -640,8 +642,8 @@ if ($input_errors) { } $tab_array = array(); -$tab_array[] = array(gettext("Tunnels"), true, "vpn_ipsec.php"); -$tab_array[] = array(gettext("Mobile clients"), false, "vpn_ipsec_mobile.php"); +$tab_array[] = array(gettext("Tunnels"), !$editing_mobile, "vpn_ipsec.php"); +$tab_array[] = array(gettext("Mobile Clients"), $editing_mobile, "vpn_ipsec_mobile.php"); $tab_array[] = array(gettext("Pre-Shared Keys"), false, "vpn_ipsec_keys.php"); $tab_array[] = array(gettext("Advanced Settings"), false, "vpn_ipsec_settings.php"); display_top_tabs($tab_array); diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php index f402917..85d5f1c 100644 --- a/src/usr/local/www/vpn_ipsec_phase2.php +++ b/src/usr/local/www/vpn_ipsec_phase2.php @@ -436,9 +436,11 @@ if ($_POST) { } if ($pconfig['mobile']) { - $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Edit Phase 2"), gettext("Mobile Client")); + $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Mobile Client"), gettext("Edit Phase 2")); + $editing_mobile = true; } else { - $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Edit Phase 2")); + $pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Tunnel"), gettext("Edit Phase 2")); + $editing_mobile = false; } $shortcut_section = "ipsec"; @@ -515,8 +517,8 @@ if ($input_errors) print_input_errors($input_errors); $tab_array = array(); -$tab_array[0] = array(gettext("Tunnels"), true, "vpn_ipsec.php"); -$tab_array[1] = array(gettext("Mobile clients"), false, "vpn_ipsec_mobile.php"); +$tab_array[0] = array(gettext("Tunnels"), !$editing_mobile, "vpn_ipsec.php"); +$tab_array[1] = array(gettext("Mobile Clients"), $editing_mobile, "vpn_ipsec_mobile.php"); $tab_array[2] = array(gettext("Pre-Shared Keys"), false, "vpn_ipsec_keys.php"); $tab_array[3] = array(gettext("Advanced Settings"), false, "vpn_ipsec_settings.php"); display_top_tabs($tab_array); diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php index 06677f2..62a6869 100644 --- a/src/usr/local/www/vpn_ipsec_settings.php +++ b/src/usr/local/www/vpn_ipsec_settings.php @@ -231,7 +231,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Settings")); +$pgtitle = array(gettext("VPN"), gettext("IPsec"), gettext("Advanced Settings")); $shortcut_section = "ipsec"; include("head.inc"); @@ -260,8 +260,8 @@ if ($input_errors) $tab_array = array(); $tab_array[0] = array(gettext("Tunnels"), false, "vpn_ipsec.php"); -$tab_array[1] = array(gettext("Mobile clients"), false, "vpn_ipsec_mobile.php"); -$tab_array[2] = array(gettext("Pre-Shared Key"), false, "vpn_ipsec_keys.php"); +$tab_array[1] = array(gettext("Mobile Clients"), false, "vpn_ipsec_mobile.php"); +$tab_array[2] = array(gettext("Pre-Shared Keys"), false, "vpn_ipsec_keys.php"); $tab_array[3] = array(gettext("Advanced Settings"), true, "vpn_ipsec_settings.php"); display_top_tabs($tab_array); |