From 4dd4a2258235cfafc0d5a4f87d116755ebe52ead Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 28 Feb 2012 14:52:23 -0800
Subject: From Tobias H - catch some irregularities caused by cut/paste code

---
 mod/display.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mod/display.php')

diff --git a/mod/display.php b/mod/display.php
index d96be4333..f510f793d 100755
--- a/mod/display.php
+++ b/mod/display.php
@@ -74,11 +74,11 @@ function display_content(&$a) {
 		$x = array(
 			'is_owner' => true,
 			'allow_location' => $a->user['allow_location'],
-			'default_location' => $a->user['default_location'],
+			'default_location' => $a->user['default-location'],
 			'nickname' => $a->user['nickname'],
-			'lockstate' => ((($group) || (is_array($a->user) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))))) ? 'lock' : 'unlock'),
-			'acl' => populate_acl((($group || $cid) ? $def_acl : $a->user), $celeb),
-			'bang' => (($group || $cid) ? '!' : ''),
+			'lockstate' => ( (is_array($a->user)) && ((strlen($a->user['allow_cid'])) || (strlen($a->user['allow_gid'])) || (strlen($a->user['deny_cid'])) || (strlen($a->user['deny_gid']))) ? 'lock' : 'unlock'),
+			'acl' => populate_acl($a->user, $celeb),
+			'bang' => '',
 			'visitor' => 'block',
 			'profile_uid' => local_user()
 		);	
-- 
cgit v1.2.3


From 21887a36fde1f287c73c7cc3a57ac9ba2ec2135b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 6 Mar 2012 14:53:14 -0800
Subject: [PRIVACY] privacy issue bug #314

---
 mod/display.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'mod/display.php')

diff --git a/mod/display.php b/mod/display.php
index f510f793d..4f2e5ff9a 100755
--- a/mod/display.php
+++ b/mod/display.php
@@ -34,7 +34,7 @@ function display_content(&$a) {
 
 	$contact = null;
 	$remote_contact = false;
-
+dbg(1);
 	if(remote_user()) {
 		$contact_id = $_SESSION['visitor_id'];
 		$groups = init_groups_visitor($contact_id);
@@ -87,6 +87,9 @@ function display_content(&$a) {
 
 	$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
+	if(! local_user() && ! remote_user())
+		$sql_extra .= " and `item`.`private` = 0 ";
+
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
@@ -135,7 +138,7 @@ function display_content(&$a) {
 		}
 
 	}
-
+dbg(0);
 	return $o;
 }
 
-- 
cgit v1.2.3


From 39a49d51e370f6421a065cd78594e849ef92ff73 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 6 Mar 2012 16:28:52 -0800
Subject: remove stray debugging

---
 mod/display.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mod/display.php')

diff --git a/mod/display.php b/mod/display.php
index 4f2e5ff9a..00f8b503a 100755
--- a/mod/display.php
+++ b/mod/display.php
@@ -34,7 +34,7 @@ function display_content(&$a) {
 
 	$contact = null;
 	$remote_contact = false;
-dbg(1);
+
 	if(remote_user()) {
 		$contact_id = $_SESSION['visitor_id'];
 		$groups = init_groups_visitor($contact_id);
@@ -138,7 +138,7 @@ dbg(1);
 		}
 
 	}
-dbg(0);
+
 	return $o;
 }
 
-- 
cgit v1.2.3


From 88cd5800cf2e22f365bc38f567fcc1627e9278a7 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 6 Mar 2012 17:21:14 -0800
Subject: [privacy] rework latest fix

---
 mod/display.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'mod/display.php')

diff --git a/mod/display.php b/mod/display.php
index 00f8b503a..f510f793d 100755
--- a/mod/display.php
+++ b/mod/display.php
@@ -87,9 +87,6 @@ function display_content(&$a) {
 
 	$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
-	if(! local_user() && ! remote_user())
-		$sql_extra .= " and `item`.`private` = 0 ";
-
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
-- 
cgit v1.2.3


From 7ad2dd65654f6b1cb17ae98e65c3e95528d29e30 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 6 Mar 2012 17:52:00 -0800
Subject: fix photos after permissions_sql change

---
 mod/display.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/display.php')

diff --git a/mod/display.php b/mod/display.php
index f510f793d..f428149e8 100755
--- a/mod/display.php
+++ b/mod/display.php
@@ -85,7 +85,7 @@ function display_content(&$a) {
 		$o .= status_editor($a,$x,0,true);
 
 
-	$sql_extra = permissions_sql($a->profile['uid'],$remote_contact,$groups);
+	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
-- 
cgit v1.2.3