Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-3936: 

Refactored getUsers not to take multiple types of arguments.
This commit is contained in:
Rudi Grinberg 2012-08-23 14:41:54 -04:00
parent 996dcfd35f
commit 50de229258
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
airtime_mvc/application/models/User.php
View File

@ -238,21 +238,17 @@ class Application_Model_User
return $user; return $user;
} }
public static function getUsers($type, $search=null) public static function getUsers(array $type, $search=null)
{ {
$con = Propel::getConnection(); $con = Propel::getConnection();
$sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs "; $sql_gen = "SELECT login AS value, login AS label, id as index FROM cc_subjs ";
$sql = $sql_gen; $sql = $sql_gen;
if (is_array($type)) { $type = array_map( function($t) {
for ($i=0; $i<count($type); $i++) { return "type = '{$type[$i]}'";
$type[$i] = "type = '{$type[$i]}'"; }, $type);
} $sql_type = join(" OR ", $type);
$sql_type = join(" OR ", $type);
} else {
$sql_type = "type = {$type}";
}
$sql = $sql_gen ." WHERE (". $sql_type.") "; $sql = $sql_gen ." WHERE (". $sql_type.") ";
@ -345,16 +341,14 @@ class Application_Model_User
if (is_null($userinfo)) { if (is_null($userinfo)) {
return null; return null;
} else { }
try { try {
return new self($userinfo->id); return new self($userinfo->id);
} catch (Exception $e) { } catch (Exception $e) {
//we get here if $userinfo->id is defined, but doesn't exist //we get here if $userinfo->id is defined, but doesn't exist
//in the database anymore. //in the database anymore.
Zend_Auth::getInstance()->clearIdentity(); Zend_Auth::getInstance()->clearIdentity();
return null;
return null;
}
} }
} }
} }