diff options
| author | friendica <info@friendica.com> | 2014-08-22 21:37:08 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-08-22 21:37:08 -0700 |
| commit | 9196c9eef091e7f4a41fbc9452521d6ca2de55a3 (patch) | |
| tree | 409292976fe0b3ea818a3f807835883056a09199 /include | |
| parent | 255ab8e9c9b86c7d38e03eb0d4913a823086366d (diff) | |
| download | volse-hubzilla-9196c9eef091e7f4a41fbc9452521d6ca2de55a3.tar.gz volse-hubzilla-9196c9eef091e7f4a41fbc9452521d6ca2de55a3.tar.bz2 volse-hubzilla-9196c9eef091e7f4a41fbc9452521d6ca2de55a3.zip | |
We really can't do this without a hubloc. I was hoping we could, but notifier is setup to take hublocs, not xchans.
Diffstat (limited to 'include')
| -rw-r--r-- | include/notifier.php | 2 | ||||
| -rw-r--r-- | include/zot.php | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/notifier.php b/include/notifier.php index 9d5c7cb8e..180a538bc 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -382,7 +382,7 @@ function notifier_run($argv, $argc){ $env_recips = (($private) ? array() : null); - $details = q("select xchan_hash, xchan_instance_url, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")"); + $details = q("select xchan_hash, xchan_instance_url, xchan_network, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")"); $recip_list = array(); diff --git a/include/zot.php b/include/zot.php index 41d0bc1eb..a155b2588 100644 --- a/include/zot.php +++ b/include/zot.php @@ -959,12 +959,13 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { ); } logger('import_xchan: new hub: ' . $location['url']); - $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected) - values ( '%s','%s','%s','%s', %d ,'%s','%s','%s','%s','%s','%s','%s')", + $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_network, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected) + values ( '%s','%s','%s','%s', '%s', %d ,'%s','%s','%s','%s','%s','%s','%s')", dbesc($arr['guid']), dbesc($arr['guid_sig']), dbesc($xchan_hash), dbesc($location['address']), + dbesc('zot'), intval((intval($location['primary'])) ? HUBLOC_FLAGS_PRIMARY : 0), dbesc($location['url']), dbesc($location['url_sig']), |