Browse Source

implement rel alternate, some corresponding last minute touchups on display module

pull/1/head
Mike Macgirvin 11 years ago
parent
commit
7ad27f5737
  1. 2
      include/items.php
  2. 3
      include/notifier.php
  3. 13
      mod/display.php
  4. 1
      mod/network.php
  5. 1
      view/atom_cmnt.tpl
  6. 1
      view/atom_item.tpl

2
include/items.php

@ -179,6 +179,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
'$location' => xmlify($item['location']),
'$type' => $type,
'$alt' => xmlify($a->get_baseurl() . '/display/' . $owner_nick . '/' . $item['id']),
'$content' => xmlify($item['body']),
'$verb' => xmlify($verb),
'$actobj' => $actobj, // do not xmlify
@ -196,6 +197,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
'$type' => $type,
'$content' => xmlify($item['body']),
'$alt' => xmlify($a->get_baseurl() . '/display/' . $owner_nick . '/' . $item['id']),
'$verb' => xmlify($verb),
'$actobj' => $actobj, // do not xmlify
'$parent_id' => xmlify($item['parent-uri']),

3
include/notifier.php

@ -188,6 +188,7 @@
'$type' => 'text',
'$verb' => xmlify($verb),
'$actobj' => $actobj,
'$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
'$content' => xmlify($item['body']),
'$parent_id' => xmlify($item['parent-uri']),
'$comment_allow' => 0
@ -228,6 +229,7 @@
'$verb' => xmlify($verb),
'$actobj' => $actobj,
'$content' => xmlify($item['body']),
'$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
'$comment_allow' => (($item['last-child']) ? 1 : 0)
));
}
@ -241,6 +243,7 @@
'$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , ATOM_TIME)),
'$updated' => xmlify(datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00' , ATOM_TIME)),
'$content' => xmlify($item['body']),
'$alt' => xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id']),
'$location' => xmlify($item['location']),
'$type' => 'text',
'$verb' => xmlify($verb),

13
mod/display.php

@ -155,6 +155,9 @@ function display_content(&$a) {
: '<div class="wall-item-lock"></div>');
if(can_write_wall($a,$a->profile['uid'])) {
if($item['id'] == $item['parent']) {
$likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
}
if($item['last-child']) {
$comment = replace_macros($cmnt_tpl,array(
'$return_path' => $_SESSION['return_url'],
@ -219,20 +222,14 @@ function display_content(&$a) {
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
$profile_link = $profile_url;
$drop = '';
if(($item['contact-id'] == $_SESSION['visitor_id']) || ($item['uid'] == get_uid()))
$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));
else
$drop = replace_macros(load_view_file('view/wall_fake_drop.tpl'), array('$id' => $item['id']));
$like = (($alike[$item['id']]) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
$dislike = (($dlike[$item['id']]) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
$likebuttons = '';
if($item['id'] == $item['parent']) {
$likebuttons = replace_macros($like_tpl,array('$id' => $item['id']));
}
$o .= replace_macros($template,array(
'$id' => $item['item_id'],

1
mod/network.php

@ -234,7 +234,6 @@ function network_content(&$a, $update = 0) {
));
}
$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id']));

1
view/atom_cmnt.tpl

@ -11,6 +11,7 @@
<published>$published</published>
<updated>$updated</updated>
<content type="$type" >$content</content>
<link rel="alternate" href="$alt" />
<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
<as:verb>$verb</as:verb>
$actobj

1
view/atom_item.tpl

@ -15,6 +15,7 @@
<published>$published</published>
<updated>$updated</updated>
<content type="$type" >$content</content>
<link rel="alternate" href="$alt" />
<dfrn:location>$location</dfrn:location>
<dfrn:comment-allow>$comment_allow</dfrn:comment-allow>
<as:verb>$verb</as:verb>

Loading…
Cancel
Save