aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-29 20:26:00 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-29 20:26:00 -0800
commit650f882265cc0256fa85046baacca9dc6db56d24 (patch)
tree1b338dcd0a50279c6b78221b2f6b1f6dd66f088c /include/zot.php
parenta2747403f23b0a67b8b154b2526ca7f76b5d844b (diff)
downloadvolse-hubzilla-650f882265cc0256fa85046baacca9dc6db56d24.tar.gz
volse-hubzilla-650f882265cc0256fa85046baacca9dc6db56d24.tar.bz2
volse-hubzilla-650f882265cc0256fa85046baacca9dc6db56d24.zip
generalise the site black|white allow lists, also add a channel black|white list for future use
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php14
1 files changed, 2 insertions, 12 deletions
diff --git a/include/zot.php b/include/zot.php
index e575f3d05..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;
}