From 62fe7203e641696566af66d8ea447482a0398426 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 21 Sep 2013 11:39:02 +0200
Subject: Hide Delivery Status Notification option when smtp_server is unset
 (#1489336)

Conflicts:

	CHANGELOG
	config/main.inc.php.dist
---
 skins/classic/templates/compose.html | 15 +++++++++++----
 skins/larry/templates/compose.html   |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'skins')

diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
index 5b0b47924..b6dab2c4c 100644
--- a/skins/classic/templates/compose.html
+++ b/skins/classic/templates/compose.html
@@ -178,16 +178,23 @@
     <tr>
         <td><label for="rcmcomposereceipt"><roundcube:label name="returnreceipt" />:</label></td>
         <td><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /></td>
-    </tr><tr>
+    </tr>
+    <roundcube:if condition="config:smtp_server != ''" />
+    <tr>
         <td><label for="rcmcomposedsn"><roundcube:label name="dsn" />:</label></td>
         <td><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /></td>
-    </tr><tr>
+    </tr>
+    <roundcube:endif />
+    <tr>
         <td><label for="rcmcomposepriority"><roundcube:label name="priority" />:</label></td>
         <td><roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></td>
-    </tr><roundcube:if condition="!config:no_save_sent_messages" /><tr>
+    </tr>
+    <roundcube:if condition="!config:no_save_sent_messages" />
+    <tr>
         <td><label><roundcube:label name="savesentmessagein" />:</label></td>
         <td><roundcube:object name="storetarget" maxlength="30" /></td>
-    </tr><roundcube:endif />
+    </tr>
+    <roundcube:endif />
     </table>
 </div>
 
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 9cfe7fe4c..1e2a45912 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -140,9 +140,11 @@
 	<span class="composeoption">
 		<label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> <roundcube:label name="returnreceipt" /></label>
 	</span>
+	<roundcube:if condition="config:smtp_server != ''" />
 	<span class="composeoption">
 		<label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /> <roundcube:label name="dsn" /></label>
 	</span>
+	<roundcube:endif />
 	<roundcube:if condition="!config:no_save_sent_messages" />
 	<span class="composeoption">
 		<label><roundcube:label name="savesentmessagein" /> <roundcube:object name="storetarget" maxlength="30" style="max-width:12em" /></label>
-- 
cgit v1.2.3