reports/plugin_formatters/xml/cookie_collector.rb in arachni-0.4.0.4 vs reports/plugin_formatters/xml/cookie_collector.rb in arachni-0.4.1

@@ -1,65 +1,45 @@
 =begin
-                  Arachni
-  Copyright (c) 2010-2012 Tasos "Zapotek" Laskos <[e-mail]>
+    Copyright 2010-2012 Tasos Laskos <[e-mail]>
 
-  This is free software; you can copy and distribute and modify
-  this program under the term of the GPL v2.0 License
-  (See LICENSE file for details)
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
 
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 =end
 
-module Arachni
+class Arachni::Reports::XML
 
-require Arachni::Options.instance.dir['reports'] + '/xml/buffer.rb'
+#
+# XML formatter for the results of the CookieCollector plugin
+#
+# @author Tasos "Zapotek" Laskos <[e-mail]>
+#
+class PluginFormatters::CookieCollector < Arachni::Plugin::Formatter
+    include Buffer
 
-module Reports
+    def run
+        results.each_with_index do |result, i|
+            start_tag 'response'
 
-class XML
-module PluginFormatters
+            simple_tag( 'time', result[:time].to_s )
+            simple_tag( 'url', result[:res]['effective_url'] )
 
-    #
-    # XML formatter for the results of the CookieCollector plugin
-    #
-    # @author: Tasos "Zapotek" Laskos
-    #                                      <[e-mail]>
-    #                                      <[e-mail]>
-    # @version: 0.1
-    #
-    class CookieCollector < Arachni::Plugin::Formatter
+            start_tag 'cookies'
+            result[:cookies].each { |name, value| add_cookie( name, value ) }
+            end_tag 'cookies'
 
-        include Buffer
-
-        def run
-            start_tag( 'cookie_collector' )
-            simple_tag( 'description', @description )
-
-            start_tag( 'results' )
-            @results.each_with_index {
-                |result, i|
-
-                start_tag( 'response' )
-                simple_tag( 'time', result[:time].to_s )
-                simple_tag( 'url', result[:res]['effective_url'] )
-
-                start_tag( 'cookies' )
-                result[:cookies].each_pair{
-                    |name, value|
-                    add_cookie( name, value )
-                }
-                end_tag( 'cookies' )
-                end_tag( 'response' )
-            }
-            end_tag( 'results' )
-
-            end_tag( 'cookie_collector' )
-
-            return buffer( )
+            end_tag 'response'
         end
 
+        buffer
     end
-
-end
-end
 
 end
 end