diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-02 17:51:37 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-02 17:51:37 +0200 |
| commit | 5ba39fef9af977fe9b92fef1b6d582138aee7d4b (patch) | |
| tree | 1e86418d826600bd4714596e8ad785c3a99f976f /mod/mail.php | |
| parent | 9b8aa8d09ec4415ad7da8d07779c1e6b719d159e (diff) | |
| download | volse-hubzilla-5ba39fef9af977fe9b92fef1b6d582138aee7d4b.tar.gz volse-hubzilla-5ba39fef9af977fe9b92fef1b6d582138aee7d4b.tar.bz2 volse-hubzilla-5ba39fef9af977fe9b92fef1b6d582138aee7d4b.zip | |
private mail compositor changes
Diffstat (limited to 'mod/mail.php')
| -rw-r--r-- | mod/mail.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mod/mail.php b/mod/mail.php index 525127a71..54663b3ae 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -226,10 +226,11 @@ function mail_content(&$a) { // the ugly select box - $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); + //$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); $tpl = get_markup_template('prv_message.tpl'); $o .= replace_macros($tpl,array( + '$new' => true, '$header' => t('Send Private Message'), '$to' => t('To:'), '$showinputs' => 'true', @@ -347,10 +348,6 @@ function mail_content(&$a) { $recp = (($message['from_xchan'] === $channel['channel_hash']) ? 'to' : 'from'); -// FIXME - move this HTML to template - - $select = $message[$recp]['xchan_name'] . '<input type="hidden" name="messageto" value="' . $message[$recp]['xchan_hash'] . '" />'; - $parent = '<input type="hidden" name="replyto" value="' . $message['parent_mid'] . '" />'; $tpl = get_markup_template('mail_display.tpl'); $o = replace_macros($tpl, array( '$mailbox' => $mailbox, @@ -366,14 +363,15 @@ function mail_content(&$a) { // reply '$header' => t('Send Reply'), '$to' => t('To:'), - '$showinputs' => '', + '$reply' => true, '$subject' => t('Subject:'), '$subjtxt' => $message['title'], '$readonly' => 'readonly="readonly"', - '$yourmessage' => t('Your message:'), + '$yourmessage' => sprintf(t('Your message for %s'), $message[$recp]['xchan_name']), '$text' => '', '$select' => $select, - '$parent' => $parent, + '$parent' => $message['parent_mid'], + '$recphash' => $message[$recp]['xchan_hash'], '$upload' => t('Upload photo'), '$attach' => t('Attach file'), '$insert' => t('Insert web link'), |