From acbd63db3dfb089782d06c78fd795b7e68296b7a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 7 Jun 2016 08:57:39 +0200
Subject: [PATCH] dns: fix unbound custom options

PR: https://forum.opnsense.org/index.php?topic=3137.0
---
 src/etc/inc/unbound.inc      | 10 +++-------
 src/www/services_unbound.php | 13 +++++++------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/etc/inc/unbound.inc b/src/etc/inc/unbound.inc
index ef68e11fb..063b7ecbb 100644
--- a/src/etc/inc/unbound.inc
+++ b/src/etc/inc/unbound.inc
@@ -209,13 +209,9 @@ EOF;
     unbound_acls_config();
 
     // Add custom Unbound options
-    if ($config['unbound']['custom_options']) {
-        $custom_options = "# Unbound custom option\n";
-        foreach (preg_split('/\s+/', $config['unbound']['custom_options']) as $ent) {
-            $custom_options .= $ent."\n";
-        }
-    } else {
-	     $custom_options = "";
+    $custom_options = '';
+    if (!empty($config['unbound']['custom_options'])) {
+        $custom_options = "# Unbound custom options\n{$config['unbound']['custom_options']}\n";
     }
 
     // Server configuration variables
diff --git a/src/www/services_unbound.php b/src/www/services_unbound.php
index b50e322e0..22ad8fca6 100644
--- a/src/www/services_unbound.php
+++ b/src/www/services_unbound.php
@@ -242,12 +242,13 @@ include_once("head.inc");
                         </td>
                       </tr>
                       <tr class="showadv" style="display:none">
-                          <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Advanced");?></td>
-                          <td>
-                              <strong><?=gettext("Advanced");?><br /></strong>
-                              <textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=$pconfig['custom_options'];?></textarea><br />
-                              <?=gettext("Enter any additional options you would like to add to the DNS Resolver configuration here, separated by a space or newline"); ?><br />
-                          </td>
+                        <td><a id="help_for_custom_options" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext('Custom options') ?></td>
+                        <td>
+                          <textarea rows="6" cols="78" name="custom_options" id="custom_options"><?=$pconfig['custom_options'];?></textarea>
+                          <div class="hidden" for="help_for_custom_options">
+                            <?=gettext("Enter any additional options you would like to add to the DNS Resolver configuration here."); ?>
+                          </div>
+                        </td>
                       </tr>
                       <tr class="showadv" style="display:none">
                         <td><a id="help_for_outgoing_interface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Outgoing Network Interfaces"); ?></td>