use Horde::isConnectionSecure() and Horde::requireSecureConnection()

diff --git a/imp/ajax.php b/imp/ajax.php
index 0e3146b..d7ab9ac 100644 (file)
--- a/imp/ajax.php
+++ b/imp/ajax.php
@@ -694,7 +694,7 @@ case 'SMIMEPersonal':
     if ($action == 'SMIMEPersonal') {
         $imp_smime = Horde_Crypt::singleton(array('IMP', 'Smime'));
         try {
-            $imp_smime->requireSecureConnection();
+            Horde::requireSecureConnection();
             if ($passphrase) {
                 if ($imp_smime->storePassphrase($passphrase)) {
                     $result->success = 1;
@@ -710,7 +710,7 @@ case 'SMIMEPersonal':
     } else {
         $imp_pgp = Horde_Crypt::singleton(array('IMP', 'Pgp'));
         try {
-            $imp_pgp->requireSecureConnection();
+            Horde::requireSecureConnection();
             if ($passphrase) {
                 if ($imp_pgp->storePassphrase(($action == 'PGPSymmetric') ? 'symmetric' : 'personal', $passphrase, Util::getFormData('symmetricid'))) {
                     $result->success = 1;

diff --git a/imp/pgp.php b/imp/pgp.php
index bb4ee3b..a2ce671 100644 (file)
--- a/imp/pgp.php
+++ b/imp/pgp.php
@@ -77,12 +77,7 @@ try {
     Horde::fatal($e, __FILE__, __LINE__);
 }
 
-try {
-    $imp_pgp->requireSecureConnection();
-    $secure_check = true;
-} catch (Horde_Exception $e) {
-    $secure_check = false;
-}
+$secure_check = Horde::isConnectionSecure();
 
 /* Run through the action handlers */
 $actionID = Util::getFormData('actionID');

diff --git a/imp/smime.php b/imp/smime.php
index 8d1849a..d49e103 100644 (file)
--- a/imp/smime.php
+++ b/imp/smime.php
@@ -86,12 +86,7 @@ try {
     Horde::fatal($e, __FILE__, __LINE__);
 }
 
-try {
-    $imp_smime->requireSecureConnection();
-    $secure_check = true;
-} catch (Horde_Exception $e) {
-    $secure_check = false;
-}
+$secure_check = Horde::isConnectionSecure();
 
 /* Run through the action handlers */
 $actionID = Util::getFormData('actionID');