1 files changed, 33 insertions, 29 deletions
diff --git a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
index 49359a045..545ad5633 100644
--- a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
@@ -4,9 +4,9 @@ namespace Sabre\DAV\Browser;
 
 use Sabre\DAV;
 use Sabre\DAV\MkCol;
-use Sabre\HTTP\URLUtil;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
+use Sabre\HTTP\URLUtil;
 
 /**
  * Browser Plugin
@@ -26,7 +26,7 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * reference to server class
      *
-     * @var Sabre\DAV\Server
+     * @var DAV\Server
      */
     protected $server;
 
@@ -112,7 +112,7 @@ class Plugin extends DAV\ServerPlugin {
         $getVars = $request->getQueryParameters();
 
         // CSP headers
-        $this->server->httpResponse->setHeader('Content-Security-Policy', "default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';");
+        $response->setHeader('Content-Security-Policy', "default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';");
 
         $sabreAction = isset($getVars['sabreAction']) ? $getVars['sabreAction'] : null;
 
@@ -317,7 +317,7 @@ class Plugin extends DAV\ServerPlugin {
 
                 $buttonActions = '';
                 if ($subProps['subNode'] instanceof DAV\IFile) {
-                    $buttonActions =  '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
+                    $buttonActions = '<a href="' . $this->escapeHTML($subProps['fullPath']) . '?sabreAction=info"><span class="oi" data-glyph="info"></span></a>';
                 }
                 $this->server->emit('browserButtonActions', [$subProps['fullPath'], $subProps['subNode'], &$buttonActions]);
 
@@ -414,11 +414,14 @@ class Plugin extends DAV\ServerPlugin {
      *
      * @param string $title
      * @param string $path
-     * @return void
+     * @return string
      */
     function generateHeader($title, $path = null) {
 
-        $version = DAV\Version::VERSION;
+        $version = '';
+        if (DAV\Server::$exposeVersion) {
+            $version = DAV\Version::VERSION;
+        }
 
         $vars = [
             'title'     => $this->escapeHTML($title),
@@ -475,7 +478,10 @@ HTML;
      */
     function generateFooter() {
 
-        $version = DAV\Version::VERSION;
+        $version = '';
+        if (DAV\Server::$exposeVersion) {
+            $version = DAV\Version::VERSION;
+        }
         return <<<HTML
 <footer>Generated by SabreDAV $version (c)2007-2016 <a href="http://sabre.io/">http://sabre.io/</a></footer>
 </body>
@@ -506,23 +512,21 @@ HTML;
         if (get_class($node) === 'Sabre\\DAV\\SimpleCollection')
             return;
 
-        ob_start();
-        echo '<form method="post" action="">
-        <h3>Create new folder</h3>
-        <input type="hidden" name="sabreAction" value="mkcol" />
-        <label>Name:</label> <input type="text" name="name" /><br />
-        <input type="submit" value="create" />
-        </form>
-        <form method="post" action="" enctype="multipart/form-data">
-        <h3>Upload file</h3>
-        <input type="hidden" name="sabreAction" value="put" />
-        <label>Name (optional):</label> <input type="text" name="name" /><br />
-        <label>File:</label> <input type="file" name="file" /><br />
-        <input type="submit" value="upload" />
-        </form>
-        ';
-
-        $output .= ob_get_clean();
+        $output .= <<<HTML
+<form method="post" action="">
+<h3>Create new folder</h3>
+<input type="hidden" name="sabreAction" value="mkcol" />
+<label>Name:</label> <input type="text" name="name" /><br />
+<input type="submit" value="create" />
+</form>
+<form method="post" action="" enctype="multipart/form-data">
+<h3>Upload file</h3>
+<input type="hidden" name="sabreAction" value="put" />
+<label>Name (optional):</label> <input type="text" name="name" /><br />
+<label>File:</label> <input type="file" name="file" /><br />
+<input type="submit" value="upload" />
+</form>
+HTML;
 
     }
 
@@ -543,8 +547,8 @@ HTML;
      * This method returns a local pathname to an asset.
      *
      * @param string $assetName
-     * @return string
      * @throws DAV\Exception\NotFound
+     * @return string
      */
     protected function getLocalAssetPath($assetName) {
 
@@ -575,9 +579,9 @@ HTML;
         // Rudimentary mime type detection
         $mime = 'application/octet-stream';
         $map = [
-            'ico'  => 'image/vnd.microsoft.icon',
-            'png'  => 'image/png',
-            'css'  => 'text/css',
+            'ico' => 'image/vnd.microsoft.icon',
+            'png' => 'image/png',
+            'css' => 'text/css',
         ];
 
         $ext = substr($assetName, strrpos($assetName, '.') + 1);
@@ -623,7 +627,7 @@ HTML;
      * Maps a resource type to a human-readable string and icon.
      *
      * @param array $resourceTypes
-     * @param INode $node
+     * @param DAV\INode $node
      * @return array
      */
     private function mapResourceType(array $resourceTypes, $node) {