Issue 13812: Public groups with manual request approval
This commit is contained in:
parent
38466415b3
commit
79d144740f
|
@ -104,8 +104,8 @@ function forumdirectory_content()
|
||||||
$total = 0;
|
$total = 0;
|
||||||
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
|
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
|
||||||
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
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",
|
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_COMMUNITY, User::PAGE_FLAGS_COMM_MAN);
|
||||||
if (DBA::isResult($cnt)) {
|
if (DBA::isResult($cnt)) {
|
||||||
$total = $cnt['total'];
|
$total = $cnt['total'];
|
||||||
}
|
}
|
||||||
|
@ -120,8 +120,8 @@ function forumdirectory_content()
|
||||||
`contact`.`addr`, `contact`.`url` FROM `profile`
|
`contact`.`addr`, `contact`.`url` FROM `profile`
|
||||||
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||||
INNER JOIN `contact` ON `contact`.`uid` = `user`.`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`
|
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
|
$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN
|
||||||
);
|
);
|
||||||
|
|
||||||
if (DBA::isResult($r)) {
|
if (DBA::isResult($r)) {
|
||||||
|
|
|
@ -101,8 +101,8 @@ function groupdirectory_content()
|
||||||
$total = 0;
|
$total = 0;
|
||||||
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
|
$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
|
||||||
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
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",
|
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_COMMUNITY, User::PAGE_FLAGS_COMM_MAN);
|
||||||
if (DBA::isResult($cnt)) {
|
if (DBA::isResult($cnt)) {
|
||||||
$total = $cnt['total'];
|
$total = $cnt['total'];
|
||||||
}
|
}
|
||||||
|
@ -117,8 +117,8 @@ function groupdirectory_content()
|
||||||
`contact`.`addr`, `contact`.`url` FROM `profile`
|
`contact`.`addr`, `contact`.`url` FROM `profile`
|
||||||
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
|
||||||
INNER JOIN `contact` ON `contact`.`uid` = `user`.`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`
|
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
|
$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_COMM_MAN
|
||||||
);
|
);
|
||||||
|
|
||||||
if (DBA::isResult($r)) {
|
if (DBA::isResult($r)) {
|
||||||
|
|
Loading…
Reference in a new issue