feat: small changes

tabarra · Feb 6, 2024 · f800375 · f800375
1 parent 7d718ba
commit f800375
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 6 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2023 André Tabarra <maintainer@txadmin.gg>
+Copyright (c) 2019-2024 André Tabarra <maintainer@txadmin.gg>
 
 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
@@ -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
@@ -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
@@ -96,7 +96,7 @@ const ChangePasswordTab = memo(function () {
                             <Label htmlFor="current-password">Current Password</Label>
                             <Input
                                 id="current-password"
-                                placeholder="Enter new password"
+                                placeholder="Enter current password"
                                 type="password"
                                 value={oldPassword}
                                 autoFocus

diff --git a/panel/src/layout/ServerSidebar/ServerSchedule.tsx b/panel/src/layout/ServerSidebar/ServerSchedule.tsx
@@ -34,8 +34,6 @@ const promptCommonProps = {
                     (example: <InlineCode>23:30</InlineCode> for 11:30 PM.)
                 </li>
             </ul>
-            {/* Type in the time for the server to restart in relative format (<InlineCode>+MM</InlineCode>) or the 24-hour format <InlineCode>HH:MM</InlineCode>. <br />
-            Example: <InlineCode>+15</InlineCode> for 15 minutes from now., and <InlineCode>23:30</InlineCode> for 11:30 PM. <br /> */}
         </p>
         {browserTimezone !== window.txConsts.serverTimezone && timezoneDiffMessage}
     </>),

diff --git 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