EGroupware / egroupware

api/src/Db/Deprecated.php

Indentation +81 added lines, -81 removed lines

@@ -41,19 +41,19 @@ 
 	var $Query_ID = 0;
 
 	/**
-	* Execute a query
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $offset row to start from, default 0
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
-	* @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
-	* @return ADORecordSet or false, if the query fails
-	* @throws EGroupware\Api\Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
-	*/
+	 * Execute a query
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $offset row to start from, default 0
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @param int $fetchmode =self::FETCH_BOTH self::FETCH_BOTH (default), self::FETCH_ASSOC or self::FETCH_NUM
+	 * @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
+	 * @return ADORecordSet or false, if the query fails
+	 * @throws EGroupware\Api\Db\Exception\InvalidSql with $this->Link_ID->ErrorNo() as code
+	 */
 	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=self::FETCH_BOTH, $reconnect=true)
 	{
 		// New query, discard previous result.
@@ -76,12 +76,12 @@ 
 	}
 
 	/**
-	* Escape strings before sending them to the database
-	*
-	* @deprecated use quote($value,$type='') instead
-	* @param string $str the string to be escaped
-	* @return string escaped sting
-	*/
+	 * Escape strings before sending them to the database
+	 *
+	 * @deprecated use quote($value,$type='') instead
+	 * @param string $str the string to be escaped
+	 * @return string escaped sting
+	 */
 	function db_addslashes($str)
 	{
 		if (!isset($str) || $str == '')
@@ -107,14 +107,14 @@ 
 	}
 
 	/**
-	* Move to the next row in the results set
-	*
-	* Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param int $fetch_mode self::FETCH_BOTH = numerical+assoc keys (eGW default), self::FETCH_ASSOC or self::FETCH_NUM
-	* @return bool was another row found?
-	*/
+	 * Move to the next row in the results set
+	 *
+	 * Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param int $fetch_mode self::FETCH_BOTH = numerical+assoc keys (eGW default), self::FETCH_ASSOC or self::FETCH_NUM
+	 * @return bool was another row found?
+	 */
 	function next_record($fetch_mode=self::FETCH_BOTH)
 	{
 		if (!$this->Query_ID)
@@ -164,12 +164,12 @@ 
 	}
 
 	/**
-	* Move to position in result set
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param int $pos required row (optional), default first row
-	* @return boolean true if sucessful or false if not found
-	*/
+	 * Move to position in result set
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param int $pos required row (optional), default first row
+	 * @return boolean true if sucessful or false if not found
+	 */
 	function seek($pos = 0)
 	{
 		if (!$this->Query_ID  || !$this->Query_ID->Move($this->Row = $pos))
@@ -180,74 +180,74 @@ 
 	}
 
 	/**
-	* Lock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @param string $table name of table to lock
-	* @param string $mode type of lock required (optional), default write
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Lock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @param string $table name of table to lock
+	 * @param string $mode type of lock required (optional), default write
+	 * @return bool True if sucessful, False if fails
+	 */
 	function lock($table, $mode='write')
 	{
 		unset($table, $mode);	// not used anymore
 	}
 
 	/**
-	* Unlock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Unlock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @return bool True if sucessful, False if fails
+	 */
 	function unlock()
 	{}
 
 	/**
-	* Number of rows in current result set
-	*
-	* @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
-	* @return int number of rows
-	*/
+	 * Number of rows in current result set
+	 *
+	 * @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
+	 * @return int number of rows
+	 */
 	function num_rows()
 	{
 		return $this->Query_ID ? $this->Query_ID->RecordCount() : False;
 	}
 
 	/**
-	* Number of fields in current row
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @return int number of fields
-	*/
+	 * Number of fields in current row
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @return int number of fields
+	 */
 	function num_fields()
 	{
 		return $this->Query_ID ? $this->Query_ID->FieldCount() : False;
 	}
 
 	/**
-	* @deprecated use num_rows()
-	*/
+	 * @deprecated use num_rows()
+	 */
 	function nf()
 	{
 		return $this->num_rows();
 	}
 
 	/**
-	* @deprecated use print num_rows()
-	*/
+	 * @deprecated use print num_rows()
+	 */
 	function np()
 	{
 		print $this->num_rows();
 	}
 
 	/**
-	* Return the value of a column
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param string|integer $Name name of field or positional index starting from 0
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	* @return string the field value
-	*/
+	 * Return the value of a column
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param string|integer $Name name of field or positional index starting from 0
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 * @return string the field value
+	 */
 	function f($Name, $strip_slashes = False)
 	{
 		if ($strip_slashes)
@@ -258,26 +258,26 @@ 
 	}
 
 	/**
-	* Print the value of a field
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param string $Name name of field to print
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	*/
+	 * Print the value of a field
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param string $Name name of field to print
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 */
 	function p($Name, $strip_slashes = True)
 	{
 		print $this->f($Name, $strip_slashes);
 	}
 
 	/**
-	* Returns a query-result-row as an associative array (no numerical keys !!!)
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param bool $do_next_record should next_record() be called or not (default not)
-	* @param string $strip ='' string to strip of the column-name, default ''
-	* @return array/bool the associative array or False if no (more) result-row is availible
-	*/
+	 * Returns a query-result-row as an associative array (no numerical keys !!!)
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param bool $do_next_record should next_record() be called or not (default not)
+	 * @param string $strip ='' string to strip of the column-name, default ''
+	 * @return array/bool the associative array or False if no (more) result-row is availible
+	 */
 	function row($do_next_record=False,$strip='')
 	{
 		if ($do_next_record && !$this->next_record(self::FETCH_ASSOC) || !is_array($this->Record))

api/src/Contacts/Ads.php

Indentation +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 	 *
 	 * @param string/array $_contact_id contact_id or array with values for id or account_id
 	 * @return array/boolean data if row could be retrived else False
-	*/
+	 */
 	function read($_contact_id)
 	{
 		if (is_array($_contact_id) && isset($_contact_id['account_id']) ||

api/src/Contacts/Ldap.php

Indentation +17 added lines, -17 removed lines

@@ -41,33 +41,33 @@ 
 	var $contacts_id='id';
 
 	/**
-	* @var string $accountName holds the accountname of the current user
-	*/
+	 * @var string $accountName holds the accountname of the current user
+	 */
 	var $accountName;
 
 	/**
-	* @var object $ldapServerInfo holds the information about the current used ldap server
-	*/
+	 * @var object $ldapServerInfo holds the information about the current used ldap server
+	 */
 	var $ldapServerInfo;
 
 	/**
-	* @var int $ldapLimit how many rows to fetch from ldap server
-	*/
+	 * @var int $ldapLimit how many rows to fetch from ldap server
+	 */
 	var $ldapLimit = 2000;
 
 	/**
-	* @var string $personalContactsDN holds the base DN for the personal addressbooks
-	*/
+	 * @var string $personalContactsDN holds the base DN for the personal addressbooks
+	 */
 	var $personalContactsDN;
 
 	/**
-	* @var string $sharedContactsDN holds the base DN for the shared addressbooks
-	*/
+	 * @var string $sharedContactsDN holds the base DN for the shared addressbooks
+	 */
 	var $sharedContactsDN;
 
 	/**
-	* @var string $accountContactsDN holds the base DN for accounts addressbook
-	*/
+	 * @var string $accountContactsDN holds the base DN for accounts addressbook
+	 */
 	var $accountContactsDN;
 
 	/**
@@ -77,8 +77,8 @@ 
 	var $accountsFilter = '(objectclass=posixaccount)';
 
 	/**
-	* @var string $allContactsDN holds the base DN of all addressbook
-	*/
+	 * @var string $allContactsDN holds the base DN of all addressbook
+	 */
 	var $allContactsDN;
 
 	/**
@@ -96,8 +96,8 @@ 
 	var $never_change_dn = false;
 
 	/**
-	* @var int $total holds the total count of found rows
-	*/
+	 * @var int $total holds the total count of found rows
+	 */
 	var $total;
 
 	/**
@@ -403,7 +403,7 @@ 
 	 *
 	 * @param string|array $contact_id contact_id or array with values for id or account_id
 	 * @return array/boolean data if row could be retrived else False
-	*/
+	 */
 	function read($contact_id)
 	{
 		if (is_array($contact_id) && isset($contact_id['account_id']) ||

api/src/Contacts/Sql.php

Indentation +3 added lines, -3 removed lines

@@ -858,9 +858,9 @@
 	}
 
 	/**
-	* Deletes custom field data
-	* Implemented to deal with LDAP backend, which saves CFs in SQL, but the account record is in LDAP
-	*/
+	 * Deletes custom field data
+	 * Implemented to deal with LDAP backend, which saves CFs in SQL, but the account record is in LDAP
+	 */
 	function delete_customfields($data)
 	{
 		$this->db->delete($this->extra_table,$data,__LINE__,__FILE__);

api/src/Vfs/Sqlfs/StreamWrapper.php

Indentation +5 added lines, -5 removed lines

@@ -447,10 +447,10 @@ 
  	 * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite!
  	 *
  	 * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<'))
-  	 * {
+ 	 * {
  	 * 		$eof = !$eof;
  	 * }
-  	 *
+ 	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
 	function stream_eof ( )
@@ -485,7 +485,7 @@ 
  	 * See fseek() for more information about these parameters.
  	 *
  	 * @param integer $offset
-  	 * @param integer $whence	SEEK_SET - 0 - Set position equal to offset bytes
+ 	 * @param integer $whence	SEEK_SET - 0 - Set position equal to offset bytes
  	 * 							SEEK_CUR - 1 - Set position to current location plus offset.
  	 * 							SEEK_END - 2 - Set position to end-of-file plus offset. (To move to a position before the end-of-file, you need to pass a negative value in offset.)
  	 * @return boolean TRUE if the position was updated, FALSE otherwise.
@@ -681,8 +681,8 @@ 
 		$maxdepth=10;
 		$depth2propagate = (int)$depth + 1;
 		if ($depth2propagate > $maxdepth) return is_dir($pathname);
-    	is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
-    	return is_dir($pathname) || @mkdir($pathname, $mode);
+		is_dir(Vfs::dirname($pathname)) || self::mkdir_recursive(Vfs::dirname($pathname), $mode, $depth2propagate);
+		return is_dir($pathname) || @mkdir($pathname, $mode);
 	}
 
 	/**

api/src/Vfs/Filesystem/StreamWrapper.php

Indentation +2 added lines, -2 removed lines

@@ -228,10 +228,10 @@
  	 * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite!
  	 *
  	 * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<'))
-  	 * {
+ 	 * {
  	 * 		$eof = !$eof;
  	 * }
-  	 *
+ 	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
 	function stream_eof ( )

api/src/Vfs/StreamWrapperIface.php

Indentation +2 added lines, -2 removed lines

@@ -80,10 +80,10 @@
  	 * Important: PHP 5.0 introduced a bug that wasn't fixed until 5.1: the return value has to be the oposite!
  	 *
  	 * if(version_compare(PHP_VERSION,'5.0','>=') && version_compare(PHP_VERSION,'5.1','<'))
-  	 * {
+ 	 * {
  	 * 		$eof = !$eof;
  	 * }
-  	 *
+ 	 *
  	 * @return boolean true if the read/write position is at the end of the stream and no more data availible, false otherwise
  	 */
 	function stream_eof ( );

api/src/WebDAV/Tools/_parse_lockinfo.php

Indentation +203 added lines, -203 removed lines

@@ -43,209 +43,209 @@
  */
 class _parse_lockinfo
 {
-    /**
-     * success state flag
-     *
-     * @var bool
-     * @access public
-     */
-    var $success = false;
-
-    /**
-     * lock type, currently only "write"
-     *
-     * @var string
-     * @access public
-     */
-    var $locktype = "";
-
-    /**
-     * lock scope, "shared" or "exclusive"
-     *
-     * @var string
-     * @access public
-     */
-    var $lockscope = "";
-
-    /**
-     * lock owner information
-     *
-     * @var string
-     * @access public
-     */
-    var $owner = "";
-
-    /**
-     * flag that is set during lock owner read
-     *
-     * @var bool
-     * @access private
-     */
-    var $collect_owner = false;
-
-    /**
-     * constructor
-     *
-     * @param  string  path of stream to read
-     * @access public
-     */
-    function __construct($path)
-    {
-        // we assume success unless problems occur
-        $this->success = true;
-
-        // remember if any input was parsed
-        $had_input = false;
-
-        // open stream
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
-
-        // create namespace aware parser
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
-
-        // set tag and data handlers
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
-        xml_set_character_data_handler($xml_parser,
-                                       array(&$this, "_data"));
-
-        // we want a case sensitive parser
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
-
-        // parse input
-        while ($this->success && !feof($f_in)) {
-            $line = fgets($f_in);
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($xml_parser, $line, false);
-            }
-        }
-
-        // finish parsing
-        if ($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
-
-        // check if required tags where found
-        $this->success &= !empty($this->locktype);
-        $this->success &= !empty($this->lockscope);
-
-        // free parser resource
-        xml_parser_free($xml_parser);
-
-        // close input stream
-        fclose($f_in);
-    }
-
-
-    /**
-     * tag start handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @param  array     tag attributes
-     * @return void
-     * @access private
-     */
-    function _startElement($parser, $name, $attrs)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-
-        if ($this->collect_owner) {
-            // everything within the <owner> tag needs to be collected
-            $ns_short = "";
-            $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "<$ns_short$tag$ns_attr>";
-        } else if ($ns == "DAV:") {
-            // parse only the essential tags
-            switch ($tag) {
-            case "write":
-                $this->locktype = $tag;
-                break;
-            case "exclusive":
-            case "shared":
-                $this->lockscope = $tag;
-                break;
-            case "owner":
-                $this->collect_owner = true;
-                break;
-            }
-        }
-    }
-
-    /**
-     * data handler
-     *
-     * @param  resource  parser
-     * @param  string    data
-     * @return void
-     * @access private
-     */
-    function _data($parser, $data)
-    {
-        // only the <owner> tag has data content
-        if ($this->collect_owner) {
-            $this->owner .= $data;
-        }
-    }
-
-    /**
-     * tag end handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @return void
-     * @access private
-     */
-    function _endElement($parser, $name)
-    {
-        // namespace handling
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-        } else {
-            $ns  = "";
-            $tag = $name;
-        }
-
-        // <owner> finished?
-        if (($ns == "DAV:") && ($tag == "owner")) {
-            $this->collect_owner = false;
-        }
-
-        // within <owner> we have to collect everything
-        if ($this->collect_owner) {
-            $ns_short = "";
-            $ns_attr  = "";
-            if ($ns) {
-                if ($ns == "DAV:") {
-                    $ns_short = "D:";
-                } else {
-                    $ns_attr = " xmlns='$ns'";
-                }
-            }
-            $this->owner .= "</$ns_short$tag$ns_attr>";
-        }
-    }
+	/**
+	 * success state flag
+	 *
+	 * @var bool
+	 * @access public
+	 */
+	var $success = false;
+
+	/**
+	 * lock type, currently only "write"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $locktype = "";
+
+	/**
+	 * lock scope, "shared" or "exclusive"
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $lockscope = "";
+
+	/**
+	 * lock owner information
+	 *
+	 * @var string
+	 * @access public
+	 */
+	var $owner = "";
+
+	/**
+	 * flag that is set during lock owner read
+	 *
+	 * @var bool
+	 * @access private
+	 */
+	var $collect_owner = false;
+
+	/**
+	 * constructor
+	 *
+	 * @param  string  path of stream to read
+	 * @access public
+	 */
+	function __construct($path)
+	{
+		// we assume success unless problems occur
+		$this->success = true;
+
+		// remember if any input was parsed
+		$had_input = false;
+
+		// open stream
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
+
+		// create namespace aware parser
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
+
+		// set tag and data handlers
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
+		xml_set_character_data_handler($xml_parser,
+									   array(&$this, "_data"));
+
+		// we want a case sensitive parser
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
+
+		// parse input
+		while ($this->success && !feof($f_in)) {
+			$line = fgets($f_in);
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($xml_parser, $line, false);
+			}
+		}
+
+		// finish parsing
+		if ($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
+
+		// check if required tags where found
+		$this->success &= !empty($this->locktype);
+		$this->success &= !empty($this->lockscope);
+
+		// free parser resource
+		xml_parser_free($xml_parser);
+
+		// close input stream
+		fclose($f_in);
+	}
+
+
+	/**
+	 * tag start handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @param  array     tag attributes
+	 * @return void
+	 * @access private
+	 */
+	function _startElement($parser, $name, $attrs)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+
+		if ($this->collect_owner) {
+			// everything within the <owner> tag needs to be collected
+			$ns_short = "";
+			$ns_attr  = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "<$ns_short$tag$ns_attr>";
+		} else if ($ns == "DAV:") {
+			// parse only the essential tags
+			switch ($tag) {
+			case "write":
+				$this->locktype = $tag;
+				break;
+			case "exclusive":
+			case "shared":
+				$this->lockscope = $tag;
+				break;
+			case "owner":
+				$this->collect_owner = true;
+				break;
+			}
+		}
+	}
+
+	/**
+	 * data handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    data
+	 * @return void
+	 * @access private
+	 */
+	function _data($parser, $data)
+	{
+		// only the <owner> tag has data content
+		if ($this->collect_owner) {
+			$this->owner .= $data;
+		}
+	}
+
+	/**
+	 * tag end handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @return void
+	 * @access private
+	 */
+	function _endElement($parser, $name)
+	{
+		// namespace handling
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+		} else {
+			$ns  = "";
+			$tag = $name;
+		}
+
+		// <owner> finished?
+		if (($ns == "DAV:") && ($tag == "owner")) {
+			$this->collect_owner = false;
+		}
+
+		// within <owner> we have to collect everything
+		if ($this->collect_owner) {
+			$ns_short = "";
+			$ns_attr  = "";
+			if ($ns) {
+				if ($ns == "DAV:") {
+					$ns_short = "D:";
+				} else {
+					$ns_attr = " xmlns='$ns'";
+				}
+			}
+			$this->owner .= "</$ns_short$tag$ns_attr>";
+		}
+	}
 }
 
 ?>

api/src/WebDAV/Tools/_parse_proppatch.php

Indentation +192 added lines, -192 removed lines

@@ -43,198 +43,198 @@
  */
 class _parse_proppatch
 {
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $success;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $props;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $depth;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $mode;
-
-    /**
-     *
-     *
-     * @var
-     * @access
-     */
-    var $current;
-
-    /**
-     * On return whole request, if $store_request == true was specified in constructor
-     *
-     * @var string
-     */
-    var $request;
-
-    /**
-     * constructor
-     *
-     * @param  string  path of input stream
-     * @param boolean $store_request =false if true whole request data will be made available in $this->request
-     * @access public
-     */
-    function __construct($path, $store_request=false)
-    {
-        $this->success = true;
-
-        $this->depth = 0;
-        $this->props = array();
-        $had_input = false;
-
-        $f_in = fopen($path, "r");
-        if (!$f_in) {
-            $this->success = false;
-            return;
-        }
-
-        $xml_parser = xml_parser_create_ns("UTF-8", " ");
-
-        xml_set_element_handler($xml_parser,
-                                array(&$this, "_startElement"),
-                                array(&$this, "_endElement"));
-
-        xml_set_character_data_handler($xml_parser,
-                                       array(&$this, "_data"));
-
-        xml_parser_set_option($xml_parser,
-                              XML_OPTION_CASE_FOLDING, false);
-
-        while($this->success && !feof($f_in)) {
-            $line = fgets($f_in);
-            if ($store_request) $this->request .= $line;
-            if (is_string($line)) {
-                $had_input = true;
-                $this->success &= xml_parse($xml_parser, $line, false);
-            }
-        }
-
-        if($had_input) {
-            $this->success &= xml_parse($xml_parser, "", true);
-        }
-
-        xml_parser_free($xml_parser);
-
-        fclose($f_in);
-    }
-
-    /**
-     * tag start handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @param  array     tag attributes
-     * @return void
-     * @access private
-     */
-    function _startElement($parser, $name, $attrs)
-    {
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-            if ($ns == "")
-                $this->success = false;
-        } else {
-            $ns = "";
-            $tag = $name;
-        }
-
-        if ($this->depth == 1) {
-            $this->mode = $tag;
-        }
-
-        if ($this->depth == 3) {
-            $prop = array("name" => $tag);
-            $this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
-            if ($this->mode == "set") {
-                $this->current["val"] = "";     // default set val
-            }
-        }
-
-        if ($this->depth >= 4) {
-            $this->current["val"] .= "<$tag";
-            if (isset($attr)) {
-                foreach ($attr as $key => $val) {
-                    $this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
-                }
-            }
-            $this->current["val"] .= ">";
-        }
-
-
-
-        $this->depth++;
-    }
-
-    /**
-     * tag end handler
-     *
-     * @param  resource  parser
-     * @param  string    tag name
-     * @return void
-     * @access private
-     */
-    function _endElement($parser, $name)
-    {
-        if (strstr($name, " ")) {
-            list($ns, $tag) = explode(" ", $name);
-            if ($ns == "")
-                $this->success = false;
-        } else {
-            $ns = "";
-            $tag = $name;
-        }
-
-        $this->depth--;
-
-        if ($this->depth >= 4) {
-            $this->current["val"] .= "</$tag>";
-        }
-
-        if ($this->depth == 3) {
-            if (isset($this->current)) {
-                $this->props[] = $this->current;
-                unset($this->current);
-            }
-        }
-    }
-
-    /**
-     * input data handler
-     *
-     * @param  resource  parser
-     * @param  string    data
-     * @return void
-     * @access private
-     */
-    function _data($parser, $data)
-    {
-        if (isset($this->current)) {
-            $this->current["val"] .= $data;
-        }
-    }
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $success;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $props;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $depth;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $mode;
+
+	/**
+	 *
+	 *
+	 * @var
+	 * @access
+	 */
+	var $current;
+
+	/**
+	 * On return whole request, if $store_request == true was specified in constructor
+	 *
+	 * @var string
+	 */
+	var $request;
+
+	/**
+	 * constructor
+	 *
+	 * @param  string  path of input stream
+	 * @param boolean $store_request =false if true whole request data will be made available in $this->request
+	 * @access public
+	 */
+	function __construct($path, $store_request=false)
+	{
+		$this->success = true;
+
+		$this->depth = 0;
+		$this->props = array();
+		$had_input = false;
+
+		$f_in = fopen($path, "r");
+		if (!$f_in) {
+			$this->success = false;
+			return;
+		}
+
+		$xml_parser = xml_parser_create_ns("UTF-8", " ");
+
+		xml_set_element_handler($xml_parser,
+								array(&$this, "_startElement"),
+								array(&$this, "_endElement"));
+
+		xml_set_character_data_handler($xml_parser,
+									   array(&$this, "_data"));
+
+		xml_parser_set_option($xml_parser,
+							  XML_OPTION_CASE_FOLDING, false);
+
+		while($this->success && !feof($f_in)) {
+			$line = fgets($f_in);
+			if ($store_request) $this->request .= $line;
+			if (is_string($line)) {
+				$had_input = true;
+				$this->success &= xml_parse($xml_parser, $line, false);
+			}
+		}
+
+		if($had_input) {
+			$this->success &= xml_parse($xml_parser, "", true);
+		}
+
+		xml_parser_free($xml_parser);
+
+		fclose($f_in);
+	}
+
+	/**
+	 * tag start handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @param  array     tag attributes
+	 * @return void
+	 * @access private
+	 */
+	function _startElement($parser, $name, $attrs)
+	{
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+			if ($ns == "")
+				$this->success = false;
+		} else {
+			$ns = "";
+			$tag = $name;
+		}
+
+		if ($this->depth == 1) {
+			$this->mode = $tag;
+		}
+
+		if ($this->depth == 3) {
+			$prop = array("name" => $tag);
+			$this->current = array("name" => $tag, "ns" => $ns, "status"=> 200);
+			if ($this->mode == "set") {
+				$this->current["val"] = "";     // default set val
+			}
+		}
+
+		if ($this->depth >= 4) {
+			$this->current["val"] .= "<$tag";
+			if (isset($attr)) {
+				foreach ($attr as $key => $val) {
+					$this->current["val"] .= ' '.$key.'="'.str_replace('"','&quot;', $val).'"';
+				}
+			}
+			$this->current["val"] .= ">";
+		}
+
+
+
+		$this->depth++;
+	}
+
+	/**
+	 * tag end handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    tag name
+	 * @return void
+	 * @access private
+	 */
+	function _endElement($parser, $name)
+	{
+		if (strstr($name, " ")) {
+			list($ns, $tag) = explode(" ", $name);
+			if ($ns == "")
+				$this->success = false;
+		} else {
+			$ns = "";
+			$tag = $name;
+		}
+
+		$this->depth--;
+
+		if ($this->depth >= 4) {
+			$this->current["val"] .= "</$tag>";
+		}
+
+		if ($this->depth == 3) {
+			if (isset($this->current)) {
+				$this->props[] = $this->current;
+				unset($this->current);
+			}
+		}
+	}
+
+	/**
+	 * input data handler
+	 *
+	 * @param  resource  parser
+	 * @param  string    data
+	 * @return void
+	 * @access private
+	 */
+	function _data($parser, $data)
+	{
+		if (isset($this->current)) {
+			$this->current["val"] .= $data;
+		}
+	}
 }
 
 /*