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

4 files changed, 12 insertions, 4 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ae9424e..ff21d8c 100644
--- a/app/controllers/users_controller.rb
+++ b/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?
@@ -344,4 +350,4 @@ class UsersController < ApplicationController
     a = [:ign, :email, :password, :password_confirmation, :mail_own_thread_reply, :mail_other_thread_reply, :mail_own_blogpost_comment, :mail_other_blogpost_comment, :mail_mention] + add
     params.require(:user).permit(a)
   end
-end
\ No newline at end of file
+end
diff --git a/app/mailers/redstoner_mailer.rb b/app/mailers/redstoner_mailer.rb
index 38e9956..1b387f8 100644
--- a/app/mailers/redstoner_mailer.rb
+++ b/app/mailers/redstoner_mailer.rb
@@ -44,4 +44,4 @@ class RedstonerMailer < ActionMailer::Base
     @user = user
     mail(to: @user.email, subject: "Email change on Redstoner.com")
   end
-end
\ No newline at end of file
+end
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 56ece88..eabe78e 100644
--- a/app/views/users/show.html.erb
+++ b/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 %>
@@ -107,4 +108,4 @@
   <% else %>
     <%= render_md(@user.about).html_safe %>
   <% end %>
-</div>
\ No newline at end of file
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index 1caa0ca..584c94f 100644
--- a/config/routes.rb
+++ b/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
@@ -51,4 +52,4 @@ Redstoner::Application.routes.draw do
   get  '/dmca'  => redirect('https://www.youtube.com/watch?v=oHg5SJYRHA0')
 
   root to: 'statics#index'
-end
\ No newline at end of file
+end