Merge branch 'master' into tres

Conflicts:
	include/group.php
	include/text.php
	mod/acl.php
	mod/channel.php
	mod/connections.php
	mod/display.php
	mod/group.php
	mod/item.php
	mod/locs.php
	mod/network.php
	mod/photos.php
	mod/ping.php
	mod/starred.php
	mod/viewsrc.php

mod/post.php

@@ -148,7 +148,7 @@ function post_init(&$a) {
 		// If they are already authenticated and haven't changed credentials, 
 		// we can save an expensive network round trip and improve performance.
 
-		$remote = remote_user();
+		$remote = remote_channel();
 		$result = null;
 		$remote_service_class = '';
 		$remote_level = 0;
@@ -219,7 +219,7 @@ function post_init(&$a) {
 					$DNT = $j['DNT'];
 			}
 			// everything is good... maybe
-			if(local_user()) {
+			if(local_channel()) {
 
 				// tell them to logout if they're logged in locally as anything but the target remote account
 				// in which case just shut up because they don't need to be doing this at all.