Completed
Push — stable10 ( 453e52...4cd5d8 )
by Joas
33s
created
apps/dav/lib/Connector/Sabre/DummyGetResponsePlugin.php 2 patches
Indentation   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -39,33 +39,33 @@
 block discarded – undo
39 39
  * @package OCA\DAV\Connector\Sabre
40 40
  */
41 41
 class DummyGetResponsePlugin extends \Sabre\DAV\ServerPlugin {
42
-	/** @var \Sabre\DAV\Server */
43
-	protected $server;
42
+    /** @var \Sabre\DAV\Server */
43
+    protected $server;
44 44
 
45
-	/**
46
-	 * @param \Sabre\DAV\Server $server
47
-	 * @return void
48
-	 */
49
-	function initialize(\Sabre\DAV\Server $server) {
50
-		$this->server = $server;
51
-		$this->server->on('method:GET', [$this, 'httpGet'], 200);
52
-	}
45
+    /**
46
+     * @param \Sabre\DAV\Server $server
47
+     * @return void
48
+     */
49
+    function initialize(\Sabre\DAV\Server $server) {
50
+        $this->server = $server;
51
+        $this->server->on('method:GET', [$this, 'httpGet'], 200);
52
+    }
53 53
 
54
-	/**
55
-	 * @param RequestInterface $request
56
-	 * @param ResponseInterface $response
57
-	 * @return false
58
-	 */
59
-	function httpGet(RequestInterface $request, ResponseInterface $response) {
60
-		$string = 'This is the WebDAV interface. It can only be accessed by ' .
61
-			'WebDAV clients such as the ownCloud desktop sync client.';
62
-		$stream = fopen('php://memory','r+');
63
-		fwrite($stream, $string);
64
-		rewind($stream);
54
+    /**
55
+     * @param RequestInterface $request
56
+     * @param ResponseInterface $response
57
+     * @return false
58
+     */
59
+    function httpGet(RequestInterface $request, ResponseInterface $response) {
60
+        $string = 'This is the WebDAV interface. It can only be accessed by ' .
61
+            'WebDAV clients such as the ownCloud desktop sync client.';
62
+        $stream = fopen('php://memory','r+');
63
+        fwrite($stream, $string);
64
+        rewind($stream);
65 65
 
66
-		$response->setStatus(200);
67
-		$response->setBody($stream);
66
+        $response->setStatus(200);
67
+        $response->setBody($stream);
68 68
 
69
-		return false;
70
-	}
69
+        return false;
70
+    }
71 71
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -57,9 +57,9 @@
 block discarded – undo
57 57
 	 * @return false
58 58
 	 */
59 59
 	function httpGet(RequestInterface $request, ResponseInterface $response) {
60
-		$string = 'This is the WebDAV interface. It can only be accessed by ' .
60
+		$string = 'This is the WebDAV interface. It can only be accessed by '.
61 61
 			'WebDAV clients such as the ownCloud desktop sync client.';
62
-		$stream = fopen('php://memory','r+');
62
+		$stream = fopen('php://memory', 'r+');
63 63
 		fwrite($stream, $string);
64 64
 		rewind($stream);
65 65
 
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/CopyEtagHeaderPlugin.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -33,50 +33,50 @@
 block discarded – undo
33 33
  */
34 34
 class CopyEtagHeaderPlugin extends \Sabre\DAV\ServerPlugin {
35 35
 
36
-	/** @var \Sabre\DAV\Server */
37
-	private $server;
38
-	/**
39
-	 * This initializes the plugin.
40
-	 *
41
-	 * @param \Sabre\DAV\Server $server Sabre server
42
-	 *
43
-	 * @return void
44
-	 */
45
-	public function initialize(\Sabre\DAV\Server $server) {
46
-		$this->server = $server;
36
+    /** @var \Sabre\DAV\Server */
37
+    private $server;
38
+    /**
39
+     * This initializes the plugin.
40
+     *
41
+     * @param \Sabre\DAV\Server $server Sabre server
42
+     *
43
+     * @return void
44
+     */
45
+    public function initialize(\Sabre\DAV\Server $server) {
46
+        $this->server = $server;
47 47
 
48
-		$server->on('afterMethod', [$this, 'afterMethod']);
49
-		$server->on('afterMove', [$this, 'afterMove']);
50
-	}
48
+        $server->on('afterMethod', [$this, 'afterMethod']);
49
+        $server->on('afterMove', [$this, 'afterMove']);
50
+    }
51 51
 
52
-	/**
53
-	 * After method, copy the "Etag" header to "OC-Etag" header.
54
-	 *
55
-	 * @param RequestInterface $request request
56
-	 * @param ResponseInterface $response response
57
-	 */
58
-	public function afterMethod(RequestInterface $request, ResponseInterface $response) {
59
-		$eTag = $response->getHeader('Etag');
60
-		if (!empty($eTag)) {
61
-			$response->setHeader('OC-ETag', $eTag);
62
-		}
63
-	}
52
+    /**
53
+     * After method, copy the "Etag" header to "OC-Etag" header.
54
+     *
55
+     * @param RequestInterface $request request
56
+     * @param ResponseInterface $response response
57
+     */
58
+    public function afterMethod(RequestInterface $request, ResponseInterface $response) {
59
+        $eTag = $response->getHeader('Etag');
60
+        if (!empty($eTag)) {
61
+            $response->setHeader('OC-ETag', $eTag);
62
+        }
63
+    }
64 64
 
65
-	/**
66
-	 * Called after a node is moved.
67
-	 *
68
-	 * This allows the backend to move all the associated properties.
69
-	 *
70
-	 * @param string $source
71
-	 * @param string $destination
72
-	 * @return void
73
-	 */
74
-	function afterMove($source, $destination) {
75
-		$node = $this->server->tree->getNodeForPath($destination);
76
-		if ($node instanceof File) {
77
-			$eTag = $node->getETag();
78
-			$this->server->httpResponse->setHeader('OC-ETag', $eTag);
79
-			$this->server->httpResponse->setHeader('ETag', $eTag);
80
-		}
81
-	}
65
+    /**
66
+     * Called after a node is moved.
67
+     *
68
+     * This allows the backend to move all the associated properties.
69
+     *
70
+     * @param string $source
71
+     * @param string $destination
72
+     * @return void
73
+     */
74
+    function afterMove($source, $destination) {
75
+        $node = $this->server->tree->getNodeForPath($destination);
76
+        if ($node instanceof File) {
77
+            $eTag = $node->getETag();
78
+            $this->server->httpResponse->setHeader('OC-ETag', $eTag);
79
+            $this->server->httpResponse->setHeader('ETag', $eTag);
80
+        }
81
+    }
82 82
 }
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/MaintenancePlugin.php 1 patch
Indentation   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -33,61 +33,61 @@
 block discarded – undo
33 33
 
34 34
 class MaintenancePlugin extends ServerPlugin {
35 35
 
36
-	/** @var IConfig */
37
-	private $config;
36
+    /** @var IConfig */
37
+    private $config;
38 38
 
39
-	/**
40
-	 * Reference to main server object
41
-	 *
42
-	 * @var Server
43
-	 */
44
-	private $server;
39
+    /**
40
+     * Reference to main server object
41
+     *
42
+     * @var Server
43
+     */
44
+    private $server;
45 45
 
46
-	/**
47
-	 * @param IConfig $config
48
-	 */
49
-	public function __construct(IConfig $config = null) {
50
-		$this->config = $config;
51
-		if (is_null($config)) {
52
-			$this->config = \OC::$server->getConfig();
53
-		}
54
-	}
46
+    /**
47
+     * @param IConfig $config
48
+     */
49
+    public function __construct(IConfig $config = null) {
50
+        $this->config = $config;
51
+        if (is_null($config)) {
52
+            $this->config = \OC::$server->getConfig();
53
+        }
54
+    }
55 55
 
56 56
 
57
-	/**
58
-	 * This initializes the plugin.
59
-	 *
60
-	 * This function is called by \Sabre\DAV\Server, after
61
-	 * addPlugin is called.
62
-	 *
63
-	 * This method should set up the required event subscriptions.
64
-	 *
65
-	 * @param \Sabre\DAV\Server $server
66
-	 * @return void
67
-	 */
68
-	public function initialize(\Sabre\DAV\Server $server) {
69
-		$this->server = $server;
70
-		$this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 1);
71
-	}
57
+    /**
58
+     * This initializes the plugin.
59
+     *
60
+     * This function is called by \Sabre\DAV\Server, after
61
+     * addPlugin is called.
62
+     *
63
+     * This method should set up the required event subscriptions.
64
+     *
65
+     * @param \Sabre\DAV\Server $server
66
+     * @return void
67
+     */
68
+    public function initialize(\Sabre\DAV\Server $server) {
69
+        $this->server = $server;
70
+        $this->server->on('beforeMethod', array($this, 'checkMaintenanceMode'), 1);
71
+    }
72 72
 
73
-	/**
74
-	 * This method is called before any HTTP method and returns http status code 503
75
-	 * in case the system is in maintenance mode.
76
-	 *
77
-	 * @throws ServiceUnavailable
78
-	 * @return bool
79
-	 */
80
-	public function checkMaintenanceMode() {
81
-		if ($this->config->getSystemValue('singleuser', false)) {
82
-			throw new ServiceUnavailable('System in single user mode.');
83
-		}
84
-		if ($this->config->getSystemValue('maintenance', false)) {
85
-			throw new ServiceUnavailable('System in maintenance mode.');
86
-		}
87
-		if (\OC::checkUpgrade(false)) {
88
-			throw new ServiceUnavailable('Upgrade needed');
89
-		}
73
+    /**
74
+     * This method is called before any HTTP method and returns http status code 503
75
+     * in case the system is in maintenance mode.
76
+     *
77
+     * @throws ServiceUnavailable
78
+     * @return bool
79
+     */
80
+    public function checkMaintenanceMode() {
81
+        if ($this->config->getSystemValue('singleuser', false)) {
82
+            throw new ServiceUnavailable('System in single user mode.');
83
+        }
84
+        if ($this->config->getSystemValue('maintenance', false)) {
85
+            throw new ServiceUnavailable('System in maintenance mode.');
86
+        }
87
+        if (\OC::checkUpgrade(false)) {
88
+            throw new ServiceUnavailable('Upgrade needed');
89
+        }
90 90
 
91
-		return true;
92
-	}
91
+        return true;
92
+    }
93 93
 }
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/AppEnabledPlugin.php 1 patch
Indentation   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -34,58 +34,58 @@
 block discarded – undo
34 34
  */
35 35
 class AppEnabledPlugin extends ServerPlugin {
36 36
 
37
-	/**
38
-	 * Reference to main server object
39
-	 *
40
-	 * @var \Sabre\DAV\Server
41
-	 */
42
-	private $server;
37
+    /**
38
+     * Reference to main server object
39
+     *
40
+     * @var \Sabre\DAV\Server
41
+     */
42
+    private $server;
43 43
 
44
-	/**
45
-	 * @var string
46
-	 */
47
-	private $app;
44
+    /**
45
+     * @var string
46
+     */
47
+    private $app;
48 48
 
49
-	/**
50
-	 * @var \OCP\App\IAppManager
51
-	 */
52
-	private $appManager;
49
+    /**
50
+     * @var \OCP\App\IAppManager
51
+     */
52
+    private $appManager;
53 53
 
54
-	/**
55
-	 * @param string $app
56
-	 * @param \OCP\App\IAppManager $appManager
57
-	 */
58
-	public function __construct($app, IAppManager $appManager) {
59
-		$this->app = $app;
60
-		$this->appManager = $appManager;
61
-	}
54
+    /**
55
+     * @param string $app
56
+     * @param \OCP\App\IAppManager $appManager
57
+     */
58
+    public function __construct($app, IAppManager $appManager) {
59
+        $this->app = $app;
60
+        $this->appManager = $appManager;
61
+    }
62 62
 
63
-	/**
64
-	 * This initializes the plugin.
65
-	 *
66
-	 * This function is called by \Sabre\DAV\Server, after
67
-	 * addPlugin is called.
68
-	 *
69
-	 * This method should set up the required event subscriptions.
70
-	 *
71
-	 * @param \Sabre\DAV\Server $server
72
-	 * @return void
73
-	 */
74
-	public function initialize(\Sabre\DAV\Server $server) {
63
+    /**
64
+     * This initializes the plugin.
65
+     *
66
+     * This function is called by \Sabre\DAV\Server, after
67
+     * addPlugin is called.
68
+     *
69
+     * This method should set up the required event subscriptions.
70
+     *
71
+     * @param \Sabre\DAV\Server $server
72
+     * @return void
73
+     */
74
+    public function initialize(\Sabre\DAV\Server $server) {
75 75
 
76
-		$this->server = $server;
77
-		$this->server->on('beforeMethod', array($this, 'checkAppEnabled'), 30);
78
-	}
76
+        $this->server = $server;
77
+        $this->server->on('beforeMethod', array($this, 'checkAppEnabled'), 30);
78
+    }
79 79
 
80
-	/**
81
-	 * This method is called before any HTTP after auth and checks if the user has access to the app
82
-	 *
83
-	 * @throws \Sabre\DAV\Exception\Forbidden
84
-	 * @return bool
85
-	 */
86
-	public function checkAppEnabled() {
87
-		if (!$this->appManager->isEnabledForUser($this->app)) {
88
-			throw new Forbidden();
89
-		}
90
-	}
80
+    /**
81
+     * This method is called before any HTTP after auth and checks if the user has access to the app
82
+     *
83
+     * @throws \Sabre\DAV\Exception\Forbidden
84
+     * @return bool
85
+     */
86
+    public function checkAppEnabled() {
87
+        if (!$this->appManager->isEnabledForUser($this->app)) {
88
+            throw new Forbidden();
89
+        }
90
+    }
91 91
 }
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/Directory.php 2 patches
Indentation   +248 added lines, -248 removed lines patch added patch discarded remove patch
@@ -39,276 +39,276 @@
 block discarded – undo
39 39
 use Sabre\DAV\Exception\Locked;
40 40
 
41 41
 class Directory extends \OCA\DAV\Connector\Sabre\Node
42
-	implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota {
42
+    implements \Sabre\DAV\ICollection, \Sabre\DAV\IQuota {
43 43
 
44
-	/**
45
-	 * Cached directory content
46
-	 *
47
-	 * @var \OCP\Files\FileInfo[]
48
-	 */
49
-	private $dirContent;
44
+    /**
45
+     * Cached directory content
46
+     *
47
+     * @var \OCP\Files\FileInfo[]
48
+     */
49
+    private $dirContent;
50 50
 
51
-	/**
52
-	 * Cached quota info
53
-	 *
54
-	 * @var array
55
-	 */
56
-	private $quotaInfo;
51
+    /**
52
+     * Cached quota info
53
+     *
54
+     * @var array
55
+     */
56
+    private $quotaInfo;
57 57
 
58
-	/**
59
-	 * @var ObjectTree|null
60
-	 */
61
-	private $tree;
58
+    /**
59
+     * @var ObjectTree|null
60
+     */
61
+    private $tree;
62 62
 
63
-	/**
64
-	 * Sets up the node, expects a full path name
65
-	 *
66
-	 * @param \OC\Files\View $view
67
-	 * @param \OCP\Files\FileInfo $info
68
-	 * @param ObjectTree|null $tree
69
-	 * @param \OCP\Share\IManager $shareManager
70
-	 */
71
-	public function __construct($view, $info, $tree = null, $shareManager = null) {
72
-		parent::__construct($view, $info, $shareManager);
73
-		$this->tree = $tree;
74
-	}
63
+    /**
64
+     * Sets up the node, expects a full path name
65
+     *
66
+     * @param \OC\Files\View $view
67
+     * @param \OCP\Files\FileInfo $info
68
+     * @param ObjectTree|null $tree
69
+     * @param \OCP\Share\IManager $shareManager
70
+     */
71
+    public function __construct($view, $info, $tree = null, $shareManager = null) {
72
+        parent::__construct($view, $info, $shareManager);
73
+        $this->tree = $tree;
74
+    }
75 75
 
76
-	/**
77
-	 * Creates a new file in the directory
78
-	 *
79
-	 * Data will either be supplied as a stream resource, or in certain cases
80
-	 * as a string. Keep in mind that you may have to support either.
81
-	 *
82
-	 * After successful creation of the file, you may choose to return the ETag
83
-	 * of the new file here.
84
-	 *
85
-	 * The returned ETag must be surrounded by double-quotes (The quotes should
86
-	 * be part of the actual string).
87
-	 *
88
-	 * If you cannot accurately determine the ETag, you should not return it.
89
-	 * If you don't store the file exactly as-is (you're transforming it
90
-	 * somehow) you should also not return an ETag.
91
-	 *
92
-	 * This means that if a subsequent GET to this new file does not exactly
93
-	 * return the same contents of what was submitted here, you are strongly
94
-	 * recommended to omit the ETag.
95
-	 *
96
-	 * @param string $name Name of the file
97
-	 * @param resource|string $data Initial payload
98
-	 * @return null|string
99
-	 * @throws Exception\EntityTooLarge
100
-	 * @throws Exception\UnsupportedMediaType
101
-	 * @throws FileLocked
102
-	 * @throws InvalidPath
103
-	 * @throws \Sabre\DAV\Exception
104
-	 * @throws \Sabre\DAV\Exception\BadRequest
105
-	 * @throws \Sabre\DAV\Exception\Forbidden
106
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
107
-	 */
108
-	public function createFile($name, $data = null) {
76
+    /**
77
+     * Creates a new file in the directory
78
+     *
79
+     * Data will either be supplied as a stream resource, or in certain cases
80
+     * as a string. Keep in mind that you may have to support either.
81
+     *
82
+     * After successful creation of the file, you may choose to return the ETag
83
+     * of the new file here.
84
+     *
85
+     * The returned ETag must be surrounded by double-quotes (The quotes should
86
+     * be part of the actual string).
87
+     *
88
+     * If you cannot accurately determine the ETag, you should not return it.
89
+     * If you don't store the file exactly as-is (you're transforming it
90
+     * somehow) you should also not return an ETag.
91
+     *
92
+     * This means that if a subsequent GET to this new file does not exactly
93
+     * return the same contents of what was submitted here, you are strongly
94
+     * recommended to omit the ETag.
95
+     *
96
+     * @param string $name Name of the file
97
+     * @param resource|string $data Initial payload
98
+     * @return null|string
99
+     * @throws Exception\EntityTooLarge
100
+     * @throws Exception\UnsupportedMediaType
101
+     * @throws FileLocked
102
+     * @throws InvalidPath
103
+     * @throws \Sabre\DAV\Exception
104
+     * @throws \Sabre\DAV\Exception\BadRequest
105
+     * @throws \Sabre\DAV\Exception\Forbidden
106
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
107
+     */
108
+    public function createFile($name, $data = null) {
109 109
 
110
-		try {
111
-			// for chunked upload also updating a existing file is a "createFile"
112
-			// because we create all the chunks before re-assemble them to the existing file.
113
-			if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
110
+        try {
111
+            // for chunked upload also updating a existing file is a "createFile"
112
+            // because we create all the chunks before re-assemble them to the existing file.
113
+            if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
114 114
 
115
-				// exit if we can't create a new file and we don't updatable existing file
116
-				$info = \OC_FileChunking::decodeName($name);
117
-				if (!$this->fileView->isCreatable($this->path) &&
118
-					!$this->fileView->isUpdatable($this->path . '/' . $info['name'])
119
-				) {
120
-					throw new \Sabre\DAV\Exception\Forbidden();
121
-				}
115
+                // exit if we can't create a new file and we don't updatable existing file
116
+                $info = \OC_FileChunking::decodeName($name);
117
+                if (!$this->fileView->isCreatable($this->path) &&
118
+                    !$this->fileView->isUpdatable($this->path . '/' . $info['name'])
119
+                ) {
120
+                    throw new \Sabre\DAV\Exception\Forbidden();
121
+                }
122 122
 
123
-			} else {
124
-				// For non-chunked upload it is enough to check if we can create a new file
125
-				if (!$this->fileView->isCreatable($this->path)) {
126
-					throw new \Sabre\DAV\Exception\Forbidden();
127
-				}
128
-			}
123
+            } else {
124
+                // For non-chunked upload it is enough to check if we can create a new file
125
+                if (!$this->fileView->isCreatable($this->path)) {
126
+                    throw new \Sabre\DAV\Exception\Forbidden();
127
+                }
128
+            }
129 129
 
130
-			$this->fileView->verifyPath($this->path, $name);
130
+            $this->fileView->verifyPath($this->path, $name);
131 131
 
132
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
133
-			// using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
134
-			$info = new \OC\Files\FileInfo($path, null, null, array(), null);
135
-			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
136
-			$node->acquireLock(ILockingProvider::LOCK_SHARED);
137
-			return $node->put($data);
138
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
139
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
140
-		} catch (\OCP\Files\InvalidPathException $ex) {
141
-			throw new InvalidPath($ex->getMessage());
142
-		} catch (ForbiddenException $ex) {
143
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
144
-		} catch (LockedException $e) {
145
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
146
-		}
147
-	}
132
+            $path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
133
+            // using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
134
+            $info = new \OC\Files\FileInfo($path, null, null, array(), null);
135
+            $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
136
+            $node->acquireLock(ILockingProvider::LOCK_SHARED);
137
+            return $node->put($data);
138
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
139
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
140
+        } catch (\OCP\Files\InvalidPathException $ex) {
141
+            throw new InvalidPath($ex->getMessage());
142
+        } catch (ForbiddenException $ex) {
143
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
144
+        } catch (LockedException $e) {
145
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
146
+        }
147
+    }
148 148
 
149
-	/**
150
-	 * Creates a new subdirectory
151
-	 *
152
-	 * @param string $name
153
-	 * @throws FileLocked
154
-	 * @throws InvalidPath
155
-	 * @throws \Sabre\DAV\Exception\Forbidden
156
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
157
-	 */
158
-	public function createDirectory($name) {
159
-		try {
160
-			if (!$this->info->isCreatable()) {
161
-				throw new \Sabre\DAV\Exception\Forbidden();
162
-			}
149
+    /**
150
+     * Creates a new subdirectory
151
+     *
152
+     * @param string $name
153
+     * @throws FileLocked
154
+     * @throws InvalidPath
155
+     * @throws \Sabre\DAV\Exception\Forbidden
156
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
157
+     */
158
+    public function createDirectory($name) {
159
+        try {
160
+            if (!$this->info->isCreatable()) {
161
+                throw new \Sabre\DAV\Exception\Forbidden();
162
+            }
163 163
 
164
-			$this->fileView->verifyPath($this->path, $name);
165
-			$newPath = $this->path . '/' . $name;
166
-			if (!$this->fileView->mkdir($newPath)) {
167
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
168
-			}
169
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
170
-			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
171
-		} catch (\OCP\Files\InvalidPathException $ex) {
172
-			throw new InvalidPath($ex->getMessage());
173
-		} catch (ForbiddenException $ex) {
174
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
175
-		} catch (LockedException $e) {
176
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
177
-		}
178
-	}
164
+            $this->fileView->verifyPath($this->path, $name);
165
+            $newPath = $this->path . '/' . $name;
166
+            if (!$this->fileView->mkdir($newPath)) {
167
+                throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
168
+            }
169
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
170
+            throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
171
+        } catch (\OCP\Files\InvalidPathException $ex) {
172
+            throw new InvalidPath($ex->getMessage());
173
+        } catch (ForbiddenException $ex) {
174
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
175
+        } catch (LockedException $e) {
176
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
177
+        }
178
+    }
179 179
 
180
-	/**
181
-	 * Returns a specific child node, referenced by its name
182
-	 *
183
-	 * @param string $name
184
-	 * @param \OCP\Files\FileInfo $info
185
-	 * @return \Sabre\DAV\INode
186
-	 * @throws InvalidPath
187
-	 * @throws \Sabre\DAV\Exception\NotFound
188
-	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
189
-	 */
190
-	public function getChild($name, $info = null) {
191
-		$path = $this->path . '/' . $name;
192
-		if (is_null($info)) {
193
-			try {
194
-				$this->fileView->verifyPath($this->path, $name);
195
-				$info = $this->fileView->getFileInfo($path);
196
-			} catch (\OCP\Files\StorageNotAvailableException $e) {
197
-				throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
198
-			} catch (\OCP\Files\InvalidPathException $ex) {
199
-				throw new InvalidPath($ex->getMessage());
200
-			} catch (ForbiddenException $e) {
201
-				throw new \Sabre\DAV\Exception\Forbidden();
202
-			}
203
-		}
180
+    /**
181
+     * Returns a specific child node, referenced by its name
182
+     *
183
+     * @param string $name
184
+     * @param \OCP\Files\FileInfo $info
185
+     * @return \Sabre\DAV\INode
186
+     * @throws InvalidPath
187
+     * @throws \Sabre\DAV\Exception\NotFound
188
+     * @throws \Sabre\DAV\Exception\ServiceUnavailable
189
+     */
190
+    public function getChild($name, $info = null) {
191
+        $path = $this->path . '/' . $name;
192
+        if (is_null($info)) {
193
+            try {
194
+                $this->fileView->verifyPath($this->path, $name);
195
+                $info = $this->fileView->getFileInfo($path);
196
+            } catch (\OCP\Files\StorageNotAvailableException $e) {
197
+                throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
198
+            } catch (\OCP\Files\InvalidPathException $ex) {
199
+                throw new InvalidPath($ex->getMessage());
200
+            } catch (ForbiddenException $e) {
201
+                throw new \Sabre\DAV\Exception\Forbidden();
202
+            }
203
+        }
204 204
 
205
-		if (!$info) {
206
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
207
-		}
205
+        if (!$info) {
206
+            throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
207
+        }
208 208
 
209
-		if ($info['mimetype'] == 'httpd/unix-directory') {
210
-			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
211
-		} else {
212
-			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info, $this->shareManager);
213
-		}
214
-		if ($this->tree) {
215
-			$this->tree->cacheNode($node);
216
-		}
217
-		return $node;
218
-	}
209
+        if ($info['mimetype'] == 'httpd/unix-directory') {
210
+            $node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
211
+        } else {
212
+            $node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info, $this->shareManager);
213
+        }
214
+        if ($this->tree) {
215
+            $this->tree->cacheNode($node);
216
+        }
217
+        return $node;
218
+    }
219 219
 
220
-	/**
221
-	 * Returns an array with all the child nodes
222
-	 *
223
-	 * @return \Sabre\DAV\INode[]
224
-	 */
225
-	public function getChildren() {
226
-		if (!is_null($this->dirContent)) {
227
-			return $this->dirContent;
228
-		}
229
-		try {
230
-			$folderContent = $this->fileView->getDirectoryContent($this->path);
231
-		} catch (LockedException $e) {
232
-			throw new Locked();
233
-		}
220
+    /**
221
+     * Returns an array with all the child nodes
222
+     *
223
+     * @return \Sabre\DAV\INode[]
224
+     */
225
+    public function getChildren() {
226
+        if (!is_null($this->dirContent)) {
227
+            return $this->dirContent;
228
+        }
229
+        try {
230
+            $folderContent = $this->fileView->getDirectoryContent($this->path);
231
+        } catch (LockedException $e) {
232
+            throw new Locked();
233
+        }
234 234
 
235
-		$nodes = array();
236
-		foreach ($folderContent as $info) {
237
-			$node = $this->getChild($info->getName(), $info);
238
-			$nodes[] = $node;
239
-		}
240
-		$this->dirContent = $nodes;
241
-		return $this->dirContent;
242
-	}
235
+        $nodes = array();
236
+        foreach ($folderContent as $info) {
237
+            $node = $this->getChild($info->getName(), $info);
238
+            $nodes[] = $node;
239
+        }
240
+        $this->dirContent = $nodes;
241
+        return $this->dirContent;
242
+    }
243 243
 
244
-	/**
245
-	 * Checks if a child exists.
246
-	 *
247
-	 * @param string $name
248
-	 * @return bool
249
-	 */
250
-	public function childExists($name) {
251
-		// note: here we do NOT resolve the chunk file name to the real file name
252
-		// to make sure we return false when checking for file existence with a chunk
253
-		// file name.
254
-		// This is to make sure that "createFile" is still triggered
255
-		// (required old code) instead of "updateFile".
256
-		//
257
-		// TODO: resolve chunk file name here and implement "updateFile"
258
-		$path = $this->path . '/' . $name;
259
-		return $this->fileView->file_exists($path);
244
+    /**
245
+     * Checks if a child exists.
246
+     *
247
+     * @param string $name
248
+     * @return bool
249
+     */
250
+    public function childExists($name) {
251
+        // note: here we do NOT resolve the chunk file name to the real file name
252
+        // to make sure we return false when checking for file existence with a chunk
253
+        // file name.
254
+        // This is to make sure that "createFile" is still triggered
255
+        // (required old code) instead of "updateFile".
256
+        //
257
+        // TODO: resolve chunk file name here and implement "updateFile"
258
+        $path = $this->path . '/' . $name;
259
+        return $this->fileView->file_exists($path);
260 260
 
261
-	}
261
+    }
262 262
 
263
-	/**
264
-	 * Deletes all files in this directory, and then itself
265
-	 *
266
-	 * @return void
267
-	 * @throws FileLocked
268
-	 * @throws \Sabre\DAV\Exception\Forbidden
269
-	 */
270
-	public function delete() {
263
+    /**
264
+     * Deletes all files in this directory, and then itself
265
+     *
266
+     * @return void
267
+     * @throws FileLocked
268
+     * @throws \Sabre\DAV\Exception\Forbidden
269
+     */
270
+    public function delete() {
271 271
 
272
-		if ($this->path === '' || $this->path === '/' || !$this->info->isDeletable()) {
273
-			throw new \Sabre\DAV\Exception\Forbidden();
274
-		}
272
+        if ($this->path === '' || $this->path === '/' || !$this->info->isDeletable()) {
273
+            throw new \Sabre\DAV\Exception\Forbidden();
274
+        }
275 275
 
276
-		try {
277
-			if (!$this->fileView->rmdir($this->path)) {
278
-				// assume it wasn't possible to remove due to permission issue
279
-				throw new \Sabre\DAV\Exception\Forbidden();
280
-			}
281
-		} catch (ForbiddenException $ex) {
282
-			throw new Forbidden($ex->getMessage(), $ex->getRetry());
283
-		} catch (LockedException $e) {
284
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
285
-		}
286
-	}
276
+        try {
277
+            if (!$this->fileView->rmdir($this->path)) {
278
+                // assume it wasn't possible to remove due to permission issue
279
+                throw new \Sabre\DAV\Exception\Forbidden();
280
+            }
281
+        } catch (ForbiddenException $ex) {
282
+            throw new Forbidden($ex->getMessage(), $ex->getRetry());
283
+        } catch (LockedException $e) {
284
+            throw new FileLocked($e->getMessage(), $e->getCode(), $e);
285
+        }
286
+    }
287 287
 
288
-	/**
289
-	 * Returns available diskspace information
290
-	 *
291
-	 * @return array
292
-	 */
293
-	public function getQuotaInfo() {
294
-		if ($this->quotaInfo) {
295
-			return $this->quotaInfo;
296
-		}
297
-		try {
298
-			$storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info);
299
-			if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
300
-				$free = \OCP\Files\FileInfo::SPACE_UNLIMITED;
301
-			} else {
302
-				$free = $storageInfo['free'];
303
-			}
304
-			$this->quotaInfo = array(
305
-				$storageInfo['used'],
306
-				$free
307
-			);
308
-			return $this->quotaInfo;
309
-		} catch (\OCP\Files\StorageNotAvailableException $e) {
310
-			return array(0, 0);
311
-		}
312
-	}
288
+    /**
289
+     * Returns available diskspace information
290
+     *
291
+     * @return array
292
+     */
293
+    public function getQuotaInfo() {
294
+        if ($this->quotaInfo) {
295
+            return $this->quotaInfo;
296
+        }
297
+        try {
298
+            $storageInfo = \OC_Helper::getStorageInfo($this->info->getPath(), $this->info);
299
+            if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
300
+                $free = \OCP\Files\FileInfo::SPACE_UNLIMITED;
301
+            } else {
302
+                $free = $storageInfo['free'];
303
+            }
304
+            $this->quotaInfo = array(
305
+                $storageInfo['used'],
306
+                $free
307
+            );
308
+            return $this->quotaInfo;
309
+        } catch (\OCP\Files\StorageNotAvailableException $e) {
310
+            return array(0, 0);
311
+        }
312
+    }
313 313
 
314 314
 }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 				// exit if we can't create a new file and we don't updatable existing file
116 116
 				$info = \OC_FileChunking::decodeName($name);
117 117
 				if (!$this->fileView->isCreatable($this->path) &&
118
-					!$this->fileView->isUpdatable($this->path . '/' . $info['name'])
118
+					!$this->fileView->isUpdatable($this->path.'/'.$info['name'])
119 119
 				) {
120 120
 					throw new \Sabre\DAV\Exception\Forbidden();
121 121
 				}
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 
130 130
 			$this->fileView->verifyPath($this->path, $name);
131 131
 
132
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
132
+			$path = $this->fileView->getAbsolutePath($this->path).'/'.$name;
133 133
 			// using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
134 134
 			$info = new \OC\Files\FileInfo($path, null, null, array(), null);
135 135
 			$node = new \OCA\DAV\Connector\Sabre\File($this->fileView, $info);
@@ -162,9 +162,9 @@  discard block
 block discarded – undo
162 162
 			}
163 163
 
164 164
 			$this->fileView->verifyPath($this->path, $name);
165
-			$newPath = $this->path . '/' . $name;
165
+			$newPath = $this->path.'/'.$name;
166 166
 			if (!$this->fileView->mkdir($newPath)) {
167
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
167
+				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath);
168 168
 			}
169 169
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
170 170
 			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
189 189
 	 */
190 190
 	public function getChild($name, $info = null) {
191
-		$path = $this->path . '/' . $name;
191
+		$path = $this->path.'/'.$name;
192 192
 		if (is_null($info)) {
193 193
 			try {
194 194
 				$this->fileView->verifyPath($this->path, $name);
@@ -203,7 +203,7 @@  discard block
 block discarded – undo
203 203
 		}
204 204
 
205 205
 		if (!$info) {
206
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
206
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
207 207
 		}
208 208
 
209 209
 		if ($info['mimetype'] == 'httpd/unix-directory') {
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
255 255
 		// (required old code) instead of "updateFile".
256 256
 		//
257 257
 		// TODO: resolve chunk file name here and implement "updateFile"
258
-		$path = $this->path . '/' . $name;
258
+		$path = $this->path.'/'.$name;
259 259
 		return $this->fileView->file_exists($path);
260 260
 
261 261
 	}
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/BlockLegacyClientPlugin.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 */
65 65
 	public function beforeHandler(RequestInterface $request) {
66 66
 		$userAgent = $request->getHeader('User-Agent');
67
-		if($userAgent === null) {
67
+		if ($userAgent === null) {
68 68
 			return;
69 69
 		}
70 70
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 		// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
74 74
 		// "mirall/%1" for older releases
75 75
 		preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
76
-		if(isset($versionMatches[1]) &&
76
+		if (isset($versionMatches[1]) &&
77 77
 			version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
78 78
 			throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
79 79
 		}
Please login to merge, or discard this patch.
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -35,47 +35,47 @@
 block discarded – undo
35 35
  * @package OCA\DAV\Connector\Sabre
36 36
  */
37 37
 class BlockLegacyClientPlugin extends ServerPlugin {
38
-	/** @var \Sabre\DAV\Server */
39
-	protected $server;
40
-	/** @var IConfig */
41
-	protected $config;
38
+    /** @var \Sabre\DAV\Server */
39
+    protected $server;
40
+    /** @var IConfig */
41
+    protected $config;
42 42
 
43
-	/**
44
-	 * @param IConfig $config
45
-	 */
46
-	public function __construct(IConfig $config) {
47
-		$this->config = $config;
48
-	}
43
+    /**
44
+     * @param IConfig $config
45
+     */
46
+    public function __construct(IConfig $config) {
47
+        $this->config = $config;
48
+    }
49 49
 
50
-	/**
51
-	 * @param \Sabre\DAV\Server $server
52
-	 * @return void
53
-	 */
54
-	public function initialize(\Sabre\DAV\Server $server) {
55
-		$this->server = $server;
56
-		$this->server->on('beforeMethod', [$this, 'beforeHandler'], 200);
57
-	}
50
+    /**
51
+     * @param \Sabre\DAV\Server $server
52
+     * @return void
53
+     */
54
+    public function initialize(\Sabre\DAV\Server $server) {
55
+        $this->server = $server;
56
+        $this->server->on('beforeMethod', [$this, 'beforeHandler'], 200);
57
+    }
58 58
 
59
-	/**
60
-	 * Detects all unsupported clients and throws a \Sabre\DAV\Exception\Forbidden
61
-	 * exception which will result in a 403 to them.
62
-	 * @param RequestInterface $request
63
-	 * @throws \Sabre\DAV\Exception\Forbidden If the client version is not supported
64
-	 */
65
-	public function beforeHandler(RequestInterface $request) {
66
-		$userAgent = $request->getHeader('User-Agent');
67
-		if($userAgent === null) {
68
-			return;
69
-		}
59
+    /**
60
+     * Detects all unsupported clients and throws a \Sabre\DAV\Exception\Forbidden
61
+     * exception which will result in a 403 to them.
62
+     * @param RequestInterface $request
63
+     * @throws \Sabre\DAV\Exception\Forbidden If the client version is not supported
64
+     */
65
+    public function beforeHandler(RequestInterface $request) {
66
+        $userAgent = $request->getHeader('User-Agent');
67
+        if($userAgent === null) {
68
+            return;
69
+        }
70 70
 
71
-		$minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '1.7.0');
71
+        $minimumSupportedDesktopVersion = $this->config->getSystemValue('minimum.supported.desktop.version', '1.7.0');
72 72
 
73
-		// Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
74
-		// "mirall/%1" for older releases
75
-		preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
76
-		if(isset($versionMatches[1]) &&
77
-			version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
78
-			throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
79
-		}
80
-	}
73
+        // Match on the mirall version which is in scheme "Mozilla/5.0 (%1) mirall/%2" or
74
+        // "mirall/%1" for older releases
75
+        preg_match("/(?:mirall\\/)([\d.]+)/i", $userAgent, $versionMatches);
76
+        if(isset($versionMatches[1]) &&
77
+            version_compare($versionMatches[1], $minimumSupportedDesktopVersion) === -1) {
78
+            throw new \Sabre\DAV\Exception\Forbidden('Unsupported client version.');
79
+        }
80
+    }
81 81
 }
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/CommentPropertiesPlugin.php 2 patches
Indentation   +98 added lines, -98 removed lines patch added patch discarded remove patch
@@ -29,103 +29,103 @@
 block discarded – undo
29 29
 
30 30
 class CommentPropertiesPlugin extends ServerPlugin {
31 31
 
32
-	const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
33
-	const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
34
-	const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
35
-
36
-	/** @var  \Sabre\DAV\Server */
37
-	protected $server;
38
-
39
-	/** @var ICommentsManager */
40
-	private $commentsManager;
41
-
42
-	/** @var IUserSession */
43
-	private $userSession;
44
-
45
-	public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
46
-		$this->commentsManager = $commentsManager;
47
-		$this->userSession = $userSession;
48
-	}
49
-
50
-	/**
51
-	 * This initializes the plugin.
52
-	 *
53
-	 * This function is called by Sabre\DAV\Server, after
54
-	 * addPlugin is called.
55
-	 *
56
-	 * This method should set up the required event subscriptions.
57
-	 *
58
-	 * @param \Sabre\DAV\Server $server
59
-	 * @return void
60
-	 */
61
-	function initialize(\Sabre\DAV\Server $server) {
62
-		$this->server = $server;
63
-		$this->server->on('propFind', array($this, 'handleGetProperties'));
64
-	}
65
-
66
-	/**
67
-	 * Adds tags and favorites properties to the response,
68
-	 * if requested.
69
-	 *
70
-	 * @param PropFind $propFind
71
-	 * @param \Sabre\DAV\INode $node
72
-	 * @return void
73
-	 */
74
-	public function handleGetProperties(
75
-		PropFind $propFind,
76
-		\Sabre\DAV\INode $node
77
-	) {
78
-		if (!($node instanceof File) && !($node instanceof Directory)) {
79
-			return;
80
-		}
81
-
82
-		$propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {
83
-			return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()));
84
-		});
85
-
86
-		$propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {
87
-			return $this->getCommentsLink($node);
88
-		});
89
-
90
-		$propFind->handle(self::PROPERTY_NAME_UNREAD, function() use ($node) {
91
-			return $this->getUnreadCount($node);
92
-		});
93
-	}
94
-
95
-	/**
96
-	 * returns a reference to the comments node
97
-	 *
98
-	 * @param Node $node
99
-	 * @return mixed|string
100
-	 */
101
-	public function getCommentsLink(Node $node) {
102
-		$href =  $this->server->getBaseUri();
103
-		$entryPoint = strpos($href, '/remote.php/');
104
-		if($entryPoint === false) {
105
-			// in case we end up somewhere else, unexpectedly.
106
-			return null;
107
-		}
108
-		$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
109
-		$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
110
-		return $href;
111
-	}
112
-
113
-	/**
114
-	 * returns the number of unread comments for the currently logged in user
115
-	 * on the given file or directory node
116
-	 *
117
-	 * @param Node $node
118
-	 * @return Int|null
119
-	 */
120
-	public function getUnreadCount(Node $node) {
121
-		$user = $this->userSession->getUser();
122
-		if(is_null($user)) {
123
-			return null;
124
-		}
125
-
126
-		$lastRead = $this->commentsManager->getReadMark('files', strval($node->getId()), $user);
127
-
128
-		return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()), $lastRead);
129
-	}
32
+    const PROPERTY_NAME_HREF   = '{http://owncloud.org/ns}comments-href';
33
+    const PROPERTY_NAME_COUNT  = '{http://owncloud.org/ns}comments-count';
34
+    const PROPERTY_NAME_UNREAD = '{http://owncloud.org/ns}comments-unread';
35
+
36
+    /** @var  \Sabre\DAV\Server */
37
+    protected $server;
38
+
39
+    /** @var ICommentsManager */
40
+    private $commentsManager;
41
+
42
+    /** @var IUserSession */
43
+    private $userSession;
44
+
45
+    public function __construct(ICommentsManager $commentsManager, IUserSession $userSession) {
46
+        $this->commentsManager = $commentsManager;
47
+        $this->userSession = $userSession;
48
+    }
49
+
50
+    /**
51
+     * This initializes the plugin.
52
+     *
53
+     * This function is called by Sabre\DAV\Server, after
54
+     * addPlugin is called.
55
+     *
56
+     * This method should set up the required event subscriptions.
57
+     *
58
+     * @param \Sabre\DAV\Server $server
59
+     * @return void
60
+     */
61
+    function initialize(\Sabre\DAV\Server $server) {
62
+        $this->server = $server;
63
+        $this->server->on('propFind', array($this, 'handleGetProperties'));
64
+    }
65
+
66
+    /**
67
+     * Adds tags and favorites properties to the response,
68
+     * if requested.
69
+     *
70
+     * @param PropFind $propFind
71
+     * @param \Sabre\DAV\INode $node
72
+     * @return void
73
+     */
74
+    public function handleGetProperties(
75
+        PropFind $propFind,
76
+        \Sabre\DAV\INode $node
77
+    ) {
78
+        if (!($node instanceof File) && !($node instanceof Directory)) {
79
+            return;
80
+        }
81
+
82
+        $propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) {
83
+            return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()));
84
+        });
85
+
86
+        $propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) {
87
+            return $this->getCommentsLink($node);
88
+        });
89
+
90
+        $propFind->handle(self::PROPERTY_NAME_UNREAD, function() use ($node) {
91
+            return $this->getUnreadCount($node);
92
+        });
93
+    }
94
+
95
+    /**
96
+     * returns a reference to the comments node
97
+     *
98
+     * @param Node $node
99
+     * @return mixed|string
100
+     */
101
+    public function getCommentsLink(Node $node) {
102
+        $href =  $this->server->getBaseUri();
103
+        $entryPoint = strpos($href, '/remote.php/');
104
+        if($entryPoint === false) {
105
+            // in case we end up somewhere else, unexpectedly.
106
+            return null;
107
+        }
108
+        $commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
109
+        $href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
110
+        return $href;
111
+    }
112
+
113
+    /**
114
+     * returns the number of unread comments for the currently logged in user
115
+     * on the given file or directory node
116
+     *
117
+     * @param Node $node
118
+     * @return Int|null
119
+     */
120
+    public function getUnreadCount(Node $node) {
121
+        $user = $this->userSession->getUser();
122
+        if(is_null($user)) {
123
+            return null;
124
+        }
125
+
126
+        $lastRead = $this->commentsManager->getReadMark('files', strval($node->getId()), $user);
127
+
128
+        return $this->commentsManager->getNumberOfCommentsForObject('files', strval($node->getId()), $lastRead);
129
+    }
130 130
 
131 131
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -99,13 +99,13 @@  discard block
 block discarded – undo
99 99
 	 * @return mixed|string
100 100
 	 */
101 101
 	public function getCommentsLink(Node $node) {
102
-		$href =  $this->server->getBaseUri();
102
+		$href = $this->server->getBaseUri();
103 103
 		$entryPoint = strpos($href, '/remote.php/');
104
-		if($entryPoint === false) {
104
+		if ($entryPoint === false) {
105 105
 			// in case we end up somewhere else, unexpectedly.
106 106
 			return null;
107 107
 		}
108
-		$commentsPart = 'dav/comments/files/' . rawurldecode($node->getId());
108
+		$commentsPart = 'dav/comments/files/'.rawurldecode($node->getId());
109 109
 		$href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/'));
110 110
 		return $href;
111 111
 	}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	public function getUnreadCount(Node $node) {
121 121
 		$user = $this->userSession->getUser();
122
-		if(is_null($user)) {
122
+		if (is_null($user)) {
123 123
 			return null;
124 124
 		}
125 125
 
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/Server.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -34,12 +34,12 @@
 block discarded – undo
34 34
  */
35 35
 class Server extends \Sabre\DAV\Server {
36 36
 
37
-	/**
38
-	 * @see \Sabre\DAV\Server
39
-	 */
40
-	public function __construct($treeOrNode = null) {
41
-		parent::__construct($treeOrNode);
42
-		self::$exposeVersion = false;
43
-		$this->enablePropfindDepthInfinity = true;
44
-	}
37
+    /**
38
+     * @see \Sabre\DAV\Server
39
+     */
40
+    public function __construct($treeOrNode = null) {
41
+        parent::__construct($treeOrNode);
42
+        self::$exposeVersion = false;
43
+        $this->enablePropfindDepthInfinity = true;
44
+    }
45 45
 }
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/LockPlugin.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -34,53 +34,53 @@
 block discarded – undo
34 34
 use Sabre\HTTP\RequestInterface;
35 35
 
36 36
 class LockPlugin extends ServerPlugin {
37
-	/**
38
-	 * Reference to main server object
39
-	 *
40
-	 * @var \Sabre\DAV\Server
41
-	 */
42
-	private $server;
37
+    /**
38
+     * Reference to main server object
39
+     *
40
+     * @var \Sabre\DAV\Server
41
+     */
42
+    private $server;
43 43
 
44
-	/**
45
-	 * {@inheritdoc}
46
-	 */
47
-	public function initialize(\Sabre\DAV\Server $server) {
48
-		$this->server = $server;
49
-		$this->server->on('beforeMethod', [$this, 'getLock'], 50);
50
-		$this->server->on('afterMethod', [$this, 'releaseLock'], 50);
51
-	}
44
+    /**
45
+     * {@inheritdoc}
46
+     */
47
+    public function initialize(\Sabre\DAV\Server $server) {
48
+        $this->server = $server;
49
+        $this->server->on('beforeMethod', [$this, 'getLock'], 50);
50
+        $this->server->on('afterMethod', [$this, 'releaseLock'], 50);
51
+    }
52 52
 
53
-	public function getLock(RequestInterface $request) {
54
-		// we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
55
-		// so instead we limit ourselves to the PUT method manually
56
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
57
-			return;
58
-		}
59
-		try {
60
-			$node = $this->server->tree->getNodeForPath($request->getPath());
61
-		} catch (NotFound $e) {
62
-			return;
63
-		}
64
-		if ($node instanceof Node) {
65
-			try {
66
-				$node->acquireLock(ILockingProvider::LOCK_SHARED);
67
-			} catch (LockedException $e) {
68
-				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
69
-			}
70
-		}
71
-	}
53
+    public function getLock(RequestInterface $request) {
54
+        // we can't listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
55
+        // so instead we limit ourselves to the PUT method manually
56
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
57
+            return;
58
+        }
59
+        try {
60
+            $node = $this->server->tree->getNodeForPath($request->getPath());
61
+        } catch (NotFound $e) {
62
+            return;
63
+        }
64
+        if ($node instanceof Node) {
65
+            try {
66
+                $node->acquireLock(ILockingProvider::LOCK_SHARED);
67
+            } catch (LockedException $e) {
68
+                throw new FileLocked($e->getMessage(), $e->getCode(), $e);
69
+            }
70
+        }
71
+    }
72 72
 
73
-	public function releaseLock(RequestInterface $request) {
74
-		if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
75
-			return;
76
-		}
77
-		try {
78
-			$node = $this->server->tree->getNodeForPath($request->getPath());
79
-		} catch (NotFound $e) {
80
-			return;
81
-		}
82
-		if ($node instanceof Node) {
83
-			$node->releaseLock(ILockingProvider::LOCK_SHARED);
84
-		}
85
-	}
73
+    public function releaseLock(RequestInterface $request) {
74
+        if ($request->getMethod() !== 'PUT' || isset($_SERVER['HTTP_OC_CHUNKED'])) {
75
+            return;
76
+        }
77
+        try {
78
+            $node = $this->server->tree->getNodeForPath($request->getPath());
79
+        } catch (NotFound $e) {
80
+            return;
81
+        }
82
+        if ($node instanceof Node) {
83
+            $node->releaseLock(ILockingProvider::LOCK_SHARED);
84
+        }
85
+    }
86 86
 }
Please login to merge, or discard this patch.