clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic

This commit is contained in:
friendica 2012-01-24 18:59:55 -08:00
parent dae0c1ded2
commit e2d0eb4a88
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/items.php
View File

@ -2755,6 +2755,9 @@ function item_expire($uid,$days) {
function drop_items($items) { function drop_items($items) {
$uid = 0; $uid = 0;
if((! local_user()) && (! $remote_user()))
return;
if(count($items)) { if(count($items)) {
foreach($items as $item) { foreach($items as $item) {
$owner = drop_item($item,false); $owner = drop_item($item,false);

28
mod/item.php
View File

@ -20,7 +20,7 @@ require_once('include/enotify.php');
function item_post(&$a) { function item_post(&$a) {
if((! local_user()) && (! remote_user())) if((! local_user()) && (! remote_user()) && (! x($_REQUEST,'commenter')))
return; return;
require_once('include/security.php'); require_once('include/security.php');
@ -110,11 +110,35 @@ function item_post(&$a) {
if($parent) logger('mod_post: parent=' . $parent); if($parent) logger('mod_post: parent=' . $parent);
$profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
$post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0); $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0);
$app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''); $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : '');
if(! can_write_wall($a,$profile_uid)) { $allow_moderated = false;
// here is where we are going to check for permission to post a moderated comment.
// First check that the parent exists and it is a wall item.
if((x($_REQUEST,'commenter')) && ((! $parent) || (! $parent_item['wall']))) {
notice( t('Permission denied.') . EOL) ;
if(x($_REQUEST,'return'))
goaway($a->get_baseurl() . "/" . $return_path );
killme();
}
// Now check that it is a page_type of PAGE_BLOG, and that valid personal details
// have been provided, and run any anti-spam plugins
// TODO
if((! can_write_wall($a,$profile_uid)) && (! $allow_moderated)) {
notice( t('Permission denied.') . EOL) ; notice( t('Permission denied.') . EOL) ;
if(x($_REQUEST,'return')) if(x($_REQUEST,'return'))
goaway($a->get_baseurl() . "/" . $return_path ); goaway($a->get_baseurl() . "/" . $return_path );

4
mod/notifications.php
View File

@ -42,12 +42,12 @@ function notifications_post(&$a) {
intval(local_user()) intval(local_user())
); );
} }
return; goaway($a->get_baseurl() . '/notifications/intros');
} }
if($_POST['submit'] == t('Ignore')) { if($_POST['submit'] == t('Ignore')) {
$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d LIMIT 1", $r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d LIMIT 1",
intval($intro_id)); intval($intro_id));
return; goaway($a->get_baseurl() . '/notifications/intros');
} }
} }
} }