zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2014-12-26 03:53:12 +00:00
commit f4c812d0df
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/site.rb
View file

@ -85,7 +85,7 @@ end
get '/site/:username/confirm_email/:token' do get '/site/:username/confirm_email/:token' do
site = Site[username: params[:username]] site = Site[username: params[:username]]
if site.email_confirmation_token == params[:token] if !site.nil? && site.email_confirmation_token == params[:token]
site.email_confirmed = true site.email_confirmed = true
site.save_changes site.save_changes

11
app/site_files.rb
View file

@ -3,6 +3,12 @@ get '/site_files/new_page' do
erb :'site_files/new_page' erb :'site_files/new_page'
end end
# Redirect from original path
get '/site_files/new' do
require_login
redirect '/site_files/new_page'
end
post '/site_files/create_page' do post '/site_files/create_page' do
require_login require_login
@errors = [] @errors = []
@ -31,11 +37,6 @@ post '/site_files/create_page' do
redirect params[:dir] ? "/dashboard?dir=#{Rack::Utils.escape params[:dir]}" : '/dashboard' redirect params[:dir] ? "/dashboard?dir=#{Rack::Utils.escape params[:dir]}" : '/dashboard'
end end
get '/site_files/new' do
require_login
erb :'site_files/new'
end
def file_upload_response(error=nil) def file_upload_response(error=nil)
http_error_code = 406 http_error_code = 406