merge

2 files changed, 7 insertions, 39 deletions

diff --git a/inc/HTTP/WebDAV/Server.php b/inc/HTTP/WebDAV/Server.php
index ba57aaf48be..c81b9c90b9d 100755
--- a/inc/HTTP/WebDAV/Server.php
+++ b/inc/HTTP/WebDAV/Server.php
@@ -33,35 +33,10 @@
    +----------------------------------------------------------------------+
 */
 
-oc_require_once "HTTP/WebDAV/Tools/_parse_propfind.php";
-oc_require_once "HTTP/WebDAV/Tools/_parse_proppatch.php";
-oc_require_once "HTTP/WebDAV/Tools/_parse_lockinfo.php";
-=======
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Hartmut Holzgraefe <hholzgra@php.net>                       |
-// |          Christian Stocker <chregu@bitflux.ch>                       |
-// +----------------------------------------------------------------------+
-//
-// $Id: Server.php,v 1.46 2006/03/03 21:43:09 hholzgra Exp $
-//
 oc_require_once("HTTP/WebDAV/Tools/_parse_propfind.php");
 oc_require_once("HTTP/WebDAV/Tools/_parse_proppatch.php");
 oc_require_once("HTTP/WebDAV/Tools/_parse_lockinfo.php");
->>>>>>> 854e0c5a9c9060e827fbbfddffeeeadfc2d27278:inc/HTTP/WebDAV/Server.php
+
 
 /**
  * Virtual base class for implementing WebDAV servers 
@@ -2162,11 +2137,4 @@ class HTTP_WebDAV_Server
     	return $func_overload & 2 ? mb_strlen($str,'ascii') : strlen($str);
     }
 } 
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
 ?>
diff --git a/inc/HTTP/WebDAV/Server/Filesystem.php b/inc/HTTP/WebDAV/Server/Filesystem.php
index e2a672ee39e..35c9f362a54 100755
--- a/inc/HTTP/WebDAV/Server/Filesystem.php
+++ b/inc/HTTP/WebDAV/Server/Filesystem.php
@@ -32,9 +32,9 @@
    | POSSIBILITY OF SUCH DAMAGE.                                          |
    +----------------------------------------------------------------------+
 */    
-    require_once "../../../lib_base.php";
-    oc_require_once "HTTP/WebDAV/Server.php";
-    oc_require_once "System.php";
+    require_once("../inc/lib_base.php");
+    oc_require_once("HTTP/WebDAV/Server.php");
+    oc_require_once("System.php");
     
     /**
      * Filesystem access using WebDAV
@@ -726,13 +726,13 @@
             $where = "WHERE path = '$options[path]' AND token = '$options[update]'";
 
             $query = "SELECT owner, exclusivelock FROM locks $where";
-            $res   = OC_DB:query($query);
-            $row   = OC_DB:fetch_assoc($res);
+            $res   = OC_DB::query($query);
+            $row   = OC_DB::fetch_assoc($res);
             OC_DB:free_result($res);
 
             if (is_array($row)) {
                 $query = "UPDATE locks SET expires = '$options[timeout]', modified = ".time()." $where";
-                OC_DB:query($query);
+                OC_DB::query($query);
                 
                 $options['owner'] = $row['owner'];
                 $options['scope'] = $row["exclusivelock"] ? "exclusive" : "shared";