keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

keep FB out of private notes

Browse source
This commit is contained in:
friendica 2012-05-22 21:20:31 -07:00
parent 0da20ec9ef
commit 3ac7c4e859
4 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/socgraph.php
View file

@ -71,20 +71,24 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
$name = $entry->displayName; $name = $entry->displayName;
foreach($entry->urls as $url) { if(isset($entry->urls)) {
if($url->type == 'profile') { foreach($entry->urls as $url) {
$profile_url = $url->value; if($url->type == 'profile') {
continue; $profile_url = $url->value;
} continue;
if($url->type == 'webfinger') { }
$connect_url = str_replace('acct:' , '', $url->value); if($url->type == 'webfinger') {
continue; $connect_url = str_replace('acct:' , '', $url->value);
continue;
}
} }
} }
foreach($entry->photos as $photo) { if(isset($entry->photos)) {
if($photo->type == 'profile') { foreach($entry->photos as $photo) {
$profile_photo = $photo->value; if($photo->type == 'profile') {
continue; $profile_photo = $photo->value;
continue;
}
} }
} }

4
mod/network.php
View file

@ -108,6 +108,10 @@ function network_content(&$a, $update = 0) {
return login(false); return login(false);
} }
$arr = array('query' => $a->query_string);
call_hooks('network_content_init', $arr);
$o = ''; $o = '';
// item filter tabs // item filter tabs

4
mod/notes.php
View file

@ -81,7 +81,7 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT COUNT(*) AS `total` $r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra ", $sql_extra ",
intval(local_user()) intval(local_user())
@ -96,7 +96,7 @@ function notes_content(&$a,$update = false) {
$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid` $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0 AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
$sql_extra $sql_extra
ORDER BY `item`.`created` DESC LIMIT %d ,%d ", ORDER BY `item`.`created` DESC LIMIT %d ,%d ",

1
view/theme/slackr/theme.php
View file

@ -45,6 +45,7 @@ function cmtBbClose(id) {
} }
$(document).ready(function() { $(document).ready(function() {
$('html').click(function() { $("#nav-notifications-menu" ).hide(); }); $('html').click(function() { $("#nav-notifications-menu" ).hide(); });
$('.group-edit-icon').hover( $('.group-edit-icon').hover(