use Friendica\Core\Cache\Duration;
use Friendica\Core\Hook;
use Friendica\Core\Logger;
-use Friendica\Network\Probe;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Session;
}
}
- $profile = self::getByNickname($nickname, $user['uid']);
+ $profile = !empty($user['uid']) ? User::getOwnerDataById($user['uid'], false) : [];
if (empty($profile) && empty($profiledata)) {
Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
* @hooks 'profile_sidebar'
* array $arr
*/
- private static function sidebar(App $a, $profile, $block = 0, $show_connect = true)
+ private static function sidebar(App $a, array $profile, $block = 0, $show_connect = true)
{
$o = '';
$location = false;
// This function can also use contact information in $profile
$is_contact = !empty($profile['cid']);
- if (!is_array($profile) && !count($profile)) {
+ if (empty($profile['nickname'])) {
+ Logger::warning('Received profile with no nickname', ['profile' => $profile, 'callstack' => System::callstack(10)]);
return $o;
}
$subscribe_feed_link = null;
$wallmessage_link = null;
-
-
$visitor_contact = [];
if (!empty($profile['uid']) && self::getMyURL()) {
$visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]);
$profile_is_dfrn = $profile['network'] == Protocol::DFRN;
$profile_is_native = in_array($profile['network'], Protocol::NATIVE_SUPPORT);
- $local_user_is_self = local_user() && local_user() == ($profile['uid'] ?? 0);
+ $local_user_is_self = self::getMyURL() && ($profile['url'] == self::getMyURL());
$visitor_is_authenticated = (bool)self::getMyURL();
$visitor_is_following =
in_array($visitor_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND])
}
} elseif ($profile_is_native) {
if ($visitor_is_following) {
- $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url);
+ $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url) . '&auto=1';
} else {
- $follow_link = $visitor_base_path .'/follow?url=' . urlencode($profile_url);
+ $follow_link = $visitor_base_path .'/follow?url=' . urlencode($profile_url) . '&auto=1';
}
}
// Fetch the account type
$account_type = Contact::getAccountType($profile);
- if (!empty($profile['address'])
- || !empty($profile['location'])
- || !empty($profile['locality'])
- || !empty($profile['region'])
- || !empty($profile['postal-code'])
- || !empty($profile['country-name'])
- ) {
+ if (!empty($profile['address']) || !empty($profile['location'])) {
$location = DI::l10n()->t('Location:');
}
'pending' => false,
'hidden' => false,
'archive' => false,
+ 'failed' => false,
'network' => Protocol::FEDERATED,
]);
}
$p['about'] = BBCode::convert($p['about']);
}
- if (empty($p['address']) && !empty($p['location'])) {
- $p['address'] = $p['location'];
- }
-
if (isset($p['address'])) {
$p['address'] = BBCode::convert($p['address']);
}
while ($rr = DBA::fetch($s)) {
$condition = ['parent-uri' => $rr['uri'], 'uid' => $rr['uid'], 'author-id' => public_contact(),
- 'activity' => [Item::activityToIndex( Activity::ATTEND), Item::activityToIndex(Activity::ATTENDMAYBE)],
+ 'vid' => [Verb::getID(Activity::ATTEND), Verb::getID(Activity::ATTENDMAYBE)],
'visible' => true, 'deleted' => false];
if (!Item::exists($condition)) {
continue;
$magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
// We have to check if the remote server does understand /magic without invoking something
- $serverret = Network::curl($basepath . '/magic');
+ $serverret = DI::httpRequest()->get($basepath . '/magic');
if ($serverret->isSuccess()) {
Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG);
System::externalRedirect($magic_path);
$_SESSION['visitor_handle'] = $visitor['addr'];
$_SESSION['visitor_home'] = $visitor['url'];
$_SESSION['my_url'] = $visitor['url'];
- $_SESSION['remote_comment'] = Probe::getRemoteFollowLink($visitor['url']);
+ $_SESSION['remote_comment'] = $visitor['subscribe'];
Session::setVisitorsContacts();
*/
public static function searchProfiles($start = 0, $count = 100, $search = null)
{
- $publish = (DI::config()->get('system', 'publish_all') ? '' : "AND `publish` = 1");
- $total = 0;
-
if (!empty($search)) {
+ $publish = (DI::config()->get('system', 'publish_all') ? '' : "AND `publish` ");
$searchTerm = '%' . $search . '%';
- $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `owner-view`
- WHERE $publish AND NOT `blocked` AND NOT `account_removed`
+ $condition = ["NOT `blocked` AND NOT `account_removed`
+ $publish
AND ((`name` LIKE ?) OR
(`nickname` LIKE ?) OR
(`about` LIKE ?) OR
(`country-name` LIKE ?) OR
(`pub_keywords` LIKE ?) OR
(`prv_keywords` LIKE ?))",
- $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm);
+ $searchTerm, $searchTerm, $searchTerm, $searchTerm,
+ $searchTerm, $searchTerm, $searchTerm, $searchTerm];
} else {
- $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
- FROM `owner-view` WHERE $publish AND NOT `blocked` AND NOT `account_removed`");
- }
-
- if (DBA::isResult($cnt)) {
- $total = $cnt['total'];
+ $condition = ['blocked' => false, 'account_removed' => false];
+ if (!DI::config()->get('system', 'publish_all')) {
+ $condition['publish'] = true;
+ }
}
- $order = " ORDER BY `name` ASC ";
- $profiles = [];
+ $total = DBA::count('owner-view', $condition);
// If nothing found, don't try to select details
if ($total > 0) {
- if (!empty($search)) {
- $searchTerm = '%' . $search . '%';
-
- $profiles = DBA::p("SELECT * FROM `owner-view`
- WHERE $publish AND NOT `blocked` AND NOT `account_removed`
- AND ((`name` LIKE ?) OR
- (`nickname` LIKE ?) OR
- (`about` LIKE ?) OR
- (`locality` LIKE ?) OR
- (`region` LIKE ?) OR
- (`country-name` LIKE ?) OR
- (`pub_keywords` LIKE ?) OR
- (`prv_keywords` LIKE ?))
- $order LIMIT ?,?",
- $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
- $start, $count
- );
- } else {
- $profiles = DBA::p("SELECT * FROM `owner-view`
- WHERE $publish AND NOT `blocked` AND NOT `account_removed` $order LIMIT ?,?", $start, $count);
- }
- }
-
- if (DBA::isResult($profiles) && $total > 0) {
- return [
- 'total' => $total,
- 'entries' => DBA::toArray($profiles),
- ];
-
+ $profiles = DBA::selectToArray('owner-view', [], $condition, ['order' => ['name'], 'limit' => [$start, $count]]);
} else {
- return [
- 'total' => $total,
- 'entries' => [],
- ];
+ $profiles = [];
}
+
+ return ['total' => $total, 'entries' => $profiles];
}
}
projects / friendica.git / blobdiff