Merge pull request #539 from MrPetovan/bug/4555-remove-active-users-feature

[communityhome] Remove active users feature

communityhome/README.md

@@ -1,34 +1,17 @@
 Community Home
 --------------
 
-This addon overwrites the default home page shown to not logged users.
+This addon overwrites the default home page shown to anonymous users.
-On sidebar there are the login form, last ten users (if they have 
+On the sidebar there are the login form, last ten users (if they chose
-choosed to be in site directory), last ten public photos and last ten
+to be in the site directory), last ten public photos and last ten
-"likes" sent by a site user or about a site user's item
+"likes" sent by a site user or about a site user's item.
 
-In main content is shown the community stream. This addon doesn't 
+In the main content is shown the community stream. This addon doesn't
-honour your community page visibility site setting: the community 
+honor your community page visibility site setting: the community
 stream is shown also if you have choose to not show the community page.
 
 If 'home.html' is found in your friendica root, its content is inserted
 before community stream
 
-Each elements can be show or not. At the moment, there is no admin page
+By default no features are enabled, you can edit this addon's settings
-for settings, so this settings must be added to yout .htconfig.php
+through the admin panel.
-
-
-    $a->config['communityhome']['showcommunitystream'] = true;
-    $a->config['communityhome']['showlastlike'] = true;
-    $a->config['communityhome']['showlastphotos'] = true;
-    $a->config['communityhome']['showactiveusers'] = true;
-    $a->config['communityhome']['showlastusers'] = true;
-
-If you don't want to show something, set it to false.
-
-Note:
------
-
-- Default is "false". With no settings in .htconfig.php, nothing is 
-shown, except login form and content of 'home.html'
-
-- Active users query can be heavy for db, and on some system don't work

communityhome/communityhome.php

@@ -1,40 +1,45 @@
 <?php
+
 /**
  * Name: Community home
  * Description: Show last community activity in homepage
  * Version: 2.0
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Status: Unsupported
  */
+
+use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Module\Login;
 
-require_once('mod/community.php');
+require_once 'mod/community.php';
 
-
+function communityhome_install()
-function communityhome_install() {
+{
 	Addon::registerHook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home');
 	logger("installed communityhome");
 }
 
-function communityhome_uninstall() {
+function communityhome_uninstall()
+{
 	Addon::unregisterHook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home');
 	logger("removed communityhome");
 }
 
-function communityhome_getopts() {
+function communityhome_getopts()
+{
 	return [
 		'hidelogin' => L10n::t('Hide login form'),
 		'showlastusers' => L10n::t('Show last new users'),
-		'showactiveusers'=>L10n::t('Show last active users'),
 		'showlastphotos' => L10n::t('Show last photos'),
 		'showlastlike' => L10n::t('Show last liked items'),
 		'showcommunitystream' => L10n::t('Show community stream')
 	];
 }
 
-function communityhome_addon_admin(&$a, &$o)
+function communityhome_addon_admin(App $a, &$o)
 {
 	$tpl = get_markup_template('settings.tpl', 'addon/communityhome/');
 
@@ -50,7 +55,7 @@ function communityhome_addon_admin(&$a, &$o)
 	$o = replace_macros($tpl, $ctx);
 }
 
-function communityhome_addon_admin_post(&$a, &$b)
+function communityhome_addon_admin_post(App $a)
 {
 	if (x($_POST, 'communityhome-submit')) {
 		$opts = communityhome_getopts();
@@ -60,8 +65,8 @@ function communityhome_addon_admin_post(&$a, &$b)
 	}
 }
 
-
+function communityhome_home(App $a, &$o)
-function communityhome_home(&$a, &$o){
+{
 	// custom css
 	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/communityhome/communityhome.css" media="all" />';
 
@@ -113,39 +118,7 @@ function communityhome_home(&$a, &$o){
 			}
 		}
 	}
-	// 12 most active users (by posts and contacts)
-	// this query don't work on some mysql versions
-	if (Config::get('communityhome','showactiveusers')){
-		$r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`  FROM
-				(SELECT COUNT(*) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`,
-				(SELECT COUNT(*) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`,
-				(
-				SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid`
-				UNION ALL
-				SELECT `contacts`,`items`,`con`.`uid` FROM `con` LEFT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid`
-				) AS `uni`, `user`, `profile`
-				WHERE `uni`.`uid`=`user`.`uid`
-				AND `uni`.`uid`=`profile`.`uid` AND `profile`.`publish`=1
-				GROUP BY `uid`
-				ORDER BY `items` DESC,`contacts` DESC
-				LIMIT 0,10");
-		if($r && count($r)) {
-			$aside['$activeusers_title']  = L10n::t('Most active users');
-			$aside['$activeusers_items']  = [];
 
-			$photo = 'thumb';
-			foreach($r as $rr) {
-				$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-				$entry = replace_macros($tpl,[
-					'$id' => $rr['id'],
-					'$profile_link' => $profile_link,
-					'$photo' => $rr[$photo],
-					'$photo_user' => sprintf("%s (%s posts, %s contacts)",$rr['name'], ($rr['items']?$rr['items']:'0'), ($rr['contacts']?$rr['contacts']:'0'))
-				]);
-				$aside['$activeusers_items'][] = $entry;
-			}
-		}
-	}
 	// last 12 photos
 	if (Config::get('communityhome', 'showlastphotos')) {
 		$aside['$photos_title'] = L10n::t('Latest photos');
@@ -198,7 +171,8 @@ function communityhome_home(&$a, &$o){
 				GROUP BY `uri`
 				ORDER BY `T1`.`created` DESC
 				LIMIT 0,10",
-				$a->get_baseurl(),$a->get_baseurl()
+			$a->get_baseurl(),
+			$a->get_baseurl()
 		);
 
 		foreach ($r as $rr) {
@@ -219,7 +193,8 @@ function communityhome_home(&$a, &$o){
 				default:
 					if ($rr['resource-id']) {
 						$post_type = L10n::t('photo');
-						$m=[];	preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
+						$m = [];
+						preg_match("/\[url=([^]]*)\]/", $rr['body'], $m);
 						$rr['plink'] = $m[1];
 					} else {
 						$post_type = L10n::t('status');
@@ -228,7 +203,6 @@ function communityhome_home(&$a, &$o){
 			$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
 
 			$aside['$like_items'][] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
-
 		}
 	}
 
@@ -238,17 +212,14 @@ function communityhome_home(&$a, &$o){
 
 	$o = '<h1>' . ((x($a->config, 'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "" ) . '</h1>';
 
-	if(file_exists('home.html'))
+	if (file_exists('home.html')) $o = file_get_contents('home.html');
- 		$o = file_get_contents('home.html');
 
 	if (Config::get('communityhome', 'showcommunitystream')) {
 		$oldset = Config::get('system', 'community_page_style');
-		if ($oldset == CP_NO_COMMUNITY_PAGE)
+		if ($oldset == CP_NO_COMMUNITY_PAGE) Config::set('system', 'community_page_style', CP_USERS_ON_SERVER);
-			Config::set('system','community_page_style', CP_USERS_ON_SERVER);
 
 		$o .= community_content($a, 1);
 
-		if ($oldset == CP_NO_COMMUNITY_PAGE)
+		if ($oldset == CP_NO_COMMUNITY_PAGE) Config::set('system', 'community_page_style', $oldset);
-			Config::set('system','community_page_style', $oldset);
 	}
 }

communityhome/templates/communityhome.tpl

@@ -41,15 +41,6 @@
 {{/if}}
 
 
-{{if $activeusers_title}}
-<h3>{{$activeusers_title}}</h3>
-<div class='items-wrapper'>
-{{foreach $activeusers_items as $i}}
-	{{$i}}
-{{/foreach}}
-</div>
-{{/if}}
-
 {{if $photos_title}}
 <h3>{{$photos_title}}</h3>
 <div class='items-wrapper'>