Hide switch -x (XML output format) as it is incomplete and bugged and won't make it for 0.9 stable

This commit is contained in:
Bernardo Damele 2011-02-27 12:17:41 +00:00
parent 60605b6e7c
commit 6e8ebd35f4
4 changed files with 11 additions and 14 deletions

View File

@ -145,9 +145,9 @@ optDict = {
}, },
"General": { "General": {
"xmlFile": "string", #"xmlFile": "string",
"sessionFile": "string",
"trafficFile": "string", "trafficFile": "string",
"sessionFile": "string",
"flushSession": "boolean", "flushSession": "boolean",
"forms": "boolean", "forms": "boolean",
"eta": "boolean", "eta": "boolean",

View File

@ -238,7 +238,7 @@ def __createDumpDir():
os.makedirs(conf.dumpPath, 0755) os.makedirs(conf.dumpPath, 0755)
def __configureDumper(): def __configureDumper():
if conf.xmlFile: if hasattr(conf, 'xmlFile') and conf.xmlFile:
conf.dumper = xmldumper conf.dumper = xmldumper
else: else:
conf.dumper = dumper conf.dumper = dumper

View File

@ -432,17 +432,17 @@ def cmdLineParser():
general = OptionGroup(parser, "General", "These options can be used " general = OptionGroup(parser, "General", "These options can be used "
"to set some general working parameters. " ) "to set some general working parameters. " )
general.add_option("-x", dest="xmlFile", #general.add_option("-x", dest="xmlFile",
help="Dump the data into an XML file") # help="Dump the data into an XML file")
general.add_option("-s", dest="sessionFile",
help="Save and resume all data retrieved "
"on a session file")
general.add_option("-t", dest="trafficFile", general.add_option("-t", dest="trafficFile",
help="Log all HTTP traffic into a " help="Log all HTTP traffic into a "
"textual file") "textual file")
general.add_option("-s", dest="sessionFile",
help="Save and resume all data retrieved "
"on a session file")
general.add_option("--flush-session", dest="flushSession", general.add_option("--flush-session", dest="flushSession",
action="store_true", default=False, action="store_true", default=False,
help="Flush session file for current target") help="Flush session file for current target")

View File

@ -478,15 +478,12 @@ regType =
# These options can be used to set some general working parameters. # These options can be used to set some general working parameters.
[General] [General]
# Dump the data into an XML file. # Log all HTTP traffic into a textual file.
xmlFile = trafficFile =
# Save and resume all data retrieved on a session file. # Save and resume all data retrieved on a session file.
sessionFile = sessionFile =
# Log all HTTP traffic into a textual file.
trafficFile =
# Flush session file for current target. # Flush session file for current target.
# Valid: True or False # Valid: True or False
flushSession = False flushSession = False