From b29194f0d9f3d34459f981284d2dc7948dd89117 Mon Sep 17 00:00:00 2001 From: Albert S Date: Fri, 3 May 2019 15:56:08 +0200 Subject: [PATCH] user model: added enabled column --- setup/sqlite.sql | 2 +- user.h | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/setup/sqlite.sql b/setup/sqlite.sql index 8d3ecc5..83c0281 100644 --- a/setup/sqlite.sql +++ b/setup/sqlite.sql @@ -1,6 +1,6 @@ CREATE TABLE page(id INTEGER PRIMARY KEY, name varchar(256), lastrevision integer, visible integer DEFAULT 1); CREATE TABLE user(id INTEGER PRIMARY KEY,username varchar(64), -password blob, salt blob, permissions integer); +password blob, salt blob, permissions integer, enabled integer DEFAULT 1); CREATE TABLE session(id INTEGER PRIMARY KEY, csrf_token varchar(32), creationtime date, userid integer , token varchar(32)); CREATE TABLE permissions(id INTEGER PRIMARY KEY, permissions integer, diff --git a/user.h b/user.h index 57707bb..0d8736a 100644 --- a/user.h +++ b/user.h @@ -8,16 +8,17 @@ class User private: static User anonUser; public: - static const User &Anonymous(); - static void setAnon(User u) - { - User::anonUser = std::move(u); - } - std::string login; - std::vector password; - std::vector salt; - Permissions permissions; - User(); + static const User &Anonymous(); + static void setAnon(User u) + { + User::anonUser = std::move(u); + } + std::string login; + std::vector password; + std::vector salt; + bool enabled; + Permissions permissions; + User(); };