Added tag <epayload> to the payloads.xml's <test> tag to define which payload to use when exploiting the test type.

Removed some useless tests.
Moved <error> from queries.xml to payloads.xml as it makes more sense.
Beeps at sql inj found only if --beep is provided.
Minor fix in order to be able to pickle advancedDict() objects.
Minor code refactoring.
Removed useless folders.

lib/parse/payloads.py

@@ -14,6 +14,9 @@ from lib.core.data import paths
 from lib.core.datatype import advancedDict
 
 def cleanupVals(values, tag):
+    if isinstance(values, basestring):
+        return values
+
     count = 0
 
     for value in values:
@@ -48,7 +51,7 @@ def parseXmlNode(node):
 
         for child in element.getchildren():
             if child.text and child.text.strip():
-                values = cleanupVals(child.text.split(','), child.tag)
+                values = cleanupVals(child.text.split(',') if child.tag != "epayload" else child.text, child.tag)
                 test[child.tag] = values
             else:
                 if len(child.getchildren()) == 0: