helper functions that take a user object

darcs-hash:20080827001348-84dde-de452a1120aba995355aa616cf416bb6b617566c.gz

diff --git a/lib/subs.php b/lib/subs.php
index 554647d442e34a5a52b33818ed85018a93931555..51ae54059f8dda989a8e6ceeffc14b1900760390 100644 (file)
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -24,6 +24,7 @@ require_once('XMPPHP/XMPP.php');
 /* Subscribe $user to nickname $other_nickname
   Returns true or an error message.
 */
+
 function subs_subscribe_user($user,$other_nickname) {
 
        $other = User::staticGet('nickname', $other_nickname);
@@ -32,6 +33,11 @@ function subs_subscribe_user($user,$other_nickname) {
                return _('No such user.');
        }
 
+       return subs_subscribe_to($user, $other);
+}
+
+function subs_subscribe_to($user, $other) {
+
        if ($user->isSubscribed($other)) {
                return _('Already subscribed!.');
        }
@@ -78,15 +84,21 @@ function subs_notify_email($listenee, $listener) {
        mail_subscribe_notify($listenee, $listener);
 }
 
-
 /* Unsubscribe $user from nickname $other_nickname
   Returns true or an error message.
 */
 function subs_unsubscribe_user($user, $other_nickname) {
 
        $other = User::staticGet('nickname', $other_nickname);
-       if (!$other)
+
+       if (!$other) {
                return _('No such user.');
+       }
+
+       return subs_unsubscribe_to($user, $other);
+}
+
+function subs_unsubscribe_to($user, $other) {
 
        if (!$user->isSubscribed($other))
                return _('Not subscribed!.');
@@ -111,6 +123,5 @@ function subs_unsubscribe_user($user, $other_nickname) {
        }
        
        return true;
-
 }