knjrbfw 0.0.111 → 0.0.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5696af92d53b95a8c94fcef022377125817c5963
-  data.tar.gz: 2d85cab631950106238a682c722773b38a7f480e
+  metadata.gz: 66637edb9c36f0d7ea2b74ef01525eac6504e558
+  data.tar.gz: 0618414f52721e98c76b6a87d2f1bbd30dfb948a
 SHA512:
-  metadata.gz: 38f796337ac3a2cf5d51a17dcf65d8bc4e1c601d393fdd82de0821365019d95f5cf3316e1fcd4b605a6016bc5ca4957c567317af110d53b0b81892e3d6926edf
-  data.tar.gz: 9598253f0ad7546b545f888d38bc1beadaa07b54e1352192dd726a7ec7de87cc60b5f5174717a2749bb8d84c5aaee90d3480658369bc25618b7df2c69cd45cbc
+  metadata.gz: 90be6e975266b2179b6689ff362b150afbb4871ccb9eb175fc1a1bc8b2bf1c823ebc8e36389db3387697fcf07ea45d6ae1bc4aabbacf8051c82532d052b0c13e
+  data.tar.gz: 212fa35ff3ea29a7bc6186be6a1df13dd1ab1d405db62979e6d4407f3203a3e0a0f73b1c978e34e013a996bdd9e627a66a037ac58a8d0432b279594e6a2c52b6

data/VERSION

@@ -1 +1 @@
-0.0.111
+0.0.113

data/knjrbfw.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: knjrbfw 0.0.111 ruby lib
+# stub: knjrbfw 0.0.113 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "knjrbfw"
-  s.version = "0.0.111"
+  s.version = "0.0.113"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kasper Johansen"]
-  s.date = "2015-04-13"
+  s.date = "2015-04-21"
   s.description = "Including stuff for HTTP, SSH and much more."
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -61,8 +61,6 @@ Gem::Specification.new do |s|
     "lib/knj/compiler.rb",
     "lib/knj/cpufreq.rb",
     "lib/knj/csv.rb",
-    "lib/knj/datarow.rb",
-    "lib/knj/datarow_custom.rb",
     "lib/knj/degulesider.rb",
     "lib/knj/erb/apache_knjerb.conf",
     "lib/knj/erb/cache/README",
@@ -196,7 +194,6 @@ Gem::Specification.new do |s|
     "lib/knj/scripts/ip2location.rb",
     "lib/knj/scripts/keepalive.rb",
     "lib/knj/scripts/php_to_rb_helper.rb",
-    "lib/knj/scripts/process_meta_exec.rb",
     "lib/knj/scripts/speed_test.rb",
     "lib/knj/scripts/svn_merge.rb",
     "lib/knj/scripts/upgrade_knjrbfw_checker.rb",
@@ -215,7 +212,6 @@ Gem::Specification.new do |s|
     "lib/knj/thread.rb",
     "lib/knj/thread2.rb",
     "lib/knj/threadhandler.rb",
-    "lib/knj/translations.rb",
     "lib/knj/unix_proc.rb",
     "lib/knj/web.rb",
     "lib/knj/webscripts/image.rhtml",

data/lib/knj/image.rb

@@ -4,114 +4,125 @@ class Knj::Image
   #===Examples
   # img = Magick::Image.read(path_str)
   # Knj::Image.rounded_corners(
-  #   :img => img,
-  #   :radius => 25,
-  #   :border => 1,
-  #   :border_color => "#000000"
+  #   img: img,
+  #   radius: 25,
+  #   border: 1,
+  #   border_color: "#000000"
   # )
   def self.rounded_corners(args)
-    raise "No or invalid ':img' given: '#{args}'." if !args[:img]
+    raise "No or invalid ':img' given: '#{args}'." unless args[:img]
     raise "No or invalid ':radius' given: '#{args}'." if !args[:radius].respond_to?(:to_i) || args[:radius].to_i <= 0
-    
+
     pic = args[:img]
     raise "Format '#{pic.format}' does not support transparency." if pic.format == "JPEG"
-    
+
     r = args[:radius].to_i
     r_half = r / 2
     r2 = r * r
     d = r * 2
-    
+
     center_x = r - 1
     center_y = 1
-    
+
     coords = {}
     0.upto(r) do |x|
       y = center_y + ::Math.sqrt(r2 - ((x - center_x) * (x - center_x)))
       coords[x] = y.to_i
     end
-    
+
     if args[:border]
       draw = ::Magick::Draw.new
       draw.stroke(args[:border_color])
       draw.stroke_width(1)
-      
+
       0.upto(args[:border] - 1) do |x|
         draw.line(x, 0, x, pic.rows)
         draw.line(pic.columns-x-1, 0, pic.columns-x-1, pic.rows)
-        
+
         draw.line(0, x, pic.columns, x)
         draw.line(0, pic.rows-x-1, pic.columns, pic.rows-x-1)
       end
-      
+
       draw.draw(pic)
     end
-    
+
     borders = [] if args[:border]
-    
+
     1.upto(4) do |count|
       r.times do |x|
         border_from = nil
         border_to = nil
         border_mode = nil
-        
+
         case count
           when 1
             x_from = x
-            
+
             y_from = 0
             y_to = r - coords[x]
-            
-            if borders and x > 0 and x < r_half
+
+            if borders && x > 0 && x < r_half
               border_from = y_to
               border_to = r - coords[x - 1]
               border_to = 1 if border_to < 1
-              
+
               #top left
-              borders << {:x => x_from, :yf => border_from, :yt => border_to}
-              borders << {:y => x_from, :xf => border_from, :xt => border_to}
-              
+              borders << {x: x_from, yf: border_from, yt: border_to}
+              borders << {y: x_from, xf: border_from, xt: border_to}
+
               #top right
-              borders << {:x => pic.columns - x - 1, :yf => border_from, :yt => border_to}
-              borders << {:y => x_from, :xf => pic.columns - border_to, :xt => pic.columns - border_from}
-              
+              borders << {x: pic.columns - x - 1, yf: border_from, yt: border_to}
+              borders << {y: x_from, xf: pic.columns - border_to, xt: pic.columns - border_from}
+
               #bottom left
-              borders << {:x => x_from, :yf => pic.rows - border_to, :yt => pic.rows - border_from}
-              borders << {:y => pic.rows - x - 1, :xf => border_from, :xt => border_to}
-              
+              borders << {x: x_from, yf: pic.rows - border_to, yt: pic.rows - border_from}
+              borders << {y: pic.rows - x - 1, xf: border_from, xt: border_to}
+
               #bottom right
-              borders << {:x => pic.columns - x - 1, :yf => pic.rows - border_to, :yt => pic.rows - border_from}
-              borders << {:y => pic.rows - x - 1, :xf => pic.columns - border_to, :xt => pic.columns - border_from}
+              borders << {x: pic.columns - x - 1, yf: pic.rows - border_to, yt: pic.rows - border_from}
+              borders << {y: pic.rows - x - 1, xf: pic.columns - border_to, xt: pic.columns - border_from}
             end
           when 2
             x_from = pic.columns - r + x
-            
+
             y_from = 0
             y_to = r - coords[r - x - 1]
           when 3
             x_from = x
-            
+
             y_from = pic.rows - r + coords[x]
             y_to = pic.rows - y_from
           when 4
             x_from = pic.columns - r + x
-            
+
             y_from = pic.rows - r + coords[r - x - 1]
             y_to = pic.rows - y_from
         end
-        
+
         next if y_to <= 0
-        
-        pixels = pic.get_pixels(x_from, y_from, 1, y_to)
-        pixels.each do |pixel|
-          pixel.opacity = ::Magick::TransparentOpacity
+
+        if RUBY_ENGINE == "jruby"
+          # Hack around missing method in rmagick4j Image#get_pixels. It will be black :-(
+          pixels = []
+          y_to.times do |count|
+            pixel = Magick::Pixel.new(0, 0, 0, 255)
+            pixels << pixel
+          end
+
+          pic.store_pixels(x_from, y_from, 1, y_to, pixels)
+        else
+          pixels = pic.get_pixels(x_from, y_from, 1, y_to)
+          pixels.each do |pixel|
+            pixel.opacity = ::Magick::TransparentOpacity
+          end
+          pic.store_pixels(x_from, y_from, 1, y_to, pixels)
         end
-        pic.store_pixels(x_from, y_from, 1, y_to, pixels)
       end
     end
-    
+
     if borders
       color = args[:border_color]
-      
+
       borders.each do |border|
         if border.key?(:x)
           count_from = border[:yf]
@@ -120,18 +131,18 @@ class Knj::Image
           count_from = border[:xf]
           count_to = border[:xt]
         end
-        
+
         count_from.upto(count_to - 1) do |coord|
-          if RUBY_ENGINE == "jruby" and color[0, 1] == "#"
+          if RUBY_ENGINE == "jruby" && color[0, 1] == "#"
             r = color[1, 2].hex
             b = color[3, 2].hex
             g = color[5, 2].hex
-            
+
             pixel = ::Magick::Pixel.new(r, b, g)
           else
             pixel = ::Magick::Pixel.from_color(color)
           end
-          
+
           if border.key?(:x)
             if RUBY_ENGINE == "jruby"
               pic.store_pixels(border[:x], coord, 1, 1, [pixel])
@@ -148,21 +159,21 @@ class Knj::Image
         end
       end
     end
-    
+
     pic.matte = true
   end
-  
+
   #Returns the width relative to the height.
   #===Examples
   # Knj::Image.width_for_height(640, 480, 400) #=> 533
   def self.width_for_height(orig_width, orig_height, new_height)
     return (orig_width.to_f / (orig_height.to_f / new_height.to_f)).to_i
   end
-  
+
   #Returns the height relative to the width.
   #===Examples
   # Knj::Image.height_for_width(640, 480, 533) #=> 399
   def self.height_for_width(orig_width, orig_height, new_width)
     return (orig_height.to_f / (orig_width.to_f / new_width.to_f)).to_i
   end
-end
+end

data/lib/knj/scripts/php_to_rb_helper.rb

@@ -7,11 +7,11 @@ begin
   options = {}
   OptionParser.new do |opts|
     opts.banner = "Usage: example.rb [options]"
-    
+
     opts.on("-f PHPFILE", "--file", "The PHP-file you want help to convert.") do |f|
       options[:file] = f
     end
-    
+
     opts.on("-t", "--tags-remove", "Removes the PHP-tags completely.") do |t|
       options[:tags] = false
     end
@@ -37,15 +37,8 @@ cont.gsub!(/\A#!\/usr\/bin\/env\s+php5/, "!#/usr/bin/env ruby1.9.1")
 #Replace class extends.
 cont.scan(/(class\s+(.+?)\s+extends\s+(.+?){)/) do |match|
   rb_classname = "#{match[1][0..0].upcase}#{match[1][1..999]}"
-  
-  if match[2] == "knjdb_row"
-    extends = "Knj::Datarow"
-  else
-    extends = "#{match[2][0..0].upcase}#{match[2][1..999]}"
-  end
-  
+  extends = "#{match[2][0..0].upcase}#{match[2][1..999]}"
   rb_str = "class #{rb_classname} < #{extends}"
-  
   cont = cont.gsub(match[0], rb_str)
 end
 
@@ -54,7 +47,7 @@ end
 cont.scan(/(class\s+(.+?)\s*{)/) do |match|
   rb_classname = "#{match[1][0..0].upcase}#{match[1][1..999]}"
   rb_str = "class #{rb_classname}"
-  
+
   cont = cont.gsub(match[0], rb_str)
 end
 
@@ -68,7 +61,7 @@ cont.scan(/(static\s+function\s+(.+?)\((.*?)\)\s*{)/) do |match|
   else
     func_name = match[1]
   end
-  
+
   rb_str = "def self.#{func_name}(#{match[2]})"
   cont = cont.gsub(match[0], rb_str)
 end
@@ -101,7 +94,7 @@ end
 cont.scan(/((\s+?)}\s*catch\s*\(\s*(#{regexes["class"]})\s+\$(#{regexes["var"]})\s*\)\s*{(\s+))/) do |match|
   classname = "#{match[2][0..0].upcase}#{match[2][1..999]}"
   classname = "Errno::ENOENT" if classname == "Knjdb_rownotfound_exception"
-  
+
   rb_str = "#{match[1]}rescue #{classname} => #{match[3]}#{match[4]}"
   cont = cont.gsub(match[0], rb_str)
 end
@@ -111,7 +104,7 @@ end
 cont.scan(/((\s+?)require_once\s+\"(.+)\"\s*;(\s+?))/) do |match|
   filename = match[2]
   filename.gsub!(/\.php$/, ".rb")
-  
+
   rb_str = "#{match[1]}require \"#{filename}\"#{match[3]}"
   cont = cont.gsub(match[0], rb_str)
 end
@@ -123,7 +116,7 @@ cont.scan(/(function\s(.+?)\((.*?)\))/) do |match|
   def_args.scan(/(([A-z]+)\s+\$(#{regexes["var"]}))/) do |match_arg|
     def_args = def_args.gsub(match_arg[0], "#{match_arg[2]}")
   end
-  
+
   rb_str = "def #{match[1]}(#{def_args})"
   cont = cont.gsub(match[0], rb_str)
 end
@@ -267,11 +260,11 @@ end
 #Replace multi-line comments.
 cont.scan(/((\s+|<\?)\/\*([\s\S]+?)\*\/)/) do |match|
   rb_str = "\n=begin\n#{match[2]}\n=end\n"
-  
+
   if match[1] == "<?"
     rb_str = "<%#{rb_str}"
   end
-  
+
   cont = cont.gsub(match[0], rb_str)
 end
 
@@ -300,14 +293,14 @@ end
 #Replace variable-names.
 cont.scan(/(([^%\d])(\$(#{regexes["var"]})))/) do |match|
   vname = match[3]
-  
+
   if vname[-1..-1] == "["
     vname = vname[0..-2]
     match[0] = match[0][0..-2]
     match[2] = match[2][0..-2]
     match[3] = match[3][0..-2]
   end
-  
+
   if vname == "this"
     rb_varname = "self"
   elsif global_vars.key?(vname)
@@ -315,7 +308,7 @@ cont.scan(/(([^%\d])(\$(#{regexes["var"]})))/) do |match|
   else
     rb_varname = "#{vname}"
   end
-  
+
   cont = cont.gsub(match[2], rb_varname)
 end
 

data/lib/knj/web.rb

@@ -7,72 +7,72 @@ class Knj::Web
   def self.parse_uri(str)
     uri_match = str.to_s.match(/^\/(.+?\..*?|)(\?(.*)|)$/)
     raise "Could not parse the URI: '#{str}'." if !uri_match
-    
+
     return {
       :path => "/#{uri_match[1]}",
       :query => uri_match[3]
     }
   end
-  
+
   #Parses cookies-string and returns hash with parsed cookies.
   def self.parse_cookies(str)
     ret = {}
-    
+
     str.split(/;\s*/).each do |cookie_str|
       if !match = cookie_str.match(/^(.*?)=\"(.*)\"$/)
         match = cookie_str.match(/^(.*?)=(.*)$/)
       end
-      
+
       ret[self.urldec(match[1])] = self.urldec(match[2]) if match
     end
-    
+
     return ret
   end
-  
+
   def self.parse_set_cookies(str)
     str = String.new(str.to_s)
     return [] if str.length <= 0
     args = {}
     cookie_start_regex = /^(.+?)=(.*?)(;\s*|$)/
-    
+
     match = str.match(cookie_start_regex)
     raise "Could not match cookie: '#{str}'." if !match
     str.gsub!(cookie_start_regex, "")
-    
+
     args["name"] = self.urldec(match[1].to_s)
     args["value"] = self.urldec(match[2].to_s)
-    
+
     while match = str.match(/(.+?)=(.*?)(;\s*|$)/)
       str = str.gsub(match[0], "")
       args[match[1].to_s.downcase] = match[2].to_s
     end
-    
+
     return [args]
   end
-  
+
   def self.cookie_str(cookie_data)
     raise "Not a hash: '#{cookie_data.class.name}', '#{cookie_data}'." unless cookie_data.is_a?(Hash)
     cookiestr = "#{self.urlenc(cookie_data["name"])}=#{self.urlenc(cookie_data["value"])}"
-    
+
     cookie_data.each do |key, val|
       next if key == "name" or key == "value"
-      
+
       if key.to_s.downcase == "expires" and val.is_a?(Time)
         cookiestr << "; Expires=#{val.httpdate}"
       else
         cookiestr << "; #{key}=#{val}"
       end
     end
-    
+
     return cookiestr
   end
-  
+
   #Parses a query and returns the various _GET-variables.
   def self.parse_urlquery(querystr, args = {})
     get = {}
     querystr.to_s.split("&").each do |value|
       pos = value.index("=")
-      
+
       if pos != nil
         name = value[0..pos-1]
         name = name.to_sym if args[:syms]
@@ -80,10 +80,10 @@ class Knj::Web
         Knj::Web.parse_name(get, Knj::Web.urldec(name), valuestr, args)
       end
     end
-    
+
     return get
   end
-  
+
   def self.parse_name(seton, varname, value, args = {})
     if value.respond_to?(:filename) and value.filename
       realvalue = value
@@ -92,18 +92,18 @@ class Knj::Web
       realvalue = self.urldec(realvalue) if args[:urldecode]
       realvalue = realvalue.force_encoding("utf-8") if args[:force_utf8] if realvalue.respond_to?(:force_encoding)
     end
-    
+
     if varname and varname.index("[") != nil and match = varname.match(/\[(.*?)\]/)
       namepos = varname.index(match[0])
       name = varname.slice(0..namepos - 1)
       name = name.to_sym if args[:syms]
       seton[name] = {} if !seton.key?(name)
-      
+
       secname, secname_empty = Knj::Web.parse_secname(seton[name], match[1], args)
-      
+
       valuefrom = namepos + secname.to_s.length + 2
       restname = varname.slice(valuefrom..-1)
-      
+
       if restname and restname.index("[") != nil
         seton[name][secname] = {} if !seton[name].key?(secname)
         Knj::Web.parse_name_second(seton[name][secname], restname, value, args)
@@ -114,13 +114,13 @@ class Knj::Web
       seton[varname] = realvalue
     end
   end
-  
+
   def self.parse_secname(seton, secname, args)
     secname_empty = false
     if secname.length <= 0
       secname_empty = true
       try = 0
-      
+
       loop do
         if !seton.key?(try.to_s)
           break
@@ -128,14 +128,14 @@ class Knj::Web
           try += 1
         end
       end
-      
+
       secname = try.to_s
     end
-    
+
     secname = secname.to_sym if args[:syms] and secname.is_a?(String) and !(Float(secname) rescue false)
     return [secname, secname_empty]
   end
-  
+
   def self.parse_name_second(seton, varname, value, args = {})
     if value.respond_to?(:filename) and value.filename
       realvalue = value
@@ -143,16 +143,16 @@ class Knj::Web
       realvalue = value.to_s
       realvalue = realvalue.force_encoding("utf-8") if args[:force_utf8]
     end
-    
+
     match = varname.match(/^\[(.*?)\]/)
     if match
       namepos = varname.index(match[0])
       name = match[1]
       secname, secname_empty = Knj::Web.parse_secname(seton, match[1], args)
-      
+
       valuefrom = namepos + match[1].length + 2
       restname = varname.slice(valuefrom..-1)
-      
+
       if restname and restname.index("[") != nil
         seton[secname] = {} if !seton.key?(secname)
         Knj::Web.parse_name_second(seton[secname], restname, value, args)
@@ -163,30 +163,30 @@ class Knj::Web
       seton[varname] = realvalue
     end
   end
-  
+
   def self.require_eruby(filepath)
     cont = File.read(filepath).untaint
     parse = Erubis.Eruby.new(cont)
     eval(parse.src.to_s)
   end
-  
+
   def self.alert(string)
     require "#{$knjpath}strings"
-    
+
     begin
       _httpsession.alert_sent = true
     rescue NameError
       #ignore.
     end
-    
+
     @alert_sent = true
-    
+
     html = "<script type=\"text/javascript\">alert(\"#{Knj::Strings.js_safe(string.to_s)}\");</script>"
     print html
-    
+
     return self
   end
-  
+
   #Redirects to another URL.
   #===Examples
   #  Knj::Web.redirect("someotherpage.rhtml")
@@ -200,22 +200,22 @@ class Knj::Web
         else
           _httpsession.resp.status = 303 if !_hb.headers_sent?
         end
-        
+
         _hb.header("Location", url) if !_hb.headers_sent?
       end
     rescue NameError
       #ignore.
     end
-    
+
     print "<script type=\"text/javascript\">location.href=\"#{url}\";</script>"
     exit
   end
-  
+
   def self.back
     print "<script type=\"text/javascript\">history.go(-1);</script>"
     exit
   end
-  
+
   def self.checkval(value, val1, val2 = nil)
     if val2 != nil
       if !value or value == "" or value == "false"
@@ -231,7 +231,7 @@ class Knj::Web
       end
     end
   end
-  
+
   def self.inputs(arr)
     html = ""
     arr.each do |args|
@@ -241,38 +241,38 @@ class Knj::Web
         html << self.input(args)
       end
     end
-    
+
     return html
   end
-  
+
   def self.style_html(css)
     return "" if css.length <= 0
-    
+
     str = " style=\""
-    
+
     css.each do |key, val|
       str << "#{key}: #{val};"
     end
-    
+
     str << "\""
-    
+
     return str
   end
-  
+
   def self.attr_html(attrs)
     return "" if attrs.length <= 0
-    
+
     html = ""
     attrs.each do |key, val|
       html << " #{key}=\"#{val.to_s.html}\""
     end
-    
+
     return html
   end
-  
+
   def self.input(args)
     Knj::ArrayExt.hash_sym(args)
-    
+
     if args.key?(:value)
       if args[:value].is_a?(Array) and (args[:value].first.is_a?(NilClass) or args[:value].first == false)
         value = nil
@@ -290,18 +290,18 @@ class Knj::Web
         value = args[:value]
       end
     end
-    
+
     args[:value_default] = args[:default] if args[:default]
-    
+
     if value.is_a?(NilClass) and args[:value_default]
       value = args[:value_default]
     elsif value.is_a?(NilClass)
       value = ""
     end
-    
+
     if value and args.key?(:value_func) and args[:value_func]
       cback = args[:value_func]
-      
+
       if cback.is_a?(Method)
         value = cback.call(value)
       elsif cback.is_a?(Array)
@@ -312,10 +312,10 @@ class Knj::Web
         raise "Unknown class: #{cback.class.name}."
       end
     end
-    
+
     value = args[:values] if args[:values]
     args[:id] = args[:name] if !args[:id]
-    
+
     if !args[:type]
       if args[:opts]
         args[:type] = :select
@@ -329,7 +329,7 @@ class Knj::Web
     else
       args[:type] = args[:type].to_sym
     end
-    
+
     attr = {
       "name" => args[:name],
       "id" => args[:id],
@@ -339,46 +339,46 @@ class Knj::Web
     attr.merge!(args[:attr]) if args[:attr]
     attr["disabled"] = "disabled" if args[:disabled]
     attr["maxlength"] = args[:maxlength] if args.key?(:maxlength)
-    
+
     raise "No name given to the Web::input()-method." if !args[:name] and args[:type] != :info and args[:type] != :textshow and args[:type] != :plain and args[:type] != :spacer and args[:type] != :headline
-    
+
     css = {}
     css["text-align"] = args[:align] if args.key?(:align)
     css.merge!(args[:css]) if args.key?(:css)
-    
+
     attr_keys = [:onchange]
     attr_keys.each do |tag|
       if args.key?(tag)
         attr[tag] = args[tag]
       end
     end
-    
+
     classes_tr = []
     classes_tr += args[:classes_tr] if args[:classes_tr]
-    
+
     if !classes_tr.empty?
       classes_tr_html = " class=\"#{classes_tr.join(" ")}\""
     else
       classes_tr_html = ""
     end
-    
+
     if args.key?(:title)
       title_html = args[:title].to_s.html
     elsif args.key?(:title_html)
       title_html = args[:title_html]
     end
-    
+
     html = ""
-    
+
     classes = ["input_#{args[:type]}"]
     classes = classes | args[:classes] if args.key?(:classes)
     attr["class"] = classes.join(" ")
-    
+
     if args[:type] == :checkbox
       attr["value"] = args[:value_active] if args.key?(:value_active)
       attr["checked"] = "checked" if value.is_a?(String) and value == "1" or value.to_s == "1" or value.to_s == "on" or value.to_s == "true"
       attr["checked"] = "checked" if value.is_a?(TrueClass)
-      
+
       html << "<tr#{classes_tr_html}>"
       html << "<td colspan=\"2\" class=\"tdcheck\">"
       html << "<input#{self.attr_html(attr)} />"
@@ -395,7 +395,7 @@ class Knj::Web
       html << title_html
       html << "</div></td>"
       html << "<td#{self.style_html(css)} class=\"tdc\" id=\"#{Knj::Web.html("#{args[:id]}_content")}\"><div>"
-      
+
       if args[:type] == :textarea
         if args.key?(:height)
           if (Float(args[:height]) rescue false)
@@ -404,11 +404,11 @@ class Knj::Web
             css["height"] = args[:height]
           end
         end
-        
+
         html << "<textarea#{self.style_html(css)} class=\"input_textarea\" name=\"#{args[:name].html}\" id=\"#{args[:id].html}\">#{value}</textarea>"
       elsif args[:type] == :fckeditor
         args[:height] = 400 if !args[:height]
-        
+
         require "/usr/share/fckeditor/fckeditor.rb" if !Kernel.const_defined?(:FCKeditor)
         fck = FCKeditor.new(args[:name])
         fck.Height = args[:height].to_i
@@ -423,11 +423,11 @@ class Knj::Web
       elsif args[:type] == :select
         attr["multiple"] = "multiple" if args[:multiple]
         attr["size"] = args["size"] if args[:size]
-        
+
         html << "<select#{self.attr_html(attr)}>"
         html << Knj::Web.opts(args[:opts], value, args[:opts_args])
         html << "</select>"
-        
+
         if args[:moveable]
           html << "<div style=\"padding-top: 3px;\">"
           html << "<input type=\"button\" value=\"#{_("Up")}\" onclick=\"select_moveup($('##{args[:id]}'));\" />"
@@ -438,20 +438,20 @@ class Knj::Web
         html << "<table class=\"designtable\"><tr#{classes_tr_html}><td style=\"width: 100%;\">"
         html << "<input type=\"file\" name=\"#{args[:name].html}\" class=\"input_file\" />"
         html << "</td><td style=\"padding-left: 5px;\">"
-        
+
         raise "No path given for imageupload-input." if !args.key?(:path)
         raise "No value given in arguments for imageupload-input." if !args.key?(:value)
-        
+
         path = args[:path].gsub("%value%", value.to_s).untaint
         if File.exists?(path)
           html << "<img src=\"image.rhtml?path=#{self.urlenc(path).html}&smartsize=100&rounded_corners=10&border_color=black&force=true&ts=#{Time.new.to_f}\" alt=\"Image\" />"
-          
+
           if args[:dellink]
             dellink = args[:dellink].gsub("%value%", value.to_s)
             html << "<div style=\"text-align: center;\">(<a href=\"javascript: if (confirm('#{_("Do you want to delete the image?")}')){location.href='#{dellink}';}\">#{_("delete")}</a>)</div>"
           end
         end
-        
+
         html << "</td></tr></table>"
       elsif args[:type] == :file
         html << "<input type=\"#{args[:type].to_s}\" class=\"input_#{args[:type].to_s}\" name=\"#{args[:name].html}\" />"
@@ -463,17 +463,17 @@ class Knj::Web
         css["width"] = "100%"
         css["height"] = args[:height] if args.key?(:height)
         html << "<textarea#{self.attr_html(attr)}#{self.style_html(css)} id=\"#{args[:id]}\" name=\"#{args[:name]}\">#{value}</textarea>"
-        
+
         jshash = {
           "id" => args[:id],
           "start_highlight" => true
         }
-        
+
         pos_keys = [:skip_init, :allow_toggle, :replace_tab_by_spaces, :toolbar, :syntax]
         pos_keys.each do |key|
           jshash[key.to_s] = args[key] if args.key?(key)
         end
-        
+
         html << "<script type=\"text/javascript\">"
         html << "function knj_web_init_#{args[:name]}(){"
         html << "editAreaLoader.init(#{Php4r.json_encode(jshash)});"
@@ -487,35 +487,34 @@ class Knj::Web
         attr[:value] = value
         html << "<input#{self.attr_html(attr)} />"
       end
-      
+
       html << "</div></td></tr>"
     end
-    
+
     html << "<tr#{classes_tr_html}><td colspan=\"2\" class=\"tdd\">#{args[:descr]}</td></tr>" if args[:descr]
     return html
   end
-  
+
   def self.opts(opthash, curvalue = nil, opts_args = {})
     opts_args = {} if !opts_args
     Knj::ArrayExt.hash_sym(opts_args)
-    
+
     return "" if !opthash
     cname = curvalue.class.name
-    curvalue = curvalue.id if (cname == "Knj::Db_row" or cname == "Knj::Datarow")
-    
+
     html = ""
     addsel = " selected=\"selected\"" if !curvalue
-    
+
     html << "<option#{addsel} value=\"\">#{_("Add new")}</option>" if opts_args and (opts_args[:add] or opts_args[:addnew])
     html << "<option#{addsel} value=\"\">#{_("Choose")}</option>" if opts_args and opts_args[:choose]
     html << "<option#{addsel} value=\"\">#{_("None")}</option>" if opts_args and opts_args[:none]
     html << "<option#{addsel} value=\"\">#{_("All")}</option>" if opts_args and opts_args[:all]
-    
+
     if opthash.is_a?(Hash) or opthash.class.to_s == "Dictionary"
       opthash.each do |key, value|
         html << "<option"
         sel = false
-        
+
         if curvalue.is_a?(Array) and curvalue.index(key) != nil
           sel = true
         elsif curvalue.to_s == key.to_s
@@ -523,7 +522,7 @@ class Knj::Web
         elsif curvalue and curvalue.respond_to?(:is_knj?) and curvalue.id.to_s == key.to_s
           sel = true
         end
-        
+
         html << " selected=\"selected\"" if sel
         html << " value=\"#{Knj::Web.html(key)}\">#{Knj::Web.html(value)}</option>"
       end
@@ -536,18 +535,18 @@ class Knj::Web
         end
       end
     end
-    
+
     return html
   end
-  
+
   def self.rendering_engine(servervar = nil)
     servervar = _server if !servervar
     if !servervar
       raise "Could not figure out meta data."
     end
-    
+
     agent = servervar["HTTP_USER_AGENT"].to_s.downcase
-    
+
     if agent.include?("webkit") != nil
       return "webkit"
     elsif agent.include?("gecko") != nil
@@ -561,15 +560,15 @@ class Knj::Web
       return false
     end
   end
-  
+
   def self.os(servervar = nil)
     servervar = _server if !servervar
     if !servervar
       raise "Could not figure out meta data."
     end
-    
+
     agent = servervar["HTTP_USER_AGENT"].to_s.downcase
-    
+
     if agent.include?("(windows;") != nil or agent.include?("windows nt") != nil
       return {
         "os" => "win",
@@ -581,16 +580,16 @@ class Knj::Web
         "title" => "Linux"
       }
     end
-    
+
     raise "Unknown OS: #{agent}"
   end
-  
+
   #Returns various information about the current browser. Currently only works with the Hayabusa-project.
   def self.browser(servervar = nil)
     servervar = _server if !servervar
     raise "Could not figure out meta data." if !servervar
     agent = servervar["HTTP_USER_AGENT"].to_s.downcase
-    
+
     if match = agent.include?("knj:true")
       browser = "bot"
       title = "Bot"
@@ -704,7 +703,7 @@ class Knj::Web
       title = "(unknown browser)"
       version = "(unknown version)"
     end
-    
+
     os = nil
     os_version = nil
     if agent.include?("linux") != nil
@@ -713,12 +712,12 @@ class Knj::Web
       os = "mac"
     elsif match = agent.match(/windows\s+nt\s+([\d\.]+)/)
       os = "windows"
-      
+
       if match[1] == "5.1"
         os_version = "xp"
       end
     end
-    
+
     return {
       "browser" => browser,
       "title" => title,
@@ -727,23 +726,23 @@ class Knj::Web
       "os_version" => os_version
     }
   end
-  
+
   def self.locale(args = {})
     if args[:servervar]
       servervar = args[:servervar]
     else
       servervar = _server
     end
-    
+
     if !servervar
       raise "Could not figure out meta data."
     end
-    
+
     ret = {
       :recommended => [],
       :browser => []
     }
-    
+
     alangs = servervar["HTTP_ACCEPT_LANGUAGE"].to_s
     if alangs.length > 0
       alangs.split(/\s*,\s*/).each do |alang|
@@ -753,7 +752,7 @@ class Knj::Web
         else
           q = 1.0
         end
-        
+
         if match = alang.match(/^([A-z]+)-([A-z]+)$/)
           locale = match[1]
           sublocale = match[2]
@@ -761,7 +760,7 @@ class Knj::Web
           locale = alang
           sublocale = false
         end
-        
+
         ret[:browser] << {
           :locale => locale,
           :sublocale => sublocale,
@@ -769,7 +768,7 @@ class Knj::Web
         }
       end
     end
-    
+
     if args[:supported] and ret[:browser]
       ret[:browser].each do |locale|
         args[:supported].each do |supported_locale|
@@ -785,17 +784,17 @@ class Knj::Web
         end
       end
     end
-    
+
     if args[:default]
       ret[:recommended] << args[:default] if ret[:recommended].index(args[:default]) == nil
     end
-    
+
     return ret
   end
-  
+
   def self.hiddens(hidden_arr)
     html = ""
-    
+
     hidden_arr.each do |hidden_hash|
       if hidden_hash.is_a?(Array)
         hidden_hash = {
@@ -813,18 +812,18 @@ class Knj::Web
           end
         end
       end
-      
+
       html << "<input type=\"hidden\" name=\"#{hidden_hash[:name].to_s.html}\" value=\"#{hidden_hash[:value].to_s.html}\" />"
     end
-    
+
     return html
   end
-  
+
   #Parses a string to be safe for use in <a href="">.
   def self.ahref_parse(str)
     return str.to_s.gsub("&", "&amp;")
   end
-  
+
   #URL-encodes a string.
   def self.urlenc(string)
     #Thanks to CGI framework
@@ -832,7 +831,7 @@ class Knj::Web
       '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
     end.tr(' ', '+')
   end
-  
+
   #URL-decodes a string.
   def self.urldec(string)
     #Thanks to CGI framework
@@ -840,21 +839,21 @@ class Knj::Web
       [$1.delete('%')].pack('H*')
     end
   end
-  
+
   #Escapes HTML-characters in a string.
   def self.html(string)
     return string.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
   end
-  
+
   def self.html_args(h)
     str = ""
     h.each do |key, val|
       str << "&#{Php4r.urlencode(key)}=#{Php4r.urlencode(val)}"
     end
-    
+
     return str
   end
-  
+
   #Calculates the URL from meta hash.
   def self.url(args = {})
     if args[:meta]
@@ -862,21 +861,21 @@ class Knj::Web
     else
       meta = _meta
     end
-    
+
     url = ""
-    
+
     if meta["HTTP_SSL_ENABLED"] == "1"
       url << "https://"
     else
       url << "http://"
     end
-    
+
     url << meta["HTTP_HOST"]
     url << meta["REQUEST_URI"] if !args.key?(:uri) or args[:uri]
-    
+
     return url
   end
-  
+
   URL_SAFE_REPLACES = {
     "ø" => "oe",
     "æ" => "ae",
@@ -886,11 +885,11 @@ class Knj::Web
   }
   def self.url_safe(str)
     str = str.to_s.downcase
-    
+
     URL_SAFE_REPLACES.each do |key, val|
       str.gsub!(key, val)
     end
-    
+
     return Knj::Strings.remove_non_ascii(str)
   end
 end
@@ -899,14 +898,14 @@ class String
   def html
     return Knj::Web.html(self)
   end
-  
+
   def sql
     begin
       return _db.escape(self)
     rescue NameError
       #ignore - not i KnjAppServer HTTP-session.
     end
-    
+
     raise "Could not figure out where to find db object."
   end
 end
@@ -915,7 +914,7 @@ class Symbol
   def html
     return self.to_s.html
   end
-  
+
   def sql
     return self.to_s.sql
   end
@@ -925,7 +924,7 @@ class Fixnum
   def sql
     return self.to_s.sql
   end
-  
+
   def html
     return self.to_s.html
   end