MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.3.12' into develop

pull/762/head
iglocska 2014-10-24 14:19:10 +02:00
parent f27ec74c74 d0b441132b
commit 0ffe6f517a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -18,8 +18,8 @@
/app/files/*
!/app/files/empty
!/app/files/scripts/
!/app/files/scripts/tmp/empty
/app/files/scripts/tmp/*
!/app/files/scripts/tmp/empty
/app/tmp/files/*
!/app/files/empty
/app/webroot/img/logo.png

4
app/Controller/UsersController.php
View File

@ -181,10 +181,10 @@ class UsersController extends AppController {
$test = array();
foreach ($pieces as $piece) {
if ($piece[0] == '!') {
if ($searchTerm == 'email' || $searchTerm == 'org') $this->paginate['conditions']['AND'][] = array('LOWER(User.' . $searchTerm . ') NOT LIKE' => '%' . substr($piece, 1) . '%');
if ($searchTerm == 'email' || $searchTerm == 'org') $this->paginate['conditions']['AND'][] = array('LOWER(User.' . $searchTerm . ') NOT LIKE' => '%' . strtolower(substr($piece, 1)) . '%');
else $this->paginate['conditions']['AND'][] = array('User.' . $searchTerm => substr($piece, 1));
} else {
if ($searchTerm == 'email' || $searchTerm == 'org') $test['OR'][] = array('LOWER(User.' . $searchTerm . ') LIKE' => '%' . $piece . '%');
if ($searchTerm == 'email' || $searchTerm == 'org') $test['OR'][] = array('LOWER(User.' . $searchTerm . ') LIKE' => '%' . strtolower($piece) . '%');
else $test['OR'][] = array('User.' . $searchTerm => $piece);
}
}

2
app/Lib/cakephp

@ -1 +1 @@
Subproject commit 8b1e5e31c7517c1e1a53bf7a9fb63338ef7e0c3b
Subproject commit 62f392a0113c1c4f40e4f2155b765b6c4c8c28ff

0
app/files/scripts/tmp/empty Normal file
View File