Removing --disable... switches and making changes in default choice(s) for respectable sections

plugins/generic/enumeration.py

@@ -1073,7 +1073,7 @@ class Enumeration:
                 logger.error(errMsg)
                 bruteForce = True
 
-        if bruteForce or colList and conf.disableLike:
+        if bruteForce or colList:
             resumeAvailable = False
 
             for tbl in tblList:
@@ -1785,9 +1785,7 @@ class Enumeration:
                     kb.data.dumpedTable["__infos__"] = {"count": entriesCount,
                                                         "table": safeSQLIdentificatorNaming(tbl, True),
                                                         "db": safeSQLIdentificatorNaming(conf.db)}
-                    if not conf.disableHash:
-                        attackDumpedTable()
-
+                    attackDumpedTable()
                     conf.dumper.dbTableValues(kb.data.dumpedTable)
 
             except sqlmapConnectionException, e:

plugins/generic/misc.py

@@ -176,10 +176,10 @@ class Miscellaneous:
 
     def likeOrExact(self, what):
         message = "do you want sqlmap to consider provided %s(s):\n" % what
-        message += "[1] as LIKE %s names (default)\n" % what
-        message += "[2] as exact %s names" % what
+        message += "[1] as LIKE %s names\n" % what
+        message += "[2] as exact %s names (default)" % what
 
-        choice = readInput(message, default='1') if not conf.disableLike else '2'
+        choice = readInput(message, default='2')
 
         if not choice or choice == '1':
             choice = '1'