From 640ba5d744deaf147d980b2a5a94e2d80574a884 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 22 Feb 2011 14:19:39 +0000 Subject: [PATCH] minor refactoring --- plugins/generic/enumeration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py index 7adcfb512..af9448717 100644 --- a/plugins/generic/enumeration.py +++ b/plugins/generic/enumeration.py @@ -1287,10 +1287,10 @@ class Enumeration: entriesCount = 0 - if isTechniqueAvailable(PAYLOAD.TECHNIQUE.UNION) or isTechniqueAvailable(PAYLOAD.TECHNIQUE.ERROR) or conf.direct: + if any([isTechniqueAvailable(PAYLOAD.TECHNIQUE.UNION), isTechniqueAvailable(PAYLOAD.TECHNIQUE.ERROR), conf.direct]): entries = [] - if Backend.getIdentifiedDbms() == DBMS.MYSQL and isTechniqueAvailable(PAYLOAD.TECHNIQUE.ERROR) and conf.groupConcat: + if all([Backend.getIdentifiedDbms() == DBMS.MYSQL, isTechniqueAvailable(PAYLOAD.TECHNIQUE.ERROR), conf.groupConcat]): randStr, randStr2 = randomStr(), randomStr() filterFunction = "REPLACE(REPLACE(IFNULL(%s, ' '),'%s','%s'),'%s','%s')"\ % ('%s', CONCAT_VALUE_DELIMITER, randStr, CONCAT_ROW_DELIMITER, randStr2)