aboutsummaryrefslogtreecommitdiffstats
path: root/mod/profile.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-01-23 20:56:11 -0800
committerfriendica <info@friendica.com>2012-01-23 20:56:11 -0800
commita76a497d924a16b8b07b126408db21655aac3bd6 (patch)
treeda677488f3ad710d223ae7e3ad68d1c695f46ada /mod/profile.php
parent1f074cb44c5deda5b480f5ff814ff3640ec843d0 (diff)
downloadvolse-hubzilla-a76a497d924a16b8b07b126408db21655aac3bd6.tar.gz
volse-hubzilla-a76a497d924a16b8b07b126408db21655aac3bd6.tar.bz2
volse-hubzilla-a76a497d924a16b8b07b126408db21655aac3bd6.zip
implement "moderate" flag on items
Diffstat (limited to 'mod/profile.php')
-rwxr-xr-xmod/profile.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/mod/profile.php b/mod/profile.php
index 90a609d03..5d89db93e 100755
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -167,7 +167,7 @@ function profile_content(&$a, $update = 0) {
$r = q("SELECT distinct(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
AND `item`.`wall` = 1
$sql_extra
@@ -181,7 +181,7 @@ function profile_content(&$a, $update = 0) {
$r = q("SELECT COUNT(*) AS `total`
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`.`id` = `item`.`parent` AND `item`.`wall` = 1
$sql_extra ",
intval($a->profile['profile_uid'])
@@ -197,7 +197,7 @@ function profile_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`.`id` = `item`.`parent` AND `item`.`wall` = 1
$sql_extra
ORDER BY `item`.`created` DESC $pager_sql ",
@@ -220,6 +220,7 @@ function profile_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 `item`.`moderated` = 0
AND `contact`.`id` = `item`.`contact-id`
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `item`.`parent` IN ( %s )