diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-06 20:50:02 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-06 20:50:02 -0800 |
| commit | 53627c89a716fcd9bac535169710e65b229e96a5 (patch) | |
| tree | 938fe27caf3f04549fcf1ee9dea2e70c26c0db5b /include/network.php | |
| parent | c8c9916b5977e3ae8db4762209ca4bf99a3058ee (diff) | |
| parent | f7f0d2b265b764e1a7bb032473108ca2cfaeb4a5 (diff) | |
| download | volse-hubzilla-53627c89a716fcd9bac535169710e65b229e96a5.tar.gz volse-hubzilla-53627c89a716fcd9bac535169710e65b229e96a5.tar.bz2 volse-hubzilla-53627c89a716fcd9bac535169710e65b229e96a5.zip | |
Merge branch 'dev'
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/network.php b/include/network.php index f386afc8e..5895d302b 100644 --- a/include/network.php +++ b/include/network.php @@ -1822,6 +1822,13 @@ function check_siteallowed($url) { $retvalue = true; + + $arr = array('url' => $url); + call_hooks('check_siteallowed',$arr); + + if(array_key_exists('allowed',$arr)) + return $arr['allowed']; + $bl1 = get_config('system','whitelisted_sites'); if(is_array($bl1) && $bl1) { foreach($bl1 as $bl) { @@ -1848,6 +1855,12 @@ function check_channelallowed($hash) { $retvalue = true; + $arr = array('hash' => $hash); + call_hooks('check_channelallowed',$arr); + + if(array_key_exists('allowed',$arr)) + return $arr['allowed']; + $bl1 = get_config('system','whitelisted_channels'); if(is_array($bl1) && $bl1) { foreach($bl1 as $bl) { |