Escape profile url in xmpp in case fancy urls off (Ticket #521)

[quix0rs-gnu-social.git] / scripts / xmppdaemon.php

diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 1aa789e7e7ca6c75d10c4bd0198b7e050ba68c3a..1db6687d0f8698ec1f358fabcc06d9d6576b943d 100755 (executable)
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -55,6 +55,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 define('LACONICA', true);
+define('CLAIM_TIMEOUT', 100000);
 
 require_once(INSTALLDIR . '/lib/common.php');
 require_once(INSTALLDIR . '/lib/jabber.php');
@@ -207,15 +208,49 @@ class XMPPDaemon {
 
        function handle_command($user, $body) {
                # XXX: localise
-               switch(trim($body)) {
+               $p=explode(' ',$body);
+               if(count($p)>2)
+                       return false;
+               switch($p[0]) {
+                case 'help':
+                       if(count($p)!=1)
+                               return false;
+                       $this->from_site($user->jabber, "Commands:\n on     - turn on notifications\n off    - turn off notifications\n help   - show this help \n sub - subscribe to user\n unsub - unsubscribe from user");
+                       return true;
                 case 'on':
+                       if(count($p)!=1)
+                               return false;
                        $this->set_notify($user, true);
                        $this->from_site($user->jabber, 'notifications on');
                        return true;
                 case 'off':
+                       if(count($p)!=1)
+                               return false;
                        $this->set_notify($user, false);
                        $this->from_site($user->jabber, 'notifications off');
                        return true;
+                case 'sub':
+                       if(count($p)==1) {
+                               $this->from_site($user->jabber, 'Specify the name of the user to subscribe to');
+                               return true;
+                       }
+                       $result=subs_subscribe_user($user, $p[1]);
+                       if($result=='true')
+                               $this->from_site($user->jabber, 'Subscribed to ' . $p[1]);
+                       else
+                               $this->from_site($user->jabber, $result);
+                       return true;
+                case 'unsub':
+                       if(count($p)==1) {
+                               $this->from_site($user->jabber, 'Specify the name of the user to unsubscribe from');
+                               return true;
+                       }
+                       $result=subs_unsubscribe_user($user, $p[1]);
+                       if($result=='true')
+                               $this->from_site($user->jabber, 'Unsubscribed from ' . $p[1]);
+                       else
+                               $this->from_site($user->jabber, $result);
+                       return true;
                 default:
                        return false;
                }
@@ -225,7 +260,7 @@ class XMPPDaemon {
                $orig = clone($user);
                $user->jabbernotify = $notify;
                $result = $user->update($orig);
-               if (!$id) {
+               if (!$result) {
                        $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
                        $this->log(LOG_ERR,
                                           'Could not set notify flag to ' . $notify .