]> git.mxchange.org Git - friendica.git/blobdiff - mod/message.php
finish dipsy light colour fixes
[friendica.git] / mod / message.php
old mode 100755 (executable)
new mode 100644 (file)
index 0907abd..71f83b4
@@ -3,6 +3,41 @@
 require_once('include/acl_selectors.php');
 require_once('include/message.php');
 
+function message_init(&$a) {
+       $tabs = array();
+       $new = array(
+               'label' => t('New Message'),
+               'url' => $a->get_baseurl(true) . '/message/new',
+               'sel'=> ($a->argv[1] == 'new'),
+       );
+       
+       $tpl = get_markup_template('message_side.tpl');
+       $a->page['aside'] = replace_macros($tpl, array(
+               '$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;
+       
+}
+
 function message_post(&$a) {
 
        if(! local_user()) {
@@ -15,6 +50,12 @@ function message_post(&$a) {
        $body      = ((x($_REQUEST,'body'))      ? escape_tags(trim($_REQUEST['body'])) : '');
        $recipient = ((x($_REQUEST,'messageto')) ? intval($_REQUEST['messageto'])       : 0 );
 
+       // Work around doubled linefeeds in Tinymce 3.5b2
+
+       $plaintext = intval(get_pconfig(local_user(),'system','plaintext'));
+       if(! $plaintext) {
+               $body = fix_mce_lf($body);
+       }
        
        $ret = send_message($recipient, $body, $subject, $replyto);
        $norecip = false;
@@ -58,28 +99,6 @@ function message_content(&$a) {
 
        $myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
 
-
-       $tabs = array(
-               array(
-                       'label' => t('Inbox'),
-                       'url'=> $a->get_baseurl(true) . '/message',
-                       'sel'=> (($a->argc == 1) ? 'active' : ''),
-               ),
-               array(
-                       'label' => t('Outbox'),
-                       'url' => $a->get_baseurl(true) . '/message/sent',
-                       'sel'=> (($a->argv[1] == 'sent') ? 'active' : ''),
-               ),
-               array(
-                       'label' => t('New Message'),
-                       'url' => $a->get_baseurl(true) . '/message/new',
-                       'sel'=> (($a->argv[1] == 'new') ? 'active' : ''),
-               ),
-       );
-       $tpl = get_markup_template('common_tabs.tpl');
-       $tab_content = replace_macros($tpl, array('$tabs'=>$tabs));
-
-
        $tpl = get_markup_template('mail_head.tpl');
        $header = replace_macros($tpl, array(
                '$messages' => t('Messages'),
@@ -153,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'])) : ''),
@@ -174,17 +217,14 @@ function message_content(&$a) {
                return $o;
        }
 
-       if(($a->argc == 1) || ($a->argc == 2 && $a->argv[1] === 'sent')) {
+       if($a->argc == 1) {
+
+               // list messages
 
                $o .= $header;
                
-               if($a->argc == 2)
-                       $eq = '='; // I'm not going to bother escaping this.
-               else
-                       $eq = '!='; // or this.
-
                $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)
                );
@@ -192,11 +232,12 @@ function message_content(&$a) {
                        $a->set_pager_total($r[0]['total']);
        
                $r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, 
-                       `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`  
+                       `mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`,
+                       count( * ) as count
                        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 `mailcreated` DESC  LIMIT %d , %d ",
+                       WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `mailcreated` DESC  LIMIT %d , %d ",
                        intval(local_user()),
-                       dbesc($myprofile),
+                       //
                        intval($a->pager['start']),
                        intval($a->pager['itemspage'])
                );
@@ -207,17 +248,29 @@ function message_content(&$a) {
 
                $tpl = get_markup_template('mail_list.tpl');
                foreach($r as $rr) {
+                       if($rr['unknown']) {
+                               $partecipants = sprintf( t("Unknown sender - %s"),$rr['from-name']);
+                       }
+                       elseif (link_compare($rr['from-url'],$myprofile)){
+                               $partecipants = sprintf( t("You and %s"), $rr['name']);
+                       }
+                       else {
+                               $partecipants = sprintf( t("%s and You"), $rr['from-name']);
+                       }
+                       
                        $o .= replace_macros($tpl, array(
                                '$id' => $rr['id'],
-                               '$from_name' =>$rr['from-name'],
+                               '$from_name' => $partecipants,
                                '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
                                '$sparkle' => ' sparkle',
-                               '$from_photo' => $rr['thumb'],
+                               '$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
                                '$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')),
                                '$delete' => t('Delete conversation'),
                                '$body' => template_escape($rr['body']),
                                '$to_name' => template_escape($rr['name']),
-                               '$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('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')),
+                               '$seen' => $rr['mailseen'],
+                               '$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
                        ));
                }
                $o .= paginate($a);     
@@ -271,8 +324,13 @@ function message_content(&$a) {
                ));
 
 
-               $tpl = get_markup_template('mail_conv.tpl');
+               $mails = array();
+               $seen = 0;
+               $unknown = false;
+
                foreach($messages as $message) {
+                       if($message['unknown'])
+                               $unknown = true;
                        if($message['from-url'] == $myprofile) {
                                $from_url = $myprofile;
                                $sparkle = '';
@@ -281,26 +339,63 @@ function message_content(&$a) {
                                $from_url = $a->get_baseurl(true) . '/redir/' . $message['contact-id'];
                                $sparkle = ' sparkle';
                        }
-                       $o .= replace_macros($tpl, array(
-                               '$id' => $message['id'],
-                               '$from_name' => template_escape($message['from-name']),
-                               '$from_url' => $from_url,
-                               '$sparkle' => $sparkle,
-                               '$from_photo' => $message['from-photo'],
-                               '$subject' => template_escape($message['title']),
-                               '$body' => template_escape(smilies(bbcode($message['body']))),
-                               '$delete' => t('Delete message'),
-                               '$to_name' => template_escape($message['name']),
-                               '$date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A')
-                       ));
+
+
+                       $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']),
+                               'from_url' => $from_url,
+                               'sparkle' => $sparkle,
+                               'from_photo' => $message['from-photo'],
+                               'subject' => template_escape($message['title']),
+                               'body' => template_escape(smilies(bbcode($message['body']))),
+                               'delete' => t('Delete message'),
+                               'to_name' => template_escape($message['name']),
+                               'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i 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('prv_message.tpl');
-               $o .= replace_macros($tpl,array(
+
+               $tpl = get_markup_template('mail_display.tpl');
+               $o = replace_macros($tpl, array(
+                       '$thread_id' => $a->argv[1],
+                       '$thread_subject' => $message['title'],
+                       '$thread_seen' => $seen,
+                       '$delete' =>  t('Delete conversation'),
+                       '$canreply' => (($unknown) ? false : '1'),
+                       '$unknown_text' => t("No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."),                        
+                       '$mails' => $mails,
+                       
+                       // reply
                        '$header' => t('Send Reply'),
                        '$to' => t('To:'),
+                       '$showinputs' => '',
                        '$subject' => t('Subject:'),
                        '$subjtxt' => template_escape($message['title']),
                        '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
@@ -311,6 +406,7 @@ function message_content(&$a) {
                        '$upload' => t('Upload photo'),
                        '$insert' => t('Insert web link'),
                        '$wait' => t('Please wait')
+
                ));
 
                return $o;