X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=communityhome%2Fcommunityhome.php;h=ff3215d36aa00aaf64fe203ddd8de8847d0d7aef;hb=545e10bef52c5810e641fbce7f56ac54031f0289;hp=e2c3deeb817d50681541ada7cdd0766677854e9e;hpb=b87ef672f18443a8d0a8f6ec05dd895533471999;p=friendica-addons.git

diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php
index e2c3deeb..ff3215d3 100755
--- a/communityhome/communityhome.php
+++ b/communityhome/communityhome.php
@@ -2,7 +2,7 @@
 /**
  * Name: Community home
  * Description: Show last community activity in homepage
- * Version: 1.0
+ * Version: 2.0
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  */
 
@@ -23,17 +23,24 @@ function communityhome_uninstall() {
 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" />';
-	
-	$aside = array(
-		'$tab_1' => t('Login'),
-		'$tab_2' => t('OpenID'),
-		'$noOid' => get_config('system','no_openid'),
-	);
-	
-	// login form
-	$aside['$login_title'] =  t('Login');
-	$aside['$login_form'] = login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
-	
+
+	if (!get_config('communityhome','hidelogin')){
+		$aside = array(
+			'$tab_1' => t('Login'),
+			'$tab_2' => t('OpenID'),
+			'$noOid' => get_config('system','no_openid'),
+		);
+
+		// login form
+		$aside['$login_title'] =  t('Login');
+		$aside['$login_form'] = login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true);
+	} else
+		$aside = array(
+			//'$tab_1' => t('Login'),
+			//'$tab_2' => t('OpenID'),
+			//'$noOid' => get_config('system','no_openid'),
+		);
+
 	// last 12 users
 	if (get_config('communityhome','showlastusers')===true){
 		$aside['$lastusers_title'] = t('Latest users');
@@ -68,8 +75,8 @@ function communityhome_home(&$a, &$o){
 	// this query don't work on some mysql versions
 	if (get_config('communityhome','showactiveusers')===true){
 		$r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`  FROM
-				(SELECT COUNT(`id`) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`,
-				(SELECT COUNT(`id`) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`,
+				(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 
@@ -83,7 +90,7 @@ function communityhome_home(&$a, &$o){
 		if($r && count($r)) {
 			$aside['$activeusers_title']  = t('Most active users');
 			$aside['$activeusers_items']  = array();
-			
+
 			$photo = 'thumb';
 			foreach($r as $rr) {
 				$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
@@ -116,14 +123,14 @@ function communityhome_home(&$a, &$o){
 					dbesc(t('Profile Photos'))
 					);
 
-			
+
 		if(count($r)) {
 	#		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
 			$tpl = get_markup_template( 'directory_item.tpl', 'addon/communityhome/' );
 			foreach($r as $rr) {
 				$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 				$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
-			
+
 				$entry = replace_macros($tpl,array(
 					'$id' => $rr['id'],
 					'$profile_link' => $photo_page,
@@ -135,7 +142,7 @@ function communityhome_home(&$a, &$o){
 			}
 		}
 	}
-	
+
 	// last 10 liked items
 	if (get_config('communityhome','showlastlike')===true){
 		$aside['$like_title'] = t('Latest likes');
@@ -154,7 +161,7 @@ function communityhome_home(&$a, &$o){
 		foreach ($r as $rr) {
 			$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
 			$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
-			
+
 			//var_dump($rr['verb'],$rr['object-type']); killme();
 			switch($rr['verb']){
 				case 'http://activitystrea.ms/schema/1.0/post':
@@ -178,23 +185,27 @@ function communityhome_home(&$a, &$o){
 			$plink = '<a href="' . $rr['plink'] . '">' . $post_type . '</a>';
 
 			$aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
-			
+
 		}
 	}
-	
+
 #	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
 	$tpl = get_markup_template('communityhome.tpl', 'addon/communityhome/');
 	$a->page['aside'] = replace_macros($tpl, $aside);
-	
+
 	$o = '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';
-	
+
 	if(file_exists('home.html'))
  		$o = file_get_contents('home.html');
-	
+
 	if (get_config('communityhome','showcommunitystream')===true){
-		$oldset = get_config('system','no_community_page');
-		set_config('system','no_community_page', false);
+		$oldset = get_config('system','community_page_style');
+		if ($oldset == CP_NO_COMMUNITY_PAGE)
+			set_config('system','community_page_style', CP_USERS_ON_SERVER);
+
 		$o .= community_content($a,1);
-		set_config('system','no_community_page', $oldset);
+
+		if ($oldset == CP_NO_COMMUNITY_PAGE)
+			set_config('system','community_page_style', $oldset);
 	}
 }