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
This commit is contained in:
Hypolite Petovan 2019-04-14 11:25:27 -04:00
parent 35d222f95d
commit 488e425416
4 changed files with 58 additions and 57 deletions

View file

@ -126,9 +126,6 @@ function admin_post(App $a)
} }
$return_path = 'admin/themes/' . $theme . (!empty($_GET['mode']) ? '?mode=' . $_GET['mode'] : ''); $return_path = 'admin/themes/' . $theme . (!empty($_GET['mode']) ? '?mode=' . $_GET['mode'] : '');
break; break;
case 'tos':
admin_page_tos_post($a);
break;
case 'features': case 'features':
admin_page_features_post($a); admin_page_features_post($a);
break; break;
@ -289,9 +286,6 @@ function admin_content(App $a)
case 'deleteitem': case 'deleteitem':
$o = admin_page_deleteitem($a); $o = admin_page_deleteitem($a);
break; break;
case 'tos':
$o = admin_page_tos($a);
break;
default: default:
notice(L10n::t("Item not found.")); 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. * @brief Subpage to modify the server wide block list via the admin panel.
* *

View file

@ -121,6 +121,8 @@ class Router
$this->routeCollector->addGroup('/admin', function (RouteCollector $collector) { $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) {
$collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class); $collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class);
$collector->addRoute(['GET'] , '/federation' , Module\Admin\Federation::class); $collector->addRoute(['GET'] , '/federation' , Module\Admin\Federation::class);
$collector->addRoute(['GET', 'POST'], '/tos' , Module\Admin\Tos::class);
}); });
} }

53
src/Module/Admin/Tos.php Normal file
View file

@ -0,0 +1,53 @@
<?php
namespace Friendica\Module\Admin;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Module\BaseAdminModule;
class Tos extends BaseAdminModule
{
public static function post()
{
parent::post();
parent::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);
info(L10n::t('The Terms of Service settings have been updated.'));
self::getApp()->internalRedirect('admin/tos');
}
public static function content()
{
parent::content();
$tos = new \Friendica\Module\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' => parent::getFormSecurityToken('admin_tos'),
'$submit' => L10n::t('Save Settings'),
]);
}
}

View file

@ -52,6 +52,9 @@ abstract class BaseAdminModule extends BaseModule
'overview' => ['admin' , L10n::t('Overview') , 'overview'], 'overview' => ['admin' , L10n::t('Overview') , 'overview'],
'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation'] 'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation']
]], ]],
'configuration' => [L10n::t('Configuration'), [
'tos' => ['admin/tos' , L10n::t('Terms of Service') , 'tos'],
]],
]; ];
$addons_admin = []; $addons_admin = [];