Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / uimport.php

diff --git a/mod/uimport.php b/mod/uimport.php
index 942268b0ef0a89ac0cd523a70a74ef92c9658320..15bc8322b97fdd3337c0293580e0f64cea59101a 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -1,12 +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
-if(! function_exists('uimport_post')) {\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
@@ -28,18 +28,16 @@ function uimport_post(&$a) {
             $verified = 0;\r
             break;\r
        }\r
-\r
+    \r
     if (x($_FILES,'accountfile')){\r
         /// @TODO Pass $blocked / $verified, send email to admin on REGISTER_APPROVE\r
         import_account($a, $_FILES['accountfile']);\r
         return;\r
     }\r
 }\r
-}\r
-\r
-if(! function_exists('uimport_content')) {\r
-function uimport_content(&$a) {\r
 \r
+function uimport_content(App &$a) {\r
+       \r
        if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {\r
                notice("Permission denied." . EOL);\r
                return;\r
@@ -54,8 +52,8 @@ function uimport_content(&$a) {
                        return;\r
                }\r
        }\r
-\r
-\r
+       \r
+       \r
        if(x($_SESSION,'theme'))\r
                unset($_SESSION['theme']);\r
        if(x($_SESSION,'mobile-theme'))\r
@@ -74,4 +72,3 @@ function uimport_content(&$a) {
         ),\r
     ));\r
 }\r
-}\r