diff --git a/LICENSE b/LICENSE index f7ffb058c..114cb969b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019-2023 André Tabarra +Copyright (c) 2019-2024 André Tabarra Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/core/components/WebServer/index.ts b/core/components/WebServer/index.ts index c764b5a02..ff55f8206 100644 --- a/core/components/WebServer/index.ts +++ b/core/components/WebServer/index.ts @@ -88,7 +88,6 @@ export default class WebServer { || error.code === 'ECANCELED' )) { console.error(`Probably harmless error on ${ctx.path}`); - console.error('Please be kind and send a screenshot of this error to the txAdmin developer.'); console.dir(error); } }); diff --git a/core/extras/checkPreRelease.ts b/core/extras/checkPreRelease.ts index 8e543fac5..39881b3e0 100644 --- a/core/extras/checkPreRelease.ts +++ b/core/extras/checkPreRelease.ts @@ -28,6 +28,7 @@ const cronCheckExpiration = () => { if (timeUntilExpiration < 0) { console.error('This pre-release version has expired, please update your txAdmin.'); console.error('For more information: https://discord.gg/txAdmin.'); + console.error('Bye bye 👋'); process.exit(400); } else if (timeUntilExpiration < 24 * 60 * 60 * 1000) { printExpirationBanner(timeUntilExpiration); diff --git a/panel/src/components/AccountDialog.tsx b/panel/src/components/AccountDialog.tsx index 17102bce2..9dd0afc04 100644 --- a/panel/src/components/AccountDialog.tsx +++ b/panel/src/components/AccountDialog.tsx @@ -96,7 +96,7 @@ const ChangePasswordTab = memo(function () { 23:30 for 11:30 PM.) - {/* Type in the time for the server to restart in relative format (+MM) or the 24-hour format HH:MM.
- Example: +15 for 15 minutes from now., and 23:30 for 11:30 PM.
*/}

{browserTimezone !== window.txConsts.serverTimezone && timezoneDiffMessage} ), diff --git a/resource/cl_main.lua b/resource/cl_main.lua index 88143e8a2..adf38edd9 100644 --- a/resource/cl_main.lua +++ b/resource/cl_main.lua @@ -165,7 +165,7 @@ function IsNuiRequestOriginValid(headers) -- warn admin of possible csrf attempt if menuIsAccessible and sendPersistentAlert then - local msg = ('ATTENTION! txAdmin received a NUI message from the origin "%s" which is not approved. This likely means that that resource is vulnerable to XSS which has been exploited to inject txAdmin commands. It is recommended that you fix the vulnerability or remove that resource completely. For more information: discord.gg/txAdmin.') :format(headers['Origin']) + local msg = ('ATTENTION! txAdmin received a NUI message from the origin "%s" which is not approved. This likely means that that resource is vulnerable to XSS which has been exploited to inject txAdmin commands. It is recommended that you fix the vulnerability or remove that resource completely. For more information: discord.gg/txAdmin.'):format(headers['Origin']) sendPersistentAlert('csrfWarning', 'error', msg, false) end