Commit 141190d9 authored by Maximilian Grüttemeier's avatar Maximilian Grüttemeier
Browse files

Exporting Bans 

- Added first prototype to export bans from MSync 2 to ULX ( just the active ones that are linked to the server )
- Fixed a bug that could cause different time values when banning a user
parent 9178867b

lua/msync/client_gui/modules/cl_mbsync.lua

+2 −12
Original line number Diff line number Diff line
@@ -356,7 +356,6 @@ MSync.modules[info.ModuleIdentifier].init = function() 
        local nickname_textentry = vgui.Create( "DTextEntry", panel )

        nickname_textentry:SetPos( 125, 35 )

        nickname_textentry:SetSize( 210, 20 )

        --nickname_textentry:SetText( "[ApDev] Rainbow Dash" )

        nickname_textentry:SetDisabled(true)



        local steamid_text = vgui.Create( "DLabel", panel )
@@ -368,7 +367,6 @@ MSync.modules[info.ModuleIdentifier].init = function() 
        local steamid_textentry = vgui.Create( "DTextEntry", panel )

        steamid_textentry:SetPos( 125, 60 )

        steamid_textentry:SetSize( 210, 20 )

        --steamid_textentry:SetText( "STEAM_0:0:0" )

        steamid_textentry:SetDisabled(true)



        local steamid64_text = vgui.Create( "DLabel", panel )
@@ -380,17 +378,9 @@ MSync.modules[info.ModuleIdentifier].init = function() 
        local steamid64_textentry = vgui.Create( "DTextEntry", panel )

        steamid64_textentry:SetPos( 125, 85 )

        steamid64_textentry:SetSize( 210, 20 )

        --steamid64_textentry:SetText( "7600000000" )

        steamid64_textentry:SetDisabled(true)



        --local adminheader_text = vgui.Create( "DLabel", panel )

        --adminheader_text:SetPos( 15, 110 )

        --adminheader_text:SetColor( Color( 255, 255, 255 ) )

        --adminheader_text:SetText( "Admin" )

        --adminheader_text:SetSize(320, 15)

        --adminheader_text:SetContentAlignment( 5 )



        --[[ (i*30)+1

        --[[

            Info about the banning Admin

        ]]
@@ -1360,7 +1350,7 @@ MSync.modules[info.ModuleIdentifier].net = function() 
    ]]

    net.Receive( "msync."..info.ModuleIdentifier..".recieveData", function( len, ply )

        MSync.modules[info.ModuleIdentifier].explodeTable(MSync.modules[info.ModuleIdentifier].banTable, net.ReadTable())

        print(MSync.modules[info.ModuleIdentifier].temporary['recieved'])



        MSync.modules[info.ModuleIdentifier].temporary["recieved"] = MSync.modules[info.ModuleIdentifier].temporary["recieved"] + 1



        if MSync.modules[info.ModuleIdentifier].temporary["recieved"] == MSync.modules[info.ModuleIdentifier].temporary["count"] then

lua/msync/server/modules/sv_mbsync.lua

+89 −8
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ MSync.modules[info.ModuleIdentifier].init = function( transaction ) 
        );

    ]] ))





    --[[

        Description: Function to ban a player

        Returns: nothing
@@ -60,12 +59,13 @@ MSync.modules[info.ModuleIdentifier].init = function( transaction ) 
                (SELECT p_group_id FROM tbl_server_grp WHERE group_name=?)

            );

        ]] )

        local timestamp = os.time()

        banUserQ:setString(1, ply:SteamID())

        banUserQ:setString(2, ply:SteamID64())

        banUserQ:setString(3, calling_ply:SteamID())

        banUserQ:setString(4, calling_ply:SteamID64())

        banUserQ:setString(5, reason)

        banUserQ:setNumber(6, os.time())

        banUserQ:setNumber(6, timestamp)

        banUserQ:setNumber(7, length*60)

        if not allserver then

            banUserQ:setString(8, MSync.settings.data.serverGroup)
@@ -81,8 +81,8 @@ MSync.modules[info.ModuleIdentifier].init = function( transaction ) 
            local banData = {

                admin = calling_ply:Nick(),

                reason = reason,

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

                time = os.time()

                unban = timestamp+(length*60),

                time = timestamp

            }

            if length == 0 then

                banData["unban"] = length
@@ -129,12 +129,13 @@ MSync.modules[info.ModuleIdentifier].init = function( transaction ) 
                (SELECT p_group_id FROM tbl_server_grp WHERE group_name=?)

            );

        ]] )

        local timestamp = os.time()

        banUserIdQ:setString(1, userid)

        banUserIdQ:setString(2, userid)

        banUserIdQ:setString(3, calling_ply:SteamID())

        banUserIdQ:setString(4, calling_ply:SteamID64())

        banUserIdQ:setString(5, reason)

        banUserIdQ:setNumber(6, os.time())

        banUserIdQ:setNumber(6, timestamp)

        banUserIdQ:setNumber(7, length)

        if not allserver then

            banUserIdQ:setString(8, MSync.settings.data.serverGroup)
@@ -148,8 +149,8 @@ MSync.modules[info.ModuleIdentifier].init = function( transaction ) 
            local banData = {

                admin = calling_ply:Nick(),

                reason = reason,

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

                time = os.time()

                unban = timestamp+(length*60),

                time = timestamp

            }

            if length == 0 then

                banData["unban"] = length
@@ -513,6 +514,86 @@ MSync.modules[info.ModuleIdentifier].init = function( transaction ) 
        getActiveBansQ:start()

    end



    --[[

        Description: Function to get all active bans

        Returns: nothing

    ]]

    MSync.modules[info.ModuleIdentifier].exportBansToULX = function()

        local exportActiveBans = MSync.DBServer:prepare( [[

            SELECT 

                tbl_mbsync.*,

                banned.steamid,

                banned.steamid64,

                banned.nickname AS 'banned.nickname',

                admin.nickname AS 'admin.nickname',

                admin.steamid AS 'admin.steamid'

            FROM `tbl_mbsync`

            LEFT JOIN tbl_users AS banned

                ON tbl_mbsync.user_id = banned.p_user_id

            LEFT JOIN tbl_users AS admin

                ON tbl_mbsync.admin_id = admin.p_user_id

            WHERE

                ban_lifted IS NULL AND

                (

                    (date_unix+length_unix)>? OR

                     length_unix=0

                ) AND

                (

                    server_group=(SELECT p_group_id FROM tbl_server_grp WHERE group_name=?) OR

                    server_group=(SELECT p_group_id FROM tbl_server_grp WHERE group_name='allservers')

                )

        ]] )

        exportActiveBans:setNumber(1, os.time())

        exportActiveBans:setString(8, MSync.settings.data.serverGroup)



        exportActiveBans.onSuccess = function( q, data )



            local function escapeString( str )

                if not str then

                    return "NULL"

                else

                    return sql.SQLStr(str)

                end

            end



            print("[MBSync] Exporting Bans to ULX")

            for k,v in pairs(data) do

                local unban

                if v.length_unix == 0 then

                    unban = 0

                else

                    unban = v.date_unix + v.length_unix

                end



                ULib.bans[ v["steamid"] ] = {

                    admin = v["admin.nickname"],

                    time = v.date_unix,

                    unban = unban,

                    reason = v.reason,

                    name = v["banned.nickname"]

                }

                hook.Call( ULib.HOOK_USER_BANNED, _, v["steamid"], ULib.bans[ v["steamid"] ] )

            end

            ULib.fileWrite( ULib.BANS_FILE, ULib.makeKeyValues( ULib.bans ) )

            print("[MBSync] Export finished")



        end



        exportActiveBans.onError = function( q, err, sql )

            print("------------------------------------")

            print("[MBSync] SQL Error!")

            print("------------------------------------")

            print("Please include this in a Bug report:\n")

            print(err.."\n")

            print("------------------------------------")

            print("Do not include this, this is for debugging only:\n")

            print(sql.."\n")

            print("------------------------------------")

        end



        exportActiveBans:start()

    end



    --[[

        Description: Function to load the MSync settings file

        Returns: true
@@ -1123,7 +1204,7 @@ MSync.modules[info.ModuleIdentifier].hooks = function() 


    hook.Add("PlayerDisconnected", "msync."..info.ModuleIdentifier..".saveDisconnects", function( ply )

        if ply:IsBot() then return end

        local tableLength = #MSync.modules[info.ModuleIdentifier].recentDisconnects

        local tableLength = table.Count(MSync.modules[info.ModuleIdentifier].recentDisconnects)

        local data = {

            name = ply:Name(),

            steamid = ply:SteamID(),