Added ban reason #41

Merged
bruncbrunc merged 7 commits from bna into master 2017-10-31 22:20:56 -04:00
2 changed files with 14 additions and 4 deletions

View File

@@ -6,6 +6,8 @@ class UsersController < ApplicationController
before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions]
caches_action :show, expires_in: 10.seconds, layout: false
def index
if params[:role]
if params[:role].downcase == "staff"
@@ -30,6 +32,12 @@ class UsersController < ApplicationController
end
def show
begin
@ban_json = JSON.parse(File.read("/etc/minecraft/redstoner/banned-players.json")).detect {|u| u["uuid"].tr("-", "") == @user.uuid}
rescue
flash.now[:alert] = "An error occured while checking if this user is banned from the server!"
@ban_json = nil
end
end
# SIGNUP

View File

@@ -15,11 +15,13 @@
<h1><%= @user.name %></h1>
<div class="clear"></div>
<% if @user.banned? %>
<span class="user-banned">This user is banned!</span>
<% if @ban_json %>
<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 %>
<% if @user.banned? %>
<span class="user-banned">This user is banned on the website!</span>
<% end %>
<br>
<% if !@user.confirmed? %>
<% if @user.is?(current_user) || mod? %>
<span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span>