watobo 0.9.12 → 0.9.13

data/lib/watobo/gui/chatviewer_frame.rb

@@ -1,7 +1,7 @@
 # .
 # chatviewer_frame.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
 
     SEL_TYPE_GREP = 0
@@ -36,9 +37,27 @@ module Watobo
       end
 
       def setText(text, prefs={})
-        @text = text
+        normalized_text = text
+        if text.is_a? String
+           normalized_text = text.gsub(/[^[:print:]]/,".")
+        elsif text.respond_to? :has_body?
+          if text.content_type =~ /(html|xml)/
+            doc = Nokogiri::XML(text.body, &:noblanks)
+            fbody = doc.to_xhtml( indent:3, indent_text:" ")
+            normalized_text = text.headers.map{|h| h.strip }.join("\n")
+            normalized_text << "\n\n"
+            unless fbody.to_s.empty?
+            normalized_text << fbody.to_s
+            else
+              normalized_text = text
+            end
+          end
+        end
+        
+         @text = normalized_text
+        #@text = text
         @simple_text_view.max_len = @max_len
-        @simple_text_view.setText(text, prefs)
+        @simple_text_view.setText(@text, prefs)
         @match_pos_label.text = "0/0"
         @match_pos_label.textColor = 'grey'
 
@@ -348,12 +367,13 @@ module Watobo
 
       attr_accessor :max_len, :auto_filter
       def setText(text, prefs={})
-
+        
         @text = text
         @textviewer.max_len = @max_len
         index = @tabBook.current
 
         @viewers[index].setText(text)
+     #  @viewers.map{|v| v.setText(text)}
       # @textviewer.applyFilter if cp[:filter] == true
 
       end
@@ -419,6 +439,11 @@ module Watobo
         tab_frame = FXVerticalFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
         @hexViewer = HexViewer.new(tab_frame)
         @viewers << @hexViewer
+        
+         FXTabItem.new(@tabBook, "HTML", nil)
+       
+        @html_viewer = HTMLViewerFrame.new(@tabBook, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
+        @viewers << @html_viewer
       end
 
     end

data/lib/watobo/gui/checkboxtree.rb

@@ -1,7 +1,7 @@
 # .
 # checkboxtree.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -33,7 +33,8 @@ if $0 == __FILE__
 
 end
 
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class CheckBoxTreeItem < FXTreeItem
       attr_accessor :checked
@@ -156,14 +157,13 @@ module Watobo
         self.setItemClosedIcon(parent, icon)
       end
 
-     def getCheckedData(item = nil, data = nil)
-        data = [] if !data
-        item = self if !item
-        item.each do |c|
-          getCheckedData(c, data) if c.numChildren > 0
-          data.push c.data if self.itemLeaf?(c) and c.checked
+     def getCheckedData(root = self)
+        @selected = [] if root == self
+        root.each do |c|
+          getCheckedData(c) if c.numChildren > 0
+          @selected << c.data if self.itemLeaf?(c) and c.checked
         end
-        data
+        @selected
       end
 
       def checkAll
@@ -271,7 +271,8 @@ end
 ##########################
 
 if $0 == __FILE__
-  module Watobo
+  # @private 
+module Watobo#:nodoc: all
     module Gui
 
       @application ||= FXApp.new('LayoutTester', 'FoxTest')
@@ -311,8 +312,8 @@ if $0 == __FILE__
 
         def leave
           d = @cbtree.getCheckedData
-          puts d.class
-          puts d
+          #puts d.class
+          #puts d
           exit
         end
 

data/lib/watobo/gui/checks_policy_frame.rb

@@ -1,7 +1,7 @@
 # .
 # checks_policy_frame.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class ChecksPolicyFrame < FXVerticalFrame
      # attr :policy_name
@@ -46,7 +47,7 @@ module Watobo
           puts "unknown policy or unknown test [#{@policy}] - [#{check.class.to_s}"
           end
           a = {
-            :name => "#{check.info[:check_group]}|#{check.info[:check_name]}",
+            :name => "#{check.check_group}|#{check.check_name}",
             :enabled => status,
             :data => check
           }
@@ -59,11 +60,8 @@ module Watobo
       def set_checks(elements, policy={})
         tree_elements = []
         @checks.each do |check|
-          puts "--"
-          puts check.class
-                    
           a = {
-            :name => "#{check.info[:check_group]}|#{check.info[:check_name]}",
+            :name => "#{check.check_group}|#{check.check_name}",
             :enabled => false,
             :data => check
           }
@@ -87,11 +85,11 @@ module Watobo
       #sel.map { |i| p i.class }
       end
 
-      def initialize(parent, checks, policy=nil)
+      def initialize(parent, policy=nil)
         # Invoke base class initialize function first
         super(parent, :opts => LAYOUT_FILL_X| LAYOUT_FILL_Y, :padding => 0)
 
-         @checks = checks
+         @checks = Watobo::ActiveModules.to_a
         #@checks = Watobo.active_checks
 =begin        
         @policy_list = policy.is_a?(Hash) ? policy : default_policy(checks)         # policy settings
@@ -141,7 +139,7 @@ module Watobo
         #applyPolicy(@current_policy)
         #end
         #applyPolicy()
-        set_checks checks
+        set_checks @checks
       end
 
       private

data/lib/watobo/gui/client_cert_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # client_cert_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class ClientCertDialog < FXDialogBox
 
@@ -44,9 +45,10 @@ module Watobo
 
         @cert_path = nil
         @client_certificates = {}
-       #  @client_certificates = project.getClientCertificates unless project.getClientCertificates.nil?
-      #  puts client_certificates.to_yaml
-
+        
+        current_certs = Watobo.project.getClientCertificates
+        @client_certificates = current_certs unless current_certs.nil?
+      
         @password_policy.update prefs[:password_policy] if prefs.has_key? :password_policy
 
         @site_dt = FXDataTarget.new('')
@@ -125,7 +127,7 @@ module Watobo
         @sites_combo.clearItems
         @sites_combo.appendItem(NO_SELECTION, nil)
         @site_dt.value = NO_SELECTION
-        Watobo::Gui.project.listSites(:in_scope => @scope_only_cb.checked? ){ |site|
+        Watobo::Chats.sites(:in_scope => @scope_only_cb.checked? ){ |site|
           #puts "Site: #{site}"
           @sites_combo.appendItem(site, site)
         }

data/lib/watobo/gui/confirm_scan_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # confirm_scan_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -21,7 +21,8 @@
 # .
 require 'watobo/gui/conversation_table'
 
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class ConfirmScanDialog < FXDialogBox
 
@@ -44,7 +45,8 @@ module Watobo
         FXLabel.new(base_frame, "The following #{chatlist.length} chats will be scanned:")
 
         # @chatTable = ConversationTable.new(base_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-@chatTable = ConversationTable.new(base_frame)
+        puts chatlist.length
+        @chatTable = ConversationTable.new(base_frame)
         @chatTable.showConversation(chatlist)
 
         buttons_frame = FXHorizontalFrame.new(base_frame,