watobo 0.9.10 → 0.9.11

data/CHANGELOG

@@ -1,4 +1,13 @@
+= Version 0.9.11
+== NEW
+* [FileFinder] pimped the interface, added save-settings
+
+== Fixes
+* [ConversationTable] Request-/Resoponse View is updated when navigating with arrow-keys
+* [INTERCEPOR] fixed bug in parsing intercepted responses
+
 = Version 0.9.10
+== Fixes
 * fixed sqlmap temp directory
 
 = Version 0.9.9

data/lib/watobo/gui/interceptor_gui.rb

@@ -200,11 +200,27 @@ module Watobo
           notify(:error, "#{$!}")
         rescue => bang
           puts bang
+          puts bang.backtrace if $DEBUG
           notify(:error, "Could not parse request: #{$!}")
         end
 
         return nil
       end
+      
+      def to_response(prefs={})
+        begin
+          return @textbox.to_response(prefs)
+        rescue SyntaxError, LocalJumpError, NameError
+        #  puts bang
+        #  puts bang.backtrace if $DEBUG
+          notify(:error, "#{$!}")
+        rescue => bang
+        puts bang
+        notify(:error, "Could not parse request: #{$!}")
+        end
+
+        return nil
+      end
 
       private
 
@@ -547,6 +563,7 @@ module Watobo
         # request_frame = FXVerticalFrame.new(request_frame_outer, LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
         @requestbox = Watobo::Gui::InterceptEditor.new(request_frame_outer, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+        
 
         @response_tab = FXTabItem.new(@tabBook, "Response (0)", nil)
         response_frame_outer = FXVerticalFrame.new(@tabBook, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
@@ -646,8 +663,10 @@ module Watobo
               response = @response_list.first
               if not response.nil?
                 response[:response].clear
-                new_response = @responsebox.parseRequest(:update_content_length => true)
+                new_response = @responsebox.to_response(:update_content_length => true)
+                puts new_response.class
                 response[:response].concat new_response
+                puts new_response
                 response[:thread].run
                 @responsebox.clear
                 @response_list.shift
@@ -658,6 +677,7 @@ module Watobo
           rescue => bang
             puts "!!! Error"
             puts bang
+            puts bang.backtrace
           end
         end
 

data/lib/watobo/gui/main_window.rb

@@ -1147,6 +1147,9 @@ module Watobo
 
         self.icon = ICON_WATOBO
         self.show(PLACEMENT_MAXIMIZED)
+        
+        self.extend Watobo::Gui::Settings
+        
         self.connect(SEL_CLOSE, method(:onClose))
 
         @project = nil
@@ -1393,7 +1396,10 @@ module Watobo
         # R E Q U E S T I N F O
         requestInfo = FXVerticalFrame.new(@switcher, :opts => LAYOUT_FILL_X|LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         request_splitter = FXSplitter.new(requestInfo, :opts => LAYOUT_SIDE_TOP|SPLITTER_HORIZONTAL|LAYOUT_FILL_Y|LAYOUT_FILL_X|SPLITTER_TRACKING|SPLITTER_REVERSED)
-
+request_splitter.connect(SEL_COMMAND){
+  puts "Request Splitter Resized!"
+  
+}
 
         # C H A T  T A B L E  C O N T R O L L E R
         @conversation_table_ctrl = ConversationTableCtrl.new(request_splitter,  :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
@@ -1421,6 +1427,15 @@ module Watobo
           open_manual_request_editor(chat)
           end
         end
+        
+        @chatTable.connect(SEL_CHANGED){ |sender, sel, item|
+          #puts item.row
+           @chatTable.selectRow(item.row, false)
+           chatid = @chatTable.getRowText(item.row).to_i
+          chat = @project.getChat(chatid)
+          chat_selected(chat)
+
+        }
 
         @chatTable.connect(SEL_RIGHTBUTTONRELEASE) do |sender, sel, event|
           @findings_tree.killSelection()
@@ -1606,6 +1621,15 @@ module Watobo
         @request_viewer = Watobo::Gui::RequestViewer.new(chat_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         #  @request_viewer = Watobo::Gui::ChatViewer.new(chat_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         # @request_viewer.highlight_style = 1
+        
+        #
+        # SEL_CONFIGURE is fired when the window is resized
+        #@request_viewer.connect(SEL_CONFIGURE){ |sender, sel, ptr|
+        @chat_frame_splitter.connect(SEL_COMMAND){
+         # puts sender.class
+        #  puts sender.width 
+        puts @request_viewer.height
+          }
 
         # FXHorizontalSeparator.new(chat_frame, :opts => SEPARATOR_GROOVE|LAYOUT_FILL_X)
         chat_frame = FXVerticalFrame.new(@chat_frame_splitter, :opts => LAYOUT_FILL_X|FRAME_SUNKEN|LAYOUT_MIN_WIDTH, :padding => 0, :width=>400)
@@ -1672,6 +1696,24 @@ module Watobo
 
       # end
       private
+      
+      def chat_selected(chat)
+        begin
+          getApp().beginWaitCursor()
+          # purge viewers
+          @request_viewer.setText('')
+          @response_viewer.setText('')
+       
+               showChat(chat)
+          
+        rescue => bang
+          puts "!!!ERROR: chat_selected"
+          puts bang
+          puts "!!!"
+        ensure
+        getApp().endWaitCursor()
+        end
+      end
 
       def save_response
         unless @last_chat.nil?

data/lib/watobo/gui/mixins/gui_settings.rb

@@ -0,0 +1,51 @@
+# .
+# gui_settings.rb
+# 
+# Copyright 2012 by siberas, http://www.siberas.de
+# 
+# This file is part of WATOBO (Web Application Tool Box)
+#        http://watobo.sourceforge.com
+# 
+# WATOBO is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation version 2 of the License.
+# 
+# WATOBO is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with WATOBO; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# .
+module Watobo
+  module Gui
+    module Settings
+       def self.save_gui_settings(settings)
+        wd = Watobo.working_directory
+
+        dir_name = Watobo::Utils.snakecase self.class.to_s.gsub(/.*::/,'')
+        path = File.join(wd, "conf", "gui")
+        Dir.mkdir path unless File.exist? path
+        conf_dir = File.join(path, dir_name)
+        Dir.mkdir conf_dir unless File.exist? conf_dir
+        file = File.join(conf_dir, dir_name + "_settings.yml")
+        
+        Watobo::Utils.save_settings(file, config)
+      end
+
+      def load_gui_settings()
+        wd = Watobo.working_directory
+        dir_name = Watobo::Utils.snakecase self.class.to_s.gsub(/.*::/,'')
+        path = File.join(wd, "conf", "gui")
+        Dir.mkdir path unless File.exist? path
+        conf_dir = File.join(path, dir_name)
+        Dir.mkdir conf_dir unless File.exist? conf_dir
+        file = File.join(conf_dir, dir_name + "_settings.yml")
+        config = Watobo::Utils.load_settings(file)
+        config
+      end
+    end
+  end
+end

data/lib/watobo/gui/request_editor.rb

@@ -443,6 +443,7 @@ module Watobo
 
         return nil
       end
+      
 
       private
 

data/lib/watobo/gui/templates/plugin.rb

@@ -66,7 +66,9 @@ include Watobo::Gui
       end
 
       def initialize(owner, title, project, opts)
-        super(owner, title, :opts => DECOR_ALL,:width=>800, :height=>600)
+        dialog_opts = { :opts => DECOR_ALL, :width=>800, :height=>650  }
+        dialog_opts.update opts
+        super(owner, title, dialog_opts)
         # Implement Sender
         # Implement Scanner
         @icon = nil
@@ -75,6 +77,33 @@ include Watobo::Gui
         @event_dispatcher_listeners = Hash.new
 
       end
+      
+      private
+      
+      def save_config(config)
+        wd = Watobo.working_directory
+
+        dir_name = Watobo::Utils.snakecase self.class.to_s.gsub(/.*::/,'')
+        path = File.join(wd, "conf", "plugins")
+        Dir.mkdir path unless File.exist? path
+        conf_dir = File.join(path, dir_name)
+        Dir.mkdir conf_dir unless File.exist? conf_dir
+        file = File.join(conf_dir, dir_name + "_config.yml")
+        
+        Watobo::Utils.save_settings(file, config)
+      end
+
+      def load_config()
+        wd = Watobo.working_directory
+        dir_name = Watobo::Utils.snakecase self.class.to_s.gsub(/.*::/,'')
+        path = File.join(wd, "conf", "plugins")
+        Dir.mkdir path unless File.exist? path
+        conf_dir = File.join(path, dir_name)
+        Dir.mkdir conf_dir unless File.exist? conf_dir
+        file = File.join(conf_dir, dir_name + "_config.yml")
+        config = Watobo::Utils.load_settings(file)
+        config
+      end
     end
   end
 end

data/lib/watobo/gui.rb

@@ -119,6 +119,7 @@ Watobo::Gui.create_application
 
 require 'watobo/gui/utils/init_icons'
 require 'watobo/gui/mixins/subscriber'
+require 'watobo/gui/mixins/gui_settings'
 
 gui_path = File.expand_path(File.join(File.dirname(__FILE__), "gui"))
 

data/lib/watobo/mixins/request_parser.rb

@@ -129,7 +129,7 @@ module Watobo
          # result.extend Watobo::Mixin::Parser::Web10
          # result.extend Watobo::Mixin::Shaper::Web10
          Watobo::Request.create result
-
+        
           ct = result.content_type
           # last line is without "\r\n" if text has a body
           if ct =~ /multipart\/form/ and body then
@@ -173,11 +173,55 @@ module Watobo
             result.push "\r\n"
             result.push body.strip
           end
+ 
+          result.fixupContentLength() if options[:update_content_length] == true
+          puts ">>"
+          puts result
+          return result
+        rescue => bang
+          puts bang
+          puts bang.backtrace
+          raise bang
+        end
+        #return nil
+      end
+      
+      def to_response(opts={})
+        options = { :update_content_length => false }
+        options.update opts
+        begin
+          text = parse_code
+          result = []
+
+          if text =~ /\n\n/
+            dummy = text.split(/\n\n/)
+            header = dummy.shift.split(/\n/)
+            body = dummy.join("\n\n")
+          else
+            header = text.split(/\n/)
+            body = nil
+          end
+
+          header.each do |h|
+            result.push "#{h}\r\n"
+          end
 
+
+         Watobo::Response.create result
+        
+          if body then
+            result.push "\r\n"
+            result.push body.strip
+          end
+ 
           result.fixupContentLength() if options[:update_content_length] == true
+          puts ">>"
+          puts result
           return result
-        rescue
-          raise
+        rescue => bang
+          puts bang
+          puts bang.backtrace
+          raise bang
         end
         #return nil
       end

data/lib/watobo.rb

@@ -49,7 +49,7 @@ require 'watobo/framework'
 
 module Watobo
 
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 
   def self.base_directory
     @base_directory ||= ""

data/plugins/catalog/catalog.rb

@@ -294,7 +294,7 @@ about_txt.disable
 
         def initialize(owner, project)
           
-          super(owner, "Catalog Scanner", project, :opts => DECOR_ALL, :width=>800, :height=>400)
+          super(owner, "Catalog Scanner", project, :opts => DECOR_ALL, :width=>800, :height=>600)
           menu_bar = FXMenuBar.new(self, :opts => LAYOUT_SIDE_TOP|LAYOUT_FILL_X|FRAME_GROOVE)
           menu_pane = FXMenuPane.new(self)
           

data/plugins/filefinder/filefinder.rb

@@ -130,6 +130,65 @@ module Watobo
       class Filefinder < Watobo::Template::Plugin
         
           include Watobo::Constants
+        class DBSelectFrame < FXVerticalFrame
+          
+          def select_db(db_name)
+            @db_listbox.numItems.times do |i|
+              if db_name == @db_listbox.getItemData(i)
+                @db_listbox.currentItem = i
+              end
+            end            
+          end
+          
+          def get_db_name
+            i = @db_listbox.currentItem
+            db = ''
+            db = @db_listbox.getItemData(i) if i >= 0
+            db
+          end
+          
+          def get_db_list
+            l = []
+            @db_listbox.numItems.times do |i|
+              l << @db_listbox.getItemData(i)
+            end
+            l
+          end
+          
+          def initialize(parent, db_list, opts)
+            super(parent, opts)
+            @db_list = []
+            db_list.each do |f|
+              @db_list << f if File.exist? f
+            end
+           
+            FXLabel.new(self, "Each filename must be in a seperate line, e.g. DirBuster-DBs" )
+            frame = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X)
+            
+            @db_listbox = FXListBox.new(frame, :opts => LAYOUT_FILL_X|FRAME_SUNKEN|FRAME_THICK)
+            @db_list.each do |db|
+              item = @db_listbox.appendItem(db)
+              @db_listbox.setItemData(@db_listbox.numItems-1, db )
+            end
+            @db_listbox.numVisible = @db_listbox.numItems
+            
+            @add_db_btn = FXButton.new(frame, "add")
+            @add_db_btn.connect(SEL_COMMAND) { add_db }
+          end
+          
+          private
+          
+          def add_db
+            db_path = File.dirname(get_db_name)
+          db = FXFileDialog.getOpenFilename(self, "Open DB", db_path, "All Files (*)")
+          unless db.empty?
+            item = @db_listbox.appendItem(db)
+            i= @db_listbox.numItems-1
+              @db_listbox.setItemData(i, db )
+              @db_listbox.currentItem = i
+          end
+        end
+        end
         
         def updateView()
           #@project = project
@@ -167,7 +226,7 @@ module Watobo
         
         
         def initialize(owner, project)
-          super(owner, "File Finder", project, :opts => DECOR_ALL, :width=>800, :height=>400)
+          super(owner, "File Finder", project, :opts => DECOR_ALL, :width=>800, :height=>600)
           load_icon(__FILE__)
           
           self.connect(SEL_CLOSE, method(:onClose))
@@ -181,6 +240,28 @@ module Watobo
           
           @site = nil
           @dir = nil
+          @db_list = []
+          @db_name = ""
+          @file_name = ""
+          
+          config = load_config
+
+          
+          if config.respond_to? :has_key?
+          if config.has_key? :db_list
+            config[:db_list].each do |db|
+              @db_list << db if File.exist? db              
+            end
+          end
+          
+          if config.has_key? :name
+            @db_list.each do |db|
+              @db_name = db if config[:name] == db
+            end
+            @file_name = config[:name] if @db_name.empty?            
+          end
+          end
+          puts @db_list
           
           begin            
             hs_green = FXHiliteStyle.new
@@ -202,11 +283,15 @@ module Watobo
             top_splitter = FXSplitter.new(top_frame, LAYOUT_FILL_X|SPLITTER_HORIZONTAL|LAYOUT_FILL_Y|SPLITTER_TRACKING)
             log_frame = FXVerticalFrame.new(mr_splitter, :opts => LAYOUT_FILL_X|LAYOUT_SIDE_BOTTOM,:height => 100)
             
+            @settings_tab = FXTabBook.new(top_splitter, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y)
+             FXTabItem.new(@settings_tab, "Settings", nil)
+            @settings_frame = FXVerticalFrame.new(@settings_tab, :opts => LAYOUT_FILL_Y|LAYOUT_FILL_Y|FRAME_RAISED)
             
-            @settings_frame = FXVerticalFrame.new(top_splitter, :opts => LAYOUT_FILL_Y)
+            FXTabItem.new(@settings_tab, "Logging", nil)
+            @logging_frame = FXVerticalFrame.new(@settings_tab, :opts => LAYOUT_FILL_Y|LAYOUT_FILL_Y|FRAME_RAISED)
             
-             result_frame = FXVerticalFrame.new(top_splitter, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-             @requestCombo = FXComboBox.new(result_frame, 5, nil, 0,
+             request_frame = FXVerticalFrame.new(top_splitter, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+             @requestCombo = FXComboBox.new(request_frame, 5, nil, 0,
                                            COMBOBOX_STATIC|FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
             #@filterCombo.width =200
             
@@ -215,7 +300,7 @@ module Watobo
             @requestCombo.editable = false
             @requestCombo.connect(SEL_COMMAND, method(:onSelectRequest))
             
-            log_text_frame = FXVerticalFrame.new(result_frame, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding=>0)
+            log_text_frame = FXVerticalFrame.new(request_frame, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding=>0)
             @request_editor = RequestEditor.new(log_text_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
             
            #   @scope_only_cb = FXCheckButton.new(@settings_frame, "target scope only", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
@@ -246,50 +331,64 @@ module Watobo
             @test_all_dirs.setCheck(false)
             
             
-            @dbfile_dt = FXDataTarget.new('')
-            @dbfile_dt.value = ''
-            @db_path = File.expand_path(File.dirname(__FILE__))
-            @dbfile_label = FXLabel.new(@settings_frame, "Enter name of file or db-filename:" )
-            dbfile_frame = FXHorizontalFrame.new(@settings_frame,:opts => LAYOUT_FILL_X|LAYOUT_SIDE_TOP)
-            @dbfile_text = FXTextField.new(dbfile_frame, 20,
-                                           :target => @dbfile_dt, :selector => FXDataTarget::ID_VALUE,
-                                           :opts => TEXTFIELD_NORMAL|LAYOUT_FILL_COLUMN)
+            @finder_tab = FXTabBook.new(@settings_frame, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+            
+            FXTabItem.new(@finder_tab, "Filename", nil)
+            frame = FXVerticalFrame.new(@finder_tab, :opts => LAYOUT_FILL_X|FRAME_RAISED)
+            @search_name_dt = FXDataTarget.new(@file_name)
+           
+            @dbfile_text = FXTextField.new(frame, 30,
+                                           :target => @search_name_dt, :selector => FXDataTarget::ID_VALUE,
+                                           :opts => TEXTFIELD_NORMAL|LAYOUT_FILL_COLUMN|LAYOUT_FILL_X)
             @dbfile_text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-            @dbfile_btn = FXButton.new(dbfile_frame, "Change")
-            @dbfile_btn.connect(SEL_COMMAND, method(:selectDBFile))
             
+
+            FXTabItem.new(@finder_tab, "Database", nil)     
+            @db_select_frame = DBSelectFrame.new(@finder_tab, @db_list, :opts => FRAME_THICK|FRAME_RAISED|LAYOUT_FILL_X)
             
-                        @fmode_dt = FXDataTarget.new(0)
+            unless @db_name.empty?
+              @db_select_frame.select_db @db_name
+              @finder_tab.current = 1
+            end
+            
+            @fmode_dt = FXDataTarget.new(0)
             group_box = FXGroupBox.new(@settings_frame, "Mode", LAYOUT_SIDE_TOP|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
             mode_frame = FXVerticalFrame.new(group_box, :opts => LAYOUT_FILL_X)
-          
-@append_extensions_cb = FXCheckButton.new(mode_frame, "append extensions", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP|LAYOUT_RIGHT|LAYOUT_FILL_Y)           
-@append_slash_cb = FXCheckButton.new(mode_frame, "append /", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP|LAYOUT_RIGHT|LAYOUT_FILL_Y)
-            # group_box = FXGroupBox.new(self, "Collection",LAYOUT_SIDE_TOP|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0, 0, 0, 0)
-            # frame = FXVerticalFrame.new(group_box, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_GROOVE)
-            # @collectionList = FXList.new(frame, :opts => LIST_EXTENDEDSELECT|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-            #@fmode_dt.connect(SEL_COMMAND) {
-            #   @file_rb.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-            #   @dir_rb.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-            #}
-            #@dbfile_text.enabled = false
-            #@dbfile_label.enabled = false
-            #@dbfile_btn.disable
-            # @use_ssl = FXCheckButton.new(@settings_frame, "use SSL", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
-            
-            
-            #   @run_passive_checks = FXCheckButton.new(@settings_frame, "run passive checks", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
-            #   @run_passive_checks.setCheck(false)
-            gbox = FXGroupBox.new(@settings_frame, "Extensions", LAYOUT_SIDE_LEFT|FRAME_GROOVE|LAYOUT_FILL_X|LAYOUT_FILL_Y, 0, 0, 0, 150)
-            gbframe = FXVerticalFrame.new(gbox, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
-            @extensions_text = FXText.new(gbframe, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
-            ext = "bak;php;asp;aspx;tgz;tar.gz;gz;tmp;temp;old;_"
-         #   fxtext.backColor = fxtext.parent.backColor
-         #   fxtext.disable
-         #   text = "FileFinder allows you to search easily for specific files, e.g. files you have uploaded.\nIf you want to search for multiple files you can also use a db-file, "
-         #   text << "which is a plain text file - each filename on one line."
+            @append_slash_cb = FXCheckButton.new(mode_frame, "append /", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP|LAYOUT_FILL_Y)
+           
+            @append_extensions_cb = FXCheckButton.new(mode_frame, "append extensions", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP|LAYOUT_FILL_Y)
+            frame = FXVerticalFrame.new(mode_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
+            @extensions_text = FXText.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|TEXT_WORDWRAP)
+            ext = "bak;php;asp;aspx;tgz;tar.gz;gz;tmp;temp;old;_"        
             
             @extensions_text.setText(ext)
+            
+            frame = @logging_frame
+            @logScanChats = FXCheckButton.new(frame, "enable", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+            @logScanChats.checkState = false
+
+            @logScanChats.connect(SEL_COMMAND) do |sender, sel, item|
+              if @logScanChats.checked? then
+                @scanlog_name_text.enabled = true
+                @scanlog_name_text.backColor = FXColor::White
+              else
+                @scanlog_name_text.enabled = false
+                @scanlog_name_text.backColor = @scanlog_name_text.parent.backColor 
+              end
+            end
+
+            @scanlog_name_dt = FXDataTarget.new('')
+           # @scanlog_name_dt.value = @project.scanLogDirectory() if File.exist?(@project.scanLogDirectory())
+            @scanlog_dir_label = FXLabel.new(frame, "Scan Name:" )
+            scanlog_frame = FXHorizontalFrame.new(frame,:opts => LAYOUT_FILL_X|LAYOUT_SIDE_TOP)
+            @scanlog_name_text = FXTextField.new(scanlog_frame, 20,
+            :target => @scanlog_name_dt, :selector => FXDataTarget::ID_VALUE,
+            :opts => TEXTFIELD_NORMAL|LAYOUT_FILL_COLUMN|LAYOUT_FILL_X)
+            @scanlog_name_text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
+            unless @logScanChats.checked?
+              @scanlog_name_text.enabled = false
+              @scanlog_name_text.backColor = @scanlog_name_text.parent.backColor
+            end 
              
             
             @pbar = FXProgressBar.new(@settings_frame, nil, 0, LAYOUT_FILL_X|FRAME_SUNKEN|FRAME_THICK|PROGRESSBAR_HORIZONTAL)
@@ -304,15 +403,9 @@ module Watobo
             @start_button.connect(SEL_COMMAND, method(:start))
             @start_button.disable
             
-            
-           
-            
-            
             log_frame_header = FXHorizontalFrame.new(log_frame, :opts => LAYOUT_FILL_X)
             FXLabel.new(log_frame_header, "Logs:" )
             
-            
-            #log_text_frame = FXHorizontalFrame.new(bottom_frame, :opts => LAYOUT_FILL_X|FRAME_SUNKEN|LAYOUT_BOTTOM)
             log_text_frame = FXVerticalFrame.new(log_frame, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding=>0)
             @log_viewer = LogViewer.new(log_text_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
             
@@ -339,6 +432,20 @@ module Watobo
         
         private
         
+        def config
+          name = @search_name_dt.value
+          db_list = @db_select_frame.get_db_list
+          if @finder_tab.current == 1
+            name = @db_select_frame.get_db_name           
+          end
+          
+          c={
+            :db_list => db_list,
+            :name => name            
+          }
+          
+        end
+        
         def onSelectRequest(sender, sel, item)
           begin
             chat = @requestCombo.getItemData(@requestCombo.currentItem)
@@ -455,13 +562,7 @@ module Watobo
         end
         
         
-        def selectDBFile(sender, sel, item)
-          filename = FXFileDialog.getOpenFilename(self, "Save file", @db_path, "All Files (*)")
-          if filename != ""
-            @dbfile_dt.value = filename
-            @dbfile_text.handle(self, FXSEL(SEL_UPDATE, 0), nil)
-          end
-        end
+        
         
         
         def hide()
@@ -483,7 +584,17 @@ module Watobo
           @start_button.text = "Cancel"
           chatlist = []
           checklist = []
-          @check = Check.new(@project, @dbfile_dt.value, @project.getScanPreferences())
+          #config = { :db_file => @dbfile_dt.value }
+          save_config(config)
+          name = ''
+          if @finder_tab.current == 0
+            name = @search_name_dt.value
+          else
+            name = @db_select_frame.get_db_name
+          end
+                    
+          
+          @check = Check.new(@project, name, @project.getScanPreferences())
           
           if @append_extensions_cb.checked?
           extensions = @extensions_text.text.split(/(;|\n)/).select {|x| x !~ /(\n|;)/ }          
@@ -547,10 +658,12 @@ module Watobo
          
           t.join
           
-         # puts @project
-         # puts @project.getScanPreferences().to_yaml
-         # puts
-          @scanner = Watobo::Scanner2.new(chatlist, checklist, @project.passive_checks, @project.getScanPreferences())
+          scan_prefs = Watobo.project.getScanPreferences
+          if @logScanChats.checked?
+            scan_prefs[:scanlog_name] = @scanlog_name_dt.value unless @scanlog_name_dt.value.empty?
+          end
+          
+          @scanner = Watobo::Scanner2.new(chatlist, checklist, @project.passive_checks, scan_prefs)
           @pbar.total = @check.numChecks
           @pbar.progress = 0
           @pbar.barColor = 'red' 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watobo
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -125,6 +125,7 @@ files:
 - lib/watobo/gui/main_window.rb
 - lib/watobo/gui/manual_request_editor.rb
 - lib/watobo/gui/master_pw_dialog.rb
+- lib/watobo/gui/mixins/gui_settings.rb
 - lib/watobo/gui/mixins/subscriber.rb
 - lib/watobo/gui/page_tree.rb
 - lib/watobo/gui/password_policy_dialog.rb