nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

icon changes, feed security improvements

Browse source
This commit is contained in:
Friendika 2011-03-04 20:55:32 -08:00
commit 216f038456
27 changed files with 483 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

11
mod/pubsub.php
View file

@ -55,7 +55,8 @@ function pubsub_init(&$a) {
$sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
$r = q("SELECT * FROM `contact` WHERE `poll` = '%s' AND `id` = %d AND `uid` = %d AND `blocked` = 0 $sql_extra LIMIT 1",
$r = q("SELECT * FROM `contact` WHERE `poll` = '%s' AND `id` = %d AND `uid` = %d
AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1",
dbesc($hub_topic),
intval($contact_id),
intval($owner['uid'])
@ -101,10 +102,14 @@ function pubsub_post(&$a) {
$importer = $r[0];
$r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
$r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d
AND ( `rel` = %d OR `rel` = %d ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
intval($contact_id),
intval($importer['uid'])
intval($importer['uid']),
intval(REL_FAN),
intval(REL_BUD)
);
if(! count($r)) {
logger('pubsub: no contact record - ignored');
hub_post_return();

4
mod/wall_upload.php
View file

@ -101,5 +101,5 @@ function wall_upload_post(&$a) {
echo '<br /><br /><a href="' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '" ><img src="' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg\" alt=\"$basename\" /></a><br /><br />";
killme();
return; // NOTREACHED
}
// NOTREACHED
}