Unverified Commit ac621f01 authored by Maximilian Grüttemeier's avatar Maximilian Grüttemeier Committed by GitHub
Browse files

Merge pull request #24 from Aperture-Development/development 

Bugfix for #22
parents c683cf49 bacc115a

lua/msync/client_gui/cl_admin_gui.lua

+6 −3
Original line number Diff line number Diff line
@@ -226,10 +226,13 @@ function MSync.AdminPanel.InitModuleSettings( sheet ) 


    for k, v in pairs(files) do

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



        if MSync.moduleState[info["ModuleIdentifier"]] then

            MSync.modules[info.ModuleIdentifier]["init"]()

            MSync.modules[info.ModuleIdentifier]["net"]()

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

        end

    end



    return pnl

end

lua/msync/client_gui/cl_modules.lua

+7 −6
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ end 
function MSync.initModules()



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

        if not MSync.moduleState[v["info"]["ModuleIdentifier"]] then return end;

        if MSync.moduleState[v["info"]["ModuleIdentifier"]] then

            v["init"]()

            v["net"]()

            v["ulx"]()

            v["hooks"]()

            print("["..v["info"]["Name"].."] Module loaded")

        end

    end



end

lua/msync/server/sv_init.lua

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ end 
    Returns: safe settings table

]]

function MSync.func.getSafeSettings()

    local settings = MSync.settings.data

    local settings = table.Copy(MSync.settings.data)

    settings.mysql.password = nil



    return settings

lua/msync/server/sv_net.lua

+1 −2
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ end ) 
util.AddNetworkString("msync.getSettings")

net.Receive("msync.getSettings", function(len, ply)

    if not ply:query("msync.getSettings") then return end



    MSync.net.sendTable(ply, "settings", MSync.func.getSafeSettings())

end )
@@ -126,9 +125,9 @@ util.AddNetworkString("msync.toggleModule") 
net.Receive("msync.toggleModule", function(len, ply)

    if not ply:query("msync.toggleModule") then return end





    local ident = net.ReadString()

    local state = net.ReadString()



    if state == "Enable" then

        MSync.settings.data.enabledModules[ident] = true

    elseif state == "Disable" then