Merge branch 'master' of https://github.com/trustedsec/social-engineer-toolkit

src/core/fasttrack.py

@@ -162,7 +162,7 @@ try:
                         if sql != "":
                             print(sql)
 
-		    if len(sql_servers) > 2:
+                    if len(sql_servers) > 2:
                         print_status("By pressing enter, you will begin the brute force process on all SQL accounts identified in the list above.")
                         test = input("Press {enter} to begin the brute force process.")
                     for servers in sql_servers:

src/core/set.py

@@ -1182,10 +1182,11 @@ and send the QRCode via a mailer.
 
             except ImportError:
                 print_error(
-                    "This module requires python-imaging to work properly.")
-                print_error("In Ubuntu do apt-get install python-imaging")
+                    "This module requires PIL (Or Pillow) and qrcode to work properly.")
                 print_error(
-                    "Else refer to here for installation: http://code.google.com/appengine/docs/python/images/installingPIL.html")
+                    "Just do pip install Pillow; pip install qrcode")
+                print_error(
+                    "Else refer to here for installation: http://pillow.readthedocs.io/en/3.3.x/installation.html")
                 return_continue()
 
         # Main Menu choice 9: PowerShell Attacks

src/teensy/teensy.py

@@ -83,7 +83,7 @@ with open(os.path.join(core.setdir + "teensy")) as fileopen:
 
 
 def writefile(filename, now):
-    with open(os.path.join("src/teensy" + filename)) as fileopen, \
+    with open(os.path.join("src/teensy/" + filename)) as fileopen, \
             open(os.path.join(core.setdir + "/reports/teensy_{0}.pde".format(now)), "w") as filewrite:
 
         for line in fileopen: