aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-10-13 21:49:33 -0400
committerScott Ullrich <sullrich@pfsense.org>2009-10-13 21:49:33 -0400
commit06ffa37cc93684db363f01c197a14ec85ac2e0b8 (patch)
treee9fc1c62250a2a16e7b55b2ac481e6a879c6b386
parent03b1246cd9c18ae9e2e880cf3c8c44b6bb8cb220 (diff)
downloadpfsense-packages-06ffa37cc93684db363f01c197a14ec85ac2e0b8.tar.gz
pfsense-packages-06ffa37cc93684db363f01c197a14ec85ac2e0b8.tar.bz2
pfsense-packages-06ffa37cc93684db363f01c197a14ec85ac2e0b8.zip
Add support for 1.2
-rwxr-xr-xconfig/haproxy/haproxy_backends.php7
-rwxr-xr-xconfig/haproxy/haproxy_backends_edit.php7
-rwxr-xr-xconfig/haproxy/haproxy_global.php7
-rwxr-xr-xconfig/haproxy/haproxy_servers.php4
-rwxr-xr-xconfig/haproxy/haproxy_servers_edit.php8
5 files changed, 32 insertions, 1 deletions
diff --git a/config/haproxy/haproxy_backends.php b/config/haproxy/haproxy_backends.php
index b1b3ce56..95c3d6b0 100755
--- a/config/haproxy/haproxy_backends.php
+++ b/config/haproxy/haproxy_backends.php
@@ -61,6 +61,10 @@ if ($_GET['act'] == "del") {
}
}
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+ $one_two = true;
+
$pgtitle = "Services: HAProxy: Backends";
include("head.inc");
@@ -68,6 +72,9 @@ include("head.inc");
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<form action="haproxy_backends.php" method="post">
+<?php if($one_two): ?>
+<p class="pgtitle"><?=$pgtitle?></font></p>
+<?php endif; ?>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>
<?php if (file_exists($d_haproxyconfdirty_path)): ?><p>
diff --git a/config/haproxy/haproxy_backends_edit.php b/config/haproxy/haproxy_backends_edit.php
index 06b9d974..0863286e 100755
--- a/config/haproxy/haproxy_backends_edit.php
+++ b/config/haproxy/haproxy_backends_edit.php
@@ -245,6 +245,10 @@ if ($_POST) {
}
}
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+ $one_two = true;
+
$pgtitle = "HAProxy: Backend: Edit";
include("head.inc");
@@ -356,6 +360,9 @@ include("head.inc");
</script>
<?php include("fbegin.inc"); ?>
<?php if ($input_errors) print_input_errors($input_errors); ?>
+<?php if($one_two): ?>
+<p class="pgtitle"><?=$pgtitle?></font></p>
+<?php endif; ?>
<form action="haproxy_backends_edit.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>
diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php
index 53784027..02a50115 100755
--- a/config/haproxy/haproxy_global.php
+++ b/config/haproxy/haproxy_global.php
@@ -75,6 +75,10 @@ if ($_POST) {
}
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+ $one_two = true;
+
$pgtitle = "Services: HAProxy: Settings";
include("head.inc");
@@ -90,6 +94,9 @@ function enable_change(enable_change) {
}
//-->
</script>
+<?php if($one_two): ?>
+<p class="pgtitle"><?=$pgtitle?></font></p>
+<?php endif; ?>
<form action="haproxy_global.php" method="post" name="iform">
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>
diff --git a/config/haproxy/haproxy_servers.php b/config/haproxy/haproxy_servers.php
index 6533b704..f78b02e1 100755
--- a/config/haproxy/haproxy_servers.php
+++ b/config/haproxy/haproxy_servers.php
@@ -61,6 +61,10 @@ if ($_GET['act'] == "del") {
}
}
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+ $one_two = true;
+
$pgtitle = "Services: HAProxy: Backends";
include("head.inc");
diff --git a/config/haproxy/haproxy_servers_edit.php b/config/haproxy/haproxy_servers_edit.php
index 475c847e..32460f08 100755
--- a/config/haproxy/haproxy_servers_edit.php
+++ b/config/haproxy/haproxy_servers_edit.php
@@ -130,6 +130,10 @@ if ($_POST) {
}
}
+$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
+if(strstr($pfSversion, "1.2"))
+ $one_two = true;
+
$pgtitle = "HAProxy: Server: Edit";
include("head.inc");
@@ -149,7 +153,9 @@ function clearcombo(){
<?php include("fbegin.inc"); ?>
<?php if ($input_errors) print_input_errors($input_errors); ?>
-
+<?php if($one_two): ?>
+<p class="pgtitle"><?=$pgtitle?></font></p>
+<?php endif; ?>
<form action="haproxy_servers_edit.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="6" cellspacing="0">
<tr>