Merge branch '3.6-rc'

[friendica-addons.git] / communityhome / communityhome.php

diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php
index a4c956c282e55aa55be230d484aa2647bedb5482..f2908ab0e38d6cad4fdc7a0da6ce6df6b49eff06 100644 (file)
--- a/communityhome/communityhome.php
+++ b/communityhome/communityhome.php
@@ -5,6 +5,7 @@
  * Description: Show last community activity in homepage
  * Version: 2.0
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
+ * Status: Unsupported
  */
 
 use Friendica\App;
@@ -32,7 +33,6 @@ 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')
@@ -111,47 +111,14 @@ function communityhome_home(App $a, &$o)
                                $entry = replace_macros($tpl, [
                                        '$id' => $rr['id'],
                                        '$profile_link' => $profile_link,
-                                       '$photo' => $rr[$photo],
+                                       '$photo' => $a->get_cached_avatar_image($rr[$photo]),
                                        '$alt_text' => $rr['name'],
-                               ]);
+                               ));
                                $aside['$lastusers_items'][] = $entry;
                        }
                }
        }
-       // 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');
@@ -161,7 +128,7 @@ function communityhome_home(App $a, &$o)
                                                WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s')
                                                        AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1`
                                        INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`,
-                                       `user`
+                                       `user` 
                                        WHERE `user`.`uid` = `photo`.`uid`
                                        AND `user`.`blockwall`=0
                                        AND `user`.`hidewall` = 0
@@ -183,9 +150,8 @@ function communityhome_home(App $a, &$o)
                                        '$id' => $rr['id'],
                                        '$profile_link' => $photo_page,
                                        '$photo' => $photo_url,
-                                       '$photo_user' => $rr['username'],
-                                       '$photo_title' => $rr['desc']
-                               ]);
+                                       '$alt_text' => $rr['username']." : ".$rr['desc'],
+                               ));
 
                                $aside['$photos_items'][] = $entry;
                        }
@@ -199,7 +165,7 @@ function communityhome_home(App $a, &$o)
                $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM
                                (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link`
                                        FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-                               INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri`
+                               INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
                                WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
                                GROUP BY `uri`
                                ORDER BY `T1`.`created` DESC