harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update the update records for all addresses attached to this channel, not just the primary.

Browse Source
This commit is contained in:
friendica 2014-06-30 03:34:37 -07:00
parent bb26dce293
commit 4e8d10e269
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/zot.php
View File

@ -1,4 +1,4 @@
<?php /** @file */ 32;278;2c<?php /** @file */
require_once('include/crypto.php'); require_once('include/crypto.php');
require_once('include/items.php'); require_once('include/items.php');
@ -601,6 +601,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED) {
$changed = false; $changed = false;
$what = ''; $what = '';
$addresses = array();
if(! (is_array($arr) && array_key_exists('success',$arr) && $arr['success'])) { if(! (is_array($arr) && array_key_exists('success',$arr) && $arr['success'])) {
logger('import_xchan: invalid data packet: ' . print_r($arr,true)); logger('import_xchan: invalid data packet: ' . print_r($arr,true));
@ -837,6 +838,8 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED) {
if(strpos($location['address'],'/') !== false) if(strpos($location['address'],'/') !== false)
$location['address'] = substr($location['address'],0,strpos($location['address'],'/')); $location['address'] = substr($location['address'],0,strpos($location['address'],'/'));
$addresses[] = $location['address'];
// match as many fields as possible in case anything at all changed. // match as many fields as possible in case anything at all changed.
$r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ", $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ",
@ -997,16 +1000,25 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED) {
if(($changed) || ($ud_flags == UPDATE_FLAGS_FORCED)) { if(($changed) || ($ud_flags == UPDATE_FLAGS_FORCED)) {
$guid = random_string() . '@' . get_app()->get_hostname(); $guid = random_string() . '@' . get_app()->get_hostname();
update_modtime($xchan_hash,$guid,$arr['address'],$ud_flags); if($addresses) {
foreach($addresses as $address) {
update_modtime($xchan_hash,$guid,$address,$ud_flags);
}
}
logger('import_xchan: changed: ' . $what,LOGGER_DEBUG); logger('import_xchan: changed: ' . $what,LOGGER_DEBUG);
} }
elseif(! $ud_flags) { elseif(! $ud_flags) {
// nothing changed but we still need to update the updates record // nothing changed but we still need to update the updates record
q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) ", if($addresses) {
intval(UPDATE_FLAGS_UPDATED), foreach($addresses as $address) {
dbesc($arr['address']),
intval(UPDATE_FLAGS_UPDATED) q("update updates set ud_flags = ( ud_flags | %d ) where ud_addr = '%s' and not (ud_flags & %d) ",
); intval(UPDATE_FLAGS_UPDATED),
dbesc($address),
intval(UPDATE_FLAGS_UPDATED)
);
}
}
} }
if(! x($ret,'message')) { if(! x($ret,'message')) {