* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+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";
}
function connect() {
+
$connect_to = ($this->host) ? $this->host : $this->server;
$this->log(LOG_INFO, "Connecting to $connect_to on port $this->port");
if (!$this->conn) {
return false;
}
+
return !$this->conn->isDisconnected();
}
static $parts = array('message', 'presence',
'end_stream', 'session_start');
- while(!$this->conn->disconnected) {
+ while(!$this->conn->isDisconnected()) {
$payloads = $this->conn->processUntil($parts, 10);
$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;
}
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);
$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);
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);
$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);
}
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) {
function clear_old_claims() {
$qi = new Queue_item();
+ $qi->claimed = NULL;
$qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
$qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
}
}
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();
$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;
}
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!');
function clear_old_confirm_claims() {
$confirm = new Confirm();
+ $confirm->claimed = NULL;
$confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
$confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
}
projects / quix0rs-gnu-social.git / blobdiff