Add plus icon next to current entries on all the pages (listener/server

pool pages, as well as the entries in ACL's and adding servers) which is
a "add a new rule based on this one".

4 files changed, 147 insertions, 22 deletions

diff --git a/config/haproxy-dev/haproxy_listeners.php b/config/haproxy-dev/haproxy_listeners.php
index f66b51bf..ef67108b 100755
--- a/config/haproxy-dev/haproxy_listeners.php
+++ b/config/haproxy-dev/haproxy_listeners.php
@@ -147,13 +147,14 @@ include("head.inc");
                       <tr>
                         <td valign="middle"><a href="haproxy_listeners_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_listeners.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_listeners_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
                       </tr>
                     </table>
                   </td>
                 </tr>
                 <?php $i++; endforeach; ?>
                 <tr>
-                  <td class="list" colspan="4"></td>
+                  <td class="list" colspan="5"></td>
                   <td class="list">
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
diff --git a/config/haproxy-dev/haproxy_listeners_edit.php b/config/haproxy-dev/haproxy_listeners_edit.php
index 8d948dd9..fc665ea9 100755
--- a/config/haproxy-dev/haproxy_listeners_edit.php
+++ b/config/haproxy-dev/haproxy_listeners_edit.php
@@ -58,6 +58,9 @@ if (isset($_POST['id']))
 else
 	$id = $_GET['id'];
 
+if (isset($_GET['dup']))
+	$id = $_GET['dup'];
+
 if (isset($id) && $a_backend[$id]) {
 	$pconfig['name'] = $a_backend[$id]['name'];
 	$pconfig['desc'] = $a_backend[$id]['desc'];
@@ -90,6 +93,9 @@ if (isset($id) && $a_backend[$id]) {
 
 }
 
+if (isset($_GET['dup']))
+	unset($id);
+
 $changedesc = "Services: HAProxy: Listener";
 $changecount = 0;
 
@@ -267,6 +273,8 @@ include("head.inc");
 	var addRowTo = (function() {
 	    return (function (tableId) {
 	        var d, tbody, tr, td, bgc, i, ii, j;
+		var btable, btbody, btr, btd;
+
 	        d = document;
 	        tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
 	        tr = d.createElement("tr");
@@ -274,25 +282,68 @@ include("head.inc");
 	        for (i = 0; i < field_counter_js; i++) {
 	                td = d.createElement("td");
 	                if(rowtype[i] == 'textbox') {
-	                        td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "'></input> ";
+				td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
+					"'></input><input size='" + rowsize[i] + "' name='" + rowname[i] + totalrows +
+					"' id='" + rowname[i] + totalrows +
+				       	"'></input> ";
 	                } else if(rowtype[i] == 'select') {
-	                        td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select name='" + rowname[i] + totalrows + "'><?php foreach ($a_expr as $expr) {?><option value=\"<?=$expr[0]?>\"><?=$expr[1]?></option><?php }?></select> ";
+				td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
+					"'></input><select name='" + rowname[i] + totalrows + 
+					"' id='" + rowname[i] + totalrows +
+					"'><?php foreach ($a_expr as $expr) {?><option value=\"<?=$expr[0]?>\"><?=$expr[1]?></option><?php }?></select> ";
 	                } else {
-	                        td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input type='checkbox' name='" + rowname[i] + totalrows + "'></input> ";
+				td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
+					"'></input><input type='checkbox' name='" + rowname[i] + totalrows +
+				        "' id='" + rowname[i] + totalrows + "'></input> ";
 	                }
 	                tr.appendChild(td);
 	        }
-	        td = d.createElement("td");
-	        td.rowSpan = "1";
-			td.className = "list";
-	        td.innerHTML = '<img src="/themes/' + theme + '/images/icons/icon_x.gif" width="17" height="17" border="0" onclick="removeRow(this); return false;">';
+		td = d.createElement("td");
+		td.rowSpan = "1";
+		td.setAttribute("class","list");
+
+		// Recreate the button table.
+		btable = document.createElement("table");
+		btable.setAttribute("border", "0");
+		btable.setAttribute("cellspacing", "0");
+		btable.setAttribute("cellpadding", "1");
+		btbody = document.createElement("tbody");
+		btr = document.createElement("tr");
+		btd = document.createElement("td");
+		btd.setAttribute("valign", "middle");
+		btd.innerHTML = '<img src="/themes/' + theme + '/images/icons/icon_x.gif" title="delete entry" width="17" height="17" border="0" onclick="removeRow(this); return false;">';
+		btr.appendChild(btd);
+		btd = document.createElement("td");
+		btd.setAttribute("valign", "middle");
+		btd.innerHTML = '<img src="/themes/' + theme + "/images/icons/icon_plus.gif\" title=\"duplicate entry\" width=\"17\" height=\"17\" border=\"0\" onclick=\"dupRow(" + totalrows + ", 'acltable'); return false;\">";
+		btr.appendChild(btd);
+		btbody.appendChild(btr);
+		btable.appendChild(btbody);
+
+		td.appendChild(btable);
 	        tr.appendChild(td);
 	        tbody.appendChild(tr);
 	    });
 	})();
 
+	function dupRow(rowId, tableId) {
+		var dupEl;
+		var newEl;
+
+		addRowTo(tableId);
+		for (i = 0; i < field_counter_js; i++) {
+			dupEl = document.getElementById(rowname[i] + rowId);
+			newEl = document.getElementById(rowname[i] + totalrows);
+			if (dupEl && newEl)
+				newEl.value = dupEl.value;
+		}
+	}
+
 	function removeRow(el) {
 	    var cel;
+	    // Break out of one table first
+	    while (el && el.nodeName.toLowerCase() != "table")
+		    el = el.parentNode;
 	    while (el && el.nodeName.toLowerCase() != "tr")
 	            el = el.parentNode;
 
@@ -471,7 +522,7 @@ include("head.inc");
 			foreach ($a_acl as $acl) {
 			?>
 			<tr>
-				<td><input name="acl_name<?=$counter;?>" type="text" value="<?=$acl['name']; ?>" size="20"/></td>
+				<td><input name="acl_name<?=$counter;?>" id="acl_name<?=$counter;?>" type="text" value="<?=$acl['name']; ?>" size="20"/></td>
 				<td>
 				<select name="acl_expression<?=$counter;?>" id="acl_expression<?=$counter;?>">
 				<?php
@@ -480,8 +531,16 @@ include("head.inc");
 				<?php } ?>
 				</select>
 				</td>
-				<td><input name="acl_value<?=$counter;?>" type="text" value="<?=$acl['value']; ?>" size="35"/></td>
-			  	<td class="list"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" onclick="removeRow(this); return false;"></td>
+				<td><input name="acl_value<?=$counter;?>" id="acl_value<?=$counter;?>" type="text" value="<?=$acl['value']; ?>" size="35"/></td>
+			  	<td class="list">
+			         <table border="0" cellspacing="0" cellpadding="1"><tr>
+			         <td valign="middle">
+				  <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="delete entry" width="17" height="17" border="0" onclick="removeRow(this); return false;">
+			         </td>
+			         <td valign="middle">
+				 <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="duplicate entry" width="17" height="17" border="0" onclick="dupRow(<?=$counter;?>, 'acltable'); return false;">
+			         </td></tr></table>
+				</td>
 			</tr>
 			<?php
 			$counter++;
diff --git a/config/haproxy-dev/haproxy_pool_edit.php b/config/haproxy-dev/haproxy_pool_edit.php
index dea2eb7d..6974220d 100755
--- a/config/haproxy-dev/haproxy_pool_edit.php
+++ b/config/haproxy-dev/haproxy_pool_edit.php
@@ -44,6 +44,9 @@ if (isset($_POST['id']))
 else
 	$id = $_GET['id'];
 
+if (isset($_GET['dup']))
+	$id = $_GET['dup'];
+
 if (isset($id) && $a_pools[$id]) {
 	$pconfig['name'] = $a_pools[$id]['name'];
 	$pconfig['checkinter'] = $a_pools[$id]['checkinter'];
@@ -54,6 +57,9 @@ if (isset($id) && $a_pools[$id]) {
 	$pconfig['a_servers']=&$a_pools[$id]['ha_servers']['item'];	
 }
 
+if (isset($_GET['dup']))
+	unset($id);
+
 $changedesc = "Services: HAProxy: pools: ";
 $changecount = 0;
 
@@ -266,18 +272,34 @@ function clearcombo(){
 			<td class="vtable"><?=$server['address']; ?></td>
 			<td class="vtable"><?=$server['port']; ?></td>
 			<td class="vtable"><?=$server['weight']; ?></td>
-			<td class="list"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" onclick="editRow(<?=$counter;?>); return false;"></td>
+			<td class="list">
+			  <table border="0" cellspacing="0" cellpadding="1"><tr>
+			  <td valign="middle">
+			  <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="edit entry" width="17" height="17" border="0" onclick="editRow(<?=$counter;?>); return false;">
+			  </td>
+			  <td valign="middle">
+			  <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="duplicate entry" width="17" height="17" border="0" onclick="dupRow(<?=$counter;?>, 'servertable'); return false;">
+			  </td></tr></table>
+			</td>
 			</tr>
 			<tr id="tr_edit_<?=$counter;?>" name="tr_edit_<?=$counter;?>" style="display: none;">
 				<td class="vtable">
-				  <input name="server_name<?=$counter;?>" type="text" value="<?=$server['name']; ?>" size="30"/></td>
+				  <input name="server_name<?=$counter;?>" id="server_name<?=$counter;?>" type="text" value="<?=$server['name']; ?>" size="30"/></td>
 				<td class="vtable">
-				  <input name="server_address<?=$counter;?>" type="text" value="<?=$server['address']; ?>" size="30"/></td>
+				  <input name="server_address<?=$counter;?>" id="server_address<?=$counter;?>" type="text" value="<?=$server['address']; ?>" size="30"/></td>
 				<td class="vtable">
-				  <input name="server_port<?=$counter;?>" type="text" value="<?=$server['port']; ?>" size="12"/></td>
+				  <input name="server_port<?=$counter;?>" id="server_port<?=$counter;?>" type="text" value="<?=$server['port']; ?>" size="12"/></td>
 				<td class="vtable">
-				  <input name="server_weight<?=$counter;?>" type="text" value="<?=$server['weight']; ?>" size="12"/></td>
-			  	<td class="list"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" onclick="removeRow(this); return false;"></td>
+				  <input name="server_weight<?=$counter;?>" id="server_weight<?=$counter;?>" type="text" value="<?=$server['weight']; ?>" size="12"/></td>
+				<td class="list">
+			         <table border="0" cellspacing="0" cellpadding="1"><tr>
+			         <td valign="middle">
+				  <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="delete entry" width="17" height="17" border="0" onclick="removeRow(this); return false;">
+			         </td>
+			         <td valign="middle">
+				 <img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="duplicate entry" width="17" height="17" border="0" onclick="dupRow(<?=$counter;?>, 'servertable'); return false;">
+			         </td></tr></table>
+				</td>
 			</tr>
 			<?php
 			$counter++;
@@ -360,6 +382,8 @@ var temp_streaming_text = "";
 var addRowTo = (function() {
     return (function (tableId) {
 	var d, tbody, tr, td, bgc, i, ii, j;
+	var btable, btbody, btr, btd;
+
 	d = document;
 	tbody = d.getElementById(tableId).getElementsByTagName("tbody").item(0);
 	tr = d.createElement("tr");
@@ -367,11 +391,17 @@ var addRowTo = (function() {
 	for (i = 0; i < field_counter_js; i++) {
 		td = d.createElement("td");
 		if(rowtype[i] == 'textbox') {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "'></input> ";
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
+				"'></input><input size='" + rowsize[i] + "' name='" + rowname[i] + totalrows +
+				"' id='" + rowname[i] + totalrows + "'></input> ";
 		} else if(rowtype[i] == 'select') {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><select size='" + rowsize[i] + "' name='" + rowname[i] + totalrows + "'>$options</select> ";
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
+				"'></input><select size='" + rowsize[i] + "' name='" + rowname[i] + totalrows +
+			       	"' id='" + rowname[i] + totalrows + "'>$options</select> ";
 		} else {
-			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows + "'></input><input type='checkbox' name='" + rowname[i] + totalrows + "'></input> ";
+			td.innerHTML="<INPUT type='hidden' value='" + totalrows +"' name='" + rowname[i] + "_row-" + totalrows +
+				"'></input><input type='checkbox' name='" + rowname[i] + totalrows +
+				"' id='" + rowname[i] + totalrows + "'></input> ";
 		}
 		td.setAttribute("class","vtable");
 		tr.appendChild(td);
@@ -380,14 +410,48 @@ var addRowTo = (function() {
 	td.rowSpan = "1";
         td.setAttribute("class","list");
 
-	td.innerHTML = '<img src="/themes/' + theme + '/images/icons/icon_x.gif" width="17" height="17" border="0" onclick="removeRow(this); return false;">';
+	// Recreate the button table.
+	btable = document.createElement("table");
+	btable.setAttribute("border", "0");
+	btable.setAttribute("cellspacing", "0");
+	btable.setAttribute("cellpadding", "1");
+	btbody = document.createElement("tbody");
+	btr = document.createElement("tr");
+	btd = document.createElement("td");
+	btd.setAttribute("valign", "middle");
+	btd.innerHTML = '<img src="/themes/' + theme + '/images/icons/icon_x.gif" title="delete entry" width="17" height="17" border="0" onclick="removeRow(this); return false;">';
+	btr.appendChild(btd);
+	btd = document.createElement("td");
+	btd.setAttribute("valign", "middle");
+	btd.innerHTML = '<img src="/themes/' + theme + "/images/icons/icon_plus.gif\" title=\"duplicate entry\" width=\"17\" height=\"17\" border=\"0\" onclick=\"dupRow(" + totalrows + ", 'servertable'); return false;\">";
+	btr.appendChild(btd);
+	btbody.appendChild(btr);
+	btable.appendChild(btbody);
+
+	td.appendChild(btable);
 	tr.appendChild(td);
 	tbody.appendChild(tr);
     });
 })();
 
+function dupRow(rowId, tableId) {
+    var dupEl;
+    var newEl;
+
+    addRowTo(tableId);
+    for (i = 0; i < field_counter_js; i++) {
+        dupEl = document.getElementById(rowname[i] + rowId);
+        newEl = document.getElementById(rowname[i] + totalrows);
+	if (dupEl && newEl)
+            newEl.value = dupEl.value;
+    }
+}
+
 function removeRow(el) {
     var cel;
+    // Break out of one table first
+    while (el && el.nodeName.toLowerCase() != "table")
+	    el = el.parentNode;
     while (el && el.nodeName.toLowerCase() != "tr")
 	    el = el.parentNode;
 
diff --git a/config/haproxy-dev/haproxy_pools.php b/config/haproxy-dev/haproxy_pools.php
index 61e85273..78a1fdff 100755
--- a/config/haproxy-dev/haproxy_pools.php
+++ b/config/haproxy-dev/haproxy_pools.php
@@ -141,13 +141,14 @@ include("head.inc");
                       <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>
                       </tr>
                     </table>
                   </td>
                 </tr>
                 <?php $i++; endforeach; ?>
                 <tr>
-                  <td class="list" colspan="6"></td>
+                  <td class="list" colspan="3"></td>
                   <td class="list">
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>