From fd94c98953c589e291fbb10b4c0b20bd41c6e1d2 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Thu, 20 May 2010 00:42:24 -0400
Subject: [PATCH] some php5 stuff for folks, typo in turba

mend
---
 folks/lib/Friends/shared.php | 16 ++++------------
 turba/lib/Driver/Imsp.php    |  2 +-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/folks/lib/Friends/shared.php b/folks/lib/Friends/shared.php
index 27590ad50..181f9621a 100644
--- a/folks/lib/Friends/shared.php
+++ b/folks/lib/Friends/shared.php
@@ -44,9 +44,9 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
     {
         $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Share')->getScope();
 
-        $share = $GLOBALS['folks_shares']->getShareById($group);
-        if ($share instanceof PEAR_Error) {
-            return $share;
+        try {
+            $share = $GLOBALS['folks_shares']->getShareById($group);
+        } catch (Horde_Share_Exception $e) {
         }
 
         return $share->get('owner');
@@ -58,11 +58,7 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
     protected function _getGroups()
     {
         $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Share')->getScope();
-
         $groups = $GLOBALS['folks_shares']->listShares($this->_user, Horde_Perms::READ);
-        if ($groups instanceof PEAR_Error) {
-            return $groups;
-        }
 
         $list = array();
         foreach ($groups as $group) {
@@ -84,12 +80,8 @@ class Folks_Friends_shared extends  Folks_Friends_sql {
         }
 
         $GLOBALS['folks_shares'] = $GLOBALS['injector']->getInstance('Horde_Share')->getScope();
-
         $share = $GLOBALS['folks_shares']->getShareById($group);
-        if ($share instanceof PEAR_Error) {
-            return $share;
-        }
-
+        
         // Only owners of a group can delete them
         if (!Horde_Auth::getAuth() ||
             (Horde_Auth::getAuth() != $share->get('owner') &&
diff --git a/turba/lib/Driver/Imsp.php b/turba/lib/Driver/Imsp.php
index a37dda5f1..7d2651e7f 100644
--- a/turba/lib/Driver/Imsp.php
+++ b/turba/lib/Driver/Imsp.php
@@ -634,7 +634,7 @@ class Turba_Driver_Imsp extends Turba_Driver
         } else {
             $params['params']['name'] = $this->params['username'] . '.' . $params['name'];
         }
-        $result = &Turba::createShare($share_id, $params);
+        $result = Turba::createShare($share_id, $params);
         if (is_a($result, 'PEAR_Error')) {
             return $result;
         }
-- 
2.11.0