aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authoronefang2020-03-17 12:33:25 +1000
committeronefang2020-03-17 12:33:25 +1000
commita5266482304ef471986a8ba4df72692b41429dc9 (patch)
tree66d9811bb548d0b739e2b4ad7316e1308cf4f957 /src
parentHTML labels before their input fields. (diff)
downloadopensim-SC_OLD-a5266482304ef471986a8ba4df72692b41429dc9.zip
opensim-SC_OLD-a5266482304ef471986a8ba4df72692b41429dc9.tar.gz
opensim-SC_OLD-a5266482304ef471986a8ba4df72692b41429dc9.tar.bz2
opensim-SC_OLD-a5266482304ef471986a8ba4df72692b41429dc9.tar.xz
Only try to load users Lua file on login.
Diffstat (limited to 'src')
-rw-r--r--src/sledjchisl/sledjchisl.c55
1 files changed, 28 insertions, 27 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 609fefa..68cd321 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -3493,33 +3493,6 @@ static int validateName(reqData *Rd, qhashtbl_t *data)
3493 if (s) {s--; *s = '\0'; s++;} 3493 if (s) {s--; *s = '\0'; s++;}
3494 free(where); 3494 free(where);
3495 3495
3496 if (0 != rt)
3497 {
3498 bitch(Rd, "Login failed.", "Could not read user Lua file.");
3499 ret += rt;
3500 }
3501 else
3502 {
3503 Rd->database->putstr(Rd->database, "UserAccounts.FirstName", name);
3504 Rd->database->putstr(Rd->database, "UserAccounts.LastName", s);
3505 Rd->database->putstr(Rd->database, "UserAccounts.Email", getStrH(tnm, "email"));
3506 Rd->database->putstr(Rd->database, "UserAccounts.Created", getStrH(tnm, "created"));
3507 Rd->database->putstr(Rd->database, "UserAccounts.PrincipleID", getStrH(tnm, "UUID"));
3508 Rd->database->putstr(Rd->database, "UserAccounts.UserLevel", getStrH(tnm, "level"));
3509 Rd->database->putstr(Rd->database, "UserAccounts.UserFlags", getStrH(tnm, "flags"));
3510 Rd->database->putstr(Rd->database, "UserAccounts.UserTitle", getStrH(tnm, "title"));
3511 Rd->database->putstr(Rd->database, "UserAccounts.active", getStrH(tnm, "active"));
3512 Rd->database->putstr(Rd->database, "auth.passwordSalt", getStrH(tnm, "passwordSalt"));
3513 Rd->database->putstr(Rd->database, "auth.passwordHash", getStrH(tnm, "passwordHash"));
3514
3515 Rd->stuff->putstr(Rd->stuff, "UUID", xstrdup(getStrH(Rd->database, "UserAccounts.PrincipalID")));
3516 Rd->stuff->putstr(Rd->stuff, "level", xstrdup(getStrH(Rd->database, "UserAccounts.Userlevel")));
3517 if (s) {s--; *s = ' '; s++;}
3518 Rd->stuff->putstr(Rd->stuff, "name", xstrdup(name));
3519 if (s) {s--; *s = '\0'; s++;}
3520 }
3521
3522
3523 static dbRequest *acnts = NULL; 3496 static dbRequest *acnts = NULL;
3524 if (NULL == acnts) 3497 if (NULL == acnts)
3525 { 3498 {
@@ -3564,6 +3537,34 @@ if (rt)
3564 } 3537 }
3565 } 3538 }
3566} 3539}
3540else
3541{
3542// if (0 != rt)
3543 {
3544 }
3545// else
3546 {
3547 Rd->database->putstr(Rd->database, "UserAccounts.FirstName", name);
3548 Rd->database->putstr(Rd->database, "UserAccounts.LastName", s);
3549 Rd->database->putstr(Rd->database, "UserAccounts.Email", getStrH(tnm, "email"));
3550 Rd->database->putstr(Rd->database, "UserAccounts.Created", getStrH(tnm, "created"));
3551 Rd->database->putstr(Rd->database, "UserAccounts.PrincipleID", getStrH(tnm, "UUID"));
3552 Rd->database->putstr(Rd->database, "UserAccounts.UserLevel", getStrH(tnm, "level"));
3553 Rd->database->putstr(Rd->database, "UserAccounts.UserFlags", getStrH(tnm, "flags"));
3554 Rd->database->putstr(Rd->database, "UserAccounts.UserTitle", getStrH(tnm, "title"));
3555 Rd->database->putstr(Rd->database, "UserAccounts.active", getStrH(tnm, "active"));
3556 Rd->database->putstr(Rd->database, "auth.passwordSalt", getStrH(tnm, "passwordSalt"));
3557 Rd->database->putstr(Rd->database, "auth.passwordHash", getStrH(tnm, "passwordHash"));
3558
3559 Rd->stuff->putstr(Rd->stuff, "UUID", xstrdup(getStrH(Rd->database, "UserAccounts.PrincipalID")));
3560 Rd->stuff->putstr(Rd->stuff, "level", xstrdup(getStrH(Rd->database, "UserAccounts.Userlevel")));
3561 if (s) {s--; *s = ' '; s++;}
3562 Rd->stuff->putstr(Rd->stuff, "name", xstrdup(name));
3563 if (s) {s--; *s = '\0'; s++;}
3564 }
3565
3566
3567}
3567 } 3568 }
3568 else if (strcmp("create", Rd->doit) == 0) 3569 else if (strcmp("create", Rd->doit) == 0)
3569 { 3570 {