Merge pull request #557 from PiBa-NL/haproxy_spellcheck

haproxy-devel, -made more consistent use of frontend/backend text

7 files changed, 72 insertions, 31 deletions

diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index 4da961de..f768ef01 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -281,6 +281,18 @@ EOD;
 				$bind['httpclose'] = "httpclose";
 				$writeconfigupdate = true;
 			}
+			if (!$bind['extaddr']){
+				$bind['extaddr'] = "wan_ipv4";
+				$writeconfigupdate = true;
+			}
+			if ($bind['extaddr'] == "localhost"){
+				$bind['extaddr'] = "localhost_ipv4";
+				$writeconfigupdate = true;
+			}
+			if ($bind['extaddr'] == "any"){
+				$bind['extaddr'] = "any_ipv4";
+				$writeconfigupdate = true;
+			}
 		}
 	}
 	if ($writeconfigupdate)
@@ -721,7 +733,7 @@ function haproxy_writeconf($configfile) {
 			fwrite ($fd, "\ttimeout client\t\t" . $bind['client_timeout'] . "\n");
 
 	
-			// Combine the rest of the listener configs
+			// Combine the rest of the frontend configs
 			$default_backend = "";
 			$i = 0;
 			foreach ($bind['config'] as $bconfig) {
@@ -1124,6 +1136,17 @@ function get_frontend_acls($frontend) {
 	return $result;
 }
 
+function get_backend($name) {
+	global $config;
+	$a_backend = &$config['installedpackages']['haproxy']['ha_pools']['item'];
+	foreach($a_backend as $key => $backend)
+	{
+		if ($backend['name'] == $name)
+			return $backend;
+	}
+	return null;
+}
+
 function haproxy_escapestring($configurationsting) {
 	$result = str_replace('\\', '\\\\', $configurationsting);
 	$result = str_replace(' ', '\\ ', $result);
diff --git a/config/haproxy-devel/haproxy_global.php b/config/haproxy-devel/haproxy_global.php
index 0ff0e10e..1a540b4f 100755
--- a/config/haproxy-devel/haproxy_global.php
+++ b/config/haproxy-devel/haproxy_global.php
@@ -43,7 +43,9 @@ if ($_POST) {
 	$pconfig = $_POST;
 	
 	if ($_POST['calculate_certificate_chain']) {
-		haproxy_recalculate_certifcate_chain();
+		$changed = haproxy_recalculate_certifcate_chain();
+		if ($changed > 0)
+			touch($d_haproxyconfdirty_path);
 	} else
 	if ($_POST['apply']) {
 		$result = haproxy_check_and_run($savemsg, true);
@@ -148,8 +150,8 @@ function enable_change(enable_change) {
 	/* active tabs */
 	$tab_array = array();
 	$tab_array[] = array("Settings", true, "haproxy_global.php");
-	$tab_array[] = array("Listener", false, "haproxy_listeners.php");	
-	$tab_array[] = array("Server Pool", false, "haproxy_pools.php");	
+	$tab_array[] = array("Frontend", false, "haproxy_listeners.php");	
+	$tab_array[] = array("Backend", false, "haproxy_pools.php");	
 	display_top_tabs($tab_array);
 	?>
 	</td></tr>
diff --git a/config/haproxy-devel/haproxy_listeners.php b/config/haproxy-devel/haproxy_listeners.php
index 397cef5c..f6325255 100644
--- a/config/haproxy-devel/haproxy_listeners.php
+++ b/config/haproxy-devel/haproxy_listeners.php
@@ -72,7 +72,7 @@ $pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
 if(strstr($pfSversion, "1.2"))
 	$one_two = true;
 	
-$pgtitle = "Services: HAProxy: Listener";
+$pgtitle = "Services: HAProxy: Frontends";
 include("head.inc");
 
 ?>
@@ -93,8 +93,8 @@ include("head.inc");
         /* active tabs */
         $tab_array = array();
 	$tab_array[] = array("Settings", false, "haproxy_global.php");
-        $tab_array[] = array("Listener", true, "haproxy_listeners.php");		
-	$tab_array[] = array("Server Pool", false, "haproxy_pools.php");
+        $tab_array[] = array("Frontend", true, "haproxy_listeners.php");		
+	$tab_array[] = array("Backend", false, "haproxy_pools.php");
 	display_top_tabs($tab_array);
   ?>
   </td></tr>
@@ -109,7 +109,7 @@ include("head.inc");
 		  <td width="30%" class="listhdrr">Description</td>
 		  <td width="20%" class="listhdrr">Address</td>
 		  <td width="5%" class="listhdrr">Type</td>
-		  <td width="10%" class="listhdrr">Server&nbsp;pool</td>
+		  <td width="10%" class="listhdrr">Backend</td>
 		  <td width="20%" class="listhdrr">Parent</td>
 		  <td width="5%" class="list"></td>
 		</tr>
@@ -171,6 +171,15 @@ include("head.inc");
 					if ($isadvset)
 						echo "<img src=\"$img_adv\" title=\"" . gettext("Advanced settings set") . ": {$isadvset}\" border=\"0\">";				
 					
+					$backend_serverpool = $frontend['backend_serverpool'];
+					$backend = get_backend($backend_serverpool );
+					$servers = $backend['ha_servers']['item'];
+					$backend_serverpool_hint = gettext("Servers in pool:");
+					if (is_array($servers)){
+						foreach($servers as $server){
+							$backend_serverpool_hint .= "\n".$server['address'].":".$server['port'];
+						}
+					}
 					?>
 				  </td>
 				  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$frontendname;?>';">
@@ -186,7 +195,9 @@ include("head.inc");
 					<?=$frontend['type']?>
 				  </td>
 				  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$frontendname;?>';">
+					<div title='<?=$backend_serverpool_hint;?>'>
 					<?=$frontend['backend_serverpool']?>
+					</div>
 				  </td>
 				  <td class="listlr" ondblclick="document.location='haproxy_listeners_edit.php?id=<?=$frontendname;?>';">
 					<?=$frontend['secondary'] == 'yes' ? $frontend['primary_frontend'] : "";?>
@@ -194,9 +205,9 @@ include("head.inc");
 				  <td class="list" nowrap>
 					<table border="0" cellspacing="0" cellpadding="1">
 					  <tr>
-						<td valign="middle"><a href="haproxy_listeners_edit.php?id=<?=$frontendname;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-						<td valign="middle"><a href="haproxy_listeners.php?act=del&id=<?=$frontendname;?>" onclick="return confirm('Do you really want to delete this entry?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
-						<td valign="middle"><a href="haproxy_listeners_edit.php?dup=<?=$frontendname;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+						<td valign="middle"><a href="haproxy_listeners_edit.php?id=<?=$frontendname;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif"  title="<?=gettext("edit frontend");?>" width="17" height="17" border="0"></a></td>
+						<td valign="middle"><a href="haproxy_listeners.php?act=del&id=<?=$frontendname;?>" onclick="return confirm('Do you really want to delete this entry?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete frontend");?>"  width="17" height="17" border="0"></a></td>
+						<td valign="middle"><a href="haproxy_listeners_edit.php?dup=<?=$frontendname;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("clone frontend");?>" width="17" height="17" border="0"></a></td>
 					  </tr>
 					</table>
 				  </td>
@@ -209,7 +220,7 @@ include("head.inc");
 			  <td class="list">
 				<table border="0" cellspacing="0" cellpadding="1">
 				  <tr>
-					<td valign="middle"><a href="haproxy_listeners_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+					<td valign="middle"><a href="haproxy_listeners_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new frontend");?>"  width="17" height="17" border="0"></a></td>
 				  </tr>
 				</table>
 			  </td>
diff --git a/config/haproxy-devel/haproxy_listeners_edit.php b/config/haproxy-devel/haproxy_listeners_edit.php
index 98fba74a..a51ae393 100644
--- a/config/haproxy-devel/haproxy_listeners_edit.php
+++ b/config/haproxy-devel/haproxy_listeners_edit.php
@@ -327,7 +327,7 @@ $interfaces = haproxy_get_bindable_interfaces();
 		else
 			seltext = "<?php echo haproxy_acl_select('http');?>";
 		if (seltext == '') {
-			alert("No ACL types available in current listener mode");
+			alert("No ACL types available in current frontend type");
 			return;
 		}
 
@@ -570,7 +570,7 @@ $interfaces = haproxy_get_bindable_interfaces();
 		<tr class="haproxy_primary" align="left">
 			<td width="22%" valign="top" class="vncellreq">External port</td>
 			<td width="78%" class="vtable" colspan="2">
-				<input name="port" type="text" <?if(isset($pconfig['port'])) echo "value=\"{$pconfig['port']}\"";?> size="30" maxlength="500">
+				<input name="port" type="text" <?if(isset($pconfig['port'])) echo "value=\"{$pconfig['port']}\"";?> size="10" maxlength="500">
 				<div>The port to listen to.  To specify multiple ports, separate with a comma (,). EXAMPLE: 80,443</div>
 			</td>
 		</tr>
@@ -734,7 +734,10 @@ $interfaces = haproxy_get_bindable_interfaces();
 			<td width="78%" class="vtable" colspan="2">
 				<input id="ssloffload" name="ssloffload" type="checkbox" value="yes" <?php if ($pconfig['ssloffload']=='yes') echo "checked";?> onclick="updatevisibility();"><strong>Use Offloading</strong></input>
 				<br/>
-				The SSL Offloading will reduce web servers load by encrypt data to users on internet and send it without encrytion to internal servers.  
+				SSL Offloading will reduce web servers load by maintaining and encrypting connection with users on internet while sending and retrieving data without encrytion to internal servers.
+				Also more ACL rules and http logging may be configured when this option is used. 
+				Certificates can be imported into the <a href="/system_camanager.php" target="_new">pfSense "Certificate Authority Manager"</a>
+				Please be aware this possibly will not work with all web applications. Some applications will require setting the SSL checkbox on the backend server configurations so the connection to the webserver will also be a encrypted connection, in that case there will be a slight overall performance loss.
 			</td>
 		</tr>
 		<tr class="haproxy_ssloffloading_enabled" align="left">
diff --git a/config/haproxy-devel/haproxy_pool_edit.php b/config/haproxy-devel/haproxy_pool_edit.php
index 92f4177e..312d6ecc 100644
--- a/config/haproxy-devel/haproxy_pool_edit.php
+++ b/config/haproxy-devel/haproxy_pool_edit.php
@@ -68,7 +68,7 @@ if (isset($id) && $a_pools[$id]) {
 if (isset($_GET['dup']))
 	unset($id);
 
-$changedesc = "Services: HAProxy: pools: ";
+$changedesc = "Services: HAProxy: Backend server pool: ";
 $changecount = 0;
 
 if ($_POST) {
@@ -216,7 +216,7 @@ $pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
 if(strstr($pfSversion, "1.2"))
 	$one_two = true;
 
-$pgtitle = "HAProxy: Backend: Edit";
+$pgtitle = "HAProxy: Backend server pool: Edit";
 include("head.inc");
 
 row_helper();
@@ -320,7 +320,7 @@ foreach($simplefields as $field){
 	<div class="tabcont">
 	<table width="100%" border="0" cellpadding="6" cellspacing="0">
 		<tr>
-			<td colspan="2" valign="top" class="listtopic">Edit HAProxy pool</td>
+			<td colspan="2" valign="top" class="listtopic">Edit HAProxy Backend server pool</td>
 		</tr>	
 		<tr align="left">
 			<td width="22%" valign="top" class="vncellreq">Name</td>
@@ -616,21 +616,21 @@ FLUSH PRIVILEGES;</pre>
 		<tr align="left">
 			<td width="22%" valign="top" class="vncell">Connection timeout</td>
 			<td width="78%" class="vtable" colspan="2">
-				<input name="connection_timeout" type="text" <?if(isset($pconfig['connection_timeout'])) echo "value=\"{$pconfig['connection_timeout']}\"";?> size="64">
+				<input name="connection_timeout" type="text" <?if(isset($pconfig['connection_timeout'])) echo "value=\"{$pconfig['connection_timeout']}\"";?> size="20">
 				<div>the time (in milliseconds) we give up if the connection does not complete within (default 30000).</div>
 			</td>
 		</tr>
 		<tr align="left">
 			<td width="22%" valign="top" class="vncell">Server timeout</td>
 			<td width="78%" class="vtable" colspan="2">
-				<input name="server_timeout" type="text" <?if(isset($pconfig['server_timeout'])) echo "value=\"{$pconfig['server_timeout']}\"";?> size="64">
+				<input name="server_timeout" type="text" <?if(isset($pconfig['server_timeout'])) echo "value=\"{$pconfig['server_timeout']}\"";?> size="20">
 				<div>the time (in milliseconds) we accept to wait for data from the server, or for the server to accept data (default 30000).</div>
 			</td>
 		</tr>
 		<tr align="left">
 			<td width="22%" valign="top" class="vncell">Retries</td>
 			<td width="78%" class="vtable" colspan="2">
-				<input name="retries" type="text" <?if(isset($pconfig['retries'])) echo "value=\"{$pconfig['retries']}\"";?> size="64">
+				<input name="retries" type="text" <?if(isset($pconfig['retries'])) echo "value=\"{$pconfig['retries']}\"";?> size="20">
 				<div>After a connection failure to a server, it is possible to retry, potentially
 on another server. This is useful if health-checks are too rare and you don't
 want the clients to see the failures. The number of attempts to reconnect is
diff --git a/config/haproxy-devel/haproxy_pools.php b/config/haproxy-devel/haproxy_pools.php
index 2d0189a5..b52c0af9 100644
--- a/config/haproxy-devel/haproxy_pools.php
+++ b/config/haproxy-devel/haproxy_pools.php
@@ -67,7 +67,7 @@ $pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
 if(strstr($pfSversion, "1.2"))
 	$one_two = true;
 	
-$pgtitle = "Services: HAProxy: Server pools";
+$pgtitle = "Services: HAProxy: Backend server pools";
 include("head.inc");
 
 ?>
@@ -88,8 +88,8 @@ include("head.inc");
 	/* active tabs */
 	$tab_array = array();
 	$tab_array[] = array("Settings", false, "haproxy_global.php");
-	$tab_array[] = array("Listener", false, "haproxy_listeners.php");
-	$tab_array[] = array("Server Pool", true, "haproxy_pools.php");
+	$tab_array[] = array("Frontend", false, "haproxy_listeners.php");
+	$tab_array[] = array("Backend", true, "haproxy_pools.php");
 	display_top_tabs($tab_array);
   ?>
   </td></tr>
@@ -102,7 +102,7 @@ include("head.inc");
 			<td width="25%" class="listhdrr">Name</td>
 			<td width="10%" class="listhdrr">Servers</td>
 			<td width="10%" class="listhdrr">Check</td>
-			<td width="30%" class="listhdrr">Listener</td>
+			<td width="30%" class="listhdrr">Frontend</td>
 			<td width="10%" class="list"></td>
 		</tr>
 <?php
@@ -152,9 +152,9 @@ include("head.inc");
 			  <td class="list" nowrap>
 				<table border="0" cellspacing="0" cellpadding="1">
 				  <tr>
-					<td valign="middle"><a href="haproxy_pool_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-					<td valign="middle"><a href="haproxy_pools.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this entry?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
-					<td valign="middle"><a href="haproxy_pool_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+					<td valign="middle"><a href="haproxy_pool_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit backend");?>" width="17" height="17" border="0"></a></td>
+					<td valign="middle"><a href="haproxy_pools.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this entry?')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete backend");?>" width="17" height="17" border="0"></a></td>
+					<td valign="middle"><a href="haproxy_pool_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("clone backend");?>" width="17" height="17" border="0"></a></td>
 				  </tr>
 				</table>
 			  </td>
@@ -169,7 +169,7 @@ include("head.inc");
 			  <td class="list">
 				<table border="0" cellspacing="0" cellpadding="1">
 				  <tr>
-					<td valign="middle"><a href="haproxy_pool_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
+					<td valign="middle"><a href="haproxy_pool_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new backend");?>" width="17" height="17" border="0"></a></td>
 				  </tr>
 				</table>
 			  </td>
diff --git a/config/haproxy-devel/haproxy_utils.inc b/config/haproxy-devel/haproxy_utils.inc
index 940c816f..f4df2433 100644
--- a/config/haproxy-devel/haproxy_utils.inc
+++ b/config/haproxy-devel/haproxy_utils.inc
@@ -221,7 +221,8 @@ function haproxy_recalculate_certifcate_chain(){
 		}
 	}
 	if ($items_recalculated > 0)
-		write_config("Recalculated $items_recalculated certificate chains.");
+		write_config("Services: HAProxy: Recalculated $items_recalculated certificate chains.");
+	return $items_recalculated;
 }
 
 function phparray_to_javascriptarray_recursive($nestID, $path, $items, $nodeName, $includeitems) {
@@ -256,7 +257,8 @@ function echo_html_select($name, $keyvaluelist, $selected, $listEmptyMessage="",
 		echo "<select name=\"$name\" id=\"$name\" class=\"formselect\"$onchangeEvent>";
 		foreach($keyvaluelist as $key => $desc){
 			$selectedhtml = $key == $selected ? "selected" : "";
-			echo "<option value=\"{$key}\" {$selectedhtml}>{$desc['name']}</option>";
+			$name = htmlspecialchars($desc['name']);
+			echo "<option value=\"{$key}\" {$selectedhtml}>{$name}</option>";
 		}
 		echo "</select>";
 	} else {