Merge branch 'master' of dev.sourcefabric.org:campcaster

This commit is contained in:
mkonecny 2011-01-24 19:20:06 -05:00
commit 51f77dba50
14 changed files with 383 additions and 347 deletions

View file

@ -39,14 +39,13 @@ class User {
}
public static function getUsers($type=NULL) {
public static function getUsers($type=NULL, $search=NULL) {
global $CC_DBC;
$sql;
$sql_gen = "SELECT id, login, type FROM cc_subjs ";
$sql_gen = "SELECT id, login FROM cc_subjs ";
$sql = $sql_gen;
if(!is_null($type)){
@ -62,6 +61,9 @@ class User {
$sql = $sql_gen ." WHERE ". $sql_type;
}
if(!is_null($search)) {
$like = "login ILIKE '{$search}'";
}
$sql = $sql . " ORDER BY login";