Skip to content

Commit cfd4c3e

Browse files
brenodanyelstoneage-mtaDezash
authored
admin: some improvements (#315)
* Update admin_main.lua * fix the "hide sensitive datas" checkbox width * Update [admin]/admin/client/gui/admin_main.lua Co-authored-by: Gabrielius Laurinavičius <[email protected]> * make "hide sensitive data" ignore the "Output admin messages to chat box" setting * make "hide sensitive data" ignore "Output player information to console" * make "hide sensitive data" disable bans and admin Chat tabs * hide sensitive data and color codes in reports window * remove color codes from screenshots window * remove color codes from kick and unmute dialog * remove color codes from mute window * fix message box not showing entire messages * remove extra space from "set dimension" input box * update server password label when change "hide sensitive data" state * Update [admin]/admin/client/gui/admin_message.lua Co-authored-by: Gabrielius Laurinavičius <[email protected]> * Update [admin]/admin/client/gui/admin_message.lua Co-authored-by: Gabrielius Laurinavičius <[email protected]> * fix "Name" label not showing the entire text Co-authored-by: Breno Danyel <[email protected]> Co-authored-by: Gabrielius Laurinavičius <[email protected]>
1 parent a3d7b1f commit cfd4c3e

File tree

6 files changed

+181
-97
lines changed

6 files changed

+181
-97
lines changed

[admin]/admin/client/gui/admin_inputbox.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ function aMuteInputBox ( player )
463463
guiSetText ( aMuteInputRadio2s[i], dur>0 and secondsToTimeDesc(dur) or "Until reconnect" )
464464
end
465465

466-
guiSetText ( aMuteInputForm, "Mute player " .. getPlayerName(player) )
466+
guiSetText ( aMuteInputForm, "Mute player " .. removeColorCoding(getPlayerName(player)) )
467467
guiSetText ( aMuteInputLabel, "Enter the mute reason" )
468468
aHideFloaters()
469469
guiSetVisible ( aMuteInputForm, true )

[admin]/admin/client/gui/admin_main.lua

Lines changed: 161 additions & 88 deletions
Large diffs are not rendered by default.

[admin]/admin/client/gui/admin_message.lua

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function aViewMessage ( id )
4343
guiSetText ( aViewMessageCategory, _messages[id].category )
4444
guiSetText ( aViewMessageForm, _messages[id].subject )
4545
guiSetText ( aViewMessageTime, _messages[id].time )
46-
guiSetText ( aViewMessageAuthor, _messages[id].author )
46+
guiSetText ( aViewMessageAuthor, removeColorCoding( _messages[id].author ) )
4747
guiSetText ( aViewMessageText, _messages[id].text )
4848
guiSetVisible ( aViewMessageForm, true )
4949
local isVisible = _messages[id].suspect ~= nil
@@ -68,9 +68,20 @@ function aViewSuspectInfo ( button )
6868
aSuspectInfo = nil
6969
end, false)
7070

71-
local infoMemo = guiCreateMemo(0.04, 0.1, 0.96, 0.75, "Nickname: "..suspectInfo.name.."\nAccount name: "..suspectInfo.username.."\nIP: "
72-
..suspectInfo.ip.."\nSerial: "..suspectInfo.serial.."\nMTA version: "..suspectInfo.version.."\n\nChat log:\n"..suspectInfo.chatLog,
73-
true, aSuspectInfo)
71+
local displayInfo = {
72+
73+
'Nickname: '.. removeColorCoding(suspectInfo.name),
74+
'Account name: '.. getSensitiveText(suspectInfo.username),
75+
'IP: '.. getSensitiveText(suspectInfo.ip),
76+
'Serial: '.. getSensitiveText(suspectInfo.serial),
77+
'MTA version: '.. suspectInfo.version,
78+
'\nChat log:\n' .. suspectInfo.chatLog,
79+
80+
}
81+
82+
local text = table.concat(displayInfo, '\n')
83+
84+
local infoMemo = guiCreateMemo(0.04, 0.1, 0.96, 0.75, text, true, aSuspectInfo)
7485
guiMemoSetReadOnly(infoMemo, true)
7586
else
7687
aMessageBox ( "error", "This report does have any suspect information." )

[admin]/admin/client/gui/admin_messagebox.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function aMessageBox ( type, message, action, vOne, vTwo, vThree )
4141
guiSetSize ( aMessageLabel, 350, 100, false )
4242
else
4343
guiSetSize ( aMessageForm, 300, 120, false )
44-
guiSetSize ( aMessageLabel, 150, 16, false )
44+
guiSetSize ( aMessageLabel, 150, 30, false )
4545
end
4646
local sx, sy = guiGetSize ( aMessageForm, false )
4747
guiSetPosition ( aMessageOk, sx / 2 - 22, 90, false )

[admin]/admin/client/gui/admin_messages.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function aMessagesSync ( action, data )
6666
if ( message.read ) then guiGridListSetItemText ( aMessagesList, row, 2, message.subject, false, false )
6767
else guiGridListSetItemText ( aMessagesList, row, 2, "* "..message.subject, false, false ) end
6868
guiGridListSetItemText ( aMessagesList, row, 3, message.time, false, false )
69-
guiGridListSetItemText ( aMessagesList, row, 4, message.author, false, false )
69+
guiGridListSetItemText ( aMessagesList, row, 4, removeColorCoding(message.author), false, false )
7070
end
7171
end
7272
end

[admin]/admin/client/gui/admin_screenshot.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ addEventHandler("aClientScreenShot",resourceRoot,
120120
guiGridListClear ( aScreenShotList )
121121
for i,screenshot in ipairs (data) do
122122
local row = guiGridListAddRow(aScreenShotList)
123-
guiGridListSetItemText(aScreenShotList,row,1,screenshot.player,false,false)
124-
guiGridListSetItemText(aScreenShotList,row,2,screenshot.admin,false,false)
123+
guiGridListSetItemText(aScreenShotList,row,1,removeColorCoding(screenshot.player),false,false)
124+
guiGridListSetItemText(aScreenShotList,row,2,removeColorCoding(screenshot.admin),false,false)
125125
guiGridListSetItemText(aScreenShotList,row,3,screenshot.realtime,false,false)
126126
guiGridListSetItemData(aScreenShotList,row,1,screenshot.id)
127127
end

0 commit comments

Comments
 (0)