Move admin/tos to src/Module

- Add Module\Admin\Tos class
- Add route for admin/tos
- Add admin aside menu entry
- Remove admin_page_tos and admin_page_tos_post from mod/admin.php

diff --git a/mod/admin.php b/mod/admin.php
index dd441023d0f651f29b25250951a0c29621d9ec01..af4c874c2c766be4567a9c68c4508a3db17fd91e 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -126,9 +126,6 @@ function admin_post(App $a)
                                }
                                $return_path = 'admin/themes/' . $theme . (!empty($_GET['mode']) ? '?mode=' . $_GET['mode'] : '');
                                break;
-                       case 'tos':
-                               admin_page_tos_post($a);
-                               break;
                        case 'features':
                                admin_page_features_post($a);
                                break;
@@ -289,9 +286,6 @@ function admin_content(App $a)
                        case 'deleteitem':
                                $o = admin_page_deleteitem($a);
                                break;
-                       case 'tos':
-                               $o = admin_page_tos($a);
-                               break;
                        default:
                                notice(L10n::t("Item not found."));
                }
@@ -305,57 +299,6 @@ function admin_content(App $a)
        }
 }
 
-/**
- * @brief Subpage to define the display of a Terms of Usage page.
- *
- * @param App $a
- * @return string
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- */
-function admin_page_tos(App $a)
-{
-       $tos = new Tos();
-       $t = Renderer::getMarkupTemplate('admin/tos.tpl');
-       return Renderer::replaceMacros($t, [
-               '$title' => L10n::t('Administration'),
-               '$page' => L10n::t('Terms of Service'),
-               '$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->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' => BaseModule::getFormSecurityToken("admin_tos"),
-               '$submit' => L10n::t('Save Settings'),
-       ]);
-}
-
-/**
- * @brief Process send data from Admin TOS Page
- *
- * @param App $a
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- */
-function admin_page_tos_post(App $a)
-{
-       BaseModule::checkFormSecurityTokenRedirectOnError('/admin/tos', 'admin_tos');
-
-       if (empty($_POST['page_tos'])) {
-               return;
-       }
-
-       $displaytos = !empty($_POST['displaytos']);
-       $displayprivstatement = !empty($_POST['displayprivstatement']);
-       $tostext = (!empty($_POST['tostext']) ? strip_tags(trim($_POST['tostext'])) : '');
-
-       Config::set('system', 'tosdisplay', $displaytos);
-       Config::set('system', 'tosprivstatement', $displayprivstatement);
-       Config::set('system', 'tostext', $tostext);
-
-       $a->internalRedirect('admin/tos');
-
-       return; // NOTREACHED
-}
-
 /**
  * @brief Subpage to modify the server wide block list via the admin panel.
  *

diff --git a/src/App/Router.php b/src/App/Router.php
index 4137c4ada498692ca88f88b7d7fa392d00b9da2c..ca362f484282ee630b063bece9043a8815777cab 100644 (file)
--- a/src/App/Router.php
+++ b/src/App/Router.php
@@ -121,6 +121,8 @@ class Router
                $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) {
                        $collector->addRoute(['GET']        , '[/]'                     , Module\Admin\Summary::class);
                        $collector->addRoute(['GET']        , '/federation'             , Module\Admin\Federation::class);
+
+                       $collector->addRoute(['GET', 'POST'], '/tos'                    , Module\Admin\Tos::class);
                });
        }
 

diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php
new file mode 100644 (file)
index 0000000..efab22f
--- /dev/null
+++ b/src/Module/Admin/Tos.php
@@ -0,0 +1,53 @@
+<?php\r
+\r
+namespace Friendica\Module\Admin;\r
+\r
+use Friendica\Core\Config;\r
+use Friendica\Core\L10n;\r
+use Friendica\Core\Renderer;\r
+use Friendica\Module\BaseAdminModule;\r
+\r
+class Tos extends BaseAdminModule\r
+{\r
+       public static function post()\r
+       {\r
+               parent::post();\r
+\r
+               parent::checkFormSecurityTokenRedirectOnError('/admin/tos', 'admin_tos');\r
+\r
+               if (empty($_POST['page_tos'])) {\r
+                       return;\r
+               }\r
+\r
+               $displaytos = !empty($_POST['displaytos']);\r
+               $displayprivstatement = !empty($_POST['displayprivstatement']);\r
+               $tostext = (!empty($_POST['tostext']) ? strip_tags(trim($_POST['tostext'])) : '');\r
+\r
+               Config::set('system', 'tosdisplay', $displaytos);\r
+               Config::set('system', 'tosprivstatement', $displayprivstatement);\r
+               Config::set('system', 'tostext', $tostext);\r
+\r
+               info(L10n::t('The Terms of Service settings have been updated.'));\r
+\r
+               self::getApp()->internalRedirect('admin/tos');\r
+       }\r
+\r
+       public static function content()\r
+       {\r
+               parent::content();\r
+\r
+               $tos = new \Friendica\Module\Tos();\r
+               $t = Renderer::getMarkupTemplate('admin/tos.tpl');\r
+               return Renderer::replaceMacros($t, [\r
+                       '$title' => L10n::t('Administration'),\r
+                       '$page' => L10n::t('Terms of Service'),\r
+                       '$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.')],\r
+                       '$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')],\r
+                       '$preview' => L10n::t('Privacy Statement Preview'),\r
+                       '$privtext' => $tos->privacy_complete,\r
+                       '$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.')],\r
+                       '$form_security_token' => parent::getFormSecurityToken('admin_tos'),\r
+                       '$submit' => L10n::t('Save Settings'),\r
+               ]);\r
+       }\r
+}
\ No newline at end of file

diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php
index 2df7a6b8259dda11852441267c33a80589e16b00..90f78103782ae0d1ad98a7556a399a5c6e9a8a0b 100644 (file)
--- a/src/Module/BaseAdminModule.php
+++ b/src/Module/BaseAdminModule.php
@@ -52,6 +52,9 @@ abstract class BaseAdminModule extends BaseModule
                                'overview'     => ['admin'             , L10n::t('Overview')                , 'overview'],\r
                                'federation'   => ['admin/federation'  , L10n::t('Federation Statistics')   , 'federation']\r
                        ]],\r
+                       'configuration' => [L10n::t('Configuration'), [\r
+                               'tos'          => ['admin/tos'         , L10n::t('Terms of Service')        , 'tos'],\r
+                       ]],\r
                ];\r
 \r
                $addons_admin = [];\r