Merge pull request #53 from ONLYOFFICE/develop

Hotfix/2.2.2
ONLYOFFICE · Aug 31, 2021 · 4deddc4 · 4deddc4
2 parents ce39393 + 0cc5462
commit 4deddc4
Show file tree

Hide file tree

Showing 22 changed files with 106 additions and 103 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 2.2.2
+## Fixed
+- Fixed JWT
+
 ## 2.2.1
 ## Fixed
 - Fixed French and Italian translations

diff --git a/controllers/BackendController.php b/controllers/BackendController.php
@@ -84,8 +84,11 @@ public function actionTrack()
                 $token = null;
                 if (!empty($data["token"])) {
                     $token = $data["token"];
-                } else if (!empty($_SERVER['HTTP_AUTHORIZATION'])) {
-                    $token = substr($_SERVER['HTTP_AUTHORIZATION'], strlen('Bearer '));
+                } else {
+                    $header = Yii::$app->request->headers->get('Authorization');
+                    if (!empty($header)) {
+                        $token = substr($header, strlen('Bearer '));
+                    }
                 }
 
                 if (empty($token)) {
@@ -94,7 +97,7 @@ public function actionTrack()
 
                 try {
                     $ds = JWT::decode($token, $module->getJwtSecret(), array('HS256'));
-                    $data = (array)$ds->payload;
+                    $data = isset($ds->payload) ? (array)$ds->payload : (array)$ds;
                 } catch (\Exception $ex) {
                     throw new \Exception('Invalid JWT signature');
                 }

diff --git a/messages/de/base.php b/messages/de/base.php
@@ -18,10 +18,10 @@
  */
 return [
     '<strong>Create</strong> document' => 'Dokument <strong>erstellen</strong> ',
-    '<strong>DocumentServer</strong> not accessible.' => '<strong>DocumentServer</strong> nicht erreichbar',
-    '<strong>DocumentServer</strong> not configured yet.' => '<strong>DocumentServer</strong> wurde noch nicht konfiguriert.',
-    '<strong>DocumentServer</strong> successfully connected! - Installed version: {version}' => 'Erfolgreich mit dem <strong>DocumentServer</strong> verbunden! – Installierte Version: {version}',
-    '<strong>ONLYOFFICE - DocumentServer</strong> module configuration' => '<strong>ONLYOFFICE – DocumentServer</strong> Modul-Konfiguration',
+    '<strong>ONLYOFFICE Docs</strong> not accessible.' => '<strong>ONLYOFFICE Docs</strong> nicht erreichbar',
+    '<strong>ONLYOFFICE Docs</strong> not configured yet.' => '<strong>ONLYOFFICE Docs</strong> wurde noch nicht konfiguriert.',
+    '<strong>ONLYOFFICE Docs</strong> successfully connected! - Installed version: {version}' => 'Erfolgreich mit dem <strong>ONLYOFFICE Docs</strong> verbunden! – Installierte Version: {version}',
+    '<strong>ONLYOFFICE - Docs</strong> module configuration' => '<strong>ONLYOFFICE – Docs</strong> Modul-Konfiguration',
     '<strong>Share</strong> document' => 'Dokument <strong>teilen</strong>',
     'Close' => 'Schließen',
     'Copy to clipboard' => 'In die Zwischenablage kopieren',
@@ -36,7 +36,7 @@
     'You can simply share this document using a direct link. The user does not need an valid user account on the platform.' => 'Du kannst dieses Dokument einfach über einen direkten Link teilen. Der Nutzer benötigt kein gültiges Benutzerkonto auf der Plattform.',
     'e.g. http://documentserver' => 'z.B. http://documentserver',
     '<strong>Convert</strong> document' => 'Dokument <strong>konvertieren</strong>',
-    '<strong>DocumentServer</strong> invalid JWT token.' => '<strong>DocumentServer</strong> ungültiges JWT-Token.',
+    '<strong>ONLYOFFICE Docs</strong> invalid JWT token.' => '<strong>ONLYOFFICE Docs</strong> ungültiges JWT-Token.',
     'Convert document' => 'Dokument konvertieren',
     'Converting <strong>{oldFileName}</strong> to <strong>{newFileName}</strong>..' => 'Konvertieren <strong>{oldFileName}</strong> zu <strong>{newFileName}</strong>..',
     'Create document <small>(Text, Spreadsheet, Presentation)</small>' => 'Dokument erstellen <small>(Text, Tabellenkalkulation, Präsentation)</small>',
@@ -47,8 +47,8 @@
     'JWT Secret key (leave blank to disable)' => 'JWT geheimer Schlüssel (zum Deaktivieren leer lassen)',
     'Share' => 'Freigeben',
     'View document' => 'Dokument anzeigen',
-    'Document Editing Service address for internal requests from the server' => 'Serviceadresse der Dokumentbearbeitung für interne Anforderungen vom Server',
-    'Server address for internal requests from the Document Editing Service' => 'Serveradresse für interne Anforderungen vom Dokumentbearbeitung-Service',
+    'ONLYOFFICE Docs address for internal requests from the server' => 'Die Adresse von ONLYOFFICE Docs für interne Anforderungen vom Server',
+    'Server address for internal requests from ONLYOFFICE Docs' => 'Serveradresse für interne Anforderungen  vom ONLYOFFICE Docs',
     'Can use ONLYOFFICE' => 'Kann ONLYOFFICE benutzen',
     'Allows the user to use ONLYOFFICE.' => 'Erlaubt diesem Benutzer Arbeit in ONLYOFFICE.',
 ];
diff --git a/messages/fi/base.php b/messages/fi/base.php
@@ -18,10 +18,10 @@
  */
 return [
     '<strong>Create</strong> document' => '<strong>Luo</strong> tiedosto',
-    '<strong>DocumentServer</strong> not accessible.' => '<strong>DocumentServer</strong> ei yhteyttä.',
-    '<strong>DocumentServer</strong> not configured yet.' => '<strong>DocumentServer</strong> ei määritetty.',
-    '<strong>DocumentServer</strong> successfully connected! - Installed version: {version}' => '<strong>DocumentServer</strong> yhdistetty! - Versio: {version}',
-    '<strong>ONLYOFFICE - DocumentServer</strong> module configuration' => '<strong>ONLYOFFICE - DocumentServer</strong> laajennuksen määritys',
+    '<strong>ONLYOFFICE Docs</strong> not accessible.' => '<strong>ONLYOFFICE Docs</strong> ei yhteyttä.',
+    '<strong>ONLYOFFICE Docs</strong> not configured yet.' => '<strong>ONLYOFFICE Docs</strong> ei määritetty.',
+    '<strong>ONLYOFFICE Docs</strong> successfully connected! - Installed version: {version}' => '<strong>ONLYOFFICE Docs</strong> yhdistetty! - Versio: {version}',
+    '<strong>ONLYOFFICE - Docs</strong> module configuration' => '<strong>ONLYOFFICE - Docs</strong> laajennuksen määritys',
     '<strong>Share</strong> document' => '<strong>Jaa</strong> tiedosto',
     'Close' => 'Sulje',
     'Copy to clipboard' => 'Kopioi leikepöydälle',
@@ -36,7 +36,7 @@
     'You can simply share this document using a direct link. The user does not need an valid user account on the platform.' => 'Voit jakaa tämän tiedoston tällä linkillä. Käyttäjän ei tarvitse olla palvelun jäsen.',
     'e.g. http://documentserver' => 'esim. http://documentserver',
     '<strong>Convert</strong> document' => '<strong>Muunna</strong> tiedosto',
-    '<strong>DocumentServer</strong> invalid JWT token.' => '<strong>Document server</strong> virheellinen JWT-tunnus.',
+    '<strong>ONLYOFFICE Docs</strong> invalid JWT token.' => '<strong>ONLYOFFICE Docs</strong> virheellinen JWT-tunnus.',
     'Convert document' => 'Muunna tiedosto',
     'Converting <strong>{oldFileName}</strong> to <strong>{newFileName}</strong>..' => 'Muunnetaan <strong>{oldFileName}</strong> tiedostoksi <strong>{newFileName}</strong>..',
     'Create document <small>(Text, Spreadsheet, Presentation)</small>' => 'Tee tiedosto <small>(Teksti, Laskutaulukko, Esitys)</small>',
@@ -47,8 +47,8 @@
     'JWT Secret key (leave blank to disable)' => 'JWT Salainen avain (tyhjä: pois käytöstä)',
     'Share' => 'Jaa',
     'View document' => 'Tarkasta tiedosto',
-    'Document Editing Service address for internal requests from the server' => 'Asiakirjan muokkauspalvelun osoite palvelimen sisäisille pyynnöille',
-    'Server address for internal requests from the Document Editing Service' => 'Palvelimen osoite asiakirjan muokkauspalvelun sisäisille pyynnöille',
+    'ONLYOFFICE Docs address for internal requests from the server' => 'ONLYOFFICE Docs osoite palvelimen sisäisille pyynnöille',
+    'Server address for internal requests from ONLYOFFICE Docs' => 'Palvelimen osoite ONLYOFFICE Docs sisäisille pyynnöille',
     'Can use ONLYOFFICE' => 'Voi käyttää ONLYOFFICEA',
     'Allows the user to use ONLYOFFICE.' => 'Sallii käyttäjän käyttää ONLYOFFICEA.',
 ];
diff --git a/messages/fr/base.php b/messages/fr/base.php
@@ -18,10 +18,10 @@
  */
 return [
     '<strong>Create</strong> document' => '<strong>Créer</strong> un document',
-    '<strong>DocumentServer</strong> not accessible.' => '<strong>DocumentServer</strong> non accessible.',
-    '<strong>DocumentServer</strong> not configured yet.' => '<strong>DocumentServer</strong> pas encore configuré.',
-    '<strong>DocumentServer</strong> successfully connected! - Installed version: {version}' => '<strong>DocumentServer</strong> connecté avec succès ! - Version installée : {version}',
-    '<strong>ONLYOFFICE - DocumentServer</strong> module configuration' => '<strong>ONLYOFFICE - DocumentServer</strong> configuration du module',
+    '<strong>ONLYOFFICE Docs</strong> not accessible.' => '<strong>ONLYOFFICE Docs</strong> non accessible.',
+    '<strong>ONLYOFFICE Docs</strong> not configured yet.' => '<strong>ONLYOFFICE Docs</strong> pas encore configuré.',
+    '<strong>ONLYOFFICE Docs</strong> successfully connected! - Installed version: {version}' => '<strong>ONLYOFFICE Docs</strong> connecté avec succès ! - Version installée : {version}',
+    '<strong>ONLYOFFICE - Docs</strong> module configuration' => '<strong>ONLYOFFICE - Docs</strong> configuration du module',
     '<strong>Share</strong> document' => '<strong>Partager</strong> un document',
     'Close' => 'Fermer',
     'Copy to clipboard' => 'Copier dans le presse-papier',
@@ -36,7 +36,7 @@
     'You can simply share this document using a direct link. The user does not need an valid user account on the platform.' => 'Vous pouvez simplement partager ce document à l\'aide d\'un lien direct. L\'utilisateur n\'a pas besoin de posséder une compte valide sur la plateforme. ',
     'e.g. http://documentserver' => 'par ex. http://documentserver',
     '<strong>Convert</strong> document' => '<strong>Convertir</strong> un document',
-    '<strong>DocumentServer</strong> invalid JWT token.' => '<strong>DocumentServer</strong> le jeton JWT n’est pas valide.',
+    '<strong>ONLYOFFICE Docs</strong> invalid JWT token.' => '<strong>ONLYOFFICE Docs</strong> le jeton JWT n’est pas valide.',
     'Convert document' => 'Convertir un document',
     'Converting <strong>{oldFileName}</strong> to <strong>{newFileName}</strong>..' => 'Conversion du <strong>{oldFileName}</strong> en <strong>{newFileName}</strong>..',
     'Create document <small>(Text, Spreadsheet, Presentation)</small>' => 'Créer un document <small>(Document, Classeur, Présentation)</small>',
@@ -47,8 +47,8 @@
     'JWT Secret key (leave blank to disable)' => 'JWT clé secrète (laisser en blanc pour désactiver)',
     'Share' => 'Partager',
     'View document' => 'Voir un document',
-    'Document Editing Service address for internal requests from the server' => 'Adresse du service d’édition de document pour les demandes internes du serveur',
-    'Server address for internal requests from the Document Editing Service' => 'Adresse du serveur pour les demandes internes du service d’édition de document',
+    'ONLYOFFICE Docs address for internal requests from the server' => 'Adresse du ONLYOFFICE Docs pour les demandes internes du serveur',
+    'Server address for internal requests from ONLYOFFICE Docs' => 'Adresse du serveur pour les demandes internes du ONLYOFFICE Docs',
     'Can use ONLYOFFICE' => 'Peut utiliser ONLYOFFICE',
     'Allows the user to use ONLYOFFICE.' => 'Permet à l\'utilisateur d\'utiliser ONLYOFFICE.',
 ];
diff --git a/messages/hr/base.php b/messages/hr/base.php
@@ -18,10 +18,10 @@
  */
 return [
     '<strong>Create</strong> document' => '<strong>Kreiraj</strong> dokument',
-    '<strong>DocumentServer</strong> not accessible.' => '<strong>DokumentServer</strong> nije pristupačan.',
-    '<strong>DocumentServer</strong> not configured yet.' => '<strong>DokumentServer</strong> još nije konfiguriran.',
-    '<strong>DocumentServer</strong> successfully connected! - Installed version: {version}' => '<strong>DokumentServer</strong> uspješno spojen! - Instalirana verzija: {version}',
-    '<strong>ONLYOFFICE - DocumentServer</strong> module configuration' => '<strong>ONLYOFFICE - DokumentServer</strong> konfiguracija modula',
+    '<strong>ONLYOFFICE Docs</strong> not accessible.' => '<strong>ONLYOFFICE Docs</strong> nije pristupačan.',
+    '<strong>ONLYOFFICE Docs</strong> not configured yet.' => '<strong>ONLYOFFICE Docs</strong> još nije konfiguriran.',
+    '<strong>ONLYOFFICE Docs</strong> successfully connected! - Installed version: {version}' => '<strong>ONLYOFFICE Docs</strong> uspješno spojen! - Instalirana verzija: {version}',
+    '<strong>ONLYOFFICE - Docs</strong> module configuration' => '<strong>ONLYOFFICE - Docs</strong> konfiguracija modula',
     '<strong>Share</strong> document' => '<strong>Dijeli</strong> dokument',
     'Close' => 'Zatvori',
     'Copy to clipboard' => 'Kopiraj u međuspremnik',
@@ -35,7 +35,7 @@
     'Open the new document in the next step' => 'Otvori novi dokument u sljedećem koraku',
     'You can simply share this document using a direct link. The user does not need an valid user account on the platform.' => 'Možete jednostavno podijeliti ovaj dokument koristeći direktnu poveznicu (link). Korisnik ne treba registirani račun na platformi.',
     '<strong>Convert</strong> document' => '<strong>Pretvori</strong> dokument',
-    '<strong>DocumentServer</strong> invalid JWT token.' => '<strong>DokumentServer</strong> nevažeći JWT token',
+    '<strong>ONLYOFFICE Docs</strong> invalid JWT token.' => '<strong>ONLYOFFICE Docs</strong> nevažeći JWT token',
     'Convert document' => 'Pretvori dokument',
     'Converting <strong>{oldFileName}</strong> to <strong>{newFileName}</strong>..' => 'Pretvaranje <strong>{oldFileName}</strong> u <strong>{newFileName}</strong>..',
     'Create document <small>(Text, Spreadsheet, Presentation)</small>' => 'Kreiraj dokument <small>(Tekst, Proračunska tablica, Prezentacija)</small>',
@@ -47,8 +47,8 @@
     'Share' => 'Podijeli',
     'View document' => 'Pogledaj dokument',
     'e.g. http://documentserver' => 'Npr. http://documentserver',
-    'Document Editing Service address for internal requests from the server' => 'Adresa pružatelja usluge uređivanja dokumenata za interne zahtjeve od strane poslužitelja',
-    'Server address for internal requests from the Document Editing Service' => 'Adresa poslužitelja za interne zahtjeve od strane pružatelja usluge uređivanja dokumenata',
+    'ONLYOFFICE Docs address for internal requests from the server' => 'Adresa pružatelja ONLYOFFICE Docs za interne zahtjeve od strane poslužitelja',
+    'Server address for internal requests from ONLYOFFICE Docs' => 'Adresa poslužitelja za interne zahtjeve od strane pružatelja ONLYOFFICE Docs',
     'Can use ONLYOFFICE' => 'Može koristiti ONLYOFFICE',
     'Allows the user to use ONLYOFFICE.' => 'Omogućuje korisniku da upotrebljava ONLYOFFICE.',
 ];
diff --git a/messages/hu/base.php b/messages/hu/base.php
@@ -18,10 +18,10 @@
  */
 return [
     '<strong>Create</strong> document' => 'Dokumentum <strong>létrehozása</strong>',
-    '<strong>DocumentServer</strong> not accessible.' => '<strong>DocumentServer</strong> nem elérhető.',
-    '<strong>DocumentServer</strong> not configured yet.' => '<strong>DocumentServer</strong> még nincs konfigurálva.',
-    '<strong>DocumentServer</strong> successfully connected! - Installed version: {version}' => '<strong>DocumentServer</strong> sikeresen kapcsolódott! - Telepített verzió: {version}',
-    '<strong>ONLYOFFICE - DocumentServer</strong> module configuration' => '<strong>ONLYOFFICE - DocumentServer</strong> modul konfiguráció',
+    '<strong>ONLYOFFICE Docs</strong> not accessible.' => '<strong>ONLYOFFICE Docs</strong> nem elérhető.',
+    '<strong>ONLYOFFICE Docs</strong> not configured yet.' => '<strong>ONLYOFFICE Docs</strong> még nincs konfigurálva.',
+    '<strong>ONLYOFFICE Docs</strong> successfully connected! - Installed version: {version}' => '<strong>ONLYOFFICE Docs</strong> sikeresen kapcsolódott! - Telepített verzió: {version}',
+    '<strong>ONLYOFFICE - Docs</strong> module configuration' => '<strong>ONLYOFFICE - Docs</strong> modul konfiguráció',
     '<strong>Share</strong> document' => 'Dokumentum <strong>megosztása</strong>',
     'Close' => 'Bezárás',
     'Copy to clipboard' => 'Másolás a vágólapra',
@@ -36,7 +36,7 @@
     'You can simply share this document using a direct link. The user does not need an valid user account on the platform.' => 'Egyszerűen megoszthatod ezt a dokumentumot közvetlen hivatkozás használatával. A felhasználónak nem kell érvényes felhasználói fiókkal rendelkeznie a platformon.',
     'e.g. http://documentserver' => 'pl. http://documentserver',
     '<strong>Convert</strong> document' => 'Dokumentum <strong>konvertálása</strong>',
-    '<strong>DocumentServer</strong> invalid JWT token.' => '<strong>DocumentServer</strong> érvénytelen JWT  jelkép.',
+    '<strong>ONLYOFFICE Docs</strong> invalid JWT token.' => '<strong>ONLYOFFICE Docs</strong> érvénytelen JWT  jelkép.',
     'Convert document' => 'Dokumentum konvertálása',
     'Converting <strong>{oldFileName}</strong> to <strong>{newFileName}</strong>..' => '<strong>{oldFileName}</strong> konvertálása <strong>{newFileName}</strong>-re..',
     'Create document <small>(Text, Spreadsheet, Presentation)</small>' => 'Dokumentum készítése <small>(Szöveg,  Táblázatkezelő, Prezentáció)</small>',
@@ -47,8 +47,8 @@
     'JWT Secret key (leave blank to disable)' => 'JWT Titok kulcs (hagyd üresen a kikapcsoláshoz)',
     'Share' => 'Megosztás',
     'View document' => 'Dokumentum megnézése',
-    'Document Editing Service address for internal requests from the server' => 'Dokumentumszerkesztő szolgáltatás elérési címe szerveroldali belső lekérésekhez',
-    'Server address for internal requests from the Document Editing Service' => 'Szerver elérési címe a Dokumentumszerkesztő szolgáltatástól érkező belső lekérésekhez',
+    'ONLYOFFICE Docs address for internal requests from the server' => 'ONLYOFFICE Docs elérési címe szerveroldali belső lekérésekhez',
+    'Server address for internal requests from ONLYOFFICE Docs' => 'Szerver elérési címe a ONLYOFFICE Docs érkező belső lekérésekhez',
     'Can use ONLYOFFICE' => 'ONLYOFFICE használható',
     'Allows the user to use ONLYOFFICE.' => 'Lehetővé teszi, hogy a felhasználó használja az ONLYOFFICE-t.',
 ];