From 33bf4bc05ec530e5ac2bffbaca62bc0ac2ebb24e Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 30 Jul 2010 00:12:42 -0600
Subject: [PATCH] Missed an onclick conversion

---
 imp/lib/Prefs/Ui.php                    | 3 ++-
 imp/templates/prefs/smimepublickey.html | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php
index 39672ad16..84cd35112 100644
--- a/imp/lib/Prefs/Ui.php
+++ b/imp/lib/Prefs/Ui.php
@@ -1381,13 +1381,14 @@ class IMP_Prefs_Ui
         }
 
         if ($_SESSION['imp']['file_upload']) {
+            $t->set('can_import', true);
             $t->set('no_source', !$GLOBALS['prefs']->getValue('add_source'));
             if (!$t->get('no_source')) {
                 $cacheSess = $GLOBALS['injector']->getInstance('Horde_SessionObjects');
                 $t->set('import_pubkey-help', Horde_Help::link('imp', 'smime-import-pubkey'));
 
                 Horde::addInlineScript(array(
-                    '$("import_pgp").observe("click", function(e) { ' . Horde::popupJs($smime_url, array('params' => array('actionID' => 'import_public_key', 'reload' => $cacheSess->storeOid($ui->selfUrl()->setRaw(true), false)), 'height' => 275, 'width' => 750, 'urlencode' => true)) . '; e.stop(); })'
+                    '$("import_smime_public").observe("click", function(e) { ' . Horde::popupJs($smime_url, array('params' => array('actionID' => 'import_public_key', 'reload' => $cacheSess->storeOid($ui->selfUrl()->setRaw(true), false)), 'height' => 275, 'width' => 750, 'urlencode' => true)) . '; e.stop(); })'
                 ), 'dom');
             }
         }
diff --git a/imp/templates/prefs/smimepublickey.html b/imp/templates/prefs/smimepublickey.html
index bce9dc68f..910d4ce36 100644
--- a/imp/templates/prefs/smimepublickey.html
+++ b/imp/templates/prefs/smimepublickey.html
@@ -19,7 +19,7 @@
 </else:pubkey_list></if:pubkey_list>
   </div>
 
-<if:import_url>
+<if:can_import>
 <if:no_source>
   <div>
    <em><gettext>Key import is not available. You have no address book defined to add your contacts.</gettext></em>
@@ -27,15 +27,15 @@
 <else:no_source>
   <div>
    <p>
-    <input type="submit" name="save" class="button" onclick="<tag:import_url />return false;" value="<gettext>Import Public Key</gettext>" />
+    <input type="submit" name="save" id="import_smime_public" class="button" value="<gettext>Import Public Key</gettext>" />
    <tag:import_pubkey-help />
    </p>
   </div>
  </else:no_source></if:no_source>
-<else:import_url>
+<else:can_import>
   <div>
    <div class="prefsSmimeWarning"><gettext>Key import is not available. File upload is not enabled on this server.</gettext></div>
   </div>
-</else:import_url></if:import_url>
+</else:can_import></if:can_import>
  </div>
 </div>
-- 
2.11.0