summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-22 15:47:29 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-22 15:47:29 -0700
commit273d9e2def8b7ad003d39ca3210b502d8981a8cb (patch)
treea666bfa8f8a820e71133e811f45ecdf823c95a25
parent032b65b83ab3c76dca4d1935334915de931fef97 (diff)
jabberqueuehandler uses commandline stuff
-rwxr-xr-xscripts/jabberqueuehandler.php42
1 files changed, 21 insertions, 21 deletions
diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php
index b848442fd..be0f187a9 100755
--- a/scripts/jabberqueuehandler.php
+++ b/scripts/jabberqueuehandler.php
@@ -18,29 +18,26 @@
* 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);
-// Preset the server at the command line
+$shortoptions = 'r';
+$longoptions = array('resource');
+
+$helptext = <<<END_OF_JABBER_HELP
+Daemon script for pushing new notices to Jabber users.
-$server = ($argc > 2) ? $argv[2] : null;
-$path = ($argc > 3) ? $argv[3] : null;
+ -r --resource Jabber Resource ID
-require_once(INSTALLDIR . '/lib/common.php');
-require_once(INSTALLDIR . '/lib/jabber.php');
-require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
+END_OF_JABBER_HELP;
-set_error_handler('common_error_handler');
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+require_once INSTALLDIR . '/lib/common.php';
+require_once INSTALLDIR . '/lib/jabber.php';
+require_once INSTALLDIR . '/lib/xmppqueuehandler.php';
class JabberQueueHandler extends XmppQueueHandler
{
-
var $conn = null;
function transport()
@@ -66,12 +63,15 @@ if (common_config('xmpp','enabled')==false) {
exit();
}
-ini_set("max_execution_time", "0");
-ini_set("max_input_time", "0");
-set_time_limit(0);
-mb_internal_encoding('UTF-8');
-
-$resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-queuehandler');
+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 JabberQueueHandler($resource);