Commit 3f2eeedb authored by jan.koester's avatar jan.koester
Browse files

test

parent a1ea55db
Loading
Loading
Loading
Loading
+3 −4
Changes for src/blogi.cpp: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -900,14 +900,14 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const
    if (!username.empty() && !password.empty()) {
        // Attempt automatic login
        uuid::uuid sessid;
        if (PlgArgs->auth->login(tid, username.c_str(), password.c_str(), sessid, loginSessionId, ctx.domainName)) {
        if (PlgArgs->auth->login(tid, username.c_str(), password.c_str(), sessid, sessionid, ctx.domainName)) {
            // Login successful, redirect to start page
            libhttppp::HttpResponse curres;
            libhttppp::HttpCookie authid;
            libhttppp::HttpCookie scook;

            if (createdLoginSession) {
                scook.setcookie(curres, "sessionid", loginSessionId, "", cookieDomain(curreq).c_str(), (1000*60*60*1), "/", false, "1", "Lax", false);
                scook.setcookie(curres, "sessionid", sessionid, "", cookieDomain(curreq).c_str(), (1000*60*60*1), "/", false, "1", "Lax", false);
            }
            authid.setcookie(curres,"authid",sessid.c_str(),"",cookieDomain(curreq).c_str(),(1000*60*60*1),"/",false,"1","Lax",false);

@@ -937,9 +937,8 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const
    if(index.getElementbyID("main"))
        index.getElementbyID("main")->insertChild(condat.parse());

    std::string loginSessionId = sessionid;
    bool createdLoginSession = false;
    if (loginSessionId.empty()) {
    if (ses.empty()) {
        std::string buf;
        std::string usa;
        libhttppp::HttpHeader::HeaderData *uahdr = curreq.getHeaderData("user-agent");