Bug #9387: Fix UI to allow upload of personal S/MIME cert

diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php
index 55d50c8..c09ba38 100644 (file)
--- a/imp/lib/Prefs/Ui.php
+++ b/imp/lib/Prefs/Ui.php
@@ -1521,7 +1521,7 @@ class IMP_Prefs_Ui
                 $t->set('import-cert-help', Horde_Help::link('imp', 'smime-import-personal-certs'));
 
                 Horde::addInlineScript(array(
-                    '$("import_smime_personal").observe("click", function(e) { ' . Horde::popupJs($smime_url, array('params' => array('actionID' => 'import_personal_public_key', 'reload' => $GLOBALS['session']->store($ui->selfUrl()->setRaw(true), false)), 'height' => 275, 'width' => 750, 'urlencode' => true)) . '; e.stop(); })'
+                    '$("import_smime_personal").observe("click", function(e) { ' . Horde::popupJs($smime_url, array('params' => array('actionID' => 'import_personal_certs', 'reload' => $GLOBALS['session']->store($ui->selfUrl()->setRaw(true), false)), 'height' => 275, 'width' => 750, 'urlencode' => true)) . '; e.stop(); })'
                 ), 'dom');
             }
         }

diff --git a/imp/templates/prefs/smimeprivatekey.html b/imp/templates/prefs/smimeprivatekey.html
index 99e23a8..569943e 100644 (file)
--- a/imp/templates/prefs/smimeprivatekey.html
+++ b/imp/templates/prefs/smimeprivatekey.html
@@ -35,14 +35,12 @@
   <tag:personalkey-delete-help />
  </p>
 <else:has_key>
-<if:import_url>
  <div>
   <p>
    <input type="submit" name="save" class="button" id="import_smime_personal" value="<gettext>Import Personal Certificate</gettext>" />
    <tag:import-cert-help />
   </p>
  </div>
-</if:import_url>
 </else:has_key></if:has_key>
 </else:notsecure></if:notsecure>
 </div>