logger("API call duration: ".round($duration, 2)."\t".$a->query_string, LOGGER_DEBUG);
if (get_config("system", "profiler")) {
- logger(sprintf("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
+ $duration = microtime(true)-$a->performance["start"];
+
+ logger(parse_url($a->query_string, PHP_URL_PATH).": ".sprintf("Database: %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s",
round($a->performance["database"] - $a->performance["database_write"], 3),
round($a->performance["database_write"], 3),
round($a->performance["network"], 2),
- round($a->performance["rendering"], 2),
- round($a->performance["parser"], 2),
round($a->performance["file"], 2),
- round($duration - $a->performance["database"]
- - $a->performance["network"] - $a->performance["rendering"]
- - $a->performance["parser"] - $a->performance["file"], 2),
+ round($duration - ($a->performance["database"] + $a->performance["network"]
+ + $a->performance["file"]), 2),
round($duration, 2)),
LOGGER_DEBUG);
// count friends
$r = q("SELECT count(*) as `count` FROM `contact`
WHERE `uid` = %d AND `rel` IN ( %d, %d )
- AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
+ AND `self`=0 AND `blocked`=0 AND `hidden`=0",
intval($uinfo[0]['uid']),
intval(CONTACT_IS_SHARING),
intval(CONTACT_IS_FRIEND)
$r = q("SELECT count(*) as `count` FROM `contact`
WHERE `uid` = %d AND `rel` IN ( %d, %d )
- AND `self`=0 AND `blocked`=0 AND `pending`=0 AND `hidden`=0",
+ AND `self`=0 AND `blocked`=0 AND `hidden`=0",
intval($uinfo[0]['uid']),
intval(CONTACT_IS_FOLLOWER),
intval(CONTACT_IS_FRIEND)
`contact`.`id` AS `cid`
FROM `item`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND NOT `contact`.`blocked`
WHERE `item`.`uid` = %d AND `verb` = '%s'
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
$sql_extra
`user`.`nickname`, `user`.`hidewall`
FROM `item`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND NOT `contact`.`blocked`
STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
AND NOT `user`.`hidewall`
WHERE `verb` = '%s' AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
`contact`.`id` AS `cid`
FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND NOT `contact`.`blocked`
WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND `item`.`uid` = %d AND `item`.`verb` = '%s'
$sql_extra",
`contact`.`id` AS `cid`
FROM `item`
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND NOT `contact`.`blocked`
WHERE `item`.`parent` = %d AND `item`.`visible`
AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND `item`.`uid` = %d AND `item`.`verb` = '%s'
`contact`.`id` AS `cid`
FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND NOT `contact`.`blocked`
WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND NOT `item`.`private` AND `item`.`allow_cid` = '' AND `item`.`allow`.`gid` = ''
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
`contact`.`id` AS `cid`
FROM `item` FORCE INDEX (`uid_id`)
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND NOT `contact`.`blocked`
WHERE `item`.`uid` = %d AND `verb` = '%s'
AND NOT (`item`.`author-link` IN ('https://%s', 'http://%s'))
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
`contact`.`id` AS `cid`
FROM `item` FORCE INDEX (`uid_contactid_id`)
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND `contact`.`uid` = `item`.`uid`
- AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND NOT `contact`.`blocked`
WHERE `item`.`uid` = %d AND `verb` = '%s'
AND `item`.`contact-id` = %d
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
AND `item`.`starred` = 1
AND `contact`.`id` = `item`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND NOT `contact`.`blocked`
$sql_extra
AND `item`.`id`>%d
ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
'religion' => $profile['religion'],
'public_keywords' => $profile['pub_keywords'],
'private_keywords' => $profile['prv_keywords'],
- 'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, true),
- 'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, true),
- 'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, true),
- 'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, true),
- 'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, true),
- 'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, true),
- 'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, true),
- 'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, true),
- 'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, true),
- 'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, true),
- 'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, true),
- 'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, true),
+ 'likes' => bbcode(api_clean_plain_items($profile['likes']), false, false, 2, false),
+ 'dislikes' => bbcode(api_clean_plain_items($profile['dislikes']), false, false, 2, false),
+ 'about' => bbcode(api_clean_plain_items($profile['about']), false, false, 2, false),
+ 'music' => bbcode(api_clean_plain_items($profile['music']), false, false, 2, false),
+ 'book' => bbcode(api_clean_plain_items($profile['book']), false, false, 2, false),
+ 'tv' => bbcode(api_clean_plain_items($profile['tv']), false, false, 2, false),
+ 'film' => bbcode(api_clean_plain_items($profile['film']), false, false, 2, false),
+ 'interest' => bbcode(api_clean_plain_items($profile['interest']), false, false, 2, false),
+ 'romance' => bbcode(api_clean_plain_items($profile['romance']), false, false, 2, false),
+ 'work' => bbcode(api_clean_plain_items($profile['work']), false, false, 2, false),
+ 'education' => bbcode(api_clean_plain_items($profile['education']), false, false, 2, false),
+ 'social_networks' => bbcode(api_clean_plain_items($profile['contact']), false, false, 2, false),
'homepage' => $profile['homepage'],
'users' => null);
return $profile;
if ($user_info['self'] == 0)
$sql_extra = " AND false ";
- $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 $sql_extra",
+ $r = q("SELECT `nurl` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` $sql_extra",
intval(api_user())
);
projects / friendica.git / blobdiff