- updated to the new pikotools api (child spaces were removed)

some plugins need to be fixed yet: ticket, gallery, group, menu
- added current user to default models as "user"
- renamed in User: super_user -> is_super_user, env -> admin_env, pass_hash_salted -> is_pass_hash_salted
- now Users class has a WinixModel as a base class
  some plugin calls have to be fixed yet
- added UserWrapper model with a pointer to User class
- removed from ItemContent: methods for accessing 'meta' and 'admin_meta', now ezc can iterate through Space classes
- fixed in env winix function: if there is "changeuser" parameter then we should only switch the user (not save anything)
This commit is contained in:
2021-06-27 23:31:50 +02:00
parent 472490c239
commit 1d18b7fa12
59 changed files with 1419 additions and 1607 deletions

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2018, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
#include "lastcontainer.h"
#include "cur.h"
#include "db/db.h"
#include "winixmodeldeprecated.h"
#include "models/winixmodel.h"
@@ -53,13 +53,13 @@ namespace Winix
class SessionManager;
class Users : public WinixModelDeprecated
class Users : public WinixModel
{
typedef UGContainer<User> Table;
public:
void set_dependency(WinixModelDeprecated * winix_model);
//void set_dependency(WinixModelDeprecated * winix_model);
typedef Table::Iterator Iterator;
@@ -69,8 +69,8 @@ public:
Users();
void SetCur(Cur * pcur);
void SetSessionManager(SessionManager * sm);
// void SetCur(Cur * pcur);
// void SetSessionManager(SessionManager * sm);
void Clear();
void ReadUsers(Db * db);
@@ -91,12 +91,17 @@ public:
void IncrementLoggedUsers();
long HowManyLogged();
protected:
void fields();
private:
Table table;
Cur * cur;
SessionManager * session_manager;
//Cur * cur;
//SessionManager * session_manager;
long how_many_logged;
bool LoginUserCheckSession(bool use_ses_log);