Merge branch 'master' of https://github.com/Futseh/redstoner.com

app/controllers/users_controller.rb

@@ -138,6 +138,12 @@ class UsersController < ApplicationController
     end
   end
 
+  def resend_mail
+    RedstonerMailer.register_mail(@user, false).deliver_now
+    flash[:notice] = "Check your inbox for the confirmation mail."
+    redirect_to users_path(@user)
+  end
+
   def update
     if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?)
       if mod?

app/views/users/show.html.erb

@@ -23,6 +23,7 @@
   <% if !@user.confirmed? %>
     <% if @user.is?(current_user) %>
       <span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span>
+      <%= button_to "Resend the confirmation mail", resend_mail_user_path, class: "btn red" %>
     <% else %>
       <span class="user-unconfirmed">This user hasn't confirmed their email yet!</span>
     <% end %>

config/routes.rb

@@ -18,6 +18,7 @@ Redstoner::Application.routes.draw do
     member do
       get 'confirm'
       get 'edit_login'
+      post 'resend_mail'
       get 'edit_notifications'
       put 'update_login'
     end