Update to the svn version of "HTTP WebDAV server" (integration to owncloud was made with alimited knowledge, so it may be ugly).Anyway it improves a lot the score on litmus testsuite on my server.
This commit is contained in:
root
parent
964c9b362c
commit
09add452d9
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,159 +1,173 @@
|
||||||
<?php
|
<?php // $Id$
|
||||||
//
|
/*
|
||||||
// +----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
// | PHP Version 4 |
|
| Copyright (c) 2002-2007 Christian Stocker, Hartmut Holzgraefe |
|
||||||
// +----------------------------------------------------------------------+
|
| All rights reserved |
|
||||||
// | Copyright (c) 1997-2003 The PHP Group |
|
| |
|
||||||
// +----------------------------------------------------------------------+
|
| Redistribution and use in source and binary forms, with or without |
|
||||||
// | This source file is subject to version 2.02 of the PHP license, |
|
| modification, are permitted provided that the following conditions |
|
||||||
// | that is bundled with this package in the file LICENSE, and is |
|
| are met: |
|
||||||
// | available at through the world-wide-web at |
|
| |
|
||||||
// | http://www.php.net/license/2_02.txt. |
|
| 1. Redistributions of source code must retain the above copyright |
|
||||||
// | If you did not receive a copy of the PHP license and are unable to |
|
| notice, this list of conditions and the following disclaimer. |
|
||||||
// | obtain it through the world-wide-web, please send a note to |
|
| 2. Redistributions in binary form must reproduce the above copyright |
|
||||||
// | license@php.net so we can mail you a copy immediately. |
|
| notice, this list of conditions and the following disclaimer in |
|
||||||
// +----------------------------------------------------------------------+
|
| the documentation and/or other materials provided with the |
|
||||||
// | Authors: Hartmut Holzgraefe <hholzgra@php.net> |
|
| distribution. |
|
||||||
// | Christian Stocker <chregu@bitflux.ch> |
|
| 3. The names of the authors may not be used to endorse or promote |
|
||||||
// +----------------------------------------------------------------------+
|
| products derived from this software without specific prior |
|
||||||
//
|
| written permission. |
|
||||||
// $Id: _parse_lockinfo.php,v 1.2 2004/01/05 12:32:40 hholzgra Exp $
|
| |
|
||||||
//
|
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
|
||||||
|
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
|
||||||
|
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
|
||||||
|
| FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
|
||||||
|
| COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
|
||||||
|
| INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
|
||||||
|
| BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
|
||||||
|
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
|
||||||
|
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
|
||||||
|
| LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
|
||||||
|
| ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
||||||
|
| POSSIBILITY OF SUCH DAMAGE. |
|
||||||
|
+----------------------------------------------------------------------+
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* helper class for parsing LOCK request bodies
|
* helper class for parsing LOCK request bodies
|
||||||
*
|
*
|
||||||
* @package HTTP_WebDAV_Server
|
* @package HTTP_WebDAV_Server
|
||||||
* @author Hartmut Holzgraefe <hholzgra@php.net>
|
* @author Hartmut Holzgraefe <hholzgra@php.net>
|
||||||
* @version 0.99.1dev
|
* @version @package-version@
|
||||||
*/
|
*/
|
||||||
class _parse_lockinfo
|
class _parse_lockinfo
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* success state flag
|
* success state flag
|
||||||
*
|
*
|
||||||
* @var bool
|
* @var bool
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
var $success = false;
|
var $success = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* lock type, currently only "write"
|
* lock type, currently only "write"
|
||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
var $locktype = "";
|
var $locktype = "";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* lock scope, "shared" or "exclusive"
|
* lock scope, "shared" or "exclusive"
|
||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
var $lockscope = "";
|
var $lockscope = "";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* lock owner information
|
* lock owner information
|
||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
var $owner = "";
|
var $owner = "";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* flag that is set during lock owner read
|
* flag that is set during lock owner read
|
||||||
*
|
*
|
||||||
* @var bool
|
* @var bool
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
var $collect_owner = false;
|
var $collect_owner = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* constructor
|
* constructor
|
||||||
*
|
*
|
||||||
* @param string path of stream to read
|
* @param string path of stream to read
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
function _parse_lockinfo($path)
|
function _parse_lockinfo($path)
|
||||||
{
|
{
|
||||||
// we assume success unless problems occur
|
// we assume success unless problems occur
|
||||||
$this->success = true;
|
$this->success = true;
|
||||||
|
|
||||||
// remember if any input was parsed
|
// remember if any input was parsed
|
||||||
$had_input = false;
|
$had_input = false;
|
||||||
|
|
||||||
// open stream
|
// open stream
|
||||||
$f_in = fopen($path, "r");
|
$f_in = fopen($path, "r");
|
||||||
if (!$f_in) {
|
if (!$f_in) {
|
||||||
$this->success = false;
|
$this->success = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// create namespace aware parser
|
// create namespace aware parser
|
||||||
$xml_parser = xml_parser_create_ns("UTF-8", " ");
|
$xml_parser = xml_parser_create_ns("UTF-8", " ");
|
||||||
|
|
||||||
// set tag and data handlers
|
// set tag and data handlers
|
||||||
xml_set_element_handler($xml_parser,
|
xml_set_element_handler($xml_parser,
|
||||||
array(&$this, "_startElement"),
|
array(&$this, "_startElement"),
|
||||||
array(&$this, "_endElement"));
|
array(&$this, "_endElement"));
|
||||||
xml_set_character_data_handler($xml_parser,
|
xml_set_character_data_handler($xml_parser,
|
||||||
array(&$this, "_data"));
|
array(&$this, "_data"));
|
||||||
|
|
||||||
// we want a case sensitive parser
|
// we want a case sensitive parser
|
||||||
xml_parser_set_option($xml_parser,
|
xml_parser_set_option($xml_parser,
|
||||||
XML_OPTION_CASE_FOLDING, false);
|
XML_OPTION_CASE_FOLDING, false);
|
||||||
|
|
||||||
// parse input
|
// parse input
|
||||||
while($this->success && !feof($f_in)) {
|
while ($this->success && !feof($f_in)) {
|
||||||
$line = fgets($f_in);
|
$line = fgets($f_in);
|
||||||
if (is_string($line)) {
|
if (is_string($line)) {
|
||||||
$had_input = true;
|
$had_input = true;
|
||||||
$this->success &= xml_parse($xml_parser, $line, false);
|
$this->success &= xml_parse($xml_parser, $line, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// finish parsing
|
// finish parsing
|
||||||
if($had_input) {
|
if ($had_input) {
|
||||||
$this->success &= xml_parse($xml_parser, "", true);
|
$this->success &= xml_parse($xml_parser, "", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if required tags where found
|
// check if required tags where found
|
||||||
$this->success &= !empty($this->locktype);
|
$this->success &= !empty($this->locktype);
|
||||||
$this->success &= !empty($this->lockscope);
|
$this->success &= !empty($this->lockscope);
|
||||||
|
|
||||||
// free parser resource
|
// free parser resource
|
||||||
xml_parser_free($xml_parser);
|
xml_parser_free($xml_parser);
|
||||||
|
|
||||||
// close input stream
|
// close input stream
|
||||||
fclose($f_in);
|
fclose($f_in);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* tag start handler
|
* tag start handler
|
||||||
*
|
*
|
||||||
* @param resource parser
|
* @param resource parser
|
||||||
* @param string tag name
|
* @param string tag name
|
||||||
* @param array tag attributes
|
* @param array tag attributes
|
||||||
* @return void
|
* @return void
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
function _startElement($parser, $name, $attrs)
|
function _startElement($parser, $name, $attrs)
|
||||||
{
|
{
|
||||||
// namespace handling
|
// namespace handling
|
||||||
if (strstr($name, " ")) {
|
if (strstr($name, " ")) {
|
||||||
list($ns, $tag) = explode(" ", $name);
|
list($ns, $tag) = explode(" ", $name);
|
||||||
} else {
|
} else {
|
||||||
$ns = "";
|
$ns = "";
|
||||||
$tag = $name;
|
$tag = $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($this->collect_owner) {
|
if ($this->collect_owner) {
|
||||||
// everything within the <owner> tag needs to be collected
|
// everything within the <owner> tag needs to be collected
|
||||||
$ns_short = "";
|
$ns_short = "";
|
||||||
$ns_attr = "";
|
$ns_attr = "";
|
||||||
if ($ns) {
|
if ($ns) {
|
||||||
if ($ns == "DAV:") {
|
if ($ns == "DAV:") {
|
||||||
$ns_short = "D:";
|
$ns_short = "D:";
|
||||||
|
|
@ -163,75 +177,75 @@ class _parse_lockinfo
|
||||||
}
|
}
|
||||||
$this->owner .= "<$ns_short$tag$ns_attr>";
|
$this->owner .= "<$ns_short$tag$ns_attr>";
|
||||||
} else if ($ns == "DAV:") {
|
} else if ($ns == "DAV:") {
|
||||||
// parse only the essential tags
|
// parse only the essential tags
|
||||||
switch ($tag) {
|
switch ($tag) {
|
||||||
case "write":
|
case "write":
|
||||||
$this->locktype = $tag;
|
$this->locktype = $tag;
|
||||||
break;
|
break;
|
||||||
case "exclusive":
|
case "exclusive":
|
||||||
case "shared":
|
case "shared":
|
||||||
$this->lockscope = $tag;
|
$this->lockscope = $tag;
|
||||||
break;
|
break;
|
||||||
case "owner":
|
case "owner":
|
||||||
$this->collect_owner = true;
|
$this->collect_owner = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* data handler
|
* data handler
|
||||||
*
|
*
|
||||||
* @param resource parser
|
* @param resource parser
|
||||||
* @param string data
|
* @param string data
|
||||||
* @return void
|
* @return void
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
function _data($parser, $data)
|
function _data($parser, $data)
|
||||||
{
|
{
|
||||||
// only the <owner> tag has data content
|
// only the <owner> tag has data content
|
||||||
if ($this->collect_owner) {
|
if ($this->collect_owner) {
|
||||||
$this->owner .= $data;
|
$this->owner .= $data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* tag end handler
|
* tag end handler
|
||||||
*
|
*
|
||||||
* @param resource parser
|
* @param resource parser
|
||||||
* @param string tag name
|
* @param string tag name
|
||||||
* @return void
|
* @return void
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
function _endElement($parser, $name)
|
function _endElement($parser, $name)
|
||||||
{
|
{
|
||||||
// namespace handling
|
// namespace handling
|
||||||
if (strstr($name, " ")) {
|
if (strstr($name, " ")) {
|
||||||
list($ns, $tag) = explode(" ", $name);
|
list($ns, $tag) = explode(" ", $name);
|
||||||
} else {
|
} else {
|
||||||
$ns = "";
|
$ns = "";
|
||||||
$tag = $name;
|
$tag = $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
// <owner> finished?
|
// <owner> finished?
|
||||||
if (($ns == "DAV:") && ($tag == "owner")) {
|
if (($ns == "DAV:") && ($tag == "owner")) {
|
||||||
$this->collect_owner = false;
|
$this->collect_owner = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// within <owner> we have to collect everything
|
// within <owner> we have to collect everything
|
||||||
if ($this->collect_owner) {
|
if ($this->collect_owner) {
|
||||||
$ns_short = "";
|
$ns_short = "";
|
||||||
$ns_attr = "";
|
$ns_attr = "";
|
||||||
if ($ns) {
|
if ($ns) {
|
||||||
if ($ns == "DAV:") {
|
if ($ns == "DAV:") {
|
||||||
$ns_short = "D:";
|
$ns_short = "D:";
|
||||||
} else {
|
} else {
|
||||||
$ns_attr = " xmlns='$ns'";
|
$ns_attr = " xmlns='$ns'";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->owner .= "</$ns_short$tag$ns_attr>";
|
$this->owner .= "</$ns_short$tag$ns_attr>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -1,178 +1,191 @@
|
||||||
<?php
|
<?php // $Id$
|
||||||
//
|
/*
|
||||||
// +----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
// | PHP Version 4 |
|
| Copyright (c) 2002-2007 Christian Stocker, Hartmut Holzgraefe |
|
||||||
// +----------------------------------------------------------------------+
|
| All rights reserved |
|
||||||
// | Copyright (c) 1997-2003 The PHP Group |
|
| |
|
||||||
// +----------------------------------------------------------------------+
|
| Redistribution and use in source and binary forms, with or without |
|
||||||
// | This source file is subject to version 2.02 of the PHP license, |
|
| modification, are permitted provided that the following conditions |
|
||||||
// | that is bundled with this package in the file LICENSE, and is |
|
| are met: |
|
||||||
// | available at through the world-wide-web at |
|
| |
|
||||||
// | http://www.php.net/license/2_02.txt. |
|
| 1. Redistributions of source code must retain the above copyright |
|
||||||
// | If you did not receive a copy of the PHP license and are unable to |
|
| notice, this list of conditions and the following disclaimer. |
|
||||||
// | obtain it through the world-wide-web, please send a note to |
|
| 2. Redistributions in binary form must reproduce the above copyright |
|
||||||
// | license@php.net so we can mail you a copy immediately. |
|
| notice, this list of conditions and the following disclaimer in |
|
||||||
// +----------------------------------------------------------------------+
|
| the documentation and/or other materials provided with the |
|
||||||
// | Authors: Hartmut Holzgraefe <hholzgra@php.net> |
|
| distribution. |
|
||||||
// | Christian Stocker <chregu@bitflux.ch> |
|
| 3. The names of the authors may not be used to endorse or promote |
|
||||||
// +----------------------------------------------------------------------+
|
| products derived from this software without specific prior |
|
||||||
//
|
| written permission. |
|
||||||
// $Id: _parse_propfind.php,v 1.2 2004/01/05 12:33:22 hholzgra Exp $
|
| |
|
||||||
//
|
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
|
||||||
|
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
|
||||||
|
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
|
||||||
|
| FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
|
||||||
|
| COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
|
||||||
|
| INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
|
||||||
|
| BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
|
||||||
|
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
|
||||||
|
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
|
||||||
|
| LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
|
||||||
|
| ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
||||||
|
| POSSIBILITY OF SUCH DAMAGE. |
|
||||||
|
+----------------------------------------------------------------------+
|
||||||
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* helper class for parsing PROPFIND request bodies
|
* helper class for parsing PROPFIND request bodies
|
||||||
*
|
*
|
||||||
* @package HTTP_WebDAV_Server
|
* @package HTTP_WebDAV_Server
|
||||||
* @author Hartmut Holzgraefe <hholzgra@php.net>
|
* @author Hartmut Holzgraefe <hholzgra@php.net>
|
||||||
* @version 0.99.1dev
|
* @version @package-version@
|
||||||
*/
|
*/
|
||||||
class _parse_propfind
|
class _parse_propfind
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* success state flag
|
* success state flag
|
||||||
*
|
*
|
||||||
* @var bool
|
* @var bool
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
var $success = false;
|
var $success = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* found properties are collected here
|
* found properties are collected here
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
var $props = false;
|
var $props = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* internal tag nesting depth counter
|
* internal tag nesting depth counter
|
||||||
*
|
*
|
||||||
* @var int
|
* @var int
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
var $depth = 0;
|
var $depth = 0;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* constructor
|
* constructor
|
||||||
*
|
*
|
||||||
* @access public
|
* @access public
|
||||||
*/
|
*/
|
||||||
function _parse_propfind($path)
|
function _parse_propfind($path)
|
||||||
{
|
{
|
||||||
// success state flag
|
// success state flag
|
||||||
$this->success = true;
|
$this->success = true;
|
||||||
|
|
||||||
// property storage array
|
// property storage array
|
||||||
$this->props = array();
|
$this->props = array();
|
||||||
|
|
||||||
// internal tag depth counter
|
// internal tag depth counter
|
||||||
$this->depth = 0;
|
$this->depth = 0;
|
||||||
|
|
||||||
// remember if any input was parsed
|
// remember if any input was parsed
|
||||||
$had_input = false;
|
$had_input = false;
|
||||||
|
|
||||||
// open input stream
|
// open input stream
|
||||||
$f_in = fopen($path, "r");
|
$f_in = fopen($path, "r");
|
||||||
if (!$f_in) {
|
if (!$f_in) {
|
||||||
$this->success = false;
|
$this->success = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// create XML parser
|
// create XML parser
|
||||||
$xml_parser = xml_parser_create_ns("UTF-8", " ");
|
$xml_parser = xml_parser_create_ns("UTF-8", " ");
|
||||||
|
|
||||||
// set tag and data handlers
|
// set tag and data handlers
|
||||||
xml_set_element_handler($xml_parser,
|
xml_set_element_handler($xml_parser,
|
||||||
array(&$this, "_startElement"),
|
array(&$this, "_startElement"),
|
||||||
array(&$this, "_endElement"));
|
array(&$this, "_endElement"));
|
||||||
|
|
||||||
// we want a case sensitive parser
|
// we want a case sensitive parser
|
||||||
xml_parser_set_option($xml_parser,
|
xml_parser_set_option($xml_parser,
|
||||||
XML_OPTION_CASE_FOLDING, false);
|
XML_OPTION_CASE_FOLDING, false);
|
||||||
|
|
||||||
|
|
||||||
// parse input
|
// parse input
|
||||||
while($this->success && !feof($f_in)) {
|
while ($this->success && !feof($f_in)) {
|
||||||
$line = fgets($f_in);
|
$line = fgets($f_in);
|
||||||
if (is_string($line)) {
|
if (is_string($line)) {
|
||||||
$had_input = true;
|
$had_input = true;
|
||||||
$this->success &= xml_parse($xml_parser, $line, false);
|
$this->success &= xml_parse($xml_parser, $line, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// finish parsing
|
// finish parsing
|
||||||
if($had_input) {
|
if ($had_input) {
|
||||||
$this->success &= xml_parse($xml_parser, "", true);
|
$this->success &= xml_parse($xml_parser, "", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// free parser
|
// free parser
|
||||||
xml_parser_free($xml_parser);
|
xml_parser_free($xml_parser);
|
||||||
|
|
||||||
// close input stream
|
// close input stream
|
||||||
fclose($f_in);
|
fclose($f_in);
|
||||||
|
|
||||||
// if no input was parsed it was a request
|
// if no input was parsed it was a request
|
||||||
if(!count($this->props)) $this->props = "all"; // default
|
if(!count($this->props)) $this->props = "all"; // default
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* start tag handler
|
* start tag handler
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @param resource parser
|
* @param resource parser
|
||||||
* @param string tag name
|
* @param string tag name
|
||||||
* @param array tag attributes
|
* @param array tag attributes
|
||||||
*/
|
*/
|
||||||
function _startElement($parser, $name, $attrs)
|
function _startElement($parser, $name, $attrs)
|
||||||
{
|
{
|
||||||
// name space handling
|
// name space handling
|
||||||
if (strstr($name, " ")) {
|
if (strstr($name, " ")) {
|
||||||
list($ns, $tag) = explode(" ", $name);
|
list($ns, $tag) = explode(" ", $name);
|
||||||
if ($ns == "")
|
if ($ns == "")
|
||||||
$this->success = false;
|
$this->success = false;
|
||||||
} else {
|
} else {
|
||||||
$ns = "";
|
$ns = "";
|
||||||
$tag = $name;
|
$tag = $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
// special tags at level 1: <allprop> and <propname>
|
// special tags at level 1: <allprop> and <propname>
|
||||||
if ($this->depth == 1) {
|
if ($this->depth == 1) {
|
||||||
if ($tag == "allprop")
|
if ($tag == "allprop")
|
||||||
$this->props = "all";
|
$this->props = "all";
|
||||||
|
|
||||||
if ($tag == "propname")
|
if ($tag == "propname")
|
||||||
$this->props = "names";
|
$this->props = "names";
|
||||||
}
|
}
|
||||||
|
|
||||||
// requested properties are found at level 2
|
// requested properties are found at level 2
|
||||||
if ($this->depth == 2) {
|
if ($this->depth == 2) {
|
||||||
$prop = array("name" => $tag);
|
$prop = array("name" => $tag);
|
||||||
if ($ns)
|
if ($ns)
|
||||||
$prop["xmlns"] = $ns;
|
$prop["xmlns"] = $ns;
|
||||||
$this->props[] = $prop;
|
$this->props[] = $prop;
|
||||||
}
|
}
|
||||||
|
|
||||||
// increment depth count
|
// increment depth count
|
||||||
$this->depth++;
|
$this->depth++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* end tag handler
|
* end tag handler
|
||||||
*
|
*
|
||||||
* @access private
|
* @access private
|
||||||
* @param resource parser
|
* @param resource parser
|
||||||
* @param string tag name
|
* @param string tag name
|
||||||
*/
|
*/
|
||||||
function _endElement($parser, $name)
|
function _endElement($parser, $name)
|
||||||
{
|
{
|
||||||
// here we only need to decrement the depth count
|
// here we only need to decrement the depth count
|
||||||
$this->depth--;
|
$this->depth--;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,45 @@
|
||||||
<?php
|
<?php // $Id$
|
||||||
//
|
/*
|
||||||
// +----------------------------------------------------------------------+
|
+----------------------------------------------------------------------+
|
||||||
// | PHP Version 4 |
|
| Copyright (c) 2002-2007 Christian Stocker, Hartmut Holzgraefe |
|
||||||
// +----------------------------------------------------------------------+
|
| All rights reserved |
|
||||||
// | Copyright (c) 1997-2003 The PHP Group |
|
| |
|
||||||
// +----------------------------------------------------------------------+
|
| Redistribution and use in source and binary forms, with or without |
|
||||||
// | This source file is subject to version 2.02 of the PHP license, |
|
| modification, are permitted provided that the following conditions |
|
||||||
// | that is bundled with this package in the file LICENSE, and is |
|
| are met: |
|
||||||
// | available at through the world-wide-web at |
|
| |
|
||||||
// | http://www.php.net/license/2_02.txt. |
|
| 1. Redistributions of source code must retain the above copyright |
|
||||||
// | If you did not receive a copy of the PHP license and are unable to |
|
| notice, this list of conditions and the following disclaimer. |
|
||||||
// | obtain it through the world-wide-web, please send a note to |
|
| 2. Redistributions in binary form must reproduce the above copyright |
|
||||||
// | license@php.net so we can mail you a copy immediately. |
|
| notice, this list of conditions and the following disclaimer in |
|
||||||
// +----------------------------------------------------------------------+
|
| the documentation and/or other materials provided with the |
|
||||||
// | Authors: Hartmut Holzgraefe <hholzgra@php.net> |
|
| distribution. |
|
||||||
// | Christian Stocker <chregu@bitflux.ch> |
|
| 3. The names of the authors may not be used to endorse or promote |
|
||||||
// +----------------------------------------------------------------------+
|
| products derived from this software without specific prior |
|
||||||
//
|
| written permission. |
|
||||||
// $Id: _parse_proppatch.php,v 1.3 2004/01/05 12:41:34 hholzgra Exp $
|
| |
|
||||||
//
|
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
|
||||||
|
| "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
|
||||||
|
| LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS |
|
||||||
|
| FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE |
|
||||||
|
| COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, |
|
||||||
|
| INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, |
|
||||||
|
| BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
|
||||||
|
| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
|
||||||
|
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
|
||||||
|
| LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
|
||||||
|
| ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
||||||
|
| POSSIBILITY OF SUCH DAMAGE. |
|
||||||
|
+----------------------------------------------------------------------+
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* helper class for parsing PROPPATCH request bodies
|
* helper class for parsing PROPPATCH request bodies
|
||||||
*
|
*
|
||||||
* @package HTTP_WebDAV_Server
|
* @package HTTP_WebDAV_Server
|
||||||
* @author Hartmut Holzgraefe <hholzgra@php.net>
|
* @author Hartmut Holzgraefe <hholzgra@php.net>
|
||||||
* @version 0.99.1dev
|
* @version @package-version@
|
||||||
*/
|
*/
|
||||||
class _parse_proppatch
|
class _parse_proppatch
|
||||||
{
|
{
|
||||||
|
|
@ -152,8 +166,10 @@ class _parse_proppatch
|
||||||
|
|
||||||
if ($this->depth >= 4) {
|
if ($this->depth >= 4) {
|
||||||
$this->current["val"] .= "<$tag";
|
$this->current["val"] .= "<$tag";
|
||||||
foreach ($attr as $key => $val) {
|
if (isset($attr)) {
|
||||||
$this->current["val"] .= ' '.$key.'="'.str_replace('"','"', $val).'"';
|
foreach ($attr as $key => $val) {
|
||||||
|
$this->current["val"] .= ' '.$key.'="'.str_replace('"','"', $val).'"';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
$this->current["val"] .= ">";
|
$this->current["val"] .= ">";
|
||||||
}
|
}
|
||||||
|
|
@ -204,11 +220,18 @@ class _parse_proppatch
|
||||||
* @return void
|
* @return void
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
function _data($parser, $data) {
|
function _data($parser, $data)
|
||||||
|
{
|
||||||
if (isset($this->current)) {
|
if (isset($this->current)) {
|
||||||
$this->current["val"] .= $data;
|
$this->current["val"] .= $data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
/*
|
||||||
|
* Local variables:
|
||||||
|
* tab-width: 4
|
||||||
|
* c-basic-offset: 4
|
||||||
|
* indent-tabs-mode:nil
|
||||||
|
* End:
|
||||||
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue