aboutsummaryrefslogtreecommitdiffstats
path: root/mod/message.php
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-03-14 12:57:35 +0100
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-03-14 12:57:35 +0100
commit70709a882594250684c954a21d186877ea6f983c (patch)
treeee2f364e513f8fd9fa1e12da8f5cd39c36d9b403 /mod/message.php
parent509ed2604fe6860b83e02984f8b4a280496a22a8 (diff)
parent42462cc1f00cd0d2e637ff3ddb62b30ae4a645c6 (diff)
downloadvolse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.gz
volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.bz2
volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.zip
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts: view/de/strings.php
Diffstat (limited to 'mod/message.php')
-rwxr-xr-xmod/message.php21
1 files changed, 16 insertions, 5 deletions
diff --git a/mod/message.php b/mod/message.php
index 91db5baef..57d45ee3c 100755
--- a/mod/message.php
+++ b/mod/message.php
@@ -10,17 +10,19 @@ function message_post(&$a) {
return;
}
- $replyto = ((x($_POST,'replyto')) ? notags(trim($_POST['replyto'])) : '');
- $subject = ((x($_POST,'subject')) ? notags(trim($_POST['subject'])) : '');
- $body = ((x($_POST,'body')) ? escape_tags(trim($_POST['body'])) : '');
- $recipient = ((x($_POST,'messageto')) ? intval($_POST['messageto']) : 0 );
+ $replyto = ((x($_REQUEST,'replyto')) ? notags(trim($_REQUEST['replyto'])) : '');
+ $subject = ((x($_REQUEST,'subject')) ? notags(trim($_REQUEST['subject'])) : '');
+ $body = ((x($_REQUEST,'body')) ? escape_tags(trim($_REQUEST['body'])) : '');
+ $recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto']) : 0 );
$ret = send_message($recipient, $body, $subject, $replyto);
+ $norecip = false;
switch($ret){
case -1:
notice( t('No recipient selected.') . EOL );
+ $norecip = true;
break;
case -2:
notice( t('Unable to locate contact information.') . EOL );
@@ -35,6 +37,13 @@ function message_post(&$a) {
info( t('Message sent.') . EOL );
}
+ // fake it to go back to the input form if no recipient listed
+
+ if($norecip) {
+ $a->argc = 2;
+ $a->argv[1] = 'new';
+ }
+
}
function message_content(&$a) {
@@ -151,7 +160,8 @@ function message_content(&$a) {
'$header' => t('Send Private Message'),
'$to' => t('To:'),
'$subject' => t('Subject:'),
- '$subjtxt' => '',
+ '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+ '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
'$readonly' => '',
'$yourmessage' => t('Your message:'),
'$select' => $select,
@@ -295,6 +305,7 @@ function message_content(&$a) {
'$subjtxt' => template_escape($message['title']),
'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
'$yourmessage' => t('Your message:'),
+ '$text' => '',
'$select' => $select,
'$parent' => $parent,
'$upload' => t('Upload photo'),