From a4960360669daa0a0c842427185ce1ada3b4ab97 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 28 Jan 2015 20:56:04 -0800
Subject: local_user => local_channel

---
 boot.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 969a4f578..f35e6586b 100755
--- a/boot.php
+++ b/boot.php
@@ -1004,11 +1004,11 @@ class App {
 
 	function build_pagehead() {
 
-		$user_scalable = ((local_user()) ? get_pconfig(local_user(),'system','user_scalable') : 1);
+		$user_scalable = ((local_channel()) ? get_pconfig(local_channel(),'system','user_scalable') : 1);
 		if ($user_scalable === false)
 			$user_scalable = 1;
 
-		$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 80000);
+		$interval = ((local_channel()) ? get_pconfig(local_channel(),'system','update_interval') : 80000);
 		if($interval < 10000)
 			$interval = 80000;
 
@@ -1023,7 +1023,7 @@ class App {
 		$this->page['htmlhead'] = replace_macros($tpl, array(
 			'$user_scalable' => $user_scalable,
 			'$baseurl' => $this->get_baseurl(),
-			'$local_user' => local_user(),
+			'$local_channel' => local_channel(),
 			'$generator' => RED_PLATFORM . ' ' . RED_VERSION,
 			'$update_interval' => $interval,
 			'$icon' => head_get_icon(),
@@ -1529,7 +1529,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
 
 	$dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
 
-	if(local_user()) {
+	if(local_channel()) {
 		$tpl = get_markup_template("logout.tpl");
 	}
 	else {
@@ -1603,7 +1603,7 @@ function get_account_id() {
  *
  * @return int|bool channel_id or false
  */
-function local_user() {
+function local_channel() {
 	if((x($_SESSION, 'authenticated')) && (x($_SESSION, 'uid')))
 		return intval($_SESSION['uid']);
 
@@ -1744,7 +1744,7 @@ function current_theme(){
 
 	// Find the theme that belongs to the channel whose stuff we are looking at
 
-	if($a->profile_uid && $a->profile_uid != local_user()) {
+	if($a->profile_uid && $a->profile_uid != local_channel()) {
 		$r = q("select channel_theme from channel where channel_id = %d limit 1",
 			intval($a->profile_uid)
 		);
@@ -1759,8 +1759,8 @@ function current_theme(){
 	// The default is for channel themes to take precedence over your own on pages belonging
 	// to that channel.
 
-	if($page_theme && local_user() && local_user() != $a->profile_url) {
-		if(get_pconfig(local_user(),'system','always_my_theme'))
+	if($page_theme && local_channel() && local_channel() != $a->profile_url) {
+		if(get_pconfig(local_channel(),'system','always_my_theme'))
 			$page_theme = null;
 	}
 
-- 
cgit v1.2.3


From e157371c39121db472cbc45b59ac89d847788648 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 28 Jan 2015 20:58:59 -0800
Subject: remote_user => remote_channel

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index f35e6586b..d972c68dc 100755
--- a/boot.php
+++ b/boot.php
@@ -1615,7 +1615,7 @@ function local_channel() {
  *
  * @return int|bool visitor_id or false
  */
-function remote_user() {
+function remote_channel() {
 	if((x($_SESSION, 'authenticated')) && (x($_SESSION, 'visitor_id')))
 		return $_SESSION['visitor_id'];
 
-- 
cgit v1.2.3


From 74f9544ed40b4d6110846d87fec16ca4102fca13 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 28 Jan 2015 21:08:37 -0800
Subject: provide compatibility functions so code breakage with customised
 setups or work in progress should be minor

---
 boot.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index d972c68dc..96dee2c46 100755
--- a/boot.php
+++ b/boot.php
@@ -1610,6 +1610,12 @@ function local_channel() {
 	return false;
 }
 
+function local_user() {
+	// DEPRECATED
+	return local_channel();
+}
+
+
 /**
  * @brief Returns contact id (visitor_id) of authenticated site visitor or false.
  *
@@ -1622,6 +1628,12 @@ function remote_channel() {
 	return false;
 }
 
+function remote_user() {
+	// DEPRECATED
+	return remote_channel();
+}
+
+
 /**
  * Contents of $s are displayed prominently on the page the next time
  * a page is loaded. Usually used for errors or alerts.
-- 
cgit v1.2.3