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

Bugfixes 

First test didn't go very well. Much more work needs to be done.

UPDATE: EGG_0.0.4
parent 8cbf6c88

autorun/msync_autorun.lua

+9 −13
Original line number Diff line number Diff line 
if SERVER then 

    include("/msync/sh_init.lua")

    AddCSLuaFile("/msync/sh_init.lua")

    include("msync/sh_init.lua")

    AddCSLuaFile("msync/sh_init.lua")



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

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



    MSync.function.loadServer()



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

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

    end

    MSync.func.loadServer()

elseif CLIENT then

    include("/msync/sh_init.lua")

    include("msync/sh_init.lua")



    include("/msync/client_gui/cl_admin_gui.lua")

    include("/msync/client_gui/cl_init.lua")

    include("/msync/client_gui/cl_net.lua")

    include("/msync/client_gui/cl_modules.lua")

    include("msync/client_gui/cl_admin_gui.lua")

    include("msync/client_gui/cl_init.lua")

    include("msync/client_gui/cl_net.lua")

    include("msync/client_gui/cl_modules.lua")



end
 
 No newline at end of file

msync/client_gui/modules/cl_samplemodule.lua

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ MSync.modules.SampleModule = MSync.modules.SampleModule or {} 
MSync.modules.SampleModule.info = {

    Name = "Sample Module",

    ModuleIdentifier = "SampleModule",

    Description = "A basic example module on how to create modules"

    Description = "A basic example module on how to create modules",

    Version = "0.0.1"

}



--[[

msync/server/modules/sv_samplemodule.lua

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ MSync.modules.SampleModule = MSync.modules.SampleModule or {} 
MSync.modules.SampleModule.info = {

    Name = "Sample Module",

    ModuleIdentifier = "SampleModule",

    Description = "A basic example module on how to create modules"

    Description = "A basic example module on how to create modules",

    Version = "1.0.0"

}



--[[

msync/server/sv_hooks.lua

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
    Returns: nothing

]]

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

    MSync.function.loadSettings()

    MSync.func.loadSettings()

    

    --[[

        Description: timer to prevent loading before ULX

msync/server/sv_init.lua

+18 −12
Original line number Diff line number Diff line
@@ -3,18 +3,24 @@ MSync.net = MSync.net or {} 
MSync.mysql     = MSync.mysql or {}

MSync.modules   = MSync.modules or {}

MSync.settings  = MSync.settings or {}

MSync.function  = MSync.function or {}

MSync.func  = MSync.func or {}



--[[

    Description: Function to load the server side files

    Returns: nothing

]]

function MSync.function.loadServer()

function MSync.func.loadServer()



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

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

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

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

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

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

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

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

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



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

    for k, v in pairs(files) do

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

    end



end
@@ -22,7 +28,7 @@ end 
    Description: Function to load the MSync settings file

    Returns: true

]]

function MSync.function.loadSettings()

function MSync.func.loadSettings()

    if not file.Exists("msync/settings.txt", "DATA") then

        MSync.settings.data = {

            mysql = {
@@ -50,7 +56,7 @@ end 
    Description: Function to save the MSync settings to the settings file

    Returns: true if the settings file exists

]]

function MSync.function.saveSettings()

function MSync.func.saveSettings()

    file.Write("msync/settings.txt", util.TableToJSON(MSync.settings.data, true))

    return file.Exists("msync/settings.txt", "DATA")

end
@@ -59,7 +65,7 @@ end 
    Description: Function to get a table of the module informations

    Returns: table with Module informations

]]

function MSync.function.getModuleInfos()

function MSync.func.getModuleInfos()

    local infoTable = {}



    for k,v in pairs(MSync.modules) do
@@ -75,7 +81,7 @@ end 
                We have decided that its better to Re-Enter the password always, and not be able to see the MySQL password client side

    Returns: safe settings table

]]

function MSync.function.getSafeSettings()

function MSync.func.getSafeSettings()

    local settings = MSync.settings.data

    settings.mysql.password = nil