Fix formatting of nsupdate options for ACME pkg. Fixes #7236

6 files changed, 28 insertions, 19 deletions

diff --git a/security/pfSense-pkg-acme/Makefile b/security/pfSense-pkg-acme/Makefile
index 1fdc17c..5a988a2 100644
--- a/security/pfSense-pkg-acme/Makefile
+++ b/security/pfSense-pkg-acme/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pfSense-pkg-acme
-PORTVERSION=	0.1.9
+PORTVERSION=	0.1.10
 CATEGORIES=	security
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme.inc b/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme.inc
index db557d7..31be862 100644
--- a/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme.inc
+++ b/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme.inc
@@ -201,10 +201,10 @@ $acme_domain_validation_method['dns_me'] = array(name => "DNS-DNSMadeEasy",
 $acme_domain_validation_method['dns_nsupdate'] = array(name => "DNS-NSupdate",
 	'fields' => array(
 		'NSUPDATE_SERVER' => array('name'=>"nsupdate_server",'columnheader'=>"Key",'type'=>"textbox",
-			'description' =>"Fill in the NSUpdate target server"
+			'description' =>"Fill in the nsupdate DNS server"
 		),
 		'NSUPDATE_KEY' => array('name'=>"nsupdate_key",'columnheader'=>"Id",'type'=>"textarea",
-			'description' =>"Fill in the NSUpdate KEY"
+			'description' =>"Fill in the nsupdate HMAC-MD5 host key"
 		)
 	));
 $acme_domain_validation_method['dns_ovh'] = array(name => "DNS-ovh / kimsufi / soyoustart / runabove",
diff --git a/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_gui.inc b/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_gui.inc
index ac4b285..ec1eef3 100644
--- a/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_gui.inc
+++ b/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_gui.inc
@@ -115,13 +115,7 @@ function acmeicon($iconname, $title) {
 	$title = str_replace("'", "'", $title);
 	
 	$faicon = $acme_icons[$iconname]["faicon"];
-	if (pf_version() < "2.3") {
-		$icon = $acme_icons[$iconname]["icon"];
-		$iconsize = $acme_icons[$iconname]["iconsize"];
-		return "<img src='/themes/{$g['theme']}/images/icons/$icon' title='$title' width='$iconsize' height='$iconsize' border='0' />";	
-	} else {
-		return "<i class='fa $faicon' title='$title'></i>";
-	}
+	return "<i class='fa $faicon' title='$title'></i>";
 }
 
 class Form_Section_class extends Form_Section {
diff --git a/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_htmllist.inc b/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_htmllist.inc
index c69aebf..579793b 100644
--- a/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_htmllist.inc
+++ b/security/pfSense-pkg-acme/files/usr/local/pkg/acme/acme_htmllist.inc
@@ -120,7 +120,7 @@ class HtmlList
 				$checked = $itemvalue=='yes' ? " checked" : "";
 				$result .= "<input onclick='html_listitem_change(\"{$this->tablename}\",\"{$itemname}\",\"{$counter}\",this);' name='$itemnamenr' id='$itemnamenr' type='checkbox'$checked value='yes' />";
 			} elseif ($itemtype == "textarea") {
-				$result .= "<textarea class='form-control nowrap' name='$itemnamenr' id='$itemnamenr' cols='{$item['size']}' rows='10'>";
+				$result .= "<textarea class='form-control nowrap' name='$itemnamenr' id='$itemnamenr' cols='{$item['size']}' rows='10' style='width:100%'>";
 				$result .= htmlspecialchars(base64_decode($itemvalue));
 				$result .= "</textarea>";
 			} elseif ($itemtype ==  "fixedtext") {
@@ -348,7 +348,7 @@ function sort_index(&$a, &$b) {
 	return 0;
 }
 
-function acme_htmllist_js(){
+function acme_htmllist_js($tablename = "") {
 	global $g;
 ?><script type="text/javascript">
 	var theme = "<?=$g['theme']?>";
@@ -375,7 +375,7 @@ function acme_htmllist_js(){
 			"' id='" + tableId + field['name'] + rowId +
 			"'><\/input> ";
 		} else if(field['type'] === 'textarea') {
-			result="<textarea class='form-control nowrap' cols='" + field['size'] + "' rows='15' name='" + tableId + field['name'] + rowId +
+			result="<textarea class='form-control nowrap' cols='" + field['size'] + "' rows='15' style='width:100%' name='" + tableId + field['name'] + rowId +
 			"' id='" + tableId + field['name'] + rowId +
 			"'><\/textarea> ";
 		} else if(field['type'] === 'select') {
@@ -463,27 +463,42 @@ function acme_htmllist_js(){
 			tr.appendChild(td);
 			td = d.createElement("td");
 			td.setAttribute("colspan", fieldcount);
+			vdiv = d.createElement("div");
+			vdiv.setAttribute("id", "htmltable_<?=$tablename?>_" + totalrows + "_details_view");
+			vdiv.setAttribute("class","hidden");
+			td.appendChild(vdiv);
+			ediv = d.createElement("div");
+			ediv.setAttribute("id", "htmltable_<?=$tablename?>_" + totalrows + "_details_edit");
+			ediv.setAttribute("class", "");
+
 			table = d.createElement("table");
+			table.setAttribute("class","table table-hover table-striped table-condensed");
+			table.setAttribute("style","border-collapse:collapse");
+			table.setAttribute("border","1");
 			table.setAttribute("cellspacing","0");
+			etbody = d.createElement("tbody");
+
 			for (var i in detailitems) {
 				field = detailitems[i];
 				fieldhtml = createFieldHtml(tableId, field, totalrows);
 				subtr = d.createElement("tr");
 				subtr.setAttribute("id","tr_edititemdetails_" + totalrows + "_" + field['name']);
 				subtd = d.createElement("td");
-				subtd.setAttribute("class","vncell");
+				subtd.setAttribute("style","border-right:0");
 				subtd.innerHTML = field['columnheader'] + ": ";
 				subtr.appendChild(subtd);
 				subtd = d.createElement("td");
-				subtd.setAttribute("class","vncell");
+				subtd.setAttribute("style","border-left:0");
 				if (field['description']) {
 					fieldhtml = field['description'] + "<br/>" + fieldhtml;
 				}
 				subtd.innerHTML = fieldhtml;
 				subtr.appendChild(subtd);
-				table.appendChild(subtr);
+				etbody.appendChild(subtr);
 			}
-			td.appendChild(table);
+			table.appendChild(etbody);
+			ediv.appendChild(table);
+			td.appendChild(ediv);
 			tr.appendChild(td);
 			td = d.createElement("td");
 			tr.appendChild(td);
diff --git a/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_accountkeys_edit.php b/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_accountkeys_edit.php
index 7666a5f..20f4f95 100644
--- a/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_accountkeys_edit.php
+++ b/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_accountkeys_edit.php
@@ -360,5 +360,5 @@ events.push(function() {
 	}
 </script>
 <?php
-acme_htmllist_js();
+acme_htmllist_js("account_keys");
 include("foot.inc");
\ No newline at end of file
diff --git a/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_certificates_edit.php b/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_certificates_edit.php
index b7f9add..de3d760 100644
--- a/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_certificates_edit.php
+++ b/security/pfSense-pkg-acme/files/usr/local/www/acme/acme_certificates_edit.php
@@ -448,5 +448,5 @@ events.push(function() {
 </script>
 
 <?php
-acme_htmllist_js();
+acme_htmllist_js("table_domains");
 include("foot.inc");
\ No newline at end of file