mv URL path uexport -> userexport

diff --git a/mod/settings.php b/mod/settings.php
index 24cb2a8794d12c40f4876c766c26ef68eef48b18..497532561b88862e2aa2ed8855931ab602fb79df 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -129,8 +129,8 @@ function settings_init(App $a)
 
        $tabs[] =       [
                'label' => L10n::t('Export personal data'),
-               'url' => 'settings/uexport',
-               'selected' => (($a->argc > 1) && ($a->argv[1] === 'uexport')?'active':''),
+               'url' => 'settings/userexport',
+               'selected' => (($a->argc > 1) && ($a->argv[1] === 'userexport')?'active':''),
                'accesskey' => 'e',
        ];
 

diff --git a/src/Module/BaseSettingsModule.php b/src/Module/BaseSettingsModule.php
index 6945af8a5aed18c67fc9e67188efbadca5d58be8..4b5e9bf9150c997efe5f1444449baf8cc9c45d6b 100644 (file)
--- a/src/Module/BaseSettingsModule.php
+++ b/src/Module/BaseSettingsModule.php
@@ -87,8 +87,8 @@ class BaseSettingsModule extends BaseModule
 
                $tabs[] = [
                        'label' => L10n::t('Export personal data'),
-                       'url' => 'settings/uexport',
-                       'selected' => (($a->argc > 1) && ($a->argv[1] === 'uexport') ? 'active' : ''),
+                       'url' => 'settings/userexport',
+                       'selected' => (($a->argc > 1) && ($a->argv[1] === 'userexport') ? 'active' : ''),
                        'accesskey' => 'e',
                ];
 

diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index d6cd0aabf199b5e18cff68a614675e7500cb4af9..41072d7ef5882e0299857f430a2b79c7ba064545 100644 (file)
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -40,8 +40,8 @@ class UserExport extends BaseSettingsModule
                 * list of array( 'link url', 'link text', 'help text' )
                 */
                $options = [
-                       ['settings/uexport/account', L10n::t('Export account'), L10n::t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')],
-                       ['settings/uexport/backup', L10n::t('Export all'), L10n::t("Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account \x28photos are not exported\x29")],
+                       ['settings/userexport/account', L10n::t('Export account'), L10n::t('Export your account info and contacts. Use this to make a backup of your account and/or to move it to another server.')],
+                       ['settings/userexport/backup', L10n::t('Export all'), L10n::t("Export your accout info, contacts and all your items as json. Could be a very big file, and could take a lot of time. Use this to make a full backup of your account \x28photos are not exported\x29")],
                ];
                Hook::callAll('uexport_options', $options);
 

diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index 6dca554b25a593c6bc44a885c380d4ab52483525..c26085b48bb2e9fdbbe5adaef26f0f6e9cdcce31 100644 (file)
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -34,7 +34,7 @@ class Tos extends BaseModule
        {
                $this->privacy_operate = L10n::t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.');
                $this->privacy_distribute = L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.');
-               $this->privacy_delete = L10n::t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/uexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', System::baseurl());
+               $this->privacy_delete = L10n::t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', System::baseurl());
                // In some cases we don't need every single one of the above separate, but all in one block.
                // So here is an array to look over
                $this->privacy_complete = [L10n::t('Privacy Statement'), $this->privacy_operate, $this->privacy_distribute, $this->privacy_delete];
@@ -76,7 +76,7 @@ class Tos extends BaseModule
                                '$privstatementtitle' => L10n::t('Privacy Statement'),
                                '$privacy_operate' => L10n::t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'),
                                '$privacy_distribute' => L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'),
-                               '$privacy_delete' => L10n::t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/uexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', System::baseurl())
+                               '$privacy_delete' => L10n::t('At any point in time a logged in user can export their account data from the <a href="%1$s/settings/userexport">account settings</a>. If the user wants to delete their account they can do so at <a href="%1$s/removeme">%1$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', System::baseurl())
                        ]);
                } else {
                        return;

diff --git a/static/routes.config.php b/static/routes.config.php
index e5b4614d8546d068509504fc67e856015a6dd56c..fb0ec2f7e34115ebe089c690e82d441185f15468 100644 (file)
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -203,7 +203,7 @@ return [
                        '/verify'       => [Module\Settings\TwoFactor\Verify::class,      [R::GET, R::POST]],
                ],
                '/delegation[/{action}/{user_id}]' => [Module\Settings\Delegation::class,       [R::GET, R::POST]],
-               '/uexport[/{action}]' => [Module\Settings\UserExport::class,             [R::GET, R::POST]],
+               '/userexport[/{action}]' => [Module\Settings\UserExport::class,             [R::GET, R::POST]],
        ],
 
        '/randprof'                      => [Module\RandomProfile::class,         [R::GET]],