aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-12-28 17:50:19 -0500
committerScott Ullrich <sullrich@pfsense.org>2009-12-28 17:50:19 -0500
commitf97891b1d641ddc03837e776baaa347ff98837a7 (patch)
tree3f7980df75d2be29b659a4d40afc517e91984009
parent223eb01c5880267202cacc60108c3108b2b08eee (diff)
downloadpfsense-packages-f97891b1d641ddc03837e776baaa347ff98837a7.tar.gz
pfsense-packages-f97891b1d641ddc03837e776baaa347ff98837a7.tar.bz2
pfsense-packages-f97891b1d641ddc03837e776baaa347ff98837a7.zip
Using base64_deocde() and base64_encode() note the missing _
-rw-r--r--config/haproxy/haproxy.inc4
-rwxr-xr-xconfig/haproxy/haproxy_frontends_edit.php4
-rwxr-xr-xconfig/haproxy/haproxy_global.php4
-rwxr-xr-xconfig/haproxy/haproxy_servers_edit.php2
4 files changed, 7 insertions, 7 deletions
diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index 29827d39..7f57ae33 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -153,7 +153,7 @@ function haproxy_configure() {
// Advanced pass trhu
if($backend['advanced'])
- fwrite ($fd, "\t" . str_replace("\n", " ", base64decode($backend['advanced'])) . "\n");
+ fwrite ($fd, "\t" . str_replace("\n", " ", base64_decode($backend['advanced'])) . "\n");
// https is an alias for tcp for clarity purpouses
if(strtolower($backend['type']) == "https") {
@@ -234,7 +234,7 @@ function haproxy_configure() {
$server_ports[] = $server['port'];
}
if($server['advanced'])
- $advanced_txt = " " . str_replace("\n", " ", base64decode($server['advanced']));
+ $advanced_txt = " " . str_replace("\n", " ", base64_decode($server['advanced']));
else
$advanced_txt = "";
foreach($server_ports as $pport)
diff --git a/config/haproxy/haproxy_frontends_edit.php b/config/haproxy/haproxy_frontends_edit.php
index a752b4b1..7f6562ad 100755
--- a/config/haproxy/haproxy_frontends_edit.php
+++ b/config/haproxy/haproxy_frontends_edit.php
@@ -70,7 +70,7 @@ if (isset($id) && $a_backend[$id]) {
$pconfig['client_timeout'] = $a_backend[$id]['client_timeout'];
$pconfig['port'] = $a_backend[$id]['port'];
$pconfig['a_acl']=&$a_backend[$id]['ha_acls']['item'];
- $pconfig['advanced'] = base64decode($a_backend[$id]['advanced']);
+ $pconfig['advanced'] = base64_decode($a_backend[$id]['advanced']);
}
@@ -232,7 +232,7 @@ if ($_POST) {
update_if_changed("extaddr", $backend['extaddr'], $_POST['extaddr']);
update_if_changed("max_connections", $backend['max_connections'], $_POST['max_connections']);
update_if_changed("client_timeout", $backend['client_timeout'], $_POST['client_timeout']);
- update_if_changed("advanced", $backend['advanced'], base64encode($_POST['advanced']));
+ update_if_changed("advanced", $backend['advanced'], base64_encode($_POST['advanced']));
$backend['ha_acls']['item'] = $a_acl;
diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php
index 9db0c216..dc0949b4 100755
--- a/config/haproxy/haproxy_global.php
+++ b/config/haproxy/haproxy_global.php
@@ -77,7 +77,7 @@ if ($_POST) {
$config['installedpackages']['haproxy']['synchost2'] = $_POST['synchost3'] ? $_POST['synchost3'] : false;
$config['installedpackages']['haproxy']['remotesyslog'] = $_POST['remotesyslog'] ? $_POST['remotesyslog'] : false;
$config['installedpackages']['haproxy']['syncpassword'] = $_POST['syncpassword'] ? $_POST['syncpassword'] : false;
- $config['installedpackages']['haproxy']['advanced'] = base64encode($_POST['advanced']) ? $_POST['advanced'] : false;
+ $config['installedpackages']['haproxy']['advanced'] = base64_encode($_POST['advanced']) ? $_POST['advanced'] : false;
touch($d_haproxyconfdirty_path);
write_config();
}
@@ -93,7 +93,7 @@ $pconfig['synchost1'] = $config['installedpackages']['haproxy']['synchost1'];
$pconfig['synchost2'] = $config['installedpackages']['haproxy']['synchost2'];
$pconfig['synchost3'] = $config['installedpackages']['haproxy']['synchost3'];
$pconfig['remotesyslog'] = $config['installedpackages']['haproxy']['remotesyslog'];
-$pconfig['advanced'] = base64decode($config['installedpackages']['haproxy']['advanced']);
+$pconfig['advanced'] = base64_decode($config['installedpackages']['haproxy']['advanced']);
$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
if(strstr($pfSversion, "1.2"))
diff --git a/config/haproxy/haproxy_servers_edit.php b/config/haproxy/haproxy_servers_edit.php
index cc034821..15f2c8d9 100755
--- a/config/haproxy/haproxy_servers_edit.php
+++ b/config/haproxy/haproxy_servers_edit.php
@@ -123,7 +123,7 @@ if ($_POST) {
update_if_changed("weight", $server['weight'], $_POST['weight']);
update_if_changed("status", $server['status'], $_POST['status']);
update_if_changed("address", $server['address'], $_POST['address']);
- update_if_changed("advanced", $server['advanced'], base64encode($_POST['advanced']));
+ update_if_changed("advanced", $server['advanced'], base64_encode($_POST['advanced']));
if (isset($id) && $a_server[$id]) {
$a_server[$id] = $server;