diff options
| author | Friendika <info@friendika.com> | 2011-08-18 17:30:06 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-08-18 17:30:06 -0700 |
| commit | 2df7251b349fa3ef9650cf8adb1fb680f253930d (patch) | |
| tree | 979b20a30d5c4d36729fe356898dc4248b64e18d /include | |
| parent | 609741573c40ef11732d8ae59317e1378f31686b (diff) | |
| download | volse-hubzilla-2df7251b349fa3ef9650cf8adb1fb680f253930d.tar.gz volse-hubzilla-2df7251b349fa3ef9650cf8adb1fb680f253930d.tar.bz2 volse-hubzilla-2df7251b349fa3ef9650cf8adb1fb680f253930d.zip | |
notifier issue
Diffstat (limited to 'include')
| -rw-r--r-- | include/network.php | 7 | ||||
| -rw-r--r-- | include/notifier.php | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/network.php b/include/network.php index ade8a40ac..10e3648a1 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 15fb38534..89c36e434 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) ); |