Remove Horde_Token dependency

horde · Nov 4, 2013 · 96ae8a6 · 96ae8a6
1 parent 305185f
commit 96ae8a6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/imp/lib/Basic/Compose.php b/imp/lib/Basic/Compose.php
@@ -66,8 +66,6 @@ protected function _init()
             $identity->setDefault($this->vars->identity);
         }
 
-        $horde_token = $injector->getInstance('Horde_Token');
-
         if ($this->vars->actionID) {
             switch ($this->vars->actionID) {
             case 'draft':
@@ -104,12 +102,9 @@ protected function _init()
         /* Check for duplicate submits. */
         if ($reload = $this->vars->compose_formToken) {
             try {
-                if (!$horde_token->verify($reload)) {
-                    $notification->push(_("You have already submitted this page."), 'horde.error');
-                    $this->vars->actionID = null;
-                }
-            } catch (Horde_Token_Exception $e) {
-                $notification->push($e->getMessage());
+                $session->checkNonce($reload);
+            } catch (Horde_Exception $e) {
+                $notification->push(_("You have already submitted this page."), 'horde.error');
                 $this->vars->actionID = null;
             }
         }
@@ -508,7 +503,7 @@ protected function _init()
                 if ($this->vars->actionID == 'auto_save_draft') {
                     $r = new stdClass;
                     $r->requestToken = $session->getToken();
-                    $r->formToken = Horde_Token::generateId('compose');
+                    $r->formToken = $session->getNonce();
 
                     $response = new Horde_Core_Ajax_Response_HordeCore($r);
                     $response->sendAndExit();
@@ -629,7 +624,7 @@ protected function _init()
             if ($resume || count($imp_compose)) {
                 $cancel_url = self::url()->setRaw(true)->add(array(
                     'actionID' => 'cancel_compose',
-                    'compose_requestToken' => $horde_token->get('imp.compose'),
+                    'compose_requestToken' => $session->getToken(),
                     'composeCache' => $composeCacheID,
                     'popup' => 1
                 ));
@@ -641,7 +636,7 @@ protected function _init()
         } elseif ($resume || count($imp_compose)) {
             $cancel_url = $this->_mailboxReturnUrl(self::url()->setRaw(true))->setRaw(true)->add(array(
                 'actionID' => 'cancel_compose',
-                'compose_requestToken' => $horde_token->get('imp.compose'),
+                'compose_requestToken' => $session->getToken(),
                 'composeCache' => $composeCacheID
             ));
             $discard_url = clone $cancel_url;
@@ -759,7 +754,7 @@ protected function _init()
             /* Prepare the redirect template. */
             $view->cacheid = $composeCacheID;
             $view->title = $this->title;
-            $view->token = $horde_token->get('imp.compose');
+            $view->token = $session->getToken();
 
             if ($registry->hasMethod('contacts/search')) {
                 $view->abook = $blank_url->copy()->link(array(
@@ -780,7 +775,7 @@ protected function _init()
             $hidden = array(
                 'actionID' => '',
                 'attachmentAction' => '',
-                'compose_formToken' => Horde_Token::generateId('compose'),
+                'compose_formToken' => $session->getNonce(),
                 'compose_requestToken' => $session->getToken(),
                 'composeCache' => $composeCacheID,
                 'oldrtemode' => $rtemode,

diff --git a/imp/package.xml b/imp/package.xml
@@ -1382,13 +1382,6 @@
     <max>3.0.0alpha1</max>
     <exclude>3.0.0alpha1</exclude>
    </package>
-   <package>
-    <name>Horde_Token</name>
-    <channel>pear.horde.org</channel>
-    <min>2.0.0</min>
-    <max>3.0.0alpha1</max>
-    <exclude>3.0.0alpha1</exclude>
-   </package>
    <package>
     <name>Horde_Tree</name>
     <channel>pear.horde.org</channel>