multi-user, do not cache open mbox

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index 3530ef58833667dae08496494350c425f8ec407d..83e9e289106e98255d34aea773f6847728cdbf12 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -85,8 +85,11 @@ function register_post(&$a) {
        // So now we are just looking for a space in the full name. 
        
        $loose_reg = get_config('system','no_regfullname');
-       if((! $loose_reg) && (! strpos($username,' ')))
-               $err .= t("That doesn\'t appear to be your full \x28First Last\x29 name.") . EOL;
+       if(! $loose_reg) {
+               $username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
+               if(! strpos($username,' '))
+                       $err .= t("That doesn't appear to be your full \x28First Last\x29 name.") . EOL;
+       }
 
        if(! allowed_email($email))
                        $err .= t('Your email domain is not among those allowed on this site.') . EOL;
@@ -199,6 +202,24 @@ function register_post(&$a) {
                return;
        }               
 
+       /**
+        * if somebody clicked submit twice very quickly, they could end up with two accounts 
+        * due to race condition. Remove this one.
+        */
+
+       $r = q("SELECT `uid` FROM `user`
+                       WHERE `nickname` = '%s' ",
+                       dbesc($nickname)
+       );
+       if((count($r) > 1) && $newuid) {
+               $err .= t('Nickname is already registered. Please choose another.') . EOL;
+               q("DELETE FROM `user` WHERE `uid` = %d LIMIT 1",
+                       intval($newuid)
+               );
+               notice ($err);
+               return;
+       }
+
        if(x($newuid) !== false) {
                $r = q("INSERT INTO `profile` ( `uid`, `profile-name`, `is-default`, `name`, `photo`, `thumb`, `publish`, `net-publish` )
                        VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, %d ) ",
@@ -308,7 +329,10 @@ function register_post(&$a) {
                                '$uid' => $newuid ));
 
                $res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']),
-                       $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
+                       $email_tpl, 
+                               'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                               . 'Content-type: text/plain; charset=UTF-8' . "\n"
+                               . 'Content-transfer-encoding: 8bit' );
 
 
                if($res) {
@@ -345,8 +369,10 @@ function register_post(&$a) {
                 ));
 
                $res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']),
-                       $email_tpl,'From: ' .  t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
-
+                       $email_tpl,
+                               'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+                               . 'Content-type: text/plain; charset=UTF-8' . "\n"
+                               . 'Content-transfer-encoding: 8bit' );
                if($res) {
                        notice( t('Your registration is pending approval by the site owner.') . EOL ) ;
                        goaway($a->get_baseurl());
@@ -401,7 +427,9 @@ function register_content(&$a) {
                $oidlabel = t("Your OpenID \x28optional\x29: ");
        }
 
-       $realpeople = t('Members of this network prefer to communicate with real people who use their real names.');
+       // I set this and got even more fake names than before...
+
+       $realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.');
 
        if(get_config('system','publish_all')) {
                $profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />';