Skip to content

Commit 7805474

Browse files
ApertureDevelopmentApertureDevelopment
authored
Merge pull request #26 from Aperture-Development/master
Updating bugfix branch to current
2 parents ee693e7 + ac621f0 commit 7805474

19 files changed

+2480
-239
lines changed

‎addon.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
"*samplemodule.lua",
1111
"LICENSE",
1212
"README.md",
13-
"database.sql",
13+
"*.sql",
1414
".git/*",
15-
".git"
15+
".git*",
16+
".vscode*"
1617
]
1718
}

‎database.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS `tbl_mbsync` (
3939
`adminid` INT UNSIGNED NOT NULL,
4040
`reason` VARCHAR(45) NOT NULL,
4141
`date_unix` float NOT NULL,
42-
`lenght_unix` float NOT NULL,
42+
`length_unix` float NOT NULL,
4343
`server_group` INT UNSIGNED NOT NULL,
4444
`ban_lifted` INT UNSIGNED,
4545
FOREIGN KEY (server_group) REFERENCES tbl_server_grp(p_group_id),

‎fake_data.sql‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/*INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:1', '760000001', 'User 1', '2020-04-09 17:00');
2+
INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:2', '760000002', 'User 2', '2020-04-09 17:00');
3+
INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:3', '760000003', 'User 3', '2020-04-09 17:00');
4+
INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:4', '760000004', 'User 4', '2020-04-09 17:00');
5+
INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:5', '760000005', 'User 5', '2020-04-09 17:00');
6+
INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:6', '760000006', 'User 6', '2020-04-09 17:00');
7+
INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:7', '760000007', 'User 7', '2020-04-09 17:00');*/
8+
9+
INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (7, 2, 'Test 1', 1586445390, 99999999, 1);
10+
INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (2, 3, 'Test 2', 1586445390, 99999999, 1);
11+
INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (3, 4, 'Test 3', 1586445390, 99999999, 1);
12+
INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (4, 5, 'Test 4', 1586445390, 99999999, 1);
13+
INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (5, 6, 'Test 5', 1586445390, 99999999, 1);
14+
INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (6, 7, 'Test 6', 1586445390, 99999999, 1);

‎lua/autorun/msync_autorun.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if SERVER then
1+
if SERVER then
22
include("msync/sh_init.lua")
33
AddCSLuaFile("msync/sh_init.lua")
44

‎lua/msync/client_gui/cl_admin_gui.lua‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MSync.AdminPanel = MSync.AdminPanel or {}
66
Arguments: parent sheet
77
Returns: panel
88
]]
9-
function MSync.AdminPanel.InitMySQL( sheet )
9+
function MSync.AdminPanel.InitMySQL( sheet )
1010
local pnl = vgui.Create( "DPanel", sheet )
1111

1212
local mysqlip_text = vgui.Create( "DLabel", pnl )
@@ -97,10 +97,10 @@ function MSync.AdminPanel.InitMySQL( sheet )
9797
dbstatus:SetText( "DB Connection status: -Not Implemented-" )
9898

9999
local save_button = vgui.Create( "DButton", pnl )
100-
save_button:SetText( "Save Settings" )
100+
save_button:SetText( "Save Settings" )
101101
save_button:SetPos( 25, 290 )
102102
save_button:SetSize( 130, 30 )
103-
save_button.DoClick = function()
103+
save_button.DoClick = function()
104104
MSync.settings.mysql.host = mysqlip:GetValue()
105105
MSync.settings.mysql.port = mysqlport:GetValue()
106106
MSync.settings.mysql.database = mysqldb:GetValue()
@@ -111,10 +111,10 @@ function MSync.AdminPanel.InitMySQL( sheet )
111111
end
112112

113113
local saveconnect_button = vgui.Create( "DButton", pnl )
114-
saveconnect_button:SetText( "Save and Connect" )
114+
saveconnect_button:SetText( "Save and Connect" )
115115
saveconnect_button:SetPos( 155, 290 )
116116
saveconnect_button:SetSize( 130, 30 )
117-
saveconnect_button.DoClick = function()
117+
saveconnect_button.DoClick = function()
118118
MSync.settings.mysql.host = mysqlip:GetValue()
119119
MSync.settings.mysql.port = mysqlport:GetValue()
120120
MSync.settings.mysql.database = mysqldb:GetValue()
@@ -126,18 +126,18 @@ function MSync.AdminPanel.InitMySQL( sheet )
126126
end
127127

128128
local connect_button = vgui.Create( "DButton", pnl )
129-
connect_button:SetText( "Connect" )
129+
connect_button:SetText( "Connect" )
130130
connect_button:SetPos( 285, 290 )
131131
connect_button:SetSize( 130, 30 )
132-
connect_button.DoClick = function()
132+
connect_button.DoClick = function()
133133
MSync.net.connectDB()
134134
end
135135

136136
local reset_button = vgui.Create( "DButton", pnl )
137-
reset_button:SetText( "Reset Settings" )
137+
reset_button:SetText( "Reset Settings" )
138138
reset_button:SetPos( 415, 290 )
139139
reset_button:SetSize( 130, 30 )
140-
reset_button.DoClick = function()
140+
reset_button.DoClick = function()
141141
mysqlip:SetText("127.0.0.1")
142142
mysqlport:SetText("3306")
143143
mysqldb:SetText("msync")
@@ -180,7 +180,7 @@ end
180180
Arguments: parent sheet
181181
Returns: panel
182182
]]
183-
function MSync.AdminPanel.InitModules( sheet )
183+
function MSync.AdminPanel.InitModules( sheet )
184184
local pnl = vgui.Create( "DPanel", sheet )
185185

186186
local ModuleList = vgui.Create( "DListView", pnl )
@@ -219,16 +219,19 @@ end
219219
Arguments: parent sheet
220220
Returns: panel
221221
]]
222-
function MSync.AdminPanel.InitModuleSettings( sheet )
222+
function MSync.AdminPanel.InitModuleSettings( sheet )
223223
local pnl = vgui.Create( "DColumnSheet", sheet )
224224

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

227227
for k, v in pairs(files) do
228228
local info = include("msync/client_gui/modules/"..v)
229-
MSync.modules[info.ModuleIdentifier]["init"]()
230-
MSync.modules[info.ModuleIdentifier]["net"]()
231-
pnl:AddSheet( info.Name, MSync.modules[info.ModuleIdentifier].adminPanel(pnl))
229+
230+
if MSync.moduleState[info["ModuleIdentifier"]] then
231+
MSync.modules[info.ModuleIdentifier]["init"]()
232+
MSync.modules[info.ModuleIdentifier]["net"]()
233+
pnl:AddSheet( info.Name, MSync.modules[info.ModuleIdentifier].adminPanel(pnl))
234+
end
232235
end
233236

234237
return pnl

‎lua/msync/client_gui/cl_modules.lua‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ end
2222
function MSync.initModules()
2323

2424
for k,v in pairs(MSync.modules) do
25-
if not MSync.moduleState[v["info"]["ModuleIdentifier"]] then return end;
26-
v["init"]()
27-
v["net"]()
28-
v["ulx"]()
29-
v["hooks"]()
30-
print("["..v["info"]["Name"].."] Module loaded")
25+
if MSync.moduleState[v["info"]["ModuleIdentifier"]] then
26+
v["init"]()
27+
v["net"]()
28+
v["ulx"]()
29+
v["hooks"]()
30+
print("["..v["info"]["Name"].."] Module loaded")
31+
end
3132
end
3233

3334
end

‎lua/msync/client_gui/cl_net.lua‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ net.Receive( "msync.sendTable", function( len, pl )
5858
local table = net.ReadTable()
5959

6060
if type == "settings" then MSync.settings = table; print("Got Settings!")
61-
elseif type == "modules" then MSync.serverModules = table
62-
elseif type == "modulestate" then
61+
elseif type == "modules" then MSync.serverModules = table
62+
elseif type == "modulestate" then
6363
MSync.moduleState = table
64-
MSync.loadModules()
64+
MSync.loadModules()
6565
end
6666
end )
6767

0 commit comments

Comments
 (0)