hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
Romain Neutron
2012-01-06 13:30:56 +01:00
parent f7e301abf7 66f7efa392
commit 64ce815e81
6 changed files with 87 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/classes/User/Query.class.php
View File

@@ -137,6 +137,7 @@ class User_Query implements User_QueryInterface
const LIKE_FIRSTNAME= 'usr_prenom';
const LIKE_LASTNAME= 'usr_nom';
const LIKE_NAME= 'name';
const LIKE_COMPANY = 'societe';
const LIKE_LOGIN = 'usr_login';
const LIKE_EMAIL = 'usr_mail';
@@ -292,6 +293,7 @@ class User_Query implements User_QueryInterface
}
$sql_like = array();
foreach ($this->like_field as $like_field => $like_value)
{
switch ($like_field)
@@ -303,7 +305,7 @@ class User_Query implements User_QueryInterface
case self::LIKE_LOGIN:
case self::LIKE_COUNTRY:
$sql_like[] = sprintf(
' usr.`%s` LIKE "%s%%" '
' usr.`%s` LIKE "%s%%" COLLATE utf8_unicode_ci '
, $like_field
, str_replace(array('"', '%'), array('\"', '\%'), $like_value)
);
@@ -579,8 +581,17 @@ class User_Query implements User_QueryInterface
*/
public function like($like_field, $like_value)
{
$this->like_field[trim($like_field)] = trim($like_value);
if($like_field == self::LIKE_NAME)
{
$this->like_field[self::LIKE_FIRSTNAME] = trim($like_value);
$this->like_field[self::LIKE_LASTNAME] = trim($like_value);
}
else
{
$this->like_field[trim($like_field)] = trim($like_value);
}
$this->total = $this->page = null;
return $this;