Issue 13812: Public groups with manual request approval

diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 79267c4ee5ee72388255a91d5c95d1071746562b..114da1dac90a39e38ff830120c48d179a818b7dc 100644 (file)
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -104,8 +104,8 @@ function forumdirectory_content()
        $total = 0;
        $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
                                INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
-                               User::PAGE_FLAGS_COMMUNITY);
+                               WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?) $sql_extra",
+                               User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN);
        if (DBA::isResult($cnt)) {
                $total = $cnt['total'];
        }
@@ -120,8 +120,8 @@ function forumdirectory_content()
                        `contact`.`addr`, `contact`.`url` FROM `profile`
                        INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
                        INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-                       WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
-                       $sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
+                       WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?) AND `contact`.`self`
+                       $sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN
        );
 
        if (DBA::isResult($r)) {

diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php
index 7bad1ef93a424eb8022024329c576e07e4b2db8f..6d562cdc826f7a01e78e7dfc3f03f4da9e0255ca 100644 (file)
--- a/groupdirectory/groupdirectory.php
+++ b/groupdirectory/groupdirectory.php
@@ -101,8 +101,8 @@ function groupdirectory_content()
        $total = 0;
        $cnt   = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
                                INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
-               User::PAGE_FLAGS_COMMUNITY);
+                               WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?) $sql_extra",
+               User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN);
        if (DBA::isResult($cnt)) {
                $total = $cnt['total'];
        }
@@ -117,8 +117,8 @@ function groupdirectory_content()
                        `contact`.`addr`, `contact`.`url` FROM `profile`
                        INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
                        INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-                       WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
-                       $sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
+                       WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` IN (?, ?)  AND `contact`.`self`
+                       $sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN
        );
 
        if (DBA::isResult($r)) {