friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Code bautification

This commit is contained in:
Michael 2016-12-10 12:28:49 +00:00
parent 00c74a7d6d
commit c666c98559
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/Contact.php
View File

@ -683,10 +683,11 @@ function posts_from_contact_url($a, $contact_url) {
$r = q("SELECT `network`, `id` AS `author-id` FROM `contact` $r = q("SELECT `network`, `id` AS `author-id` FROM `contact`
WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0", WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
dbesc(normalise_link($contact_url))); dbesc(normalise_link($contact_url)));
if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND `item`.`private`))"; $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND `item`.`private`))";
else } else {
$sql = "`item`.`uid` = %d"; $sql = "`item`.`uid` = %d";
}
$author_id = intval($r[0]["author-id"]); $author_id = intval($r[0]["author-id"]);
@ -699,16 +700,6 @@ function posts_from_contact_url($a, $contact_url) {
$a->set_pager_total($r[0]['total']); $a->set_pager_total($r[0]['total']);
} }
/*
"SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
`author-name` AS `name`, `owner-avatar` AS `photo`,
`owner-link` AS `url`, `owner-avatar` AS `thumb`
FROM `item` FORCE INDEX (`authorid_created`)
WHERE `item`.`author-id` = %d AND $sql
AND NOT `deleted` AND NOT `moderated` AND `visible`
*/
$r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql. $r = q(item_query()." AND `item`.`author-id` = %d AND ".$sql.
" ORDER BY `item`.`created` DESC LIMIT %d, %d", " ORDER BY `item`.`created` DESC LIMIT %d, %d",
intval($author_id), intval($author_id),
@ -719,7 +710,7 @@ function posts_from_contact_url($a, $contact_url) {
$o = conversation($a,$r,'community',false); $o = conversation($a,$r,'community',false);
if(!get_config('system', 'old_pager')) { if (!get_config('system', 'old_pager')) {
$o .= alt_pager($a,count($r)); $o .= alt_pager($a,count($r));
} else { } else {
$o .= paginate($a); $o .= paginate($a);

13
mod/nodeinfo.php
View File

@ -174,7 +174,7 @@ function nodeinfo_cron() {
return; return;
$last = get_config('nodeinfo','last_calucation'); $last = get_config('nodeinfo','last_calucation');
/*
if($last) { if($last) {
// Calculate every 24 hours // Calculate every 24 hours
$next = $last + (24 * 60 * 60); $next = $last + (24 * 60 * 60);
@ -183,7 +183,7 @@ function nodeinfo_cron() {
return; return;
} }
} }
*/ logger("cron_start"); logger("cron_start");
$users = qu("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item` $users = qu("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
FROM `user` FROM `user`
@ -217,13 +217,8 @@ function nodeinfo_cron() {
set_config('nodeinfo','active_users_monthly', $active_users_monthly); set_config('nodeinfo','active_users_monthly', $active_users_monthly);
} }
$posts = qu("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall`"); $posts = qu("SELECT COUNT(*) AS local_posts FROM `thread` WHERE `thread`.`wall` AND `thread`.`uid` != 0");
/*
$posts = qu("SELECT COUNT(*) AS `local_posts` FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `contact`.`self` and `item`.`id` = `item`.`parent` AND left(body, 6) != '[share' AND `item`.`network` IN ('%s', '%s', '%s')",
dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_DFRN));
*/
if (!is_array($posts)) if (!is_array($posts))
$local_posts = -1; $local_posts = -1;
else else