Merge pull request #5714 from annando/removed-postupdate

[friendica.git] / mod / uimport.php

diff --git a/mod/uimport.php b/mod/uimport.php
index a1b0e4d1451106ce7b2546b5bc5c24cd71d2dbd7..704439216b5537fe790eac758af7973ee51f99e3 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -11,39 +11,21 @@ use Friendica\Core\UserImport;
 
 function uimport_post(App $a)
 {
-       switch ($a->config['register_policy']) {
-               case REGISTER_OPEN:
-                       $blocked = 0;
-                       $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 ((Config::get('config', 'register_policy') != REGISTER_OPEN) && !is_site_admin()) {
+               notice(L10n::t('Permission denied.') . EOL);
+               return;
        }
 
-       if (x($_FILES, 'accountfile')) {
-               /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE
+       if (!empty($_FILES['accountfile'])) {
                UserImport::importAccount($a, $_FILES['accountfile']);
                return;
        }
 }
 
-function uimport_content(App $a) {
-
-       if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
-               notice("Permission denied." . EOL);
+function uimport_content(App $a)
+{
+       if ((Config::get('config', 'register_policy') != REGISTER_OPEN) && !is_site_admin()) {
+               notice(L10n::t('User imports on closed servers can only be done by an administrator.') . EOL);
                return;
        }
 
@@ -72,7 +54,7 @@ function uimport_content(App $a) {
                        'title' => L10n::t("Move account"),
                        'intro' => L10n::t("You can import an account from another Friendica server."),
                        'instruct' => L10n::t("You need to export your account from the old server and upload it here. We will recreate your old account here with all your contacts. We will try also to inform your friends that you moved here."),
-                       'warn' => L10n::t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),
+                       'warn' => L10n::t("This feature is experimental. We can't import contacts from the OStatus network \x28GNU Social/Statusnet\x29 or from Diaspora"),
                        'field' => ['accountfile', L10n::t('Account file'), '<input id="id_accountfile" name="accountfile" type="file">', L10n::t('To export your account, go to "Settings->Export your personal data" and select "Export account"')],
                ],
        ]);