Issue 1490: User import is now only possible on open sites or via an administrator. (#5680)

This commit is contained in:
Michael Vogel 2018-08-27 11:55:08 +00:00 committed by Hypolite Petovan
parent 2022d0e812
commit f7953a2b02

View file

@ -11,39 +11,21 @@ use Friendica\Core\UserImport;
function uimport_post(App $a) function uimport_post(App $a)
{ {
switch (Config::get('config', 'register_policy')) { if ((Config::get('config', 'register_policy') != REGISTER_OPEN) && !is_site_admin()) {
case REGISTER_OPEN: notice(L10n::t('Permission denied.') . EOL);
$blocked = 0; return;
$verified = 1;
break;
case REGISTER_APPROVE:
$blocked = 1;
$verified = 0;
break;
default:
case REGISTER_CLOSED:
if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) {
notice(L10n::t('Permission denied.') . EOL);
return;
}
$blocked = 1;
$verified = 0;
break;
} }
if (x($_FILES, 'accountfile')) { if (!empty($_FILES['accountfile'])) {
/// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE
UserImport::importAccount($a, $_FILES['accountfile']); UserImport::importAccount($a, $_FILES['accountfile']);
return; return;
} }
} }
function uimport_content(App $a) { function uimport_content(App $a)
{
if ((!local_user()) && (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED)) { if ((Config::get('config', 'register_policy') != REGISTER_OPEN) && !is_site_admin()) {
notice("Permission denied." . EOL); notice(L10n::t('User imports on closed servers can only be done by an administrator.') . EOL);
return; return;
} }