X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FProfile.php;h=a73c8410b31ba12a114b85cf8e31fee9d2c93c8b;hb=c5558cc4595263e2654bb614f54d61273d79bc5f;hp=81a7630bbdda6027222d28a4bf04f2ee99f1af5a;hpb=a71eb1d127beb7a0fa5ed504c8f431ef13e43e8d;p=friendica.git diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 81a7630bbd..a73c8410b3 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -25,6 +25,7 @@ use Friendica\Protocol\Diaspora; use Friendica\Util\DateTimeFormat; use Friendica\Util\Network; use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; use Friendica\Util\Temporal; require_once 'include/dba.php'; @@ -287,7 +288,7 @@ class Profile $location = false; // This function can also use contact information in $profile - $is_contact = x($profile, 'cid'); + $is_contact = !empty($profile['cid']); if (!is_array($profile) && !count($profile)) { return $o; @@ -296,7 +297,7 @@ class Profile $profile['picdate'] = urlencode(defaults($profile, 'picdate', '')); if (($profile['network'] != '') && ($profile['network'] != Protocol::DFRN)) { - $profile['network_name'] = format_network_name($profile['network'], $profile['url']); + $profile['network_name'] = Strings::formatNetworkName($profile['network'], $profile['url']); } else { $profile['network_name'] = ''; } @@ -326,9 +327,9 @@ class Profile // Is the local user already connected to that user? if ($connect && local_user()) { if (isset($profile['url'])) { - $profile_url = normalise_link($profile['url']); + $profile_url = Strings::normaliseLink($profile['url']); } else { - $profile_url = normalise_link(System::baseUrl() . '/profile/' . $profile['nickname']); + $profile_url = Strings::normaliseLink(System::baseUrl() . '/profile/' . $profile['nickname']); } if (DBA::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) { @@ -356,7 +357,7 @@ class Profile // See issue https://github.com/friendica/friendica/issues/3838 // Either we remove the message link for remote users or we enable creating messages from remote users - if (remote_user() || (self::getMyURL() && x($profile, 'unkmail') && ($profile['uid'] != local_user()))) { + if (remote_user() || (self::getMyURL() && !empty($profile['unkmail']) && ($profile['uid'] != local_user()))) { $wallmessage = L10n::t('Message'); if (remote_user()) { @@ -370,7 +371,7 @@ class Profile $r = q( "SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d", intval($profile['uid']), - DBA::escape(normalise_link(self::getMyURL())), + DBA::escape(Strings::normaliseLink(self::getMyURL())), intval(Contact::FRIEND) ); } @@ -423,23 +424,23 @@ class Profile // Fetch the account type $account_type = Contact::getAccountType($profile); - if (x($profile, 'address') - || x($profile, 'location') - || x($profile, 'locality') - || x($profile, 'region') - || x($profile, 'postal-code') - || x($profile, 'country-name') + if (!empty($profile['address']) + || !empty($profile['location']) + || !empty($profile['locality']) + || !empty($profile['region']) + || !empty($profile['postal-code']) + || !empty($profile['country-name']) ) { $location = L10n::t('Location:'); } - $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; + $gender = !empty($profile['gender']) ? L10n::t('Gender:') : false; + $marital = !empty($profile['marital']) ? L10n::t('Status:') : false; + $homepage = !empty($profile['homepage']) ? L10n::t('Homepage:') : false; + $about = !empty($profile['about']) ? L10n::t('About:') : false; + $xmpp = !empty($profile['xmpp']) ? L10n::t('XMPP:') : false; - if ((x($profile, 'hidewall') || $block) && !local_user() && !remote_user()) { + if ((!empty($profile['hidewall']) || $block) && !local_user() && !remote_user()) { $location = $gender = $marital = $homepage = $about = false; } @@ -447,7 +448,7 @@ class Profile $firstname = $split_name['first']; $lastname = $split_name['last']; - if (x($profile, 'guid')) { + if (!empty($profile['guid'])) { $diaspora = [ 'guid' => $profile['guid'], 'podloc' => System::baseUrl(), @@ -571,9 +572,18 @@ class Profile if (is_null($r)) { $s = DBA::p( "SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event` - INNER JOIN `contact` ON `contact`.`id` = `event`.`cid` + INNER JOIN `contact` + ON `contact`.`id` = `event`.`cid` + AND (`contact`.`rel` = ? OR `contact`.`rel` = ?) + AND NOT `contact`.`pending` + AND NOT `contact`.`hidden` + AND NOT `contact`.`blocked` + AND NOT `contact`.`archive` + AND NOT `contact`.`deleted` WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ? ORDER BY `start` ASC ", + Contact::SHARING, + Contact::FRIEND, local_user(), DateTimeFormat::utc('now + 6 days'), DateTimeFormat::utcNow() @@ -617,7 +627,7 @@ class Profile $rr['link'] = Contact::magicLink($rr['url']); $rr['title'] = $rr['name']; - $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : ''); + $rr['date'] = L10n::getDay(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . L10n::t('[today]') : ''); $rr['startime'] = null; $rr['today'] = $today; } @@ -703,7 +713,7 @@ class Profile $rr['title'] = $title; $rr['description'] = $description; - $rr['date'] = day_translate(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : ''); + $rr['date'] = L10n::getDay(DateTimeFormat::convert($rr['start'], $rr['adjust'] ? $a->timezone : 'UTC', 'UTC', $bd_format)) . (($today) ? ' ' . L10n::t('[today]') : ''); $rr['startime'] = $strt; $rr['today'] = $today; @@ -748,11 +758,11 @@ class Profile $profile['gender'] = [L10n::t('Gender:'), $a->profile['gender']]; } - if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) { + if (!empty($a->profile['dob']) && $a->profile['dob'] > DBA::NULL_DATE) { $year_bd_format = L10n::t('j F, Y'); $short_bd_format = L10n::t('j F'); - $val = day_translate( + $val = L10n::getDay( 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) @@ -762,7 +772,7 @@ class Profile } if (!empty($a->profile['dob']) - && $a->profile['dob'] > '0001-01-01' + && $a->profile['dob'] > DBA::NULL_DATE && $age = Temporal::getAgeByTimezone($a->profile['dob'], $a->profile['timezone'], '') ) { $profile['age'] = [L10n::t('Age:'), $age]; @@ -880,8 +890,8 @@ class Profile } $tab = false; - if (x($_GET, 'tab')) { - $tab = notags(trim($_GET['tab'])); + if (!empty($_GET['tab'])) { + $tab = Strings::escapeTags(trim($_GET['tab'])); } $url = System::baseUrl() . '/profile/' . $nickname; @@ -991,7 +1001,7 @@ class Profile */ public static function getMyURL() { - if (x($_SESSION, 'my_url')) { + if (!empty($_SESSION['my_url'])) { return $_SESSION['my_url']; } return null; @@ -1140,7 +1150,7 @@ class Profile } $achar = strpos($s, '?') ? '&' : '?'; $mine = self::getMyURL(); - if ($mine && !link_compare($mine, $s)) { + if ($mine && !Strings::compareLink($mine, $s)) { return $s . $achar . 'zrl=' . urlencode($mine); } return $s; @@ -1163,7 +1173,7 @@ class Profile */ public static function getThemeUid() { - $uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0); + $uid = (!empty($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0); if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (!$uid))) { return local_user(); }