X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=ec53d064d6b83704d24ff2bd99f8a5b6c8f96640;hb=5c2b54009e0d1ef8b283fbf8b6937f00a253ae61;hp=a7f35f578213442158381d6a5ad0f7ed15ace67b;hpb=4cfa46186a54c2a0fdffe0f56481f1a764f9a6a1;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index a7f35f5782..ec53d064d6 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -1,24 +1,29 @@ $nickname]); 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; } @@ -101,18 +104,18 @@ class Profile } if ($profiledata) { - $a->page['aside'] .= profile_sidebar($profiledata, true, $show_connect); + $a->page['aside'] .= self::sidebar($profiledata, true, $show_connect); if (!DBM::is_result($user)) { return; } } - $pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile); + $pdata = self::getByNickname($nickname, $user[0]['uid'], $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; } @@ -161,10 +164,10 @@ class Profile if (local_user() && local_user() == $a->profile['uid'] && $profiledata) { $a->page['aside'] .= replace_macros( get_markup_template('profile_edlink.tpl'), - array( - '$editprofile' => t('Edit profile'), + [ + '$editprofile' => L10n::t('Edit profile'), '$profid' => $a->profile['id'] - ) + ] ); } @@ -176,14 +179,14 @@ class Profile * But: When this profile was on the same server, then we could display the contacts */ if (!$profiledata) { - $a->page['aside'] .= profile_sidebar($a->profile, $block, $show_connect); + $a->page['aside'] .= self::sidebar($a->profile, $block, $show_connect); } return; } /** - * @brief Get all profil data of a local user + * Get all profile data of a local user * * If the viewer is an authenticated remote viewer, the profile displayed is the * one that has been configured for his/her viewing in the Contact manager. @@ -192,12 +195,13 @@ class Profile * * Includes all available profile data * + * @brief Get all profile data of a local user * @param string $nickname nick * @param int $uid uid * @param int $profile_id ID of the profile - * @returns array + * @return array */ - function get_profiledata_by_nick($nickname, $uid = 0, $profile_id = 0) + public static function getByNickname($nickname, $uid = 0, $profile_id = 0) { if (remote_user() && count($_SESSION['remote'])) { foreach ($_SESSION['remote'] as $visitor) { @@ -245,16 +249,17 @@ class Profile } /** - * @brief Formats a profile for display in the sidebar. + * Formats a profile for display in the sidebar. * * It is very difficult to templatise the HTML completely * because of all the conditional logic. * + * @brief Formats a profile for display in the sidebar. * @param array $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 * @@ -263,7 +268,7 @@ class Profile * @hooks 'profile_sidebar' * array $arr */ - function profile_sidebar($profile, $block = 0, $show_connect = true) + private static function sidebar($profile, $block = 0, $show_connect = true) { $a = get_app(); @@ -285,11 +290,11 @@ class Profile $profile['network_name'] = ''; } - call_hooks('profile_sidebar_enter', $profile); + Addon::callHooks('profile_sidebar_enter', $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'])) { @@ -313,7 +318,7 @@ class Profile $profile_url = normalise_link(System::baseUrl() . '/profile/' . $profile['nickname']); } - if (dba::exists('contact', array('pending' => false, 'uid' => local_user(), 'nurl' => $profile_url))) { + if (dba::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) { $connect = false; } } @@ -328,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() || (get_my_url() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) { - $wallmessage = t('Message'); + if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) { + $wallmessage = L10n::t('Message'); $wallmessage_link = 'wallmessage/' . $profile['nickname']; if (remote_user()) { @@ -348,7 +353,7 @@ class Profile $r = q( "SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d", intval($profile['uid']), - dbesc(normalise_link(get_my_url())), + dbesc(normalise_link(self::getMyURL())), intval(CONTACT_IS_FRIEND) ); } @@ -364,39 +369,39 @@ class Profile // show edit profile to yourself if (!$is_contact && $profile['uid'] == local_user() && Feature::isEnabled(local_user(), 'multi_profiles')) { - $profile['edit'] = array(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'] = array( - 'chg_photo' => t('Change profile photo'), - 'cr_new' => t('Create New Profile'), - 'entries' => array(), - ); + $profile['menu'] = [ + 'chg_photo' => L10n::t('Change profile photo'), + 'cr_new' => L10n::t('Create New Profile'), + 'entries' => [], + ]; if (DBM::is_result($r)) { foreach ($r as $rr) { - $profile['menu']['entries'][] = array( + $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'] = array(System::baseUrl() . '/profiles/' . $profile['id'], t('Edit profile'), '', t('Edit profile')); - $profile['menu'] = array( - 'chg_photo' => t('Change profile photo'), + $profile['edit'] = [System::baseUrl() . '/profiles/' . $profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')]; + $profile['menu'] = [ + 'chg_photo' => L10n::t('Change profile photo'), 'cr_new' => null, - 'entries' => array(), - ); + 'entries' => [], + ]; } // Fetch the account type @@ -409,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; @@ -427,7 +432,7 @@ class Profile $lastname = $split_name['last']; if (x($profile, 'guid')) { - $diaspora = array( + $diaspora = [ 'guid' => $profile['guid'], 'podloc' => System::baseUrl(), 'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ), @@ -438,7 +443,7 @@ class Profile 'photo300' => $profile['contact_photo'], 'photo100' => $profile['contact_thumb'], 'photo50' => $profile['contact_micro'], - ); + ]; } else { $diaspora = false; } @@ -475,28 +480,30 @@ class Profile } } - $p = array(); + $p = []; foreach ($profile as $k => $v) { $k = str_replace('-', '_', $k); $p[$k] = $v; } 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, array( + $o .= replace_macros($tpl, [ '$profile' => $p, '$xmpp' => $xmpp, '$connect' => $connect, @@ -510,21 +517,21 @@ class Profile '$marital' => $marital, '$homepage' => $homepage, '$about' => $about, - '$network' => t('Network:'), + '$network' => L10n::t('Network:'), '$contacts' => $contacts, '$updated' => $updated, '$diaspora' => $diaspora, '$contact_block' => $contact_block, - )); + ]); - $arr = array('profile' => &$profile, 'entry' => &$o); + $arr = ['profile' => &$profile, 'entry' => &$o]; - call_hooks('profile_sidebar', $arr); + Addon::callHooks('profile_sidebar', $arr); return $o; } - function get_birthdays() + public static function getBirthdays() { $a = get_app(); $o = ''; @@ -540,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); @@ -552,18 +559,20 @@ 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 = array(); + $cids = []; $istoday = false; foreach ($r as $rr) { @@ -596,30 +605,29 @@ 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; } } } $tpl = get_markup_template('birthdays_reminder.tpl'); - return replace_macros($tpl, array( + return replace_macros($tpl, [ '$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' => '}' - )); + ]); } - function get_events() + public static function getEventsReminderHTML() { - require_once 'include/bbcode.php'; - $a = get_app(); + $o = ''; if (!local_user() || $a->is_mobile || $a->is_tablet) { return $o; @@ -632,19 +640,33 @@ 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 * + FROM `event` + WHERE `event`.`uid` = ? + AND `event`.`type` != 'birthday' + AND `event`.`start` < ? + AND `event`.`start` >= ? + AND NOT EXISTS ( + SELECT `id` + FROM `item` + WHERE `item`.`uid` = `event`.`uid` + AND `item`.`parent-uri` = `event`.`uri` + AND `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'), + ACTIVITY_ATTENDNO ); - $r = array(); + $r = []; if (DBM::is_result($s)) { $istoday = false; @@ -654,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; @@ -690,57 +712,63 @@ class Profile $classtoday = (($istoday) ? 'event-today' : ''); } $tpl = get_markup_template('events_reminder.tpl'); - return replace_macros($tpl, array( + return replace_macros($tpl, [ '$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, - )); + ]); } - function advanced_profile(App $a) + public static function getAdvanced(App $a) { $o = ''; $uid = $a->profile['uid']; $o .= replace_macros( get_markup_template('section_title.tpl'), - array('$title' => t('Profile')) + ['$title' => L10n::t('Profile')] ); if ($a->profile['name']) { $tpl = get_markup_template('profile_advanced.tpl'); - $profile = array(); + $profile = []; + + $profile['fullname'] = [L10n::t('Full Name:'), $a->profile['name']]; - $profile['fullname'] = array(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'] = array(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'] = array(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'] = array(t('Age:'), $age); + $profile['age'] = [L10n::t('Age:'), $age]; } if ($a->profile['marital']) { - $profile['marital'] = array(t('Status:'), $a->profile['marital']); + $profile['marital'] = [L10n::t('Status:'), $a->profile['marital']]; } /// @TODO Maybe use x() here, plus below? @@ -749,102 +777,102 @@ 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'] = array(t('Sexual Preference:'), $a->profile['sexual']); + $profile['sexual'] = [L10n::t('Sexual Preference:'), $a->profile['sexual']]; } if ($a->profile['homepage']) { - $profile['homepage'] = array(t('Homepage:'), linkify($a->profile['homepage'])); + $profile['homepage'] = [L10n::t('Homepage:'), linkify($a->profile['homepage'])]; } if ($a->profile['hometown']) { - $profile['hometown'] = array(t('Hometown:'), linkify($a->profile['hometown'])); + $profile['hometown'] = [L10n::t('Hometown:'), linkify($a->profile['hometown'])]; } if ($a->profile['pub_keywords']) { - $profile['pub_keywords'] = array(t('Tags:'), $a->profile['pub_keywords']); + $profile['pub_keywords'] = [L10n::t('Tags:'), $a->profile['pub_keywords']]; } if ($a->profile['politic']) { - $profile['politic'] = array(t('Political Views:'), $a->profile['politic']); + $profile['politic'] = [L10n::t('Political Views:'), $a->profile['politic']]; } if ($a->profile['religion']) { - $profile['religion'] = array(t('Religion:'), $a->profile['religion']); + $profile['religion'] = [L10n::t('Religion:'), $a->profile['religion']]; } if ($txt = prepare_text($a->profile['about'])) { - $profile['about'] = array(t('About:'), $txt); + $profile['about'] = [L10n::t('About:'), $txt]; } if ($txt = prepare_text($a->profile['interest'])) { - $profile['interest'] = array(t('Hobbies/Interests:'), $txt); + $profile['interest'] = [L10n::t('Hobbies/Interests:'), $txt]; } if ($txt = prepare_text($a->profile['likes'])) { - $profile['likes'] = array(t('Likes:'), $txt); + $profile['likes'] = [L10n::t('Likes:'), $txt]; } if ($txt = prepare_text($a->profile['dislikes'])) { - $profile['dislikes'] = array(t('Dislikes:'), $txt); + $profile['dislikes'] = [L10n::t('Dislikes:'), $txt]; } if ($txt = prepare_text($a->profile['contact'])) { - $profile['contact'] = array(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'] = array(t('Musical interests:'), $txt); + $profile['music'] = [L10n::t('Musical interests:'), $txt]; } if ($txt = prepare_text($a->profile['book'])) { - $profile['book'] = array(t('Books, literature:'), $txt); + $profile['book'] = [L10n::t('Books, literature:'), $txt]; } if ($txt = prepare_text($a->profile['tv'])) { - $profile['tv'] = array(t('Television:'), $txt); + $profile['tv'] = [L10n::t('Television:'), $txt]; } if ($txt = prepare_text($a->profile['film'])) { - $profile['film'] = array(t('Film/dance/culture/entertainment:'), $txt); + $profile['film'] = [L10n::t('Film/dance/culture/entertainment:'), $txt]; } if ($txt = prepare_text($a->profile['romance'])) { - $profile['romance'] = array(t('Love/Romance:'), $txt); + $profile['romance'] = [L10n::t('Love/Romance:'), $txt]; } if ($txt = prepare_text($a->profile['work'])) { - $profile['work'] = array(t('Work/employment:'), $txt); + $profile['work'] = [L10n::t('Work/employment:'), $txt]; } if ($txt = prepare_text($a->profile['education'])) { - $profile['education'] = array(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'] = array(t('Forums:'), ForumManager::profileAdvanced($uid)); + $profile['forumlist'] = [L10n::t('Forums:'), ForumManager::profileAdvanced($uid)]; } if ($a->profile['uid'] == local_user()) { - $profile['edit'] = array(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, array( - '$title' => t('Profile'), - '$basic' => t('Basic'), - '$advanced' => t('Advanced'), + return replace_macros($tpl, [ + '$title' => L10n::t('Profile'), + '$basic' => L10n::t('Basic'), + '$advanced' => L10n::t('Advanced'), '$profile' => $profile - )); + ]); } return ''; } - function profile_tabs($a, $is_owner = false, $nickname = null) + public static function getTabs($a, $is_owner = false, $nickname = null) { if (is_null($nickname)) { $nickname = $a->user['nickname']; @@ -857,92 +885,92 @@ class Profile $url = System::baseUrl() . '/profile/' . $nickname; - $tabs = array( - array( - 'label' => t('Status'), + $tabs = [ + [ + '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', - ), - array( - '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', - ), - array( - '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', - ), - array( - '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', - ), - ); + ], + ]; // the calendar link for the full featured events calendar if ($is_owner && $a->theme_events_in_profile) { - $tabs[] = array( - 'label' => t('Events'), + $tabs[] = [ + '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', - ); + ]; // if the user is not the owner of the calendar we only show a calendar // with the public events of the calendar owner } elseif (!$is_owner) { - $tabs[] = array( - 'label' => t('Events'), + $tabs[] = [ + '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', - ); + ]; } if ($is_owner) { - $tabs[] = array( - 'label' => t('Personal Notes'), + $tabs[] = [ + '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', - ); + ]; } if ((!$is_owner) && ((count($a->profile)) || (!$a->profile['hide-friends']))) { - $tabs[] = array( - 'label' => t('Contacts'), + $tabs[] = [ + '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', - ); + ]; } - $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $tab, 'tabs' => $tabs); - call_hooks('profile_tabs', $arr); + $arr = ['is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => $tab, 'tabs' => $tabs]; + Addon::callHooks('profile_tabs', $arr); $tpl = get_markup_template('common_tabs.tpl'); - return replace_macros($tpl, array('$tabs' => $arr['tabs'])); + return replace_macros($tpl, ['$tabs' => $arr['tabs']]); } /** @@ -950,7 +978,7 @@ class Profile * * @return string */ - function get_my_url() + public static function getMyURL() { if (x($_SESSION, 'my_url')) { return $_SESSION['my_url']; @@ -958,28 +986,51 @@ class Profile return null; } - function zrl_init(App $a) + public static function zrlInit(App $a) { - $my_url = get_my_url(); - $my_url = validate_url($my_url); + $my_url = self::getMyURL(); + $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 $urlparts = parse_url($my_url); $result = Cache::get('gprobe:' . $urlparts['host']); - if ((!is_null($result)) && (in_array($result['network'], array(NETWORK_FEED, NETWORK_PHANTOM)))) { + if ((!is_null($result)) && (in_array($result['network'], [NETWORK_FEED, NETWORK_PHANTOM]))) { logger('DDoS attempt detected for ' . $urlparts['host'] . ' by ' . $_SERVER['REMOTE_ADDR'] . '. server data: ' . print_r($_SERVER, true), LOGGER_DEBUG); return; } Worker::add(PRIORITY_LOW, 'GProbe', $my_url); - $arr = array('zrl' => $my_url, 'url' => $a->cmd); - call_hooks('zrl_init', $arr); + $arr = ['zrl' => $my_url, 'url' => $a->cmd]; + Addon::callHooks('zrl_init', $arr); } } - function zrl($s, $force = false) + /** + * @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)) { return $s; @@ -991,7 +1042,7 @@ class Profile $s = $s . '/'; } $achar = strpos($s, '?') ? '&' : '?'; - $mine = get_my_url(); + $mine = self::getMyURL(); if ($mine && !link_compare($mine, $s)) { return $s . $achar . 'zrl=' . urlencode($mine); } @@ -999,7 +1050,7 @@ class Profile } /** - * @brief Get the user ID of the page owner + * Get the user ID of the page owner. * * Used from within PCSS themes to set theme parameters. If there's a * puid request variable, that is the "page owner" and normally their theme @@ -1007,12 +1058,13 @@ class Profile * system pconfig, which means they don't want to see anybody else's theme * settings except their own while on this site. * + * @brief Get the user ID of the page owner * @return int user ID * * @note Returns local_user instead of user ID if "always_my_theme" * is set to true */ - function get_theme_uid() + public static function getThemeUid() { $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0); if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (!$uid))) { @@ -1021,5 +1073,4 @@ class Profile return $uid; } - }