Bugfixes

UPDATE: EGG_0.0.7

Author: ApertureDevelopment

msync/client_gui/cl_admin_gui.lua

@@ -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" )
 
-    for k,v in pairs(MSync.serverModules) do
-        ModuleList:AddItem(v["Name"], v["ModuleIdentifier"], v["state"])
-    end
+    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

@@ -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

@@ -1,4 +1,4 @@
-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

@@ -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

@@ -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
 
 --[[

msync/server/sv_net.lua

@@ -16,8 +16,8 @@ function MSync.net.sendTable(ply, identifier, table)
         net.WriteString(identifier)
         net.WriteTable(table)
     net.Send(ply)
-
 end
+util.AddNetworkString("msync.sendTable")
 
 --[[
     Description: Function to send a text message to the client
@@ -34,8 +34,8 @@ function MSync.net.sendMessage(ply, state, string)
         net.WriteString(state)
         net.WriteString(string)
     net.Send(ply)
-
 end
+util.AddNetworkString("msync.sendMessage")
 
 --[[
     Description: Function to open the admin GUI on the client
@@ -47,11 +47,13 @@ function MSync.net.openAdminGUI(ply)
     net.Start("msync.openAdminGUI")
     net.Send(ply)
 end
+util.AddNetworkString("msync.openAdminGUI")
 
 --[[
     Description: Net Receiver - Gets called when the client requests a table
     Returns: nothing
 ]]   
+util.AddNetworkString("msync.getTable")
 net.Receive("msync.getTable", function(len, ply)
     if not ply:query("msync.getTable") then return end
 
@@ -63,6 +65,7 @@ end )
     Description: Net Receiver - Gets called when the client sends the settings table to the server
     Returns: nothing
 ]]   
+util.AddNetworkString("msync.sendSettings")
 net.Receive("msync.sendSettings", function(len, ply)
     if not ply:query("msync.sendSettings") then return end
 
@@ -74,6 +77,7 @@ end )
     Description: Net Receiver - Gets called when the client requests the settings table
     Returns: nothing
 ]]   
+util.AddNetworkString("msync.getSettings")
 net.Receive("msync.getSettings", function(len, ply)
     if not ply:query("msync.getSettings") then return end
 
@@ -84,6 +88,7 @@ end )
     Description: Net Receiver - Gets called when the client requests the module table
     Returns: nothing
 ]]   
+util.AddNetworkString("msync.getModules")
 net.Receive("msync.getModules", function(len, ply)
     if not ply:query("msync.getModules") then return end
 

msync/server/sv_ulx.lua

@@ -13,6 +13,7 @@ function MSync.ulx.createPermissions()
     ULib.ucl.registerAccess("msync.loadModule", "superadmin", "Allows the player to load a module", "MSync")
     ULib.ucl.registerAccess("msync.reloadModules", "superadmin", "Allows the player to reload all modules", "MSync")
     ULib.ucl.registerAccess("msync.toggleModule", "superadmin", "Allows the player to enable/disable modules", "MSync"	)
+    ULib.ucl.registerAccess("msync.getSettings", "superadmin", "Allows the player to get the server settings", "MSync"	)
 end
 
 --[[
@@ -23,8 +24,9 @@ function MSync.ulx.createCommands()
 
     function MSync.func.openAdminGUI(calling_ply)
         if not calling_ply:query("msync.openAdminGUI") then return end;
+        if not IsValid(calling_ply) then return end;
 
-        MSync.net.openAdminGUI(ply)
+        MSync.net.openAdminGUI(calling_ply)
     end
     local OpenAdminGUI = ulx.command( "MSync", "msync.openAdminGUI", MSync.func.openAdminGUI, "!msync" )
     OpenAdminGUI:defaultAccess( ULib.ACCESS_SUPERADMIN )