YakumoLabs/nextcloud-user_external
4
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use executeAudited instead of prepare+execute

Browse Source
This commit is contained in:
Christian Weiske
2014-02-11 21:04:38 +01:00
parent f86938dad1
commit d5f3984a7d
1 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
lib/base.php
View File

@@ -40,8 +40,10 @@ abstract class Base extends \OC_User_Backend{
* @return bool * @return bool
*/ */
public function deleteUser($uid) { public function deleteUser($uid) {
$query = OC_DB::prepare('DELETE FROM `*PREFIX*users_external` WHERE `uid` = ? AND `backend` = ?'); OC_DB::executeAudited(
$query->execute(array($uid, $this->backend)); 'DELETE FROM `*PREFIX*users_external` WHERE `uid` = ? AND `backend` = ?',
array($uid, $this->backend)
);
return true; return true;
} }
@@ -53,9 +55,12 @@ abstract class Base extends \OC_User_Backend{
* @return string display name * @return string display name
*/ */
public function getDisplayName($uid) { public function getDisplayName($uid) {
$query = OC_DB::prepare('SELECT `displayname` FROM `*PREFIX*users_external` WHERE `uid` = ? AND `backend` = ?'); $user = OC_DB::executeAudited(
$result = $query->execute(array($uid, $this->backend))->fetchAll(); 'SELECT `displayname` FROM `*PREFIX*users_external`'
$displayName = trim($result[0]['displayname'], ' '); . ' WHERE `uid` = ? AND `backend` = ?',
array($uid, $this->backend)
)->fetchRow();
$displayName = trim($user['displayname'], ' ');
if (!empty($displayName)) { if (!empty($displayName)) {
return $displayName; return $displayName;
} else { } else {
@@ -69,15 +74,18 @@ abstract class Base extends \OC_User_Backend{
* @return array with all displayNames (value) and the corresponding uids (key) * @return array with all displayNames (value) and the corresponding uids (key)
*/ */
public function getDisplayNames($search = '', $limit = null, $offset = null) { public function getDisplayNames($search = '', $limit = null, $offset = null) {
$displayNames = array(); $result = OC_DB::executeAudited(
$query = OC_DB::prepare( array(
'SELECT `uid`, `displayname` FROM `*PREFIX*users_external`' 'sql' => 'SELECT `uid`, `displayname` FROM `*PREFIX*users_external`'
. ' WHERE (LOWER(`displayname`) LIKE LOWER(?) OR ' . ' WHERE (LOWER(`displayname`) LIKE LOWER(?) '
. 'LOWER(`uid`) LIKE LOWER(?)) AND `backend` = ?', . ' OR LOWER(`uid`) LIKE LOWER(?)) AND `backend` = ?',
$limit, $offset 'limit' => $limit,
'offset' => $offset
),
array($search . '%', $search . '%', $this->backend)
); );
$result = $query->execute(array($search . '%', $search . '%', $this->backend));
$users = array(); $displayNames = array();
while ($row = $result->fetchRow()) { while ($row = $result->fetchRow()) {
$displayNames[$row['uid']] = $row['displayname']; $displayNames[$row['uid']] = $row['displayname'];
} }
@@ -91,11 +99,15 @@ abstract class Base extends \OC_User_Backend{
* @return array with all uids * @return array with all uids
*/ */
public function getUsers($search = '', $limit = null, $offset = null) { public function getUsers($search = '', $limit = null, $offset = null) {
$query = OC_DB::prepare( $result = OC_DB::executeAudited(
'SELECT `uid` FROM `*PREFIX*users_external` WHERE LOWER(`uid`) LIKE LOWER(?) AND `backend` = ?', array(
$limit, $offset 'sql' => 'SELECT `uid` FROM `*PREFIX*users_external`'
. ' WHERE LOWER(`uid`) LIKE LOWER(?) AND `backend` = ?',
'limit' => $limit,
'offset' => $offset
),
array($search . '%', $this->backend)
); );
$result = $query->execute(array($search . '%', $this->backend));
$users = array(); $users = array();
while ($row = $result->fetchRow()) { while ($row = $result->fetchRow()) {
$users[] = $row['uid']; $users[] = $row['uid'];
@@ -115,21 +127,21 @@ abstract class Base extends \OC_User_Backend{
/** /**
* Change the display name of a user * Change the display name of a user
* *
* @param string $uid The username * @param string $uid The username
* @param string $displayName The new display name * @param string $displayName The new display name
* *
* @return true/false * @return true/false
*/ */
public function setDisplayName($uid, $displayName) { public function setDisplayName($uid, $displayName) {
if ($this->userExists($uid)) { if (!$this->userExists($uid)) {
$query = OC_DB::prepare(
'UPDATE `*PREFIX*users_external` SET `displayname` = ? WHERE LOWER(`uid`) = ? AND `backend` = ?'
);
$query->execute(array($displayName, $uid, $this->backend));
return true;
} else {
return false; return false;
} }
OC_DB::executeAudited(
'UPDATE `*PREFIX*users_external` SET `displayname` = ?'
. ' WHERE LOWER(`uid`) = ? AND `backend` = ?',
array($displayName, $uid, $this->backend)
);
return true;
} }
/** /**
@@ -142,8 +154,11 @@ abstract class Base extends \OC_User_Backend{
protected function storeUser($uid) protected function storeUser($uid)
{ {
if (!$this->userExists($uid)) { if (!$this->userExists($uid)) {
$query = OC_DB::prepare('INSERT INTO `*PREFIX*users_external` ( `uid`, `backend` ) VALUES( ?, ? )'); OC_DB::executeAudited(
$result = $query->execute(array($uid, $this->backend)); 'INSERT INTO `*PREFIX*users_external` ( `uid`, `backend` )'
. ' VALUES( ?, ? )',
array($uid, $this->backend)
);
} }
} }
@@ -155,14 +170,11 @@ abstract class Base extends \OC_User_Backend{
* @return boolean * @return boolean
*/ */
public function userExists($uid) { public function userExists($uid) {
$query = OC_DB::prepare( $result = OC_DB::executeAudited(
'SELECT COUNT(*) FROM `*PREFIX*users_external` WHERE LOWER(`uid`) = LOWER(?) AND `backend` = ?' 'SELECT COUNT(*) FROM `*PREFIX*users_external`'
. ' WHERE LOWER(`uid`) = LOWER(?) AND `backend` = ?',
array($uid, $this->backend)
); );
$result = $query->execute(array($uid, $this->backend));
if (OC_DB::isError($result)) {
OC_Log::write('user_external', OC_DB::getErrorMessage($result), OC_Log::ERROR);
return false;
}
return $result->fetchOne() > 0; return $result->fetchOne() > 0;
} }
} }