From 2df7251b349fa3ef9650cf8adb1fb680f253930d Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 18 Aug 2011 17:30:06 -0700 Subject: [PATCH] notifier issue --- include/network.php | 7 ++++--- include/notifier.php | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/network.php b/include/network.php index ade8a40ac4..10e3648a18 100644 --- a/include/network.php +++ b/include/network.php @@ -697,8 +697,8 @@ function parse_xml_string($s,$strict = true) { function add_fcontact($arr) { $r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`, - `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey` ) - values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')", + `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` ) + values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')", dbesc($arr['url']), dbesc($arr['name']), dbesc($arr['photo']), @@ -710,7 +710,8 @@ function add_fcontact($arr) { dbesc($arr['confirm']), dbesc($arr['network']), dbesc($arr['alias']), - dbesc($arr['pubkey']) + dbesc($arr['pubkey']), + dbesc(datetime_convert()) ); return $r; } diff --git a/include/notifier.php b/include/notifier.php index 15fb385346..89c36e4341 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -587,8 +587,9 @@ function notifier_run($argv, $argc){ */ $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 ", + dbesc(NETWORK_DFRN), intval($owner['uid']), intval(CONTACT_IS_SHARING) );