show lockstate on messages, sparkle failure on profile page,

comments on typo checker

7 files changed, 36 insertions, 3 deletions

diff --git a/mod/display.php b/mod/display.php
index 9c24d85b0..d0bbf54bf 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -85,7 +85,7 @@ function display_content(&$a) {
 	}
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, 
+		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 		`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -149,6 +149,12 @@ function display_content(&$a) {
 			if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent'])) 
 				continue;
 
+			$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
+				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" alt="Private Message" /></div>'
+				: '<div class="wall-item-lock"></div>');
+
+
 			if(can_write_wall($a,$a->profile['uid'])) {
 				if($item['last-child']) {
 					$comment = replace_macros($cmnt_tpl,array(
@@ -239,6 +245,7 @@ function display_content(&$a) {
 				'$title' => $item['title'],
 				'$body' => bbcode($item['body']),
 				'$ago' => relative_date($item['created']),
+				'$lock' => $lock,
 				'$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
 				'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
 				'$owner_url' => $owner_url,
diff --git a/mod/network.php b/mod/network.php
index 1634a0f06..b0daecac4 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -173,6 +173,13 @@ function network_content(&$a, $update = 0) {
 			if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent'])) 
 				continue;
 
+
+			$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
+				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" alt="Private Message" /></div>'
+				: '<div class="wall-item-lock"></div>');
+
+
 			// Top-level wall post not written by the wall owner (wall-to-wall)
 			// First figure out who owns it. 
 
@@ -279,6 +286,7 @@ function network_content(&$a, $update = 0) {
 				'$title' => $item['title'],
 				'$body' => bbcode($item['body']),
 				'$ago' => relative_date($item['created']),
+				'$lock' => $lock,
 				'$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
 				'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
 				'$owner_url' => $owner_url,
diff --git a/mod/profile.php b/mod/profile.php
index a0cdcfcc7..bf9c0f758 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -231,7 +231,7 @@ function profile_content(&$a, $update = 0) {
 		$a->set_pager_total($r[0]['total']);
 
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-		`contact`.`name`, `contact`.`photo`, `contact`.`url`, 
+		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, 
 		`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
 		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -307,6 +307,14 @@ function profile_content(&$a, $update = 0) {
 			if((($item['verb'] == ACTIVITY_LIKE) || ($item['verb'] == ACTIVITY_DISLIKE)) && ($item['id'] != $item['parent'])) 
 				continue;
 
+			$lock = (($item['uid'] == get_uid()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))
+				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" alt="Private Message" /></div>'
+				: '<div class="wall-item-lock"></div>');
+
+
+
+
 			if(can_write_wall($a,$a->profile['profile_uid'])) {
 				if($item['id'] == $item['parent']) {
 					$likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
@@ -370,6 +378,7 @@ function profile_content(&$a, $update = 0) {
 				'$title' => $item['title'],
 				'$body' => bbcode($item['body']),
 				'$ago' => relative_date($item['created']),
+				'$lock' => $lock,
 				'$location' => (($item['location']) ? '<a target="map" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : ''),
 				'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
 				'$drop' => $drop,
diff --git a/test/typo.php b/test/typo.php
index c8b94be21..e3141a46e 100644
--- a/test/typo.php
+++ b/test/typo.php
@@ -1,4 +1,8 @@
 <?php
+	// Tired of chasing typos and finding them after a commit. 
+	// Run this from cmdline in basedir and quickly see if we've 
+	// got any parse errors in our application files.
+
 	include 'boot.php';
 
 	$a = new App();
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index a7dee04b6..90bd3f8c2 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -702,9 +702,12 @@ input#dfrn-url {
 	float: left;
 }
 .wall-item-wrapper {
-	margin-top: 30px;
 	float: left;
 }
+.wall-item-lock {
+	height: 20px;
+	margin-top: 10px;
+}
 
 .wall-item-ago {
 	color: #888888;
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 58a7727a8..4d2404ce0 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -6,6 +6,7 @@
 		</div>
 
 		<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+			$lock
 			<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
 			<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
 			<div class="wall-item-location" id="wall-item-location-$id">$location</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index d98289901..f8affd1c5 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -11,6 +11,7 @@
 		</div>
 	
 		<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+			$lock
 			<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name$osparkle" id="wall-item-ownername-$id">$owner_name</span></a> via Wall-To-Wall:<br />
 			<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
 			<div class="wall-item-location" id="wall-item-location-$id">$location</div>