tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

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

Browse Source 
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:
Tomasz Sowa
2021-06-27 23:31:50 +02:00
parent 472490c239
commit 1d18b7fa12
59 changed files with 1419 additions and 1607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
winixd/core/system.cpp
View File

@@ -87,7 +87,8 @@ void System::set_dependency(WinixModelDeprecated * winix_model)
dirs.set_dependency(this);
mounts.set_dependency(this);
users.set_dependency(this);
//users.set_dependency(this);
users.set_connector(model_connector);
groups.set_dependency(this);
rebus.set_dependency(this);
load_avg.set_dependency(this);
@@ -140,8 +141,9 @@ void System::Init()
mounts.CreateMounts();
mounts.ReadMounts();
users.SetCur(cur);
users.SetSessionManager(session_manager);
// users.SetCur(cur);
// users.SetSessionManager(session_manager);
users.set_connector(model_connector);
users.ReadUsers(db);
groups.ReadGroups(db); // !! chwilowe przekazanie argumentu, db bedzie zmienione
@@ -533,7 +535,7 @@ bool System::CanChangeUser(const Item & item, long new_user_id)
// session must be set
return false;
if( cur->session->puser && cur->session->puser->super_user )
if( cur->session->puser && cur->session->puser->is_super_user )
// super user is allowed everything
return true;
@@ -553,7 +555,7 @@ bool System::CanChangeGroup(const Item & item, long new_group_id)
// session must be set
return false;
if( cur->session->puser && cur->session->puser->super_user )
if( cur->session->puser && cur->session->puser->is_super_user )
// super user is allowed everything
return true;
@@ -587,7 +589,7 @@ bool System::CanChangePrivileges(const Item & item, int new_priv)
// session must be set
return false;
if( cur->session->puser && cur->session->puser->super_user )
if( cur->session->puser && cur->session->puser->is_super_user )
// super user is allowed everything
return true;
@@ -751,7 +753,7 @@ bool System::CanRemoveRenameChild(const Item & dir, long child_item_user_id)
if( cur->session->puser )
{
if( cur->session->puser->super_user )
if( cur->session->puser->is_super_user )
return true;
if( dir.item_content.user_id != -1 && cur->session->puser->id != -1 && child_item_user_id != -1 )
@@ -811,7 +813,7 @@ bool System::IsSuperUser(long user_id)
if( !puser )
return false;
return puser->super_user;
return puser->is_super_user;
}