diff options
| author | Robin <robin@Amaya.(none)> | 2010-05-22 22:08:08 +0200 |
|---|---|---|
| committer | Robin <robin@Amaya.(none)> | 2010-05-22 22:08:08 +0200 |
| commit | d909f91d07deae7e5e438496dee82075dae24cdb (patch) | |
| tree | 3bc24bc6e72c9e9605afa74a06944a78ec9946dd /inc/HTTP | |
| parent | 086f060b9ebb16d0f28b50e472d849ba5332483a (diff) | |
| download | nextcloud-server-d909f91d07deae7e5e438496dee82075dae24cdb.tar.gz nextcloud-server-d909f91d07deae7e5e438496dee82075dae24cdb.zip | |
small webdav fixes
Diffstat (limited to 'inc/HTTP')
| -rwxr-xr-x | inc/HTTP/WebDAV/Server/Filesystem.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/inc/HTTP/WebDAV/Server/Filesystem.php b/inc/HTTP/WebDAV/Server/Filesystem.php index e11e3b3f5c9..66d040ba0e2 100755 --- a/inc/HTTP/WebDAV/Server/Filesystem.php +++ b/inc/HTTP/WebDAV/Server/Filesystem.php @@ -31,6 +31,7 @@ | ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | | POSSIBILITY OF SUCH DAMAGE. | +----------------------------------------------------------------------+ + --- modified for ownCloud --- */ require_once("../inc/lib_base.php"); oc_require_once("HTTP/WebDAV/Server.php"); @@ -539,6 +540,8 @@ $stat = $this->DELETE(array("path" => $options["dest"])); if (($stat{0} != "2") && (substr($stat, 0, 3) != "404")) { return $stat; + }else{ + $new=true; } } else { return "412 precondition failed"; @@ -547,7 +550,7 @@ if ($del) { if (!OC_FILESYSTEM::rename($source, $dest)) { - return "500 Internal server error"; + return "500 Internal server error 1"; } $destpath = $this->_unslashify($options["dest"]); if (is_dir($source)) { @@ -578,7 +581,6 @@ if (OC_FILESYSTEM::is_dir($file)) { $file = $this->_slashify($file); } - $destfile = str_replace($source, $dest, $file); if (OC_FILESYSTEM::is_dir($file)) { @@ -593,9 +595,7 @@ return "409 Conflict"; } } else { - if (!OC_FILESYSTEM::copy($file, $destfile)) { - error_log("copy $file to $destfile failed"); return "409 Conflict"; } } |