diff --git a/lib/core/gui.py b/lib/core/gui.py index 66c0abfd0..eee1561eb 100644 --- a/lib/core/gui.py +++ b/lib/core/gui.py @@ -86,8 +86,13 @@ def runGui(parser): tk.Label(frame).grid(column=0, row=0, sticky=tk.W) row = 1 + if group.get_description(): + tk.Label(frame, text="%s:" % group.get_description()).grid(column=0, row=1, columnspan=3, sticky=tk.W) + tk.Label(frame).grid(column=0, row=2, sticky=tk.W) + row += 2 + for option in group.option_list: - tk.Label(frame, text=parser.formatter._format_option_strings(option)).grid(column=0, row=row, sticky=tk.W) + tk.Label(frame, text="%s " % parser.formatter._format_option_strings(option)).grid(column=0, row=row, sticky=tk.W) if option.type == "string": widget = tk.Entry(frame) @@ -107,8 +112,7 @@ def runGui(parser): if hasattr(widget, "insert"): widget.insert(0, default) - tk.Label(frame, text=" ").grid(column=3, row=row, sticky=tk.W) - tk.Label(frame, text=option.help).grid(column=4, row=row, sticky=tk.W) + tk.Label(frame, text=" %s" % option.help).grid(column=2, row=row, sticky=tk.W) row += 1 diff --git a/lib/core/settings.py b/lib/core/settings.py index e7718d3cc..a27cc6cc4 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -18,7 +18,7 @@ from lib.core.enums import OS from thirdparty.six import unichr as _unichr # sqlmap version (...) -VERSION = "1.3.11.85" +VERSION = "1.3.11.86" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py index d0ea1365a..2179f905a 100644 --- a/lib/parse/cmdline.py +++ b/lib/parse/cmdline.py @@ -411,7 +411,7 @@ def cmdLineParser(argv=None): help="Perform an extensive DBMS version fingerprint") # Enumeration options - enumeration = parser.add_argument_group("Enumeration", "These options can be used to enumerate the back-end database management system information, structure and data contained in the tables. Moreover you can run your own SQL statements") + enumeration = parser.add_argument_group("Enumeration", "These options can be used to enumerate the back-end database management system information, structure and data contained in the tables") enumeration.add_argument("-a", "--all", dest="getAll", action="store_true", help="Retrieve everything")