diff options
| -rw-r--r-- | src/squark-filter.c | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | www/blocked.cgi | 0 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/squark-filter.c b/src/squark-filter.c index 88e8a37..09693c9 100644 --- a/src/squark-filter.c +++ b/src/squark-filter.c @@ -417,13 +417,12 @@ static void read_input(struct sqdb *db) if (!auth_ok) { send_redirect(BLOB_STR("login.cgi"), id, url, BLOB_STR("auth"), username); + } else if ((1ULL << category) & entry.p.hard_block_categories) { + send_redirect(BLOB_STR("blocked.cgi"), id, url, get_category_name(db, category), username); } else if (((1ULL << category) & entry.p.block_categories) && - (!entry.p.hard_block_categories) && (now < entry.override_time || now > entry.override_time + FILTER_OVERRIDE_TIMEOUT)) { send_redirect(BLOB_STR("warning.cgi"), id, url, get_category_name(db, category), username); - } else if ((1ULL << category) & entry.p.hard_block_categories) { - send_redirect(BLOB_STR("blocked.cgi"), id, url, get_category_name(db, category), username); } else send_ok(id, get_category_name(db, category), !!((1ULL << category) & entry.p.block_categories)); diff --git a/www/blocked.cgi b/www/blocked.cgi index e08d47d..e08d47d 100644..100755 --- a/www/blocked.cgi +++ b/www/blocked.cgi |