mirror of
https://github.com/friendica/friendica
synced 2024-12-22 18:00:16 +00:00
w3c compliance fixes, owner attribution on likes defaulting to local owner, not item creator
This commit is contained in:
Friendika
parent
a2b2318106
commit
3a2bf8ab7c
9 changed files with 37 additions and 14 deletions
|
|
@ -463,7 +463,7 @@ function facebook_jot_nets(&$a,&$b) {
|
|||
if(intval($fb_post) == 1) {
|
||||
$fb_defpost = get_pconfig(local_user(),'facebook','post_by_default');
|
||||
$selected = ((intval($fb_defpost) == 1) ? ' checked="checked" ' : '');
|
||||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="facebook_enable"' . $selected . 'value="1" /> '
|
||||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="facebook_enable"' . $selected . ' value="1" /> '
|
||||
. t('Post to Facebook') . '</div>';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ function statusnet_jot_nets(&$a,&$b) {
|
|||
if(intval($statusnet_post) == 1) {
|
||||
$statusnet_defpost = get_pconfig(local_user(),'statusnet','post_by_default');
|
||||
$selected = ((intval($statusnet_defpost) == 1) ? ' checked="checked" ' : '');
|
||||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . 'value="1" /> '
|
||||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="statusnet_enable"' . $selected . ' value="1" /> '
|
||||
. t('Post to StatusNet') . '</div>';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ function twitter_jot_nets(&$a,&$b) {
|
|||
if(intval($tw_post) == 1) {
|
||||
$tw_defpost = get_pconfig(local_user(),'twitter','post_by_default');
|
||||
$selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
|
||||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . 'value="1" /> '
|
||||
$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . ' value="1" /> '
|
||||
. t('Post to Twitter') . '</div>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -730,7 +730,7 @@ function status_editor($a,$x, $notes_cid = 0) {
|
|||
|
||||
if($mail_enabled) {
|
||||
$selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
|
||||
$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
|
||||
$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
|
||||
. t("Post to Email") . '</div>';
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
|
|||
|
||||
$createtext = t('Create a new group');
|
||||
$linktext= t('Everybody');
|
||||
$selected = (($group_id == 0) ? ' class="group-selected" ' : '');
|
||||
$selected = (($group_id == 0) ? ' group-selected' : '');
|
||||
$o .= <<< EOT
|
||||
|
||||
<div id="group-sidebar">
|
||||
|
|
@ -172,7 +172,7 @@ $o .= <<< EOT
|
|||
|
||||
<div id="sidebar-group-list">
|
||||
<ul id="sidebar-group-ul">
|
||||
<li class="sidebar-group-li" ><a href="$every" class="sidebar-group-element" $selected >$linktext</a></li>
|
||||
<li class="sidebar-group-li" ><a href="$every" class="sidebar-group-element$selected" >$linktext</a></li>
|
||||
|
||||
EOT;
|
||||
|
||||
|
|
@ -185,13 +185,13 @@ EOT;
|
|||
|
||||
if(count($r)) {
|
||||
foreach($r as $rr) {
|
||||
$selected = (($group_id == $rr['id']) ? ' class="group-selected" ' : '');
|
||||
$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
|
||||
$o .= ' <li class="sidebar-group-li">'
|
||||
. (($edit) ? "<a href=\"group/{$rr['id']}\" title=\"" . t('Edit')
|
||||
. "\" class=\"groupsideedit\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "")
|
||||
. (($cid) ? '<input type="checkbox" class="' . (($selected) ? 'ticked' : 'unticked') . '" onclick="contactgroupChangeMember(' . $rr['id'] . ',' . $cid . ');return true;" '
|
||||
. ((in_array($rr['id'],$member_of)) ? ' checked="checked" ' : '') . '/>' : '')
|
||||
. "<a href=\"$each/{$rr['id']}\" class=\"sidebar-group-element\" $selected >{$rr['name']}</a></li>\r\n";
|
||||
. "<a href=\"$each/{$rr['id']}\" class=\"sidebar-group-element" . $selected ."\" >{$rr['name']}</a></li>\r\n";
|
||||
}
|
||||
}
|
||||
$o .= " </ul>\r\n </div>";
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ function editpost_content(&$a) {
|
|||
|
||||
if($mail_enabled) {
|
||||
$selected = (($pubmail_enabled) ? ' checked="checked" ' : '');
|
||||
$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . 'value="1" /> '
|
||||
$jotnets .= '<div class="profile-jot-net"><input type="checkbox" name="pubmail_enable"' . $selected . ' value="1" /> '
|
||||
. t("Post to Email") . '</div>';
|
||||
}
|
||||
|
||||
|
|
|
|||
27
mod/like.php
27
mod/like.php
|
|
@ -55,6 +55,22 @@ function like_content(&$a) {
|
|||
return;
|
||||
}
|
||||
|
||||
$remote_owner = null;
|
||||
|
||||
if(! $item['wall']) {
|
||||
// The top level post may have been written by somebody on another system
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($item['contact-id']),
|
||||
intval($item['uid'])
|
||||
);
|
||||
if(! count($r))
|
||||
return;
|
||||
if(! $r[0]['self'])
|
||||
$remote_owner = $r[0];
|
||||
}
|
||||
|
||||
// this represents the post owner on this system.
|
||||
|
||||
$r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
|
||||
WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
|
||||
intval($owner_uid)
|
||||
|
|
@ -67,6 +83,11 @@ function like_content(&$a) {
|
|||
return;
|
||||
}
|
||||
|
||||
if(! $remote_owner)
|
||||
$remote_owner = $owner;
|
||||
|
||||
|
||||
// This represents the person posting
|
||||
|
||||
if((local_user()) && (local_user() == $owner_uid)) {
|
||||
$contact = $owner;
|
||||
|
|
@ -137,9 +158,9 @@ EOT;
|
|||
$arr['gravity'] = GRAVITY_LIKE;
|
||||
$arr['parent'] = $item['id'];
|
||||
$arr['parent-uri'] = $item['uri'];
|
||||
$arr['owner-name'] = $owner['name'];
|
||||
$arr['owner-link'] = $owner['url'];
|
||||
$arr['owner-avatar'] = $owner['thumb'];
|
||||
$arr['owner-name'] = $remote_owner['name'];
|
||||
$arr['owner-link'] = $remote_owner['url'];
|
||||
$arr['owner-avatar'] = $remote_owner['thumb'];
|
||||
$arr['author-name'] = $contact['name'];
|
||||
$arr['author-link'] = $contact['url'];
|
||||
$arr['author-avatar'] = $contact['thumb'];
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@ function network_content(&$a, $update = 0) {
|
|||
$star = ((x($_GET,'star')) ? intval($_GET['star']) : 0);
|
||||
$bmark = ((x($_GET,'bmark')) ? intval($_GET['bmark']) : 0);
|
||||
$order = ((x($_GET,'order')) ? notags($_GET['order']) : 'comment');
|
||||
$liked = ((x($_GET,'liked')) ? intval($_GET['liked']) : 0);
|
||||
|
||||
|
||||
if(($a->argc > 2) && $a->argv[2] === 'new')
|
||||
|
|
@ -195,6 +196,7 @@ function network_content(&$a, $update = 0) {
|
|||
. ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '')
|
||||
. ((x($_GET,'order')) ? '&order=' . $_GET['order'] : '')
|
||||
. ((x($_GET,'bmark')) ? '&bmark=' . $_GET['bmark'] : '')
|
||||
. ((x($_GET,'liked')) ? '&liked=' . $_GET['liked'] : '')
|
||||
. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
|
||||
<a href="#" class="icon like"title="$likethis" onclick="dolike($id,'like'); return false"></a>
|
||||
<a href="#" class="icon like" title="$likethis" onclick="dolike($id,'like'); return false"></a>
|
||||
<a href="#" class="icon dislike" title="$nolike" onclick="dolike($id,'dislike'); return false"></a>
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$share"onclick="jotShare($id); return false"></a>
|
||||
<a href="#" class="icon recycle wall-item-share-buttons" title="$share" onclick="jotShare($id); return false"></a>
|
||||
<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue