Minor bug fix and layout adjustment regarding --threading and standard output

lib/core/common.py

@@ -500,9 +500,13 @@ def checkFile(filename):
 
     if not os.path.exists(filename):
         raise sqlmapFilePathException, "unable to read file '%s'" % filename
-    
-def replaceNewlineTabs(inpStr):
-    replacedString = inpStr.replace("\n", "__NEWLINE__").replace("\t", "__TAB__")
+
+def replaceNewlineTabs(inpStr, stdout=False):
+    if stdout:
+        replacedString = inpStr.replace("\n", " ").replace("\t", " ")
+    else:
+        replacedString = inpStr.replace("\n", "__NEWLINE__").replace("\t", "__TAB__")
+
     replacedString = replacedString.replace(temp.delimiter, "__DEL__")
 
     return replacedString

lib/core/dump.py

@@ -70,7 +70,7 @@ class Dump:
             data = data.replace("__DEL__", ", ")
 
             if "\n" in data:
-                self.__write("%s:\n---\n%s---\n" % (header, data))
+                self.__write("%s:\n---\n%s\n---\n" % (header, data))
             else:
                 self.__write("%s:    '%s'\n" % (header, data))
         else: