Archived
Made messages shown on user profile pages more accurate based on who is viewing.
This commit is contained in:
@@ -19,7 +19,11 @@ class UsersController < ApplicationController
|
|||||||
begin
|
begin
|
||||||
@ban_json = JSON.parse(File.read("/etc/minecraft/redstoner/banned-players.json")).detect {|u| u["uuid"].tr("-", "") == @user.uuid}
|
@ban_json = JSON.parse(File.read("/etc/minecraft/redstoner/banned-players.json")).detect {|u| u["uuid"].tr("-", "") == @user.uuid}
|
||||||
rescue
|
rescue
|
||||||
flash.now[:alert] = "An error occured while checking if this user is banned from the server!"
|
if @user.is?(current_user)
|
||||||
|
flash.now[:alert] = "An error occured while checking if you are banned from the server!"
|
||||||
|
else
|
||||||
|
flash.now[:alert] = "An error occured while checking if this user is banned from the server!"
|
||||||
|
end
|
||||||
@ban_json = nil
|
@ban_json = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -16,16 +16,27 @@
|
|||||||
|
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
<% if @ban_json && (@ban_json["expires"] == "forever" || !(DateTime.parse(@ban_json["expires"]) <= DateTime.now)) %>
|
<% if @ban_json && (@ban_json["expires"] == "forever" || !(DateTime.parse(@ban_json["expires"]) <= DateTime.now)) %>
|
||||||
<span class="user-banned">This user is banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span>
|
<% if @user.is?(current_user) %>
|
||||||
|
<span class="user-banned">You are banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span>
|
||||||
|
<% else %>
|
||||||
|
<span class="user-banned">This user is banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span>
|
||||||
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% if @user.banned? %>
|
<% if @user.banned? %>
|
||||||
|
<% if @user.is?(current_user) %>
|
||||||
|
<span class="user-banned">You are banned on the website!</span>
|
||||||
|
<% else %>
|
||||||
<span class="user-banned">This user is banned on the website!</span>
|
<span class="user-banned">This user is banned on the website!</span>
|
||||||
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
<br>
|
<br>
|
||||||
<% if !@user.confirmed? %>
|
<% if !@user.confirmed? %>
|
||||||
<% if @user.is?(current_user) || mod? %>
|
<% if @user.is?(current_user) %>
|
||||||
<span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span>
|
<span class="user-unconfirmed">You haven't confirmed your email "<u><%= @user.email %></u>" yet!</span>
|
||||||
<%= button_to "Resend the confirmation mail", resend_mail_user_path, class: "btn dark", form_class: "inline-block", data: {confirm: "Did you check your spam folder?"} %>
|
<%= button_to "Resend the confirmation mail", resend_mail_user_path, class: "btn dark", form_class: "inline-block", data: {confirm: "Did you check your spam folder?"} %>
|
||||||
|
<% elsif mod? %>
|
||||||
|
<span class="user-unconfirmed">This user hasn't confirmed their email "<u><%= @user.email %></u>" yet!</span>
|
||||||
|
<%= button_to "Resend the confirmation mail", resend_mail_user_path, class: "btn dark", form_class: "inline-block" %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span class="user-unconfirmed">This user hasn't confirmed their email yet!</span>
|
<span class="user-unconfirmed">This user hasn't confirmed their email yet!</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user