Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object...

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index 7e97a1ddf2ff9d72ee6c0685bdd7a1f84ced9d9a..ec15d5b1340f722c0e0de3d2910012ec04855e75 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -269,28 +269,9 @@ function create_user($arr) {
                                intval($newuid));
                        return $result;
                }
-               $r = q("INSERT INTO `contact` ( `uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
-                       `addr`, `request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness` )
-                       VALUES ( %d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0 ) ",
-                       intval($newuid),
-                       datetime_convert(),
-                       dbesc($username),
-                       dbesc($nickname),
-                       dbesc(z_root() . "/photo/profile/{$newuid}.jpg"),
-                       dbesc(z_root() . "/photo/avatar/{$newuid}.jpg"),
-                       dbesc(z_root() . "/photo/micro/{$newuid}.jpg"),
-                       dbesc(z_root() . "/profile/$nickname"),
-                       dbesc(normalise_link(z_root() . "/profile/$nickname")),
-                       dbesc($nickname . '@' . substr(z_root(), strpos(z_root(),'://') + 3 )),
-                       dbesc(z_root() . "/dfrn_request/$nickname"),
-                       dbesc(z_root() . "/dfrn_notify/$nickname"),
-                       dbesc(z_root() . "/dfrn_poll/$nickname"),
-                       dbesc(z_root() . "/dfrn_confirm/$nickname"),
-                       dbesc(z_root() . "/poco/$nickname"),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert())
-               );
+
+               // Create the self contact
+               user_create_self_contact($newuid);
 
                // Create a group with no members. This allows somebody to use it
                // right away as a default group for new contacts.
@@ -377,6 +358,49 @@ function create_user($arr) {
 
 }
 
+/**
+ * @brief create the "self" contact from data from the user table
+ *
+ * @param integer $uid
+ */
+function user_create_self_contact($uid) {
+
+       // Only create the entry if it doesn't exist yet
+       $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($uid));
+       if (dbm::is_result($r)) {
+               return;
+       }
+
+       $r = q("SELECT `uid`, `username`, `nickname` FROM `user` WHERE `uid` = %d", intval($uid));
+       if (!dbm::is_result($r)) {
+               return;
+       }
+
+       $user = $r[0];
+
+       q("INSERT INTO `contact` (`uid`, `created`, `self`, `name`, `nick`, `photo`, `thumb`, `micro`, `blocked`, `pending`, `url`, `nurl`,
+               `addr`, `request`, `notify`, `poll`, `confirm`, `poco`, `name-date`, `uri-date`, `avatar-date`, `closeness`)
+               VALUES (%d, '%s', 1, '%s', '%s', '%s', '%s', '%s', 0, 0, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', 0)",
+               intval($user['uid']),
+               datetime_convert(),
+               dbesc($user['username']),
+               dbesc($user['nickname']),
+               dbesc(z_root()."/photo/profile/".$user['uid'].".jpg"),
+               dbesc(z_root()."/photo/avatar/".$user['uid'].".jpg"),
+               dbesc(z_root()."/photo/micro/".$user['uid'].".jpg"),
+               dbesc(z_root()."/profile/".$user['nickname']),
+               dbesc(normalise_link(z_root()."/profile/".$user['nickname'])),
+               dbesc($user['nickname'].'@'.substr(z_root(), strpos(z_root(),'://') + 3)),
+               dbesc(z_root()."/dfrn_request/".$user['nickname']),
+               dbesc(z_root()."/dfrn_notify/".$user['nickname']),
+               dbesc(z_root()."/dfrn_poll/".$user['nickname']),
+               dbesc(z_root()."/dfrn_confirm/".$user['nickname']),
+               dbesc(z_root()."/poco/".$user['nickname']),
+               dbesc(datetime_convert()),
+               dbesc(datetime_convert()),
+               dbesc(datetime_convert())
+       );
+}
 
 /**
  * @brief send registration confiŕmation with the intormation that reg is pending