Begin working on converting PEAR_Error to Exceptions

More work needs to be done here.

diff --git a/whups/admin/index.php b/whups/admin/index.php
index 4b84765..59b88a0 100644 (file)
--- a/whups/admin/index.php
+++ b/whups/admin/index.php
@@ -385,11 +385,11 @@ case 'deletequeueform':
     $form = new DeleteQueueForm($vars);
     if ($form->validate($vars)) {
         if ($vars->get('yesno') == 1) {
-            $result = $whups_driver->deleteQueue($vars->get('queue'));
-            if (!is_a($result, 'PEAR_Error')) {
+            try {
+                $result = $whups_driver->deleteQueue($vars->get('queue'));
                 $notification->push( _("The queue has been deleted."),
                                      'horde.success');
-            } else {
+            } catch (Horde_Exception $e) {
                 $notification->push(_("There was an error deleting the queue:")
                                     . ' ' . $result->getMessage(),
                                     'horde.error');

diff --git a/whups/lib/Driver.php b/whups/lib/Driver.php
index 5b33207..038693c 100644 (file)
--- a/whups/lib/Driver.php
+++ b/whups/lib/Driver.php
@@ -286,12 +286,12 @@ class Whups_Driver {
     function deleteQueue($queueId)
     {
         $perms = $GLOBALS['injector']->getInstance('Horde_Perms');
-        $perm = $perms->getPermission("whups:queues:$queueId");
-        if (is_a($perm, 'PEAR_Error')) {
-            return;
-        }
+        try {
+            $perm = $perms->getPermission("whups:queues:$queueId");
+            return $perms->removePermission($perm, true);
+        } catch (Horde_Perms_Exception $e) {}
 
-        return $perms->removePermission($perm, true);
+        return true;
     }
 
     /**
@@ -305,12 +305,12 @@ class Whups_Driver {
     function deleteReply($reply)
     {
         $perms = $GLOBALS['injector']->getInstance('Horde_Perms');
-        $perm = $perms->getPermission("whups:replies:$reply");
-        if (is_a($perm, 'PEAR_Error')) {
-            return;
-        }
+        try {
+            $perm = $perms->getPermission("whups:replies:$reply");
+            return $perms->removePermission($perm, true);
+        } catch (Horde_Perms_Exception $e) {}
 
-        return $perms->removePermission($perm, true);
+        return true;
     }
 
     /**