friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

notifier issue

pull/1/head
Friendika 2011-08-18 17:30:06 -07:00
parent 609741573c
commit 2df7251b34
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/network.php
View File

@ -697,8 +697,8 @@ function parse_xml_string($s,$strict = true) {
function add_fcontact($arr) { function add_fcontact($arr) {
$r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`, $r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`,
`notify`,`poll`,`confirm`,`network`,`alias`,`pubkey` ) `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` )
values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')", values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
dbesc($arr['url']), dbesc($arr['url']),
dbesc($arr['name']), dbesc($arr['name']),
dbesc($arr['photo']), dbesc($arr['photo']),
@ -710,7 +710,8 @@ function add_fcontact($arr) {
dbesc($arr['confirm']), dbesc($arr['confirm']),
dbesc($arr['network']), dbesc($arr['network']),
dbesc($arr['alias']), dbesc($arr['alias']),
dbesc($arr['pubkey']) dbesc($arr['pubkey']),
dbesc(datetime_convert())
); );
return $r; return $r;
} }

3
include/notifier.php
View File

@ -587,8 +587,9 @@ function notifier_run($argv, $argc){
*/ */
$r = q("SELECT `id`, `name` FROM `contact` $r = q("SELECT `id`, `name` FROM `contact`
WHERE `network` = NETWORK_DFRN AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 WHERE `network` = '%s' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0
AND `rel` != %d ", AND `rel` != %d ",
dbesc(NETWORK_DFRN),
intval($owner['uid']), intval($owner['uid']),
intval(CONTACT_IS_SHARING) intval(CONTACT_IS_SHARING)
); );