diff options
| author | friendica <info@friendica.com> | 2012-01-23 20:56:11 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-01-23 20:56:11 -0800 |
| commit | a76a497d924a16b8b07b126408db21655aac3bd6 (patch) | |
| tree | da677488f3ad710d223ae7e3ad68d1c695f46ada /mod/network.php | |
| parent | 1f074cb44c5deda5b480f5ff814ff3640ec843d0 (diff) | |
| download | volse-hubzilla-a76a497d924a16b8b07b126408db21655aac3bd6.tar.gz volse-hubzilla-a76a497d924a16b8b07b126408db21655aac3bd6.tar.bz2 volse-hubzilla-a76a497d924a16b8b07b126408db21655aac3bd6.zip | |
implement "moderate" flag on items
Diffstat (limited to 'mod/network.php')
| -rwxr-xr-x | mod/network.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mod/network.php b/mod/network.php index 70cb232f6..271a1236d 100755 --- a/mod/network.php +++ b/mod/network.php @@ -404,7 +404,8 @@ function network_content(&$a, $update = 0) { `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` FROM `item`, `contact` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 + WHERE `item`.`uid` = %d AND `item`.`visible` = 1 + AND `item`.`deleted` = 0 and `item`.`moderated` = 0 $simple_update AND `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 @@ -430,7 +431,7 @@ function network_content(&$a, $update = 0) { $r = q("SELECT `parent` AS `item_id`, `contact`.`uid` AS `contact_uid` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - and `item`.`unseen` = 1 + and `item`.`moderated` = 0 and `item`.`unseen` = 1 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $sql_extra $sql_nets ", intval(local_user()) @@ -440,7 +441,7 @@ function network_content(&$a, $update = 0) { $r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact_uid` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 + AND `item`.`moderated` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `item`.`parent` = `item`.`id` $sql_extra $sql_nets ORDER BY `item`.$ordering DESC $pager_sql ", @@ -465,7 +466,7 @@ function network_content(&$a, $update = 0) { `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` FROM `item`, `contact` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - AND `contact`.`id` = `item`.`contact-id` + AND `item`.`moderated` = 0 AND `contact`.`id` = `item`.`contact-id` AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `item`.`parent` IN ( %s ) $sql_extra ", |