bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-12 23:27:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

improved folder feature

Browse Source
This commit is contained in:
SJ
2015-09-18 14:56:09 +02:00
parent 9769694821
commit 04a0f2b6ef
12 changed files with 138 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ class ModelUserAuth extends Model {
$session->set("emails", $data['emails']);
$session->set("folders", $data['folders']);
$session->set("extra_folders", $data['extra_folders']);
}
@ -35,7 +34,6 @@ class ModelUserAuth extends Model {
$data['auditdomains'] = array();
$data['emails'] = array();
$data['folders'] = array();
$data['extra_folders'] = array();
if($username == '' || $password == '') { return 0; }
@ -114,8 +112,7 @@ 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_all_folder_ids($query->row['uid']);
$data['extra_folders'] = $this->model_folder_folder->get_all_extra_folder_ids($query->row['uid']);
$data['folders'] = $this->model_folder_folder->get_folder_id_array_for_user($query->row['uid'], $data['admin_user']);
$session->set("auth_data", $data);
@ -323,7 +320,6 @@ class ModelUserAuth extends Model {
$data['auditdomains'] = $this->model_domain_domain->get_your_all_domains_by_email($email);
$data['emails'] = $emails;
$data['folders'] = array();
$data['extra_folders'] = array();
$uid = $this->model_user_user->get_uid_by_email($email);
if($uid < 1) {

3
webui/model/user/google.php
View File

@ -41,8 +41,7 @@ class ModelUserGoogle extends Model {
$session->set("realname", $query->row['realname']);
$session->set("emails", $this->model_user_user->get_users_all_email_addresses($user['uid']));
$session->set("folders", $this->model_folder_folder->get_all_folder_ids($user['uid']));
$session->set("extra_folders", $this->model_folder_folder->get_all_extra_folder_ids($user['uid']));
$session->set("folders", $this->model_folder_folder->get_folder_id_array_for_user($user['uid']));
AUDIT(ACTION_LOGIN, $user['username'], '', '', 'successful auth against Google');