From 8f502b0bb4e3897baedf567be654cccc76733a77 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 24 Jun 2009 16:23:19 -0600 Subject: [PATCH] Secret:: -> Horde_Secret:: --- babel/lib/base.php | 3 --- folks/edit/password.php | 4 ++-- kronolith/calendars/remote_edit.php | 5 ++--- kronolith/lib/Forms/EditRemoteCalendar.php | 5 ++--- kronolith/lib/Forms/SubscribeRemoteCalendar.php | 5 ++--- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/babel/lib/base.php b/babel/lib/base.php index 5f5c2a85a..5b79ebe5d 100644 --- a/babel/lib/base.php +++ b/babel/lib/base.php @@ -39,9 +39,6 @@ if (is_a(($pushed = $registry->pushApp('babel', !defined('AUTH_HANDLER'))), 'PEA $conf = &$GLOBALS['conf']; @define('BABEL_TEMPLATES', $registry->get('templates')); -/* Horde base libraries */ -require_once 'Horde/Secret.php'; - /* Babel base library */ require_once BABEL_BASE . '/lib/Babel.php'; require_once BABEL_BASE . '/lib/Translate.php'; diff --git a/folks/edit/password.php b/folks/edit/password.php index 9ea8c4486..6688065f2 100644 --- a/folks/edit/password.php +++ b/folks/edit/password.php @@ -162,10 +162,10 @@ do { if (Auth::getCredential('password') == $info['old']) { Auth::setCredential('password', $info['new']); if (Auth::getProvider() == 'imp' || !empty($_SESSION['imp']['pass'])) { - $_SESSION['imp']['pass'] = Secret::write(Secret::getKey('imp'), + $_SESSION['imp']['pass'] = Horde_Secret::write(Horde_Secret::getKey('imp'), $info['new']); } elseif (Auth::getProvider() == 'mimp' || !empty($_SESSION['mimp']['pass'])) { - $_SESSION['mimp']['pass'] = Secret::write(Secret::getKey('mimp'), + $_SESSION['mimp']['pass'] = Horde_Secret::write(Horde_Secret::getKey('mimp'), $info['new']); } } diff --git a/kronolith/calendars/remote_edit.php b/kronolith/calendars/remote_edit.php index 7b67f11fb..8cf506900 100644 --- a/kronolith/calendars/remote_edit.php +++ b/kronolith/calendars/remote_edit.php @@ -57,9 +57,8 @@ $key = Auth::getCredential('password'); $username = $calendar['user']; $password = $calendar['password']; if ($key) { - require_once 'Horde/Secret.php'; - $username = Secret::read($key, base64_decode($username)); - $password = Secret::read($key, base64_decode($password)); + $username = Horde_Secret::read($key, base64_decode($username)); + $password = Horde_Secret::read($key, base64_decode($password)); } $vars->set('name', $calendar['name']); diff --git a/kronolith/lib/Forms/EditRemoteCalendar.php b/kronolith/lib/Forms/EditRemoteCalendar.php index 0b3541162..c46dc40dc 100644 --- a/kronolith/lib/Forms/EditRemoteCalendar.php +++ b/kronolith/lib/Forms/EditRemoteCalendar.php @@ -49,9 +49,8 @@ class Kronolith_EditRemoteCalendarForm extends Horde_Form { if (strlen($username) || strlen($password)) { $key = Auth::getCredential('password'); if ($key) { - require_once 'Horde/Secret.php'; - $username = base64_encode(Secret::write($key, $username)); - $password = base64_encode(Secret::write($key, $password)); + $username = base64_encode(Horde_Secret::write($key, $username)); + $password = base64_encode(Horde_Secret::write($key, $password)); } } diff --git a/kronolith/lib/Forms/SubscribeRemoteCalendar.php b/kronolith/lib/Forms/SubscribeRemoteCalendar.php index eb0fe1d85..debfbdd7b 100644 --- a/kronolith/lib/Forms/SubscribeRemoteCalendar.php +++ b/kronolith/lib/Forms/SubscribeRemoteCalendar.php @@ -49,9 +49,8 @@ class Kronolith_SubscribeRemoteCalendarForm extends Horde_Form { if (strlen($username) || strlen($password)) { $key = Auth::getCredential('password'); if ($key) { - require_once 'Horde/Secret.php'; - $username = base64_encode(Secret::write($key, $username)); - $password = base64_encode(Secret::write($key, $password)); + $username = base64_encode(Horde_Secret::write($key, $username)); + $password = base64_encode(Horde_Secret::write($key, $password)); } } -- 2.11.0