don't show mailbox settings at all if disabled

diff --git a/mod/settings.php b/mod/settings.php
index ea71f7020decdcf238d75a6ece36ac1b1454bab2..e115556879f88177303d3ddbe2ce4e8556f0e31e 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -115,6 +115,8 @@ function settings_post(&$a) {
 
 
        $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+       if(get_config('system','dfrn_only'))
+               $mail_disabled = 1;
 
        if(! $mail_disabled) {
                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
@@ -355,6 +357,8 @@ function settings_content(&$a) {
 
 
        $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+       if(get_config('system','dfrn_only'))
+               $mail_disabled = 1;
 
        if(! $mail_disabled) {
                $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",

diff --git a/view/settings.tpl b/view/settings.tpl
index 50b59cc9181baa638f12721e48bbda93a127f7c8..5e8b907695938a9af41d3c377d5fbc2fee980533 100644 (file)
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -94,10 +94,10 @@ $hide_wall
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
 </div>
 
-<h3 class="settings-heading">$h_imap</h3>
 {{ if $mail_disabled }}
-       <div class="info-message">$mail_disabled</div>
+
 {{ else }}
+       <h3 class="settings-heading">$h_imap</h3>
        <p>$imap_desc</p>
        {{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
        {{inc field_input.tpl with $field=$mail_server }}{{endinc}}