From 3115a6de1c24a9084a1e13dd9b21587a679b21e1 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 17 Nov 2009 22:51:08 -0500
Subject: Correct memory usage and simplify output

---
 config/haproxy/haproxy.inc               | 4 +++-
 config/haproxy/haproxy_backends_edit.php | 1 -
 config/haproxy/haproxy_global.php        | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'config')

diff --git a/config/haproxy/haproxy.inc b/config/haproxy/haproxy.inc
index 652d0a63..e3028e4c 100644
--- a/config/haproxy/haproxy.inc
+++ b/config/haproxy/haproxy.inc
@@ -86,7 +86,7 @@ run_rc_command "\$1"
 
 EOD;
 
-	$fd = fopen("/usr/local/etc/rc.d/haproxy.sh", "w");
+	$fd = fopen("/usr/local/etc/rc.d/haproxy.sh", "W");
 	fwrite($fd, $haproxy);
 	fclose($fd);
 	exec("chmod a+rx /usr/local/etc/rc.d/haproxy.sh");
@@ -119,6 +119,7 @@ function haproxy_configure() {
 		fwrite ($fd, "\n");
 	}
 
+	// Construct and write out configuration file
 	if(is_array($a_backends)) {
 		foreach ($a_backends as $backend) {
 
@@ -195,6 +196,7 @@ function haproxy_configure() {
 			}
 			fwrite ($fd, "\n");
 		}
+		// Sync HAProxy configuration (if enabled)
 		if(isset($config['installedpackages']['haproxy']['enablesync'])) {
 			if($config['installedpackages']['haproxy']['synchost1']) {
 				haproxy_do_xmlrpc_sync($config['installedpackages']['haproxy']['synchost1'], 
diff --git a/config/haproxy/haproxy_backends_edit.php b/config/haproxy/haproxy_backends_edit.php
index 80616dc6..70bfa28f 100755
--- a/config/haproxy/haproxy_backends_edit.php
+++ b/config/haproxy/haproxy_backends_edit.php
@@ -366,7 +366,6 @@ include("head.inc");
 <?php if($one_two): ?>
 <p class="pgtitle"><?=$pgtitle?></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>
 			<td colspan="2" valign="top" class="listtopic">Edit haproxy backend</td>
diff --git a/config/haproxy/haproxy_global.php b/config/haproxy/haproxy_global.php
index 609c4b4e..0dfe6523 100755
--- a/config/haproxy/haproxy_global.php
+++ b/config/haproxy/haproxy_global.php
@@ -173,19 +173,19 @@ function enable_change(enable_change) {
 						</tr>
 						<tr>
 							<td align="right"><font size=-1>999</td>
-							<td><font size=-1>3276 Kilobytes</td>
+							<td><font size=-1>1888K</td>
 						</tr>
 						<tr>
 							<td align="right"><font size=-1>99999</td>
-							<td><font size=-1>8032 Kilobytes</td>
+							<td><font size=-1>8032K</td>
 						</tr>
 						<tr>
 							<td align="right"><font size=-1>999999</td>
-							<td><font size=-1>50016 Kilobytes</td>
+							<td><font size=-1>50016K</td>
 						</tr>
 						<tr>
 							<td align="right"><font size=-1>9999999</td>
-							<td><font size=-1>467 Megabytes</td>
+							<td><font size=-1>467M</td>
 						</tr>
 					</table>
 					</td></tr></table>
-- 
cgit v1.2.3