cleanup untracked files

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index d97b3e0cd59a7e130d290b5ed77f88f0c867a7d5..06ed1e0f18fb4bb936bd3fd627f8d9077e97e7eb 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -199,6 +199,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 ) ",
@@ -291,6 +309,12 @@ function register_post(&$a) {
                }
        }
 
+       if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
+               $url = $a->get_baseurl() . "/profile/$nickname";
+               proc_run('php',"include/directory.php","$url");
+       }
+
+
        if( $a->config['register_policy'] == REGISTER_OPEN ) {
                $email_tpl = load_view_file("view/register_open_eml.tpl");
                $email_tpl = replace_macros($email_tpl, array(
@@ -301,7 +325,7 @@ function register_post(&$a) {
                                '$password' => $new_password,
                                '$uid' => $newuid ));
 
-               $res = mail($email, t('Registration details for ') . $a->config['sitename'],
+               $res = mail($email, sprintf(t('Registration details for %s'), $a->config['sitename']),
                        $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
 
 
@@ -338,7 +362,7 @@ function register_post(&$a) {
                                '$hash' => $hash
                 ));
 
-               $res = mail($a->config['admin_email'], t('Registration request at ') . $a->config['sitename'],
+               $res = mail($a->config['admin_email'], sprintf(t('Registration request at %s'), $a->config['sitename']),
                        $email_tpl,'From: ' .  t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
 
                if($res) {
@@ -348,13 +372,6 @@ function register_post(&$a) {
 
        }
 
-       if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
-               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-               $url = $a->get_baseurl() . "/profile/$nickname";
-               if($url && strlen(get_config('system','directory_submit_url')))
-                       proc_run($php_path,"include/directory.php","$url");
-
-       }
        return;
 }}
 
@@ -402,6 +419,10 @@ function register_content(&$a) {
                $oidlabel = t("Your OpenID \x28optional\x29: ");
        }
 
+       // 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" />';
        }
@@ -424,6 +445,7 @@ function register_content(&$a) {
        $o = load_view_file("view/register.tpl");
        $o = replace_macros($o, array(
                '$oidhtml' => $oidhtml,
+               '$realpeople' => $realpeople,
                '$regtitle'  => t('Registration'),
                '$registertext' =>((x($a->config,'register_text'))
                        ? '<div class="error-message">' . $a->config['register_text'] . '</div>'
@@ -434,7 +456,7 @@ function register_content(&$a) {
                '$openid'    => $openid_url,
                '$namelabel' => t('Your Full Name ' . "\x28" . 'e.g. Joe Smith' . "\x29" . ': '),
                '$addrlabel' => t('Your Email Address: '),
-               '$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your global profile locator will then be \'<strong>nickname@$sitename</strong>\'.'),
+               '$nickdesc'  => t('Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be \'<strong>nickname@$sitename</strong>\'.'),
                '$nicklabel' => t('Choose a nickname: '),
                '$photo'     => $photo,
                '$publish'   => $profile_publish,