From b24627743afd0de319c84e7b60f177d3fb5ebace Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 20 Dec 2010 18:59:57 -0700
Subject: [PATCH] disposition_send_mdn -> send_mdn

---
 imp/config/prefs.php.dist                         | 6 +++---
 imp/docs/UPGRADING                                | 1 +
 imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php | 5 +++++
 imp/lib/Prefs/Ui.php                              | 2 +-
 imp/lib/Ui/Message.php                            | 2 +-
 imp/locale/en/help.xml                            | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 24e780f15..3769b55d5 100644
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -708,7 +708,7 @@ $prefGroups['viewing'] = array(
         'image_replacement', 'image_addrbook', 'highlight_text',
         'highlight_simple_markup', 'show_quoteblocks', 'dim_signature',
         'emoticons', 'parts_display', 'mail_hdr', 'default_msg_charset',
-        'disposition_send_mdn'
+        'send_mdn'
     )
 );
 
@@ -838,7 +838,7 @@ $_prefs['default_msg_charset'] = array(
 );
 
 // Send read receipts?
-$_prefs['disposition_send_mdn'] = array(
+$_prefs['send_mdn'] = array(
     'value' => 1,
     'advanced' => true,
     'type' => 'enum',
@@ -850,7 +850,7 @@ $_prefs['disposition_send_mdn'] = array(
 //        2 => _("Prompt only if necessary; otherwise automatically send")
     ),
     'desc' => _("Prompt to send read receipt (a/k/a message disposition notification) when requested by the sender?"),
-    'help' => 'prefs-disposition_send_mdn'
+    'help' => 'prefs-send_mdn'
 );
 
 
diff --git a/imp/docs/UPGRADING b/imp/docs/UPGRADING
index 12556dce4..b88ece108 100644
--- a/imp/docs/UPGRADING
+++ b/imp/docs/UPGRADING
@@ -74,6 +74,7 @@ your ``config/prefs.php`` file and your preferences backend::
    alternative_display
    attachment_display
    auto_delete_drafts
+   disposition_send_mdn
    fckeditor_buttons
    fetchmail_link
    fetchmail_menu
diff --git a/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php b/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php
index 6114d6a15..5ec8037be 100644
--- a/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php
+++ b/imp/lib/LoginTasks/SystemTask/UpgradeFromImp4.php
@@ -132,6 +132,11 @@ class IMP_LoginTasks_SystemTask_UpgradeFromImp4 extends Horde_LoginTasks_SystemT
             ($prefs->getValue('initial_page') == 'folders.php')) {
             $prefs->setValue('initial_page', IMP_Prefs_Ui::PREF_FOLDER_PAGE);
         }
+
+        if ($prefs->isDefault('send_mdn') &&
+            $prefs->getValue('disposition_send_mdn')) {
+            $prefs->setValue('send_mdn', 1);
+        }
     }
 
     /**
diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php
index 9ab665cdd..689287f75 100644
--- a/imp/lib/Prefs/Ui.php
+++ b/imp/lib/Prefs/Ui.php
@@ -353,7 +353,7 @@ class IMP_Prefs_Ui
 
         case 'viewing':
             if (empty($conf['maillog']['use_maillog'])) {
-                $ui->suppress[] = 'disposition_send_mdn';
+                $ui->suppress[] = 'send_mdn';
             }
 
             $mock_part = new Horde_Mime_Part();
diff --git a/imp/lib/Ui/Message.php b/imp/lib/Ui/Message.php
index 67a25a567..5a513c8ee 100644
--- a/imp/lib/Ui/Message.php
+++ b/imp/lib/Ui/Message.php
@@ -71,7 +71,7 @@ class IMP_Ui_Message
     public function MDNCheck($mailbox, $uid, $headers, $confirmed = false)
     {
         $imp_imap = $GLOBALS['injector']->getInstance('IMP_Injector_Factory_Imap')->create();
-        $pref_val = $GLOBALS['prefs']->getValue('disposition_send_mdn');
+        $pref_val = $GLOBALS['prefs']->getValue('send_mdn');
 
         if (!$pref_val || $imp_imap->isReadOnly($mailbox)) {
             return false;
diff --git a/imp/locale/en/help.xml b/imp/locale/en/help.xml
index 3b3ebfb11..6c6b57cc6 100644
--- a/imp/locale/en/help.xml
+++ b/imp/locale/en/help.xml
@@ -769,7 +769,7 @@
     </para>
 </entry>
 
-<entry id="prefs-disposition_send_mdn">
+<entry id="prefs-send_mdn">
     <title>Preferences: Send Read Receipt</title>
     <para>
     &quot;Send a MDN&quot; sends a read receipt (also known as a Message Disposition Notification) when you view a message in which the user has requested that they receive notification that you have read the message. By default, you will be prompted to send the notification.
-- 
2.11.0