report failure to generate keys

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 011a5a67bd7cd93e16578dde0b4d1a741a548ded..fa4af3f466de0f472681b967899b9e54071fd4af 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('view/acl_selectors.php');
+require_once('include/acl_selectors.php');
 
 function message_init(&$a) {
 
@@ -14,22 +14,25 @@ function message_post(&$a) {
                return;
        }
 
-       $replyto = notags(trim($_POST['replyto']));
-       $recipient = intval($_POST['messageto']);
-       $subject = notags(trim($_POST['subject']));
-       $body = escape_tags(trim($_POST['body']));
+       $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 );
 
        if(! $recipient) {
                notice( t('No recipient selected.') . EOL );
                return;
        }
 
+       if(! strlen($subject))
+               $subject = t('[no subject]');
+
        $me = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-               intval($_SESSION['uid'])
+               intval(local_user())
        );
        $contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($recipient),
-                       intval($_SESSION['uid'])
+                       intval(local_user())
        );
 
        if(! (count($me) && (count($contact)))) {
@@ -38,22 +41,21 @@ function message_post(&$a) {
        }
 
        $hash = random_string();
-       $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . $_SESSION['uid'] . ':' . $hash ;
+       $uri = 'urn:X-dfrn:' . $a->get_baseurl() . ':' . local_user() . ':' . $hash ;
 
        if(! strlen($replyto))
                $replyto = $uri;
 
        $r = q("INSERT INTO `mail` ( `uid`, `from-name`, `from-photo`, `from-url`, 
-               `contact-id`, `title`, `body`, `delivered`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
-               VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, %d, '%s', '%s', '%s' )",
-               intval($_SESSION['uid']),
+               `contact-id`, `title`, `body`, `seen`, `replied`, `uri`, `parent-uri`, `created`)
+               VALUES ( %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s', '%s', '%s' )",
+               intval(local_user()),
                dbesc($me[0]['name']),
                dbesc($me[0]['thumb']),
                dbesc($me[0]['url']),
                intval($recipient),
                dbesc($subject),
                dbesc($body),
-               0,
                1,
                0,
                dbesc($uri),
@@ -62,16 +64,15 @@ function message_post(&$a) {
        );
        $r = q("SELECT * FROM `mail` WHERE `uri` = '%s' and `uid` = %d LIMIT 1",
                dbesc($uri),
-               intval($_SESSION['uid'])
+               intval(local_user())
        );
        if(count($r))
                $post_id = $r[0]['id'];
 
        $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-       $proc_debug = get_config('system','proc_debug');
        
        if($post_id) {
-               proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug &",
+               proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &",
                        array(),$foo));
                notice( t('Message sent.') . EOL );
        }
@@ -83,6 +84,8 @@ function message_post(&$a) {
 }
 
 function message_content(&$a) {
+
+       $o = '';
        $o .= '<script> $(document).ready(function() { $(\'#nav-messages-link\').addClass(\'nav-selected\'); });</script>';
 
        if(! local_user()) {
@@ -109,7 +112,7 @@ function message_content(&$a) {
                if($cmd === 'drop') {
                        $r = q("DELETE FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($a->argv[2]),
-                               intval($_SESSION['uid'])
+                               intval(local_user())
                        );
                        if($r) {
                                notice( t('Message deleted.') . EOL );
@@ -119,13 +122,13 @@ function message_content(&$a) {
                else {
                        $r = q("SELECT `parent-uri` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($a->argv[2]),
-                               intval($_SESSION['uid'])
+                               intval(local_user())
                        );
                        if(count($r)) {
                                $parent = $r[0]['parent-uri'];
                                $r = q("DELETE FROM `mail` WHERE `parent-uri` = '%s' AND `uid` = %d ",
                                        dbesc($parent),
-                                       intval($_SESSION['uid'])
+                                       intval(local_user())
                                );
                                if($r)
                                        notice( t('Conversation removed.') . EOL );
@@ -134,18 +137,6 @@ function message_content(&$a) {
                }       
        
        }
-       if(($a->argc > 2) && ($a->argv[1] === 'redeliver') && intval($a->argv[2])) {
-               $post_id = intval($a->argv[2]);
-               $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-               $proc_debug = get_config('system','proc_debug');
-
-
-               proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" $proc_debug & ",
-                       array(),$foo));
-               goaway($a->get_baseurl() . '/message' );
-       }
-
-
 
        if(($a->argc > 1) && ($a->argv[1] === 'new')) {
                
@@ -153,7 +144,7 @@ function message_content(&$a) {
        
                $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
 
-               $select .= contact_select('messageto','message-to-select', false, 4, true);
+               $select = contact_select('messageto','message-to-select', false, 4, true);
                $tpl = load_view_file('view/prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Private Message'),
@@ -184,7 +175,7 @@ function message_content(&$a) {
 
                $r = q("SELECT count(*) AS `total` FROM `mail` 
                        WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC",
-                       intval($_SESSION['uid']),
+                       intval(local_user()),
                        dbesc($myprofile)
                );
                if(count($r))
@@ -194,7 +185,7 @@ function message_content(&$a) {
                        `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
                        FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
                        WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC  LIMIT %d , %d ",
-                       intval($_SESSION['uid']),
+                       intval(local_user()),
                        dbesc($myprofile),
                        intval($a->pager['start']),
                        intval($a->pager['itemspage'])
@@ -230,7 +221,7 @@ function message_content(&$a) {
                $r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
                        FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
                        WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
-                       intval($_SESSION['uid']),
+                       intval(local_user()),
                        intval($a->argv[1])
                );
                if(count($r)) { 
@@ -238,7 +229,7 @@ function message_content(&$a) {
                        $messages = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
                                FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
                                WHERE `mail`.`uid` = %d AND `mail`.`parent-uri` = '%s' ORDER BY `mail`.`created` ASC",
-                               intval($_SESSION['uid']),
+                               intval(local_user()),
                                dbesc($r[0]['parent-uri'])
                        );
                }
@@ -249,7 +240,7 @@ function message_content(&$a) {
 
                $r = q("UPDATE `mail` SET `seen` = 1 WHERE `parent-uri` = '%s' AND `uid` = %d",
                        dbesc($r[0]['parent-uri']),
-                       intval($_SESSION['uid'])
+                       intval(local_user())
                );
 
                require_once("include/bbcode.php");