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

don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it.

Browse Source
This commit is contained in:
friendica 2013-09-15 19:04:11 -07:00
parent 033a9f67e7
commit b3575484c7
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
include/zot.php
View File

@ -1516,12 +1516,15 @@ function import_site($arr,$pubkey) {
} }
$update = false; $update = false;
$exists = false;
$r = q("select * from site where site_url = '%s' limit 1", $r = q("select * from site where site_url = '%s' limit 1",
dbesc($arr['url']) dbesc($arr['url'])
); );
if($r) if($r) {
$update = true; $exists = true;
$siterecord = $r[0];
}
$site_directory = 0; $site_directory = 0;
if($arr['directory_mode'] == 'normal') if($arr['directory_mode'] == 'normal')
@ -1552,29 +1555,39 @@ function import_site($arr,$pubkey) {
$access_policy = ACCESS_FREE; $access_policy = ACCESS_FREE;
} }
$directory_url = htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false);
$url = htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false);
if($update) { if($exists) {
$r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s' if(($siterecord['site_flags'] != $site_directory)
where site_url = '%s' limit 1", || ($siterecord['site_access'] != $access_policy)
intval($site_directory), || ($siterecord['site_directory'] != $directory_url)
intval($access_policy), || ($siterecord['site_register'] != $register_policy)) {
dbesc(htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false)), $update = true;
intval($register_policy),
dbesc(datetime_convert()), $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s'
dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)) where site_url = '%s' limit 1",
); intval($site_directory),
if(! $r) { intval($access_policy),
logger('import_site: update failed. ' . print_r($arr,true)); dbesc($directory_url),
intval($register_policy),
dbesc(datetime_convert()),
dbesc($url)
);
if(! $r) {
logger('import_site: update failed. ' . print_r($arr,true));
}
} }
} }
else { else {
$update = true;
$r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register ) $r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register )
values ( '%s', %d, %d, '%s', '%s', %d )", values ( '%s', %d, %d, '%s', '%s', %d )",
dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)), dbesc($url),
intval($site_directory), intval($site_directory),
intval($access_policy), intval($access_policy),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false)), dbesc($directory_url),
intval($register_policy) intval($register_policy)
); );
if(! $r) { if(! $r) {