Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

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

diff --git a/scripts/smsqueuehandler.php b/scripts/smsqueuehandler.php
index 99dd9cf77a8a169c78d1e93a64145dd3e7270986..631719aa2186aab6f58510ce4a362ee2f40b91e8 100755 (executable)
--- a/scripts/smsqueuehandler.php
+++ b/scripts/smsqueuehandler.php
@@ -2,7 +2,7 @@
 <?php
 /*
  * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, 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,44 +20,50 @@
 
 # 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();
+    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/omb.php');
+require_once(INSTALLDIR . '/lib/mail.php');
 require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class SmsQueueHandler {
-       
-       function transport() {
-               return 'omb';
-       }
-       
-       function start() {
-       }
-
-       function handle_notice($notice) {
-               mail_broadcast_notice_sms($notice);
-       }
-       
-       function finish() {
-       }
+class SmsQueueHandler extends QueueHandler
+{
+    
+    function transport()
+    {
+        return 'sms';
+    }
+
+    function start()
+    {
+        $this->log(LOG_INFO, "INITIALIZE");
+        return true;
+    }
+
+    function handle_notice($notice)
+    {
+        return mail_broadcast_notice_sms($notice);
+    }
+    
+    function finish()
+    {
+    }
 }
 
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
-$id = ($argc > 1) ? $argv[1] : NULL;
+$id = ($argc > 1) ? $argv[1] : null;
 
 $handler = new SmsQueueHandler($id);
 
-if ($handler->start()) {
-       $handler->handle_queue();
-}
-
-$handler->finish();
+$handler->runOnce();