Dolibarr / dolibarr

htdocs/includes/sabre/sabre/dav/lib/CardDAV/Xml/Filter/ParamFilter.php

Indentation +53 added lines, -53 removed lines

@@ -25,62 +25,62 @@
  */
 abstract class ParamFilter implements Element
 {
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statically, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader)
-    {
-        $result = [
-            'name' => null,
-            'is-not-defined' => false,
-            'text-match' => null,
-        ];
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Reader $reader)
+	{
+		$result = [
+			'name' => null,
+			'is-not-defined' => false,
+			'text-match' => null,
+		];
 
-        $att = $reader->parseAttributes();
-        $result['name'] = $att['name'];
+		$att = $reader->parseAttributes();
+		$result['name'] = $att['name'];
 
-        $elems = $reader->parseInnerTree();
+		$elems = $reader->parseInnerTree();
 
-        if (is_array($elems)) {
-            foreach ($elems as $elem) {
-                switch ($elem['name']) {
-                case '{'.Plugin::NS_CARDDAV.'}is-not-defined':
-                    $result['is-not-defined'] = true;
-                    break;
-                case '{'.Plugin::NS_CARDDAV.'}text-match':
-                    $matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
+		if (is_array($elems)) {
+			foreach ($elems as $elem) {
+				switch ($elem['name']) {
+				case '{'.Plugin::NS_CARDDAV.'}is-not-defined':
+					$result['is-not-defined'] = true;
+					break;
+				case '{'.Plugin::NS_CARDDAV.'}text-match':
+					$matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
 
-                    if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
-                        throw new BadRequest('Unknown match-type: '.$matchType);
-                    }
-                    $result['text-match'] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
-                        'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
-                        'value' => $elem['value'],
-                        'match-type' => $matchType,
-                    ];
-                    break;
-            }
-            }
-        }
+					if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
+						throw new BadRequest('Unknown match-type: '.$matchType);
+					}
+					$result['text-match'] = [
+						'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
+						'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
+						'value' => $elem['value'],
+						'match-type' => $matchType,
+					];
+					break;
+			}
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

Switch Indentation +15 added lines, -15 removed lines

@@ -61,22 +61,22 @@
         if (is_array($elems)) {
             foreach ($elems as $elem) {
                 switch ($elem['name']) {
-                case '{'.Plugin::NS_CARDDAV.'}is-not-defined':
-                    $result['is-not-defined'] = true;
-                    break;
-                case '{'.Plugin::NS_CARDDAV.'}text-match':
-                    $matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
+                	case '{'.Plugin::NS_CARDDAV.'}is-not-defined':
+                    	$result['is-not-defined'] = true;
+                    	break;
+                	case '{'.Plugin::NS_CARDDAV.'}text-match':
+                    	$matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
 
-                    if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
-                        throw new BadRequest('Unknown match-type: '.$matchType);
-                    }
-                    $result['text-match'] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
-                        'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
-                        'value' => $elem['value'],
-                        'match-type' => $matchType,
-                    ];
-                    break;
+                    	if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
+                        	throw new BadRequest('Unknown match-type: '.$matchType);
+                    	}
+                    	$result['text-match'] = [
+                        	'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
+                        	'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
+                        	'value' => $elem['value'],
+                        	'match-type' => $matchType,
+                    	];
+                    	break;
             }
             }
         }

htdocs/includes/sabre/sabre/dav/lib/CardDAV/Xml/Filter/PropFilter.php

Indentation +61 added lines, -61 removed lines

@@ -25,71 +25,71 @@
  */
 class PropFilter implements XmlDeserializable
 {
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statically, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader)
-    {
-        $result = [
-            'name' => null,
-            'test' => 'anyof',
-            'is-not-defined' => false,
-            'param-filters' => [],
-            'text-matches' => [],
-        ];
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Reader $reader)
+	{
+		$result = [
+			'name' => null,
+			'test' => 'anyof',
+			'is-not-defined' => false,
+			'param-filters' => [],
+			'text-matches' => [],
+		];
 
-        $att = $reader->parseAttributes();
-        $result['name'] = $att['name'];
+		$att = $reader->parseAttributes();
+		$result['name'] = $att['name'];
 
-        if (isset($att['test']) && 'allof' === $att['test']) {
-            $result['test'] = 'allof';
-        }
+		if (isset($att['test']) && 'allof' === $att['test']) {
+			$result['test'] = 'allof';
+		}
 
-        $elems = $reader->parseInnerTree();
+		$elems = $reader->parseInnerTree();
 
-        if (is_array($elems)) {
-            foreach ($elems as $elem) {
-                switch ($elem['name']) {
-                case '{'.Plugin::NS_CARDDAV.'}param-filter':
-                    $result['param-filters'][] = $elem['value'];
-                    break;
-                case '{'.Plugin::NS_CARDDAV.'}is-not-defined':
-                    $result['is-not-defined'] = true;
-                    break;
-                case '{'.Plugin::NS_CARDDAV.'}text-match':
-                    $matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
+		if (is_array($elems)) {
+			foreach ($elems as $elem) {
+				switch ($elem['name']) {
+				case '{'.Plugin::NS_CARDDAV.'}param-filter':
+					$result['param-filters'][] = $elem['value'];
+					break;
+				case '{'.Plugin::NS_CARDDAV.'}is-not-defined':
+					$result['is-not-defined'] = true;
+					break;
+				case '{'.Plugin::NS_CARDDAV.'}text-match':
+					$matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
 
-                    if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
-                        throw new BadRequest('Unknown match-type: '.$matchType);
-                    }
-                    $result['text-matches'][] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
-                        'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
-                        'value' => $elem['value'],
-                        'match-type' => $matchType,
-                    ];
-                    break;
-            }
-            }
-        }
+					if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
+						throw new BadRequest('Unknown match-type: '.$matchType);
+					}
+					$result['text-matches'][] = [
+						'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
+						'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
+						'value' => $elem['value'],
+						'match-type' => $matchType,
+					];
+					break;
+			}
+			}
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 }

Switch Indentation +18 added lines, -18 removed lines

@@ -67,25 +67,25 @@
         if (is_array($elems)) {
             foreach ($elems as $elem) {
                 switch ($elem['name']) {
-                case '{'.Plugin::NS_CARDDAV.'}param-filter':
-                    $result['param-filters'][] = $elem['value'];
-                    break;
-                case '{'.Plugin::NS_CARDDAV.'}is-not-defined':
-                    $result['is-not-defined'] = true;
-                    break;
-                case '{'.Plugin::NS_CARDDAV.'}text-match':
-                    $matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
+                	case '{'.Plugin::NS_CARDDAV.'}param-filter':
+                    	$result['param-filters'][] = $elem['value'];
+                    	break;
+                	case '{'.Plugin::NS_CARDDAV.'}is-not-defined':
+                    	$result['is-not-defined'] = true;
+                    	break;
+                	case '{'.Plugin::NS_CARDDAV.'}text-match':
+                    	$matchType = isset($elem['attributes']['match-type']) ? $elem['attributes']['match-type'] : 'contains';
 
-                    if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
-                        throw new BadRequest('Unknown match-type: '.$matchType);
-                    }
-                    $result['text-matches'][] = [
-                        'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
-                        'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
-                        'value' => $elem['value'],
-                        'match-type' => $matchType,
-                    ];
-                    break;
+                    	if (!in_array($matchType, ['contains', 'equals', 'starts-with', 'ends-with'])) {
+                        	throw new BadRequest('Unknown match-type: '.$matchType);
+                    	}
+                    	$result['text-matches'][] = [
+                        	'negate-condition' => isset($elem['attributes']['negate-condition']) && 'yes' === $elem['attributes']['negate-condition'],
+                        	'collation' => isset($elem['attributes']['collation']) ? $elem['attributes']['collation'] : 'i;unicode-casemap',
+                        	'value' => $elem['value'],
+                        	'match-type' => $matchType,
+                    	];
+                    	break;
             }
             }
         }

htdocs/includes/sabre/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php

Indentation +36 added lines, -36 removed lines

@@ -25,42 +25,42 @@
  */
 class AddressData implements XmlDeserializable
 {
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statically, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @return mixed
-     */
-    public static function xmlDeserialize(Reader $reader)
-    {
-        $result = [
-            'contentType' => $reader->getAttribute('content-type') ?: 'text/vcard',
-            'version' => $reader->getAttribute('version') ?: '3.0',
-        ];
+	/**
+	 * The deserialize method is called during xml parsing.
+	 *
+	 * This method is called statically, this is because in theory this method
+	 * may be used as a type of constructor, or factory method.
+	 *
+	 * Often you want to return an instance of the current class, but you are
+	 * free to return other data as well.
+	 *
+	 * You are responsible for advancing the reader to the next element. Not
+	 * doing anything will result in a never-ending loop.
+	 *
+	 * If you just want to skip parsing for this element altogether, you can
+	 * just call $reader->next();
+	 *
+	 * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+	 * the next element.
+	 *
+	 * @return mixed
+	 */
+	public static function xmlDeserialize(Reader $reader)
+	{
+		$result = [
+			'contentType' => $reader->getAttribute('content-type') ?: 'text/vcard',
+			'version' => $reader->getAttribute('version') ?: '3.0',
+		];
 
-        $elems = (array) $reader->parseInnerTree();
-        $elems = array_filter($elems, function ($element) {
-            return '{urn:ietf:params:xml:ns:carddav}prop' === $element['name'] &&
-                isset($element['attributes']['name']);
-        });
-        $result['addressDataProperties'] = array_map(function ($element) {
-            return $element['attributes']['name'];
-        }, $elems);
+		$elems = (array) $reader->parseInnerTree();
+		$elems = array_filter($elems, function ($element) {
+			return '{urn:ietf:params:xml:ns:carddav}prop' === $element['name'] &&
+				isset($element['attributes']['name']);
+		});
+		$result['addressDataProperties'] = array_map(function ($element) {
+			return $element['attributes']['name'];
+		}, $elems);
 
-        return $result;
-    }
+		return $result;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -53,11 +53,11 @@
         ];
 
         $elems = (array) $reader->parseInnerTree();
-        $elems = array_filter($elems, function ($element) {
+        $elems = array_filter($elems, function($element) {
             return '{urn:ietf:params:xml:ns:carddav}prop' === $element['name'] &&
                 isset($element['attributes']['name']);
         });
-        $result['addressDataProperties'] = array_map(function ($element) {
+        $result['addressDataProperties'] = array_map(function($element) {
             return $element['attributes']['name'];
         }, $elems);
 

htdocs/includes/sabre/sabre/dav/lib/CardDAV/Xml/Property/SupportedAddressData.php

Indentation +47 added lines, -47 removed lines

@@ -24,54 +24,54 @@
  */
 class SupportedAddressData implements XmlSerializable
 {
-    /**
-     * supported versions.
-     *
-     * @var array
-     */
-    protected $supportedData = [];
+	/**
+	 * supported versions.
+	 *
+	 * @var array
+	 */
+	protected $supportedData = [];
 
-    /**
-     * Creates the property.
-     */
-    public function __construct(array $supportedData = null)
-    {
-        if (is_null($supportedData)) {
-            $supportedData = [
-                ['contentType' => 'text/vcard', 'version' => '3.0'],
-                ['contentType' => 'text/vcard', 'version' => '4.0'],
-                ['contentType' => 'application/vcard+json', 'version' => '4.0'],
-            ];
-        }
+	/**
+	 * Creates the property.
+	 */
+	public function __construct(array $supportedData = null)
+	{
+		if (is_null($supportedData)) {
+			$supportedData = [
+				['contentType' => 'text/vcard', 'version' => '3.0'],
+				['contentType' => 'text/vcard', 'version' => '4.0'],
+				['contentType' => 'application/vcard+json', 'version' => '4.0'],
+			];
+		}
 
-        $this->supportedData = $supportedData;
-    }
+		$this->supportedData = $supportedData;
+	}
 
-    /**
-     * The xmlSerialize method is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializable should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     */
-    public function xmlSerialize(Writer $writer)
-    {
-        foreach ($this->supportedData as $supported) {
-            $writer->startElement('{'.Plugin::NS_CARDDAV.'}address-data-type');
-            $writer->writeAttributes([
-                'content-type' => $supported['contentType'],
-                'version' => $supported['version'],
-                ]);
-            $writer->endElement(); // address-data-type
-        }
-    }
+	/**
+	 * The xmlSerialize method is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializable should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 */
+	public function xmlSerialize(Writer $writer)
+	{
+		foreach ($this->supportedData as $supported) {
+			$writer->startElement('{'.Plugin::NS_CARDDAV.'}address-data-type');
+			$writer->writeAttributes([
+				'content-type' => $supported['contentType'],
+				'version' => $supported['version'],
+				]);
+			$writer->endElement(); // address-data-type
+		}
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CardDAV/Xml/Property/SupportedCollationSet.php

Indentation +22 added lines, -22 removed lines

@@ -19,26 +19,26 @@
  */
 class SupportedCollationSet implements XmlSerializable
 {
-    /**
-     * The xmlSerialize method is called during xml writing.
-     *
-     * Use the $writer argument to write its own xml serialization.
-     *
-     * An important note: do _not_ create a parent element. Any element
-     * implementing XmlSerializable should only ever write what's considered
-     * its 'inner xml'.
-     *
-     * The parent of the current element is responsible for writing a
-     * containing element.
-     *
-     * This allows serializers to be re-used for different element names.
-     *
-     * If you are opening new elements, you must also close them again.
-     */
-    public function xmlSerialize(Writer $writer)
-    {
-        foreach (['i;ascii-casemap', 'i;octet', 'i;unicode-casemap'] as $coll) {
-            $writer->writeElement('{urn:ietf:params:xml:ns:carddav}supported-collation', $coll);
-        }
-    }
+	/**
+	 * The xmlSerialize method is called during xml writing.
+	 *
+	 * Use the $writer argument to write its own xml serialization.
+	 *
+	 * An important note: do _not_ create a parent element. Any element
+	 * implementing XmlSerializable should only ever write what's considered
+	 * its 'inner xml'.
+	 *
+	 * The parent of the current element is responsible for writing a
+	 * containing element.
+	 *
+	 * This allows serializers to be re-used for different element names.
+	 *
+	 * If you are opening new elements, you must also close them again.
+	 */
+	public function xmlSerialize(Writer $writer)
+	{
+		foreach (['i;ascii-casemap', 'i;octet', 'i;unicode-casemap'] as $coll) {
+			$writer->writeElement('{urn:ietf:params:xml:ns:carddav}supported-collation', $coll);
+		}
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/CardDAV/Card.php

Indentation +183 added lines, -183 removed lines

@@ -16,187 +16,187 @@
  */
 class Card extends DAV\File implements ICard, DAVACL\IACL
 {
-    use DAVACL\ACLTrait;
-
-    /**
-     * CardDAV backend.
-     *
-     * @var Backend\BackendInterface
-     */
-    protected $carddavBackend;
-
-    /**
-     * Array with information about this Card.
-     *
-     * @var array
-     */
-    protected $cardData;
-
-    /**
-     * Array with information about the containing addressbook.
-     *
-     * @var array
-     */
-    protected $addressBookInfo;
-
-    /**
-     * Constructor.
-     */
-    public function __construct(Backend\BackendInterface $carddavBackend, array $addressBookInfo, array $cardData)
-    {
-        $this->carddavBackend = $carddavBackend;
-        $this->addressBookInfo = $addressBookInfo;
-        $this->cardData = $cardData;
-    }
-
-    /**
-     * Returns the uri for this object.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->cardData['uri'];
-    }
-
-    /**
-     * Returns the VCard-formatted object.
-     *
-     * @return string
-     */
-    public function get()
-    {
-        // Pre-populating 'carddata' is optional. If we don't yet have it
-        // already, we fetch it from the backend.
-        if (!isset($this->cardData['carddata'])) {
-            $this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
-        }
-
-        return $this->cardData['carddata'];
-    }
-
-    /**
-     * Updates the VCard-formatted object.
-     *
-     * @param string $cardData
-     *
-     * @return string|null
-     */
-    public function put($cardData)
-    {
-        if (is_resource($cardData)) {
-            $cardData = stream_get_contents($cardData);
-        }
-
-        // Converting to UTF-8, if needed
-        $cardData = DAV\StringUtil::ensureUTF8($cardData);
-
-        $etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'], $this->cardData['uri'], $cardData);
-        $this->cardData['carddata'] = $cardData;
-        $this->cardData['etag'] = $etag;
-
-        return $etag;
-    }
-
-    /**
-     * Deletes the card.
-     */
-    public function delete()
-    {
-        $this->carddavBackend->deleteCard($this->addressBookInfo['id'], $this->cardData['uri']);
-    }
-
-    /**
-     * Returns the mime content-type.
-     *
-     * @return string
-     */
-    public function getContentType()
-    {
-        return 'text/vcard; charset=utf-8';
-    }
-
-    /**
-     * Returns an ETag for this object.
-     *
-     * @return string
-     */
-    public function getETag()
-    {
-        if (isset($this->cardData['etag'])) {
-            return $this->cardData['etag'];
-        } else {
-            $data = $this->get();
-            if (is_string($data)) {
-                return '"'.md5($data).'"';
-            } else {
-                // We refuse to calculate the md5 if it's a stream.
-                return null;
-            }
-        }
-    }
-
-    /**
-     * Returns the last modification date as a unix timestamp.
-     *
-     * @return int
-     */
-    public function getLastModified()
-    {
-        return isset($this->cardData['lastmodified']) ? $this->cardData['lastmodified'] : null;
-    }
-
-    /**
-     * Returns the size of this object in bytes.
-     *
-     * @return int
-     */
-    public function getSize()
-    {
-        if (array_key_exists('size', $this->cardData)) {
-            return $this->cardData['size'];
-        } else {
-            return strlen($this->get());
-        }
-    }
-
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner()
-    {
-        return $this->addressBookInfo['principaluri'];
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL()
-    {
-        // An alternative acl may be specified through the cardData array.
-        if (isset($this->cardData['acl'])) {
-            return $this->cardData['acl'];
-        }
-
-        return [
-            [
-                'privilege' => '{DAV:}all',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ],
-        ];
-    }
+	use DAVACL\ACLTrait;
+
+	/**
+	 * CardDAV backend.
+	 *
+	 * @var Backend\BackendInterface
+	 */
+	protected $carddavBackend;
+
+	/**
+	 * Array with information about this Card.
+	 *
+	 * @var array
+	 */
+	protected $cardData;
+
+	/**
+	 * Array with information about the containing addressbook.
+	 *
+	 * @var array
+	 */
+	protected $addressBookInfo;
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct(Backend\BackendInterface $carddavBackend, array $addressBookInfo, array $cardData)
+	{
+		$this->carddavBackend = $carddavBackend;
+		$this->addressBookInfo = $addressBookInfo;
+		$this->cardData = $cardData;
+	}
+
+	/**
+	 * Returns the uri for this object.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->cardData['uri'];
+	}
+
+	/**
+	 * Returns the VCard-formatted object.
+	 *
+	 * @return string
+	 */
+	public function get()
+	{
+		// Pre-populating 'carddata' is optional. If we don't yet have it
+		// already, we fetch it from the backend.
+		if (!isset($this->cardData['carddata'])) {
+			$this->cardData = $this->carddavBackend->getCard($this->addressBookInfo['id'], $this->cardData['uri']);
+		}
+
+		return $this->cardData['carddata'];
+	}
+
+	/**
+	 * Updates the VCard-formatted object.
+	 *
+	 * @param string $cardData
+	 *
+	 * @return string|null
+	 */
+	public function put($cardData)
+	{
+		if (is_resource($cardData)) {
+			$cardData = stream_get_contents($cardData);
+		}
+
+		// Converting to UTF-8, if needed
+		$cardData = DAV\StringUtil::ensureUTF8($cardData);
+
+		$etag = $this->carddavBackend->updateCard($this->addressBookInfo['id'], $this->cardData['uri'], $cardData);
+		$this->cardData['carddata'] = $cardData;
+		$this->cardData['etag'] = $etag;
+
+		return $etag;
+	}
+
+	/**
+	 * Deletes the card.
+	 */
+	public function delete()
+	{
+		$this->carddavBackend->deleteCard($this->addressBookInfo['id'], $this->cardData['uri']);
+	}
+
+	/**
+	 * Returns the mime content-type.
+	 *
+	 * @return string
+	 */
+	public function getContentType()
+	{
+		return 'text/vcard; charset=utf-8';
+	}
+
+	/**
+	 * Returns an ETag for this object.
+	 *
+	 * @return string
+	 */
+	public function getETag()
+	{
+		if (isset($this->cardData['etag'])) {
+			return $this->cardData['etag'];
+		} else {
+			$data = $this->get();
+			if (is_string($data)) {
+				return '"'.md5($data).'"';
+			} else {
+				// We refuse to calculate the md5 if it's a stream.
+				return null;
+			}
+		}
+	}
+
+	/**
+	 * Returns the last modification date as a unix timestamp.
+	 *
+	 * @return int
+	 */
+	public function getLastModified()
+	{
+		return isset($this->cardData['lastmodified']) ? $this->cardData['lastmodified'] : null;
+	}
+
+	/**
+	 * Returns the size of this object in bytes.
+	 *
+	 * @return int
+	 */
+	public function getSize()
+	{
+		if (array_key_exists('size', $this->cardData)) {
+			return $this->cardData['size'];
+		} else {
+			return strlen($this->get());
+		}
+	}
+
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner()
+	{
+		return $this->addressBookInfo['principaluri'];
+	}
+
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL()
+	{
+		// An alternative acl may be specified through the cardData array.
+		if (isset($this->cardData['acl'])) {
+			return $this->cardData['acl'];
+		}
+
+		return [
+			[
+				'privilege' => '{DAV:}all',
+				'principal' => $this->addressBookInfo['principaluri'],
+				'protected' => true,
+			],
+		];
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAVACL/IACL.php

Indentation +48 added lines, -48 removed lines

@@ -17,56 +17,56 @@
  */
 interface IACL extends DAV\INode
 {
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner();
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner();
 
-    /**
-     * Returns a group principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getGroup();
+	/**
+	 * Returns a group principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getGroup();
 
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    public function getACL();
+	/**
+	 * Returns a list of ACE's for this node.
+	 *
+	 * Each ACE has the following properties:
+	 *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+	 *     currently the only supported privileges
+	 *   * 'principal', a url to the principal who owns the node
+	 *   * 'protected' (optional), indicating that this ACE is not allowed to
+	 *      be updated.
+	 *
+	 * @return array
+	 */
+	public function getACL();
 
-    /**
-     * Updates the ACL.
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     */
-    public function setACL(array $acl);
+	/**
+	 * Updates the ACL.
+	 *
+	 * This method will receive a list of new ACE's as an array argument.
+	 */
+	public function setACL(array $acl);
 
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    public function getSupportedPrivilegeSet();
+	/**
+	 * Returns the list of supported privileges for this node.
+	 *
+	 * The returned data structure is a list of nested privileges.
+	 * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+	 * standard structure.
+	 *
+	 * If null is returned from this method, the default privilege set is used,
+	 * which is fine for most common usecases.
+	 *
+	 * @return array|null
+	 */
+	public function getSupportedPrivilegeSet();
 }

htdocs/includes/sabre/sabre/dav/lib/DAVACL/Principal.php

Indentation +172 added lines, -172 removed lines

@@ -24,176 +24,176 @@
  */
 class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL
 {
-    use ACLTrait;
-
-    /**
-     * Struct with principal information.
-     *
-     * @var array
-     */
-    protected $principalProperties;
-
-    /**
-     * Principal backend.
-     *
-     * @var PrincipalBackend\BackendInterface
-     */
-    protected $principalBackend;
-
-    /**
-     * Creates the principal object.
-     */
-    public function __construct(PrincipalBackend\BackendInterface $principalBackend, array $principalProperties = [])
-    {
-        if (!isset($principalProperties['uri'])) {
-            throw new DAV\Exception('The principal properties must at least contain the \'uri\' key');
-        }
-        $this->principalBackend = $principalBackend;
-        $this->principalProperties = $principalProperties;
-    }
-
-    /**
-     * Returns the full principal url.
-     *
-     * @return string
-     */
-    public function getPrincipalUrl()
-    {
-        return $this->principalProperties['uri'];
-    }
-
-    /**
-     * Returns a list of alternative urls for a principal.
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet()
-    {
-        $uris = [];
-        if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
-            $uris = $this->principalProperties['{DAV:}alternate-URI-set'];
-        }
-
-        if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
-            $uris[] = 'mailto:'.$this->principalProperties['{http://sabredav.org/ns}email-address'];
-        }
-
-        return array_unique($uris);
-    }
-
-    /**
-     * Returns the list of group members.
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet()
-    {
-        return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
-    }
-
-    /**
-     * Returns the list of groups this principal is member of.
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership()
-    {
-        return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
-    }
-
-    /**
-     * Sets a list of group members.
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     */
-    public function setGroupMemberSet(array $groupMembers)
-    {
-        $this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
-    }
-
-    /**
-     * Returns this principals name.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        $uri = $this->principalProperties['uri'];
-        list(, $name) = Uri\split($uri);
-
-        return $name;
-    }
-
-    /**
-     * Returns the name of the user.
-     *
-     * @return string
-     */
-    public function getDisplayName()
-    {
-        if (isset($this->principalProperties['{DAV:}displayname'])) {
-            return $this->principalProperties['{DAV:}displayname'];
-        } else {
-            return $this->getName();
-        }
-    }
-
-    /**
-     * Returns a list of properties.
-     *
-     * @param array $requestedProperties
-     *
-     * @return array
-     */
-    public function getProperties($requestedProperties)
-    {
-        $newProperties = [];
-        foreach ($requestedProperties as $propName) {
-            if (isset($this->principalProperties[$propName])) {
-                $newProperties[$propName] = $this->principalProperties[$propName];
-            }
-        }
-
-        return $newProperties;
-    }
-
-    /**
-     * Updates properties on this node.
-     *
-     * This method received a PropPatch object, which contains all the
-     * information about the update.
-     *
-     * To update specific properties, call the 'handle' method on this object.
-     * Read the PropPatch documentation for more information.
-     */
-    public function propPatch(DAV\PropPatch $propPatch)
-    {
-        return $this->principalBackend->updatePrincipal(
-            $this->principalProperties['uri'],
-            $propPatch
-        );
-    }
-
-    /**
-     * Returns the owner principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    public function getOwner()
-    {
-        return $this->principalProperties['uri'];
-    }
+	use ACLTrait;
+
+	/**
+	 * Struct with principal information.
+	 *
+	 * @var array
+	 */
+	protected $principalProperties;
+
+	/**
+	 * Principal backend.
+	 *
+	 * @var PrincipalBackend\BackendInterface
+	 */
+	protected $principalBackend;
+
+	/**
+	 * Creates the principal object.
+	 */
+	public function __construct(PrincipalBackend\BackendInterface $principalBackend, array $principalProperties = [])
+	{
+		if (!isset($principalProperties['uri'])) {
+			throw new DAV\Exception('The principal properties must at least contain the \'uri\' key');
+		}
+		$this->principalBackend = $principalBackend;
+		$this->principalProperties = $principalProperties;
+	}
+
+	/**
+	 * Returns the full principal url.
+	 *
+	 * @return string
+	 */
+	public function getPrincipalUrl()
+	{
+		return $this->principalProperties['uri'];
+	}
+
+	/**
+	 * Returns a list of alternative urls for a principal.
+	 *
+	 * This can for example be an email address, or ldap url.
+	 *
+	 * @return array
+	 */
+	public function getAlternateUriSet()
+	{
+		$uris = [];
+		if (isset($this->principalProperties['{DAV:}alternate-URI-set'])) {
+			$uris = $this->principalProperties['{DAV:}alternate-URI-set'];
+		}
+
+		if (isset($this->principalProperties['{http://sabredav.org/ns}email-address'])) {
+			$uris[] = 'mailto:'.$this->principalProperties['{http://sabredav.org/ns}email-address'];
+		}
+
+		return array_unique($uris);
+	}
+
+	/**
+	 * Returns the list of group members.
+	 *
+	 * If this principal is a group, this function should return
+	 * all member principal uri's for the group.
+	 *
+	 * @return array
+	 */
+	public function getGroupMemberSet()
+	{
+		return $this->principalBackend->getGroupMemberSet($this->principalProperties['uri']);
+	}
+
+	/**
+	 * Returns the list of groups this principal is member of.
+	 *
+	 * If this principal is a member of a (list of) groups, this function
+	 * should return a list of principal uri's for it's members.
+	 *
+	 * @return array
+	 */
+	public function getGroupMembership()
+	{
+		return $this->principalBackend->getGroupMemberShip($this->principalProperties['uri']);
+	}
+
+	/**
+	 * Sets a list of group members.
+	 *
+	 * If this principal is a group, this method sets all the group members.
+	 * The list of members is always overwritten, never appended to.
+	 *
+	 * This method should throw an exception if the members could not be set.
+	 */
+	public function setGroupMemberSet(array $groupMembers)
+	{
+		$this->principalBackend->setGroupMemberSet($this->principalProperties['uri'], $groupMembers);
+	}
+
+	/**
+	 * Returns this principals name.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		$uri = $this->principalProperties['uri'];
+		list(, $name) = Uri\split($uri);
+
+		return $name;
+	}
+
+	/**
+	 * Returns the name of the user.
+	 *
+	 * @return string
+	 */
+	public function getDisplayName()
+	{
+		if (isset($this->principalProperties['{DAV:}displayname'])) {
+			return $this->principalProperties['{DAV:}displayname'];
+		} else {
+			return $this->getName();
+		}
+	}
+
+	/**
+	 * Returns a list of properties.
+	 *
+	 * @param array $requestedProperties
+	 *
+	 * @return array
+	 */
+	public function getProperties($requestedProperties)
+	{
+		$newProperties = [];
+		foreach ($requestedProperties as $propName) {
+			if (isset($this->principalProperties[$propName])) {
+				$newProperties[$propName] = $this->principalProperties[$propName];
+			}
+		}
+
+		return $newProperties;
+	}
+
+	/**
+	 * Updates properties on this node.
+	 *
+	 * This method received a PropPatch object, which contains all the
+	 * information about the update.
+	 *
+	 * To update specific properties, call the 'handle' method on this object.
+	 * Read the PropPatch documentation for more information.
+	 */
+	public function propPatch(DAV\PropPatch $propPatch)
+	{
+		return $this->principalBackend->updatePrincipal(
+			$this->principalProperties['uri'],
+			$propPatch
+		);
+	}
+
+	/**
+	 * Returns the owner principal.
+	 *
+	 * This must be a url to a principal, or null if there's no owner
+	 *
+	 * @return string|null
+	 */
+	public function getOwner()
+	{
+		return $this->principalProperties['uri'];
+	}
 }

htdocs/includes/sabre/sabre/dav/lib/DAVACL/IPrincipal.php

Indentation +50 added lines, -50 removed lines

@@ -17,59 +17,59 @@
  */
 interface IPrincipal extends DAV\INode
 {
-    /**
-     * Returns a list of alternative urls for a principal.
-     *
-     * This can for example be an email address, or ldap url.
-     *
-     * @return array
-     */
-    public function getAlternateUriSet();
+	/**
+	 * Returns a list of alternative urls for a principal.
+	 *
+	 * This can for example be an email address, or ldap url.
+	 *
+	 * @return array
+	 */
+	public function getAlternateUriSet();
 
-    /**
-     * Returns the full principal url.
-     *
-     * @return string
-     */
-    public function getPrincipalUrl();
+	/**
+	 * Returns the full principal url.
+	 *
+	 * @return string
+	 */
+	public function getPrincipalUrl();
 
-    /**
-     * Returns the list of group members.
-     *
-     * If this principal is a group, this function should return
-     * all member principal uri's for the group.
-     *
-     * @return array
-     */
-    public function getGroupMemberSet();
+	/**
+	 * Returns the list of group members.
+	 *
+	 * If this principal is a group, this function should return
+	 * all member principal uri's for the group.
+	 *
+	 * @return array
+	 */
+	public function getGroupMemberSet();
 
-    /**
-     * Returns the list of groups this principal is member of.
-     *
-     * If this principal is a member of a (list of) groups, this function
-     * should return a list of principal uri's for it's members.
-     *
-     * @return array
-     */
-    public function getGroupMembership();
+	/**
+	 * Returns the list of groups this principal is member of.
+	 *
+	 * If this principal is a member of a (list of) groups, this function
+	 * should return a list of principal uri's for it's members.
+	 *
+	 * @return array
+	 */
+	public function getGroupMembership();
 
-    /**
-     * Sets a list of group members.
-     *
-     * If this principal is a group, this method sets all the group members.
-     * The list of members is always overwritten, never appended to.
-     *
-     * This method should throw an exception if the members could not be set.
-     */
-    public function setGroupMemberSet(array $principals);
+	/**
+	 * Sets a list of group members.
+	 *
+	 * If this principal is a group, this method sets all the group members.
+	 * The list of members is always overwritten, never appended to.
+	 *
+	 * This method should throw an exception if the members could not be set.
+	 */
+	public function setGroupMemberSet(array $principals);
 
-    /**
-     * Returns the displayname.
-     *
-     * This should be a human readable name for the principal.
-     * If none is available, return the nodename.
-     *
-     * @return string
-     */
-    public function getDisplayName();
+	/**
+	 * Returns the displayname.
+	 *
+	 * This should be a human readable name for the principal.
+	 * If none is available, return the nodename.
+	 *
+	 * @return string
+	 */
+	public function getDisplayName();
 }