events: use best_link_url() and zrl() for the author_link (author link as magic-link)

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index 08719cd7c135feb9f27090f984c801f46c9f47b2..7eef876ad6c360914add2af2938bfc916795f3b0 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -1,5 +1,7 @@
 <?php
 
+use Friendica\Core\System;
+
 require_once('include/config.php');
 require_once('include/network.php');
 require_once('include/plugin.php');
@@ -66,7 +68,7 @@ function create_user($arr) {
                        require_once('library/openid.php');
                        $openid = new LightOpenID;
                        $openid->identity = $openid_url;
-                       $openid->returnUrl = z_root() . '/openid';
+                       $openid->returnUrl = System::baseUrl() . '/openid';
                        $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
                        $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default');
                        try {
@@ -167,11 +169,6 @@ function create_user($arr) {
                return $result;
        }
 
-       $default_service_class = get_config('system','default_service_class');
-       if(! $default_service_class)
-               $default_service_class = '';
-
-
        $prvkey = $keys['prvkey'];
        $pubkey = $keys['pubkey'];
 
@@ -180,9 +177,9 @@ function create_user($arr) {
        $sprvkey = $sres['prvkey'];
        $spubkey = $sres['pubkey'];
 
-       $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
-               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `service_class`, `default-location` )
-               VALUES ( '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '%s', '' )",
+       $r = q("INSERT INTO `user` (`guid`, `username`, `password`, `email`, `openid`, `nickname`,
+               `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone`, `default-location`)
+               VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, 'UTC', '')",
                dbesc(generate_user_guid()),
                dbesc($username),
                dbesc($new_password_encoded),
@@ -195,8 +192,7 @@ function create_user($arr) {
                dbesc($sprvkey),
                dbesc(datetime_convert()),
                intval($verified),
-               intval($blocked),
-               dbesc($default_service_class)
+               intval($blocked)
        );
 
        if ($r) {
@@ -237,8 +233,8 @@ function create_user($arr) {
                        t('default'),
                        1,
                        dbesc($username),
-                       dbesc(z_root() . "/photo/profile/{$newuid}.jpg"),
-                       dbesc(z_root() . "/photo/avatar/{$newuid}.jpg"),
+                       dbesc(System::baseUrl() . "/photo/profile/{$newuid}.jpg"),
+                       dbesc(System::baseUrl() . "/photo/avatar/{$newuid}.jpg"),
                        intval($publish),
                        intval($netpublish)
 
@@ -368,17 +364,17 @@ function user_create_self_contact($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(System::baseUrl()."/photo/profile/".$user['uid'].".jpg"),
+               dbesc(System::baseUrl()."/photo/avatar/".$user['uid'].".jpg"),
+               dbesc(System::baseUrl()."/photo/micro/".$user['uid'].".jpg"),
+               dbesc(System::baseUrl()."/profile/".$user['nickname']),
+               dbesc(normalise_link(System::baseUrl()."/profile/".$user['nickname'])),
+               dbesc($user['nickname'].'@'.substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3)),
+               dbesc(System::baseUrl()."/dfrn_request/".$user['nickname']),
+               dbesc(System::baseUrl()."/dfrn_notify/".$user['nickname']),
+               dbesc(System::baseUrl()."/dfrn_poll/".$user['nickname']),
+               dbesc(System::baseUrl()."/dfrn_confirm/".$user['nickname']),
+               dbesc(System::baseUrl()."/poco/".$user['nickname']),
                dbesc(datetime_convert()),
                dbesc(datetime_convert()),
                dbesc(datetime_convert())
@@ -402,7 +398,7 @@ function send_register_pending_eml($email, $sitename, $username) {
        $body = sprintf($body, $username, $sitename);
 
        return notification(array(
-               'type' => "SYSTEM_EMAIL",
+               'type' => SYSTEM_EMAIL,
                'to_email' => $email,
                'subject'=> sprintf( t('Registration at %s'), $sitename),
                'body' => $body));
@@ -448,7 +444,7 @@ function send_register_open_eml($email, $sitename, $siteurl, $username, $passwor
                $body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
 
                return notification(array(
-                       'type' => "SYSTEM_EMAIL",
+                       'type' => SYSTEM_EMAIL,
                        'to_email' => $email,
                        'subject'=> sprintf( t('Registration details for %s'), $sitename),
                        'preamble'=> $preamble,