summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-22 16:48:04 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-22 16:48:04 -0700
commit3fc2cfb7f81cca483be7255e20245c8fea2fe0d8 (patch)
treea6cc0881b4b6af69523fb88822f145c1ce7e02d9 /scripts
parent010d168aaa908073d03be66259042f921dfb861e (diff)
fix have_options arguments
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/facebookqueuehandler.php8
-rwxr-xr-xscripts/jabberqueuehandler.php10
-rwxr-xr-xscripts/ombqueuehandler.php8
-rw-r--r--scripts/pingqueuehandler.php8
-rwxr-xr-xscripts/publicqueuehandler.php8
-rwxr-xr-xscripts/smsqueuehandler.php4
-rw-r--r--scripts/triminboxes.php4
-rwxr-xr-xscripts/twitterqueuehandler.php4
8 files changed, 27 insertions, 27 deletions
diff --git a/scripts/facebookqueuehandler.php b/scripts/facebookqueuehandler.php
index f01e45a3b..05a35577f 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 be0f187a9..a44993236 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 deb5f8d7d..1587192b6 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 1bde4bc5f..23678ea4b 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 c10c67910..58ecc1745 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 c793ee550..94b846d98 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 5575dd4fc..b2135d682 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 826e12c75..00e735d98 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) {