E2EE on private mail (also fixed autocomplete results dropdown for recipient which was positioned below the navbar instead of next to the recipient input box)

2013-11-13 23:10:29 -08:00
parent 412ebdade7
commit ee629534d5
4 changed files with 22 additions and 8 deletions
@@ -76,12 +76,12 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='

 	$match = null;
 	$images = null;
-	if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match))
+	if(preg_match_all("/\[img\](.*?)\[\/img\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
 		$images = $match[1];

 	$match = false;

-	if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match))
+	if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",((strpos($body,'[/crypt]')) ? $_POST['media_str'] : $body),$match))
 		$attaches = $match[1];

 	$attachments = '';