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

fix sqlite compatibility for webdav server

This commit is contained in:
Robin Appelman 2010-09-28 23:06:29 +02:00
parent d4fa1ddaa1
commit 3e77f3f56b
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
inc/HTTP/WebDAV/Server/Filesystem.php
View File

@ -512,15 +512,17 @@
} }
$destpath = $this->_unslashify($options["dest"]); $destpath = $this->_unslashify($options["dest"]);
if (is_dir($source)) { if (is_dir($source)) {
$dpath=OC_DB::escape($destpath);
$path=OC_DB::escape($options["path"]);
$query = "UPDATE {$CONFIG_DBTABLEPREFIX}properties $query = "UPDATE {$CONFIG_DBTABLEPREFIX}properties
SET path = REPLACE(path, '".$options["path"]."', '".$destpath."') SET path = REPLACE(path, '$path', '$dpath')
WHERE path LIKE '".$this->_slashify($options["path"])."%'"; WHERE path LIKE '$path%'";
OC_DB::query($query); OC_DB::query($query);
} }
$query = "UPDATE {$CONFIG_DBTABLEPREFIX}properties $query = "UPDATE {$CONFIG_DBTABLEPREFIX}properties
SET path = '".$destpath."' SET path = '$dpath'
WHERE path = '".$options["path"]."'"; WHERE path = '$path'";
OC_DB::query($query); OC_DB::query($query);
} else { } else {
if (OC_FILESYSTEM::is_dir($source)) { if (OC_FILESYSTEM::is_dir($source)) {
@ -553,7 +555,7 @@
} }
} else { } else {
if (!OC_FILESYSTEM::copy($file, $destfile)) { if (!OC_FILESYSTEM::copy($file, $destfile)) {
return "409 Conflict"; return "409 Conflict($source) $file --> $destfile ".implode('::',$files);
} }
} }
} }
@ -581,10 +583,14 @@
if ($prop["ns"] == "DAV:") { if ($prop["ns"] == "DAV:") {
$options["props"][$key]['status'] = "403 Forbidden"; $options["props"][$key]['status'] = "403 Forbidden";
} else { } else {
$path=OC_DB::escape($options['path']);
$name=OC_DB::escape($prop['name']);
$ns=OC_DB::escape($prop['ns']);
$val=OC_DB::escape($prop['val']);
if (isset($prop["val"])) { if (isset($prop["val"])) {
$query = "REPLACE INTO {$CONFIG_DBTABLEPREFIX}properties SET path = '$options[path]', name = '$prop[name]', ns= '$prop[ns]', value = '$prop[val]'"; $query = "REPLACE INTO {$CONFIG_DBTABLEPREFIX}properties (path,name,ns,value) VALUES('$path','$name','$ns','$val')";
} else { } else {
$query = "DELETE FROM {$CONFIG_DBTABLEPREFIX}properties WHERE path = '$options[path]' AND name = '$prop[name]' AND ns = '$prop[ns]'"; $query = "DELETE FROM {$CONFIG_DBTABLEPREFIX}properties WHERE path = '$path' AND name = '$name' AND ns = '$ns'";
} }
OC_DB::query($query); OC_DB::query($query);
} }
@ -659,15 +665,15 @@
} }
} }
$locktoken=OC_DB::escape($options['locktoken']);
$path=OC_DB::escape($options['path']);
$time=time();
$owner=OC_DB::escape($options['owner']);
$timeout=OC_DB::escape($options['timeout']);
$exclusive=($options['scope'] === "exclusive" ? "1" : "0");
$query = "INSERT INTO `{$CONFIG_DBTABLEPREFIX}locks` $query = "INSERT INTO `{$CONFIG_DBTABLEPREFIX}locks`
SET `token` = '$options[locktoken]' (`token`,`path`,`created`,`modified`,`owner`,`expires`,`exclusivelock`,`recursive`)
, `path` = '$options[path]' VALUES ('$locktoken','$path',$time,$time,'$owner','timeout',$exclusive,$recursion)";
, `created` = ".time()."
, `modified` = ".time()."
, `owner` = '$options[owner]'
, `expires` = '$options[timeout]'
, `exclusivelock` = " .($options['scope'] === "exclusive" ? "1" : "0")."
, `recursive` = $recursion";
OC_DB::query($query); OC_DB::query($query);
$rows=OC_DB::affected_rows(); $rows=OC_DB::affected_rows();
if(!OC_FILESYSTEM::file_exists($fspath) and $rows>0) { if(!OC_FILESYSTEM::file_exists($fspath) and $rows>0) {