Update for Issue #118

lib/core/option.py

@@ -1330,9 +1330,9 @@ def __cleanupOptions():
     if conf.dbms:
         conf.dbms = conf.dbms.capitalize()
 
-    if conf.tstF:
-        if not any([char in conf.tstF for char in ('.', ')', '(', ']', '[')]):
-            conf.tstF = conf.tstF.replace('*', '.*')
+    if conf.testFilter:
+        if not any([char in conf.testFilter for char in ('.', ')', '(', ']', '[')]):
+            conf.testFilter = conf.testFilter.replace('*', '.*')
 
     if conf.timeSec not in kb.explicitSettings:
         if conf.tor:

lib/core/optiondict.py

@@ -194,7 +194,7 @@ optDict = {
                                "mobile":            "boolean",
                                "pageRank":          "boolean",
                                "smart":             "boolean",
-                               "tstF":              "string",
+                               "testFilter":        "string",
                                "wizard":            "boolean",
                                "verbose":           "integer"
                              },

lib/core/settings.py

@@ -519,3 +519,6 @@ BOLD_PATTERNS = ("' injectable", "might be injectable", "' is vulnerable", "is n
 
 # Generic www root directory names
 GENERIC_DOC_ROOT_DIRECTORY_NAMES = ("htdocs", "wwwroot", "www")
+
+# Maximum length of a help part containing switch/option name(s)
+MAX_HELP_OPTION_LENGTH = 18