From 5b571add72d698859b98620d537d2736871de895 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 11 Dec 2008 23:47:51 -0700
Subject: [PATCH] Make encrypt.js an all-purpose dialog script.

---
 imp/config/prefs.php.dist            | 11 +----------
 imp/index-dimp.php                   |  2 +-
 imp/js/src/{encrypt.js => dialog.js} |  4 ++--
 imp/lib/IMP.php                      |  4 ++--
 4 files changed, 6 insertions(+), 15 deletions(-)
 rename imp/js/src/{encrypt.js => dialog.js} (96%)

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index 287bd9e5b..08df891ac 100644
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -137,8 +137,7 @@ if (!$is_pop3) {
         'column' => _("Message Options"),
         'label' => _("Fetch Mail"),
         'desc' => _("Customize accounts for fetching mail from other accounts."),
-        'members' => array('fetchmail_link', 'fetchmail_popup',
-                           'fetchmail_menu')
+        'members' => array('fetchmail_link', 'fetchmail_menu')
     );
 }
 
@@ -1090,14 +1089,6 @@ $_prefs['fetchmail_link'] = array(
     'img' => 'fetchmail.png',
     'desc' => _("Edit your preferences for accessing other mail accounts."));
 
-// Fetch mail on separate window?
-$_prefs['fetchmail_popup'] = array(
-    'value' => 0,
-    'locked' => false,
-    'shared' => false,
-    'type' => 'checkbox',
-    'desc' => _("Fetch Mail in a separate window?"));
-
 // Show the Fetch mail icon on the menubar?
 $_prefs['fetchmail_menu'] = array(
     'value' => 1,
diff --git a/imp/index-dimp.php b/imp/index-dimp.php
index 28fb0eaee..d9d5e3104 100644
--- a/imp/index-dimp.php
+++ b/imp/index-dimp.php
@@ -29,7 +29,7 @@ if ((!empty($GLOBALS['conf']['utils']['gnupg']) &&
      $GLOBALS['prefs']->getValue('use_pgp')) ||
     ($GLOBALS['prefs']->getValue('use_smime') &&
      Util::extensionExists('openssl'))) {
-    $scripts[] = array('encrypt.js', 'imp', true);
+    $scripts[] = array('dialog.js', 'imp', true);
 }
 
 /* Get site specific menu items. */
diff --git a/imp/js/src/encrypt.js b/imp/js/src/dialog.js
similarity index 96%
rename from imp/js/src/encrypt.js
rename to imp/js/src/dialog.js
index ab7ce68af..043ef7726 100644
--- a/imp/js/src/encrypt.js
+++ b/imp/js/src/dialog.js
@@ -1,5 +1,5 @@
 /**
- * Javascript code used to display a RedBox pasphrase dialog.
+ * Javascript code used to display a RedBox dialog.
  *
  * Copyright 2008 The Horde Project (http://www.horde.org/)
  *
@@ -9,7 +9,7 @@
  * @author Michael Slusarz <slusarz@curecanti.org>
  */
 
-var IMPEncrypt = {
+var IMPDialog = {
 
     display: function(data)
     {
diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 7fc0a8be1..bcaf801f3 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -1952,7 +1952,7 @@ class IMP
     {
         Horde::addScriptFile('prototype.js', 'horde', true);
         Horde::addScriptFile('effects.js', 'horde', true);
-        Horde::addScriptFile('encrypt.js', 'imp', true);
+        Horde::addScriptFile('dialog.js', 'imp', true);
         Horde::addScriptFile('redbox.js', 'imp', true);
 
         switch ($type) {
@@ -1978,6 +1978,6 @@ class IMP
             'cancel_text' => _("Cancel")
         );
 
-        return 'IMPEncrypt.display(\'' . IMP::escapeJSON($js_params) . '\')';
+        return 'IMPDialog.display(\'' . IMP::escapeJSON($js_params) . '\')';
     }
 }
-- 
2.11.0