X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=xmppdaemon.php;h=d2e609b4407a31fdd2808523356e8e65bc113cfb;hb=b1282b1b9fd9997d15f127810f98117e01b72daa;hp=60697758f95f310cf1a9142316cbfc2261451a13;hpb=3d96d6f5f7ce70108cebaffdbe06956cbd6ccb99;p=quix0rs-gnu-social.git
diff --git a/xmppdaemon.php b/xmppdaemon.php
index 60697758f9..d2e609b440 100755
--- 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 "My ERROR [$errno] $errstr
\n";
+ echo "ERROR: [$errno] $errstr\n";
echo " Fatal error on line $errline in file $errfile";
- echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")
\n";
- echo "Aborting...
\n";
+ echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
+ echo "Aborting...\n";
exit(1);
break;
case E_USER_WARNING:
- echo "My WARNING [$errno] $errstr
\n";
+ echo "WARNING [$errno] $errstr\n";
break;
case E_USER_NOTICE:
- echo "My NOTICE [$errno] $errstr
\n";
+ echo "My NOTICE [$errno] $errstr\n";
break;
default:
- echo "Unknown error type: [$errno] $errstr
\n";
+ echo "Unknown error type: [$errno] $errstr\n";
break;
}
@@ -212,7 +212,7 @@ class XMPPDaemon {
$result = $user->update($orig);
if (!$id) {
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
- $this->log(LOG_ERROR,
+ $this->log(LOG_ERR,
'Could not set notify flag to ' . $notify .
' for user ' . common_log_objstring($user) .
': ' . $last_error->message);
@@ -224,6 +224,7 @@ class XMPPDaemon {
function add_notice(&$user, &$pl) {
$notice = new Notice();
+ $notice->is_local = 1;
$notice->profile_id = $user->id;
$notice->content = trim(substr($pl['body'], 0, 140));
$notice->rendered = common_render_content($notice->content, $notice);
@@ -232,7 +233,7 @@ class XMPPDaemon {
$id = $notice->insert();
if (!$id) {
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
- $this->log(LOG_ERROR,
+ $this->log(LOG_ERR,
'Could not insert ' . common_log_objstring($notice) .
' for user ' . common_log_objstring($user) .
': ' . $last_error->message);
@@ -243,7 +244,7 @@ class XMPPDaemon {
$result = $notice->update($orig);
if (!$result) {
$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
- $this->log(LOG_ERROR,
+ $this->log(LOG_ERR,
'Could not add URI to ' . common_log_objstring($notice) .
' for user ' . common_log_objstring($user) .
': ' . $last_error->message);
@@ -275,7 +276,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) {
@@ -388,7 +389,7 @@ class XMPPDaemon {
$user->nickname,
$confirm->address);
if (!$success) {
- $this->log(LOG_ERROR, 'Confirmation failed for ' . $confirm->address);
+ $this->log(LOG_ERR, 'Confirmation failed for ' . $confirm->address);
# Just let the claim age out; hopefully things work then
continue;
} else {
@@ -398,7 +399,7 @@ class XMPPDaemon {
$confirm->sent = $confirm->claimed;
$result = $confirm->update($original);
if (!$result) {
- $this->log(LOG_ERROR, 'Cannot mark sent for ' . $confirm->address);
+ $this->log(LOG_ERR, 'Cannot mark sent for ' . $confirm->address);
# Just let the claim age out; hopefully things work then
continue;
}