mirror of
https://github.com/friendica/friendica
synced 2024-11-09 23:02:54 +00:00
Rework reports query in Moderation\Reports module class
- References to non-existent fields removed - Added computed rules field - Patch originally submitted by @TheTomcat14
This commit is contained in:
parent
fe9ef20392
commit
b1b2e9bd11
1 changed files with 18 additions and 3 deletions
|
@ -56,9 +56,24 @@ class Reports extends BaseModeration
|
||||||
|
|
||||||
$pager = new Pager($this->l10n, $this->args->getQueryString(), 10);
|
$pager = new Pager($this->l10n, $this->args->getQueryString(), 10);
|
||||||
|
|
||||||
$query = $this->database->p("SELECT `report`.`id`, `report`.`cid`, `report`.`comment`, `report`.`forward`, `report`.`created`, `report`.`reporter-id`,
|
$query = $this->database->p(
|
||||||
`report`.`category`, `report`.`rules`, `contact`.`micro`, `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`addr` FROM report
|
"SELECT
|
||||||
INNER JOIN `contact` ON `contact`.`id` = `report`.`cid` ORDER BY `report`.`created` DESC LIMIT ?, ?", $pager->getStart(), $pager->getItemsPerPage());
|
`report`.`id`, `report`.`cid`, `report`.`comment`, `report`.`forward`, `report`.`created`, `report`.`reporter-id`,
|
||||||
|
`report`.`category-id`,
|
||||||
|
(
|
||||||
|
SELECT GROUP_CONCAT(`report-rule`.`text` ORDER BY `report-rule`.`line-id` SEPARATOR \"\n\")
|
||||||
|
FROM `report-rule`
|
||||||
|
WHERE `report-rule`.`rid` = `report`.`id`
|
||||||
|
GROUP BY `report-rule`.`rid`
|
||||||
|
) AS `rules`,
|
||||||
|
`contact`.`micro`, `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`addr`
|
||||||
|
FROM report
|
||||||
|
INNER JOIN `contact` ON `contact`.`id` = `report`.`cid`
|
||||||
|
ORDER BY `report`.`created` DESC
|
||||||
|
LIMIT ?, ?",
|
||||||
|
$pager->getStart(),
|
||||||
|
$pager->getItemsPerPage(),
|
||||||
|
);
|
||||||
|
|
||||||
$reports = [];
|
$reports = [];
|
||||||
while ($report = $this->database->fetch($query)) {
|
while ($report = $this->database->fetch($query)) {
|
||||||
|
|
Loading…
Reference in a new issue