Revert "If a shortened URL begins with http://, don't include it in the shortened...

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

diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 9e177b3fa35fe5fb1517ac93f332716dcaa7b156..c7ed15e495ce05fa86de8dddb2a744f89d5aac4f 100755 (executable)
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -1,8 +1,8 @@
 #!/usr/bin/env php
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, 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
@@ -18,32 +18,35 @@
  * 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');
+$shortoptions = 'i::';
+$longoptions = array('id::');
 
-set_error_handler('common_error_handler');
+$helptext = <<<END_OF_JABBER_HELP
+Daemon script for pushing new confirmations to Jabber users.
 
-define('CLAIM_TIMEOUT', 1200);
+    -i --id           Identity (default none)
+
+END_OF_JABBER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR . '/lib/jabber.php';
+require_once INSTALLDIR . '/lib/xmppqueuehandler.php';
 
-class XmppConfirmHandler extends XmppQueueHandler {
+define('CLAIM_TIMEOUT', 1200);
 
+class XmppConfirmHandler extends XmppQueueHandler
+{
     var $_id = 'confirm';
-    
-    function class_name() {
+
+    function class_name()
+    {
         return 'XmppConfirmHandler';
     }
-    
-    function run() {
+
+    function run()
+    {
         if (!$this->start()) {
             return false;
         }
@@ -99,7 +102,8 @@ class XmppConfirmHandler extends XmppQueueHandler {
         return true;
     }
 
-    function next_confirm() {
+    function next_confirm()
+    {
         $confirm = new Confirm_address();
         $confirm->whereAdd('claimed IS null');
         $confirm->whereAdd('sent IS null');
@@ -107,7 +111,7 @@ class XmppConfirmHandler extends XmppQueueHandler {
         $confirm->address_type = 'jabber';
         $confirm->orderBy('modified DESC');
         $confirm->limit(1);
-        if ($confirm->find(TRUE)) {
+        if ($confirm->find(true)) {
             $this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address);
                 # working around some weird DB_DataObject behaviour
             $confirm->whereAdd(''); # clears where stuff
@@ -125,7 +129,8 @@ class XmppConfirmHandler extends XmppQueueHandler {
         return null;
     }
 
-    function clear_old_confirm_claims() {
+    function clear_old_confirm_claims()
+    {
         $confirm = new Confirm();
         $confirm->claimed = null;
         $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
@@ -135,14 +140,24 @@ class XmppConfirmHandler extends XmppQueueHandler {
     }
 }
 
-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').'-confirm');
+if (have_option('i')) {
+    $id = get_option_value('i');
+} else if (have_option('--id')) {
+    $id = get_option_value('--id');
+} else if (count($args) > 0) {
+    $id = $args[0];
+} else {
+    $id = null;
+}
 
-$handler = new XmppConfirmHandler($resource);
+$handler = new XmppConfirmHandler($id);
 
 $handler->runOnce();