From cbff97db9b3b10d40553fc37c6502a96f6b473f8 Mon Sep 17 00:00:00 2001 From: Dauren777 Date: Thu, 11 Jun 2026 05:58:48 +0000 Subject: [PATCH] fix: doLogin checks both short and full email keys; addUser uses short key --- index.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 2eafefb..74cc4cc 100644 --- a/index.html +++ b/index.html @@ -1075,10 +1075,10 @@ function showReminders(){ function doLogin(){ var e=document.getElementById("lem").value.trim().toLowerCase(); var k=e.split("@")[0]; - var u=USR[k]; + var u=USR[k]||USR[e]; if(!u){ var ex=localStorage.getItem("ext_users"); - if(ex){try{var eu=JSON.parse(ex);if(eu[k])u=eu[k]}catch(e){}} + if(ex){try{var eu=JSON.parse(ex);if(eu[k])u=eu[k];if(!u&&eu[e])u=eu[e]}catch(e){}} } if(u){ cu={n:u.n,bg:u.bg,role:u.role!==undefined?u.role:(u.bg===0?0:1)}; @@ -1786,6 +1786,7 @@ function resetPw(k){ } function addUser(){ var em=document.getElementById("reg_email").value.trim().toLowerCase(); + var k=em.split("@")[0]; var nm=document.getElementById("reg_name").value.trim(); var ph=document.getElementById("reg_phone").value.trim(); var bg=parseInt(document.getElementById("reg_branch").value,10); @@ -1793,9 +1794,9 @@ function addUser(){ var rlSel=document.getElementById("reg_role"); var rl=rlSel?parseInt(rlSel.value,10):1; if(!em||!nm){alert("\u0417\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u0435 \u043B\u043E\u0433\u0438\u043D \u0438 \u0424\u0418\u041E");return} - if(USR[em]){alert("\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442");return} - USR[em]={n:nm,bg:bg,ph:ph,role:rl}; - if(pw)USR[em].pw=pw; + if(USR[k]){alert("\u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044C \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442");return} + USR[k]={n:nm,bg:bg,ph:ph,role:rl}; + if(pw)USR[k].pw=pw; saveUsers(); closeRegModal(); renderUsers()