Commit 3875b657 authored by Maximilian Grüttemeier's avatar Maximilian Grüttemeier
Browse files

Bugfixes 

- Fixed message when banning someone
- Fixed ban check command
- Fixed ban panel not being able to ban
parent 229d8055

lua/msync/client_gui/modules/cl_mbsync.lua

+3 −27
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ MSync.modules = MSync.modules or {} 
 * @package    MySQL Ban Sync

 * @author     Aperture Development

 * @license    root_dir/LICENCE

 * @version    0.0.5

 * @version    0.0.6

]]



--[[
@@ -15,7 +15,7 @@ local info = { 
    Name = "MySQL Ban Sync",

    ModuleIdentifier = "MBSync",

    Description = "Synchronise bans across your servers",

    Version = "0.0.5"

    Version = "0.0.6"

}



--[[
@@ -164,14 +164,6 @@ MSync.modules[info.ModuleIdentifier].init = function() 
        steamid_textentry:SetPos( 125, 35 )

        steamid_textentry:SetSize( 210, 20 )

        steamid_textentry:SetPlaceholderText( "SteamID/SteamID64" )

        --steamid_textentry:SetUpdateOnType(true)

        --steamid_textentry.OnValueChange = function( pnl, value )

        --    if string.len(value) == 0 then

        --        ban_button:SetDisabled(true)

        --    else

        --        ban_button:SetDisabled(false)

        --    end

        --end



        local length_text = vgui.Create( "DLabel", panel )

        length_text:SetPos( 15, 60 )
@@ -197,9 +189,6 @@ MSync.modules[info.ModuleIdentifier].init = function() 
        allservers_dropdown:AddChoice( "True" )

        allservers_dropdown:AddChoice( "False" )

        allservers_dropdown:SetSortItems( false )

        allservers_dropdown.OnSelect = function( self, index, value )

            --

        end



        local reason_text = vgui.Create( "DLabel", panel )

        reason_text:SetPos( 15, 110 )
@@ -221,7 +210,6 @@ MSync.modules[info.ModuleIdentifier].init = function() 
        reason_textentry:SetMultiline(true)

        reason_textentry:SetUpdateOnType(true)

        reason_textentry.OnValueChange = function( pnl, value )

            print(value)

            reasonMaxLen_text:SetText(string.len( value ).."/100")



            if string.len( value ) > 100 then
@@ -231,17 +219,6 @@ MSync.modules[info.ModuleIdentifier].init = function() 
            end

        end



        --local bantype_dropdown = vgui.Create( "DComboBox", panel )

        --bantype_dropdown:SetPos( 125, 35 )

        --bantype_dropdown:SetSize( 210, 20 )

        --bantype_dropdown:SetValue( "Recently Disconnected" )

        --bantype_dropdown:AddChoice( "Recently Disconnected" )

        --bantype_dropdown:AddChoice( "SteamID" )

        --bantype_dropdown:SetSortItems( false )

        --bantype_dropdown.OnSelect = function( self, index, value )

            --

        --end



        local reasonMaxLen_text = vgui.Create( "DLabel", panel )

        reasonMaxLen_text:SetPos( 15, 205 )

        reasonMaxLen_text:SetColor( Color( 255, 255, 255 ) )
@@ -269,7 +246,6 @@ MSync.modules[info.ModuleIdentifier].init = function() 
        ban_button:SetText( "Ban User" )

        ban_button:SetPos( 15, 425 )

        ban_button:SetSize( 320, 30 )

        ban_button:SetDisabled(true)

        ban_button.DoClick = function()

            local banConfirm_panel = vgui.Create( "DFrame" )

            banConfirm_panel:SetSize( 350, 100 )
@@ -289,7 +265,7 @@ MSync.modules[info.ModuleIdentifier].init = function() 
            accept_button:SetPos( 15, 70 )

            accept_button:SetSize( 160, 20 )

            accept_button.DoClick = function()

                -- Ban user and close panel

                RunConsoleCommand("msync.MBSync.banSteamID", steamid_textentry:GetValue(), length_textentry:GetValue(), allservers_dropdown:GetValue(), reason_textentry:GetValue())

                panel:Close()

                banConfirm_panel:Close()

            end

lua/msync/server/modules/sv_mbsync.lua

+33 −8
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ MSync.modules = MSync.modules or {} 
 * @package    MySQL Ban Sync

 * @author     Aperture Development

 * @license    root_dir/LICENSE

 * @version    0.0.5

 * @version    0.0.6

]]



--[[
@@ -15,7 +15,7 @@ local info = { 
    Name = "MySQL Ban Sync",

    ModuleIdentifier = "MBSync",

    Description = "Synchronise bans across your servers",

    Version = "0.0.5"

    Version = "0.0.6"

}



--[[
@@ -76,16 +76,28 @@ MSync.modules[info.ModuleIdentifier].init = function( transaction ) 
        banUserQ.onSuccess = function( q, data )

            -- Notify the user about the ban and add it to ULib to prevent data loss on Addon Remove

            -- Also, kick the user from the server

            local msgLength

            local msgReason

            local banData = {

                admin = calling_ply:Nick(),

                reason = reason,

                unban = os.time()+(length*60),

                time = os.time()

            }

            if length == 0 then

                banData["unban"] = length

                msgLength = "Permanent"

            else

                msgLength = ULib.secondsToStringTime(length)

            end



            if reason == "" then

                msgReason = "(None given)"

            end



            ply:Kick(ULib.getBanMessage( ply:SteamID(), banData))

            ply:Kick("\n"..ULib.getBanMessage( ply:SteamID(), banData))

            MSync.modules[info.ModuleIdentifier].getActiveBans()

            MSync.modules[info.ModuleIdentifier].msg(calling_ply, "Banned "..ply:Nick().." for "..ULib.secondsToStringTime(length).." with reason "..reason)

            MSync.modules[info.ModuleIdentifier].msg(calling_ply, "Banned "..ply:Nick().." for "..msgLength.." with reason "..msgReason)

        end



        banUserQ.onError = function( q, err, sql )
@@ -139,12 +151,25 @@ MSync.modules[info.ModuleIdentifier].init = function( transaction ) 
                unban = os.time()+(length*60),

                time = os.time()

            }

            if length == 0 then

                banData["unban"] = length

                msgLength = "Permanent"

            else

                msgLength = ULib.secondsToStringTime(length)

            end



            if reason == "" then

                msgReason = "(None given)"

            else

                msgReason = reason

            end



            MSync.modules[info.ModuleIdentifier].msg(calling_ply, "Banned "..userid.." for "..msgLength.." with reason "..msgReason)



            if not player.GetBySteamID(userid) then return end



            player.GetBySteamID(userid):Kick(ULib.getBanMessage( userid, banData))

            player.GetBySteamID(userid):Kick("\n"..ULib.getBanMessage( userid, banData))

            MSync.modules[info.ModuleIdentifier].getActiveBans()

            MSync.modules[info.ModuleIdentifier].msg(calling_ply, "Banned "..userid.." for "..ULib.secondsToStringTime(length).." with reason "..reason)

        end



        banUserIdQ.onError = function( q, err, sql )
@@ -956,14 +981,14 @@ MSync.modules[info.ModuleIdentifier].ulx = function() 
                Translate ban length and Date into readable values

            ]]



            banData.timestamp = os.date( "%H:%M:%S - %d/%m/%Y", banData.timestamp)



            if banData.length == 0 then

                banData.length = "permanent"

            else

                banData.length = os.date( "%H:%M:%S - %d/%m/%Y", banData.timestamp + banData.length)

            end



            banData.timestamp = os.date( "%H:%M:%S - %d/%m/%Y", banData.timestamp)



            --[[

                Message the ban informations to the asking player

            ]]