mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-02-16 19:40:37 +03:00
cleaner refactoring regarding last commit
This commit is contained in:
parent
401763b6f8
commit
8e7d360ea2
|
@ -308,15 +308,14 @@ def unionUse(expression, unpack=True, dump=False):
|
||||||
items = parseUnionPage(output)
|
items = parseUnionPage(output)
|
||||||
if isNoneValue(items):
|
if isNoneValue(items):
|
||||||
continue
|
continue
|
||||||
items = arrayizeValue(unArrayizeValue(items))
|
|
||||||
kb.locks.value.acquire()
|
kb.locks.value.acquire()
|
||||||
threadData.shared.value.append(items[0] if len(items) == 1 else items)
|
threadData.shared.value.append(unArrayizeValue(items))
|
||||||
kb.locks.value.release()
|
kb.locks.value.release()
|
||||||
else:
|
else:
|
||||||
items = output.replace(kb.chars.start, "").replace(kb.chars.stop, "").split(kb.chars.delimiter)
|
items = output.replace(kb.chars.start, "").replace(kb.chars.stop, "").split(kb.chars.delimiter)
|
||||||
|
|
||||||
if conf.verbose == 1:
|
if conf.verbose == 1:
|
||||||
status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join(map(lambda x: "\"%s\"" % x, items))))
|
status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join(map(lambda x: "\"%s\"" % x, arrayizeValue(items)))))
|
||||||
|
|
||||||
if len(status) > width:
|
if len(status) > width:
|
||||||
status = "%s..." % status[:width - 3]
|
status = "%s..." % status[:width - 3]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user