From 488a0bc46c04be4279eed2f7fca68e341ea7952f Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Sat, 17 Jul 2010 14:51:50 -0400
Subject: [PATCH] A few more H4 tracking changes

---
 trean/add.php           | 4 ++--
 trean/bookmark.php      | 2 +-
 trean/lib/Bookmarks.php | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/trean/add.php b/trean/add.php
index 39fddd75d..809a91243 100644
--- a/trean/add.php
+++ b/trean/add.php
@@ -37,7 +37,7 @@ case 'add_bookmark':
         $properties = array();
         $properties['name'] = $new_folder;
 
-        $parent_id = $trean_shares->getId(Horde_Auth::getAuth());
+        $parent_id = $trean_shares->getId($registry->getAuth());
         $parent = &$trean_shares->getFolder($parent_id);
         $result = $parent->addFolder($properties);
 
@@ -77,7 +77,7 @@ case 'add_bookmark':
 case 'add_folder':
     $parent_id = Horde_Util::getFormData('f');
     if (is_null($parent_id)) {
-        $parent_id = $trean_shares->getId(Horde_Auth::getAuth());
+        $parent_id = $trean_shares->getId($registry->getAuth());
     }
 
     /* Check permissions. */
diff --git a/trean/bookmark.php b/trean/bookmark.php
index 88b001c45..cf0733f0c 100644
--- a/trean/bookmark.php
+++ b/trean/bookmark.php
@@ -18,7 +18,7 @@ if (is_a($bookmark, 'PEAR_Error')) {
 $folder = $trean_shares->getFolder($bookmark->folder);
 if (is_a($folder, 'PEAR_Error')) {
     die($folder);
-} elseif (!$folder->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) {
+} elseif (!$folder->hasPermission($registry->getAuth(), Horde_Perms::EDIT)) {
     die('Permission denied');
 }
 
diff --git a/trean/lib/Bookmarks.php b/trean/lib/Bookmarks.php
index f7b178fe3..ab9032ee1 100644
--- a/trean/lib/Bookmarks.php
+++ b/trean/lib/Bookmarks.php
@@ -419,12 +419,8 @@ class Trean_Bookmarks {
             return PEAR::raiseError('Folders must be DataTreeObject_Folder objects or extend that class.');
         }
 
-        $perm = &$GLOBALS['perms']->newPermission($folder->getName());
-        if (is_a($perm, 'PEAR_Error')) {
-            return $perm;
-        }
-
         /* Give the owner full access */
+        $perm = $GLOBALS['injector']->getInstance('Horde_Perms')->newPermission($folder->getName());
         $perm->addUserPermission($folder->get('owner'), Horde_Perms::SHOW, false);
         $perm->addUserPermission($folder->get('owner'), Horde_Perms::READ, false);
         $perm->addUserPermission($folder->get('owner'), Horde_Perms::EDIT, false);
-- 
2.11.0