Unescape invite_desc template variable

[friendica.git] / mod / uimport.php

diff --git a/mod/uimport.php b/mod/uimport.php
index 14e56c30c2c4f7ed3cb29e0b99747be9eda88959..dfeab8a2f6e4d45988b567ab86c8ea8056d3e9d3 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -7,42 +7,27 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\UserImport;
+use Friendica\Core\Renderer;
 
-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;
+function uimport_post(App $a)
+{
+       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;
        }
 
@@ -50,29 +35,29 @@ function uimport_content(App $a) {
        if ($max_dailies) {
                $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
                if ($r && $r[0]['total'] >= $max_dailies) {
-                       logger('max daily registrations exceeded.');
+                       Logger::log('max daily registrations exceeded.');
                        notice(L10n::t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);
                        return;
                }
        }
 
 
-       if (x($_SESSION, 'theme')) {
+       if (!empty($_SESSION['theme'])) {
                unset($_SESSION['theme']);
        }
-       if (x($_SESSION, 'mobile-theme')) {
+       if (!empty($_SESSION['mobile-theme'])) {
                unset($_SESSION['mobile-theme']);
        }
 
-       $tpl = get_markup_template("uimport.tpl");
-       return replace_macros($tpl, [
-               '$regbutt' => t('Import'),
+       $tpl = Renderer::getMarkupTemplate("uimport.tpl");
+       return Renderer::replaceMacros($tpl, [
+               '$regbutt' => L10n::t('Import'),
                '$import' => [
-                       'title' => t("Move account"),
-                       'intro' => t("You can import an account from another Friendica server."),
-                       'instruct' => 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' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),
-                       'field' => ['accountfile', t('Account file'), '<input id="id_accountfile" name="accountfile" type="file">', t('To export your account, go to "Settings->Export your personal data" and select "Export account"')],
+                       '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 \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"')],
                ],
        ]);
 }