finish dipsy light colour fixes

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index 1369fde2e2708af28e2d55ddd28ea1e053bda21e..71f83b47a2277ab957c9c964d6e102f482947321 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -4,20 +4,7 @@ require_once('include/acl_selectors.php');
 require_once('include/message.php');
 
 function message_init(&$a) {
-       $tabs = array(
-       /*
-               array(
-                       'label' => t('All'),
-                       'url'=> $a->get_baseurl(true) . '/message',
-                       'sel'=> ($a->argc == 1),
-               ),
-               array(
-                       'label' => t('Sent'),
-                       'url' => $a->get_baseurl(true) . '/message/sent',
-                       'sel'=> ($a->argv[1] == 'sent'),
-               ),
-       */
-       );
+       $tabs = array();
        $new = array(
                'label' => t('New Message'),
                'url' => $a->get_baseurl(true) . '/message/new',
@@ -29,6 +16,25 @@ function message_init(&$a) {
                '$tabs'=>$tabs,
                '$new'=>$new,
        ));
+       $base = $a->get_baseurl();
+
+       $a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
+       $a->page['htmlhead'] .= <<< EOT
+
+<script>$(document).ready(function() { 
+       var a; 
+       a = $("#recip").autocomplete({ 
+               serviceUrl: '$base/acl',
+               width: 350,
+               onSelect: function(value,data) {
+                       $("#recip-complete").val(data);
+               }                       
+       });
+
+}); 
+
+</script>
+EOT;
        
 }
 
@@ -48,8 +54,7 @@ function message_post(&$a) {
 
        $plaintext = intval(get_pconfig(local_user(),'system','plaintext'));
        if(! $plaintext) {
-               $body = str_replace("\r\n","\n",$body);
-               $body = str_replace("\n\n","\n",$body);
+               $body = fix_mce_lf($body);
        }
        
        $ret = send_message($recipient, $body, $subject, $replyto);
@@ -94,10 +99,6 @@ function message_content(&$a) {
 
        $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
 
-
-
-
-
        $tpl = get_markup_template('mail_head.tpl');
        $header = replace_macros($tpl, array(
                '$messages' => t('Messages'),
@@ -171,12 +172,36 @@ function message_content(&$a) {
                ));
        
                $preselect = (isset($a->argv[2])?array($a->argv[2]):false);
-       
+                       
+
+               $prename = $preurl = $preid = '';
+
+               if($preselect) {
+                       $r = q("select name, url, id from contact where uid = %d and id = %d limit 1",
+                               intval(local_user()),
+                               intval($a->argv[2])
+                       );
+                       if(count($r)) {
+                               $prename = $r[0]['name'];
+                               $preurl = $r[0]['url'];
+                               $preid = $r[0]['id'];
+                       }
+               }        
+
+               $prefill = (($preselect) ? $prename  : '');
+
+               // the ugly select box
+               
                $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
+
                $tpl = get_markup_template('prv_message.tpl');
                $o .= replace_macros($tpl,array(
                        '$header' => t('Send Private Message'),
                        '$to' => t('To:'),
+                       '$showinputs' => 'true', 
+                       '$prefill' => $prefill,
+                       '$autocomp' => $autocomp,
+                       '$preid' => $preid,
                        '$subject' => t('Subject:'),
                        '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
                        '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
@@ -199,7 +224,7 @@ function message_content(&$a) {
                $o .= $header;
                
                $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",
+                       WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
                        intval(local_user()),
                        dbesc($myprofile)
                );
@@ -314,6 +339,29 @@ function message_content(&$a) {
                                $from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
                                $sparkle = ' sparkle';
                        }
+
+
+                       $Text = $message['body'];
+                       $saved_image = '';
+                       $img_start = strpos($Text,'[img]data:');
+                       $img_end = strpos($Text,'[/img]');
+
+                       if($img_start !== false && $img_end !== false && $img_end > $img_start) {
+                               $start_fragment = substr($Text,0,$img_start);
+                               $img_start += strlen('[img]');
+                               $saved_image = substr($Text,$img_start,$img_end - $img_start);
+                               $end_fragment = substr($Text,$img_end + strlen('[/img]'));              
+                               $Text = $start_fragment . '[!#saved_image#!]' . $end_fragment;
+                               $search = '/\[url\=(.*?)\]\[!#saved_image#!\]\[\/url\]' . '/is';
+                               $replace = '[url=' . z_path() . '/redir/' . $message['contact-id'] 
+                                       . '?f=1&url=' . '$1' . '][!#saved_image#!][/url]' ;
+
+                               $Text = preg_replace($search,$replace,$Text);
+
+                       if(strlen($saved_image))
+                               $message['body'] = str_replace('[!#saved_image#!]', '[img]' . $saved_image . '[/img]',$Text);
+                       }
+
                        $mails[] = array(
                                'id' => $message['id'],
                                'from_name' => template_escape($message['from-name']),
@@ -329,9 +377,10 @@ function message_content(&$a) {
                                
                        $seen = $message['seen'];
                }
+
+
                $select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
                $parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
-                       
 
                $tpl = get_markup_template('mail_display.tpl');
                $o = replace_macros($tpl, array(
@@ -346,6 +395,7 @@ function message_content(&$a) {
                        // reply
                        '$header' => t('Send Reply'),
                        '$to' => t('To:'),
+                       '$showinputs' => '',
                        '$subject' => t('Subject:'),
                        '$subjtxt' => template_escape($message['title']),
                        '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',