More removal of onclick attributes.

diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php
index 357a6a1..39672ad 100644 (file)
--- a/imp/lib/Prefs/Ui.php
+++ b/imp/lib/Prefs/Ui.php
@@ -1045,8 +1045,11 @@ class IMP_Prefs_Ui
                 $t->set('viewprivate', Horde::link($pgp_url->copy()->add('actionID', 'view_personal_private_key'), _("View Personal Private Key"), null, 'view_key'));
                 $t->set('infoprivate', Horde::link($pgp_url->copy()->add('actionID', 'info_personal_private_key'), _("Information on Personal Private Key"), null, 'info_key'));
                 $t->set('personalkey-private-help', Horde_Help::link('imp', 'pgp-personalkey-private'));
-                $t->set('deletekeypair', addslashes(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")));
                 $t->set('personalkey-delete-help', Horde_Help::link('imp', 'pgp-personalkey-delete'));
+
+                Horde::addInlineScript(array(
+                    '$("delete_pgp_privkey").observe("click", function(e) { if (!window.confirm(' . Horde_Serialize::serialize(_("Are you sure you want to delete your keypair? (This is NOT recommended!)"), Horde_Serialize::JSON, $GLOBALS['registry']->getCharset()) . ')) { e.stop(); } })'
+                ), 'dom');
             } else {
                 $imp_identity = $GLOBALS['injector']->getInstance('IMP_Identity');
                 $t->set('fullname', $imp_identity->getFullname());
@@ -1056,11 +1059,16 @@ class IMP_Prefs_Ui
                 $t->set('personalkey-create-email-help', Horde_Help::link('imp', 'pgp-personalkey-create-email'));
                 $t->set('personalkey-create-keylength-help', Horde_Help::link('imp', 'pgp-personalkey-create-keylength'));
                 $t->set('personalkey-create-passphrase-help', Horde_Help::link('imp', 'pgp-personalkey-create-passphrase'));
-                $t->set('keygen', addslashes(_("Key generation may take a long time to complete.  Continue with key generation?")));
+
+                Horde::addInlineScript(array(
+                    '$("create_pgp_key").observe("click", function(e) { if (!window.confirm(' . Horde_Serialize::serialize(_("Key generation may take a long time to complete.  Continue with key generation?"), Horde_Serialize::JSON, $GLOBALS['registry']->getCharset()) . ')) { e.stop(); } })'
+                ), 'dom');
 
                 if ($_SESSION['imp']['file_upload']) {
                     $cacheSess = $GLOBALS['injector']->getInstance('Horde_SessionObjects');
-                    $t->set('import_url', Horde::popupJs($pgp_url, array('params' => array('actionID' => 'import_personal_public_key', 'reload' => $cacheSess->storeOid($ui->selfUrl()->setRaw(true), false)), 'height' => 275, 'width' => 750, 'urlencode' => true)));
+                    Horde::addInlineScript(array(
+                        '$("import_pgp_personal").observe("click", function(e) { ' . Horde::popupJs($pgp_url, array('params' => array('actionID' => 'import_personal_public_key', 'reload' => $cacheSess->storeOid($ui->selfUrl()->setRaw(true), false)), 'height' => 275, 'width' => 750, 'urlencode' => true)) . '; e.stop(); })'
+                    ), 'dom');
                 }
 
                 $t->set('personalkey-create-actions-help', Horde_Help::link('imp', 'pgp-personalkey-create-actions'));
@@ -1157,11 +1165,15 @@ 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_url', Horde::popupJs($pgp_url, array('params' => array('actionID' => 'import_public_key', 'reload' => $cacheSess->storeOid($ui->selfUrl()->setRaw(true), false)), 'height' => 275, 'width' => 750, 'urlencode' => true)));
                 $t->set('import_pubkey-help', Horde_Help::link('imp', 'pgp-import-pubkey'));
+
+                Horde::addInlineScript(array(
+                    '$("import_pgp_public").observe("click", function(e) { ' . Horde::popupJs($pgp_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');
             }
         }
 
@@ -1291,12 +1303,18 @@ class IMP_Prefs_Ui
                 $t->set('passphrase', empty($passphrase) ? Horde::link('#', _("Enter Passphrase"), null, null, null, null, null, array('id' => $imple->getPassphraseId())) . _("Enter Passphrase") : Horde::link($ui->selfUrl(array('special' => true))->add('unset_smime_passphrase', 1), _("Unload Passphrase")) . _("Unload Passphrase"));
 
                 $t->set('viewprivate', Horde::link($smime_url->copy()->add('actionID', 'view_personal_private_key'), _("View Personal Private Key"), null, 'view_key'));
-                $t->set('deletekeypair', addslashes(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")));
                 $t->set('personalkey-delete-help', Horde_Help::link('imp', 'smime-delete-personal-certs'));
+
+                Horde::addInlineScript(array(
+                    '$("delete_smime_personal").observe("click", function(e) { if (!window.confirm(' . Horde_Serialize::serialize(_("Are you sure you want to delete your keypair? (This is NOT recommended!)"), Horde_Serialize::JSON, $GLOBALS['registry']->getCharset()) . ')) { e.stop(); } })'
+                ), 'dom');
             } elseif ($_SESSION['imp']['file_upload']) {
                 $cacheSess = $GLOBALS['injector']->getInstance('Horde_SessionObjects');
-                $t->set('import_url', Horde::popupJs($smime_url, array('params' => array('actionID' => 'import_personal_public_key', 'reload' => $cacheSess->storeOid($ui->selfUrl()->setRaw(true), false)), 'height' => 275, 'width' => 750, 'urlencode' => true)));
                 $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' => $cacheSess->storeOid($ui->selfUrl()->setRaw(true), false)), 'height' => 275, 'width' => 750, 'urlencode' => true)) . '; e.stop(); })'
+                ), 'dom');
             }
         }
 
@@ -1366,8 +1384,11 @@ class IMP_Prefs_Ui
             $t->set('no_source', !$GLOBALS['prefs']->getValue('add_source'));
             if (!$t->get('no_source')) {
                 $cacheSess = $GLOBALS['injector']->getInstance('Horde_SessionObjects');
-                $t->set('import_url', 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)));
                 $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(); })'
+                ), 'dom');
             }
         }
 

diff --git a/imp/templates/prefs/pgpprivatekey.html b/imp/templates/prefs/pgpprivatekey.html
index 188eaea..6a24d3a 100644 (file)
--- a/imp/templates/prefs/pgpprivatekey.html
+++ b/imp/templates/prefs/pgpprivatekey.html
@@ -37,7 +37,7 @@
  </div>
 
  <p>
-  <input type="submit" name="delete_pgp_privkey" class="button" onclick="confirm('<tag:deletekeypair />')" value="<gettext>Delete Current Keys</gettext>" />
+  <input type="submit" id="delete_pgp_privkey" name="delete_pgp_privkey" class="button" value="<gettext>Delete Current Keys</gettext>" />
   <tag:personalkey-delete-help />
  </p>
 <else:has_key>
@@ -113,9 +113,9 @@
   </table>
 
   <p>
-   <input type="submit" name="create_pgp_key" class="button" onclick="confirm('<tag:keygen />')" value="<gettext>Create Keys</gettext>" />
+   <input type="submit" id="create_pgp_key" name="create_pgp_key" class="button" value="<gettext>Create Keys</gettext>" />
 <if:import_url>
-   <input type="submit" name="save" class="button" onclick="<tag:import_url />return false;" value="<gettext>Import Keypair</gettext>" />
+   <input type="submit" name="save" class="button" id="import_pgp_personal" value="<gettext>Import Keypair</gettext>" />
 </if:import_url>
    <tag:personalkey-create-actions-help />
   </p>

diff --git a/imp/templates/prefs/pgppublickey.html b/imp/templates/prefs/pgppublickey.html
index 097fc81..4ef78c5 100644 (file)
--- a/imp/templates/prefs/pgppublickey.html
+++ b/imp/templates/prefs/pgppublickey.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_pgp_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="prefsPgpWarning"><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>

diff --git a/imp/templates/prefs/smimeprivatekey.html b/imp/templates/prefs/smimeprivatekey.html
index 790ad67..99e23a8 100644 (file)
--- a/imp/templates/prefs/smimeprivatekey.html
+++ b/imp/templates/prefs/smimeprivatekey.html
@@ -31,14 +31,14 @@
  </div>
 
  <p>
-  <input type="submit" name="delete_smime_personal" class="button" onclick="confirm('<tag:deletekeypair />')" value="<gettext>Delete Personal Certificate</gettext>" />
+  <input type="submit" id="delete_smime_personal" name="delete_smime_personal" class="button" value="<gettext>Delete Personal Certificate</gettext>" />
   <tag:personalkey-delete-help />
  </p>
 <else:has_key>
 <if:import_url>
  <div>
   <p>
-   <input type="submit" name="save" class="button" onclick="<tag:import_url />return false;" value="<gettext>Import Personal Certificate</gettext>" />
+   <input type="submit" name="save" class="button" id="import_smime_personal" value="<gettext>Import Personal Certificate</gettext>" />
    <tag:import-cert-help />
   </p>
  </div>