aboutsummaryrefslogtreecommitdiffstats
path: root/mod/display.php
diff options
context:
space:
mode:
authorMike Macgirvin <mike@macgirvin.com>2010-09-28 22:12:27 -0700
committerMike Macgirvin <mike@macgirvin.com>2010-09-28 22:12:27 -0700
commit18287a365693d0607be76091679cb45dc2748a6f (patch)
tree213bc6b735e7c25a1401d565fa60dcae2424ea12 /mod/display.php
parentdd3f754e235e286207ee638e75c601ca1e809936 (diff)
downloadvolse-hubzilla-18287a365693d0607be76091679cb45dc2748a6f.tar.gz
volse-hubzilla-18287a365693d0607be76091679cb45dc2748a6f.tar.bz2
volse-hubzilla-18287a365693d0607be76091679cb45dc2748a6f.zip
show lockstate on messages, sparkle failure on profile page,
comments on typo checker
Diffstat (limited to 'mod/display.php')
-rw-r--r--mod/display.php9
1 files changed, 8 insertions, 1 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,