Secret:: -> Horde_Secret::

diff --git a/babel/lib/base.php b/babel/lib/base.php
index 5f5c2a8..5b79ebe 100644 (file)
--- 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 9ea8c44..6688065 100644 (file)
--- 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 7b67f11..8cf5069 100644 (file)
--- 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 0b35411..c46dc40 100644 (file)
--- 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 eb0fe1d..debfbdd 100644 (file)
--- 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));
             }
         }