knjrbfw 0.0.7 → 0.0.8

data/lib/knj/sshrobot/sshrobot.rb

@@ -2,7 +2,7 @@ class Knj::SSHRobot
 	def initialize(args)
 		@forwards = []
 		@args = Knj::ArrayExt.hash_sym(args)
-		@args[:port] = 22 if !@args.has_key?(:port)
+		@args[:port] = 22 if !@args.key?(:port)
 	end
 	
 	def session

data/lib/knj/strings.rb

@@ -62,4 +62,76 @@ module Knj::Strings
 		str = str.slice(0..(maxlength - 1)).strip + "..." if str.length > maxlength
 		return str
 	end
+	
+	def self.html_links(str, args = {})
+    str.to_s.html.scan(/(http:\/\/([A-z]+)\S*\.([A-z]{2,4})(\S+))/) do |match|
+      if block_given?
+        str = yield(:str => str, :args => args, :match => match)
+      else
+        if args["target"]
+          html = "<a target=\"#{args["target"]}\""
+        else
+          html = "<a"
+        end
+        
+        html += " href=\"#{match[0]}\">#{match[0]}</a>"
+        str = str.gsub(match[0], html)
+      end
+    end
+    
+    return str
+	end
+	
+	def self.strip(origstr, args)
+    newstr = "#{origstr}<br>"
+    
+    if !args.key?(:right) or args[:right]
+      loop do
+        changed = false
+        args[:strips].each do |str|
+          len = str.length
+          endstr = newstr.slice(-len, len)
+          next if !endstr
+          
+          if endstr == str
+            changed = true
+            newstr = newstr.slice(0..newstr.length-len-1)
+          end
+        end
+        
+        break if !changed
+      end
+    end
+    
+    if !args.key?(:left) or args[:left]
+      loop do
+        changed = false
+        args[:strips].each do |str|
+          len = str.length
+          endstr = newstr.slice(0, len)
+          next if !endstr
+          
+          if endstr == str
+            changed = true
+            newstr = newstr.slice(len..-1)
+          end
+        end
+        
+        break if !changed
+      end
+    end
+    
+    return newstr
+	end
+	
+	#Returns the module from the given string - even if formed as SomeClass::SomeNewClass.
+	def self.const_get_full(str)
+    module_use = Kernel
+    
+    str.scan(/(.+?)(::|$)/) do |match|
+      module_use = module_use.const_get(match[0])
+    end
+    
+    return module_use
+  end
 end

data/lib/knj/sysuser.rb

@@ -21,7 +21,7 @@ class Knj::Sysuser
 	end
 	
 	def [](key)
-		raise "No such key: " + key if !@data.has_key?(key)
+		raise "No such key: " + key if !@data.key?(key)
 		return @data[key]
 	end
 end

data/lib/knj/tests/test_http2.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby1.9.1
+
+Dir.chdir(File.dirname(__FILE__))
+require "../../knjrbfw.rb"
+
+require "../autoload"
+
+http = Knj::Http2.new(:host => "www.partyworm.dk", :port => 80, :ssl => false)
+resp = http.get("/?show=frontpage")
+resp = http.get("/?show=login")
+
+#print "Wee!\n"
+#exit
+
+http = Knj::Http2.new(:host => "mexico.balance4u.com", :port => 443, :ssl => true)
+resp = http.get("/")
+
+Knj::Php.print_r(http.cookies)

data/lib/knj/thread.rb

@@ -13,11 +13,7 @@ class Knj::Thread < Thread
 			rescue SystemExit
 				exit
 			rescue Exception => e
-				print "Error: "
-				puts e.inspect
-				print "\n"
-				puts e.backtrace
-				print "\n\n"
+        print Knj::Errors.error_str(e)
 			end
 		end
 	end

data/lib/knj/thread2.rb

@@ -6,12 +6,12 @@ class Knj::Thread2
 	end
 	
 	def connect(signal, &block)
-		@callbacks[signal] = [] if !@callbacks.has_key?(signal)
+		@callbacks[signal] = [] if !@callbacks.key?(signal)
 		@callbacks[signal] << block
 	end
 	
 	def call(signal, *args)
-		return false if !@callbacks.has_key?(signal)
+		return false if !@callbacks.key?(signal)
 		@callbacks[signal].each do |block|
 			block.call(*args)
 		end
@@ -32,7 +32,7 @@ class Knj::Thread2
 			rescue Exception => e
 				call(:on_error, e)
 				
-				if !@args.has_key?(:print_error) or @args[:print_error]
+				if !@args.key?(:print_error) or @args[:print_error]
 					print "Error: "
 					puts e.inspect
 					print "\n"

data/lib/knj/threadhandler.rb

@@ -111,9 +111,9 @@ class Knj::Threadhandler
 	end
 	
 	def free(obj)
-    raise "Destroyed Knj::Threadhandler." if !@mutex
-    
 		@mutex.synchronize do
+      return false if !@mutex or !@objects #something is trying to free and object, but the handler is destroyed. Dont crash but return false.
+      
 			freedata = false
 			@objects.each do |data|
 				if data[:object] == obj

data/lib/knj/threadpool.rb

@@ -3,7 +3,7 @@ class Knj::Threadpool
 	
 	def initialize(args = {})
 		@args = args
-		@args[:sleep] = 0.01 if !@args.has_key?(:sleep)
+		@args[:sleep] = 0.01 if !@args.key?(:sleep)
 		@workers = []
 		@blocks = []
 		@mutex = Mutex.new
@@ -49,7 +49,7 @@ class Knj::Threadpool
 			if blockdata[:runned]
 				begin
 					res = blockdata[:result]
-					raise blockdata[:error] if blockdata.has_key?(:error)
+					raise blockdata[:error] if blockdata.key?(:error)
 				ensure
 					@mutex.synchronize do
 						blockdata.clear
@@ -76,7 +76,7 @@ class Knj::Threadpool
     
 		@mutex.synchronize do
 			@blocks.each do |blockdata|
-				if !blockdata[:running] and !blockdata[:runned]
+				if blockdata and !blockdata[:running] and !blockdata[:runned]
 					blockdata[:running] = true
 					return blockdata
 				end
@@ -109,7 +109,7 @@ class Knj::Threadpool::Worker
 				res = nil
 				raise "No block in blockdata?" if !@blockdata[:block]
 				
-				if @blockdata.has_key?(:result)
+				if @blockdata.key?(:result)
 					begin
             @running = true
 						res = @blockdata[:block].call(*@blockdata[:args])

data/lib/knj/translations.rb

@@ -43,7 +43,7 @@ class Knj::Translations
 		return "" if trans.empty?
 		
 		trans.each do |tran|
-			if !@cache.has_key?(classn)
+			if !@cache.key?(classn)
 				@cache[classn] = {
 					objid => {
 						key => {
@@ -109,7 +109,7 @@ class Knj::Translations
 			@ob.delete(tran)
 		end
 		
-		@cache[classn].delete(objid) if @cache.has_key?(classn) and @cache.has_key?(objid)
+		@cache[classn].delete(objid) if @cache.key?(classn) and @cache.key?(objid)
 	end
 end
 
@@ -121,19 +121,4 @@ class Knj::Translations::Translation < Knj::Datarow
 			d.data.delete(:object)
 		end
 	end
-	
-	def self.list(d)
-		sql = "SELECT * FROM #{d.db.escape_col}#{d.db.esc_col(table)}#{d.db.escape_col} WHERE 1=1"
-		ret = list_helper(d)
-		
-		d.args.each do |key, val|
-			raise "No such key: #{key}."
-		end
-		
-		sql += ret[:sql_where]
-		sql += ret[:sql_order]
-		sql += ret[:sql_limit]
-		
-		return d.ob.list_bysql(:Translation, sql)
-	end
 end

data/lib/knj/unix_proc.rb

@@ -38,9 +38,9 @@ class Knj::Unix_proc
 				"app" => File.basename(match[4])
 			}
 			
-			next if (!args.has_key?("ignore_self") or args["ignore_self"]) and match[1].to_i == $$.to_i
+			next if (!args.key?("ignore_self") or args["ignore_self"]) and match[1].to_i == $$.to_i
 			next if grepstr.length > 0 and match[4].index(grepstr) != nil #dont return current process.
-			next if args.has_key?("pids") and args["pids"].index(pid) == nil
+			next if args.key?("pids") and args["pids"].index(pid) == nil
 			
 			ret << Knj::Unix_proc.spawn(data)
 		end
@@ -72,7 +72,7 @@ class Knj::Unix_proc
 	end
 	
 	def [](key)
-		raise "No such data: #{key}" if !@data.has_key?(key)
+		raise "No such data: #{key}" if !@data.key?(key)
 		return @data[key]
 	end
 	

data/lib/knj/web.rb

@@ -175,7 +175,7 @@ class Knj::Web
 				if @data[:user_agent] != @server["HTTP_USER_AGENT"] or @data[:ip] != @server["REMOTE_ADDR"]
 					@data = nil
 				else
-					@db.update(:sessions, {"last_url" => @server["REQUEST_URI"].to_s, "date_active" => Datestamp.dbstr}, {"id" => @data[:id]})
+					@db.update(:sessions, {"last_url" => @server["REQUEST_URI"].to_s, "date_active" => Time.new}, {"id" => @data[:id]})
 					session_id = @args[:id] + "_" + @data[:id]
 				end
 			end
@@ -183,8 +183,8 @@ class Knj::Web
 		
 		if !@data or !session_id
 			@db.insert(:sessions,
-				:date_start => Knj::Datet.new.dbstr,
-				:date_active => Knj::Datet.new.dbstr,
+				:date_start => Time.new,
+				:date_active => Time.new,
 				:user_agent => @server["HTTP_USER_AGENT"],
 				:ip => @server["REMOTE_ADDR"],
 				:last_url => @server["REQUEST_URI"].to_s
@@ -211,14 +211,55 @@ class Knj::Web
 	def self.parse_cookies(str)
     ret = {}
     
-    str.split("; ").each do |cookie_str|
-      splitted = cookie_str.split("=")
-      ret[Knj::Php.urldecode(splitted[0])] = Knj::Php.urldecode(splitted[1])
+    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])
     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
+	
 	def self.parse_urlquery(querystr, args = {})
 		get = {}
 		querystr.to_s.split("&").each do |value|
@@ -228,7 +269,7 @@ class Knj::Web
 				name = value[0..pos-1]
 				name = name.to_sym if args[:syms]
 				valuestr = value.slice(pos+1..-1)
-				Knj::Web.parse_name(get, Knj::Php.urldecode(name), valuestr, args)
+				Knj::Web.parse_name(get, self.urldec(name), valuestr, args)
 			end
 		end
 		
@@ -242,7 +283,7 @@ class Knj::Web
 			try = 0
 			
 			loop do
-				if !seton.has_key?(try)
+				if !seton.key?(try)
 					break
 				else
 					try += 1
@@ -264,16 +305,16 @@ class Knj::Web
 			realvalue = value
 		else
 			realvalue = value.to_s
+			realvalue = self.urldec(realvalue) if args[:urldecode]
+			realvalue = realvalue.force_encoding("utf-8") if args[:force_utf8] if realvalue.respond_to?(:force_encoding)
 		end
 		
-		realvalue = Knj::Php.urldecode(realvalue) if args[:urldecode] and !value.respond_to?(:filename)
-		
 		if varname and varname.index("[") != nil
 			if 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.has_key?(name)
+				seton[name] = {} if !seton.key?(name)
 				
 				secname, secname_empty = Knj::Web.parse_secname(seton[name], match[1], args)
 				
@@ -281,7 +322,7 @@ class Knj::Web
 				restname = varname.slice(valuefrom..-1)
 				
 				if restname and restname.index("[") != nil
-					seton[name][secname] = {} if !seton[name].has_key?(secname)
+					seton[name][secname] = {} if !seton[name].key?(secname)
 					Knj::Web.parse_name_second(seton[name][secname], restname, value, args)
 				else
 					seton[name][secname] = realvalue
@@ -299,6 +340,7 @@ class Knj::Web
 			realvalue = value
 		else
 			realvalue = value.to_s
+			realvalue = realvalue.force_encoding("utf-8") if args[:force_utf8]
 		end
 		
 		match = varname.match(/^\[(.*?)\]/)
@@ -311,7 +353,7 @@ class Knj::Web
 			restname = varname.slice(valuefrom..-1)
 			
 			if restname and restname.index("[") != nil
-				seton[secname] = {} if !seton.has_key?(secname)
+				seton[secname] = {} if !seton.key?(secname)
 				Knj::Web.parse_name_second(seton[secname], restname, value, args)
 			else
 				seton[secname] = realvalue
@@ -397,10 +439,35 @@ class Knj::Web
 		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.has_key?(:value)
+		if args.key?(:value)
       if args[:value].is_a?(Array) and args[:value][0].is_a?(NilClass)
         value = nil
 			elsif args[:value].is_a?(Array)
@@ -424,7 +491,7 @@ class Knj::Web
 			value = ""
 		end
 		
-		if value and args.has_key?(:value_func) and args[:value_func]
+		if value and args.key?(:value_func) and args[:value_func]
 			cback = args[:value_func]
 			
 			if cback.is_a?(Method)
@@ -455,25 +522,37 @@ class Knj::Web
 			args[:type] = args[:type].to_sym
 		end
 		
-		if args.has_key?(:disabled) and args[:disabled]
-			disabled = "disabled "
-		else
-			disabled = ""
-		end
+		attr = {
+      "name" => args[:name],
+      "id" => args[:id],
+      "type" => args[:type],
+      "class" => "input_#{args[:type]}"
+		}
+    attr.merge!(args[:attr]) if args[:attr]
+    attr["disabled"] = "disabled" if args[:disabled]
+		
+		raise "No name given to the Web::input()-method." if !args[:name] and args[:type] != :info and args[:type] != :textshow and args[:type] != :plain
 		
-		raise "No name given to the Web::input()-method." if !args[:name] and args[:type] != :info and args[:type] != :textshow
+		css = {}
+		css["text-align"] = args[:align] if args.key?(:align)
 		
-		checked = ""
-		checked += " value=\"#{args[:value_active]}\"" if args.has_key?(:value_active)
-		checked += " checked" if value.is_a?(String) and value == "1" or value.to_s == "1"
-		checked += " checked" if value.is_a?(TrueClass)
+		attr_keys = [:onchange]
+		attr_keys.each do |tag|
+      if args.key?(tag)
+        attr[tag] = args[tag]
+      end
+		end
 		
 		html = ""
 		
 		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>"
 			html += "<td colspan=\"2\" class=\"tdcheck\">"
-			html += "<input type=\"checkbox\" class=\"input_checkbox\" id=\"#{args[:id].html}\" name=\"#{args[:name].html}\"#{checked} />"
+			html += "<input#{self.attr_html(attr)} />"
 			html += "<label for=\"#{args[:id].html}\">#{args[:title].html}</label>"
 			html += "</td>"
 			html += "</tr>"
@@ -482,16 +561,12 @@ class Knj::Web
 			html += "<td class=\"tdt\">"
 			html += args[:title].to_s.html
 			html += "</td>"
-			html += "<td class=\"tdc\">"
+			html += "<td#{self.style_html(css)} class=\"tdc\">"
 			
 			if args[:type] == :textarea
-				if args.has_key?(:height)
-					styleadd = " style=\"height: #{args[:height].html}px;\""
-				else
-					styleadd = ""
-				end
+        css["height"] = "#{args[:height]}px" if args.key?(:height)
 				
-				html += "<textarea#{styleadd} class=\"input_textarea\" name=\"#{args[:name].html}\" id=\"#{args[:id].html}\">#{value}</textarea>"
+				html += "<textarea#{self.style_html(css)} class=\"input_textarea\" name=\"#{args[:name].html}\" id=\"#{args[:id].html}\">#{value}</textarea>"
 				html += "</td>"
 			elsif args[:type] == :fckeditor
 				args[:height] = 400 if !args[:height]
@@ -504,11 +579,10 @@ class Knj::Web
 				
 				html += "</td>"
 			elsif args[:type] == :select
-				html += "<select name=\"#{args[:name].html}\" id=\"#{args[:id].html}\" class=\"input_select\""
-				html += " onchange=\"#{args[:onchange]}\"" if args[:onchange]
-				html += " multiple" if args[:multiple]
-				html += " size=\"#{args[:size].to_s}\"" if args[:size]
-				html += ">"
+        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>"
 				html += "</td>"
@@ -517,12 +591,12 @@ class Knj::Web
 				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.has_key?(:path)
-				raise "No value given in arguments for imageupload-input." if !args.has_key?(:value)
+				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.php?picture=#{Knj::Php.urlencode(path).html}&smartsize=100&edgesize=25&force=true&ts=#{Time.new.to_f}\" alt=\"Image\" />"
+					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)
@@ -536,21 +610,12 @@ class Knj::Web
 				html += "<input type=\"#{args[:type].to_s}\" class=\"input_#{args[:type].to_s}\" name=\"#{args[:name].html}\" /></td>"
 			elsif args[:type] == :textshow or args[:type] == :info
 				html += "#{value}</td>"
+      elsif args[:type] == :plain
+        html += "#{Knj::Web.html(value)}"
       elsif args[:type] == :editarea
-        css = {
-          "width" => "100%"
-        }
-        css["height"] = args[:height] if args.has_key?(:height)
-        
-        styleadd = " style=\""
-        css.each do |key, val|
-          styleadd += "#{key}: #{val};"
-        end
-        styleadd += "\""
-        
-        styleadd += "width=\"100%\""
-        styleadd += "height=\"#{args[:height]}\"" if args[:height]
-        html += "<textarea#{styleadd} id=\"#{args[:id]}\" name=\"#{args[:name]}\">#{value}</textarea>"
+        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],
@@ -559,7 +624,7 @@ class Knj::Web
         
         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.has_key?(key)
+          jshash[key.to_s] = args[key] if args.key?(key)
         end
         
         html += "<script type=\"text/javascript\">"
@@ -568,7 +633,8 @@ class Knj::Web
         html += "}"
         html += "</script>"
 			else
-				html += "<input #{disabled}type=\"#{args[:type].to_s.html}\" class=\"input_#{args[:type].html}\" id=\"#{args[:id].html}\" name=\"#{args[:name].html}\" value=\"#{value.html}\" /></td>"
+        attr[:value] = value
+				html += "<input#{self.attr_html(attr)} /></td>"
 				html += "</td>"
 			end
 			
@@ -607,6 +673,8 @@ class Knj::Web
 					html += " selected=\"selected\""
 				elsif curvalue.to_s == key.to_s
 					html += " selected=\"selected\""
+        elsif curvalue and curvalue.respond_to?(:is_knj?) and curvalue.id.to_s == key.to_s
+          html += " selected=\"selected\""
 				end
 				
 				html += " value=\"#{key.html}\">#{value.html}</option>"
@@ -727,6 +795,10 @@ class Knj::Web
 			browser = "bot"
 			title = "Bot"
 			version = "GIDBot"
+    elsif match = agent.match(/android\s+([\d\.]+)/)
+      browser = "android"
+      title = "Android"
+      version = match[1]
 		elsif match = agent.match(/safari\/(\d+)/)
 			browser = "safari"
 			title = "Safari"
@@ -783,6 +855,10 @@ class Knj::Web
 			browser = "bot"
 			title = "Ezooms"
 			version = match[1]
+    elsif match = agent.match(/ahrefsbot\/([\d\.]+)/)
+      browser = "bot"
+      title = "AhrefsBot"
+      version = match[1]
 		else
 			browser = "unknown"
 			title = "(unknown browser)"
@@ -881,42 +957,45 @@ class Knj::Web
 		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
-end
-
-def alert(string)
-	return Knj::Web.alert(string)
-end
-
-def redirect(string)
-	return Knj::Web.redirect(string)
-end
-
-def jsback(string)
-	return Knj::Web.back
+	
+	#URL-encodes a string.
+  def self.urlenc(string)
+    #Thanks to CGI framework
+    string.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/) do
+      '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+    end.tr(' ', '+')
+  end
+  
+  #URL-decodes a string.
+  def self.urldec(string)
+    #Thanks to CGI framework
+    str = string.to_s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/) do
+      [$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
 end
 
 class String
 	def html
-		return self.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
+		return Knj::Web.html(self)
 	end
 	
 	def sql
 		begin
-			return _httpsession.db.escape(self)
-		rescue NameError
-			#ignore - not in KnjAppServer HTTP-session.
-		end
-		
-		begin
       return _db.escape(self)
     rescue NameError
       #ignore - not i KnjAppServer HTTP-session.
     end
 		
-		return $db.escape(self) if $db
 		raise "Could not figure out where to find db object."
 	end
 end