Skip to content

admin: some improvements #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Jun 7, 2021
Merged

admin: some improvements #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a11b7cb
Update admin_main.lua
brenodanyel Apr 11, 2021
f1663b3
fix the "hide sensitive datas" checkbox width
brenodanyel Apr 11, 2021
2559152
Update [admin]/admin/client/gui/admin_main.lua
stoneage-mta Apr 11, 2021
1d0644f
make "hide sensitive data" ignore the "Output admin messages to chat …
brenodanyel Apr 11, 2021
0167c8c
make "hide sensitive data" ignore "Output player information to console"
brenodanyel Apr 11, 2021
d96caed
make "hide sensitive data" disable bans and admin Chat tabs
brenodanyel Apr 11, 2021
1fc6849
hide sensitive data and color codes in reports window
brenodanyel Apr 11, 2021
f00d13e
remove color codes from screenshots window
brenodanyel Apr 11, 2021
e7b492c
remove color codes from kick and unmute dialog
brenodanyel Apr 11, 2021
613db07
remove color codes from mute window
brenodanyel Apr 11, 2021
3bbe52c
fix message box not showing entire messages
brenodanyel Apr 11, 2021
30436d1
remove extra space from "set dimension" input box
brenodanyel Apr 11, 2021
2946c9f
update server password label when change "hide sensitive data" state
brenodanyel Apr 11, 2021
aea3a6c
Update [admin]/admin/client/gui/admin_message.lua
stoneage-mta Apr 17, 2021
a1b480d
Update [admin]/admin/client/gui/admin_message.lua
stoneage-mta Apr 17, 2021
1afe7b5
fix "Name" label not showing the entire text
brenodanyel Apr 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion [admin]/admin/client/gui/admin_inputbox.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ function aMuteInputBox ( player )
guiSetText ( aMuteInputRadio2s[i], dur>0 and secondsToTimeDesc(dur) or "Until reconnect" )
end

guiSetText ( aMuteInputForm, "Mute player " .. getPlayerName(player) )
guiSetText ( aMuteInputForm, "Mute player " .. removeColorCoding(getPlayerName(player)) )
guiSetText ( aMuteInputLabel, "Enter the mute reason" )
aHideFloaters()
guiSetVisible ( aMuteInputForm, true )
Expand Down
249 changes: 161 additions & 88 deletions [admin]/admin/client/gui/admin_main.lua
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 15 additions & 4 deletions [admin]/admin/client/gui/admin_message.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function aViewMessage ( id )
guiSetText ( aViewMessageCategory, _messages[id].category )
guiSetText ( aViewMessageForm, _messages[id].subject )
guiSetText ( aViewMessageTime, _messages[id].time )
guiSetText ( aViewMessageAuthor, _messages[id].author )
guiSetText ( aViewMessageAuthor, removeColorCoding( _messages[id].author ) )
guiSetText ( aViewMessageText, _messages[id].text )
guiSetVisible ( aViewMessageForm, true )
local isVisible = _messages[id].suspect ~= nil
Expand All @@ -68,9 +68,20 @@ function aViewSuspectInfo ( button )
aSuspectInfo = nil
end, false)

local infoMemo = guiCreateMemo(0.04, 0.1, 0.96, 0.75, "Nickname: "..suspectInfo.name.."\nAccount name: "..suspectInfo.username.."\nIP: "
..suspectInfo.ip.."\nSerial: "..suspectInfo.serial.."\nMTA version: "..suspectInfo.version.."\n\nChat log:\n"..suspectInfo.chatLog,
true, aSuspectInfo)
local displayInfo = {

'Nickname: '.. removeColorCoding(suspectInfo.name),
'Account name: '.. getSensitiveText(suspectInfo.username),
'IP: '.. getSensitiveText(suspectInfo.ip),
'Serial: '.. getSensitiveText(suspectInfo.serial),
'MTA version: '.. suspectInfo.version,
'\nChat log:\n' .. suspectInfo.chatLog,

}

local text = table.concat(displayInfo, '\n')

local infoMemo = guiCreateMemo(0.04, 0.1, 0.96, 0.75, text, true, aSuspectInfo)
guiMemoSetReadOnly(infoMemo, true)
else
aMessageBox ( "error", "This report does have any suspect information." )
Expand Down
2 changes: 1 addition & 1 deletion [admin]/admin/client/gui/admin_messagebox.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function aMessageBox ( type, message, action, vOne, vTwo, vThree )
guiSetSize ( aMessageLabel, 350, 100, false )
else
guiSetSize ( aMessageForm, 300, 120, false )
guiSetSize ( aMessageLabel, 150, 16, false )
guiSetSize ( aMessageLabel, 150, 30, false )
end
local sx, sy = guiGetSize ( aMessageForm, false )
guiSetPosition ( aMessageOk, sx / 2 - 22, 90, false )
Expand Down
2 changes: 1 addition & 1 deletion [admin]/admin/client/gui/admin_messages.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function aMessagesSync ( action, data )
if ( message.read ) then guiGridListSetItemText ( aMessagesList, row, 2, message.subject, false, false )
else guiGridListSetItemText ( aMessagesList, row, 2, "* "..message.subject, false, false ) end
guiGridListSetItemText ( aMessagesList, row, 3, message.time, false, false )
guiGridListSetItemText ( aMessagesList, row, 4, message.author, false, false )
guiGridListSetItemText ( aMessagesList, row, 4, removeColorCoding(message.author), false, false )
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions [admin]/admin/client/gui/admin_screenshot.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ addEventHandler("aClientScreenShot",resourceRoot,
guiGridListClear ( aScreenShotList )
for i,screenshot in ipairs (data) do
local row = guiGridListAddRow(aScreenShotList)
guiGridListSetItemText(aScreenShotList,row,1,screenshot.player,false,false)
guiGridListSetItemText(aScreenShotList,row,2,screenshot.admin,false,false)
guiGridListSetItemText(aScreenShotList,row,1,removeColorCoding(screenshot.player),false,false)
guiGridListSetItemText(aScreenShotList,row,2,removeColorCoding(screenshot.admin),false,false)
guiGridListSetItemText(aScreenShotList,row,3,screenshot.realtime,false,false)
guiGridListSetItemData(aScreenShotList,row,1,screenshot.id)
end
Expand Down