watobo 0.9.19 → 0.9.20

data/lib/watobo/gui/browser_preview.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # browser_preview.rb
-# 
-# Copyright 2013 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
-# .
+#.
+# Copyright 2014 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
+
 # @private 
 module Watobo#:nodoc: all
   module Gui

data/lib/watobo/gui/certificate_dialog.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # certificate_dialog.rb
-# 
-# Copyright 2013 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
-# .
+#.
+# Copyright 2014 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
+
 # @private 
 module Watobo#:nodoc: all
   module Gui

data/lib/watobo/gui/chat_diff.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # chat_diff.rb
-# 
-# Copyright 2013 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
-# .
+#.
+# Copyright 2014 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
+
 # @private 
 module Watobo#:nodoc: all
   module Gui
@@ -45,7 +33,9 @@ module Watobo#:nodoc: all
       
       
       def makeRowVisible(row)
-        data_rows = @dataText.to_s.split("\n")
+        dummy = @dataText.to_s
+        dummy = dummy.unpack("C*").pack("C*")
+        data_rows = dummy.split("\n")
         if row > 0 then
           pos = data_rows.slice(0..row-1).join("\n").length+1
         else

data/lib/watobo/gui/chatviewer_frame.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # chatviewer_frame.rb
-# 
-# Copyright 2013 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
-# .
+#.
+# Copyright 2014 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
+
 # @private 
 module Watobo#:nodoc: all
   module Gui
@@ -84,7 +72,7 @@ module Watobo#:nodoc: all
 
         @style = 2 # default style
         @text = ''
-        @max_len = 5000
+        @max_len = -1 #5000
         @filter_mode = SEL_TYPE_HIGHLIGHT
         @cur_match_pos = 0
         @text_dt = FXDataTarget.new('')
@@ -335,7 +323,7 @@ module Watobo#:nodoc: all
         @tabbook = nil
         @viewers = []
         @text = ''
-        @max_len = 5000
+        @max_len = -1 #5000
 
         @tabBook = FXTabBook.new(self, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_RIGHT)
         @tabBook.connect(SEL_COMMAND) {

data/lib/watobo/gui/checkboxtree.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # checkboxtree.rb
-# 
-# Copyright 2013 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
-# .
+#.
+# Copyright 2014 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
+
 if $0 == __FILE__
   inc_path = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
   $: << inc_path

data/lib/watobo/gui/checks_policy_frame.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # checks_policy_frame.rb
-# 
-# Copyright 2013 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
-# .
+#.
+# Copyright 2014 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
+
 # @private 
 module Watobo#:nodoc: all
   module Gui

data/lib/watobo/gui/client_cert_dialog.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # client_cert_dialog.rb
-# 
-# Copyright 2013 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
-# .
+#.
+# Copyright 2014 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
+
 # @private
 module Watobo#:nodoc: all
   module Gui
@@ -154,13 +142,14 @@ module Watobo#:nodoc: all
           password = @password_dt.value
 
           begin
-
+puts "* open certfile: #{@client_cert_dt.value}"
             if File.exist?(@client_cert_dt.value)
               p12_data = nil
               File.open(@client_cert_dt.value, "rb"){|fh|
                 p12_data = fh.read
               }
               p12 = OpenSSL::PKCS12.new( p12_data, password)
+              puts p12.certificate
               client_cert[:ssl_client_cert] = p12.certificate
               client_cert[:ssl_client_key] = p12.key
               client_cert[:extra_chain_certs] =  p12.ca_certs

data/lib/watobo/gui/confirm_scan_dialog.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # confirm_scan_dialog.rb
-# 
-# Copyright 2013 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
-# .
+#.
+# Copyright 2014 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
+
 require 'watobo/gui/conversation_table'
 
 # @private 

data/lib/watobo/gui/conversation_table.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # conversation_table.rb
-# 
-# Copyright 2013 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
-# .
+#.
+# Copyright 2014 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
+
 class CustomTableItem < FXTableItem
   attr_accessor :color
   attr_accessor :backcolor
@@ -222,7 +210,7 @@ module Watobo#:nodoc: all
           add_chat_row(chat)
         return true
         end
-        add_chat_row(chat) # if chat_visible?(chat)
+        add_chat_row(chat) if Chats.match?(chat, @filter)
         return true
 
       end
@@ -326,6 +314,8 @@ module Watobo#:nodoc: all
           self.rowHeaderMode = 0
 
           adjustCellWidth()
+          
+          
         end
         
         self.connect(SEL_CHANGED){ |sender, sel, item|
@@ -359,14 +349,36 @@ module Watobo#:nodoc: all
         adjustCellWidth()
 
         addHotkeyHandler(self)
+        
+        start_update_timer
       end
 
       def scrollUp()
-        self.makePositionVisible(0, 0)
+        #self.makePositionVisible(0, 0)
+         self.setPosition(self.xPosition, 0)
       end
 
       def scrollDown()
-        self.makePositionVisible(self.numRows-1, 0)
+        #self.makePositionVisible(self.numRows-1, 0)
+        #puts "[scrollDown] >>"
+        #puts "xPos: #{self.xPosition}"
+        #puts "yPos: #{self.yPosition}"
+        #puts "viewportHeight: #{self.viewportHeight}"
+        #puts "contentHeight: #{self.contentHeight}"
+        #puts "y-diff: #{self.viewportHeight - self.contentHeight}"
+        #puts "---"
+         self.setPosition(self.xPosition, (self.viewportHeight - self.contentHeight))
+      end
+      
+      def start_update_timer
+        @last_row_count = 0
+        @timer = FXApp.instance.addTimeout( 150, :repeat => true) {
+          if self.getNumRows != @last_row_count
+             scrollDown if @autoscroll == true
+             @last_row_count = self.getNumRows
+          end
+          }
+
       end
 
       def clearConversation()
@@ -411,30 +423,35 @@ module Watobo#:nodoc: all
         rup = chat.request.urlparms
         unless rup.nil?
         ps << rup
-        end
+        end        
 
-        post_parms_string = ''
-        post_parms_string << chat.request.post_parms.join("&")
-
-        if chat.request.method =~ /POST/ and !post_parms_string.empty? then
-          ps << "&&" unless ps.empty?
-        ps << post_parms_string
+        if chat.request.method =~ /POST/ and !chat.request.body.nil? then
+            post_parms_string = ''
+            post_parms_string << chat.request.body            
+            ps << "&&" unless ps.empty?
+            ps << post_parms_string          
         end
 
         ps = "*MULTIPART*" if chat.request.content_type =~ /multipart/i
 
         parms = ""
-        unless ps.nil?
+        unless ps.empty?
           #   parms = ps[0..50]
           #   parms += "..." if ps.length > 50
           if @url_decode == true
-            parms = CGI.unescape(ps).unpack('C*').pack('U*')
-          else
-          parms = ps
+            if chat.request.content_type =~ /(json|xml)/
+              parms = ps.unpack('C*').pack('U*')
+            else
+              parms = CGI.unescape(ps).unpack('C*').pack('U*')              
+            end
           end
           parms.gsub!(/[^[:print:]]/,'.')
 
         end
+        
+        #if parms.length > 50
+        #  parms = parms[0..50] + "..."
+        #end
 
         self.setItemText(lastRowIndex, index, parms)
         self.getItem(lastRowIndex, index).justify = FXTableItem::LEFT
@@ -460,7 +477,8 @@ module Watobo#:nodoc: all
         
         self.setItemData(lastRowIndex, 0, chat)
 
-        self.makePositionVisible(self.numRows-1, 0) if @autoscroll == true
+        #self.makePositionVisible(self.numRows-1, 0) if @autoscroll == true
+        self.setPosition(self.xPosition, (self.viewportHeight - self.contentHeight - 20 ))
       end
 
       def update_table()
@@ -472,15 +490,7 @@ module Watobo#:nodoc: all
         end
       end
       
-      def update_table_UNUSED()
-        self.clearItems
-        initColumns()
-        adjustCellWidth()
-        Watobo::Chats.each do |chat|
-          add_chat_row(chat) if chat_visible? chat
-        end
-      end
-      
+            
       def adjustCellWidth()
         begin
           self.rowHeader.width = 40