From 16866119b8a61628fcacfcad8605235f1f85f251 Mon Sep 17 00:00:00 2001
From: stamparm <miroslav.stampar@gmail.com>
Date: Tue, 30 Apr 2013 14:11:56 +0200
Subject: [PATCH] Another minor update

---
 lib/core/optiondict.py |  8 ++++----
 lib/parse/cmdline.py   | 28 ++++++++++++++--------------
 sqlmap.conf            | 32 ++++++++++++++++----------------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index 5c3a6c1b2..f393f429d 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -38,6 +38,10 @@ optDict = {
                                "proxy":             "string",
                                "pCred":             "string",
                                "ignoreProxy":       "boolean",
+                               "tor":               "boolean",
+                               "torPort":           "integer",
+                               "torType":           "string",
+                               "checkTor":          "boolean",
                                "delay":             "float",
                                "timeout":           "float",
                                "retries":           "integer",
@@ -173,7 +177,6 @@ optDict = {
                                "trafficFile":       "string",
                                "batch":             "boolean",
                                "charset":           "string",
-                               "checkTor":          "boolean",
                                "crawlDepth":        "integer",
                                "csvDel":            "string",
                                "dumpFormat":        "string",
@@ -187,9 +190,6 @@ optDict = {
                                "pivotColumn":       "string",
                                "saveCmdline":       "boolean",
                                "updateAll":         "boolean",
-                               "tor":               "boolean",
-                               "torPort":           "integer",
-                               "torType":           "string",
                              },
 
             "Miscellaneous": {
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index 97a281f17..0c2aa4151 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -127,6 +127,20 @@ def cmdLineParser():
         request.add_option("--ignore-proxy", dest="ignoreProxy", action="store_true",
                            help="Ignore system default HTTP proxy")
 
+        request.add_option("--tor", dest="tor",
+                                  action="store_true",
+                                  help="Use Tor anonymity network")
+
+        request.add_option("--tor-port", dest="torPort",
+                                  help="Set Tor proxy port other than default")
+
+        request.add_option("--tor-type", dest="torType",
+                                  help="Set Tor proxy type (HTTP (default), SOCKS4 or SOCKS5)")
+
+        request.add_option("--check-tor", dest="checkTor",
+                                  action="store_true",
+                                  help="Check to see if Tor is used properly")
+
         request.add_option("--delay", dest="delay", type="float",
                            help="Delay in seconds between each HTTP request")
 
@@ -541,10 +555,6 @@ def cmdLineParser():
         general.add_option("--charset", dest="charset",
                             help="Force character encoding used for data retrieval")
 
-        general.add_option("--check-tor", dest="checkTor",
-                                  action="store_true",
-                                  help="Check to see if Tor is used properly")
-
         general.add_option("--crawl", dest="crawlDepth", type="int",
                                   help="Crawl the website starting from the target URL")
 
@@ -591,16 +601,6 @@ def cmdLineParser():
                             action="store_true",
                             help="Save options to a configuration INI file")
 
-        general.add_option("--tor", dest="tor",
-                                  action="store_true",
-                                  help="Use Tor anonymity network")
-
-        general.add_option("--tor-port", dest="torPort",
-                                  help="Set Tor proxy port other than default")
-
-        general.add_option("--tor-type", dest="torType",
-                                  help="Set Tor proxy type (HTTP (default), SOCKS4 or SOCKS5)")
-
         general.add_option("--update", dest="updateAll",
                             action="store_true",
                             help="Update sqlmap")
diff --git a/sqlmap.conf b/sqlmap.conf
index dbe0cc417..259a834f4 100644
--- a/sqlmap.conf
+++ b/sqlmap.conf
@@ -98,6 +98,22 @@ pCred =
 # Valid: True or False
 ignoreProxy = False
 
+# Use Tor anonymity network.
+# Valid: True or False
+tor = False
+
+# Set Tor proxy port other than default.
+# Valid: integer
+# torPort =
+
+# Set Tor proxy type.
+# Valid: HTTP, SOCKS4, SOCKS5
+torType = HTTP
+
+# Check to see if Tor is used properly.
+# Valid: True or False
+checkTor = False
+
 # Delay in seconds between each HTTP request.
 # Valid: float
 # Default: 0
@@ -591,10 +607,6 @@ batch = False
 # Force character encoding used for data retrieval.
 charset = 
 
-# Check to see if Tor is used properly.
-# Valid: True or False
-checkTor = False
-
 # Crawl the website starting from the target URL.
 # Valid: integer
 # Default: 0
@@ -639,18 +651,6 @@ parseErrors = False
 # Pivot column name.
 pivotColumn =
 
-# Use Tor anonymity network.
-# Valid: True or False
-tor = False
-
-# Set Tor proxy port other than default.
-# Valid: integer
-# torPort =
-
-# Set Tor proxy type.
-# Valid: HTTP, SOCKS4, SOCKS5
-torType = HTTP
-
 # Update sqlmap.
 # Valid: True or False
 updateAll = False