summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/squark-filter.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/squark-filter.c b/src/squark-filter.c
index a5d4013..88e8a37 100644
--- a/src/squark-filter.c
+++ b/src/squark-filter.c
@@ -418,10 +418,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.block_categories) &&
+ (!entry.p.hard_block_categories) &&
(now < entry.override_time ||
- now > entry.override_time + FILTER_OVERRIDE_TIMEOUT ||
- ((1ULL << category) & entry.p.hard_block_categories))) {
+ 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));