rolling back

git-svn-id: https://beef.googlecode.com/svn/trunk@968 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
This commit is contained in:
wade@bindshell.net
2011-05-12 02:10:01 +00:00
parent 129a9caff6
commit 27c32f9d28
6 changed files with 4 additions and 87 deletions

View File

@@ -513,16 +513,8 @@ class Modules < BeEF::Extension::AdminUI::HttpController
resultsdb = BeEF::Core::Models::Result.all(:command_id => command_id)
raise WEBrick::HTTPStatus::BadRequest, "Command id result is nil" if resultsdb.nil?
resultsdb.each{ |result|
begin
r = JSON.parse(result.data)
results.push({'date' => result.date, 'data' => BeEF::Renderers::HTML.render('basic', r['type'], r['data'])})
rescue JSON::ParserError => e
print_debug "Invalid JSON on command_id: #{command_id}"
print_error "Unable to JSON parse result set from database"
end
}
resultsdb.each{ |result| results.push({'date' => result.date, 'data' => JSON.parse(result.data)}) }
@body = {
'success' => 'true',
'command_module_name' => command_module.name,