diff --git a/config/routes.rb b/config/routes.rb index 04dd9e33..6f940c06 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,10 @@ +# encoding: utf-8 +# # Redmine plugin for Document Management System "Features" # # Copyright (C) 2011 Vít Jonáš # Copyright (C) 2012 Daniel Munn -# Copyright (C) 2011-14 Karel Pičman +# Copyright (C) 2011-16 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -113,8 +115,9 @@ RedmineApp::Application.routes.draw do mount DAV4Rack::Handler.new( :root_uri_path => "#{Redmine::Utils::relative_url_root}/dmsf/webdav", :resource_class => RedmineDmsf::Webdav::ResourceProxy, - :controller_class => RedmineDmsf::Webdav::Controller - ), :at => "/dmsf/webdav" + :controller_class => RedmineDmsf::Webdav::Controller, + :log_to => Rails.logger + ), :at => '/dmsf/webdav' # Approval workflow resources :dmsf_workflows do @@ -141,4 +144,4 @@ RedmineApp::Application.routes.draw do end end -end +end \ No newline at end of file diff --git a/lib/redmine_dmsf/webdav/controller.rb b/lib/redmine_dmsf/webdav/controller.rb index 963961e6..f8ab6027 100644 --- a/lib/redmine_dmsf/webdav/controller.rb +++ b/lib/redmine_dmsf/webdav/controller.rb @@ -118,7 +118,7 @@ module RedmineDmsf # Escape URL string def url_format(resource) # Additionally escape square brackets, otherwise files with - # file name like file[1].pdf are not visible in some WebDAV clients + # file names like file[1].pdf are not visible in some WebDAV clients URI.encode(super, '[]') end diff --git a/lib/redmine_dmsf/webdav/no_parse.rb b/lib/redmine_dmsf/webdav/no_parse.rb index bef4080c..4c1edf7a 100644 --- a/lib/redmine_dmsf/webdav/no_parse.rb +++ b/lib/redmine_dmsf/webdav/no_parse.rb @@ -1,6 +1,9 @@ +# encoding: utf-8 +# # Redmine plugin for Document Management System "Features" # -# Copyright (C) 2012 Daniel Munn +# Copyright (C) 2012 Daniel Munn +# Copyright (C) 2011-16 Karel Pičman # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -24,21 +27,15 @@ module RedmineDmsf end def call(env) - if env['REQUEST_METHOD'] == "PUT" && env.has_key?('CONTENT_TYPE') then + if env['REQUEST_METHOD'] == 'PUT' && env.has_key?('CONTENT_TYPE') then if (@urls.dup.delete_if {|x| !env['PATH_INFO'].starts_with? x}.length > 0) then - logger "RedmineDmsf::NoParse prevented mime parsing for PUT #{env['PATH_INFO']}" + Rails.logger.info "RedmineDmsf::NoParse prevented mime parsing for PUT #{env['PATH_INFO']}" env['CONTENT_TYPE'] = 'text/plain' end end @app.call(env) end - - private - - def logger(env) - env['action_dispatch.logger'] || Logger.new($stdout) - end - + end end