diff --git a/app.rb b/app.rb index 7e4ec522..0341cd13 100644 --- a/app.rb +++ b/app.rb @@ -344,7 +344,7 @@ post '/admin/banhammer' do } if !['127.0.0.1', nil, ''].include? site.ip - `sudo ufw deny from #{site.ip}` + `sudo ufw insert 1 deny from #{site.ip}` end flash[:success] = 'MISSION ACCOMPLISHED' @@ -404,10 +404,10 @@ the NeoCities Cat end get '/password_reset_confirm' do - site = Site[password_reset_token: params[:token]] + site = Site[password_reset_token: params[:code]] if site - site.password = params[:token] + site.password = params[:code] site.save flash[:success] = 'Your password has been changed to the token sent in your e-mail. Please login and change your password in the settings page as soon as possible.' diff --git a/environment.rb b/environment.rb index 05333193..6f296296 100644 --- a/environment.rb +++ b/environment.rb @@ -55,6 +55,19 @@ if ENV['RACK_ENV'] == 'development' && Server.count == 0 Server.create ip: '127.0.0.1', slots_available: 999999 end +Mail.defaults do + #options = { :address => "smtp.gmail.com", + # :port => 587, + # :domain => 'your.host.name', + # :user_name => '', + # :password => '', + # :authentication => 'plain', + # :enable_starttls_auto => true } + + options = {} + delivery_method :sendmail, options +end + class Sinatra::Base alias_method :render_original, :render def render(engine, data, options = {}, locals = {}, &block) diff --git a/workers/email_worker.rb b/workers/email_worker.rb index a28f1a01..d327415b 100644 --- a/workers/email_worker.rb +++ b/workers/email_worker.rb @@ -4,10 +4,10 @@ class EmailWorker def perform(args={}) Mail.deliver do - from args[:from] - to args[:to] - subject args[:subject] - body args[:body] + from args['from'] + to args['to'] + subject args['subject'] + body args['body'] end end end diff --git a/workers/screenshot_worker.rb b/workers/screenshot_worker.rb index 186831d1..79e7e130 100644 --- a/workers/screenshot_worker.rb +++ b/workers/screenshot_worker.rb @@ -9,7 +9,7 @@ class ScreenshotWorker screenshot = Tempfile.new 'neocities_screenshot' screenshot.close - caps = Selenium::WebDriver::Remote::Capabilities.htmlunit javascript_enabled: true, takesScreenshot: true + caps = Selenium::WebDriver::Remote::Capabilities.htmlunit javascript_enabled: false, takesScreenshot: true driver = Selenium::WebDriver.for :remote, url: $config['phantomjs_url'][rand($config['phantomjs_url'].length)], desired_capabilities: caps driver.manage.window.resize_to 1280, 720