From bfb22a99329c61f4b117ca6151fb461fec3ac192 Mon Sep 17 00:00:00 2001 From: CiaranG Date: Sat, 16 Aug 2008 04:34:22 -0400 Subject: XMPP daemon updates including help, sub and subsub commands, plus subscribe/unsubcribe logic broken out into standalone module for sharing darcs-hash:20080816083422-f6e2c-fb8b4e0581719bd8c3f433e661ec9742e1b84cbc.gz --- actions/unsubscribe.php | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'actions/unsubscribe.php') diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php index 4bfaf7958..570c1700a 100644 --- a/actions/unsubscribe.php +++ b/actions/unsubscribe.php @@ -43,9 +43,27 @@ class UnsubscribeAction extends Action { } $other_nickname = $this->arg('unsubscribeto'); - $result=subs_unsubscribe_user($user,$other_nickname); - if($result!=true) { - common_user_error($result); + $other = User::staticGet('nickname', $other_nickname); + if (!$other) { + common_user_error(_('No such user.')); + return; + } + + if (!$user->isSubscribed($other)) { + common_server_error(_('Not subscribed!.')); + } + + $sub = DB_DataObject::factory('subscription'); + + $sub->subscriber = $user->id; + $sub->subscribed = $other->id; + + $sub->find(true); + + // note we checked for existence above + + if (!$sub->delete()) { + common_server_error(_('Couldn\'t delete subscription.')); return; } -- cgit v1.2.3-54-g00ecf