introduced a new group management feature

This commit is contained in:
SJ
2014-07-05 17:09:38 +02:00
parent d79b1f97c7
commit bdae1bab9d
11 changed files with 113 additions and 24 deletions

View File

@ -75,11 +75,11 @@ class ControllerUserEdit extends Controller {
$this->data['user']['domains'] = $this->model_user_user->get_domains_by_uid($this->data['uid']);
$this->data['user']['group_membership'] = $this->model_user_user->get_additional_uids($this->data['uid']);
$this->data['user']['group'] = $this->model_group_group->get_groups_by_uid($this->data['uid']);
$this->data['user']['folder'] = $this->model_folder_folder->get_folders_by_uid($this->data['uid']);
$this->data['emails'] = $this->model_user_user->get_emails($this->data['user']['username']);
$this->data['user']['group'] = $this->model_group_group->get_groups_by_email(array($this->data['emails']));
//}
}
else {

View File

@ -38,8 +38,8 @@ class ControllerUserSettings extends Controller {
$auditdomains .= ', ' . $d;
}
$auditdomains = preg_replace("/^,\s/", "", $auditdomains);
$auditgroups = preg_replace("/\s/", ", ", $this->model_group_group->get_groups_by_uid($session->get("uid")));
$auditgroups = preg_replace("/\s/", ", ", $this->model_group_group->get_groups_by_email($session->get("emails")));
$folders = $session->get("folders");