diff options
Diffstat (limited to 'mod/message.php')
| -rw-r--r-- | mod/message.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/mod/message.php b/mod/message.php index 4821a45d2..c9ff3bb8e 100644 --- a/mod/message.php +++ b/mod/message.php @@ -120,7 +120,7 @@ function message_content(&$a) { $myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname']; - $tpl = load_view_file('view/mail_head.tpl'); + $tpl = get_markup_template('mail_head.tpl'); $header = replace_macros($tpl, array( '$messages' => t('Messages'), '$inbox' => t('Inbox'), @@ -164,15 +164,18 @@ function message_content(&$a) { if(($a->argc > 1) && ($a->argv[1] === 'new')) { - $tpl = load_view_file('view/msg-header.tpl'); + $tpl = get_markup_template('msg-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), - '$nickname' => $a->user['nickname'] + '$nickname' => $a->user['nickname'], + '$linkurl' => t('Please enter a link URL:') )); - $select = contact_select('messageto','message-to-select', false, 4, true); - $tpl = load_view_file('view/prv_message.tpl'); + $preselect = (isset($a->argv[2])?array($a->argv[2]):false); + + $select = contact_select('messageto','message-to-select', $preselect, 4, true); + $tpl = get_markup_template('prv_message.tpl'); $o .= replace_macros($tpl,array( '$header' => t('Send Private Message'), '$to' => t('To:'), @@ -222,7 +225,7 @@ function message_content(&$a) { return $o; } - $tpl = load_view_file('view/mail_list.tpl'); + $tpl = get_markup_template('mail_list.tpl'); foreach($r as $rr) { $o .= replace_macros($tpl, array( '$id' => $rr['id'], @@ -234,7 +237,7 @@ function message_content(&$a) { '$delete' => t('Delete conversation'), '$body' => $rr['body'], '$to_name' => $rr['name'], - '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'],'D, d M Y - g:i A') + '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')) )); } $o .= paginate($a); @@ -272,7 +275,7 @@ function message_content(&$a) { require_once("include/bbcode.php"); - $tpl = load_view_file('view/msg-header.tpl'); + $tpl = get_markup_template('msg-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( '$nickname' => $a->user['nickname'], @@ -280,7 +283,7 @@ function message_content(&$a) { )); - $tpl = load_view_file('view/mail_conv.tpl'); + $tpl = get_markup_template('mail_conv.tpl'); foreach($messages as $message) { if($message['from-url'] == $myprofile) { $from_url = $myprofile; @@ -306,7 +309,7 @@ function message_content(&$a) { } $select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />'; $parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />'; - $tpl = load_view_file('view/prv_message.tpl'); + $tpl = get_markup_template('prv_message.tpl'); $o .= replace_macros($tpl,array( '$header' => t('Send Reply'), '$to' => t('To:'), |