multi-user, do not cache open mbox

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index ef3be2c5e9cd05a7e5e7a89cff96c1c480c16bfc..7f17a362b3cb518770fd5a2ac3994bc11d8825a0 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -96,16 +96,9 @@ function message_post(&$a) {
                        }
                }
        }
-
-
-
-
-
-       $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
        
        if($post_id) {
-               //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &", array(),$foo));
-               proc_run($php_path,"include/notifier.php","mail","$post_id");
+               proc_run('php',"include/notifier.php","mail","$post_id");
                notice( t('Message sent.') . EOL );
        }
        else {
@@ -172,10 +165,16 @@ function message_content(&$a) {
        if(($a->argc > 1) && ($a->argv[1] === 'new')) {
                
                $tpl = load_view_file('view/msg-header.tpl');
-       
-               $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
-               $select = contact_select('messageto','message-to-select', false, 4, true);
+               $a->page['htmlhead'] .= replace_macros($tpl, array(
+                       '$baseurl' => $a->get_baseurl(),
+                       '$nickname' => $a->user['nickname'],
+                       '$linkurl' => t('Please enter a link URL:')
+               ));
+       
+               $preselect = (isset($a->argv[2])?array($a->argv[2]):false);
+       
+               $select = contact_select('messageto','message-to-select', $preselect, 4, true);
                $tpl = load_view_file('view/prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Private Message'),
@@ -238,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);