Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / scripts / jabberqueuehandler.php

diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php
index 59cdb94ad72e28dd0e0b6dd861f72ddf51fcbb01..8f3a56944d550d2d2e89eaf2e892e64401e46bec 100755 (executable)
--- a/scripts/jabberqueuehandler.php
+++ b/scripts/jabberqueuehandler.php
@@ -1,8 +1,8 @@
 #!/usr/bin/env php
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -18,46 +18,61 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-# 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";
-       exit();
-}
-
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
 
-require_once(INSTALLDIR . '/lib/common.php');
-require_once(INSTALLDIR . '/lib/jabber.php');
-require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
+$shortoptions = 'i::';
+$longoptions = array('id::');
+
+$helptext = <<<END_OF_JABBER_HELP
+Daemon script for pushing new notices to Jabber users.
+
+    -i --id           Identity (default none)
 
-set_error_handler('common_error_handler');
+END_OF_JABBER_HELP;
 
-class JabberQueueHandler extends XmppQueueHandler {
+require_once INSTALLDIR.'/scripts/commandline.inc';
 
-       var $conn = NULL;
+require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/jabber.php';
+require_once INSTALLDIR . '/lib/xmppqueuehandler.php';
 
-       function transport() {
-               return 'jabber';
-       }
+class JabberQueueHandler extends XmppQueueHandler
+{
+    var $conn = null;
 
-       function handle_notice($notice) {
-               try {
-                       return jabber_broadcast_notice($notice);
-               } catch (XMPPHP_Exception $e) {
-                       $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-                       exit(1);
-               }
-       }
+    function transport()
+    {
+        return 'jabber';
+    }
+
+    function handle_notice($notice)
+    {
+        try {
+            return jabber_broadcast_notice($notice);
+        } catch (XMPPHP_Exception $e) {
+            $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+            exit(1);
+        }
+    }
 }
 
-ini_set("max_execution_time", "0");
-ini_set("max_input_time", "0");
-set_time_limit(0);
-mb_internal_encoding('UTF-8');
+// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
+// lots of CPU trying to connect to unconfigured servers
+if (common_config('xmpp','enabled')==false) {
+    print "Aborting daemon - xmpp is disabled\n";
+    exit();
+}
 
-$resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-queuehandler');
+if (have_option('i')) {
+    $id = get_option_value('i');
+} else if (have_option('--id')) {
+    $id = get_option_value('--id');
+} else if (count($args) > 0) {
+    $id = $args[0];
+} else {
+    $id = null;
+}
 
-$handler = new JabberQueueHandler($resource);
+$handler = new JabberQueueHandler($id);
 
-$handler->runOnce();
\ No newline at end of file
+$handler->runOnce();