Ticket #3575: prelobby.js.patch
File prelobby.js.patch, 4.3 KB (added by , 8 years ago) |
---|
-
binaries/data/mods/public/gui/lobby/prelobby.js
1 1 var g_LobbyIsConnecting = false; 2 var g_Encry tedPassword = "";2 var g_EncryptedPassword = ""; 3 3 var g_PasswordInputIsHidden = false; 4 4 var g_TermsOfServiceRead = false; 5 5 var g_TermsOfUseRead = false; … … 7 7 8 8 function init() 9 9 { 10 g_Encry tedPassword = Engine.ConfigDB_GetValue("user", "lobby.password");11 if (Engine.ConfigDB_GetValue("user", "lobby.login") && g_Encry tedPassword)10 g_EncryptedPassword = Engine.ConfigDB_GetValue("user", "lobby.password"); 11 if (Engine.ConfigDB_GetValue("user", "lobby.login") && g_EncryptedPassword) 12 12 switchPage("connect"); 13 13 } 14 14 … … 39 39 40 40 feedback.caption = translate("Connecting..."); 41 41 // If they enter a different password, re-encrypt. 42 if (password != g_Encry tedPassword.substring(0, 10))43 g_Encry tedPassword = Engine.EncryptPassword(password, username);42 if (password != g_EncryptedPassword.substring(0, 10)) 43 g_EncryptedPassword = Engine.EncryptPassword(password, username); 44 44 // We just use username as nick for simplicity. 45 Engine.StartXmppClient(username, g_Encry tedPassword, room, username, history);45 Engine.StartXmppClient(username, g_EncryptedPassword, room, username, history); 46 46 g_LobbyIsConnecting = true; 47 47 Engine.ConnectXmppClient(); 48 48 } … … 60 60 var feedback = Engine.GetGUIObjectByName("feedback"); 61 61 62 62 feedback.caption = translate("Registering..."); 63 g_Encry tedPassword = Engine.EncryptPassword(password, account);64 Engine.StartRegisterXmppClient(account, g_Encry tedPassword);63 g_EncryptedPassword = Engine.EncryptPassword(password, account); 64 Engine.StartRegisterXmppClient(account, g_EncryptedPassword); 65 65 g_LobbyIsConnecting = true; 66 66 Engine.ConnectXmppClient(); 67 67 } … … 68 68 69 69 function onTick() 70 70 { 71 varpageRegisterHidden = Engine.GetGUIObjectByName("pageRegister").hidden;72 varusername = Engine.GetGUIObjectByName(pageRegisterHidden ? "connectUsername" : "registerUsername").caption;73 varpassword = Engine.GetGUIObjectByName(pageRegisterHidden ? "connectPassword" : "registerPassword").caption;74 varpasswordAgain = Engine.GetGUIObjectByName("registerPasswordAgain").caption;71 let pageRegisterHidden = Engine.GetGUIObjectByName("pageRegister").hidden; 72 let username = Engine.GetGUIObjectByName(pageRegisterHidden ? "connectUsername" : "registerUsername").caption; 73 let password = Engine.GetGUIObjectByName(pageRegisterHidden ? "connectPassword" : "registerPassword").caption; 74 let passwordAgain = Engine.GetGUIObjectByName("registerPasswordAgain").caption; 75 75 76 varagreeTerms = Engine.GetGUIObjectByName("registerAgreeTerms");77 varfeedback = Engine.GetGUIObjectByName("feedback");78 varcontinueButton = Engine.GetGUIObjectByName("continue");76 let agreeTerms = Engine.GetGUIObjectByName("registerAgreeTerms"); 77 let feedback = Engine.GetGUIObjectByName("feedback"); 78 let continueButton = Engine.GetGUIObjectByName("continue"); 79 79 80 80 // Do not change feedback while connecting. 81 81 if (g_LobbyIsConnecting) {} … … 149 149 } 150 150 151 151 // Handle queued messages from the XMPP client (if running and if any) 152 varmessage;152 let message; 153 153 while ((message = Engine.LobbyGuiPollMessage()) != undefined) 154 154 { 155 155 // TODO: Properly deal with unrecognized messages … … 184 184 Engine.ConfigDB_CreateValue("user", "lobby.login", username); 185 185 Engine.ConfigDB_WriteValueToFile("user", "lobby.login", username, "config/user.cfg"); 186 186 // We only store the encrypted password, so make sure to re-encrypt it if changed before saving. 187 if (password != g_Encry tedPassword.substring(0, 10))188 g_Encry tedPassword = Engine.EncryptPassword(password, username);189 Engine.ConfigDB_CreateValue("user", "lobby.password", g_Encry tedPassword);190 Engine.ConfigDB_WriteValueToFile("user", "lobby.password", g_Encry tedPassword, "config/user.cfg");187 if (password != g_EncryptedPassword.substring(0, 10)) 188 g_EncryptedPassword = Engine.EncryptPassword(password, username); 189 Engine.ConfigDB_CreateValue("user", "lobby.password", g_EncryptedPassword); 190 Engine.ConfigDB_WriteValueToFile("user", "lobby.password", g_EncryptedPassword, "config/user.cfg"); 191 191 break; 192 192 } 193 193 }