Merge remote-tracking branch 'upstream/develop' into 1701-curl-range

[friendica.git] / mod / uimport.php

diff --git a/mod/uimport.php b/mod/uimport.php
index e9934393e8a29e41435d32453f709124bbd872a0..336ec1c2dd74e131b4e12af37b22d5ce979023cf 100644 (file)
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -8,45 +8,45 @@ require_once("include/uimport.php");
 \r
 function uimport_post(App $a) {\r
        switch($a->config['register_policy']) {\r
-        case REGISTER_OPEN:\r
-            $blocked = 0;\r
-            $verified = 1;\r
-            break;\r
+       case REGISTER_OPEN:\r
+               $blocked = 0;\r
+               $verified = 1;\r
+               break;\r
 \r
-        case REGISTER_APPROVE:\r
-            $blocked = 1;\r
-            $verified = 0;\r
-            break;\r
+       case REGISTER_APPROVE:\r
+               $blocked = 1;\r
+               $verified = 0;\r
+               break;\r
 \r
-        default:\r
-        case REGISTER_CLOSED:\r
-            if((! x($_SESSION,'authenticated') && (! x($_SESSION,'administrator')))) {\r
-                notice( t('Permission denied.') . EOL );\r
-                return;\r
-            }\r
-            $blocked = 1;\r
-            $verified = 0;\r
-            break;\r
+       default:\r
+       case REGISTER_CLOSED:\r
+               if ((! x($_SESSION,'authenticated') && (! x($_SESSION,'administrator')))) {\r
+                       notice( t('Permission denied.') . EOL );\r
+                       return;\r
+               }\r
+               $blocked = 1;\r
+               $verified = 0;\r
+               break;\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
+       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
 function uimport_content(App $a) {\r
 \r
-       if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {\r
+       if ((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {\r
                notice("Permission denied." . EOL);\r
                return;\r
        }\r
 \r
        $max_dailies = intval(get_config('system','max_daily_registrations'));\r
-       if($max_dailies) {\r
+       if ($max_dailies) {\r
                $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");\r
-               if($r && $r[0]['total'] >= $max_dailies) {\r
+               if ($r && $r[0]['total'] >= $max_dailies) {\r
                        logger('max daily registrations exceeded.');\r
                        notice( t('This site has exceeded the number of allowed daily account registrations. Please try again tomorrow.') . EOL);\r
                        return;\r
@@ -54,21 +54,22 @@ function uimport_content(App $a) {
        }\r
 \r
 \r
-       if(x($_SESSION,'theme'))\r
+       if (x($_SESSION,'theme')) {\r
                unset($_SESSION['theme']);\r
-       if(x($_SESSION,'mobile-theme'))\r
+       }\r
+       if (x($_SESSION,'mobile-theme')) {\r
                unset($_SESSION['mobile-theme']);\r
+       }\r
 \r
-\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 (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
+       $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 (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