fix password reset, fix ip blocker, turn off js for now

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.'

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 => '<username>',
+  # :password => '<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)

workers/email_worker.rb

@@ -4,10 +4,10 @@ class EmailWorker
 
   def perform(args={})
     Mail.deliver do
-       from    args[:from]
+       from    args['from']
-       to      args[:to]
+       to      args['to']
-       subject args[:subject]
+       subject args['subject']
-       body    args[:body]
+       body    args['body']
     end
   end
 end

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