X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=xmppdaemon.php;h=d2e609b4407a31fdd2808523356e8e65bc113cfb;hb=b1282b1b9fd9997d15f127810f98117e01b72daa;hp=bab614cb3b2a52bddcb45d4c9fe6a7a052abdeb4;hpb=0b5e79dc010a0883a04f1625da7a402202256f9f;p=quix0rs-gnu-social.git diff --git a/xmppdaemon.php b/xmppdaemon.php index bab614cb3b..d2e609b440 100755 --- a/xmppdaemon.php +++ b/xmppdaemon.php @@ -18,6 +18,35 @@ * along with this program. If not, see . */ +function xmppdaemon_error_handler($errno, $errstr, $errfile, $errline, $errcontext) { + 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'); + # Abort if called from a web server if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { print "This script must be run from the command line\n"; @@ -54,6 +83,7 @@ class XMPPDaemon { } function connect() { + $connect_to = ($this->host) ? $this->host : $this->server; $this->log(LOG_INFO, "Connecting to $connect_to on port $this->port"); @@ -63,6 +93,7 @@ class XMPPDaemon { if (!$this->conn) { return false; } + return !$this->conn->isDisconnected(); } @@ -71,7 +102,7 @@ class XMPPDaemon { static $parts = array('message', 'presence', 'end_stream', 'session_start'); - while(!$this->conn->disconnected) { + while(!$this->conn->isDisconnected()) { $payloads = $this->conn->processUntil($parts, 10); @@ -96,7 +127,12 @@ class XMPPDaemon { $this->confirmation_queue(); } } - + + function handle_session($pl) { + # XXX what to do here? + return true; + } + function get_user($from) { $user = User::staticGet('jabber', jabber_normalize_jid($from)); return $user; @@ -133,11 +169,22 @@ class XMPPDaemon { } if ($this->handle_command($user, $pl['body'])) { return; + } else if ($this->is_autoreply($pl['body'])) { + $this->log(LOG_INFO, 'Ignoring auto reply from ' . $from); + return; } else { $this->add_notice($user, $pl); } } + function is_autoreply($txt) { + if (preg_match('/[\[\(]?[Aa]uto-?[Rr]eply[\]\)]/', $txt)) { + return true; + } else { + return false; + } + } + function from_site($address, $msg) { $text = '['.common_config('site', 'name') . '] ' . $msg; jabber_send_message($address, $text); @@ -165,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); @@ -177,14 +224,16 @@ 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); $notice->created = DB_DataObject_Cast::dateTime(); $notice->query('BEGIN'); $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); @@ -195,14 +244,15 @@ 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); return; } $notice->query('COMMIT'); - common_broadcast_notice($notice); + common_save_replies($notice); + common_real_broadcast($notice); $this->log(LOG_INFO, 'Added notice ' . $notice->id . ' from user ' . $user->nickname); } @@ -226,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) { @@ -313,6 +363,7 @@ class XMPPDaemon { function clear_old_claims() { $qi = new Queue_item(); + $qi->claimed = NULL; $qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT); $qi->update(DB_DATAOBJECT_WHEREADD_ONLY); } @@ -323,7 +374,7 @@ class XMPPDaemon { } function confirmation_queue() { - $this->clear_old_confirm_claims(); + # $this->clear_old_confirm_claims(); $this->log(LOG_INFO, 'checking for queued confirmations'); do { $confirm = $this->next_confirm(); @@ -334,22 +385,21 @@ class XMPPDaemon { $this->log(LOG_WARNING, 'Confirmation for unknown user ' . $confirm->user_id); continue; } - $success = jabber_confirm_address($confirm->code, - $user->nickname, - $jabber); + $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 { $this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address); # Mark confirmation sent $original = clone($confirm); - $confirm->sent = DB_DataObject_Cast::dateTime(); + $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; } @@ -360,19 +410,21 @@ class XMPPDaemon { function next_confirm() { $confirm = new Confirm_address(); - $confirm->sent = NULL; - $confirm->claimed = NULL; + $confirm->whereAdd('claimed IS NULL'); + $confirm->whereAdd('sent IS NULL'); # XXX: eventually we could do other confirmations in the queue, too $confirm->address_type = 'jabber'; $confirm->orderBy('modified DESC'); $confirm->limit(1); if ($confirm->find(TRUE)) { $this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address); - $original = clone($confirm); + # working around some weird DB_DataObject behaviour + $confirm->whereAdd(''); # clears where stuff + $original = clone($confirm); $confirm->claimed = DB_DataObject_Cast::dateTime(); $result = $confirm->update($original); if ($result) { - $this->log(LOG_INFO, 'Succeeded in claim!'); + $this->log(LOG_INFO, 'Succeeded in claim! '. $result); return $confirm; } else { $this->log(LOG_INFO, 'Failed in claim!'); @@ -384,6 +436,7 @@ class XMPPDaemon { function clear_old_confirm_claims() { $confirm = new Confirm(); + $confirm->claimed = NULL; $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT); $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY); }