Merge pull request #4068 from rabuzarus/20171215_-_frio_fix_contact_list

frio: fix some contact list issues

diff --git a/boot.php b/boot.php
index 79cf3e5b3e4970c84de8796411969a1da73feb69..695f9e85c5b3519d83f01ff7080762e50bf5f41d 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -43,7 +43,7 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Asparagus');
 define('FRIENDICA_VERSION',      '3.6-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1236);
+define('DB_UPDATE_VERSION',      1237);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index d1b791136f6aec05c84d7d0d3a51b6be7e4cb209..7a488ca40bb6511b211ea57c2d45703373787e9a 100644 (file)
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -529,7 +529,7 @@ function acl_lookup(App $a, $out_type = 'json') {
                // This can be done when we can delete cache entries via wildcard
                $r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids
                                FROM `group`
-                               INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid`
+                               INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id`
                                WHERE NOT `group`.`deleted` AND `group`.`uid` = %d
                                        $sql_extra
                                GROUP BY `group`.`name`, `group`.`id`

diff --git a/include/uimport.php b/include/uimport.php
index e3c2f4e6c1f69c0b67953cf895ffd55e30b0d558..d9b040597fdc6c8affe2af20354a437821dba064 100644 (file)
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -232,8 +232,6 @@ function import_account(App $a, $file) {
        }
 
        foreach ($account['group_member'] as &$group_member) {
-               $group_member['uid'] = $newuid;
-
                $import = 0;
                foreach ($account['group'] as $group) {
                        if ($group['id'] == $group_member['gid'] && isset($group['newid'])) {

diff --git a/mod/uexport.php b/mod/uexport.php
index 5a897f4abe23355a4aab37f69b82155f7a5dbdd3..39608250805d123041bb24805e132460abce6406 100644 (file)
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -109,7 +109,7 @@ function uexport_account($a) {
        );
 
        $group_member = _uexport_multirow(
-               sprintf("SELECT * FROM `group_member` WHERE uid = %d", intval(local_user()))
+               sprintf("SELECT `group_member`.`gid`, `group_member`.`contact-id` FROM `group_member` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` WHERE `group`.`uid` = %d", intval(local_user()))
        );
 
        $output = array(

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index c118d862f726ace5eb155fe6980324511fad4f15..7a6c3eaa70487b9c11ea9535761df9e060fd1b2c 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -990,15 +990,13 @@ class DBStructure {
                $database["group_member"] = array(
                                "fields" => array(
                                                "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-                                               "uid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("user" => "uid")),
                                                "gid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("group" => "id")),
                                                "contact-id" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0", "relation" => array("contact" => "id")),
                                                ),
                                "indexes" => array(
                                                "PRIMARY" => array("id"),
                                                "contactid" => array("contact-id"),
-                                               "gid_contactid" => array("gid", "contact-id"),
-                                               "uid_gid_contactid" => array("UNIQUE", "uid", "gid", "contact-id"),
+                                               "gid_contactid" => array("UNIQUE", "gid", "contact-id"),
                                                )
                                );
                $database["gserver"] = array(

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 2e1bc01c741c070fe27b9c3e37310330a3f5670e..2203b62162372e482e084e5eb0607a4a41b8720f 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -42,7 +42,7 @@ class Contact extends BaseObject
                                INNER JOIN `group_member`
                                        ON `contact`.`id` = `group_member`.`contact-id`
                                WHERE `gid` = ?
-                               AND `group_member`.`uid` = ?
+                               AND `contact`.`uid` = ?
                                AND NOT `contact`.`self`
                                AND NOT `contact`.`blocked`
                                AND NOT `contact`.`pending`
@@ -73,7 +73,7 @@ class Contact extends BaseObject
                                INNER JOIN `group_member`
                                        ON `contact`.`id` = `group_member`.`contact-id`
                                WHERE `gid` = ?
-                               AND `group_member`.`uid` = ?
+                               AND `contact`.`uid` = ?
                                AND `contact`.`network` = ?
                                AND `contact`.`notify` != ""',
                                $gid,
@@ -605,7 +605,9 @@ class Contact extends BaseObject
                        AND NOT `pending`
                        AND `id` NOT IN (
                                SELECT DISTINCT(`contact-id`)
-                               FROM `group_member` WHERE `uid` = %d
+                               FROM `group_member`
+                               INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
+                               WHERE `group`.`uid` = %d
                        )
                        LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count)
                );

diff --git a/src/Model/Group.php b/src/Model/Group.php
index cdc2a821d081ca2f93da0829c571d16afd397831..542827151039e72bcf31a982c4083b52a8534259 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -96,8 +96,7 @@ class Group extends BaseObject
                                        AND `contact-id` IN
                                                (SELECT `contact-id`
                                                FROM `group_member`
-                                               WHERE `group_member`.`gid` = `group`.`id`
-                                               AND `group_member`.`uid` = ?)
+                                               WHERE `group_member`.`gid` = `group`.`id`)
                                        ) AS `count`
                                FROM `group`
                                WHERE `group`.`uid` = ?;",

diff --git a/update.php b/update.php
index 6bb99af57c0787aaf2fb24da045878b7e2aea07a..9701e9e398fff286991ab0d1838525b0230972df 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1236);
+define('UPDATE_VERSION' , 1237);
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;

diff --git a/util/convert_innodb.sql b/util/convert_innodb.sql
deleted file mode 100644 (file)
index 7f3d99a..0000000
--- a/util/convert_innodb.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-#  script to convert tables from MyISAM to InnoDB
-#  change the %PLACEHOLDER% to the actual name of your Friendica DB
- 
-SELECT CONCAT('ALTER TABLE ',table_schema,'.',table_name,' engine=InnoDB;') 
-FROM information_schema.tables 
-WHERE engine = 'MyISAM' AND  `table_schema` = '%PLACEHOLDER%';