wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More elegant solution for preparing IN ?s, thanks icewind

Browse source
This commit is contained in:
Michael Gapczynski 2011-07-28 20:05:18 -04:00
parent 5bc0619234
commit 7e3b796de8
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/files_sharing/lib_share.php
View file

@ -79,18 +79,6 @@ class OC_SHARE {
return $groups;
}
/**
* Create a string of ?s based on the specified count
* @return A string to be placed inside the IN operator in a query for uid_shared_with
*/
private static function prepareIN($count) {
$questionMarks = "?";
for($i = 1; $i < $count; $i++) {
$questionMarks .= ",?";
}
return $questionMarks;
}
/**
* Create a new entry in the database for a file inside a shared folder
*
@ -143,7 +131,7 @@ class OC_SHARE {
$folder = preg_replace('{(/)\1+}', "/", $folder);
$length = strlen($folder);
$userAndGroups = self::getUserAndGroups();
$query = OC_DB::prepare("SELECT uid_owner, source, target FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? OR SUBSTR(target, 1, ?) = ? AND uid_shared_with IN(".self::prepareIN(count($userAndGroups)).")");
$query = OC_DB::prepare("SELECT uid_owner, source, target FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? OR SUBSTR(target, 1, ?) = ? AND uid_shared_with IN(".substr(str_repeat(",?", count($userAndGroups)), 1).")");
return $query->execute(array_merge(array($length, $folder, $length, $folder), $userAndGroups))->fetchAll();
}
@ -157,7 +145,7 @@ class OC_SHARE {
$target = rtrim($target, "/");
$target = preg_replace('{(/)\1+}', "/", $target);
$userAndGroups = self::getUserAndGroups();
$query = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with IN(".self::prepareIN(count($userAndGroups)).") LIMIT 1");
$query = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with IN(".substr(str_repeat(",?", count($userAndGroups)), 1).") LIMIT 1");
// Prevent searching for user directory e.g. '/MTGap/files'
$userDirectory = substr($target, 0, strpos($target, "files") + 5);
while ($target != "" && $target != "/" && $target != "." && $target != $userDirectory) {
@ -186,7 +174,7 @@ class OC_SHARE {
$target = rtrim($target, "/");
$target = preg_replace('{(/)\1+}', "/", $target);
$userAndGroups = self::getUserAndGroups();
$query = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with IN(".self::prepareIN(count($userAndGroups)).") LIMIT 1");
$query = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with IN(".substr(str_repeat(",?", count($userAndGroups)), 1).") LIMIT 1");
$result = $query->execute(array_merge(array($target), $userAndGroups))->fetchAll();
if (count($result) > 0) {
return $result[0]['source'];
@ -207,7 +195,7 @@ class OC_SHARE {
*/
public static function isWriteable($target) {
$userAndGroups = self::getUserAndGroups();
$query = OC_DB::prepare("SELECT is_writeable FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with IN(".self::prepareIN(count($userAndGroups)).") LIMIT 1");
$query = OC_DB::prepare("SELECT is_writeable FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with IN(".substr(str_repeat(",?", count($userAndGroups)), 1).") LIMIT 1");
$result = $query->execute(array_merge(array($target), $userAndGroups))->fetchAll();
if (count($result) > 0) {
return $result[0]['is_writeable'];