bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-07-05 07:09: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

2
webui/controller/search/helper.php
View File

@ -45,7 +45,7 @@ class ControllerSearchHelper extends Controller {
if($this->request->post['searchtype'] == 'expert'){
if(isset($this->request->post['search']) && preg_match("/(from|to|subject|body|direction|d|size|date1|date2|attachment|a|aname|tag|note|id)\:/", $this->request->post['search'])) {
if(isset($this->request->post['search']) && preg_match("/(from|to|subject|body|direction|d|size|date1|date2|attachment|a|aname|tag|note|id|folder)\:/", $this->request->post['search'])) {
$this->a = $this->model_search_search->preprocess_post_expert_request($this->request->post);
}
else {

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")));
$folders = $session->get("folders");
$folders = array_keys($session->get("folders"));
foreach ($folders as $r) {
$auditfolders .= ', ' . $r;
}