From 81d1a767acb608ddcc53eb5f6417ab16e40df66c Mon Sep 17 00:00:00 2001
From: Bernardo Damele <bernardo.damele@gmail.com>
Date: Wed, 20 May 2009 13:56:23 +0000
Subject: [PATCH] Minor bug fix in output manager (dumper) object

---
 doc/THANKS       |  9 ++++++---
 lib/core/dump.py | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/doc/THANKS b/doc/THANKS
index 0732ae370..892c65747 100644
--- a/doc/THANKS
+++ b/doc/THANKS
@@ -23,9 +23,12 @@ Karl Chen <quarl@cs.berkeley.edu>
     for providing with the multithreading patch for the inference
     algorithm
 
-Pierre Chifflier <pollux@debian.org>
-    for uploading the sqlmap 0.6.2 Debian package to the official Debian
-    project repository
+Y P Chien <ypchien@cox.net>
+    for reporting a minor bug
+
+Pierre Chifflier <pollux@debian.org> and Mark Hymers <ftpmaster@debian.org>
+    for uploading and accepting the sqlmap Debian package to the official
+    Debian project repository
 
 Ulises U. Cune <ulises2k@gmail.com>
     for reporting a bug
diff --git a/lib/core/dump.py b/lib/core/dump.py
index 61970e119..fe7f222af 100644
--- a/lib/core/dump.py
+++ b/lib/core/dump.py
@@ -237,8 +237,8 @@ class Dump:
 
         for column in columns:
             if column != "__infos__":
-                info = tableValues[column]
-                lines = "-" * (int(info["length"]) + 2)
+                info       = tableValues[column]
+                lines      = "-" * (int(info["length"]) + 2)
                 separator += "+%s" % lines
 
         separator += "+"
@@ -253,19 +253,21 @@ class Dump:
 
         for column in columns:
             if column != "__infos__":
-                info = tableValues[column]
+                info      = tableValues[column]
                 maxlength = int(info["length"])
-                blank = " " * (maxlength - len(column))
+                blank     = " " * (maxlength - len(column))
+
                 self.__write("| %s%s" % (column, blank), n=False)
 
                 if not conf.multipleTargets and field == fields:
                     dataToDumpFile(dumpFP, "\"%s\"" % column)
-                else:
+                elif not conf.multipleTargets:
                     dataToDumpFile(dumpFP, "\"%s\"," % column)
 
                 field += 1
 
         self.__write("|\n%s" % separator)
+
         if not conf.multipleTargets:
             dataToDumpFile(dumpFP, "\n")
 
@@ -284,14 +286,15 @@ class Dump:
                     blank = " " * (maxlength - len(value))
                     self.__write("| %s%s" % (value, blank), n=False)
 
-                    if field == fields:
+                    if not conf.multipleTargets and field == fields:
                         dataToDumpFile(dumpFP, "\"%s\"" % value)
-                    else:
+                    elif not conf.multipleTargets:
                         dataToDumpFile(dumpFP, "\"%s\"," % value)
 
                     field += 1
 
             self.__write("|")
+
             if not conf.multipleTargets:
                 dataToDumpFile(dumpFP, "\n")