From 823b812ccec9677c188bc8171e1076cdcbbbe922 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 2 Feb 2014 10:04:31 +0100 Subject: [PATCH 1/2] Changing the bbcode conversion since that sometimes lead to missing links --- statusnet/statusnet.php | 2 +- twitter/twitter.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 39aec43b..5286657b 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -502,7 +502,7 @@ function statusnet_shortenmsg($b, $max_char) { //$body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body); // At first convert the text to html - $html = bbcode(api_clean_plain_items($body), false, false, 2, true); + $html = bbcode(api_clean_plain_items($body), false, false, 2); // Then convert it to plain text //$msg = trim($b['title']." \n\n".html2plain($html, 0, true)); diff --git a/twitter/twitter.php b/twitter/twitter.php index c61e94e4..ef697404 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -428,7 +428,7 @@ function twitter_shortenmsg($b, $shortlink = false) { //$body = preg_replace("/\[share(.*?)\](.*?)\[\/share\]/ism","\n\n$2\n\n",$body); // At first convert the text to html - $html = bbcode(api_clean_plain_items($body), false, false, 2, true); + $html = bbcode(api_clean_plain_items($body), false, false, 2); // Then convert it to plain text $msg = trim(html2plain($html, 0, true)); From c27ee8a3ace0f115e0045a91373ca64a37d07f6f Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 2 Feb 2014 10:05:23 +0100 Subject: [PATCH 2/2] statistics: For performance reasons the calculations are done via cron. Additionally changed calculation for posts --- statistics_json/statistics_json.php | 68 +++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 19 deletions(-) diff --git a/statistics_json/statistics_json.php b/statistics_json/statistics_json.php index fe48bac2..5bc4902e 100644 --- a/statistics_json/statistics_json.php +++ b/statistics_json/statistics_json.php @@ -8,10 +8,12 @@ */ function statistics_json_install() { + register_hook('cron', 'addon/statistics_json/statistics_json.php', 'statistics_json_cron'); } function statistics_json_uninstall() { + unregister_hook('cron', 'addon/statistics_json/statistics_json.php', 'statistics_json_cron'); } function statistics_json_module() {} @@ -23,8 +25,32 @@ function statistics_json_init() { "name" => $a->config["sitename"], "version" => FRIENDICA_VERSION, "registrations_open" => ($a->config['register_policy'] != 0), + "total_users" => get_config('statistics_json','total_users'), + "active_users_halfyear" => get_config('statistics_json','active_users_halfyear'), + "active_users_monthly" => get_config('statistics_json','active_users_monthly'), + "local_posts" => get_config('statistics_json','local_posts') ); + header("Content-Type: application/json"); + echo json_encode($statistics); + logger("statistics_init: printed ".print_r($statistics, true)); + killme(); +} + +function statistics_json_cron($a,$b) { + $last = get_config('statistics_json','last_calucation'); + + if($last) { + // Calculate all 3 hours + $next = $last + (180 * 60); + if($next > time()) { + logger('statistics_json_cron: calculation intervall not reached'); + return; + } + } + logger('statistics_json_cron: cron_start'); + + $users = q("SELECT profile.*, `user`.`login_date`, `lastitem`.`lastitem_date` FROM (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` FROM `item` @@ -39,14 +65,10 @@ function statistics_json_init() { AND NOT `user`.`account_removed` AND NOT `user`.`account_expired`"); - if (!is_array($users)) { - $statistics["total_users"] = -1; - $statistics["active_users_halfyear"] = -1; - $statistics["active_users_monthly"] = -1; - } else { - $statistics["total_users"] = count($users); - $statistics["active_users_halfyear"] = 0; - $statistics["active_users_monthly"] = 0; + if (is_array($users)) { + $total_users = count($users); + $active_users_halfyear = 0; + $active_users_monthly = 0; $halfyear = time() - (180 * 24 * 60 * 60); $month = time() - (30 * 24 * 60 * 60); @@ -54,23 +76,31 @@ function statistics_json_init() { foreach ($users AS $user) { if ((strtotime($user['login_date']) > $halfyear) OR (strtotime($user['lastitem_date']) > $halfyear)) - ++$statistics["active_users_halfyear"]; + ++$active_users_halfyear; if ((strtotime($user['login_date']) > $month) OR (strtotime($user['lastitem_date']) > $month)) - ++$statistics["active_users_monthly"]; + ++$active_users_monthly; } + set_config('statistics_json','total_users', $total_users); + logger('statistics_json_cron: total_users: '.$total_users, LOGGER_DEBUG); + + set_config('statistics_json','active_users_halfyear', $active_users_halfyear); + set_config('statistics_json','active_users_monthly', $active_users_monthly); } - $posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE `wall`"); - if (!is_array($posts)) - $statistics["local_posts"] = -1; - else - $statistics["local_posts"] = $posts[0]["local_posts"]; + $posts = q("SELECT COUNT(*) AS local_posts FROM `item` WHERE `wall` AND id=parent"); - header("Content-Type: application/json"); - echo json_encode($statistics); - logger("statistics_init: printed ".print_r($statistics, true)); - killme(); + if (!is_array($posts)) + $local_posts = -1; + else + $local_posts = $posts[0]["local_posts"]; + + set_config('statistics_json','local_posts', $local_posts); + + logger('statistics_json_cron: local_posts: '.$local_posts, LOGGER_DEBUG); + + logger('statistics_json_cron: cron_end'); + set_config('statistics_json','last_calucation', time()); }