From 1bd5f6f7ee9998add8f795de8d65af794d4535d9 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 11 Dec 2008 15:19:32 -0700 Subject: [PATCH] Convert to new Horde_Secret package. --- imp/lib/Compose.php | 2 +- imp/lib/Crypt/pgp.php | 4 ++-- imp/lib/Crypt/smime.php | 4 ++-- imp/lib/IMP.php | 2 +- imp/lib/Quota.php | 2 +- imp/lib/Session.php | 2 +- imp/lib/api.php | 3 +-- imp/lib/base.php | 3 --- imp/login.php | 2 +- imp/redirect.php | 2 +- imp/scripts/custom_login.php | 8 ++------ 11 files changed, 13 insertions(+), 21 deletions(-) diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php index ca3d2e9c8..680974bf5 100644 --- a/imp/lib/Compose.php +++ b/imp/lib/Compose.php @@ -669,7 +669,7 @@ class IMP_Compose * well. */ if (!empty($params['auth']) && empty($params['username'])) { $params['username'] = $_SESSION['imp']['user']; - $params['password'] = Secret::read(IMP::getAuthKey(), $_SESSION['imp']['pass']); + $params['password'] = Horde_Secret::read(IMP::getAuthKey(), $_SESSION['imp']['pass']); } return $message->send($email, $headers, $conf['mailer']['type'], $params); diff --git a/imp/lib/Crypt/pgp.php b/imp/lib/Crypt/pgp.php index 279bfb330..a25c9668d 100644 --- a/imp/lib/Crypt/pgp.php +++ b/imp/lib/Crypt/pgp.php @@ -380,7 +380,7 @@ class IMP_Horde_Crypt_pgp extends Horde_Crypt_pgp } return isset($_SESSION['imp']['cache']['pgp'][$type][$id]) - ? Secret::read(IMP::getAuthKey(), $_SESSION['imp']['cache']['pgp'][$type][$id]) + ? Horde_Secret::read(IMP::getAuthKey(), $_SESSION['imp']['cache']['pgp'][$type][$id]) : null; } @@ -404,7 +404,7 @@ class IMP_Horde_Crypt_pgp extends Horde_Crypt_pgp $id = 'personal'; } - $_SESSION['imp']['cache']['pgp'][$type][$id] = Secret::write(IMP::getAuthKey(), $passphrase); + $_SESSION['imp']['cache']['pgp'][$type][$id] = Horde_Secret::write(IMP::getAuthKey(), $passphrase); return true; } diff --git a/imp/lib/Crypt/smime.php b/imp/lib/Crypt/smime.php index c8f335228..1357430b0 100644 --- a/imp/lib/Crypt/smime.php +++ b/imp/lib/Crypt/smime.php @@ -277,7 +277,7 @@ class IMP_Horde_Crypt_smime extends Horde_Crypt_smime } if (isset($_SESSION['imp']['smime']['passphrase'])) { - return Secret::read(IMP::getAuthKey(), $_SESSION['imp']['smime']['passphrase']); + return Horde_Secret::read(IMP::getAuthKey(), $_SESSION['imp']['smime']['passphrase']); } elseif (isset($_SESSION['imp']['smime']['null_passphrase'])) { return ($_SESSION['imp']['smime']['null_passphrase']) ? null : false; } else { @@ -306,7 +306,7 @@ class IMP_Horde_Crypt_smime extends Horde_Crypt_smime if (!isset($_SESSION['imp']['smime'])) { $_SESSION['imp']['smime'] = array(); } - $_SESSION['imp']['smime']['passphrase'] = Secret::write(IMP::getAuthKey(), $passphrase); + $_SESSION['imp']['smime']['passphrase'] = Horde_Secret::write(IMP::getAuthKey(), $passphrase); return true; } diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php index a77435231..7fc0a8be1 100644 --- a/imp/lib/IMP.php +++ b/imp/lib/IMP.php @@ -1819,7 +1819,7 @@ class IMP $key = &self::$_authkey; if (is_null($key)) { - $key = Secret::getKey(Auth::getProvider() == 'imp' ? 'auth' : 'imp'); + $key = Horde_Secret::getKey(Auth::getProvider() == 'imp' ? 'auth' : 'imp'); } return $key; } diff --git a/imp/lib/Quota.php b/imp/lib/Quota.php index cb697688b..73ad5e103 100644 --- a/imp/lib/Quota.php +++ b/imp/lib/Quota.php @@ -79,7 +79,7 @@ class IMP_Quota /* If 'password' exists in params, it has been encrypted in the * session so we need to decrypt. */ if (isset($this->_params['password'])) { - $this->_params['password'] = Secret::read(IMP::getAuthKey(), $this->_params['password']); + $this->_params['password'] = Horde_Secret::read(IMP::getAuthKey(), $this->_params['password']); } } diff --git a/imp/lib/Session.php b/imp/lib/Session.php index 5b8fbc3e0..a604bb222 100644 --- a/imp/lib/Session.php +++ b/imp/lib/Session.php @@ -130,7 +130,7 @@ class IMP_Session /* 'admin' and 'quota' have password entries - encrypt * these entries in the session if they exist. */ if (isset($ptr[$val]['params']['password'])) { - $sess['imap'][$val]['params']['password'] = Secret::write(IMP::getAuthKey(), $ptr[$val]['params']['password']); + $sess['imap'][$val]['params']['password'] = Horde_Secret::write(IMP::getAuthKey(), $ptr[$val]['params']['password']); } } } diff --git a/imp/lib/api.php b/imp/lib/api.php index 8842f0685..b5650e386 100644 --- a/imp/lib/api.php +++ b/imp/lib/api.php @@ -318,11 +318,10 @@ function _imp_userList() function _imp_adminDo($task, $params) { require_once 'Horde/IMAP/Admin.php'; - require_once 'Horde/Secret.php'; $admin_params = $_SESSION['imp']['admin']['params']; $admin_params['admin_user'] = $admin_params['login']; - $admin_params['admin_password'] = Secret::read(IMP::getAuthKey(), $admin_params['password']); + $admin_params['admin_password'] = Horde_Secret::read(IMP::getAuthKey(), $admin_params['password']); $imap = new IMAP_Admin($admin_params); switch ($task) { diff --git a/imp/lib/base.php b/imp/lib/base.php index 3f64b6a5f..0373aec38 100644 --- a/imp/lib/base.php +++ b/imp/lib/base.php @@ -175,9 +175,6 @@ if (($viewmode == 'dimp') && Util::nonInputVar('dimp_logout')) { Horde::redirect(str_replace('&', '&', IMP::getLogoutUrl())); } -// Horde libraries. -require_once 'Horde/Secret.php'; - // Initialize global $imp_mbox array. $GLOBALS['imp_mbox'] = IMP::getCurrentMailboxInfo(); diff --git a/imp/login.php b/imp/login.php index 9b828b054..c8cf41305 100644 --- a/imp/login.php +++ b/imp/login.php @@ -117,7 +117,7 @@ if (!empty($conf['auth']['alternate_login'])) { /* Initialize the password key. If we are doing Horde auth as well, * make sure that the Horde auth key gets set instead. */ -Secret::setKey($imp_auth ? 'auth' : 'imp'); +Horde_Secret::setKey($imp_auth ? 'auth' : 'imp'); $autologin = Util::getFormData('autologin', false); $server_key = Util::getFormData('server_key', IMP_Session::getAutoLoginServer()); diff --git a/imp/redirect.php b/imp/redirect.php index 7219e3a71..ba8d15180 100644 --- a/imp/redirect.php +++ b/imp/redirect.php @@ -113,7 +113,7 @@ if (isset($_SESSION['imp']) && is_array($_SESSION['imp'])) { /* Make sure that if a username was specified, it is the current * username. */ if ((!is_null($imapuser) && ($imapuser != $_SESSION['imp']['user'])) || - (!is_null($pass) && ($pass != Secret::read(IMP::getAuthKey(), $_SESSION['imp']['pass'])))) { + (!is_null($pass) && ($pass != Horde_Secret::read(IMP::getAuthKey(), $_SESSION['imp']['pass'])))) { /* Disable the old session. */ unset($_SESSION['imp']); diff --git a/imp/scripts/custom_login.php b/imp/scripts/custom_login.php index 377f162ac..2b50a2d80 100644 --- a/imp/scripts/custom_login.php +++ b/imp/scripts/custom_login.php @@ -1,14 +1,10 @@