remote_user => remote_channel

17 files changed, 23 insertions, 23 deletions

diff --git a/mod/acl.php b/mod/acl.php
index 5a048ddee..6ae803596 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -263,7 +263,7 @@ function navbar_complete(&$a) {
 
 //	logger('navbar_complete');
 
-	if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) {
+	if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		return;
 	}
 
diff --git a/mod/channel.php b/mod/channel.php
index 493730e8a..1a471718d 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -52,7 +52,7 @@ function channel_content(&$a, $update = 0, $load = false) {
 	$datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : '');
 	$datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : '');
 
-	if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
+	if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
 			return login();
 	}
 
diff --git a/mod/directory.php b/mod/directory.php
index defa8db7e..21940d57b 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -18,7 +18,7 @@ function directory_init(&$a) {
 
 function directory_content(&$a) {
 
-	if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) {
+	if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
diff --git a/mod/display.php b/mod/display.php
index 943af4206..467c476da 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -5,7 +5,7 @@ function display_content(&$a, $update = 0, $load = false) {
 
 //	logger("mod-display: update = $update load = $load");
 
-	if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_user())) {
+	if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
diff --git a/mod/home.php b/mod/home.php
index 733789991..854e2df26 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -100,7 +100,7 @@ function home_content(&$a, $update = 0, $load = false) {
 		if($sitename) 
 			$o .= '<h1>' . sprintf( t("Welcome to %s") ,$sitename) . '</h1>';
 
-		if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_user())) {
+		if(intval(get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 			// If there's nothing special happening, just spit out a login box
 
 			if (! $a->config['system']['no_login_on_homepage'])
diff --git a/mod/item.php b/mod/item.php
index 26f6fb43d..d8cbeadc7 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -26,7 +26,7 @@ function item_post(&$a) {
 	// This will change. Figure out who the observer is and whether or not
 	// they have permission to post here. Else ignore the post.
 
-	if((! local_channel()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
+	if((! local_channel()) && (! remote_channel()) && (! x($_REQUEST,'commenter')))
 		return;
 
 	require_once('include/security.php');
@@ -905,7 +905,7 @@ function item_post(&$a) {
 
 function item_content(&$a) {
 
-	if((! local_channel()) && (! remote_user()))
+	if((! local_channel()) && (! remote_channel()))
 		return;
 
 	require_once('include/security.php');
diff --git a/mod/oexchange.php b/mod/oexchange.php
index 637f4f384..a684bd5d8 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -15,7 +15,7 @@ function oexchange_init(&$a) {
 function oexchange_content(&$a) {
 
 	if(! local_channel()) {
-		if(remote_user()) {
+		if(remote_channel()) {
 			$observer = $a->get_observer();
 			if($observer && $observer['xchan_url']) {
 				$parsed = @parse_url($observer['xchan_url']);
diff --git a/mod/photos.php b/mod/photos.php
index 108f4c524..dbe165f60 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -11,7 +11,7 @@ require_once('include/Contact.php');
 function photos_init(&$a) {
 
 
-	if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) {
+	if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		return;
 	}
 
@@ -122,8 +122,8 @@ function photos_post(&$a) {
 
 			// get the list of photos we are about to delete
 
-			if(remote_user() && (! local_channel())) {
-				$str = photos_album_get_db_idstr($page_owner_uid,$album,remote_user());
+			if(remote_channel() && (! local_channel())) {
+				$str = photos_album_get_db_idstr($page_owner_uid,$album,remote_channel());
 			}
 			elseif(local_channel()) {
 				$str = photos_album_get_db_idstr(local_channel(),$album);
@@ -425,7 +425,7 @@ function photos_content(&$a) {
 	// photos/name/image/xxxxx
 
 
-	if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) {
+	if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
diff --git a/mod/post.php b/mod/post.php
index 91a1d4877..c90997335 100644
--- a/mod/post.php
+++ b/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;
diff --git a/mod/profile.php b/mod/profile.php
index e37aea863..430d039e9 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -51,7 +51,7 @@ function profile_init(&$a) {
 
 function profile_content(&$a, $update = 0) {
 
-	if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
+	if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
 			return login();
 	}
 
@@ -68,7 +68,7 @@ function profile_content(&$a, $update = 0) {
 
 	$is_owner = ((local_channel()) && (local_channel() == $a->profile['profile_uid']) ? true : false);
 
-	if($a->profile['hidewall'] && (! $is_owner) && (! remote_user())) {
+	if($a->profile['hidewall'] && (! $is_owner) && (! remote_channel())) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
diff --git a/mod/rpost.php b/mod/rpost.php
index 187605dca..2bea18c43 100644
--- a/mod/rpost.php
+++ b/mod/rpost.php
@@ -30,7 +30,7 @@ function rpost_content(&$a) {
 	$o = '';
 
 	if(! local_channel()) {
-		if(remote_user()) {
+		if(remote_channel()) {
 			// redirect to your own site.
 			// We can only do this with a GET request so you'll need to keep the text short or risk getting truncated
 			// by the wretched beast called 'suhosin'. All the browsers now allow long GET requests, but suhosin
diff --git a/mod/search.php b/mod/search.php
index ff7eb0731..02b250bbe 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -9,7 +9,7 @@ function search_init(&$a) {
 function search_content(&$a,$update = 0, $load = false) {
 
 	if((get_config('system','block_public')) || (get_config('system','block_public_search'))) {
-		if ((! local_channel()) && (! remote_user())) {
+		if ((! local_channel()) && (! remote_channel())) {
 			notice( t('Public access denied.') . EOL);
 		return;
 		}
diff --git a/mod/share.php b/mod/share.php
index 2fb3d95cc..923971694 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -10,7 +10,7 @@ function share_init(&$a) {
 	if(! $post_id)
 		killme();
 
-	if(! (local_channel() || remote_user()))
+	if(! (local_channel() || remote_channel()))
 		killme();
 
 
diff --git a/mod/subthread.php b/mod/subthread.php
index 00ec87070..eeb8f131d 100755
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -7,7 +7,7 @@ require_once('include/items.php');
 
 function subthread_content(&$a) {
 
-	if((! local_channel()) && (! remote_user())) {
+	if((! local_channel()) && (! remote_channel())) {
 		return;
 	}
 
diff --git a/mod/tagger.php b/mod/tagger.php
index 68792ab5f..a93609c3c 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -7,7 +7,7 @@ require_once('include/items.php');
 
 function tagger_content(&$a) {
 
-	if(! local_channel() && ! remote_user()) {
+	if(! local_channel() && ! remote_channel()) {
 		return;
 	}
 
diff --git a/mod/viewconnections.php b/mod/viewconnections.php
index 1be5c157f..ee68c2149 100644
--- a/mod/viewconnections.php
+++ b/mod/viewconnections.php
@@ -4,7 +4,7 @@ require_once('include/Contact.php');
 
 function viewconnections_init(&$a) {
 
-	if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) {
+	if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		return;
 	}
 	if(argc() > 1)
@@ -13,7 +13,7 @@ function viewconnections_init(&$a) {
 
 function viewconnections_content(&$a) {
 
-	if((get_config('system','block_public')) && (! local_channel()) && (! remote_user())) {
+	if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
diff --git a/mod/zotfeed.php b/mod/zotfeed.php
index 9ad93c1d4..7bf91d4db 100644
--- a/mod/zotfeed.php
+++ b/mod/zotfeed.php
@@ -11,7 +11,7 @@ function zotfeed_init(&$a) {
 	if(! $mindate)
 		$mindate = datetime_convert('UTC','UTC', 'now - 1 month');
 
-	if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) {
+	if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
 		$result['message'] = 'Public access denied';
 		json_return_and_die($result);
 	}