Renamed check_domain_blocklist to blocked_url

- Remove debug

diff --git a/include/follow.php b/include/follow.php
index 11138afac8c54609989e51317f6ad0e151db339d..57520abe602291011acfb8ca67eeb931442f698c 100644 (file)
--- a/include/follow.php
+++ b/include/follow.php
@@ -82,7 +82,7 @@ function new_contact($uid,$url,$interactive = false) {
                return $result;
        }
 
-       if (! check_domain_blocklist($url)) {
+       if (blocked_url($url)) {
                $result['message'] = t('Blocked domain');
                return $result;
        }

diff --git a/include/network.php b/include/network.php
index 27292499beb85b1c2290e8630310859405df5058..6ead21acf9a8c0b5da2669f2c3d0e60af6569fe7 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -69,7 +69,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 
        $a = get_app();
 
-       if (! check_domain_blocklist($url)) {
+       if (blocked_url($url)) {
                logger('z_fetch_url: domain of ' . $url . ' is blocked', LOGGER_DATA);
                return $ret;
        }
@@ -252,7 +252,7 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0) {
        $stamp1 = microtime(true);
 
-       if (!check_domain_blocklist($url)) {
+       if (blocked_url($url)) {
                logger('post_url: domain of ' . $url . ' is blocked', LOGGER_DATA);
                return false;
        }
@@ -522,34 +522,33 @@ function allowed_url($url) {
 }
 
 /**
- * Checks if the provided url domain isn't on the domain blacklist.
- * Return true if the check passed (not on the blacklist), false if not
- * or malformed URL
+ * Checks if the provided url domain is on the domain blocklist.
+ * Returns true if it is or malformed URL, false if not.
  *
  * @param string $url The url to check the domain from
  * @return boolean
  */
-function check_domain_blocklist($url) {
+function blocked_url($url) {
        $h = @parse_url($url);
 
        if (! $h) {
-               return false;
+               return true;
        }
 
        $domain_blocklist = get_config('system', 'blocklist', array());
        if (! $domain_blocklist) {
-               return true;
+               return false;
        }
 
        $host = strtolower($h['host']);
 
        foreach ($domain_blocklist as $domain_block) {
                if (strtolower($domain_block['domain']) == $host) {
-                       return false;
+                       return true;
                }
        }
 
-       return true;
+       return false;
 }
 
 /**

diff --git a/mod/admin.php b/mod/admin.php
index 50e1ff18ec42e197e75267b66392fc302367acb5..97d52f14f49365c4933f9814cf7cd9490179cc73 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -272,7 +272,6 @@ function admin_content(App $a) {
  */
 function admin_page_blocklist(App $a) {
        $blocklist = Config::get('system', 'blocklist');
-       var_dump($blocklist);
        $blocklistform = array();
        if (is_array($blocklist)) {
                foreach($blocklist as $id => $b) {

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 68f9448a55470d17b8100a2e5d9dc6c1c1888448..5a25c27f6ae72a25a7ec964b9680dbcc60540a06 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -514,7 +514,7 @@ function dfrn_request_post(App $a) {
                                        return; // NOTREACHED
                                }
 
-                               if (! check_domain_blocklist($url)) {
+                               if (blocked_url($url)) {
                                        notice( t('Blocked domain') . EOL);
                                        goaway(App::get_baseurl() . '/' . $a->cmd);
                                        return; // NOTREACHED