friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

replace session return url by static pages

This commit is contained in:
Jonny Tischbein 2018-09-30 19:26:29 +02:00
parent 0a699be3c0
commit 57fe36e9a3
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mod/contacts.php
View File

@ -168,11 +168,7 @@ function contacts_batch_actions(App $a)
info(L10n::tt("%d contact edited.", "%d contacts edited.", $count_actions));
}
if (x($_SESSION, 'return_url')) {
goaway('' . $_SESSION['return_url']);
} else {
goaway('contacts');
}
goaway('contacts');
}
function contacts_post(App $a)
@ -476,20 +472,13 @@ function contacts_content(App $a, $update = 0)
}
// Now check how the user responded to the confirmation query
if (x($_REQUEST, 'canceled')) {
if (x($_SESSION, 'return_url')) {
goaway('' . $_SESSION['return_url']);
} else {
goaway('contacts');
}
goaway('contacts');
}
_contact_drop($orig_record);
info(L10n::t('Contact has been removed.') . EOL);
if (x($_SESSION, 'return_url')) {
goaway('' . $_SESSION['return_url']);
} else {
goaway('contacts');
}
goaway('contacts');
return; // NOTREACHED
}
if ($cmd === 'posts') {

2
mod/follow.php
View File

@ -20,7 +20,7 @@ function follow_post(App $a)
}
if (isset($_REQUEST['cancel'])) {
goaway($_SESSION['return_url']);
goaway('contacts');
}
$uid = local_user();

8
mod/message.php
View File

@ -160,7 +160,7 @@ function message_content(App $a)
// Now check how the user responded to the confirmation query
if (!empty($_REQUEST['canceled'])) {
goaway($_SESSION['return_url']);
goaway('/message');
}
$cmd = $a->argv[1];
@ -169,8 +169,7 @@ function message_content(App $a)
info(L10n::t('Message deleted.') . EOL);
}
//goaway(System::baseUrl(true) . '/message' );
goaway($_SESSION['return_url']);
goaway('/message' );
} else {
$r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($a->argv[2]),
@ -184,8 +183,7 @@ function message_content(App $a)
info(L10n::t('Conversation removed.') . EOL);
}
}
//goaway(System::baseUrl(true) . '/message' );
goaway($_SESSION['return_url']);
goaway('/message' );
}
}