X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=scripts%2Fpublicqueuehandler.php;h=c10c679108974b3666f9557432bedf419fe933ba;hb=7721839efdf3a9b42ac94559425578a2285b042e;hp=b1ae1d581dbcdda2ec57039183a264d4bbd3d5ac;hpb=ed57778b92e03d1e1dc922273eb07bd929398cbd;p=quix0rs-gnu-social.git

diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index b1ae1d581d..c10c679108 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -2,7 +2,7 @@
 <?php
 /*
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, 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,43 +18,58 @@
  * 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');
-
-set_error_handler('common_error_handler');
-
-class PublicQueueHandler extends XmppQueueHandler {
-	
-	function transport() {
-		return 'public';
-	}
-	
-	function handle_notice($notice) {
-		try {
-			return jabber_public_notice($notice);
-		} catch (XMPPHP_Exception $e) {
-			$this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
-			die($e->getMessage());
-		}
-	}
+
+$shortoptions = 'r';
+$longoptions = array('resource');
+
+$helptext = <<<END_OF_PUBLIC_HELP
+Daemon script for pushing new notices to public XMPP subscribers.
+
+    -r --resource       Jabber Resource ID
+
+END_OF_PUBLIC_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+require_once INSTALLDIR . '/lib/jabber.php';
+require_once INSTALLDIR . '/lib/xmppqueuehandler.php';
+
+class PublicQueueHandler extends XmppQueueHandler
+{
+
+    function transport()
+    {
+        return 'public';
+    }
+
+    function handle_notice($notice)
+    {
+        try {
+            return jabber_public_notice($notice);
+        } catch (XMPPHP_Exception $e) {
+            $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+            die($e->getMessage());
+        }
+    }
 }
 
-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') . '-public');
+if (have_option('-r')) {
+    $resource = get_option_value('-r');
+} else if (have_option('--resource')) {
+    $resource = get_option_value('--resource');
+} else if (count($args) > 0) {
+    $resource = $args[0];
+} else {
+    $resource = null;
+}
 
 $handler = new PublicQueueHandler($resource);