diff options
| author | Friendika <info@friendika.com> | 2011-07-06 20:27:18 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-07-06 20:27:18 -0700 |
| commit | d7b5a606fb7992cfc29fac4bc19429da08972364 (patch) | |
| tree | 15c0822e3c1f2fdf4851140c87e920ed3a7d575b | |
| parent | 3f258300766543d6fd3203265aa5c5355886e550 (diff) | |
| download | volse-hubzilla-d7b5a606fb7992cfc29fac4bc19429da08972364.tar.gz volse-hubzilla-d7b5a606fb7992cfc29fac4bc19429da08972364.tar.bz2 volse-hubzilla-d7b5a606fb7992cfc29fac4bc19429da08972364.zip | |
don't show mailbox settings at all if disabled
| -rw-r--r-- | mod/settings.php | 4 | ||||
| -rw-r--r-- | view/settings.tpl | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mod/settings.php b/mod/settings.php index ea71f7020..e11555687 100644 --- 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 50b59cc91..5e8b90769 100644 --- 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}} |