rubyslippers 1.07 → 1.08

data/lib/rconftool.rb

@@ -121,13 +121,17 @@ module Rconftool
         next
       end
       if old_setting.version == src_setting.version
+	      if $DEBUG
+		      $stderr.puts "old setting: #{old_setting.version}"
+		      $stderr.puts "src setting: #{src_setting.version}"
+		 end     
         debug << "  #{name}: unchanged\n"
-        src_setting.add_comment("\n DEFAULT SETTING from #{distfile}:\n")
+         src_setting.add_comment("\n DEFAULT SETTING from #{distfile}:\n")
         src_setting.add_comment(src_setting.content)
         src_setting.content = old_setting.content
         next
       end
-      # Otherwise, must install updated setting and comment out
+       # Otherwise, must install updated setting and comment out
       # the current setting for reference
       debug << "  #{name}: UPDATED\n"
       src_setting.add_comment("\n Previous setting (inserted by rconftool):\n\n")
@@ -215,9 +219,10 @@ module Rconftool
         20.times do
           line = f.gets
           break unless line
-          curr_setting << line
+	  linetmp = line.chop + "\r\n"
+          curr_setting << linetmp
           if line =~ /\A##VERSION:/
-            @version = line
+            @version = line.chop
             break
           end
         end
@@ -225,7 +230,8 @@ module Rconftool
 
         while line = f.gets
           unless line =~ /\A##NAME:(.*):(.*)/
-            curr_setting << line
+	   linetmp = line.chop + "\r\n"
+            curr_setting << linetmp
             next
           end
           curr_setting = Setting.new($1,$2)
@@ -238,7 +244,8 @@ module Rconftool
     def write(filename)
       File.open(filename,"w") do |f|
         @settings.each do |s|
-          f << s.to_s
+		stmp =  s.to_s.chop + "\r\n"
+          f << stmp
         end
       end
     end

data/lib/rwd/net.rb

@@ -562,6 +562,12 @@ class RequestRequest
   end
 end
 
+def url_unescape(string)
+string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
+[$1.delete('%')].pack('H*')
+end
+end
+
 class Request < Hash
   attr_reader :peeraddr
   attr_reader :request
@@ -604,10 +610,14 @@ class Request < Hash
         @vars	= RequestGet.new(@request.data.nil? ? "" : @request.data)
       when "POST"
         data	= (@io.read(self["content-length"].to_i) or "")
+      #  data = url_unescape(data)
         @vars	= RequestPost.new((self["content-type"] == "application/x-www-form-urlencoded") ? data : "")
       else
         $stderr.puts "Unknown request ('#{firstline}')."
-      end
+end
+
+$rwdtinkerlog.debug  data  
+     
     end
 
     @peeraddr	= @io.peeraddr
@@ -729,14 +739,15 @@ class HTTPServerException < Exception
 end
 
 class HTTPServer
-  def self.serve(portio=80, remote=false, auth=nil, realm="ev/net")
+  def self.serve(portio=80, remote=false, auth=nil, realm="rwd/net")
     port, server	= portio
 
     begin
       server	= TCPServer.new(remote ? "0.0.0.0" : "localhost", port)	if server.nil?
-
+if $DEBUG
       $stderr.puts "Just point your browser to http://localhost:#{port}/ ..."
-    rescue
+end  
+  rescue
       server	= nil
 
       $stderr.puts "Port #{port} is in use."

data/lib/rwd/ruby.rb

@@ -275,7 +275,7 @@ class String
     s.gsub!(/"/ , "\"")
     s.gsub!(/´/, "\'")
 
-    s	= CGI.unescapeHTML(self)
+   # s	= CGI.unescapeHTML(self)
 
     if eolconversion
       s.gsub!(/<br>/, "\n")

data/lib/rwd/rwd.rb

@@ -6,6 +6,8 @@ require "lib/rwd/thread"
 require "md5"
 require "rbconfig"
 
+
+
 begin
   require "win32ole"
   require "win32/registry"
@@ -50,6 +52,22 @@ unless rcfile.nil?
   end
 end
 
+if ENV["RWDTHEME"]
+	if ENV["RWDTHEME"] = "PDA"
+		load 'lib/rwdthemes/default.rwd'
+	end
+	if ENV["RWDTHEME"] = "DEFAULT"
+		$rwdtinkerlog.info "rwd: loading theme DEFAULT"
+           
+          load 'lib/rwdthemes/default.rwd'
+       end
+        if ENV["RWDTHEME"] = "WINDOWSLOOKALIKE"
+         load 'lib/rwdthemes/windowslike.rwd'
+ end
+ else
+	 load 'lib/rwdthemes/default.rwd'
+ end
+ 
 ENV["RWDBROWSER"]	= (ENV["RWDBROWSER"] or defaultbrowser) or puts "No browser found."
 ENV["RWDPORTS"]		= (ENV["RWDPORTS"] or "7701-7709")
 ENV["RWDTHEME"]		= (ENV["RWDTHEME"] or "DEFAULT")
@@ -250,7 +268,7 @@ class EVTable
 end
 
 class OpenTag
-  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     bef	= before[-1]
     res << Format % ["Before", @subtype]	if ($rwd_debug and not bef.nil?)
     res << bef	if not bef.nil?
@@ -282,7 +300,7 @@ class OpenTag
       args["nohelpbutton"]	= (not help)
 
       template	= $rwd_html_1
-      template	= $rwd_html_PDA_1	if pda
+      # template	= $rwd_html_PDA_1	if pda
 
       res << (template(template, args))
     when "p"		then res << "<p #{align}>"
@@ -476,7 +494,7 @@ class OpenTag
     after.push(aft)
   end
 
-  def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     case @subtype
     when "vertical", "window", "helpwindow", "tab", "panel"
       res << Format % ["BefPost", @subtype]	if $rwd_debug
@@ -618,7 +636,7 @@ class OpenTag
 end
 
 class Text
-  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     if not @text.scan(/[^ \t\r\n]/).empty?
       res << Format % ["Text", ""]	if $rwd_debug
       res << "#{@text}"
@@ -666,70 +684,70 @@ class RWDWindow
 
     vars	= vars.deep_dup
 
-begin # error wrap
+    begin # error wrap
 
-    vars.each do |key, value|
-      if not key.empty?
-        if value.respond_to? "to_s"
-          @rwd.gsub!(/%%#{key}%%/, value.to_s)
-          @rwd.gsub!(/%#{key}%/, value.to_s.to_html)
+           vars.each do |key, value|
+                                 if not key.empty?
+                                             if value.respond_to? "to_s"
+                                                   @rwd.gsub!(/%%#{key}%%/, value.to_s)
+                                                  @rwd.gsub!(/%#{key}%/, value.to_s.to_html)
 
-          @helprwd.gsub!(/%%#{key}%%/, value.to_s)
-          @helprwd.gsub!(/%#{key}%/, value.to_s.to_html)
+                                                  @helprwd.gsub!(/%%#{key}%%/, value.to_s)
+                                                  @helprwd.gsub!(/%#{key}%/, value.to_s.to_html)
 
-          varshtml[key]		= value.to_s.to_html
-          varsstring[key]	= value.to_s
-        end
-      end
-    end
+                                                  varshtml[key]		= value.to_s.to_html
+                                                  varsstring[key]	= value.to_s
+                                            end
+                                  end
+                           end
 
-    windowobject	= RWDTree.new(@rwd).children.dup.delete_if{|obj| obj.subtype != "window"}[0]
-    helpobject		= RWDTree.new(@helprwd).children.dup.delete_if{|obj| obj.subtype != "helpwindow"}[0]
+                           windowobject	= RWDTree.new(@rwd).children.dup.delete_if{|obj| obj.subtype != "window"}[0]
+                             helpobject		= RWDTree.new(@helprwd).children.dup.delete_if{|obj| obj.subtype != "helpwindow"}[0]
 
-    tabsobj	= windowobject.children.dup.delete_if{|obj| obj.subtype != "tabs"}[0]
+                                   tabsobj	= windowobject.children.dup.delete_if{|obj| obj.subtype != "tabs"}[0]
 
-    if not tabsobj.nil?
-      tabs	= tabsobj.children.dup.delete_if{|obj| (not obj.kind_of?(OpenTag)) or (obj.subtype != "tab")}
+                     if not tabsobj.nil?
+                              tabs	= tabsobj.children.dup.delete_if{|obj| (not obj.kind_of?(OpenTag)) or (obj.subtype != "tab")}
 
-      if tab.empty?
-        tab			= tabs[0].args["name"]
-      end
+                                    if tab.empty?
+                                              tab			= tabs[0].args["name"]
+                                      end
 
-      tabsobj.children.delete_if{|obj| (obj.kind_of?(OpenTag)) and (obj.subtype == "tab") and obj.args["name"] != tab}
-    end
+                                      tabsobj.children.delete_if{|obj| (obj.kind_of?(OpenTag)) and (obj.subtype == "tab") and obj.args["name"] != tab}
+                           end
 
-    if help
-      helpobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, false, oneormorefields, firstaction, tabs, tab, pda)
-    else
-      windowobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, (not @helprwd.empty?), oneormorefields, firstaction, tabs, tab, pda)
-    end
+                     if help
+                                helpobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, false, oneormorefields, firstaction, tabs, tab, pda)
+                        else
+                                  windowobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, (not @helprwd.empty?), oneormorefields, firstaction, tabs, tab, pda)
+                        end
 
-    html	= html.join("")	# ???
+           html	= html.join("")	# ???
 
-    html.gsub!(/%%*[[:alnum:]_\-]+%%*/, "")	if not $rwd_debug
-    html.gsub!(/%%/, "%")
-    html.gsub!(/\n\n*/, "\n")
+             html.gsub!(/%%*[[:alnum:]_\-]+%%*/, "")	if not $rwd_debug
+             html.gsub!(/%%/, "%")
+             html.gsub!(/\n\n*/, "\n")
 
-    if oneormorefields.empty?
-      focus	= ""
-    else
-      focus	= "document.bodyform.elements[0].focus();"
-    end
+           if oneormorefields.empty?
+                focus	= ""
+             else
+                focus	= "document.bodyform.elements[0].focus();"
+            end
 
-    firstaction	= action	if windowobject.args.keys.include?("refresh")	unless action.nil?
+              firstaction	= action	if windowobject.args.keys.include?("refresh")	unless action.nil?
 
-    html.gsub!(/\$RWD_FIRSTACTION\$/	, firstaction)
-    html.gsub!(/\$RWD_FOCUS\$/		, focus)
+                                                  html.gsub!(/\$RWD_FIRSTACTION\$/	, firstaction)
+                                             html.gsub!(/\$RWD_FOCUS\$/		, focus)
 
-    html
-  end
+                                          html
+                                          end
   
   rescue 
-  if $DEBUG
-  $stderr.puts  "error in RWDWindow - render method"
+		$rwdtinkerlog.error 	"error in RWDWindow - render method"
+  
   end
   end
-end
+
 
 class RWDMessage < RWDWindow
   def initialize(msg)
@@ -813,7 +831,9 @@ class RWDialog
 
     self
   end
+  
 
+  
   def render(res, path, post, download, downloadfile, pda, sessionid)
 		# Avoid a timeout.
 
@@ -845,8 +865,11 @@ class RWDialog
 
     post.sort.each do |key, value|
       puts  "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
+      $rwdtinkerlog.info "Post: #{key} -> #{value.from_html.inspect}\n"
 
       vars[key]	= value.from_html
+      $rwdtinkerlog.info  "rwd: #{value.from_html}\n"
+    
     end
 
 		# Stack handling for rwd_action, rwd_window and rwd_tab.
@@ -914,14 +937,24 @@ class RWDialog
 		# Copy vars from window to instance.
 
       vars.each do |k, v|
-        instance_eval "@#{k}	= vars['#{k}']"		if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
+	      $rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
+	 
+       		if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
+			
+			 instance_eval "@#{k}	= ''"
+			instance_variable_set("@#{k}", vars.fetch("#{k}"))   
+			$rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
+
+		end	 
       end
 
 		# Callback.
 
       if (not back) or @rwd_call_after_back.include?(@rwd_action)
         unless @rwd_action =~ /^rwd_/
-          puts  "Method: #{@rwd_action}(#{@rwd_args.join(", ")})"	if $rwd_debug
+	
+	$rwdtinkerlog.debug  "Method: #{@rwd_action}(#{@rwd_args})"	
+       
           if methods.include?(@rwd_action)
             method(@rwd_action).call(*@rwd_args)
           else
@@ -991,9 +1024,9 @@ begin # error block
 	      end
             res << RWDWindow.new($rwd_gui_tinker, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
 rescue
- if $DEBUG
- $stderr.puts  "error in render"
- end
+
+$rwdtinkerlog.error "rwd: error in render"
+
  end
 end
         end
@@ -1071,7 +1104,9 @@ end
       Thread.new do
         loop do
           if Time.now - @rwd_time > @rwd_timeout
-            $stderr.puts "Exiting due to timeout (#{@rwd_timeout} seconds)."
+		  
+		  $rwdtinkerlog.info "rwd: Exiting due to timeout (#{@rwd_timeout} seconds)."
+            
             exit 1
           end
           sleep interval
@@ -1151,7 +1186,7 @@ class RWDSession < Hash
     @lastaccess	= Time.now
   end
 
-  def render(res, path, post, download, downloadfile, pda)
+  def render(res, path, post, download, downloadfile, pda=false)
     done	= self["object"].render(res, path, post, download, downloadfile, pda, @sessionid)
 
     res.gsub!(/\$RWD_SESSION\$/, done ? "" : "#{@sessionid}")
@@ -1178,7 +1213,8 @@ class RWDServer
 
         @browserthread	=
         Thread.new do
-          puts "Starting the browser..."
+		$rwdtinkerlog.warn "rwd: Starting the browser..."
+       
 
           #if ENV["RWDBROWSER"].downcase =~ /iexplore/	# ???
             #@ie	= IE.new("http://localhost:#{port}/")
@@ -1192,7 +1228,7 @@ class RWDServer
 
             command.gsub!(/%port%/, port.to_s)
 
-            system(command) or $stderr.puts "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
+            system(command) or $rwdtinkerlog.error "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
           #end
 
           puts "The browser has terminated."
@@ -1303,8 +1339,8 @@ class RWDServer
               resp << download
             end
           rescue
-            puts "Sending response to browser failed."
-
+           
+     $rwdtinkerlog.error "rwd: Sending response to browser failed."
             @sessions.delete(session.sessionid)
           end
 
@@ -1318,8 +1354,9 @@ class RWDServer
 
               if @browserstarted and not @browserthread.nil? and @browserthread.alive?
                 resp.stop do
-                  puts "Waiting for the browser to terminate..."
-
+                 
+         $rwdtinkerlog.warn "rwd: Waiting for the browser to terminate..."
+	 
                   @browserthread.join
                 end
               end
@@ -1364,562 +1401,7 @@ class RWDServer
   end
 end
 
-$rwd_html["DEFAULT"]	= "
-<!-- Generated by RubyWebDialog.                                               -->
-<!-- For more information, please contact Erik Veenstra <rwd@erikveen.dds.nl>. -->
-<html>
-  <head>
-    <title>%TITLE%</title>
-
-    <meta http-equiv='Content-Type' content='text/html; charset=%CHARSET%'>
-    <meta http-equiv='Content-Style-Type' content='text/html ; charset=UTF-8'>
-    <meta http-equiv='Refresh' content='%REFRESH%, javascript:document.bodyform.submit();'>
-
-    <link rel='shortcut icon' href='%LOGO%'>
-
-    <style type='text/css'>
-    <!--
-
-	body {
-		background		: url(%WATERMARK%) white center center no-repeat fixed;
-	}
-
-	a {
-		text-decoration		: none;
-	}
-
-	a:hover {
-		background		: #AAAAAA;
-	}
-
-	td.panel1 {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2 {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel1high {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2high {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none none none none;
-	}
-
-	td.panel1low {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2low {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: none none none none;
-	}
-
-	td.tabblad {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none solid solid solid;
-	}
-
-	td.passivetab {
-                background-color	: #BBBBBB;
-		border-color		: #DDDDDD #DDDDDD #EEEEEE #DDDDDD;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.activetab {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid none solid;
-	}
-
-	td.notab {
-		border-color		: #EEEEEE #EEEEEE #EEEEEE #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none none solid none;
-	}
-
-    //-->
-    </style>
-
-    <script type='text/javascript'>
-    <!--
-      function BodyGo() {
-        $RWD_FOCUS$
-      }
-    //-->
-    </script>
-  </head>
-
-  <body bgcolor='white' onload='BodyGo()' link='#000000' vlink='#000000' alink='#000000'>
-    <form name='bodyform' action='/' method='post'>
-      <table align='center' border='0' cellspacing='0' cellpadding='0' width='100%' height='100%'>
-        <tr align='center' valign='middle'>
-          <td align='center'>
-
-            <table align='center' border='0' cellspacing='0' cellpadding='0'>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-
-                <td align='center'>
-
-                  <table align='center' border='0' cellspacing='0' cellpadding='0' %WIDTH1%>
-                    <tr align='center'>
-                      <td align='center' bgcolor='#444488'>
-
-                        <table align='left' border='0' cellspacing='1' cellpadding='0'>
-                          <tr align='center'>
-                            <td align='border'><img src='%LOGO%' width='14' height='14'></td>
-                            <td align='center'><b><small><font color='#FFFFFF'>&nbsp;%TITLE%&nbsp;</font></small></b></td>
-                          </tr>
-                        </table>
-
-                        <table align='right' border='0' cellspacing='1' cellpadding='0'>
-                          <tr align='center'>
-                            <!-- %HELPBUTTON%  --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_help\";document.bodyform.submit();'>&nbsp;?&nbsp;</a></small></b></td>
-                            <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_main\";document.bodyform.submit();'>&nbsp;&lt;&lt;&nbsp;</a></small></b></td>
-                            <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_back\";document.bodyform.submit();'>&nbsp;&lt;&nbsp;</a></small></b></td>
-                            <!-- %CLOSEBUTTON% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_quit\";document.bodyform.submit();'>&nbsp;X&nbsp;</a></small></b></td>
-                          </tr>
-                        </table>
-
-                      </td>
-                    </tr>
-
-                    <tr align='center'>
-                      <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='%WIDTH2%'></td>
-                    </tr>
-
-                    <tr align='center'>
-                      <td align='center' bgcolor='#CCCCCC'>
-                        <table align='center' border='0' cellspacing='3' cellpadding='0'>
-                          %BODY%
-                        </table>
-
-                        <input name='rwd_action' value='$RWD_FIRSTACTION$' type='hidden'>
-                        <input name='rwd_session' value='$RWD_SESSION$' type='hidden'>
-                      </td>
-                    </tr>
-                  </table>
-
-                </td>
-
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='#EEEEEE'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-              <tr align='center'>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center' bgcolor='black'><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-                <td align='center'                ><img src='rwd_pixel.gif' height='1' width='1'></td>
-              </tr>
-
-            </table>
-
-          </td>
-        </tr>
-      </table>
-    </form>
-  </body>
-</html>
-"
-
-$rwd_html["WINDOWSLOOKALIKE"]	= "
-<!-- Generated by RubyWebDialog.                                               -->
-<!-- For more information, please contact Erik Veenstra <rwd@erikveen.dds.nl>. -->
-<html>
-  <head>
-    <title>%TITLE%</title>
-
-    <meta http-equiv='Content-Type' content='text/html; charset=%CHARSET%'>
-    <meta http-equiv='Content-Style-Type' content='text/css; charset=UTF-8' >
-    <meta http-equiv='Refresh' content='%REFRESH%, javascript:document.bodyform.submit();'>
-
-    <link rel='shortcut icon' href='%LOGO%'>
-
-    <style type='text/css'>
-    <!--
-
-	body {
-		background		: url(%WATERMARK%) white center center no-repeat fixed;
-	}
-
-	a {
-		text-decoration		: none;
-	}
-
-	a:hover {
-		background		: #AAAAAA;
-	}
-
-	td.window {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 3pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel1 {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2 {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel1high {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2high {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none none none none;
-	}
-
-	td.panel1low {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.panel2low {
-		border-color		: #888888 #EEEEEE #EEEEEE #888888;
-		border-width		: 1pt;
-		border-style		: none none none none;
-	}
-
-	td.tabblad {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none solid solid solid;
-	}
-
-	td.passivetab {
-                background-color	: #BBBBBB;
-		border-color		: #DDDDDD #DDDDDD #EEEEEE #DDDDDD;
-		border-width		: 1pt;
-		border-style		: solid solid solid solid;
-	}
-
-	td.activetab {
-		border-color		: #EEEEEE #888888 #888888 #EEEEEE;
-		border-width		: 1pt;
-		border-style		: solid solid none solid;
-	}
-
-	td.notab {
-		border-color		: #EEEEEE #EEEEEE #EEEEEE #EEEEEE;
-		border-width		: 1pt;
-		border-style		: none none solid none;
-	}
-
-    //-->
-    </style>
-
-    <script type='text/javascript'>
-    <!--
-      function BodyGo() {
-        $RWD_FOCUS$
-      }
-    //-->
-    </script>
-  </head>
-
-  <body bgcolor='white' onload='BodyGo()' link='#000000' vlink='#000000' alink='#000000'>
-    <form name='bodyform' action='/' method='post'>
-      <table align='center' border='0' cellspacing='0' cellpadding='0' width='100%' height='100%'>
-        <tr align='center' valign='middle'>
-          <td align='center'>
-
-            <table align='center' border='0' cellspacing='0' cellpadding='0'>
-
-              <tr align='center'>
-                <td align='center' class='window'>
-
-                  <table align='center' border='0' cellspacing='0' cellpadding='0' %WIDTH1%>
-                    <tr align='center'>
-                      <td align='center' bgcolor='#444488'>
-
-                        <table align='left' border='0' cellspacing='1' cellpadding='0'>
-                          <tr align='center'>
-                            <td align='border'><img src='%LOGO%' width='14' height='14'></td>
-                            <td align='center'><b><small><font color='#FFFFFF'>&nbsp;%TITLE%&nbsp;</font></small></b></td>
-                          </tr>
-                        </table>
-
-                        <table align='right' border='0' cellspacing='1' cellpadding='0'>
-                          <tr align='center'>
-                            <!-- %HELPBUTTON%  --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_help\";document.bodyform.submit();'>&nbsp;?&nbsp;</a></small></b></td>
-                            <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_main\";document.bodyform.submit();'>&nbsp;&lt;&lt;&nbsp;</a></small></b></td>
-                            <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_back\";document.bodyform.submit();'>&nbsp;&lt;&nbsp;</a></small></b></td>
-                            <!-- %CLOSEBUTTON% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_quit\";document.bodyform.submit();'>&nbsp;X&nbsp;</a></small></b></td>
-                          </tr>
-                        </table>
-
-                      </td>
-                    </tr>
-
-                    <tr align='center'>
-                      <td align='center' bgcolor='white'><img src='rwd_pixel.gif' height='1' width='%WIDTH2%'></td>
-                    </tr>
-
-                    <tr align='center'>
-                      <td align='center' bgcolor='#CCCCCC'>
-                        <table align='center' border='0' cellspacing='3' cellpadding='0'>
-                          %BODY%
-                        </table>
-
-                        <input name='rwd_action' value='$RWD_FIRSTACTION$' type='hidden'>
-                        <input name='rwd_session' value='$RWD_SESSION$' type='hidden'>
-                      </td>
-                    </tr>
-                  </table>
-
-                </td>
-              </tr>
-
-            </table>
-
-          </td>
-        </tr>
-      </table>
-    </form>
-  </body>
-</html>
-"
-
-$rwd_html["PDA"]	= "
-<!-- Generated by RubyWebDialog.                                               -->
-<!-- For more information, please contact Erik Veenstra <rwd@erikveen.dds.nl>. -->
-<html>
-  <head>
-    <title>%TITLE%</title>
-
-    <meta http-equiv='Content-Type' content='text/html; charset=%CHARSET%'>
-    <meta http-equiv='Refresh' content='%REFRESH%, javascript:document.bodyform.submit();'>
-
-    <link rel='shortcut icon' href='%LOGO%'>
-
-    <script type='text/javascript'>
-    <!--
-      function BodyGo() {
-        $RWD_FOCUS$
-      }
-    //-->
-    </script>
-  </head>
-
-  <body bgcolor='white' onload='BodyGo()' link='#000000' vlink='#000000' alink='#000000'>
-    <form name='bodyform' action='/' method='post'>
-      <table align='center' border='0' cellspacing='0' cellpadding='0' width='100%' height='100%'>
-
-        <tr align='center'>
-          <td align='center' bgcolor='#444488'>
-
-            <table align='left' border='0' cellspacing='1' cellpadding='0'>
-              <tr align='center'>
-                <td align='border'><img src='%LOGO%' width='14' height='14'></td>
-                <td align='center'><b><small><font color='#FFFFFF'>&nbsp;%TITLE%&nbsp;</font></small></b></td>
-              </tr>
-            </table>
-
-            <table align='right' border='0' cellspacing='1' cellpadding='0'>
-              <tr align='center'>
-                <!-- %HELPBUTTON%  --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_help\";document.bodyform.submit();'>&nbsp;?&nbsp;</a></small></b></td>
-                <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_main\";document.bodyform.submit();'>&nbsp;&lt;&lt;&nbsp;</a></small></b></td>
-                <!-- %BACKBUTTONS% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_back\";document.bodyform.submit();'>&nbsp;&lt;&nbsp;</a></small></b></td>
-                <!-- %CLOSEBUTTON% --><td align='center' bgcolor='#EEEEEE'><b><small><a href='javascript:document.bodyform.rwd_action.value=\"rwd_quit\";document.bodyform.submit();'>&nbsp;X&nbsp;</a></small></b></td>
-              </tr>
-            </table>
-
-          </td>
-        </tr>
-
-        <!--
-        <tr align='center'>
-          <td align='center' bgcolor='#FFFFFF'>&nbsp;</td>
-        </tr>
-        -->
-
-        <tr align='center'>
-          <td align='center' bgcolor='#FFFFFF'>
-
-              <table align='center' border='0' cellspacing='0' cellpadding='0'>
-                %BODY%
-              </table>
-
-              <input name='rwd_action' value='$RWD_FIRSTACTION$' type='hidden'>
-              <input name='rwd_session' value='$RWD_SESSION$' type='hidden'>
-          </td>
-        </tr>
-
-      </table>
-    </form>
-  </body>
-</html>
-"
+
 
 $rwd_pixel	= "
 R0lGODlhAQABAMIAAAAAAP///+7u7kREiP///////////////yH5BAEKAAMA
@@ -1934,8 +1416,9 @@ jefB+oo6l6AxBAx7M2HRePQph5xga0RsJqfELPI2DSUAADs=
 
 
 $rwd_html_1, $rwd_html_2		= $rwd_html[ENV["RWDTHEME"]].split(/^\s*%BODY%\s*\r*$/)
-$rwd_html_PDA_1, $rwd_html_PDA_2	= $rwd_html["PDA"].split(/^\s*%BODY%\s*\r*$/)
-
+#if ENV["RWDTHEME"] == "PDA"
+#$rwd_html_PDA_1, $rwd_html_PDA_2	= $rwd_html["PDA"].split(/^\s*%BODY%\s*\r*$/)
+#end
 #end
 #
 #class RWDialog < RWD::RWDialog