From dc7a8adf292f3ebd83a70470056b5f9f06e13856 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 16 Apr 2024 04:43:54 +0000 Subject: [PATCH] Issue 13812: Public groups with manual request approval --- forumdirectory/forumdirectory.php | 8 ++++---- groupdirectory/groupdirectory.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index 79267c4ee..114da1dac 100644 --- 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 7bad1ef93..6d562cdc8 100644 --- 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)) {