diff --git a/plugins/editor.rb b/plugins/editor.rb index 9c3777a7a9..93edf8cb5e 100644 --- a/plugins/editor.rb +++ b/plugins/editor.rb @@ -17,7 +17,7 @@ class Plugin::Editor < Msf::Plugin # This class implements a single edit command. # ### - class ConsoleCommandDispatcher + class EditorCommandDispatcher include Msf::Ui::Console::CommandDispatcher # @@ -37,7 +37,7 @@ class Plugin::Editor < Msf::Plugin end # - # This method handles the sample command. + # This method handles the edit command. # def cmd_edit(*args) print_line ("Launching editor...") @@ -53,30 +53,23 @@ class Plugin::Editor < Msf::Plugin end end - # def initialize(framework, opts) super # console dispatcher commands. - add_console_dispatcher(ConsoleCommandDispatcher) + add_console_dispatcher(EditorCommandDispatcher) print_status("Editor plugin loaded.") end - # def cleanup - # If we had previously registered a console dispatcher with the console, - # deregister it now. remove_console_dispatcher('Editor') end - # - # def name "editor" end - # def desc "Simple Editor Plugin" end diff --git a/plugins/lab.rb b/plugins/lab.rb index 292886972f..7b70c0fb0a 100644 --- a/plugins/lab.rb +++ b/plugins/lab.rb @@ -1,4 +1,6 @@ # +# $Id$ +# $Revision$ # $:.unshift(File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib', 'lab')) @@ -125,8 +127,7 @@ class Plugin::Lab < Msf::Plugin def cmd_lab_save(*args) File.open(args[0], 'w') {|f| f.write(@controller.labdef.to_yaml) } - hlp_print_targets - + hlp_print_lab end