use \OC::$server->getDatabaseConnection()->executeQuery() with fetch() where possible
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
This commit is contained in:
@@ -55,11 +55,11 @@ abstract class Base extends \OC\User\Backend{
|
|||||||
* @return string display name
|
* @return string display name
|
||||||
*/
|
*/
|
||||||
public function getDisplayName($uid) {
|
public function getDisplayName($uid) {
|
||||||
$user = OC_DB::executeAudited(
|
$user = \OC::$server->getDatabaseConnection()->executeQuery(
|
||||||
'SELECT `displayname` FROM `*PREFIX*users_external`'
|
'SELECT `displayname` FROM `*PREFIX*users_external`'
|
||||||
. ' WHERE `uid` = ? AND `backend` = ?',
|
. ' WHERE `uid` = ? AND `backend` = ?',
|
||||||
array($uid, $this->backend)
|
array($uid, $this->backend)
|
||||||
)->fetchRow();
|
)->fetch();
|
||||||
$displayName = trim($user['displayname'], ' ');
|
$displayName = trim($user['displayname'], ' ');
|
||||||
if (!empty($displayName)) {
|
if (!empty($displayName)) {
|
||||||
return $displayName;
|
return $displayName;
|
||||||
@@ -170,11 +170,11 @@ abstract class Base extends \OC\User\Backend{
|
|||||||
* @return boolean
|
* @return boolean
|
||||||
*/
|
*/
|
||||||
public function userExists($uid) {
|
public function userExists($uid) {
|
||||||
$result = OC_DB::executeAudited(
|
$result = \OC::$server->getDatabaseConnection()->executeQuery(
|
||||||
'SELECT COUNT(*) FROM `*PREFIX*users_external`'
|
'SELECT COUNT(*) FROM `*PREFIX*users_external`'
|
||||||
. ' WHERE LOWER(`uid`) = LOWER(?) AND `backend` = ?',
|
. ' WHERE LOWER(`uid`) = LOWER(?) AND `backend` = ?',
|
||||||
array($uid, $this->backend)
|
array($uid, $this->backend)
|
||||||
);
|
);
|
||||||
return $result->fetchOne() > 0;
|
return $result->fetch() > 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,13 +52,13 @@ class OC_User_IMAP extends \OCA\user_external\Base {
|
|||||||
$uid = str_replace("%40","@",$uid);
|
$uid = str_replace("%40","@",$uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = OC_DB::executeAudited(
|
$result = \OC::$server->getDatabaseConnection()->executeQuery(
|
||||||
'SELECT `userid` FROM `*PREFIX*preferences` WHERE `appid`=? AND `configkey`=? AND `configvalue`=?',
|
'SELECT `userid` FROM `*PREFIX*preferences` WHERE `appid`=? AND `configkey`=? AND `configvalue`=?',
|
||||||
array('settings','email',$uid)
|
array('settings','email',$uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
$users = array();
|
$users = array();
|
||||||
while ($row = $result->fetchRow()) {
|
while ($row = $result->fetch()) {
|
||||||
$users[] = $row['userid'];
|
$users[] = $row['userid'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user