[pull] master from beefproject:master

core/main/autorun_engine/engine.rb

@@ -92,7 +92,7 @@ def trigger(rule_ids, hb_id)
                 :rule_token => rule_token,
                 :mod_body => wrapper,
                 :is_sent => false,
-                :rule_id => rule_id
+                :id => rule_id
             )
             are_exec.save!
             # Once Engine.check() verified that the hooked browser match a Rule, trigger the Rule ;-)

modules/social_engineering/pretty_theft/command.js

@@ -93,9 +93,9 @@ beef.execute(function() {
 			$j('#popup').remove();
 			$j('#darkenScreenObject').remove();
 
-		}else if((uname1.length == 0 || pass1.length == 0) && valcheck == "true"){
+		} else if((uname1.length == 0 || pass1.length == 0) && valcheck == "true") {
 			// If user has not entered any data, reset button
-			document.body.lastChild.getElementById("buttonpress").value = "false";
+			document.getElementById("buttonpress").value = "false";
 			alert("Please enter a valid username and password.");		
 		}
 	}