diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-01 00:35:01 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-01 00:35:01 +0100 |
| commit | b96f09bb3aeee403038755ab5f6e6b53654cb145 (patch) | |
| tree | ca72f5712b7467e7f968f87172cec82164435894 /include/zot.php | |
| parent | 519862115c143cf3f645a172f39e5a0b4dc9d5bb (diff) | |
| parent | 4b191fb55860c5f366c17ecaacc59ccbdd936885 (diff) | |
| download | volse-hubzilla-b96f09bb3aeee403038755ab5f6e6b53654cb145.tar.gz volse-hubzilla-b96f09bb3aeee403038755ab5f6e6b53654cb145.tar.bz2 volse-hubzilla-b96f09bb3aeee403038755ab5f6e6b53654cb145.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/include/zot.php b/include/zot.php index c0d537eb9..6764072aa 100644 --- a/include/zot.php +++ b/include/zot.php @@ -554,18 +554,8 @@ function zot_gethub($arr,$multiple = false) { if($arr['guid'] && $arr['guid_sig'] && $arr['url'] && $arr['url_sig']) { - $blacklisted = false; - $bl1 = get_config('system','blacklisted_sites'); - if(is_array($bl1) && $bl1) { - foreach($bl1 as $bl) { - if($bl && strpos($arr['url'],$bl) !== false) { - $blacklisted = true; - break; - } - } - } - if($blacklisted) { - logger('zot_gethub: blacklisted site: ' . $arr['url']); + if(! check_siteallowed($arr['url'])) { + logger('blacklisted site: ' . $arr['url']); return null; } @@ -1246,6 +1236,10 @@ function zot_import($arr, $sender_url) { $no_dups = array(); if($deliveries) { foreach($deliveries as $d) { + if(! is_array($d)) { + logger('Delivery hash array is not an array: ' . print_r($d,true)); + continue; + } if(! in_array($d['hash'],$no_dups)) $no_dups[] = $d['hash']; } |