Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / mod / uimport.php

diff --git a/mod/uimport.php b/mod/uimport.php
index d28198f69ab9baa7a08b90d71e77c628408f24b7..15bc8322b97fdd3337c0293580e0f64cea59101a 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -1,11 +1,12 @@
 <?php\r
 /**\r
  * View for user import\r
+ * @TODO This file has DOS line endings!\r
  */\r
 \r
 require_once("include/uimport.php");\r
 \r
-function uimport_post(&$a) {\r
+function uimport_post(App &$a) {\r
        switch($a->config['register_policy']) {\r
         case REGISTER_OPEN:\r
             $blocked = 0;\r
@@ -29,13 +30,13 @@ function uimport_post(&$a) {
        }\r
     \r
     if (x($_FILES,'accountfile')){\r
-        // TODO: pass $blocked / $verified, send email to admin on REGISTER_APPROVE\r
+        /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE\r
         import_account($a, $_FILES['accountfile']);\r
         return;\r
     }\r
 }\r
 \r
-function uimport_content(&$a) {\r
+function uimport_content(App &$a) {\r
        \r
        if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {\r
                notice("Permission denied." . EOL);\r
@@ -57,23 +58,17 @@ function uimport_content(&$a) {
                unset($_SESSION['theme']);\r
        if(x($_SESSION,'mobile-theme'))\r
                unset($_SESSION['mobile-theme']);\r
-       \r
-       \r
-    $tpl = get_markup_template("uimport.tpl");\r
 \r
-       $includes = array(\r
-               '$field_custom' => 'field_custom.tpl',\r
-       );\r
-       $includes = set_template_includes($a->theme['template_engine'], $includes);\r
 \r
-    return replace_macros($tpl, $includes + array(\r
+    $tpl = get_markup_template("uimport.tpl");\r
+    return replace_macros($tpl, array(\r
         '$regbutt' => t('Import'),\r
         '$import' => array(\r
             'title' => t("Move account"),\r
                        'intro' => t("You can import an account from another Friendica server."),\r
                        '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."),\r
-                       'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (statusnet/identi.ca) or from Diaspora"),\r
-            'field' => array('accountfile', t('Account file'),'<input id="id_accountfile" name="accountfile" type="file">', t('To export your accont, go to "Settings->Export your porsonal data" and select "Export account"')),\r
-        ),  \r
+                       'warn' => t("This feature is experimental. We can't import contacts from the OStatus network (GNU Social/Statusnet) or from Diaspora"),\r
+            'field' => array('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"')),\r
+        ),\r
     ));\r
 }\r