mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor OC_SHARE to allow for renaming and write permissions

This commit is contained in:
Michael Gapczynski 2011-07-06 12:12:29 -04:00
parent 9deab8302f
commit cf33995892
2 changed files with 96 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
apps/files_sharing/lib_share.php
View File

@ -31,38 +31,60 @@ class OC_SHARE {
* @param string $item * @param string $item
* @param user item shared with $uid_shared_with * @param user item shared with $uid_shared_with
*/ */
public function __construct($item, $uid_shared_with, $public = false) { public function __construct($source, $uid_shared_with, $permissions, $public = false) {
if ($item && OC_FILESYSTEM::file_exists($item) && OC_FILESYSTEM::is_readable($item)) { if ($source && OC_FILESYSTEM::file_exists($source) && OC_FILESYSTEM::is_readable($source)) {
$uid_owner = $_SESSION['user_id']; $uid_owner = $_SESSION['user_id'];
if ($public) { if ($public) {
// TODO create token for public file // TODO create token for public file
$token = sha1("$uid_owner-$item"); $token = sha1("$uid_owner-$item");
} else { } else {
$query = OC_DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?)"); $query = OC_DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
$sourceLocalPath = substr($source, strlen("/".$uid_owner."/files/"));;
foreach ($uid_shared_with as $uid) { foreach ($uid_shared_with as $uid) {
$query->execute(array($uid_owner, $uid, $item)); // TODO check to see if target already exists in database
$target = "/".$uid."/files/Share/".$sourceLocalPath;
$query->execute(array($uid_owner, $uid, $source, $target, $permissions));
} }
} }
} }
} }
/** /**
* TODO complete lib_permissions * Change is writeable for the specified item and user
* Change the permissions of the specified item * @param $source
* @param permissions $permissions * @param $uid_shared_with
* @param $is_writeable
*/ */
public static function setPermissions($item, $uid_shared_with, $permissions) { public static function setIsWriteable($source, $uid_shared_with, $is_writeable) {
$query = OC_DB::prepare("UPDATE *PREFIX*sharing SET permissions = ? WHERE item = ? AND uid_shared_with = ? AND uid_owner = ?"); $query = OC_DB::prepare("UPDATE *PREFIX*sharing SET is_writeable = ? WHERE source COLLATE latin1_bin LIKE ? AND uid_shared_with = ? AND uid_owner = ?");
$query->execute(array($permissions, $item, $uid_shared_with, $_SESSION['user_id'])); $query->execute(array($is_writeable, $source."%", $uid_shared_with, $_SESSION['user_id']));
if (mysql_affected_rows() == 0) {
// A new entry is added to the database when a file within a shared folder is set new a value for is_writeable, but not the entire folder
$query = OC_DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
$target = "/".$uid_shared_with."/files/";
$query->execute(array($_SESSION['user_id'], $uid_shared_with, $source, $target, $is_writeable));
}
} }
/** /**
* Get the permissions for the specified item * Check if the specified item is writeable for the user
* @param unknown_type $item * @param $target
* @return true or false
*/ */
public static function getPermissions($item, $uid_shared_with) { public static function isWriteable($target) {
$query = OC_DB::prepare("SELECT permissions FROM *PREFIX*sharing WHERE item = ? AND uid_shared_with = ? AND uid_owner = ? "); $query = OC_DB::prepare("SELECT is_writeable FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with = ?");
return $query->execute(array($item, $uid_shared_with, $_SESSION['user_id']))->fetchAll(); $result = $query->execute(array($target, $_SESSION['user_id']))->fetchAll();
if (count($result) > 0) {
return $result[0]['is_writeable'];
} else {
$folders = OC_SHARE::getParentFolders($target, false);
$result = $query->execute(array($folders['target'], $_SESSION['user_id']))->fetchAll();
if (count($result) > 0) {
return $result[0]['is_writeable'];
} else {
return false;
}
}
} }
/** /**
@ -76,6 +98,16 @@ class OC_SHARE {
} }
} }
/**
* Set the source location to a new value
* @param $oldSource The current source location
* @param $newTarget The new source location
*/
public static function setSource($oldSource, $newSource) {
$query = OC_DB::prepare("UPDATE *PREFIX*sharing SET source = REPLACE(source, ?, ?) WHERE uid_owner = ?");
$query->execute(array($oldSource, $newSource, $_SESSION['user_id']));
}
/** /**
* Get the source location of the target item * Get the source location of the target item
* @param $target * @param $target
@ -89,19 +121,42 @@ class OC_SHARE {
if (count($result) > 0) { if (count($result) > 0) {
return $result[0]['source']; return $result[0]['source'];
} else { } else {
// Check if the parent directory of this target is shared $folders = OC_SHARE::getParentFolders($target, false);
$parentDir = dirname($target); return $folders['source'].substr($target, strlen($folders['target']));
if ($parentDir != "" && $parentDir != "/" && $parentDir != ".") { }
$result = OC_SHARE::getSource($parentDir); }
if ($result) {
return $result."/".basename($target); public static function getParentFolders($path, $isSource = true) {
} else { // Remove any trailing '/'
return false; $path = rtrim($path, "/");
} if ($isSource) {
$query = OC_DB::prepare("SELECT target FROM *PREFIX*sharing WHERE source = ? AND uid_shared_with = ? LIMIT 1");
} else {
$query = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE target = ? AND uid_shared_with = ? LIMIT 1");
}
// TODO Prevent searching for user directory e.g. '/MTGap/files'
while ($path != "" && $path != "/" && $path != ".") {
$result = $query->execute(array($path, $_SESSION['user_id']))->fetchAll();
if (count($result) > 0) {
break;
} else { } else {
return false; // Check if the parent directory of this target is shared
$path = dirname($path);
} }
} }
if (count($result) > 0) {
if ($isSource) {
$sourceFolder = $path;
$targetFolder = $result[0]['target'];
} else {
$sourceFolder = $result[0]['source'];
$targetFolder = $path;
}
// Return both the source folder and the target folder
return array("source" => $sourceFolder, "target" => $targetFolder);
} else {
return false;
}
} }
/** /**
@ -110,8 +165,16 @@ class OC_SHARE {
* @param $newTarget The new target location * @param $newTarget The new target location
*/ */
public static function setTarget($oldTarget, $newTarget) { public static function setTarget($oldTarget, $newTarget) {
$query = OC_DB::prepare("UPDATE *PREFIX*sharing SET target = ? WHERE target = ? AND uid_shared_with = ?"); $query = OC_DB::prepare("UPDATE *PREFIX*sharing SET target = REPLACE(target, ?, ?) WHERE uid_shared_with = ?");
$query->execute(array($newTarget, $oldTarget, $_SESSION['user_id'])); $query->execute(array($oldTarget, $newTarget, $_SESSION['user_id']));
if (mysql_affected_rows() == 0) {
// A new entry is added to the database when a file within a shared folder is renamed or is moved outside the original target folder
$query = OC_DB::prepare("SELECT uid_owner, is_writeable FROM *PREFIX*sharing WHERE source = ? AND uid_shared_with = ? LIMIT 1");
$folders = OC_SHARE::getParentFolders($oldTarget, false);
$result = $query->execute(array($folders['source'], $_SESSION['user_id']));
$query = OC_DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
$query->execute(array($result[0]['uid_owner'], $_SESSION['user_id'], $folders['source'].substr($oldTarget, strlen($folders['target'])), $newTarget, $result[0]['is_writeable']));
}
} }
/** /**

31
apps/files_sharing/sharedstorage.php
View File

@ -71,6 +71,7 @@ class OC_FILESTORAGE_SHARED {
} }
} }
// TODO Change files within shared folders that are renamed
public function opendir($path) { public function opendir($path) {
if ($path == "" || $path == "/") { if ($path == "" || $path == "/") {
global $FAKEDIRS; global $FAKEDIRS;
@ -161,7 +162,6 @@ class OC_FILESTORAGE_SHARED {
} }
public function getFolderSize($path) { public function getFolderSize($path) {
return 10000;
if ($path == "" || $path == "/") { if ($path == "" || $path == "/") {
$dbpath = $_SESSION['user_id']."/files/Share/"; $dbpath = $_SESSION['user_id']."/files/Share/";
} else { } else {
@ -210,30 +210,16 @@ class OC_FILESTORAGE_SHARED {
} }
return $size; return $size;
} }
// TODO OC_SHARE::getPermissions()
public function is_readable($path) { public function is_readable($path) {
if ($path == "" || $path == "/") { return true;
return true;
} else {
$source = $this->getSource($path);
if ($source) {
$storage = OC_FILESYSTEM::getStorage($source);
return $storage->is_readable($this->getInternalPath($source));
}
}
} }
// TODO OC_SHARE::getPermissions()
public function is_writeable($path) { public function is_writeable($path) {
if ($path == "" || $path == "/") { if ($path == "" || $path == "/") {
return true; return true;
} else { } else {
$source = $this->getSource($path); return OC_SHARE::isWriteable($path);
if ($source) {
$storage = OC_FILESYSTEM::getStorage($source);
return $storage->is_writeable($this->getInternalPath($source));
}
} }
} }
@ -334,6 +320,7 @@ class OC_FILESTORAGE_SHARED {
} }
} }
// TODO OC_SHARE::getPermissions()
public function unlink($path) { public function unlink($path) {
$source = $this->getSource($path); $source = $this->getSource($path);
if ($source) { if ($source) {
@ -342,14 +329,8 @@ class OC_FILESTORAGE_SHARED {
} }
} }
// TODO OC_SHARE::getPermissions()
// TODO Update shared item location
public function rename($path1, $path2) { public function rename($path1, $path2) {
$source = $this->getSource($path1); OC_SHARE::setTarget($path1, $path2);
if ($source) {
$storage = OC_FILESYSTEM::getStorage($source);
return $storage->rename($this->getInternalPath($source), $path2);
}
} }
public function copy($path1, $path2) { public function copy($path1, $path2) {