Commit 9a755b0a authored by jan.koester's avatar jan.koester
Browse files

test

parent 3f2eeedb
Loading
Loading
Loading
Loading
+4 −5
Changes for src/blogi.cpp: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -895,7 +895,7 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const

    libhtmlpp::HtmlString out;


    bool createdLoginSession = false;

    if (!username.empty() && !password.empty()) {
        // Attempt automatic login
@@ -937,7 +937,6 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const
    if(index.getElementbyID("main"))
        index.getElementbyID("main")->insertChild(condat.parse());

    bool createdLoginSession = false;
    if (ses.empty()) {
        std::string buf;
        std::string usa;
@@ -950,12 +949,12 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const
        }

        Session sess(*PlgArgs->database[tid]);
        loginSessionId = sess.createSession(buf, usa);
        sessionid = sess.createSession(buf, usa);
        createdLoginSession = true;
    }

    uuid::uuid sessid;
    PlgArgs->auth->login(tid,username.c_str(),password.c_str(),sessid,loginSessionId,ctx.domainName);
    PlgArgs->auth->login(tid,username.c_str(),password.c_str(),sessid,sessionid,ctx.domainName);

    if(!sessid.empty()){
        libhttppp::HttpResponse curres;
@@ -963,7 +962,7 @@ void blogi::Blogi::loginPage(libhttppp::HttpRequest &curreq,const int tid,const
        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);