From 8633cd909eec2f54a5eecb25c5f15f00742e045b Mon Sep 17 00:00:00 2001 From: HD Moore Date: Mon, 16 Oct 2006 05:51:54 +0000 Subject: [PATCH] Cleaned up the views git-svn-id: file:///home/svn/framework3/trunk@4039 4d416f70-5f16-0410-b530-b9f4589650da --- data/msfweb/app/views/auxiliaries/view.rhtml | 61 ++++++++----------- data/msfweb/app/views/encoders/view.rhtml | 62 +++++++++++--------- data/msfweb/app/views/exploits/view.rhtml | 2 + data/msfweb/app/views/nops/view.rhtml | 62 +++++++++++--------- data/msfweb/app/views/payloads/view.rhtml | 58 ++++++++++-------- 5 files changed, 128 insertions(+), 117 deletions(-) diff --git a/data/msfweb/app/views/auxiliaries/view.rhtml b/data/msfweb/app/views/auxiliaries/view.rhtml index 9fe2bd3b9b..f9eedc5eec 100644 --- a/data/msfweb/app/views/auxiliaries/view.rhtml +++ b/data/msfweb/app/views/auxiliaries/view.rhtml @@ -1,57 +1,46 @@ - - - +
+ +

- - <%= module_platform_icons(@tmod.platform) %> - - <%= html_escape(@tmod.name) %> + <%= h(@tmod.name) %>

- -
-

- <%= html_escape(@tmod.description) %> -

-
- - - +
-

- This module was provided by <%= @tmod.author.join(' and ') %>. +

+ <%= h(@tmod.description) %>

- - - - - - - - - - - <% if @tmod.references.size > 0 %> - + +
-

+

+ This module (revision <%= h @tmod.version.gsub(/\$Revision:\s+|\s+\$/, '') %>) was provided by <%= h @tmod.author.map{ |a| a.to_s.gsub(/\<.*/, '') }.join(' and ').strip %>, under the <%= @tmod.license %>. +

+
+ + + <% if (@tmod.references.length > 0) %> + +
+

External references: -

- <% end %> + <% end %> -
Version:<%= @tmod.version %>
License:<%= @tmod.license %>
\ No newline at end of file + diff --git a/data/msfweb/app/views/encoders/view.rhtml b/data/msfweb/app/views/encoders/view.rhtml index 72205fa6a3..f9eedc5eec 100644 --- a/data/msfweb/app/views/encoders/view.rhtml +++ b/data/msfweb/app/views/encoders/view.rhtml @@ -1,40 +1,46 @@ - - - +
+ +

- <%= html_escape(@tmod.name) %> + <%= h(@tmod.name) %>

- -
-

- <%= html_escape(@tmod.description) %> -

-
- - - +
-

- This module was provided by <%= @tmod.author.join(' and ') %>. +

+ <%= h(@tmod.description) %>

- - - + + +
+

+ This module (revision <%= h @tmod.version.gsub(/\$Revision:\s+|\s+\$/, '') %>) was provided by <%= h @tmod.author.map{ |a| a.to_s.gsub(/\<.*/, '') }.join(' and ').strip %>, under the <%= @tmod.license %>. +

+
- - - - + + <% if (@tmod.references.length > 0) %> + +
+

+ External references: +

+

+
+ <% end %> - - - - - -
Version:<%= @tmod.version %>
License:<%= @tmod.license %>
Architecture:<%= @tmod.arch %>
\ No newline at end of file + diff --git a/data/msfweb/app/views/exploits/view.rhtml b/data/msfweb/app/views/exploits/view.rhtml index de68ed0e92..a10ee913e7 100644 --- a/data/msfweb/app/views/exploits/view.rhtml +++ b/data/msfweb/app/views/exploits/view.rhtml @@ -23,6 +23,7 @@ + <% if (@tmod.references.length > 0) %>

@@ -40,6 +41,7 @@

+ <% end %>
diff --git a/data/msfweb/app/views/nops/view.rhtml b/data/msfweb/app/views/nops/view.rhtml index 72205fa6a3..f9eedc5eec 100644 --- a/data/msfweb/app/views/nops/view.rhtml +++ b/data/msfweb/app/views/nops/view.rhtml @@ -1,40 +1,46 @@ - - - +
+ +

- <%= html_escape(@tmod.name) %> + <%= h(@tmod.name) %>

- -
-

- <%= html_escape(@tmod.description) %> -

-
- - - +
-

- This module was provided by <%= @tmod.author.join(' and ') %>. +

+ <%= h(@tmod.description) %>

- - - + + +
+

+ This module (revision <%= h @tmod.version.gsub(/\$Revision:\s+|\s+\$/, '') %>) was provided by <%= h @tmod.author.map{ |a| a.to_s.gsub(/\<.*/, '') }.join(' and ').strip %>, under the <%= @tmod.license %>. +

+
- - - - + + <% if (@tmod.references.length > 0) %> + +
+

+ External references: +

    + <% @tmod.references.each { |ref| %> + <% if (ref.kind_of?(Msf::Module::SiteReference)) %> +
  • + <%= h(ref.to_s) %>
    • + <% else %> +
  • <%= h(ref.to_s) %>
    • + <% end %> + <% } %> +
+

+
+ <% end %> - - - - - -
Version:<%= @tmod.version %>
License:<%= @tmod.license %>
Architecture:<%= @tmod.arch %>
\ No newline at end of file + diff --git a/data/msfweb/app/views/payloads/view.rhtml b/data/msfweb/app/views/payloads/view.rhtml index 6e11439ece..cc2326b670 100644 --- a/data/msfweb/app/views/payloads/view.rhtml +++ b/data/msfweb/app/views/payloads/view.rhtml @@ -1,40 +1,48 @@ - +

- - <%= module_platform_icons(@tmod.platform) %> - - <%= html_escape(@tmod.name) %> + <%= h(@tmod.name) %>

- -
-

- <%= html_escape(@tmod.description) %> -

-
- - - +
-

- This module was provided by <%= @tmod.author.join(' and ') %>. +

+ <%= h(@tmod.description) %>

- - - + + +
+

+ This module (revision <%= h @tmod.version.gsub(/\$Revision:\s+|\s+\$/, '') %>) was provided by <%= h @tmod.author.map{ |a| a.to_s.gsub(/\<.*/, '') }.join(' and ').strip %>, under the <%= @tmod.license %>. +

+
- - - - + + <% if (@tmod.references.length > 0) %> + +
+

+ External references: +

    + <% @tmod.references.each { |ref| %> + <% if (ref.kind_of?(Msf::Module::SiteReference)) %> +
  • + <%= h(ref.to_s) %>
    • + <% else %> +
  • <%= h(ref.to_s) %>
    • + <% end %> + <% } %> +
+

+
- + <% end %> + @@ -133,4 +141,4 @@ <% end %> -
Version:<%= @tmod.version %>
License:<%= @tmod.license %>
Size: <%= @tmod.generate.length %>
\ No newline at end of file +