misc/plugin/amazon.rb in tdiary-5.0.7 vs misc/plugin/amazon.rb in tdiary-5.0.8

@@ -4,14 +4,14 @@
 #
 # Copyright (C) 2005-2007 TADA Tadashi <[e-mail]>
 # You can redistribute it and/or modify it under GPL2 or any later version.
 #
 
-autoload :Net,     'net/http'
-autoload :URI,     'uri'
-autoload :Timeout, 'timeout'
-autoload :REXML,   'rexml/document'
+require 'net/http'
+require 'uri'
+require 'timeout'
+require 'rexml/document'
 
 # do not change these variables
 @amazon_subscription_id = '1CVA98NEF1G753PFESR2'
 @amazon_require_version = '2011-08-01'
 
@@ -91,11 +91,11 @@
 	res = Net::HTTP::Proxy( px_host, px_port ).get_response( URI::parse( url ) )
 	case res
 	when Net::HTTPSuccess
 		res.body
 	when Net::HTTPRedirection
-		amazon_fetch( res['location'].untaint, limit - 1 )
+		amazon_fetch( res['location'], limit - 1 )
 	when Net::HTTPForbidden, Net::HTTPServiceUnavailable
 		raise AmazonRedirectError.new( limit.to_s )
 	else
 		raise ArgumentError, res.error!
 	end
@@ -322,10 +322,10 @@
 		@conf['amazon.hidename'] = (@cgi.params['amazon.hidename'][0] == 'true')
 		@conf['amazon.bitly'] = (@cgi.params['amazon.bitly'][0] == 'true')
 		@conf['amazon.nodefault'] = (@cgi.params['amazon.nodefault'][0] == 'true')
 		if @cgi.params['amazon.clearcache'][0] == 'true' then
 			Dir["#{@cache_path}/amazon/*"].each do |cache|
-				File::delete( cache.untaint )
+				File::delete( cache )
 			end
 		end
 		unless @conf['amazon.hideconf'] then
 			@conf['amazon.aid'] = @cgi.params['amazon.aid'][0]
 		end