Fixed patchwork bugs

Author: Breccan

app/controllers/application_controller.rb

@@ -13,12 +13,12 @@ class ApplicationController < ActionController::Base
   # filter_parameter_logging :password
   private
 
-  def requires_login
+  def require_user
     flash[:error] = "Access Denied: User not logged in"
     redirect_to root_url unless current_user
   end
 
-  def requires_no_login
+  def require_no_user
     flash[:error] = "User already logged in"
     redirect_to root_url if current_user
   end

app/models/notifier.rb

@@ -1,4 +1,4 @@
-class Notifier < ActiveRecord::Base
+class Notifier < ActionMailer::Base
   default_url_options[:host] = "authlogic_example.binarylogic.com"
 
   def password_reset_instructions(user)  

app/views/layouts/application.html.erb

@@ -19,7 +19,7 @@
         <%- end -%>
 
         <div class="login_details">
-          <% if logged_in? %>
+          <% if current_user %>
             Welcome <%= current_user.username %>! Not you?
             <%= link_to "Log out", logout_path %>
           <% else %>

app/views/user_sessions/new.html.erb

@@ -13,4 +13,4 @@
   <%= f.submit "Login" %>
 <% end %>
 
-<%= link_to "Forgot your password?", password_reset_path %>
+<%= link_to "Forgot your password?", new_password_reset_path %>