bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 17:30:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

gui fixes

Browse Source 
Change-Id: Ifd1dc789d8379025b6349236cb18995d45435abc
Signed-off-by: SJ <sj@acts.hu>
This commit is contained in:
SJ 2016-08-16 21:57:00 +02:00
parent 40fbd59173
commit 315b26b697
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webui/controller/user/settings.php
View File

@ -41,8 +41,8 @@ class ControllerUserSettings extends Controller {
$auditgroups = preg_replace("/\n/", ", ", $this->model_group_group->get_groups_by_email($session->get("emails"))); $auditgroups = preg_replace("/\n/", ", ", $this->model_group_group->get_groups_by_email($session->get("emails")));
$folders = $session->get("folders"); $folders = array_keys($session->get("folders"));
foreach ($folders as $r) { foreach ($folders as $r) {
$auditfolders .= ', ' . $r; $auditfolders .= ', ' . $r;
} }

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

@ -15,6 +15,9 @@ class ModelUserAuth extends Model {
$session->set("auditdomains", $data['auditdomains']); $session->set("auditdomains", $data['auditdomains']);
$session->set("emails", $data['emails']); $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']); $session->set("folders", $data['folders']);
} }
@ -124,9 +127,6 @@ class ModelUserAuth extends Model {
$extra_emails = $this->model_user_user->get_email_addresses_from_groups($data['emails']); $extra_emails = $this->model_user_user->get_email_addresses_from_groups($data['emails']);
$data['emails'] = array_merge($data['emails'], $extra_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']);
$data['folders'] = $this->model_folder_folder->get_folder_names_for_user($data['email']);
$session->set("auth_data", $data); $session->set("auth_data", $data);
$this->is_ga_code_needed($username); $this->is_ga_code_needed($username);

2
webui/view/theme/default/templates/user/settings.tpl
View File

@ -34,7 +34,7 @@
<?php } ?> <?php } ?>
<?php if(ENABLE_FOLDER_RESTRICTIONS == 1) { ?> <?php if($folders) { ?>
<tr> <tr>
<td><?php print $text_folders; ?>:</td> <td><?php print $text_folders; ?>:</td>