Merge branch '0.8.x' into 0.9.x

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

diff --git a/scripts/ombqueuehandler.php b/scripts/ombqueuehandler.php
index 131b6513c58d3a15284462e0f2249e5c1a92c841..be33b9821801f63b2e2a12b2da9fdcc5a2b9fe1f 100755 (executable)
--- a/scripts/ombqueuehandler.php
+++ b/scripts/ombqueuehandler.php
@@ -1,8 +1,8 @@
 #!/usr/bin/env php
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, 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
@@ -20,15 +20,15 @@
 
 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.
+$helptext = <<<END_OF_OMB_HELP
+Daemon script for pushing new notices to OpenMicroBlogging subscribers.
 
     -i --id           Identity (default none)
 
-END_OF_FACEBOOK_HELP;
+END_OF_OMB_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
@@ -57,7 +57,7 @@ class OmbQueueHandler extends QueueHandler
             $this->log(LOG_DEBUG, 'Ignoring remote notice ' . $notice->id);
             return true;
         } else {
-            return omb_broadcast_remote_subscribers($notice);
+            return omb_broadcast_notice($notice);
         }
     }
 
@@ -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) {