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, 62 insertions, 59 deletions

diff --git a/actions/sup.php b/actions/sup.php
index 887017b2a..f4b1cda23 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -19,63 +19,66 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class SupAction extends Action {
-	
-	function handle($args) {
-		
-		parent::handle($args);
-		
-		$seconds = $this->trimmed('seconds');
-		
-		if (!$seconds) {
-			$seconds = 15;
-		}
-
-		$updates = $this->get_updates($seconds);
-		
-		header('Content-Type: application/json; charset=utf-8');
-		
-		print json_encode(array('updated_time' => date('c'),
-								'since_time' => date('c', time() - $seconds),
-								'available_periods' => $this->available_periods(),
-								'period' => $seconds,
-								'updates' => $updates));
-	}
-	
-	function available_periods() {
-		static $periods = array(86400, 43200, 21600, 7200,
-								3600, 1800,	600, 300, 120,
-								60, 30, 15); 
-		$available = array();
-		foreach ($periods as $period) {
-			$available[$period] = common_local_url('sup',
-												   array('seconds' => $period));
-		}
-		
-		return $available;
-	}
-	
-	function get_updates($seconds) {
-		$notice = new Notice();
-
-		# XXX: cache this. Depends on how big this protocol becomes;
-		# Re-doing this query every 15 seconds isn't the end of the world.
-
-		$notice->query('SELECT profile_id, max(id) AS max_id ' .
-					   'FROM notice ' .
-					   'WHERE created > (now() - ' . $seconds . ') ' .
-					   'GROUP BY profile_id');
-		
-		$updates = array();
-		
-		while ($notice->fetch()) {
-			$updates[] = array($notice->profile_id, $notice->max_id);
-		}
-		
-		return $updates;
-	}
-	
-	function is_readonly() {
-		return true;
-	}
+class SupAction extends Action
+{
+    function handle($args)
+    {
+        parent::handle($args);
+
+        $seconds = $this->trimmed('seconds');
+
+        if (!$seconds) {
+            $seconds = 15;
+        }
+
+        $updates = $this->getUpdates($seconds);
+
+        header('Content-Type: application/json; charset=utf-8');
+
+        print json_encode(array('updated_time' => date('c'),
+                                'since_time' => date('c', time() - $seconds),
+                                'available_periods' => $this->availablePeriods(),
+                                'period' => $seconds,
+                                'updates' => $updates));
+    }
+
+    function availablePeriods()
+    {
+        static $periods = array(86400, 43200, 21600, 7200,
+                                3600, 1800,    600, 300, 120,
+                                60, 30, 15);
+        $available = array();
+        foreach ($periods as $period) {
+            $available[$period] = common_local_url('sup',
+                                                   array('seconds' => $period));
+        }
+
+        return $available;
+    }
+
+    function getUpdates($seconds)
+    {
+        $notice = new Notice();
+
+        # XXX: cache this. Depends on how big this protocol becomes;
+        # Re-doing this query every 15 seconds isn't the end of the world.
+
+        $notice->query('SELECT profile_id, max(id) AS max_id ' .
+                       'FROM notice ' .
+                       'WHERE created > (now() - ' . $seconds . ') ' .
+                       'GROUP BY profile_id');
+
+        $updates = array();
+
+        while ($notice->fetch()) {
+            $updates[] = array($notice->profile_id, $notice->max_id);
+        }
+
+        return $updates;
+    }
+
+    function isReadOnly()
+    {
+        return true;
+    }
 }