Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 23 insertions, 18 deletions

diff --git a/scripts/smsqueuehandler.php b/scripts/smsqueuehandler.php
index 8f0d02d9b..38f2f11fe 100755
--- a/scripts/smsqueuehandler.php
+++ b/scripts/smsqueuehandler.php
@@ -20,8 +20,8 @@
 
 # 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__) . '/..'));
@@ -33,23 +33,28 @@ require_once(INSTALLDIR . '/lib/queuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class SmsQueueHandler extends QueueHandler {
-	
-	function transport() {
-		return 'sms';
-	}
+class SmsQueueHandler extends QueueHandler
+{
+    
+    function transport()
+    {
+        return 'sms';
+    }
 
-	function start() {
-		$this->log(LOG_INFO, "INITIALIZE");
-		return true;
-	}
+    function start()
+    {
+        $this->log(LOG_INFO, "INITIALIZE");
+        return true;
+    }
 
-	function handle_notice($notice) {
-		return mail_broadcast_notice_sms($notice);
-	}
-	
-	function finish() {
-	}
+    function handle_notice($notice)
+    {
+        return mail_broadcast_notice_sms($notice);
+    }
+    
+    function finish()
+    {
+    }
 }
 
 ini_set("max_execution_time", "0");
@@ -57,7 +62,7 @@ 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);