]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Profile.php
Merge pull request #4894 from MrPetovan/task/4513-show-events-reminders-attendence
[friendica.git] / src / Model / Profile.php
index cd925780b1b1cff3638fc582ec2148b7889c9617..cd8fa29e136ca208176287835f9fd2895acd6e9b 100644 (file)
@@ -2,25 +2,28 @@
 /**
  * @file src/Model/Profile.php
  */
-
 namespace Friendica\Model;
 
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\ForumManager;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Util\Temporal;
 use dba;
 
 require_once 'include/dba.php';
-require_once 'include/bbcode.php';
 require_once 'mod/proxy.php';
 
 class Profile
@@ -91,7 +94,7 @@ class Profile
 
                if (!$user && !count($user) && !count($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
-                       notice(t('Requested account is not available.') . EOL);
+                       notice(L10n::t('Requested account is not available.') . EOL);
                        $a->error = 404;
                        return;
                }
@@ -112,7 +115,7 @@ class Profile
 
                if (empty($pdata) && empty($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
-                       notice(t('Requested profile is not available.') . EOL);
+                       notice(L10n::t('Requested profile is not available.') . EOL);
                        $a->error = 404;
                        return;
                }
@@ -162,7 +165,7 @@ class Profile
                        $a->page['aside'] .= replace_macros(
                                get_markup_template('profile_edlink.tpl'),
                                [
-                                       '$editprofile' => t('Edit profile'),
+                                       '$editprofile' => L10n::t('Edit profile'),
                                        '$profid' => $a->profile['id']
                                ]
                        );
@@ -256,7 +259,7 @@ class Profile
         * @param int $block
         * @param boolean $show_connect Show connect link
         *
-        * @return HTML string suitable for sidebar inclusion
+        * @return string HTML sidebar module
         *
         * @note Returns empty string if passed $profile is wrong type or not populated
         *
@@ -291,7 +294,7 @@ class Profile
 
 
                // don't show connect link to yourself
-               $connect = $profile['uid'] != local_user() ? t('Connect') : false;
+               $connect = $profile['uid'] != local_user() ? L10n::t('Connect') : false;
 
                // don't show connect link to authenticated visitors either
                if (remote_user() && count($_SESSION['remote'])) {
@@ -330,13 +333,13 @@ class Profile
                }
 
                if ($connect && ($profile['network'] == NETWORK_DFRN) && !isset($remoteconnect)) {
-                       $subscribe_feed = t('Atom feed');
+                       $subscribe_feed = L10n::t('Atom feed');
                } else {
                        $subscribe_feed = false;
                }
 
                if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) {
-                       $wallmessage = t('Message');
+                       $wallmessage = L10n::t('Message');
                        $wallmessage_link = 'wallmessage/' . $profile['nickname'];
 
                        if (remote_user()) {
@@ -366,15 +369,15 @@ class Profile
 
                // show edit profile to yourself
                if (!$is_contact && $profile['uid'] == local_user() && Feature::isEnabled(local_user(), 'multi_profiles')) {
-                       $profile['edit'] = [System::baseUrl() . '/profiles', t('Profiles'), '', t('Manage/edit profiles')];
+                       $profile['edit'] = [System::baseUrl() . '/profiles', L10n::t('Profiles'), '', L10n::t('Manage/edit profiles')];
                        $r = q(
                                "SELECT * FROM `profile` WHERE `uid` = %d",
                                local_user()
                        );
 
                        $profile['menu'] = [
-                               'chg_photo' => t('Change profile photo'),
-                               'cr_new' => t('Create New Profile'),
+                               'chg_photo' => L10n::t('Change profile photo'),
+                               'cr_new' => L10n::t('Create New Profile'),
                                'entries' => [],
                        ];
 
@@ -383,19 +386,19 @@ class Profile
                                        $profile['menu']['entries'][] = [
                                                'photo' => $rr['thumb'],
                                                'id' => $rr['id'],
-                                               'alt' => t('Profile Image'),
+                                               'alt' => L10n::t('Profile Image'),
                                                'profile_name' => $rr['profile-name'],
                                                'isdefault' => $rr['is-default'],
-                                               'visibile_to_everybody' => t('visible to everybody'),
-                                               'edit_visibility' => t('Edit visibility'),
+                                               'visibile_to_everybody' => L10n::t('visible to everybody'),
+                                               'edit_visibility' => L10n::t('Edit visibility'),
                                        ];
                                }
                        }
                }
                if (!$is_contact && $profile['uid'] == local_user() && !Feature::isEnabled(local_user(), 'multi_profiles')) {
-                       $profile['edit'] = [System::baseUrl() . '/profiles/' . $profile['id'], t('Edit profile'), '', t('Edit profile')];
+                       $profile['edit'] = [System::baseUrl() . '/profiles/' . $profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')];
                        $profile['menu'] = [
-                               'chg_photo' => t('Change profile photo'),
+                               'chg_photo' => L10n::t('Change profile photo'),
                                'cr_new' => null,
                                'entries' => [],
                        ];
@@ -411,14 +414,14 @@ class Profile
                        || x($profile, 'postal-code')
                        || x($profile, 'country-name')
                ) {
-                       $location = t('Location:');
+                       $location = L10n::t('Location:');
                }
 
-               $gender   = x($profile, 'gender')   ? t('Gender:')   : false;
-               $marital  = x($profile, 'marital')  ? t('Status:')   : false;
-               $homepage = x($profile, 'homepage') ? t('Homepage:') : false;
-               $about    = x($profile, 'about')    ? t('About:')    : false;
-               $xmpp     = x($profile, 'xmpp')     ? t('XMPP:')     : false;
+               $gender   = x($profile, 'gender')   ? L10n::t('Gender:')   : false;
+               $marital  = x($profile, 'marital')  ? L10n::t('Status:')   : false;
+               $homepage = x($profile, 'homepage') ? L10n::t('Homepage:') : false;
+               $about    = x($profile, 'about')    ? L10n::t('About:')    : false;
+               $xmpp     = x($profile, 'xmpp')     ? L10n::t('XMPP:')     : false;
 
                if ((x($profile, 'hidewall') || $block) && !local_user() && !remote_user()) {
                        $location = $gender = $marital = $homepage = $about = false;
@@ -484,19 +487,21 @@ class Profile
                }
 
                if (isset($p['about'])) {
-                       $p['about'] = bbcode($p['about']);
+                       $p['about'] = BBCode::convert($p['about']);
                }
 
                if (isset($p['address'])) {
-                       $p['address'] = bbcode($p['address']);
+                       $p['address'] = BBCode::convert($p['address']);
                } else {
-                       $p['address'] = bbcode($p['location']);
+                       $p['address'] = BBCode::convert($p['location']);
                }
 
                if (isset($p['photo'])) {
                        $p['photo'] = proxy_url($p['photo'], false, PROXY_SIZE_SMALL);
                }
 
+               $p['url'] = self::magicLink($p['url']);
+
                $tpl = get_markup_template('profile_vcard.tpl');
                $o .= replace_macros($tpl, [
                        '$profile' => $p,
@@ -512,7 +517,7 @@ class Profile
                        '$marital' => $marital,
                        '$homepage' => $homepage,
                        '$about' => $about,
-                       '$network' => t('Network:'),
+                       '$network' => L10n::t('Network:'),
                        '$contacts' => $contacts,
                        '$updated' => $updated,
                        '$diaspora' => $diaspora,
@@ -542,8 +547,8 @@ class Profile
                *                       return $o;
                */
 
-               $bd_format = t('g A l F d'); // 8 AM Friday January 18
-               $bd_short = t('F d');
+               $bd_format = L10n::t('g A l F d'); // 8 AM Friday January 18
+               $bd_short = L10n::t('F d');
 
                $cachekey = 'get_birthdays:' . local_user();
                $r = Cache::get($cachekey);
@@ -554,16 +559,18 @@ class Profile
                                WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
                                ORDER BY `start` ASC ",
                                local_user(),
-                               datetime_convert('UTC', 'UTC', 'now + 6 days'),
-                               datetime_convert('UTC', 'UTC', 'now')
+                               DateTimeFormat::utc('now + 6 days'),
+                               DateTimeFormat::utcNow()
                        );
                        if (DBM::is_result($s)) {
                                $r = dba::inArray($s);
                                Cache::set($cachekey, $r, CACHE_HOUR);
                        }
                }
+
+               $total = 0;
+               $classtoday = '';
                if (DBM::is_result($r)) {
-                       $total = 0;
                        $now = strtotime('now');
                        $cids = [];
 
@@ -598,7 +605,7 @@ class Profile
 
                                        $rr['link'] = $url;
                                        $rr['title'] = $rr['name'];
-                                       $rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . t('[today]') : '');
+                                       $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : '');
                                        $rr['startime'] = null;
                                        $rr['today'] = $today;
                                }
@@ -609,19 +616,18 @@ class Profile
                        '$baseurl' => System::baseUrl(),
                        '$classtoday' => $classtoday,
                        '$count' => $total,
-                       '$event_reminders' => t('Birthday Reminders'),
-                       '$event_title' => t('Birthdays this week:'),
+                       '$event_reminders' => L10n::t('Birthday Reminders'),
+                       '$event_title' => L10n::t('Birthdays this week:'),
                        '$events' => $r,
                        '$lbr' => '{', // raw brackets mess up if/endif macro processing
                        '$rbr' => '}'
                ]);
        }
 
-       public static function getEvents()
+       public static function getEventsReminderHTML()
        {
-               require_once 'include/bbcode.php';
-
                $a = get_app();
+               $o = '';
 
                if (!local_user() || $a->is_mobile || $a->is_tablet) {
                        return $o;
@@ -634,16 +640,30 @@ class Profile
                *                       return $o;
                */
 
-               $bd_format = t('g A l F d'); // 8 AM Friday January 18
+               $bd_format = L10n::t('g A l F d'); // 8 AM Friday January 18
                $classtoday = '';
 
                $s = dba::p(
-                       "SELECT `event`.* FROM `event`
-                       WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
-                       ORDER BY `start` ASC ",
+                       "SELECT `event`.*
+                       FROM `event`
+                       INNER JOIN `item`
+                               ON `item`.`uid` = `event`.`uid`
+                               AND `item`.`parent-uri` = `event`.`uri`
+                       WHERE `event`.`uid` = ?
+                       AND `event`.`type` != 'birthday'
+                       AND `event`.`start` < ?
+                       AND `event`.`start` >= ?
+                       AND `item`.`author-id` = ?
+                       AND (`item`.`verb` = ? OR `item`.`verb` = ?)
+                       AND `item`.`visible`
+                       AND NOT `item`.`deleted`
+                       ORDER BY  `event`.`start` ASC",
                        local_user(),
-                       datetime_convert('UTC', 'UTC', 'now + 7 days'),
-                       datetime_convert('UTC', 'UTC', 'now - 1 days')
+                       DateTimeFormat::utc('now + 7 days'),
+                       DateTimeFormat::utc('now - 1 days'),
+                       public_contact(),
+                       ACTIVITY_ATTEND,
+                       ACTIVITY_ATTENDMAYBE
                );
 
                $r = [];
@@ -656,33 +676,33 @@ class Profile
                                        $total ++;
                                }
 
-                               $strt = datetime_convert('UTC', $rr['convert'] ? $a->timezone : 'UTC', $rr['start'], 'Y-m-d');
-                               if ($strt === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) {
+                               $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC', 'UTC', 'Y-m-d');
+                               if ($strt === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
                                        $istoday = true;
                                }
 
-                               $title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
+                               $title = strip_tags(html_entity_decode(BBCode::convert($rr['summary']), ENT_QUOTES, 'UTF-8'));
 
                                if (strlen($title) > 35) {
                                        $title = substr($title, 0, 32) . '... ';
                                }
 
-                               $description = substr(strip_tags(bbcode($rr['desc'])), 0, 32) . '... ';
+                               $description = substr(strip_tags(BBCode::convert($rr['desc'])), 0, 32) . '... ';
                                if (!$description) {
-                                       $description = t('[No description]');
+                                       $description = L10n::t('[No description]');
                                }
 
-                               $strt = datetime_convert('UTC', $rr['convert'] ? $a->timezone : 'UTC', $rr['start']);
+                               $strt = DateTimeFormat::convert($rr['start'], $rr['convert'] ? $a->timezone : 'UTC');
 
-                               if (substr($strt, 0, 10) < datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) {
+                               if (substr($strt, 0, 10) < DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) {
                                        continue;
                                }
 
-                               $today = ((substr($strt, 0, 10) === datetime_convert('UTC', $a->timezone, 'now', 'Y-m-d')) ? true : false);
+                               $today = ((substr($strt, 0, 10) === DateTimeFormat::timezoneNow($a->timezone, 'Y-m-d')) ? true : false);
 
                                $rr['title'] = $title;
                                $rr['description'] = $description;
-                               $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ? ' ' . t('[today]') : '');
+                               $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : '');
                                $rr['startime'] = $strt;
                                $rr['today'] = $today;
 
@@ -696,8 +716,8 @@ class Profile
                        '$baseurl' => System::baseUrl(),
                        '$classtoday' => $classtoday,
                        '$count' => count($r),
-                       '$event_reminders' => t('Event Reminders'),
-                       '$event_title' => t('Events this week:'),
+                       '$event_reminders' => L10n::t('Event Reminders'),
+                       '$event_title' => L10n::t('Events this week:'),
                        '$events' => $r,
                ]);
        }
@@ -709,7 +729,7 @@ class Profile
 
                $o .= replace_macros(
                        get_markup_template('section_title.tpl'),
-                       ['$title' => t('Profile')]
+                       ['$title' => L10n::t('Profile')]
                );
 
                if ($a->profile['name']) {
@@ -717,32 +737,38 @@ class Profile
 
                        $profile = [];
 
-                       $profile['fullname'] = [t('Full Name:'), $a->profile['name']];
+                       $profile['fullname'] = [L10n::t('Full Name:'), $a->profile['name']];
+
+                       if (Feature::isEnabled($uid, 'profile_membersince')) {
+                               $profile['membersince'] = [L10n::t('Member since:'), DateTimeFormat::local($a->profile['register_date'])];
+                       }
 
                        if ($a->profile['gender']) {
-                               $profile['gender'] = [t('Gender:'), $a->profile['gender']];
+                               $profile['gender'] = [L10n::t('Gender:'), $a->profile['gender']];
                        }
 
                        if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) {
-                               $year_bd_format = t('j F, Y');
-                               $short_bd_format = t('j F');
+                               $year_bd_format = L10n::t('j F, Y');
+                               $short_bd_format = L10n::t('j F');
 
-                               $val = intval($a->profile['dob']) ?
-                                       day_translate(datetime_convert('UTC', 'UTC', $a->profile['dob'] . ' 00:00 +00:00', $year_bd_format))
-                                       : day_translate(datetime_convert('UTC', 'UTC', '2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format));
+                               $val = day_translate(
+                                       intval($a->profile['dob']) ?
+                                               DateTimeFormat::utc($a->profile['dob'] . ' 00:00 +00:00', $year_bd_format)
+                                               : DateTimeFormat::utc('2001-' . substr($a->profile['dob'], 5) . ' 00:00 +00:00', $short_bd_format)
+                               );
 
-                               $profile['birthday'] = [t('Birthday:'), $val];
+                               $profile['birthday'] = [L10n::t('Birthday:'), $val];
                        }
 
                        if (!empty($a->profile['dob'])
                                && $a->profile['dob'] > '0001-01-01'
-                               && $age = age($a->profile['dob'], $a->profile['timezone'], '')
+                               && $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'], '')
                        ) {
-                               $profile['age'] = [t('Age:'), $age];
+                               $profile['age'] = [L10n::t('Age:'), $age];
                        }
 
                        if ($a->profile['marital']) {
-                               $profile['marital'] = [t('Status:'), $a->profile['marital']];
+                               $profile['marital'] = [L10n::t('Status:'), $a->profile['marital']];
                        }
 
                        /// @TODO Maybe use x() here, plus below?
@@ -751,94 +777,94 @@ class Profile
                        }
 
                        if (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
-                               $profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
+                               $profile['howlong'] = Temporal::getRelativeDate($a->profile['howlong'], L10n::t('for %1$d %2$s'));
                        }
 
                        if ($a->profile['sexual']) {
-                               $profile['sexual'] = [t('Sexual Preference:'), $a->profile['sexual']];
+                               $profile['sexual'] = [L10n::t('Sexual Preference:'), $a->profile['sexual']];
                        }
 
                        if ($a->profile['homepage']) {
-                               $profile['homepage'] = [t('Homepage:'), linkify($a->profile['homepage'])];
+                               $profile['homepage'] = [L10n::t('Homepage:'), linkify($a->profile['homepage'])];
                        }
 
                        if ($a->profile['hometown']) {
-                               $profile['hometown'] = [t('Hometown:'), linkify($a->profile['hometown'])];
+                               $profile['hometown'] = [L10n::t('Hometown:'), linkify($a->profile['hometown'])];
                        }
 
                        if ($a->profile['pub_keywords']) {
-                               $profile['pub_keywords'] = [t('Tags:'), $a->profile['pub_keywords']];
+                               $profile['pub_keywords'] = [L10n::t('Tags:'), $a->profile['pub_keywords']];
                        }
 
                        if ($a->profile['politic']) {
-                               $profile['politic'] = [t('Political Views:'), $a->profile['politic']];
+                               $profile['politic'] = [L10n::t('Political Views:'), $a->profile['politic']];
                        }
 
                        if ($a->profile['religion']) {
-                               $profile['religion'] = [t('Religion:'), $a->profile['religion']];
+                               $profile['religion'] = [L10n::t('Religion:'), $a->profile['religion']];
                        }
 
                        if ($txt = prepare_text($a->profile['about'])) {
-                               $profile['about'] = [t('About:'), $txt];
+                               $profile['about'] = [L10n::t('About:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['interest'])) {
-                               $profile['interest'] = [t('Hobbies/Interests:'), $txt];
+                               $profile['interest'] = [L10n::t('Hobbies/Interests:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['likes'])) {
-                               $profile['likes'] = [t('Likes:'), $txt];
+                               $profile['likes'] = [L10n::t('Likes:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['dislikes'])) {
-                               $profile['dislikes'] = [t('Dislikes:'), $txt];
+                               $profile['dislikes'] = [L10n::t('Dislikes:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['contact'])) {
-                               $profile['contact'] = [t('Contact information and Social Networks:'), $txt];
+                               $profile['contact'] = [L10n::t('Contact information and Social Networks:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['music'])) {
-                               $profile['music'] = [t('Musical interests:'), $txt];
+                               $profile['music'] = [L10n::t('Musical interests:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['book'])) {
-                               $profile['book'] = [t('Books, literature:'), $txt];
+                               $profile['book'] = [L10n::t('Books, literature:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['tv'])) {
-                               $profile['tv'] = [t('Television:'), $txt];
+                               $profile['tv'] = [L10n::t('Television:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['film'])) {
-                               $profile['film'] = [t('Film/dance/culture/entertainment:'), $txt];
+                               $profile['film'] = [L10n::t('Film/dance/culture/entertainment:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['romance'])) {
-                               $profile['romance'] = [t('Love/Romance:'), $txt];
+                               $profile['romance'] = [L10n::t('Love/Romance:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['work'])) {
-                               $profile['work'] = [t('Work/employment:'), $txt];
+                               $profile['work'] = [L10n::t('Work/employment:'), $txt];
                        }
 
                        if ($txt = prepare_text($a->profile['education'])) {
-                               $profile['education'] = [t('School/education:'), $txt];
+                               $profile['education'] = [L10n::t('School/education:'), $txt];
                        }
 
                        //show subcribed forum if it is enabled in the usersettings
                        if (Feature::isEnabled($uid, 'forumlist_profile')) {
-                               $profile['forumlist'] = [t('Forums:'), ForumManager::profileAdvanced($uid)];
+                               $profile['forumlist'] = [L10n::t('Forums:'), ForumManager::profileAdvanced($uid)];
                        }
 
                        if ($a->profile['uid'] == local_user()) {
-                               $profile['edit'] = [System::baseUrl() . '/profiles/' . $a->profile['id'], t('Edit profile'), '', t('Edit profile')];
+                               $profile['edit'] = [System::baseUrl() . '/profiles/' . $a->profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')];
                        }
 
                        return replace_macros($tpl, [
-                               '$title' => t('Profile'),
-                               '$basic' => t('Basic'),
-                               '$advanced' => t('Advanced'),
+                               '$title' => L10n::t('Profile'),
+                               '$basic' => L10n::t('Basic'),
+                               '$advanced' => L10n::t('Advanced'),
                                '$profile' => $profile
                        ]);
                }
@@ -861,34 +887,34 @@ class Profile
 
                $tabs = [
                        [
-                               'label' => t('Status'),
+                               'label' => L10n::t('Status'),
                                'url'   => $url,
                                'sel'   => !$tab && $a->argv[0] == 'profile' ? 'active' : '',
-                               'title' => t('Status Messages and Posts'),
+                               'title' => L10n::t('Status Messages and Posts'),
                                'id'    => 'status-tab',
                                'accesskey' => 'm',
                        ],
                        [
-                               'label' => t('Profile'),
+                               'label' => L10n::t('Profile'),
                                'url'   => $url . '/?tab=profile',
                                'sel'   => $tab == 'profile' ? 'active' : '',
-                               'title' => t('Profile Details'),
+                               'title' => L10n::t('Profile Details'),
                                'id'    => 'profile-tab',
                                'accesskey' => 'r',
                        ],
                        [
-                               'label' => t('Photos'),
+                               'label' => L10n::t('Photos'),
                                'url'   => System::baseUrl() . '/photos/' . $nickname,
                                'sel'   => !$tab && $a->argv[0] == 'photos' ? 'active' : '',
-                               'title' => t('Photo Albums'),
+                               'title' => L10n::t('Photo Albums'),
                                'id'    => 'photo-tab',
                                'accesskey' => 'h',
                        ],
                        [
-                               'label' => t('Videos'),
+                               'label' => L10n::t('Videos'),
                                'url'   => System::baseUrl() . '/videos/' . $nickname,
                                'sel'   => !$tab && $a->argv[0] == 'videos' ? 'active' : '',
-                               'title' => t('Videos'),
+                               'title' => L10n::t('Videos'),
                                'id'    => 'video-tab',
                                'accesskey' => 'v',
                        ],
@@ -897,10 +923,10 @@ class Profile
                // the calendar link for the full featured events calendar
                if ($is_owner && $a->theme_events_in_profile) {
                        $tabs[] = [
-                               'label' => t('Events'),
+                               'label' => L10n::t('Events'),
                                'url'   => System::baseUrl() . '/events',
                                'sel'   => !$tab && $a->argv[0] == 'events' ? 'active' : '',
-                               'title' => t('Events and Calendar'),
+                               'title' => L10n::t('Events and Calendar'),
                                'id'    => 'events-tab',
                                'accesskey' => 'e',
                        ];
@@ -908,10 +934,10 @@ class Profile
                        // with the public events of the calendar owner
                } elseif (!$is_owner) {
                        $tabs[] = [
-                               'label' => t('Events'),
+                               'label' => L10n::t('Events'),
                                'url'   => System::baseUrl() . '/cal/' . $nickname,
                                'sel'   => !$tab && $a->argv[0] == 'cal' ? 'active' : '',
-                               'title' => t('Events and Calendar'),
+                               'title' => L10n::t('Events and Calendar'),
                                'id'    => 'events-tab',
                                'accesskey' => 'e',
                        ];
@@ -919,10 +945,10 @@ class Profile
 
                if ($is_owner) {
                        $tabs[] = [
-                               'label' => t('Personal Notes'),
+                               'label' => L10n::t('Personal Notes'),
                                'url'   => System::baseUrl() . '/notes',
                                'sel'   => !$tab && $a->argv[0] == 'notes' ? 'active' : '',
-                               'title' => t('Only You Can See This'),
+                               'title' => L10n::t('Only You Can See This'),
                                'id'    => 'notes-tab',
                                'accesskey' => 't',
                        ];
@@ -930,10 +956,10 @@ class Profile
 
                if ((!$is_owner) && ((count($a->profile)) || (!$a->profile['hide-friends']))) {
                        $tabs[] = [
-                               'label' => t('Contacts'),
+                               'label' => L10n::t('Contacts'),
                                'url'   => System::baseUrl() . '/viewcontacts/' . $nickname,
                                'sel'   => !$tab && $a->argv[0] == 'viewcontacts' ? 'active' : '',
-                               'title' => t('Contacts'),
+                               'title' => L10n::t('Contacts'),
                                'id'    => 'viewcontacts-tab',
                                'accesskey' => 'k',
                        ];
@@ -963,7 +989,7 @@ class Profile
        public static function zrlInit(App $a)
        {
                $my_url = self::getMyURL();
-               $my_url = validate_url($my_url);
+               $my_url = Network::isUrlValid($my_url);
                if ($my_url) {
                        // Is it a DDoS attempt?
                        // The check fetches the cached value from gprobe to reduce the load for this system
@@ -981,6 +1007,29 @@ class Profile
                }
        }
 
+       /**
+        * @brief Returns a magic link to authenticate remote visitors
+        *
+        * @param string $contact_url The address of the contact profile
+        * @param integer $uid The user id, "local_user" is the default
+        *
+        * @return string with "redir" link
+        */
+       public static function magicLink($contact_url, $uid = -1)
+       {
+               if ($uid == -1) {
+                       $uid = local_user();
+               }
+               $condition = ['pending' => false, 'uid' => $uid,
+                               'nurl' => normalise_link($contact_url),
+                               'network' => NETWORK_DFRN, 'self' => false];
+               $contact = dba::selectFirst('contact', ['id'], $condition);
+               if (DBM::is_result($contact)) {
+                       return System::baseUrl() . '/redir/' . $contact['id'];
+               }
+               return self::zrl($contact_url);
+       }
+
        public static function zrl($s, $force = false)
        {
                if (!strlen($s)) {