Passed
Push — master ( 995692...3b92af )
by Roeland
31:08 queued 18:55
created
apps/workflowengine/lib/Check/RequestURL.php 1 patch
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -27,66 +27,66 @@
 block discarded – undo
27 27
 
28 28
 class RequestURL extends AbstractStringCheck {
29 29
 
30
-	/** @var string */
31
-	protected $url;
30
+    /** @var string */
31
+    protected $url;
32 32
 
33
-	/** @var IRequest */
34
-	protected $request;
33
+    /** @var IRequest */
34
+    protected $request;
35 35
 
36
-	/**
37
-	 * @param IL10N $l
38
-	 * @param IRequest $request
39
-	 */
40
-	public function __construct(IL10N $l, IRequest $request) {
41
-		parent::__construct($l);
42
-		$this->request = $request;
43
-	}
36
+    /**
37
+     * @param IL10N $l
38
+     * @param IRequest $request
39
+     */
40
+    public function __construct(IL10N $l, IRequest $request) {
41
+        parent::__construct($l);
42
+        $this->request = $request;
43
+    }
44 44
 
45
-	/**
46
-	 * @param string $operator
47
-	 * @param string $value
48
-	 * @return bool
49
-	 */
50
-	public function executeCheck($operator, $value)  {
51
-		$actualValue = $this->getActualValue();
52
-		if (in_array($operator, ['is', '!is'])) {
53
-			switch ($value) {
54
-				case 'webdav':
55
-					if ($operator === 'is') {
56
-						return $this->isWebDAVRequest();
57
-					} else {
58
-						return !$this->isWebDAVRequest();
59
-					}
60
-			}
61
-		}
62
-		return $this->executeStringCheck($operator, $value, $actualValue);
63
-	}
45
+    /**
46
+     * @param string $operator
47
+     * @param string $value
48
+     * @return bool
49
+     */
50
+    public function executeCheck($operator, $value)  {
51
+        $actualValue = $this->getActualValue();
52
+        if (in_array($operator, ['is', '!is'])) {
53
+            switch ($value) {
54
+                case 'webdav':
55
+                    if ($operator === 'is') {
56
+                        return $this->isWebDAVRequest();
57
+                    } else {
58
+                        return !$this->isWebDAVRequest();
59
+                    }
60
+            }
61
+        }
62
+        return $this->executeStringCheck($operator, $value, $actualValue);
63
+    }
64 64
 
65
-	/**
66
-	 * @return string
67
-	 */
68
-	protected function getActualValue() {
69
-		if ($this->url !== null) {
70
-			return $this->url;
71
-		}
65
+    /**
66
+     * @return string
67
+     */
68
+    protected function getActualValue() {
69
+        if ($this->url !== null) {
70
+            return $this->url;
71
+        }
72 72
 
73
-		$this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
74
-		$this->url .= $this->request->getServerHost();// E.g. localhost
75
-		$this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
76
-		$this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
73
+        $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + ://
74
+        $this->url .= $this->request->getServerHost();// E.g. localhost
75
+        $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php
76
+        $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile
77 77
 
78
-		return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
79
-	}
78
+        return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile
79
+    }
80 80
 
81
-	/**
82
-	 * @return bool
83
-	 */
84
-	protected function isWebDAVRequest() {
85
-		return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
86
-			$this->request->getPathInfo() === '/webdav' ||
87
-			strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
88
-			$this->request->getPathInfo() === '/dav/files' ||
89
-			strpos($this->request->getPathInfo(), '/dav/files/') === 0
90
-		);
91
-	}
81
+    /**
82
+     * @return bool
83
+     */
84
+    protected function isWebDAVRequest() {
85
+        return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && (
86
+            $this->request->getPathInfo() === '/webdav' ||
87
+            strpos($this->request->getPathInfo(), '/webdav/') === 0 ||
88
+            $this->request->getPathInfo() === '/dav/files' ||
89
+            strpos($this->request->getPathInfo(), '/dav/files/') === 0
90
+        );
91
+    }
92 92
 }
Please login to merge, or discard this patch.
apps/testing/lib/AlternativeHomeUserBackend.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -34,23 +34,23 @@
 block discarded – undo
34 34
  *	]
35 35
  */
36 36
 class AlternativeHomeUserBackend extends \OC\User\Database {
37
-	public function __construct() {
38
-		parent::__construct();
39
-	}
40
-	/**
41
-	 * get the user's home directory
42
-	 * @param string $uid the username
43
-	 * @return string|false
44
-	 */
45
-	public function getHome($uid) {
46
-		if ($this->userExists($uid)) {
47
-			// workaround to avoid killing the admin
48
-			if ($uid !== 'admin') {
49
-				$uid = md5($uid);
50
-			}
51
-			return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
52
-		}
37
+    public function __construct() {
38
+        parent::__construct();
39
+    }
40
+    /**
41
+     * get the user's home directory
42
+     * @param string $uid the username
43
+     * @return string|false
44
+     */
45
+    public function getHome($uid) {
46
+        if ($this->userExists($uid)) {
47
+            // workaround to avoid killing the admin
48
+            if ($uid !== 'admin') {
49
+                $uid = md5($uid);
50
+            }
51
+            return \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/' . $uid;
52
+        }
53 53
 
54
-		return false;
55
-	}
54
+        return false;
55
+    }
56 56
 }
Please login to merge, or discard this patch.
apps/federatedfilesharing/lib/TokenHandler.php 1 patch
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -33,30 +33,30 @@
 block discarded – undo
33 33
  */
34 34
 class TokenHandler {
35 35
 
36
-	const TOKEN_LENGTH = 15;
37
-
38
-	/** @var ISecureRandom */
39
-	private $secureRandom;
40
-
41
-	/**
42
-	 * TokenHandler constructor.
43
-	 *
44
-	 * @param ISecureRandom $secureRandom
45
-	 */
46
-	public function __construct(ISecureRandom $secureRandom) {
47
-		$this->secureRandom = $secureRandom;
48
-	}
49
-
50
-	/**
51
-	 * generate to token used to authenticate federated shares
52
-	 *
53
-	 * @return string
54
-	 */
55
-	public function generateToken() {
56
-		$token = $this->secureRandom->generate(
57
-			self::TOKEN_LENGTH,
58
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
59
-		return $token;
60
-	}
36
+    const TOKEN_LENGTH = 15;
37
+
38
+    /** @var ISecureRandom */
39
+    private $secureRandom;
40
+
41
+    /**
42
+     * TokenHandler constructor.
43
+     *
44
+     * @param ISecureRandom $secureRandom
45
+     */
46
+    public function __construct(ISecureRandom $secureRandom) {
47
+        $this->secureRandom = $secureRandom;
48
+    }
49
+
50
+    /**
51
+     * generate to token used to authenticate federated shares
52
+     *
53
+     * @return string
54
+     */
55
+    public function generateToken() {
56
+        $token = $this->secureRandom->generate(
57
+            self::TOKEN_LENGTH,
58
+            ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
59
+        return $token;
60
+    }
61 61
 
62 62
 }
Please login to merge, or discard this patch.
apps/federation/templates/settings-admin.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -28,10 +28,10 @@
 block discarded – undo
28 28
 				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
29 29
 					<span class="status success"></span>
30 30
 				<?php
31
-				} elseif(
32
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
33
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
34
-				) { ?>
31
+                } elseif(
32
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
33
+                    (int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
34
+                ) { ?>
35 35
 					<span class="status indeterminate"></span>
36 36
 				<?php } else {?>
37 37
 					<span class="status error"></span>
Please login to merge, or discard this patch.
apps/federation/lib/Settings/Admin.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -29,41 +29,41 @@
 block discarded – undo
29 29
 
30 30
 class Admin implements ISettings {
31 31
 
32
-	/** @var TrustedServers */
33
-	private $trustedServers;
32
+    /** @var TrustedServers */
33
+    private $trustedServers;
34 34
 
35
-	public function __construct(TrustedServers $trustedServers) {
36
-		$this->trustedServers = $trustedServers;
37
-	}
35
+    public function __construct(TrustedServers $trustedServers) {
36
+        $this->trustedServers = $trustedServers;
37
+    }
38 38
 
39
-	/**
40
-	 * @return TemplateResponse
41
-	 */
42
-	public function getForm() {
43
-		$parameters = [
44
-			'trustedServers' => $this->trustedServers->getServers(),
45
-			'autoAddServers' => $this->trustedServers->getAutoAddServers(),
46
-		];
39
+    /**
40
+     * @return TemplateResponse
41
+     */
42
+    public function getForm() {
43
+        $parameters = [
44
+            'trustedServers' => $this->trustedServers->getServers(),
45
+            'autoAddServers' => $this->trustedServers->getAutoAddServers(),
46
+        ];
47 47
 
48
-		return new TemplateResponse('federation', 'settings-admin', $parameters, '');
49
-	}
48
+        return new TemplateResponse('federation', 'settings-admin', $parameters, '');
49
+    }
50 50
 
51
-	/**
52
-	 * @return string the section ID, e.g. 'sharing'
53
-	 */
54
-	public function getSection() {
55
-		return 'sharing';
56
-	}
51
+    /**
52
+     * @return string the section ID, e.g. 'sharing'
53
+     */
54
+    public function getSection() {
55
+        return 'sharing';
56
+    }
57 57
 
58
-	/**
59
-	 * @return int whether the form should be rather on the top or bottom of
60
-	 * the admin section. The forms are arranged in ascending order of the
61
-	 * priority values. It is required to return a value between 0 and 100.
62
-	 *
63
-	 * E.g.: 70
64
-	 */
65
-	public function getPriority() {
66
-		return 30;
67
-	}
58
+    /**
59
+     * @return int whether the form should be rather on the top or bottom of
60
+     * the admin section. The forms are arranged in ascending order of the
61
+     * priority values. It is required to return a value between 0 and 100.
62
+     *
63
+     * E.g.: 70
64
+     */
65
+    public function getPriority() {
66
+        return 30;
67
+    }
68 68
 
69 69
 }
Please login to merge, or discard this patch.
apps/federation/lib/Hooks.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -27,25 +27,25 @@
 block discarded – undo
27 27
 
28 28
 class Hooks {
29 29
 
30
-	/** @var TrustedServers */
31
-	private $trustedServers;
32
-
33
-	public function __construct(TrustedServers $trustedServers) {
34
-		$this->trustedServers = $trustedServers;
35
-	}
36
-
37
-	/**
38
-	 * add servers to the list of trusted servers once a federated share was established
39
-	 *
40
-	 * @param array $params
41
-	 */
42
-	public function addServerHook($params) {
43
-		if (
44
-			$this->trustedServers->getAutoAddServers() === true &&
45
-			$this->trustedServers->isTrustedServer($params['server']) === false
46
-		) {
47
-			$this->trustedServers->addServer($params['server']);
48
-		}
49
-	}
30
+    /** @var TrustedServers */
31
+    private $trustedServers;
32
+
33
+    public function __construct(TrustedServers $trustedServers) {
34
+        $this->trustedServers = $trustedServers;
35
+    }
36
+
37
+    /**
38
+     * add servers to the list of trusted servers once a federated share was established
39
+     *
40
+     * @param array $params
41
+     */
42
+    public function addServerHook($params) {
43
+        if (
44
+            $this->trustedServers->getAutoAddServers() === true &&
45
+            $this->trustedServers->isTrustedServer($params['server']) === false
46
+        ) {
47
+            $this->trustedServers->addServer($params['server']);
48
+        }
49
+    }
50 50
 
51 51
 }
Please login to merge, or discard this patch.
apps/dav/lib/DAV/PublicAuth.php 1 patch
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -26,67 +26,67 @@
 block discarded – undo
26 26
 
27 27
 class PublicAuth implements BackendInterface {
28 28
 
29
-	/** @var string[] */
30
-	private $publicURLs;
29
+    /** @var string[] */
30
+    private $publicURLs;
31 31
 
32
-	public function __construct() {
33
-		$this->publicURLs = [
34
-			'public-calendars',
35
-			'principals/system/public'
36
-		];
37
-	}
32
+    public function __construct() {
33
+        $this->publicURLs = [
34
+            'public-calendars',
35
+            'principals/system/public'
36
+        ];
37
+    }
38 38
 
39
-	/**
40
-	 * When this method is called, the backend must check if authentication was
41
-	 * successful.
42
-	 *
43
-	 * The returned value must be one of the following
44
-	 *
45
-	 * [true, "principals/username"]
46
-	 * [false, "reason for failure"]
47
-	 *
48
-	 * If authentication was successful, it's expected that the authentication
49
-	 * backend returns a so-called principal url.
50
-	 *
51
-	 * Examples of a principal url:
52
-	 *
53
-	 * principals/admin
54
-	 * principals/user1
55
-	 * principals/users/joe
56
-	 * principals/uid/123457
57
-	 *
58
-	 * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
59
-	 * return a string such as:
60
-	 *
61
-	 * principals/users/[username]
62
-	 *
63
-	 * @param RequestInterface $request
64
-	 * @param ResponseInterface $response
65
-	 * @return array
66
-	 */
67
-	function check(RequestInterface $request, ResponseInterface $response) {
39
+    /**
40
+     * When this method is called, the backend must check if authentication was
41
+     * successful.
42
+     *
43
+     * The returned value must be one of the following
44
+     *
45
+     * [true, "principals/username"]
46
+     * [false, "reason for failure"]
47
+     *
48
+     * If authentication was successful, it's expected that the authentication
49
+     * backend returns a so-called principal url.
50
+     *
51
+     * Examples of a principal url:
52
+     *
53
+     * principals/admin
54
+     * principals/user1
55
+     * principals/users/joe
56
+     * principals/uid/123457
57
+     *
58
+     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
59
+     * return a string such as:
60
+     *
61
+     * principals/users/[username]
62
+     *
63
+     * @param RequestInterface $request
64
+     * @param ResponseInterface $response
65
+     * @return array
66
+     */
67
+    function check(RequestInterface $request, ResponseInterface $response) {
68 68
 
69
-		if ($this->isRequestPublic($request)) {
70
-			return [true, "principals/system/public"];
71
-		}
72
-		return [false, "No public access to this resource."];
73
-	}
69
+        if ($this->isRequestPublic($request)) {
70
+            return [true, "principals/system/public"];
71
+        }
72
+        return [false, "No public access to this resource."];
73
+    }
74 74
 
75
-	/**
76
-	 * @inheritdoc
77
-	 */
78
-	function challenge(RequestInterface $request, ResponseInterface $response) {
79
-	}
75
+    /**
76
+     * @inheritdoc
77
+     */
78
+    function challenge(RequestInterface $request, ResponseInterface $response) {
79
+    }
80 80
 
81
-	/**
82
-	 * @param RequestInterface $request
83
-	 * @return bool
84
-	 */
85
-	private function isRequestPublic(RequestInterface $request) {
86
-		$url = $request->getPath();
87
-		$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
88
-			return strpos($url, $publicUrl, 0) === 0;
89
-		});
90
-		return !empty($matchingUrls);
91
-	}
81
+    /**
82
+     * @param RequestInterface $request
83
+     * @return bool
84
+     */
85
+    private function isRequestPublic(RequestInterface $request) {
86
+        $url = $request->getPath();
87
+        $matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
88
+            return strpos($url, $publicUrl, 0) === 0;
89
+        });
90
+        return !empty($matchingUrls);
91
+    }
92 92
 }
Please login to merge, or discard this patch.
apps/dav/lib/DAV/Sharing/Xml/Invite.php 1 patch
Indentation   +126 added lines, -126 removed lines patch added patch discarded remove patch
@@ -41,130 +41,130 @@
 block discarded – undo
41 41
  */
42 42
 class Invite implements XmlSerializable {
43 43
 
44
-	/**
45
-	 * The list of users a calendar has been shared to.
46
-	 *
47
-	 * @var array
48
-	 */
49
-	protected $users;
50
-
51
-	/**
52
-	 * The organizer contains information about the person who shared the
53
-	 * object.
54
-	 *
55
-	 * @var array|null
56
-	 */
57
-	protected $organizer;
58
-
59
-	/**
60
-	 * Creates the property.
61
-	 *
62
-	 * Users is an array. Each element of the array has the following
63
-	 * properties:
64
-	 *
65
-	 *   * href - Often a mailto: address
66
-	 *   * commonName - Optional, for example a first and lastname for a user.
67
-	 *   * status - One of the SharingPlugin::STATUS_* constants.
68
-	 *   * readOnly - true or false
69
-	 *   * summary - Optional, description of the share
70
-	 *
71
-	 * The organizer key is optional to specify. It's only useful when a
72
-	 * 'sharee' requests the sharing information.
73
-	 *
74
-	 * The organizer may have the following properties:
75
-	 *   * href - Often a mailto: address.
76
-	 *   * commonName - Optional human-readable name.
77
-	 *   * firstName - Optional first name.
78
-	 *   * lastName - Optional last name.
79
-	 *
80
-	 * If you wonder why these two structures are so different, I guess a
81
-	 * valid answer is that the current spec is still a draft.
82
-	 *
83
-	 * @param array $users
84
-	 */
85
-	function __construct(array $users, array $organizer = null) {
86
-
87
-		$this->users = $users;
88
-		$this->organizer = $organizer;
89
-
90
-	}
91
-
92
-	/**
93
-	 * Returns the list of users, as it was passed to the constructor.
94
-	 *
95
-	 * @return array
96
-	 */
97
-	function getValue() {
98
-
99
-		return $this->users;
100
-
101
-	}
102
-
103
-	/**
104
-	 * The xmlSerialize metod is called during xml writing.
105
-	 *
106
-	 * Use the $writer argument to write its own xml serialization.
107
-	 *
108
-	 * An important note: do _not_ create a parent element. Any element
109
-	 * implementing XmlSerializble should only ever write what's considered
110
-	 * its 'inner xml'.
111
-	 *
112
-	 * The parent of the current element is responsible for writing a
113
-	 * containing element.
114
-	 *
115
-	 * This allows serializers to be re-used for different element names.
116
-	 *
117
-	 * If you are opening new elements, you must also close them again.
118
-	 *
119
-	 * @param Writer $writer
120
-	 * @return void
121
-	 */
122
-	function xmlSerialize(Writer $writer) {
123
-
124
-		$cs = '{' . Plugin::NS_OWNCLOUD . '}';
125
-
126
-		if (!is_null($this->organizer)) {
127
-
128
-			$writer->startElement($cs . 'organizer');
129
-			$writer->writeElement('{DAV:}href', $this->organizer['href']);
130
-
131
-			if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
132
-				$writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
133
-			}
134
-			if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
135
-				$writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
136
-			}
137
-			if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
138
-				$writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
139
-			}
140
-			$writer->endElement(); // organizer
141
-
142
-		}
143
-
144
-		foreach ($this->users as $user) {
145
-
146
-			$writer->startElement($cs . 'user');
147
-			$writer->writeElement('{DAV:}href', $user['href']);
148
-			if (isset($user['commonName']) && $user['commonName']) {
149
-				$writer->writeElement($cs . 'common-name', $user['commonName']);
150
-			}
151
-			$writer->writeElement($cs . 'invite-accepted');
152
-
153
-			$writer->startElement($cs . 'access');
154
-			if ($user['readOnly']) {
155
-				$writer->writeElement($cs . 'read');
156
-			} else {
157
-				$writer->writeElement($cs . 'read-write');
158
-			}
159
-			$writer->endElement(); // access
160
-
161
-			if (isset($user['summary']) && $user['summary']) {
162
-				$writer->writeElement($cs . 'summary', $user['summary']);
163
-			}
164
-
165
-			$writer->endElement(); //user
166
-
167
-		}
168
-
169
-	}
44
+    /**
45
+     * The list of users a calendar has been shared to.
46
+     *
47
+     * @var array
48
+     */
49
+    protected $users;
50
+
51
+    /**
52
+     * The organizer contains information about the person who shared the
53
+     * object.
54
+     *
55
+     * @var array|null
56
+     */
57
+    protected $organizer;
58
+
59
+    /**
60
+     * Creates the property.
61
+     *
62
+     * Users is an array. Each element of the array has the following
63
+     * properties:
64
+     *
65
+     *   * href - Often a mailto: address
66
+     *   * commonName - Optional, for example a first and lastname for a user.
67
+     *   * status - One of the SharingPlugin::STATUS_* constants.
68
+     *   * readOnly - true or false
69
+     *   * summary - Optional, description of the share
70
+     *
71
+     * The organizer key is optional to specify. It's only useful when a
72
+     * 'sharee' requests the sharing information.
73
+     *
74
+     * The organizer may have the following properties:
75
+     *   * href - Often a mailto: address.
76
+     *   * commonName - Optional human-readable name.
77
+     *   * firstName - Optional first name.
78
+     *   * lastName - Optional last name.
79
+     *
80
+     * If you wonder why these two structures are so different, I guess a
81
+     * valid answer is that the current spec is still a draft.
82
+     *
83
+     * @param array $users
84
+     */
85
+    function __construct(array $users, array $organizer = null) {
86
+
87
+        $this->users = $users;
88
+        $this->organizer = $organizer;
89
+
90
+    }
91
+
92
+    /**
93
+     * Returns the list of users, as it was passed to the constructor.
94
+     *
95
+     * @return array
96
+     */
97
+    function getValue() {
98
+
99
+        return $this->users;
100
+
101
+    }
102
+
103
+    /**
104
+     * The xmlSerialize metod is called during xml writing.
105
+     *
106
+     * Use the $writer argument to write its own xml serialization.
107
+     *
108
+     * An important note: do _not_ create a parent element. Any element
109
+     * implementing XmlSerializble should only ever write what's considered
110
+     * its 'inner xml'.
111
+     *
112
+     * The parent of the current element is responsible for writing a
113
+     * containing element.
114
+     *
115
+     * This allows serializers to be re-used for different element names.
116
+     *
117
+     * If you are opening new elements, you must also close them again.
118
+     *
119
+     * @param Writer $writer
120
+     * @return void
121
+     */
122
+    function xmlSerialize(Writer $writer) {
123
+
124
+        $cs = '{' . Plugin::NS_OWNCLOUD . '}';
125
+
126
+        if (!is_null($this->organizer)) {
127
+
128
+            $writer->startElement($cs . 'organizer');
129
+            $writer->writeElement('{DAV:}href', $this->organizer['href']);
130
+
131
+            if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
132
+                $writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
133
+            }
134
+            if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
135
+                $writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
136
+            }
137
+            if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
138
+                $writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
139
+            }
140
+            $writer->endElement(); // organizer
141
+
142
+        }
143
+
144
+        foreach ($this->users as $user) {
145
+
146
+            $writer->startElement($cs . 'user');
147
+            $writer->writeElement('{DAV:}href', $user['href']);
148
+            if (isset($user['commonName']) && $user['commonName']) {
149
+                $writer->writeElement($cs . 'common-name', $user['commonName']);
150
+            }
151
+            $writer->writeElement($cs . 'invite-accepted');
152
+
153
+            $writer->startElement($cs . 'access');
154
+            if ($user['readOnly']) {
155
+                $writer->writeElement($cs . 'read');
156
+            } else {
157
+                $writer->writeElement($cs . 'read-write');
158
+            }
159
+            $writer->endElement(); // access
160
+
161
+            if (isset($user['summary']) && $user['summary']) {
162
+                $writer->writeElement($cs . 'summary', $user['summary']);
163
+            }
164
+
165
+            $writer->endElement(); //user
166
+
167
+        }
168
+
169
+    }
170 170
 }
Please login to merge, or discard this patch.
apps/dav/lib/Comments/EntityTypeCollection.php 1 patch
Indentation   +74 added lines, -74 removed lines patch added patch discarded remove patch
@@ -43,85 +43,85 @@
 block discarded – undo
43 43
  */
44 44
 class EntityTypeCollection extends RootCollection {
45 45
 
46
-	/** @var ILogger */
47
-	protected $logger;
46
+    /** @var ILogger */
47
+    protected $logger;
48 48
 
49
-	/** @var IUserManager */
50
-	protected $userManager;
49
+    /** @var IUserManager */
50
+    protected $userManager;
51 51
 
52
-	/** @var \Closure */
53
-	protected $childExistsFunction;
52
+    /** @var \Closure */
53
+    protected $childExistsFunction;
54 54
 
55
-	/**
56
-	 * @param string $name
57
-	 * @param ICommentsManager $commentsManager
58
-	 * @param IUserManager $userManager
59
-	 * @param IUserSession $userSession
60
-	 * @param ILogger $logger
61
-	 * @param \Closure $childExistsFunction
62
-	 */
63
-	public function __construct(
64
-		$name,
65
-		ICommentsManager $commentsManager,
66
-		IUserManager $userManager,
67
-		IUserSession $userSession,
68
-		ILogger $logger,
69
-		\Closure $childExistsFunction
70
-	) {
71
-		$name = trim($name);
72
-		if(empty($name) || !is_string($name)) {
73
-			throw new \InvalidArgumentException('"name" parameter must be non-empty string');
74
-		}
75
-		$this->name = $name;
76
-		$this->commentsManager = $commentsManager;
77
-		$this->logger = $logger;
78
-		$this->userManager = $userManager;
79
-		$this->userSession = $userSession;
80
-		$this->childExistsFunction = $childExistsFunction;
81
-	}
55
+    /**
56
+     * @param string $name
57
+     * @param ICommentsManager $commentsManager
58
+     * @param IUserManager $userManager
59
+     * @param IUserSession $userSession
60
+     * @param ILogger $logger
61
+     * @param \Closure $childExistsFunction
62
+     */
63
+    public function __construct(
64
+        $name,
65
+        ICommentsManager $commentsManager,
66
+        IUserManager $userManager,
67
+        IUserSession $userSession,
68
+        ILogger $logger,
69
+        \Closure $childExistsFunction
70
+    ) {
71
+        $name = trim($name);
72
+        if(empty($name) || !is_string($name)) {
73
+            throw new \InvalidArgumentException('"name" parameter must be non-empty string');
74
+        }
75
+        $this->name = $name;
76
+        $this->commentsManager = $commentsManager;
77
+        $this->logger = $logger;
78
+        $this->userManager = $userManager;
79
+        $this->userSession = $userSession;
80
+        $this->childExistsFunction = $childExistsFunction;
81
+    }
82 82
 
83
-	/**
84
-	 * Returns a specific child node, referenced by its name
85
-	 *
86
-	 * This method must throw Sabre\DAV\Exception\NotFound if the node does not
87
-	 * exist.
88
-	 *
89
-	 * @param string $name
90
-	 * @return \Sabre\DAV\INode
91
-	 * @throws NotFound
92
-	 */
93
-	function getChild($name) {
94
-		if(!$this->childExists($name)) {
95
-			throw new NotFound('Entity does not exist or is not available');
96
-		}
97
-		return new EntityCollection(
98
-			$name,
99
-			$this->name,
100
-			$this->commentsManager,
101
-			$this->userManager,
102
-			$this->userSession,
103
-			$this->logger
104
-		);
105
-	}
83
+    /**
84
+     * Returns a specific child node, referenced by its name
85
+     *
86
+     * This method must throw Sabre\DAV\Exception\NotFound if the node does not
87
+     * exist.
88
+     *
89
+     * @param string $name
90
+     * @return \Sabre\DAV\INode
91
+     * @throws NotFound
92
+     */
93
+    function getChild($name) {
94
+        if(!$this->childExists($name)) {
95
+            throw new NotFound('Entity does not exist or is not available');
96
+        }
97
+        return new EntityCollection(
98
+            $name,
99
+            $this->name,
100
+            $this->commentsManager,
101
+            $this->userManager,
102
+            $this->userSession,
103
+            $this->logger
104
+        );
105
+    }
106 106
 
107
-	/**
108
-	 * Returns an array with all the child nodes
109
-	 *
110
-	 * @return \Sabre\DAV\INode[]
111
-	 * @throws MethodNotAllowed
112
-	 */
113
-	function getChildren() {
114
-		throw new MethodNotAllowed('No permission to list folder contents');
115
-	}
107
+    /**
108
+     * Returns an array with all the child nodes
109
+     *
110
+     * @return \Sabre\DAV\INode[]
111
+     * @throws MethodNotAllowed
112
+     */
113
+    function getChildren() {
114
+        throw new MethodNotAllowed('No permission to list folder contents');
115
+    }
116 116
 
117
-	/**
118
-	 * Checks if a child-node with the specified name exists
119
-	 *
120
-	 * @param string $name
121
-	 * @return bool
122
-	 */
123
-	function childExists($name) {
124
-		return call_user_func($this->childExistsFunction, $name);
125
-	}
117
+    /**
118
+     * Checks if a child-node with the specified name exists
119
+     *
120
+     * @param string $name
121
+     * @return bool
122
+     */
123
+    function childExists($name) {
124
+        return call_user_func($this->childExistsFunction, $name);
125
+    }
126 126
 
127 127
 }
Please login to merge, or discard this patch.