Merge pull request #6312 from annando/check-json

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index e689c45021cb70f8aa8a44b7d5075b591e7f0562..af194879902e8fd898682b75237ebe901aabd821 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -59,10 +59,10 @@ function message_post(App $a)
                return;
        }
 
-       $replyto   = x($_REQUEST, 'replyto')   ? Strings::removeTags(trim($_REQUEST['replyto']))   : '';
-       $subject   = x($_REQUEST, 'subject')   ? Strings::removeTags(trim($_REQUEST['subject']))   : '';
-       $body      = x($_REQUEST, 'body')      ? Strings::escapeTags(trim($_REQUEST['body'])) : '';
-       $recipient = x($_REQUEST, 'messageto') ? intval($_REQUEST['messageto'])       : 0;
+       $replyto   = !empty($_REQUEST['replyto'])   ? Strings::escapeTags(trim($_REQUEST['replyto'])) : '';
+       $subject   = !empty($_REQUEST['subject'])   ? Strings::escapeTags(trim($_REQUEST['subject'])) : '';
+       $body      = !empty($_REQUEST['body'])      ? Strings::escapeHtml(trim($_REQUEST['body']))    : '';
+       $recipient = !empty($_REQUEST['messageto']) ? intval($_REQUEST['messageto'])                  : 0;
 
        $ret = Mail::send($recipient, $body, $subject, $replyto);
        $norecip = false;
@@ -253,8 +253,8 @@ function message_content(App $a)
                        '$prefill' => $prefill,
                        '$preid' => $preid,
                        '$subject' => L10n::t('Subject:'),
-                       '$subjtxt' => x($_REQUEST, 'subject') ? strip_tags($_REQUEST['subject']) : '',
-                       '$text' => x($_REQUEST, 'body') ? Strings::escapeTags(htmlspecialchars($_REQUEST['body'])) : '',
+                       '$subjtxt' => !empty($_REQUEST['subject']) ? strip_tags($_REQUEST['subject']) : '',
+                       '$text' => !empty($_REQUEST['body']) ? Strings::escapeHtml(htmlspecialchars($_REQUEST['body'])) : '',
                        '$readonly' => '',
                        '$yourmessage' => L10n::t('Your message:'),
                        '$select' => $select,
@@ -431,24 +431,56 @@ function message_content(App $a)
        }
 }
 
-function get_messages($user, $lstart, $lend)
+/**
+ * @param int $uid
+ * @param int $start
+ * @param int $limit
+ * @return array
+ */
+function get_messages($uid, $start, $limit)
 {
-       //TODO: rewritte with a sub-query to get the first message of each private thread with certainty
-       return q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`,
-               ANY_VALUE(`mail`.`id`) AS `id`, ANY_VALUE(`mail`.`uid`) AS `uid`, ANY_VALUE(`mail`.`guid`) AS `guid`,
-               ANY_VALUE(`mail`.`from-name`) AS `from-name`, ANY_VALUE(`mail`.`from-photo`) AS `from-photo`,
-               ANY_VALUE(`mail`.`from-url`) AS `from-url`, ANY_VALUE(`mail`.`contact-id`) AS `contact-id`,
-               ANY_VALUE(`mail`.`convid`) AS `convid`, ANY_VALUE(`mail`.`title`) AS `title`, ANY_VALUE(`mail`.`body`) AS `body`,
-               ANY_VALUE(`mail`.`seen`) AS `seen`, ANY_VALUE(`mail`.`reply`) AS `reply`, ANY_VALUE(`mail`.`replied`) AS `replied`,
-               ANY_VALUE(`mail`.`unknown`) AS `unknown`, ANY_VALUE(`mail`.`uri`) AS `uri`,
-               `mail`.`parent-uri`,
-               ANY_VALUE(`mail`.`created`) AS `created`, ANY_VALUE(`contact`.`name`) AS `name`, ANY_VALUE(`contact`.`url`) AS `url`,
-               ANY_VALUE(`contact`.`thumb`) AS `thumb`, ANY_VALUE(`contact`.`network`) AS `network`,
-               count( * ) as `count`
-               FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id`
-               WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC LIMIT %d , %d ",
-               intval($user), intval($lstart), intval($lend)
-       );
+       return DBA::toArray(DBA::p('SELECT
+                       m.`id`,
+                       m.`uid`,
+                       m.`guid`,
+                       m.`from-name`,
+                       m.`from-photo`,
+                       m.`from-url`,
+                       m.`contact-id`,
+                       m.`convid`,
+                       m.`title`,
+                       m.`body`,
+                       m.`seen`,
+                       m.`reply`,
+                       m.`replied`,
+                       m.`unknown`,
+                       m.`uri`,
+                       m.`parent-uri`,
+                       m.`created`,
+                       c.`name`,
+                       c.`url`,
+                       c.`thumb`,
+                       c.`network`,
+                       m2.`count`,
+                       m2.`mailcreated`,
+                       m2.`mailseen`
+               FROM `mail` m
+               JOIN (
+                       SELECT
+                               `parent-uri`,
+                           MIN(`id`)      AS `id`,
+                           COUNT(*)       AS `count`,
+                           MAX(`created`) AS `mailcreated`,
+                           MIN(`seen`)    AS `mailseen`
+                       FROM `mail`
+                       WHERE `uid` = ?
+                       GROUP BY `parent-uri`
+               ) m2 ON m.`parent-uri` = m2.`parent-uri` AND m.`id` = m2.`id`
+               LEFT JOIN `contact` c ON m.`contact-id` = c.`id`
+               WHERE m.`uid` = ?
+               ORDER BY m2.`mailcreated` DESC
+               LIMIT ?, ?'
+               , $uid, $uid, $start, $limit));
 }
 
 function render_messages(array $msg, $t)