hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with master

Browse Source
This commit is contained in:
Romain Neutron
2012-01-05 14:56:13 +01:00
parent 0dd490fa23 50df11cf3c
commit a709129824
5 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/classes/deprecated/push.api.php
View File

@@ -801,7 +801,7 @@ function sqlFromFilters($usr, $filters)
$params[':like1'] = $start . $filter->fieldsearch . $end;
break;
case "NAME" :
$precise.=" (usr_nom " . $like . " :like2 OR usr_prenom like like2bis)";
$precise.=" (usr_nom " . $like . " :like2 OR usr_prenom like :like2bis)";
$params[':like2'] = $start . $filter->fieldsearch . $end;
$params[':like2bis'] = $start . $filter->fieldsearch . $end;
break;
@@ -845,7 +845,7 @@ function sqlFromFilters($usr, $filters)
$c['country' . $n] = $country;
}
$n++;
$precise.=" AND usr.pays IN (" . implode(", ", array_keys($c)) . ")";
$precise.=" AND usr.pays IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}
if (count($filters->activite) > 0 && trim($filters->activite[0]) != '')
@@ -857,7 +857,7 @@ function sqlFromFilters($usr, $filters)
$c['activite' . $n] = $activite;
}
$n++;
$precise.=" AND usr.activite IN ('" . implode(", ", array_keys($c)) . "')";
$precise.=" AND usr.activite IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}
if (count($filters->fonction) > 0 && trim($filters->fonction[0]) != '')
@@ -869,7 +869,7 @@ function sqlFromFilters($usr, $filters)
$c['fonction' . $n] = $fonction;
}
$n++;
$precise.=" AND usr.fonction IN ('" . implode(", ", array_keys($c)) . "')";
$precise.=" AND usr.fonction IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}
if (count($filters->societe) > 0 && trim($filters->societe[0]) != '')
@@ -881,7 +881,7 @@ function sqlFromFilters($usr, $filters)
$c['societe' . $n] = $societe;
}
$n++;
$precise.=" AND usr.societe IN ('" . implode(", ", array_keys($c)) . "')";
$precise.=" AND usr.societe IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}
if (count($filters->template) > 0 && trim($filters->template[0]) != '')
@@ -893,7 +893,7 @@ function sqlFromFilters($usr, $filters)
$c['template' . $n] = $template;
}
$n++;
$precise.=" AND usr.lastModel IN ('" . implode(", ", array_keys($c)) . "')";
$precise.=" AND usr.lastModel IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c);
}
}