Fixed $tree issues in routes

Author: Jefferson49

composer.json

@@ -10,7 +10,7 @@
         }        
     ],
     "require": {
-        "jefferson49/webtrees-common": ">=1.2.6",
+        "jefferson49/webtrees-common": ">=1.2.7",
         "stevenmaguire/oauth2-dropbox": "dev-Remove-scope-from-getAccessToken",
         "league/oauth2-client": "=2.8.0",
         "league/oauth2-github": "=3.1.1",

composer.lock

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OAuth2Client\n"
-"POT-Creation-Date: 2025-01-25 07:24+0100\n"
-"PO-Revision-Date: 2025-01-25 07:26+0100\n"
+"POT-Creation-Date: 2025-01-25 11:31+0100\n"
+"PO-Revision-Date: 2025-01-25 11:32+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -26,17 +26,17 @@ msgstr ""
 "Angaben für die Option \"%s\". Bitte prüfen Sie die Konfiguration in der "
 "folgenden Datei: data/config.ini.php"
 
-#: src/LoginWithAuthorizationProviderAction.php:134
+#: src/LoginWithAuthorizationProviderAction.php:137
 msgid "The requested authorization provider could not be found"
 msgstr "Der angeforderte Autorisierungsanbieter konnte nicht gefunden werden"
 
-#: src/LoginWithAuthorizationProviderAction.php:151
+#: src/LoginWithAuthorizationProviderAction.php:154
 #, php-format
 msgid "Disconnected the user %s from provider: %s"
 msgstr ""
 "Die Verknüpfung von Benutzer %s mit Autorisierungsanbieter %s wurde gelöst"
 
-#: src/LoginWithAuthorizationProviderAction.php:173
+#: src/LoginWithAuthorizationProviderAction.php:176
 msgid ""
 "Failed security check: A user, who is currently not signed in, requested to "
 "connect an authorization provider with the current user."
@@ -45,7 +45,7 @@ msgstr ""
 "angemeldet ist, hat angefordert, einen Autorisierungsanbieter mit dem "
 "aktuellen Benutzer zu verbinden."
 
-#: src/LoginWithAuthorizationProviderAction.php:184
+#: src/LoginWithAuthorizationProviderAction.php:187
 #, php-format
 msgid ""
 "Timeout for connecting user %s with authorization provider %s. Please "
@@ -55,25 +55,25 @@ msgstr ""
 "Autorisierungsanbieter %s. Bitte starten Sie die Verknüpfung mit dem "
 "Autorisierungsanbieter neu."
 
-#: src/LoginWithAuthorizationProviderAction.php:215
-#: src/LoginWithAuthorizationProviderAction.php:243
+#: src/LoginWithAuthorizationProviderAction.php:218
+#: src/LoginWithAuthorizationProviderAction.php:246
 msgid "OAuth 2.0 communication error"
 msgstr "OAuth 2.0 Kommunikationsfehler"
 
-#: src/LoginWithAuthorizationProviderAction.php:219
+#: src/LoginWithAuthorizationProviderAction.php:222
 msgid "Invalid state in communication with authorization provider."
 msgstr ""
 "Ungültiger Zustand in der Kommunikation mit dem Autorisierungsanbieter."
 
-#: src/LoginWithAuthorizationProviderAction.php:247
+#: src/LoginWithAuthorizationProviderAction.php:250
 msgid ""
 "Failed to get the access token or the user details from the authorization "
 "provider"
 msgstr ""
 "Fehler beim Empfang des Zugriffs-Tokens oder der Benutzer-Daten vom "
 "Autorisierungsanbieter"
 
-#: src/LoginWithAuthorizationProviderAction.php:272
+#: src/LoginWithAuthorizationProviderAction.php:275
 msgid ""
 "The identity received by the authorization provider cannot be connected to "
 "the requested user, because it is already used to sign in by another "
@@ -83,40 +83,40 @@ msgstr ""
 "angeforderten Benutzer verknüpft werden, da sie bereits von einem anderen "
 "webtrees-Benutzer für die Anmeldung verwendet wird."
 
-#: src/LoginWithAuthorizationProviderAction.php:283
+#: src/LoginWithAuthorizationProviderAction.php:286
 #, php-format
 msgid "Sucessfully connected existing user %s with provider: %s"
 msgstr ""
 "Erfolgreiche Verknüpfung des existierenden Benutzers %s mit "
 "Autorisierungsanbieter: %s"
 
-#: src/LoginWithAuthorizationProviderAction.php:299
+#: src/LoginWithAuthorizationProviderAction.php:302
 msgid ""
 "Invalid user account data received from authorizaton provider. Email or "
 "username missing."
 msgstr ""
 "Vom Autorisierungsanbieter wurden keine validen Daten empfangen. Email oder "
 "Benutzernamen fehlt."
 
-#: src/LoginWithAuthorizationProviderAction.php:312
+#: src/LoginWithAuthorizationProviderAction.php:315
 msgid ""
-"Creating new webtrees user account based on the received user data from the "
-"authorization provider"
+"A new webtrees user account is requested based on the user data received "
+"from the authorization provider."
 msgstr ""
-"Erstellen eines neuen webtrees Benutzerkontos basierend auf den vom "
-"Autorisierungsanbieter erhaltenen Benutzerdaten"
+"Ein neues webtrees Benutzerkonto wird angefragt basierend auf den "
+"Benutzerdaten, welche vom Autorisierungsanbieter erhaltenen wurden."
 
-#: src/LoginWithAuthorizationProviderAction.php:320
+#: src/LoginWithAuthorizationProviderAction.php:322
 msgid "Automatic user registration after sign in with authorization provider"
 msgstr ""
 "Automatische Benutzer-Registrierung nach Einloggen mit Autorisierungsanbieter"
 
-#: src/LoginWithAuthorizationProviderAction.php:346
+#: src/LoginWithAuthorizationProviderAction.php:349
 #, php-format
 msgid "The email address for user %s was updated to: %s"
 msgstr "Die Email-Adresse für Benutzer %s wurde aktualisiert zu: %s"
 
-#: src/LoginWithAuthorizationProviderAction.php:415
+#: src/LoginWithAuthorizationProviderAction.php:418
 msgid ""
 "Login with the provided user credentials denied. The username or email "
 "provided from the authorization provider might already exist in webtrees. If "
@@ -129,7 +129,7 @@ msgstr ""
 "vorhandenen webtrees-Benutzer mit einem Autorisierungsanbieter verbinden "
 "möchten, wählen Sie: Meine Seiten / Mein Konto / Verknüpfen mit"
 
-#: src/LoginWithAuthorizationProviderAction.php:458
+#: src/LoginWithAuthorizationProviderAction.php:461
 #, php-format
 msgid ""
 "The length of the \"%s\" exceeded the maximum length of %s and was reduced "

resources/lang/de.mo

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: OAuth2Client\n"
-"POT-Creation-Date: 2025-01-25 06:35+0100\n"
-"PO-Revision-Date: 2025-01-25 06:36+0100\n"
+"POT-Creation-Date: 2025-01-25 11:31+0100\n"
+"PO-Revision-Date: 2025-01-25 11:31+0100\n"
 "Last-Translator: Rick Malkin <[email protected]>\n"
 "Language-Team: \n"
 "Language: en_AU\n"
@@ -26,24 +26,24 @@ msgstr ""
 "data for the option \"%s\". Please check the configuration in the following "
 "file: data/config.ini.php"
 
-#: src/LoginWithAuthorizationProviderAction.php:134
+#: src/LoginWithAuthorizationProviderAction.php:137
 msgid "The requested authorization provider could not be found"
 msgstr "The requested authorisation provider could not be found"
 
-#: src/LoginWithAuthorizationProviderAction.php:151
+#: src/LoginWithAuthorizationProviderAction.php:154
 #, php-format
 msgid "Disconnected the user %s from provider: %s"
 msgstr ""
 
-#: src/LoginWithAuthorizationProviderAction.php:173
+#: src/LoginWithAuthorizationProviderAction.php:176
 msgid ""
 "Failed security check: A user, who is currently not signed in, requested to "
 "connect an authorization provider with the current user."
 msgstr ""
 "Failed security check: A user, who is currently not signed in, requested to "
 "connect an authorisation provider with the current user."
 
-#: src/LoginWithAuthorizationProviderAction.php:184
+#: src/LoginWithAuthorizationProviderAction.php:187
 #, php-format
 msgid ""
 "Timeout for connecting user %s with authorization provider %s. Please "
@@ -52,24 +52,24 @@ msgstr ""
 "Timeout for connecting user %s with authorisation provider %s. Please "
 "restart connecting with the authorisation provider."
 
-#: src/LoginWithAuthorizationProviderAction.php:215
-#: src/LoginWithAuthorizationProviderAction.php:243
+#: src/LoginWithAuthorizationProviderAction.php:218
+#: src/LoginWithAuthorizationProviderAction.php:246
 msgid "OAuth 2.0 communication error"
 msgstr ""
 
-#: src/LoginWithAuthorizationProviderAction.php:219
+#: src/LoginWithAuthorizationProviderAction.php:222
 msgid "Invalid state in communication with authorization provider."
 msgstr "Invalid state in communication with authorisation provider."
 
-#: src/LoginWithAuthorizationProviderAction.php:247
+#: src/LoginWithAuthorizationProviderAction.php:250
 msgid ""
 "Failed to get the access token or the user details from the authorization "
 "provider"
 msgstr ""
 "Failed to get the access token or the user details from the authorisation "
 "provider"
 
-#: src/LoginWithAuthorizationProviderAction.php:272
+#: src/LoginWithAuthorizationProviderAction.php:275
 msgid ""
 "The identity received by the authorization provider cannot be connected to "
 "the requested user, because it is already used to sign in by another "
@@ -79,37 +79,37 @@ msgstr ""
 "the requested user, because it is already used to sign in by another "
 "webtrees user."
 
-#: src/LoginWithAuthorizationProviderAction.php:283
+#: src/LoginWithAuthorizationProviderAction.php:286
 #, php-format
 msgid "Sucessfully connected existing user %s with provider: %s"
 msgstr ""
 
-#: src/LoginWithAuthorizationProviderAction.php:299
+#: src/LoginWithAuthorizationProviderAction.php:302
 msgid ""
 "Invalid user account data received from authorizaton provider. Email or "
 "username missing."
 msgstr ""
 "Invalid user account data received from authorisaton provider. Email or "
 "username missing."
 
-#: src/LoginWithAuthorizationProviderAction.php:312
+#: src/LoginWithAuthorizationProviderAction.php:315
 msgid ""
-"Creating new webtrees user account based on the received user data from the "
-"authorization provider"
+"A new webtrees user account is requested based on the user data received "
+"from the authorization provider."
 msgstr ""
-"Creating new webtrees user account based on the received user data from the "
-"authorisation provider"
+"A new webtrees user account is requested based on the user data received "
+"from the authorisation provider."
 
-#: src/LoginWithAuthorizationProviderAction.php:320
+#: src/LoginWithAuthorizationProviderAction.php:322
 msgid "Automatic user registration after sign in with authorization provider"
 msgstr "Automatic user registration after sign in with authorisation provider"
 
-#: src/LoginWithAuthorizationProviderAction.php:346
+#: src/LoginWithAuthorizationProviderAction.php:349
 #, php-format
 msgid "The email address for user %s was updated to: %s"
 msgstr ""
 
-#: src/LoginWithAuthorizationProviderAction.php:415
+#: src/LoginWithAuthorizationProviderAction.php:418
 msgid ""
 "Login with the provided user credentials denied. The username or email "
 "provided from the authorization provider might already exist in webtrees. If "
@@ -121,7 +121,7 @@ msgstr ""
 "you want to connect an existing webtrees user to an authorisation provider, "
 "select: My pages / My account / Connect with"
 
-#: src/LoginWithAuthorizationProviderAction.php:458
+#: src/LoginWithAuthorizationProviderAction.php:461
 #, php-format
 msgid ""
 "The length of the \"%s\" exceeded the maximum length of %s and was reduced "
@@ -245,26 +245,14 @@ msgid "Signed in with %s"
 msgstr ""
 
 #: resources/views/edit-account-page.phtml:75
-msgid ""
-"The email address provided from the authorization provider cannot be changed"
-msgstr ""
-"The email address provided from the authorisation provider cannot be changed"
-
-#: resources/views/edit-account-page.phtml:80
 #, php-format
 msgid "This user can sign in with %s"
 msgstr ""
 
-#: resources/views/edit-account-page.phtml:80
-#: resources/views/register-page.phtml:67
+#: resources/views/edit-account-page.phtml:78
 msgid ""
-"The administrator might have disabled to change some of the received user "
-"data"
-msgstr ""
-
-#: resources/views/edit-account-page.phtml:161
-#: resources/views/register-page.phtml:124
-msgid "Password (within webtrees)"
+"The administrator might have disabled to change the email address or the "
+"password"
 msgstr ""
 
 #: resources/views/login-with-provider.phtml:32
@@ -317,6 +305,16 @@ msgstr ""
 msgid "Request account with"
 msgstr ""
 
+#: resources/views/register-page.phtml:67
+msgid ""
+"The administrator might have disabled to change some of the received user "
+"data"
+msgstr ""
+
+#: resources/views/register-page.phtml:124
+msgid "Password (within webtrees)"
+msgstr ""
+
 #: resources/views/register-page.phtml:141
 msgid "Further registration data - Please complete and continue"
 msgstr ""
@@ -477,6 +475,13 @@ msgstr ""
 "flow between webtrees and the authorisation provider will be logged in the "
 "webtrees website logs."
 
+#~ msgid ""
+#~ "The email address provided from the authorization provider cannot be "
+#~ "changed"
+#~ msgstr ""
+#~ "The email address provided from the authorisation provider cannot be "
+#~ "changed"
+
 #~ msgid ""
 #~ "Mandatory user account data from the authorization provider cannot be "
 #~ "changed"