From 3a539bcaf7b52b66421412a857b6ace945b52fb2 Mon Sep 17 00:00:00 2001 From: SJ Date: Wed, 17 Apr 2013 11:37:01 +0200 Subject: [PATCH] fixed showing emails on settings page --- webui/controller/user/settings.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/webui/controller/user/settings.php b/webui/controller/user/settings.php index 297719be..0382d624 100644 --- a/webui/controller/user/settings.php +++ b/webui/controller/user/settings.php @@ -20,24 +20,24 @@ class ControllerUserSettings extends Controller { $this->load->model('group/group'); $this->document->title = $this->data['text_settings']; - + $d = $r = ''; $auditemails = $auditdomains = $auditgroups = $auditfolders = ''; - - $auditemails = $this->model_user_user->get_emails_by_uid($_SESSION['uid']); - + + $auditemails = implode(", ", $_SESSION['emails']); + foreach($_SESSION['auditdomains'] as $d) { $auditdomains .= ', '.$d; } $auditdomains = preg_replace("/^,\s/", "", $auditdomains); - + $auditgroups = preg_replace("/\s/", ", ", $this->model_group_group->get_groups_by_uid($_SESSION['uid'])); - + foreach ($_SESSION['folders'] as $r) { $auditfolders .= ', '.$r; } $auditfolders = preg_replace("/^,\s/", "", $auditfolders); - + if($auditemails) { $this->data['emails'] = $auditemails; } else { $this->data['emails'] = $this->data['text_none_found']; } if($auditdomains) { $this->data['domains'] = $auditdomains; } else { $this->data['domains'] = $this->data['text_none_found']; } if($auditgroups) { $this->data['groups'] = $auditgroups; } else { $this->data['groups'] = $this->data['text_none_found']; }