From 3fc2cfb7f81cca483be7255e20245c8fea2fe0d8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 22 Jun 2009 16:48:04 -0700
Subject: [PATCH] fix have_options arguments

---
 scripts/facebookqueuehandler.php |  8 ++++----
 scripts/jabberqueuehandler.php   | 10 +++++-----
 scripts/ombqueuehandler.php      |  8 ++++----
 scripts/pingqueuehandler.php     |  8 ++++----
 scripts/publicqueuehandler.php   |  8 ++++----
 scripts/smsqueuehandler.php      |  4 ++--
 scripts/triminboxes.php          |  4 ++--
 scripts/twitterqueuehandler.php  |  4 ++--
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/scripts/facebookqueuehandler.php b/scripts/facebookqueuehandler.php
index f01e45a3b4..05a35577fe 100755
--- a/scripts/facebookqueuehandler.php
+++ b/scripts/facebookqueuehandler.php
@@ -20,8 +20,8 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'i';
-$longoptions = array('id');
+$shortoptions = 'i::';
+$longoptions = array('id::');
 
 $helptext = <<<END_OF_FACEBOOK_HELP
 Daemon script for pushing new notices to Facebook.
@@ -59,8 +59,8 @@ class FacebookQueueHandler extends QueueHandler
 
 }
 
-if (have_option('-i')) {
-    $id = get_option_value('-i');
+if (have_option('i')) {
+    $id = get_option_value('i');
 } else if (have_option('--id')) {
     $id = get_option_value('--id');
 } else if (count($args) > 0) {
diff --git a/scripts/jabberqueuehandler.php b/scripts/jabberqueuehandler.php
index be0f187a98..a449932364 100755
--- a/scripts/jabberqueuehandler.php
+++ b/scripts/jabberqueuehandler.php
@@ -20,13 +20,13 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'r';
-$longoptions = array('resource');
+$shortoptions = 'r::';
+$longoptions = array('resource::');
 
 $helptext = <<<END_OF_JABBER_HELP
 Daemon script for pushing new notices to Jabber users.
 
-    -r --resource       Jabber Resource ID
+    -r --resource       Jabber Resource ID (default to config)
 
 END_OF_JABBER_HELP;
 
@@ -63,8 +63,8 @@ if (common_config('xmpp','enabled')==false) {
     exit();
 }
 
-if (have_option('-r')) {
-    $resource = get_option_value('-r');
+if (have_option('r')) {
+    $resource = get_option_value('r');
 } else if (have_option('--resource')) {
     $resource = get_option_value('--resource');
 } else if (count($args) > 0) {
diff --git a/scripts/ombqueuehandler.php b/scripts/ombqueuehandler.php
index deb5f8d7d2..1587192b6f 100755
--- a/scripts/ombqueuehandler.php
+++ b/scripts/ombqueuehandler.php
@@ -20,8 +20,8 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'i';
-$longoptions = array('id');
+$shortoptions = 'i::';
+$longoptions = array('id::');
 
 $helptext = <<<END_OF_OMB_HELP
 Daemon script for pushing new notices to OpenMicroBlogging subscribers.
@@ -72,8 +72,8 @@ class OmbQueueHandler extends QueueHandler
     }
 }
 
-if (have_option('-i')) {
-    $id = get_option_value('-i');
+if (have_option('i')) {
+    $id = get_option_value('i');
 } else if (have_option('--id')) {
     $id = get_option_value('--id');
 } else if (count($args) > 0) {
diff --git a/scripts/pingqueuehandler.php b/scripts/pingqueuehandler.php
index 1bde4bc5fd..23678ea4b5 100644
--- a/scripts/pingqueuehandler.php
+++ b/scripts/pingqueuehandler.php
@@ -20,8 +20,8 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'i';
-$longoptions = array('id');
+$shortoptions = 'i::';
+$longoptions = array('id::');
 
 $helptext = <<<END_OF_PING_HELP
 Daemon script for pushing new notices to ping servers.
@@ -54,8 +54,8 @@ class PingQueueHandler extends QueueHandler {
 	}
 }
 
-if (have_option('-i')) {
-    $id = get_option_value('-i');
+if (have_option('i')) {
+    $id = get_option_value('i');
 } else if (have_option('--id')) {
     $id = get_option_value('--id');
 } else if (count($args) > 0) {
diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index c10c679108..58ecc1745e 100755
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -20,8 +20,8 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
-$shortoptions = 'r';
-$longoptions = array('resource');
+$shortoptions = 'r::';
+$longoptions = array('resource::');
 
 $helptext = <<<END_OF_PUBLIC_HELP
 Daemon script for pushing new notices to public XMPP subscribers.
@@ -61,8 +61,8 @@ if (common_config('xmpp','enabled')==false) {
     exit();
 }
 
-if (have_option('-r')) {
-    $resource = get_option_value('-r');
+if (have_option('r')) {
+    $resource = get_option_value('r');
 } else if (have_option('--resource')) {
     $resource = get_option_value('--resource');
 } else if (count($args) > 0) {
diff --git a/scripts/smsqueuehandler.php b/scripts/smsqueuehandler.php
index c793ee550b..94b846d987 100755
--- a/scripts/smsqueuehandler.php
+++ b/scripts/smsqueuehandler.php
@@ -58,8 +58,8 @@ class SmsQueueHandler extends QueueHandler
     }
 }
 
-if (have_option('-i')) {
-    $id = get_option_value('-i');
+if (have_option('i')) {
+    $id = get_option_value('i');
 } else if (have_option('--id')) {
     $id = get_option_value('--id');
 } else if (count($args) > 0) {
diff --git a/scripts/triminboxes.php b/scripts/triminboxes.php
index 5575dd4fc1..b2135d6825 100644
--- a/scripts/triminboxes.php
+++ b/scripts/triminboxes.php
@@ -35,8 +35,8 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 
 $id = null;
 
-if (have_option('-u')) {
-    $id = get_option_value('-u');
+if (have_option('u')) {
+    $id = get_option_value('u');
 } else if (have_option('--start-user-id')) {
     $id = get_option_value('--start-user-id');
 } else {
diff --git a/scripts/twitterqueuehandler.php b/scripts/twitterqueuehandler.php
index 826e12c75c..00e735d983 100755
--- a/scripts/twitterqueuehandler.php
+++ b/scripts/twitterqueuehandler.php
@@ -59,8 +59,8 @@ class TwitterQueueHandler extends QueueHandler
 
 }
 
-if (have_option('-i')) {
-    $id = get_option_value('-i');
+if (have_option('i')) {
+    $id = get_option_value('i');
 } else if (have_option('--id')) {
     $id = get_option_value('--id');
 } else if (count($args) > 0) {
-- 
2.39.5