Merge remote-tracking branch 'friendica/master'

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index 5fceebd4bd87c006e2e5afeb60f7cfdb5c3d1379..0115ec0d58e12ddac23fa42382ba1c4563ba588c 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -268,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),
@@ -279,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())
@@ -450,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;
        }
@@ -501,8 +508,7 @@ function register_content(&$a) {
        }
 
 
-       $license = cc_license();
-
+       $license = '';
 
        $o = get_markup_template("register.tpl");
        $o = replace_macros($o, array(