diff --git a/appinfo/info.xml b/appinfo/info.xml index cfb2310..f71bb8f 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -31,7 +31,7 @@ Additionally, the community document server only supports running on x86-64 Linu https://raw.githubusercontent.com/nextcloud/documentserver_community/master/screenshots/main.png https://raw.githubusercontent.com/nextcloud/documentserver_community/master/screenshots/new.png - + diff --git a/lib/Controller/StaticController.php b/lib/Controller/StaticController.php index 38af7d7..a902fb8 100644 --- a/lib/Controller/StaticController.php +++ b/lib/Controller/StaticController.php @@ -96,8 +96,6 @@ public function webApps(string $path) { $rawContent = file_get_contents($localPath); $content = str_replace('__HINT__', addcslashes($hint, "'"), $rawContent); return $this->createFileResponseWithContent($localPath, $content, false); - } elseif ($this->sessionManager->getSessionCount() >= 20) { - $localPath = __DIR__ . '/../../js/sessionlimit.js'; } } diff --git a/lib/FileResponse.php b/lib/FileResponse.php index 4d4a4a0..d991092 100644 --- a/lib/FileResponse.php +++ b/lib/FileResponse.php @@ -37,7 +37,7 @@ public function __construct($data, int $length, int $lastModified, string $mimeT $this->data = $data; $this->name = $name; $this->setStatus($statusCode); - $this->setHeaders(array_merge($this->getHeaders(), $headers)); + $this->setHeaders($headers); $this->addHeader('Content-Length', $length); $this->addHeader('Content-Type', $mimeType); diff --git a/lib/XHRCommand/AuthCommand.php b/lib/XHRCommand/AuthCommand.php index 4baaf60..2d1d58a 100644 --- a/lib/XHRCommand/AuthCommand.php +++ b/lib/XHRCommand/AuthCommand.php @@ -32,8 +32,6 @@ use OCA\DocumentServer\OnlyOffice\WebVersion; class AuthCommand implements ICommandHandler { - public const MAX_CONNECTIONS = 20; - private $changeStore; private $sessionManager; private $lockStore; @@ -75,15 +73,6 @@ public function handle(array $command, Session $session, IIPCChannel $sessionCha $participants = $this->sessionManager->getSessionsForDocument($session->getDocumentId()); - if (count($participants) > self::MAX_CONNECTIONS) { - $sessionChannel->pushMessage(json_encode([ - 'type' => 'auth', - 'result' => 0, - ])); - - return; - } - $sessionChannel->pushMessage(json_encode([ 'type' => 'auth', 'result' => 1, diff --git a/lib/XHRResponse.php b/lib/XHRResponse.php index 6983c4a..c3bea50 100644 --- a/lib/XHRResponse.php +++ b/lib/XHRResponse.php @@ -41,7 +41,7 @@ public function __construct( $this->type = $type; $this->data = $data; $this->setStatus($statusCode); - $this->setHeaders(array_merge($this->getHeaders(), $headers)); + $this->setHeaders($headers); $this->addHeader('Content-Type', 'application/javascript; charset=UTF-8'); }