cite: just some small styling thing

diff --git a/mod/admin.php b/mod/admin.php
index 912d8d43be1857851aa5053d193c52b507b07aa0..bba46c9f3a8a9034925aad99c579a7b7c1725c00 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -305,7 +305,7 @@ function admin_page_tos(App $a)
                '$displaytos' => ['displaytos', L10n::t('Display Terms of Service'), Config::get('system', 'tosdisplay'), L10n::t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')],
                '$displayprivstatement' => ['displayprivstatement', L10n::t('Display Privacy Statement'), Config::get('system','tosprivstatement'), L10n::t('Show some informations regarding the needed information to operate the node according e.g. to <a href="%s" target="_blank">EU-GDPR</a>.','https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')],
                '$preview' => L10n::t('Privacy Statement Preview'),
-               '$privtext' => $tos->privblock,
+               '$privtext' => $tos->privacy_complete,
                '$tostext' => ['tostext', L10n::t('The Terms of Service'), Config::get('system', 'tostext'), L10n::t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')],
                '$form_security_token' => get_form_security_token("admin_tos"),
                '$submit' => L10n::t('Save Settings'),

diff --git a/mod/register.php b/mod/register.php
index cc1c8dc7d98707b7720fd8500ced01969e56cede..f1f8b7caa928d0a47c9acc96514f75cc808efd37 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -290,7 +290,7 @@ function register_content(App $a)
                '$showtoslink' => Config::get('system', 'tosdisplay'),
                '$tostext'   => L10n::t('Terms of Service'),
                '$showprivstatement' => Config::get('system', 'tosprivstatement'),
-               '$privstatement' => $tos->privblock,
+               '$privstatement' => $tos->privacy_complete,
                '$baseurl'   => System::baseurl(),
                '$form_security_token' => get_form_security_token("register")
        ]);

diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index f71c9d230239b6d3668b8bd7c2ecb483e16098fd..e8a152b5078f28577d1dd77a8914e6cc6d2456af 100644 (file)
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -16,12 +16,14 @@ use Friendica\Content\Text\BBCode;
 
 class Tos extends BaseModule
 {
-       // Some text elements we need more then once to keep updating them easy.
-       public $privoperate;
-       public $privdistribute;
-       public $privdelete;
-       public $privblock;
-       /* @brief constructor for the module, initializing the text variables
+       // Some text elements we need more than once to keep updating them easy.
+       public $privacy_operate;
+       public $privacy_distribute;
+       public $privacy_delete;
+       public $privacy_complete;
+
+       /**
+        * @brief constructor for the module, initializing the text variables
         *
         * To make the text variables available outside of the module, they need to
         * be properties of the class, however cannot be set directly as the property
@@ -29,12 +31,12 @@ class Tos extends BaseModule
         **/
        public function __construct()
        {
-               $this->privoperate = 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->privdistribute = L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.');
-               $this->privdelete = 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_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());
                // 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->privblock = [L10n::t('Privacy Statement'), $this->privoperate, $this->privdistribute, $this->privdelete];
+               $this->privacy_complete = [L10n::t('Privacy Statement'), $this->privacy_operate, $this->privacy_distribute, $this->privacy_delete];
        }
 
        /**
@@ -63,16 +65,15 @@ class Tos extends BaseModule
         **/
        public static function content() {
                $tpl = get_markup_template('tos.tpl');
-               if (Config::get('system', 'tosdisplay'))
-               {
+               if (Config::get('system', 'tosdisplay')) {
                        return replace_macros($tpl, [
-                               '$title' => L10n::t("Terms of Service"),
+                               '$title' => L10n::t('Terms of Service'),
                                '$tostext' => BBCode::convert(Config::get('system', 'tostext')),
                                '$displayprivstatement' => Config::get('system', 'tosprivstatement'),
-                               '$privstatementtitle' => L10n::t("Privacy Statement"),
-                               '$privoperate' => 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.'),
-                               '$privdistribute' => L10n::t('This data is required for communication and is passed on to the nodes of the communication partners and stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'),
-                               '$privdelete' => 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())
+                               '$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())
                        ]);
                } else {
                        return;