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

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

diff --git a/xmppdaemon.php b/xmppdaemon.php
index 60697758f95f310cf1a9142316cbfc2261451a13..e772ecc0895322a640c6d1ec4118e9767ff17d73 100755 (executable)
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -21,23 +21,23 @@
 function xmppdaemon_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
     switch ($errno) {
      case E_USER_ERROR:
-       echo "<b>My ERROR</b> [$errno] $errstr<br />\n";
+       echo "ERROR: [$errno] $errstr\n";
        echo "  Fatal error on line $errline in file $errfile";
-       echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")<br />\n";
-       echo "Aborting...<br />\n";
+       echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
+       echo "Aborting...\n";
        exit(1);
        break;
        
      case E_USER_WARNING:
-       echo "<b>My WARNING</b> [$errno] $errstr<br />\n";
+       echo "WARNING [$errno] $errstr\n";
        break;
        
      case E_USER_NOTICE:
-       echo "<b>My NOTICE</b> [$errno] $errstr<br />\n";
+       echo "My NOTICE [$errno] $errstr\n";
        break;
        
      default:
-       echo "Unknown error type: [$errno] $errstr<br />\n";
+       echo "Unknown error type: [$errno] $errstr\n";
        break;
     }
     
@@ -275,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) {