From: Jan Schneider Date: Thu, 11 Feb 2010 09:51:45 +0000 (+0100) Subject: Use Horde_Exception_PermissionDenied. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=46612f5f805800e9d52b7c0b9a8fb20b6ef5ae24;p=horde.git Use Horde_Exception_PermissionDenied. --- diff --git a/kronolith/lib/Api.php b/kronolith/lib/Api.php index c1609e0e3..b3d28b476 100644 --- a/kronolith/lib/Api.php +++ b/kronolith/lib/Api.php @@ -454,7 +454,7 @@ class Kronolith_Api extends Horde_Registry_Api } if (!array_key_exists($calendar, Kronolith::listCalendars(false, Horde_Perms::READ))) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $driver = Kronolith::getDriver(null, $calendar); @@ -493,7 +493,7 @@ class Kronolith_Api extends Horde_Registry_Api if (!array_key_exists($calendar, Kronolith::listCalendars(false, Horde_Perms::READ))) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $history = Horde_History::singleton(); @@ -524,7 +524,7 @@ class Kronolith_Api extends Horde_Registry_Api if (!array_key_exists($calendar, Kronolith::listCalendars(false, Horde_Perms::READ))) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $history = Horde_History::singleton(); @@ -553,7 +553,7 @@ class Kronolith_Api extends Horde_Registry_Api } if (!array_key_exists($calendar, Kronolith::listCalendars(false, Horde_Perms::EDIT))) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } switch ($contentType) { @@ -635,7 +635,7 @@ class Kronolith_Api extends Horde_Registry_Api } if (!array_key_exists($calendar, Kronolith::listCalendars(false, Horde_Perms::EDIT))) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $event = Kronolith::quickAdd($text, $calendar); return $event->uid; @@ -664,7 +664,7 @@ class Kronolith_Api extends Horde_Registry_Api $event = Kronolith::getDriver()->getByUID($uid); if (!$event->hasPermission(Horde_Perms::READ)) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $version = '2.0'; @@ -710,7 +710,7 @@ class Kronolith_Api extends Horde_Registry_Api if (!array_key_exists($calendar, Kronolith::listCalendars(false, Horde_Perms::READ))) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $kronolith_driver = Kronolith::getDriver(null, $calendar); @@ -796,7 +796,7 @@ class Kronolith_Api extends Horde_Registry_Api } if (empty($event)) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $kronolith_driver->deleteEvent($event->id); @@ -822,7 +822,7 @@ class Kronolith_Api extends Horde_Registry_Api if (!$event->hasPermission(Horde_Perms::EDIT) || ($event->private && $event->creator != Horde_Auth::getAuth())) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } if (is_a($content, 'Horde_iCalendar_vevent')) { @@ -901,7 +901,7 @@ class Kronolith_Api extends Horde_Registry_Api { $event = Kronolith::getDriver()->getByUID($uid); if (!$event->hasPermission(Horde_Perms::SHOW)) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } return $event; @@ -959,7 +959,7 @@ class Kronolith_Api extends Horde_Registry_Api if (empty($event) || ($event->private && $event->creator != Horde_Auth::getAuth())) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $atnames = $response->getAttribute('ATTENDEE'); @@ -1022,7 +1022,7 @@ class Kronolith_Api extends Horde_Registry_Api $allowed_calendars = Kronolith::listCalendars(false, Horde_Perms::READ); foreach ($calendars as $calendar) { if (!array_key_exists($calendar, $allowed_calendars)) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } } @@ -1046,7 +1046,7 @@ class Kronolith_Api extends Horde_Registry_Api $current_user = Horde_Auth::getAuth(); if ((empty($user) || $user != $current_user) && !Horde_Auth::isAdmin()) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $group = Group::singleton(); @@ -1213,7 +1213,7 @@ class Kronolith_Api extends Horde_Registry_Api { if (!array_key_exists($calendar, Kronolith::listCalendars(false, Horde_Perms::EDIT))) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } return $GLOBALS['kronolith_shares']->getShare($calendar)->lock($calendar, $event); } @@ -1230,7 +1230,7 @@ class Kronolith_Api extends Horde_Registry_Api { if (!array_key_exists($calendar, Kronolith::listCalendars(false, Horde_Perms::EDIT))) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } return $GLOBALS['kronolith_shares']->getShare($calendar)->unlock($lockid); } @@ -1247,7 +1247,7 @@ class Kronolith_Api extends Horde_Registry_Api { if (!array_key_exists($calendar, Kronolith::listCalendars(false, Horde_Perms::READ))) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } return $GLOBALS['kronolith_shares']->getShare($calendar)->checkLocks($event); } diff --git a/kronolith/lib/Driver/Sql.php b/kronolith/lib/Driver/Sql.php index 6d8966038..d2ec55011 100644 --- a/kronolith/lib/Driver/Sql.php +++ b/kronolith/lib/Driver/Sql.php @@ -940,13 +940,14 @@ class Kronolith_Driver_Sql extends Kronolith_Driver * @return boolean * @throws Kronolith_Exception * @throws Horde_Exception_NotFound + * @throws Horde_Exception_PermissionDenied */ public function removeUserData($user) { throw new Kronolith_Exception('to be refactored'); if (!Horde_Auth::isAdmin()) { - throw new Kronolith_Exception(_("Permission Denied")); + throw new Horde_Exception_PermissionDenied(); } $shares = $GLOBALS['kronolith_shares']->listShares($user, Horde_Perms::EDIT);