Commit 718cca01 authored by jan.koester's avatar jan.koester
Browse files

fixed

parent c1d22a02

data/template/default/cookie.html

+7 −3
Original line number Diff line number Diff line
@@ -12,9 +12,13 @@ 
    <body>

    <img alt="test" src="public/header.webp" >

    <div id="cookiebanner">

        <div id="cookieoverlay">

        </div>

        <div id="cookiecontent">

            <form id="cookiesettings">

            </form>

            <button id="cookiesubmit" type="submit" form="cookiesettings"  value="Submit" formmethod="post">Accept</button>

        </div>

    </div>

    </body>

    </html>

data/template/default/public/style.css

+25 −2
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ a { 
    margin: 2em 0;

}



#cookiebanner{

#cookieoverlay {

  top:0px;

  bottom:0px;

  z-index:99;
@@ -422,5 +422,28 @@ a { 
  width:100%;

  height:100%;

  opacity:0.7;

  background:#000000;

  background:rgb(0,0,0);

}



#cookiecontent {

  position: fixed;

  bottom: 0px;

  margin: 0px auto;

  left: 35%;

  right: 35%;

  z-index: 100;

  color: rgb(58,212, 58);

  opacity: 1;

  background: rgb(0,0,0);

  padding: 20px;

  border-top: solid rgb(49, 54, 59) 1em;

  border-left: solid rgb(49, 54, 59) 1em;

  border-right: solid rgb(49, 54, 59) 1em;

}



#cookiecontent button {

  background: none;

  color: rgb(58,212, 58);

  border: double rgb(58,212, 58) 0.3em;

  margin: 1em;

}

plugins/content/content.cpp

+3 −1
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <auth.h>

#include <conf.h>

#include <plugin.h>

#include <session.h>



#define SITELIMIT 10
@@ -262,7 +263,8 @@ namespace blogi { 
                    blogi::DBResult ares,res;



                    std::string uid;

                    Args->session->getSessionData(sessionid,"uid",uid);

                    Session sess(Args->database[tid]);

                    sess.getSessionData(sessionid,"uid",uid);



                    asql << "SELECT id from users WHERE sid='"<< uid.c_str() <<"' LIMIT 1;";

src/auth.cpp

+7 −5
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ 
#include "theme.h"

#include "session.h"



blogi::Auth::Auth(blogi::Database **pcon,blogi::Session *session,blogi::Config *cfg){

blogi::Auth::Auth(blogi::Database **pcon,blogi::Config *cfg){

    _dbconn=pcon;

    _session=session;

    _config=cfg;

    blogi::SQL sql;

    blogi::DBResult res;
@@ -209,8 +208,10 @@ LDAPLOGINUSERFOUND: 
           _dbconn[tid]->exec(&sql,res);

        };



        _session->addSessionData(ssid,"uid",sid,strlen(ssid)+1);

        _session->addSessionData(ssid,"username",username,strlen(ssid)+1);

        Session sess(*_dbconn);



        sess.addSessionData(ssid,"uid",sid,strlen(ssid)+1);

        sess.addSessionData(ssid,"username",username,strlen(ssid)+1);



        std::cout << "User : " << sid << " are logged in" << std::endl;
@@ -224,7 +225,8 @@ LDAPLOGINUSERFOUND: 
bool blogi::Auth::isLoggedIn(const int tid,libhttppp::HttpRequest *curreq,const char *ssid){

        try{

            std::string storeid;

            _session->getSessionData(ssid,"uid",storeid);

            Session sess(_dbconn[tid]);

            sess.getSessionData(ssid,"uid",storeid);

            if(!storeid.empty()){

                return true;

            }

src/auth.h

+1 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ namespace blogi { 


    class Auth{

    public:

        Auth(blogi::Database **pcon,blogi::Session *session,blogi::Config *cfg);

        Auth(blogi::Database **pcon,blogi::Config *cfg);

        ~Auth();

        bool login(const int tid,const char *username,const char *password,const char *ssid);

        bool isLoggedIn(const int tid,libhttppp::HttpRequest *curreq,const char *ssid);
@@ -55,7 +55,6 @@ namespace blogi { 
        bool locallogin(const int tid,const char *username,const char *password,const char *ssid);



        blogi::Database **_dbconn;

        blogi::Session   *_session;

        blogi::Config    *_config;

#ifdef LDAPSUPPORT

        LDAPControl      *_serverctrls;