Skip to content

Commit dd01fa0

Browse files
Code Cleanup
- Cleaned up the code and removed all trailing whitespaces
1 parent 13f0708 commit dd01fa0

File tree

12 files changed

+80
-80
lines changed

12 files changed

+80
-80
lines changed

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: 11 additions & 11 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,7 +219,7 @@ 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")

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

lua/msync/client_gui/modules/cl_mrsync.lua

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ MSync.modules.MRSync.info = {
2222
--[[
2323
Define additional functions that are later used
2424
]]
25-
function MSync.modules.MRSync.init()
25+
function MSync.modules.MRSync.init()
2626

2727
end
2828

@@ -67,10 +67,10 @@ function MSync.modules.MRSync.adminPanel(sheet)
6767
end
6868

6969
local allserver_button = vgui.Create( "DButton", pnl )
70-
allserver_button:SetText( "Add" )
70+
allserver_button:SetText( "Add" )
7171
allserver_button:SetPos( 275, 15 )
7272
allserver_button:SetSize( 130, 20 )
73-
allserver_button.DoClick = function()
73+
allserver_button.DoClick = function()
7474
if allserver_textentry:GetValue() and not MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] then
7575
allserver_table:AddLine(allserver_textentry:GetValue())
7676
MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] = true
@@ -116,10 +116,10 @@ function MSync.modules.MRSync.adminPanel(sheet)
116116
end
117117

118118
local nosync_button = vgui.Create( "DButton", pnl )
119-
nosync_button:SetText( "Add" )
119+
nosync_button:SetText( "Add" )
120120
nosync_button:SetPos( 275, 155 )
121121
nosync_button:SetSize( 130, 20 )
122-
nosync_button.DoClick = function()
122+
nosync_button.DoClick = function()
123123
if nosync_textentry:GetValue() and not MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] and not MSync.modules.MRSync.settings.syncall[allserver_textentry:GetValue()] then
124124
nosync_table:AddLine(nosync_textentry:GetValue())
125125
MSync.modules.MRSync.settings.nosync[allserver_textentry:GetValue()] = true
@@ -136,22 +136,22 @@ function MSync.modules.MRSync.adminPanel(sheet)
136136
timer.Create("mrsync.t.checkSettings", 1, 0, function()
137137
if not MSync.modules.MRSync.settings then return end
138138

139-
for k,_ in pairs(MSync.modules.MRSync.settings.syncall) do
139+
for k,_ in pairs(MSync.modules.MRSync.settings.syncall) do
140140
allserver_table:AddLine(k)
141141
end
142-
143-
for k,_ in pairs(MSync.modules.MRSync.settings.nosync) do
142+
143+
for k,_ in pairs(MSync.modules.MRSync.settings.nosync) do
144144
nosync_table:AddLine(k)
145145
end
146146

147147
timer.Remove("mrsync.t.checkSettings")
148148
end)
149149
else
150-
for k,_ in pairs(MSync.modules.MRSync.settings.syncall) do
150+
for k,_ in pairs(MSync.modules.MRSync.settings.syncall) do
151151
allserver_table:AddLine(k)
152152
end
153153

154-
for k,_ in pairs(MSync.modules.MRSync.settings.nosync) do
154+
for k,_ in pairs(MSync.modules.MRSync.settings.nosync) do
155155
nosync_table:AddLine(k)
156156
end
157157
end
@@ -171,14 +171,14 @@ end
171171
--[[
172172
Define net receivers and util.AddNetworkString
173173
]]
174-
function MSync.modules.MRSync.net()
174+
function MSync.modules.MRSync.net()
175175

176176
--[[
177177
Description: Function to send the mrsync settings to the client
178178
Arguments:
179179
player [player] - the player that wants to open the admin GUI
180180
Returns: nothing
181-
]]
181+
]]
182182
function MSync.modules.MRSync.sendSettings()
183183
net.Start("msync.mrsync.sendSettings")
184184
net.WriteTable(MSync.modules.MRSync.settings)
@@ -190,7 +190,7 @@ function MSync.modules.MRSync.net()
190190
Arguments:
191191
player [player] - the player that wants to open the admin GUI
192192
Returns: nothing
193-
]]
193+
]]
194194
function MSync.modules.MRSync.getSettings()
195195
net.Start("msync.mrsync.getSettings")
196196
net.SendToServer()
@@ -199,7 +199,7 @@ function MSync.modules.MRSync.net()
199199
--[[
200200
Description: Net Receiver - Gets called when the client requests the settings table
201201
Returns: nothing
202-
]]
202+
]]
203203
net.Receive("msync.mrsync.sendSettingsPly", function(len, ply)
204204
MSync.modules.MRSync.settings = net.ReadTable()
205205
end )
@@ -208,14 +208,14 @@ end
208208
--[[
209209
Define ulx Commands and overwrite common ulx functions (module does not get loaded until ulx has fully been loaded)
210210
]]
211-
function MSync.modules.MRSync.ulx()
212-
211+
function MSync.modules.MRSync.ulx()
212+
213213
end
214214

215215
--[[
216216
Define hooks your module is listening on e.g. PlayerDisconnect
217217
]]
218-
function MSync.modules.MRSync.hooks()
218+
function MSync.modules.MRSync.hooks()
219219

220220
end
221221

lua/msync/client_gui/modules/cl_samplemodule.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ MSync.modules.SampleModule.info = {
2222
--[[
2323
Define additional functions that are later used
2424
]]
25-
function MSync.modules.SampleModule.init()
25+
function MSync.modules.SampleModule.init()
2626

2727
function MSync.modules.SampleModule.SampleFunction()
2828
return true
@@ -51,7 +51,7 @@ end
5151
--[[
5252
Define net receivers and util.AddNetworkString
5353
]]
54-
function MSync.modules.SampleModule.net()
54+
function MSync.modules.SampleModule.net()
5555
net.Receive( "my_message", function( len, pl )
5656
if ( IsValid( pl ) and pl:IsPlayer() ) then
5757
print( "Message from " .. pl:Nick() .. " received. Its length is " .. len .. "." )
@@ -64,16 +64,16 @@ end
6464
--[[
6565
Define ulx Commands and overwrite common ulx functions (module does not get loaded until ulx has fully been loaded)
6666
]]
67-
function MSync.modules.SampleModule.ulx()
68-
67+
function MSync.modules.SampleModule.ulx()
68+
6969
end
7070

7171
--[[
7272
Define hooks your module is listening on e.g. PlayerDisconnect
7373
]]
74-
function MSync.modules.SampleModule.hooks()
74+
function MSync.modules.SampleModule.hooks()
7575
hook.Add("initialize", "msync_sampleModule_init", function()
76-
76+
7777
end)
7878
end
7979

lua/msync/server/modules/sv_mrsync.lua

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ MSync.modules.MRSync.info = {
2222
--[[
2323
Define mysql table and additional functions that are later used
2424
]]
25-
function MSync.modules.MRSync.init( transaction )
25+
function MSync.modules.MRSync.init( transaction )
2626
transaction:addQuery( MSync.DBServer:query([[
2727
CREATE TABLE IF NOT EXISTS `tbl_mrsync` (
2828
`p_id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -34,7 +34,7 @@ function MSync.modules.MRSync.init( transaction )
3434
UNIQUE INDEX `user_UNIQUE` (`user_id`, `server_group`)
3535
);
3636
]] ))
37-
37+
3838
--[[
3939
Description: Function to save a players rank
4040
Returns: nothing
@@ -60,7 +60,7 @@ function MSync.modules.MRSync.init( transaction )
6060
else
6161
addUserRankQ:setString(4, "allservers")
6262
end
63-
63+
6464
addUserRankQ:start()
6565
end
6666

@@ -130,40 +130,40 @@ end
130130
--[[
131131
Define net receivers and util.AddNetworkString
132132
]]
133-
function MSync.modules.MRSync.net()
133+
function MSync.modules.MRSync.net()
134134

135135
--[[
136136
Description: Function to send the mrsync settings to the client
137137
Arguments:
138138
player [player] - the player that wants to open the admin GUI
139139
Returns: nothing
140-
]]
140+
]]
141141
util.AddNetworkString("msync.mrsync.sendSettingsPly")
142142
function MSync.modules.MRSync.sendSettings(ply)
143143
net.Start("msync.mrsync.sendSettingsPly")
144144
net.WriteTable(MSync.modules.MRSync.settings)
145145
net.Send(ply)
146146
end
147-
147+
148148
--[[
149149
Description: Net Receiver - Gets called when the client requests the settings table
150150
Returns: nothing
151-
]]
151+
]]
152152
util.AddNetworkString("msync.mrsync.getSettings")
153153
net.Receive("msync.mrsync.getSettings", function(len, ply)
154154
if not ply:query("msync.getSettings") then return end
155-
155+
156156
MSync.modules.MRSync.sendSettings(ply)
157157
end )
158158

159159
--[[
160160
Description: Net Receiver - Gets called when the client requests the settings table
161161
Returns: nothing
162-
]]
162+
]]
163163
util.AddNetworkString("msync.mrsync.sendSettings")
164164
net.Receive("msync.mrsync.sendSettings", function(len, ply)
165165
if not ply:query("msync.sendSettings") then return end
166-
166+
167167
MSync.modules.MRSync.settings = net.ReadTable()
168168
MSync.modules.MRSync.saveSettings()
169169
end )
@@ -174,14 +174,14 @@ end
174174
--[[
175175
Define ulx Commands and overwrite common ulx functions (module does not get loaded until ulx has fully been loaded)
176176
]]
177-
function MSync.modules.MRSync.ulx()
178-
177+
function MSync.modules.MRSync.ulx()
178+
179179
end
180180

181181
--[[
182182
Define hooks your module is listening on e.g. PlayerDisconnect
183183
]]
184-
function MSync.modules.MRSync.hooks()
184+
function MSync.modules.MRSync.hooks()
185185

186186
hook.Add("PlayerInitialSpawn", "mrsync.H.loadRank", function(ply)
187187
MSync.modules.MRSync.loadRank(ply)

lua/msync/server/modules/sv_samplemodule.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ MSync.modules[info.ModuleIdentifier].info = info
2727
--[[
2828
Define mysql table and additional functions that are later used
2929
]]
30-
MSync.modules[info.ModuleIdentifier].init = function( transaction )
30+
MSync.modules[info.ModuleIdentifier].init = function( transaction )
3131
transaction:addQuery( MSync.DBServer:query([[
3232
CREATE TABLE IF NOT EXISTS `tbl_SampleModule` (
3333
SampleData INT
3434
);
3535
]] ))
36-
36+
3737
MSync.modules[info.ModuleIdentifier].SampleFunction = function()
3838
return true
3939
end
@@ -43,7 +43,7 @@ end
4343
--[[
4444
Define net receivers and util.AddNetworkString
4545
]]
46-
MSync.modules[info.ModuleIdentifier].net = function()
46+
MSync.modules[info.ModuleIdentifier].net = function()
4747
net.Receive( "my_message", function( len, pl )
4848
if ( IsValid( pl ) and pl:IsPlayer() ) then
4949
print( "Message from " .. pl:Nick() .. " received. Its length is " .. len .. "." )
@@ -56,16 +56,16 @@ end
5656
--[[
5757
Define ulx Commands and overwrite common ulx functions (module does not get loaded until ulx has fully been loaded)
5858
]]
59-
MSync.modules[info.ModuleIdentifier].ulx = function()
60-
59+
MSync.modules[info.ModuleIdentifier].ulx = function()
60+
6161
end
6262

6363
--[[
6464
Define hooks your module is listening on e.g. PlayerDisconnect
6565
]]
66-
MSync.modules[info.ModuleIdentifier].hooks = function()
66+
MSync.modules[info.ModuleIdentifier].hooks = function()
6767
hook.Add("initialize", "msync_sampleModule_init", function()
68-
68+
6969
end)
7070
end
7171

lua/msync/server/sv_hooks.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ end)
2424
--[[
2525
Description: Creates a entry to the database for every player that joins.
2626
Returns: nothing
27-
]]
27+
]]
2828
hook.Add("PlayerInitialSpawn", "msync.createUser", function( ply )
2929
MSync.mysql.addUser(ply)
3030
MSync.net.sendTable(ply, "modulestate", MSync.settings.data.enabledModules)

0 commit comments

Comments
 (0)