Twitter-API: /account/verify_credentials.format now works

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

diff --git a/xmppdaemon.php b/xmppdaemon.php
index c8e2ba16f14ddc834002c32f9534af4356e2c9f1..e772ecc0895322a640c6d1ec4118e9767ff17d73 100755 (executable)
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -19,8 +19,30 @@
  */
 
 function xmppdaemon_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
-       print "Error $errno in $errfile[$errline]: $errstr\n";
-       die();
+    switch ($errno) {
+     case E_USER_ERROR:
+       echo "ERROR: [$errno] $errstr\n";
+       echo "  Fatal error on line $errline in file $errfile";
+       echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
+       echo "Aborting...\n";
+       exit(1);
+       break;
+       
+     case E_USER_WARNING:
+       echo "WARNING [$errno] $errstr\n";
+       break;
+       
+     case E_USER_NOTICE:
+       echo "My NOTICE [$errno] $errstr\n";
+       break;
+       
+     default:
+       echo "Unknown error type: [$errno] $errstr\n";
+       break;
+    }
+    
+    /* Don't execute PHP internal error handler */
+    return true;
 }
 
 set_error_handler('xmppdaemon_error_handler');
@@ -253,7 +275,7 @@ class XMPPDaemon {
                        if (!$pl['type']) {
                                $user = User::staticGet('jabber', $from);
                                if (!$user) {
-                                       $this->log(LOG_WARNING, 'Message from unknown user ' . $from);
+                                       $this->log(LOG_WARNING, 'Presence from unknown user ' . $from);
                                        return;
                                }
                                if ($user->updatefrompresence) {