Merge pull request #1 from Aperture-Development/development

Update CHEESE_0.2.1

Author: ApertureDevelopment

database.sql

@@ -8,15 +8,19 @@ USE `msync`;
 CREATE TABLE IF NOT EXISTS `tbl_msyncdb_version` ( `version` float NOT NULL );
 
 CREATE TABLE IF NOT EXISTS `tbl_msync_servers` (
-	`p_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    `server_name` VARCHAR(15) NOT NULL,
+    `p_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    `server_name` VARCHAR(55) NOT NULL,
     `options` VARCHAR(100) NOT NULL DEFAULT '[]',
-    `server_group` VARCHAR(45)
+    `ip` INT NOT NULL,
+    `port` VARCHAR(5) NOT NULL,
+    `server_group` INT NOT NULL,
+    UNIQUE INDEX `server_UNIQUE` (`ip`, `port`)
 );
 
 CREATE TABLE IF NOT EXISTS `tbl_server_grp` (
-	`p_group_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-    `group_name` VARCHAR(15) NOT NULL
+    `p_group_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
+    `group_name` VARCHAR(15) NOT NULL,
+    UNIQUE INDEX `group_UNIQUE` (`group_name`)
 );
 
 CREATE TABLE IF NOT EXISTS `tbl_users` (

msync/client_gui/cl_admin_gui.lua

@@ -10,55 +10,65 @@ function MSync.AdminPanel.InitMySQL( sheet )
     local pnl = vgui.Create( "DPanel", sheet )
 
     local mysqlip_text = vgui.Create( "DLabel", pnl )
-    mysqlip_text:SetPos( 25, 30 )
+    mysqlip_text:SetPos( 25, 10 )
     mysqlip_text:SetColor( Color( 0, 0, 0 ) )
     mysqlip_text:SetText( "Host IP" )
 
     local mysqlip = vgui.Create( "DTextEntry", pnl )
-    mysqlip:SetPos( 25, 50 )
+    mysqlip:SetPos( 25, 30 )
     mysqlip:SetSize( 150, 20 )
     mysqlip:SetText( "127.0.0.1" )
 
     local mysqlport_text = vgui.Create( "DLabel", pnl )
-    mysqlport_text:SetPos( 25, 75 )
+    mysqlport_text:SetPos( 25, 55 )
     mysqlport_text:SetColor( Color( 0, 0, 0 ) )
     mysqlport_text:SetText( "Host Port" )
 
     local mysqlport = vgui.Create( "DTextEntry", pnl )
-    mysqlport:SetPos( 25, 95 )
+    mysqlport:SetPos( 25, 75 )
     mysqlport:SetSize( 150, 20 )
     mysqlport:SetText( "3306" )
 
     local mysqldb_text = vgui.Create( "DLabel", pnl )
-    mysqldb_text:SetPos( 25, 120 )
+    mysqldb_text:SetPos( 25, 100 )
     mysqldb_text:SetColor( Color( 0, 0, 0 ) )
     mysqldb_text:SetText( "Database" )
 
     local mysqldb = vgui.Create( "DTextEntry", pnl )
-    mysqldb:SetPos( 25, 140 )
+    mysqldb:SetPos( 25, 120 )
     mysqldb:SetSize( 150, 20 )
     mysqldb:SetText( "MSync" )
 
     local mysqluser_text = vgui.Create( "DLabel", pnl )
-    mysqluser_text:SetPos( 25, 165 )
+    mysqluser_text:SetPos( 25, 145 )
     mysqluser_text:SetColor( Color( 0, 0, 0 ) )
     mysqluser_text:SetText( "Username" )
 
     local mysqluser = vgui.Create( "DTextEntry", pnl )
-    mysqluser:SetPos( 25, 185 )
+    mysqluser:SetPos( 25, 165 )
     mysqluser:SetSize( 150, 20 )
     mysqluser:SetText( "root" )
 
     local mysqlpassword_text = vgui.Create( "DLabel", pnl )
-    mysqlpassword_text:SetPos( 25, 210 )
+    mysqlpassword_text:SetPos( 25, 190 )
     mysqlpassword_text:SetColor( Color( 0, 0, 0 ) )
     mysqlpassword_text:SetText( "Password" )
 
     local mysqlpassword = vgui.Create( "DTextEntry", pnl )
-    mysqlpassword:SetPos( 25, 230 )
+    mysqlpassword:SetPos( 25, 210 )
     mysqlpassword:SetSize( 150, 20 )
     mysqlpassword:SetText( "*****" )
 
+    local servergroup_text = vgui.Create( "DLabel", pnl )
+    servergroup_text:SetPos( 25, 235 )
+    servergroup_text:SetColor( Color( 0, 0, 0 ) )
+    servergroup_text:SetText( "Server Group" )
+
+    local servergroup = vgui.Create( "DTextEntry", pnl )
+    servergroup:SetPos( 25, 255 )
+    servergroup:SetSize( 150, 20 )
+    servergroup:SetText( "allserver" )
+
     local title_info = vgui.Create( "DLabel", pnl )
     title_info:SetPos( 200, 25 )
     title_info:SetColor( Color( 0, 0, 0 ) )
@@ -96,6 +106,7 @@ function MSync.AdminPanel.InitMySQL( sheet )
         MSync.settings.mysql.database = mysqldb:GetValue()
         MSync.settings.mysql.username = mysqluser:GetValue()
         MSync.settings.mysql.password = mysqlpassword:GetValue()
+        MSync.settings.serverGroup = servergroup:GetValue()
         MSync.net.sendSettings(MSync.settings)
     end
 
@@ -109,6 +120,7 @@ function MSync.AdminPanel.InitMySQL( sheet )
         MSync.settings.mysql.database = mysqldb:GetValue()
         MSync.settings.mysql.username = mysqluser:GetValue()
         MSync.settings.mysql.password = mysqlpassword:GetValue()
+        MSync.settings.serverGroup = servergroup:GetValue()
         MSync.net.sendSettings(MSync.settings)
         MSync.net.connectDB()
     end
@@ -131,11 +143,13 @@ function MSync.AdminPanel.InitMySQL( sheet )
         mysqldb:SetText("msync")
         mysqluser:SetText("root")
         mysqlpassword:SetText("****")
+        servergroup:SetText("allserver")
         MSync.settings.mysql.host = mysqlip:GetValue()
         MSync.settings.mysql.port = mysqlport:GetValue()
         MSync.settings.mysql.database = mysqldb:GetValue()
         MSync.settings.mysql.username = mysqluser:GetValue()
         MSync.settings.mysql.password = ""
+        MSync.settings.serverGroup = servergroup:GetValue()
         MSync.net.sendSettings(MSync.settings)
     end
 
@@ -144,6 +158,7 @@ function MSync.AdminPanel.InitMySQL( sheet )
         mysqlport:SetText(MSync.settings.mysql.port)
         mysqldb:SetText(MSync.settings.mysql.database)
         mysqluser:SetText(MSync.settings.mysql.username)
+        servergroup:SetText(MSync.settings.serverGroup)
     else
         timer.Create("msync.t.checkForSettings", 0.5, 0, function()
             if not MSync.settings or not MSync.settings.mysql then return end;
@@ -152,6 +167,7 @@ function MSync.AdminPanel.InitMySQL( sheet )
             mysqlport:SetText(MSync.settings.mysql.port)
             mysqldb:SetText(MSync.settings.mysql.database)
             mysqluser:SetText(MSync.settings.mysql.username)
+            servergroup:SetText(MSync.settings.serverGroup)
             timer.Remove("msync.t.checkForSettings")
         end)
     end
@@ -210,6 +226,8 @@ function MSync.AdminPanel.InitModuleSettings( sheet )
 
     for k, v in pairs(files) do
         local info = include("msync/client_gui/modules/"..v)
+        MSync.modules[info.ModuleIdentifier]["init"]()
+        MSync.modules[info.ModuleIdentifier]["net"]()
         pnl:AddSheet( info.Name, MSync.modules[info.ModuleIdentifier].adminPanel(pnl))
     end
 

msync/client_gui/cl_modules.lua

@@ -8,9 +8,11 @@ MSync.modules   = MSync.modules or {}
     Returns: nothing
 ]]
 function MSync.loadModules()
-    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
         include("msync/client_gui/modules/"..v)
     end
+    MSync.initModules()
 end
 
 --[[
@@ -19,12 +21,13 @@ end
 ]]
 function MSync.initModules()
 
-    for k,v in pairs(MSync.Modules) do
+    for k,v in pairs(MSync.modules) do
+        if not MSync.moduleState[v["info"]["ModuleIdentifier"]] then return end;
         v["init"]()
         v["net"]()
         v["ulx"]()
         v["hooks"]()
-        print("["..v[info][Name].."] Module loaded")
+        print("["..v["info"]["Name"].."] Module loaded")
     end
 
 end
@@ -45,4 +48,4 @@ function MSync.loadModule(path)
 
     print("["..MSync.modules[info.Name].."] Module loaded")
 
-end
+end

msync/client_gui/cl_net.lua

@@ -58,7 +58,11 @@ net.Receive( "msync.sendTable", function( len, pl )
     local table = net.ReadTable()
 
     if type == "settings" then MSync.settings = table; print("Got Settings!")
-    elseif type == "modules" then MSync.serverModules = table end
+    elseif type == "modules" then MSync.serverModules = table 
+    elseif type == "modulestate" then 
+        MSync.moduleState = table
+        MSync.loadModules() 
+    end
 end )
 
 --[[
@@ -83,4 +87,12 @@ end )
 ]]
 net.Receive( "msync.openAdminGUI", function( len, pl )
     MSync.AdminPanel.InitPanel()
+end )
+
+--[[
+    Description:  Net Receiver - Gets called when server sent the db status
+    Returns: nothing
+]]
+net.Receive( "msync.dbStatus", function( len, pl )
+    MSync.DBStatus = net.ReadBool()
 end )