Merge remote-tracking branch 'friendica/master'

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index 549d07a91896b58a6c3185885327124a5f9aa986..0115ec0d58e12ddac23fa42382ba1c4563ba588c 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -198,9 +198,10 @@ function register_post(&$a) {
        $spkey = openssl_pkey_get_details($sres);
        $spubkey = $spkey["key"];
 
-       $r = q("INSERT INTO `user` ( `username`, `password`, `email`, `openid`, `nickname`,
+       $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
                `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked` )
-               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
+               dbesc(generate_user_guid()),
                dbesc($username),
                dbesc($new_password_encoded),
                dbesc($email),
@@ -267,9 +268,9 @@ function register_post(&$a) {
                                intval($newuid));
                        return;
                }
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`,
-                       `request`, `notify`, `poll`, `confirm`, `name-date`, `uri-date`, `avatar-date` )
-                       VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
+               $r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
+                       `request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date` )
+                       VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' ) ",
                        intval($newuid),
                        datetime_convert(),
                        dbesc($username),
@@ -278,10 +279,12 @@ function register_post(&$a) {
                        dbesc($a->get_baseurl() . "/photo/avatar/{$newuid}.jpg"),
                        dbesc($a->get_baseurl() . "/photo/micro/{$newuid}.jpg"),
                        dbesc($a->get_baseurl() . "/profile/$nickname"),
+                       dbesc(normalise_link($a->get_baseurl() . "/profile/$nickname")),
                        dbesc($a->get_baseurl() . "/dfrn_request/$nickname"),
                        dbesc($a->get_baseurl() . "/dfrn_notify/$nickname"),
                        dbesc($a->get_baseurl() . "/dfrn_poll/$nickname"),
                        dbesc($a->get_baseurl() . "/dfrn_confirm/$nickname"),
+                       dbesc($a->get_baseurl() . "/poco/$nickname"),
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert()),
                        dbesc(datetime_convert())
@@ -345,6 +348,8 @@ function register_post(&$a) {
        }
 
 
+       call_hooks('register_account', $newuid);
+
        if( $a->config['register_policy'] == REGISTER_OPEN ) {
 
                if($using_invites && $invite_id) {
@@ -370,7 +375,7 @@ function register_post(&$a) {
 
                if($res) {
                        info( t('Registration successful. Please check your email for further instructions.') . EOL ) ;
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                }
                else {
                        notice( t('Failed to send email message. Here is the message that failed.') . $email_tpl . EOL );
@@ -379,7 +384,7 @@ function register_post(&$a) {
        elseif($a->config['register_policy'] == REGISTER_APPROVE) {
                if(! strlen($a->config['admin_email'])) {
                        notice( t('Your registration can not be processed.') . EOL);
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                }
 
                $hash = random_string();
@@ -425,7 +430,7 @@ function register_post(&$a) {
 
                if($res) {
                        info( t('Your registration is pending approval by the site owner.') . EOL ) ;
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                }
 
        }
@@ -447,7 +452,12 @@ function register_content(&$a) {
 
        $block = get_config('system','block_extended_register');
 
-       if((($a->config['register_policy'] == REGISTER_CLOSED) && (! local_user())) || ($block)) {
+       if(local_user() && ($block)) {
+               notice("Permission denied." . EOL);
+               return;
+       }
+
+       if((! local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
                notice("Permission denied." . EOL);
                return;
        }
@@ -498,8 +508,7 @@ function register_content(&$a) {
        }
 
 
-       $license = t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.');
-
+       $license = '';
 
        $o = get_markup_template("register.tpl");
        $o = replace_macros($o, array(