Use session token instead of Horde_Token

horde · Nov 5, 2013 · 6d5c38e · 6d5c38e
1 parent 39096d0
commit 6d5c38e
Showing 1 changed file with 34 additions and 37 deletions.
diff --git a/turba/search.php b/turba/search.php
@@ -123,47 +123,44 @@
     if ($do_search) {
         if ($vars->save_vbook) {
             try {
-                $injector->getInstance('Horde_Token')->validate(
-                    $vars->token,
-                    'turba.search'
-                );
-
-                /* We create the vbook and redirect before we try to search
-                 * since we are not displaying the search results on this page
-                 * anyway. */
-                $vname = $vars->vbook_name;
-                if (empty($vname)) {
-                    $notification->push(_("You must provide a name for virtual address books."), 'horde.error');
-                    Horde::url('search.php', true)->redirect();
-                }
-
-                /* Create the vbook. */
-                $params = array(
-                    'name' => $vname,
-                    'params' => serialize(array(
-                        'type' => 'vbook',
-                        'source' => $source,
-                        'criteria' => $criteria
-                    ))
-                );
+                $session->checkToken($vars->token);
+            } catch (Horde_Exception $e) {
+                $notification->push($e);
+                Horde::url('search.php', true)->redirect();
+            }
 
-                try {
-                    $share = Turba::createShare(strval(new Horde_Support_Randomid()), $params);
-                    $vid = $share->getName();
-                } catch (Horde_Share_Exception $e) {
-                    $notification->push(sprintf(_("There was a problem creating the virtual address book: %s"), $e->getMessage()), 'horde.error');
-                    Horde::url('search.php', true)->redirect();
-                }
+            /* We create the vbook and redirect before we try to search
+             * since we are not displaying the search results on this page
+             * anyway. */
+            $vname = $vars->vbook_name;
+            if (empty($vname)) {
+                $notification->push(_("You must provide a name for virtual address books."), 'horde.error');
+                Horde::url('search.php', true)->redirect();
+            }
 
-                $notification->push(sprintf(_("Successfully created virtual address book \"%s\""), $vname), 'horde.success');
+            /* Create the vbook. */
+            $params = array(
+                'name' => $vname,
+                'params' => serialize(array(
+                    'type' => 'vbook',
+                    'source' => $source,
+                    'criteria' => $criteria
+                ))
+            );
 
-                Horde::url('browse.php', true)
-                    ->add('source', $vid)
-                    ->redirect();
-            } catch (Horde_Token_Exception $e) {
-                $notification->push($e);
+            try {
+                $share = Turba::createShare(strval(new Horde_Support_Randomid()), $params);
+                $vid = $share->getName();
+            } catch (Horde_Share_Exception $e) {
+                $notification->push(sprintf(_("There was a problem creating the virtual address book: %s"), $e->getMessage()), 'horde.error');
                 Horde::url('search.php', true)->redirect();
             }
+
+            $notification->push(sprintf(_("Successfully created virtual address book \"%s\""), $vname), 'horde.success');
+
+            Horde::url('browse.php', true)
+                ->add('source', $vid)
+                ->redirect();
         }
 
         /* Perform a search. */
@@ -232,7 +229,7 @@
     $vbookView->hasShare = true;
     $vbookView->shareSources = $shareSources;
     $vbookView->source = $source;
-    $vbookView->token = $injector->getInstance('Horde_Token')->get('turba.search');
+    $vbookView->token = $session->getToken();
     $page_output->addInlineScript('$(\'vbook_name\').observe(\'keyup\', function() { $(\'save-vbook\').checked = !!$F(\'vbook_name\'); });');
 }