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

Merge pull request #26 from Aperture-Development/master 

Updating bugfix branch to current
parents ee693e74 ac621f01

addon.json

+3 −2
Original line number Diff line number Diff line
@@ -10,8 +10,9 @@ 
		"*samplemodule.lua",

		"LICENSE",

		"README.md",

		"database.sql",

		"*.sql",

		".git/*",

		".git"

		".git*",

		".vscode*"

	]

}
 
 No newline at end of file

database.sql

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS `tbl_mbsync` ( 
    `adminid` INT UNSIGNED NOT NULL,

    `reason` VARCHAR(45) NOT NULL,

    `date_unix` float NOT NULL,

    `lenght_unix` float NOT NULL,

    `length_unix` float NOT NULL,

    `server_group` INT UNSIGNED NOT NULL,

    `ban_lifted` INT UNSIGNED,

    FOREIGN KEY (server_group) REFERENCES tbl_server_grp(p_group_id),

fake_data.sql

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/*INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:1', '760000001', 'User 1', '2020-04-09 17:00');

INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:2', '760000002', 'User 2', '2020-04-09 17:00');

INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:3', '760000003', 'User 3', '2020-04-09 17:00');

INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:4', '760000004', 'User 4', '2020-04-09 17:00');

INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:5', '760000005', 'User 5', '2020-04-09 17:00');

INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:6', '760000006', 'User 6', '2020-04-09 17:00');

INSERT INTO tbl_users (steamid, steamid64, nickname, joined) VALUES ('STEAM_0:0:7', '760000007', 'User 7', '2020-04-09 17:00');*/



INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (7, 2, 'Test 1', 1586445390, 99999999, 1);

INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (2, 3, 'Test 2', 1586445390, 99999999, 1);

INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (3, 4, 'Test 3', 1586445390, 99999999, 1);

INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (4, 5, 'Test 4', 1586445390, 99999999, 1);

INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (5, 6, 'Test 5', 1586445390, 99999999, 1);

INSERT INTO tbl_mbsync (user_id, admin_id, reason, date_unix, length_unix, server_group) VALUES (6, 7, 'Test 6', 1586445390, 99999999, 1);
 
 No newline at end of file

lua/msync/client_gui/cl_admin_gui.lua

+17 −14
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