summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Marquette <billm@pfsense.org>2005-07-03 17:04:44 +0000
committerBill Marquette <billm@pfsense.org>2005-07-03 17:04:44 +0000
commitb128368a99b46308406b0082effb6dd2fe1e4284 (patch)
treea199e6a13b1e2c994a85634476bc2be5d5864459
parent74f446e877ad9bcf0a953de2007acaa2595f7cc7 (diff)
downloadpfsense-b128368a99b46308406b0082effb6dd2fe1e4284.zip
pfsense-b128368a99b46308406b0082effb6dd2fe1e4284.tar.gz
Use $pgtitle
-rwxr-xr-xusr/local/www/vpn_ipsec.php4
-rwxr-xr-xusr/local/www/vpn_ipsec_ca.php4
-rwxr-xr-xusr/local/www/vpn_ipsec_ca_edit.php5
-rwxr-xr-xusr/local/www/vpn_ipsec_ca_edit_create_cert.php6
-rwxr-xr-xusr/local/www/vpn_ipsec_edit.php6
-rwxr-xr-xusr/local/www/vpn_ipsec_keys.php6
-rwxr-xr-xusr/local/www/vpn_ipsec_keys_edit.php4
-rwxr-xr-xusr/local/www/vpn_ipsec_mobile.php4
-rwxr-xr-xusr/local/www/vpn_openvpn.php5
-rwxr-xr-xusr/local/www/vpn_openvpn_cli.php5
-rwxr-xr-xusr/local/www/vpn_openvpn_cli_edit.php5
-rwxr-xr-xusr/local/www/vpn_openvpn_create_certs.php5
-rwxr-xr-xusr/local/www/vpn_pptp.php3
-rwxr-xr-xusr/local/www/vpn_pptp_users.php3
-rwxr-xr-xusr/local/www/vpn_pptp_users_edit.php3
15 files changed, 33 insertions, 35 deletions
diff --git a/usr/local/www/vpn_ipsec.php b/usr/local/www/vpn_ipsec.php
index b1f5e1e..daf232c 100755
--- a/usr/local/www/vpn_ipsec.php
+++ b/usr/local/www/vpn_ipsec.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: IPsec";
require("guiconfig.inc");
if (!is_array($config['ipsec']['tunnel'])) {
@@ -82,6 +81,7 @@ if ($_GET['act'] == "del") {
}
}
+$pgtitle = "VPN: IPsec";
include("head.inc");
?>
@@ -89,7 +89,7 @@ include("head.inc");
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?php echo $pgtitle; ?></p>
+<p class="pgtitle"><?=$pgtitle?></p>
<form action="vpn_ipsec.php" method="post">
<?php if ($savemsg) print_info_box($savemsg); ?>
<?php if (file_exists($d_ipsecconfdirty_path)): ?><p>
diff --git a/usr/local/www/vpn_ipsec_ca.php b/usr/local/www/vpn_ipsec_ca.php
index 9f3542f..6fb04e1 100755
--- a/usr/local/www/vpn_ipsec_ca.php
+++ b/usr/local/www/vpn_ipsec_ca.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: IPsec";
require("guiconfig.inc");
if (!is_array($config['ipsec']['cacert'])) {
@@ -48,6 +47,7 @@ if ($_GET['act'] == "del") {
}
}
+$pgtitle = "VPN: IPsec: Certificate Authority";
include("head.inc");
?>
@@ -55,7 +55,7 @@ include("head.inc");
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle">IPSEC: Certificate Authority</p>
+<p class="pgtitle"><?=$pgtitle?></p>
<form action="vpn_ipsec.php" method="post">
<?php if ($savemsg) print_info_box($savemsg); ?>
<?php if (file_exists($d_ipsecconfdirty_path)): ?><p>
diff --git a/usr/local/www/vpn_ipsec_ca_edit.php b/usr/local/www/vpn_ipsec_ca_edit.php
index c50f64e..a857fd8 100755
--- a/usr/local/www/vpn_ipsec_ca_edit.php
+++ b/usr/local/www/vpn_ipsec_ca_edit.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: IPsec: Edit CA certificate";
require("guiconfig.inc");
if (!is_array($config['ipsec']['cacert'])) {
@@ -94,14 +93,14 @@ if ($_POST) {
}
}
-$pgtitle = "VPN: Ipsec: CA: Edit";
+$pgtitle = "VPN: IPsec: Certificate Authority: Edit";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle">IPSEC: Certificate Authority: Create Certificates</p>
+<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<form action="vpn_ipsec_ca_edit.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
diff --git a/usr/local/www/vpn_ipsec_ca_edit_create_cert.php b/usr/local/www/vpn_ipsec_ca_edit_create_cert.php
index 6e1acef..66f2521 100755
--- a/usr/local/www/vpn_ipsec_ca_edit_create_cert.php
+++ b/usr/local/www/vpn_ipsec_ca_edit_create_cert.php
@@ -142,14 +142,14 @@ if($_POST) {
fclose($fd);
conf_mount_ro();
+$pgtitle = "VPN: IPSec: Certificate Authority: Create Certificate";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<? include('fbegin.inc'); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
<form action="vpn_ipsec_ca_edit_create_cert.php" method="post" name="iform" id="iform">
-<?
- include('fbegin.inc');
-?>
<p class="pgtitle">
<?=$pgtitle?>
</p>
diff --git a/usr/local/www/vpn_ipsec_edit.php b/usr/local/www/vpn_ipsec_edit.php
index 23f87f0..eea483c 100755
--- a/usr/local/www/vpn_ipsec_edit.php
+++ b/usr/local/www/vpn_ipsec_edit.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: IPsec: Edit tunnel";
require("guiconfig.inc");
if (!is_array($config['ipsec']['tunnel'])) {
@@ -228,13 +227,14 @@ if ($_POST) {
}
}
+$pgtitle = "VPN: IPsec: Edit tunnel";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?php echo $pgtitle; ?></p>
+<p class="pgtitle"><?=$pgtitle?></p>
<script language="JavaScript">
<!--
function typesel_change() {
@@ -577,4 +577,4 @@ function address_to_pconfig_vpn($adr, &$padr, &$pmask) {
}
}
-?> \ No newline at end of file
+?>
diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php
index f002d38..e85db8e 100755
--- a/usr/local/www/vpn_ipsec_keys.php
+++ b/usr/local/www/vpn_ipsec_keys.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: IPsec";
require("guiconfig.inc");
if (!is_array($config['ipsec']['mobilekey'])) {
@@ -48,13 +47,14 @@ if ($_GET['act'] == "del") {
}
}
+$pgtitle = "VPN: IPsec: Keys";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?php echo $pgtitle; ?></p>
+<p class="pgtitle"><?=$pgtitle?></p>
<form action="vpn_ipsec.php" method="post">
<?php if ($savemsg) print_info_box($savemsg); ?>
<?php if (file_exists($d_ipsecconfdirty_path)): ?><p>
@@ -109,4 +109,4 @@ Rounded("div#mainarea","bl br","#FFF","#eeeeee","smooth");
</script>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/usr/local/www/vpn_ipsec_keys_edit.php b/usr/local/www/vpn_ipsec_keys_edit.php
index 65d62aa..578db73 100755
--- a/usr/local/www/vpn_ipsec_keys_edit.php
+++ b/usr/local/www/vpn_ipsec_keys_edit.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: IPsec: Edit pre-shared key";
require("guiconfig.inc");
if (!is_array($config['ipsec']['mobilekey'])) {
@@ -92,13 +91,14 @@ if ($_POST) {
}
}
+$pgtitle = "VPN: IPsec: Edit pre-shared key";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?php echo $pgtitle; ?></p>
+<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<form action="vpn_ipsec_keys_edit.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
diff --git a/usr/local/www/vpn_ipsec_mobile.php b/usr/local/www/vpn_ipsec_mobile.php
index 9251443..bfcacbb 100755
--- a/usr/local/www/vpn_ipsec_mobile.php
+++ b/usr/local/www/vpn_ipsec_mobile.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: IPsec";
require("guiconfig.inc");
if (!is_array($config['ipsec']['mobileclients'])) {
@@ -162,12 +161,13 @@ if ($_POST) {
}
}
+$pgtitle = "VPN: IPsec: Mobile";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?php echo $pgtitle; ?></p>
+<p class="pgtitle"><?=$pgtitle?></p>
<script language="JavaScript">
<!--
function methodsel_change() {
diff --git a/usr/local/www/vpn_openvpn.php b/usr/local/www/vpn_openvpn.php
index d2596f2..dfa64e1 100755
--- a/usr/local/www/vpn_openvpn.php
+++ b/usr/local/www/vpn_openvpn.php
@@ -28,7 +28,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: OpenVPN";
require("guiconfig.inc");
require_once("openvpn.inc");
@@ -147,14 +146,14 @@ if ($_POST) {
/* Simply take a copy of the array */
$pconfig = $config['ovpn']['server'];
-$pgtitle = "Firewall: NAT: Inbound";
+$pgtitle = "VPN: OpenVPN";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
-<p class="pgtitle"><?php echo $pgtitle; ?></p>
+<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if (file_exists($d_sysrebootreqd_path)) print_info_box(get_std_save_message(0)); ?>
diff --git a/usr/local/www/vpn_openvpn_cli.php b/usr/local/www/vpn_openvpn_cli.php
index ddfe9fc..f00b7c8 100755
--- a/usr/local/www/vpn_openvpn_cli.php
+++ b/usr/local/www/vpn_openvpn_cli.php
@@ -28,7 +28,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: OpenVPN";
require("guiconfig.inc");
require_once("openvpn.inc");
@@ -68,17 +67,17 @@ if ($_GET['act'] == "del") {
}
}
-$pgtitle = $pgtitle;
+$pgtitle = "VPN: OpenVPN: Client";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if (file_exists($d_sysrebootreqd_path) && !file_exists($d_ovpnclidirty_path)) print_info_box(get_std_save_message(0)); ?>
<form action="vpn_openvpn_cli.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
-<p class="pgtitle"><?php echo $pgtitle; ?></p>
<?php if (file_exists($d_ovpnclidirty_path)): ?><p>
<?php print_info_box_np("The OpenVPN client configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
<input name="apply" type="submit" class="formbtn" id="apply" value="Apply changes"></p>
diff --git a/usr/local/www/vpn_openvpn_cli_edit.php b/usr/local/www/vpn_openvpn_cli_edit.php
index 279e428..21fb09f 100755
--- a/usr/local/www/vpn_openvpn_cli_edit.php
+++ b/usr/local/www/vpn_openvpn_cli_edit.php
@@ -28,7 +28,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: OpenVPN: Edit client";
require("guiconfig.inc");
require_once("openvpn.inc");
@@ -187,15 +186,15 @@ if (isset($_POST['pull'])) {
}
}
-$pgtitle = $pgtitle;
+$pgtitle = "VPN: OpenVPN: Edit client";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
-<p class="pgtitle">IPSEC: OpenVPN Edit</p>
<form action="vpn_openvpn_cli_edit.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
diff --git a/usr/local/www/vpn_openvpn_create_certs.php b/usr/local/www/vpn_openvpn_create_certs.php
index fe363e3..8164bd0 100755
--- a/usr/local/www/vpn_openvpn_create_certs.php
+++ b/usr/local/www/vpn_openvpn_create_certs.php
@@ -176,11 +176,10 @@ function f(ta_id){
</script>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-
+<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
<form action="system_advanced_create_certs.php" method="post" name="iform" id="iform">
-<?php include("fbegin.inc"); ?>
- <p class="pgtitle">OpenVPN - Create Certificates</p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>
<p>
diff --git a/usr/local/www/vpn_pptp.php b/usr/local/www/vpn_pptp.php
index feeb739..89a99dd 100755
--- a/usr/local/www/vpn_pptp.php
+++ b/usr/local/www/vpn_pptp.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN PPTP";
require("guiconfig.inc");
if (!is_array($config['pptpd']['radius'])) {
@@ -122,12 +121,14 @@ if ($_POST) {
}
}
+$pgtitle = "VPN PPTP";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
<script language="JavaScript">
<!--
function get_radio_value(obj)
diff --git a/usr/local/www/vpn_pptp_users.php b/usr/local/www/vpn_pptp_users.php
index 30f3f09..c2deee6 100755
--- a/usr/local/www/vpn_pptp_users.php
+++ b/usr/local/www/vpn_pptp_users.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = "VPN: PPTP";
require("guiconfig.inc");
if (!is_array($config['pptpd']['user'])) {
@@ -67,12 +66,14 @@ if ($_GET['act'] == "del") {
}
}
+$pgtitle = "VPN: PPTP: Users";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
<form action="vpn_pptp_users.php" method="post">
<?php if ($savemsg) print_info_box($savemsg); ?>
<?php if (isset($config['pptpd']['radius']['enable']))
diff --git a/usr/local/www/vpn_pptp_users_edit.php b/usr/local/www/vpn_pptp_users_edit.php
index 98f9164..683b717 100755
--- a/usr/local/www/vpn_pptp_users_edit.php
+++ b/usr/local/www/vpn_pptp_users_edit.php
@@ -29,7 +29,6 @@
POSSIBILITY OF SUCH DAMAGE.
*/
-$pgtitle = array("VPN", "PPTP", "Edit user");
require("guiconfig.inc");
if (!is_array($config['pptpd']['user'])) {
@@ -110,11 +109,13 @@ if ($_POST) {
}
}
+$pgtitle = "VPN: PPTP: Edit User";
include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
+<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<form action="vpn_pptp_users_edit.php" method="post" name="iform" id="iform">
<div id="mainarea">
OpenPOWER on IntegriCloud