bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-07-05 19:59:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

merged folder branch

Browse Source 
Change-Id: I57f3427b128e8b313572e7bc3734933f4d345d1c
Signed-off-by: SJ <sj@acts.hu>
This commit is contained in:
SJ
2016-12-20 22:09:20 +01:00
parent 12292111a8 c1095a0ab5
commit 2ca7c9d30e
18 changed files with 131 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webui/model/user/auth.php
View File

@ -15,6 +15,9 @@ class ModelUserAuth extends Model {
$session->set("auditdomains", $data['auditdomains']);
$session->set("emails", $data['emails']);
//$data['folders'] = $this->model_folder_folder->get_folder_id_array_for_user($query->row['uid'], $data['admin_user']);
$data['folders'] = $this->model_folder_folder->get_folder_names_for_user($data['email']);
$session->set("folders", $data['folders']);
}
@ -124,8 +127,6 @@ class ModelUserAuth extends Model {
$extra_emails = $this->model_user_user->get_email_addresses_from_groups($data['emails']);
$data['emails'] = array_merge($data['emails'], $extra_emails);
$data['folders'] = $this->model_folder_folder->get_folder_id_array_for_user($query->row['uid'], $data['admin_user']);
$session->set("auth_data", $data);
$this->is_ga_code_needed($username);