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

Bugfixes 

UPDATE: EGG_0.0.7
parent 35066259

msync/client_gui/cl_admin_gui.lua

+18 −6
Original line number Diff line number Diff line
@@ -104,7 +104,10 @@ function MSync.AdminPanel.InitMySQL( sheet ) 
        mysqldb:SetText(MSync.settings.mysql.database)

        mysqluser:SetText(MSync.settings.mysql.username)

    else

        timer.Simple(2, function()

        timer.Create("msync.t.checkForSettings", 1, 0, function()

            if not MSync.settings or not MSync.settings.mysql then return end;



            timer.Remove("msync.t.checkForSettings")

            mysqlip:SetText(MSync.settings.mysql.host)

            mysqlport:SetText(MSync.settings.mysql.port)

            mysqldb:SetText(MSync.settings.mysql.database)
@@ -130,9 +133,16 @@ function MSync.AdminPanel.InitModules( sheet ) 
    ModuleList:AddColumn( "Identifier" )

    ModuleList:AddColumn( "Enabled" )



    timer.Create("msync.t.checkForServerModules", 1, 0, function()



        if not MSync.serverModules then return end;



        timer.Remove("msync.t.checkForServerModules")



        for k,v in pairs(MSync.serverModules) do

            ModuleList:AddItem(v["Name"], v["ModuleIdentifier"], v["state"])

        end

    end)



    return pnl

end
@@ -145,9 +155,11 @@ end 
function MSync.AdminPanel.InitModuleSettings( sheet ) 

    local pnl = vgui.Create( "DColumnSheet", sheet )



    for k, v in pairs(file.Find("msync/client_gui/modules/*.lua", "LUA")[1]) do

    local files, _ = file.Find("msync/client_gui/modules/*.lua", "LUA")



    for k, v in pairs(files) do

        local info = include("msync/client_gui/modules/"..v)

        pnl:AddSheet( info.Name, MSync.modules[info.ModuleIdentifier].adminPanel(pnl), "icon16/box.png" )

        pnl:AddSheet( info.Name, MSync.modules[info.ModuleIdentifier].adminPanel(pnl))

    end



    return pnl

msync/client_gui/cl_net.lua

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ net.Receive( "msync.sendTable", function( len, pl ) 
    local type = net.ReadString()

    local table = net.ReadTable()



    if type == "settings" then MSync.settings = table

    if type == "settings" then MSync.settings = table; print("Got Settings!")

    elseif type == "modules" then MSync.serverModules = table end

end )

msync/client_gui/modules/cl_samplemodule.lua

+2 −2
Original line number Diff line number Diff line 
MSync = Msync or {}

MSync = MSync or {}

MSync.modules = MSync.modules or {}

MSync.modules.SampleModule = MSync.modules.SampleModule or {}

--[[
@@ -35,7 +35,7 @@ end 
]]

function MSync.modules.SampleModule.adminPanel(sheet)

    local pnl = vgui.Create( "DPanel", sheet )



    pnl:Dock(FILL)

    return pnl

end

msync/server/sv_hooks.lua

+5 −4
Original line number Diff line number Diff line
@@ -2,23 +2,24 @@ 
    Description: hook to initialize MSync 2

    Returns: nothing

]]

--[[

hook.Add( "Initialize", "msync.initScript", function()

    MSync.func.loadSettings()

    

    --[[

        Description: timer to prevent loading before ULX

        Returns: nothing

    ]]        

    timer.Create("msync.checkForULXandULib", 5, 0, function()

    ]      

    timer.Create("msync.t.checkForULXandULib", 5, 0, function()

        if not ULX and ULib then return end;



        timer.Remove("msync.checkForULXandULib")

        timer.Remove("msync.t.checkForULXandULib")

        MSync.ulx.createPermissions()

        MSync.ulx.createCommands()

        MSync.mysql.initialize() 

    end)

end)



]]

--[[

        Description: Creates a entry to the database for every player that joins.

        Returns: nothing

msync/server/sv_init.lua

+11 −4
Original line number Diff line number Diff line
@@ -17,6 +17,17 @@ function MSync.func.loadServer() 
    include("msync/server/sv_hooks.lua")

    include("msync/server/sv_ulx.lua")



    MSync.func.loadSettings()



    timer.Create("msync.t.checkForULXandULib", 5, 0, function()

        if not ULX and ULib then return end;



        timer.Remove("msync.t.checkForULXandULib")

        MSync.ulx.createPermissions()

        MSync.ulx.createCommands()

        MSync.mysql.initialize() 

    end)



    local files, _ = file.Find("msync/client_gui/*.lua", "LUA")

    for k, v in pairs(files) do

        AddCSLuaFile("msync/client_gui/"..v)
@@ -26,10 +37,6 @@ function MSync.func.loadServer() 
    for k, v in pairs(files) do

        AddCSLuaFile("msync/client_gui/modules/"..v)

    end



    util.AddNetworkString("msync.sendSettings")

    util.AddNetworkString("msync.getModules")

    util.AddNetworkString("msync.getSettings")

end



--[[