Merge branch 'master' of github.com:kyledrake/neocities-web

This commit is contained in:
Kyle Drake 2013-06-04 15:11:51 -07:00
commit 06597748ea

4
app.rb
View file

@ -130,7 +130,7 @@ post '/site_files/upload' do
halt slim(:'site_files/new') halt slim(:'site_files/new')
end end
sanitized_filename = params[:newfile][:filename].gsub(/[^a-zA-Z_\-.]/, '') sanitized_filename = params[:newfile][:filename].gsub(/[^a-zA-Z0-9_\-.]/, '')
dest_path = File.join(site_base_path(current_site.username), sanitized_filename) dest_path = File.join(site_base_path(current_site.username), sanitized_filename)
FileUtils.mv params[:newfile][:tempfile].path, dest_path FileUtils.mv params[:newfile][:tempfile].path, dest_path
@ -142,7 +142,7 @@ end
post '/site_files/delete' do post '/site_files/delete' do
require_login require_login
sanitized_filename = params[:filename].gsub(/[^a-zA-Z_\-.]/, '') sanitized_filename = params[:filename].gsub(/[^a-zA-Z0-9_\-.]/, '')
FileUtils.rm File.join(site_base_path(current_site.username), sanitized_filename) FileUtils.rm File.join(site_base_path(current_site.username), sanitized_filename)
flash[:success] = "Deleted file #{params[:filename]}." flash[:success] = "Deleted file #{params[:filename]}."
redirect '/dashboard' redirect '/dashboard'