allow crepair to change name - as long as it isn't blank

[friendica.git] / mod / message.php

diff --git a/mod/message.php b/mod/message.php
index d4772d026144d21cc9bea0da2cc41c8829cfd98b..4b494e906f5be8df0f0e8747d6b7d41d9997f678 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -27,6 +27,10 @@ function message_post(&$a) {
                        break;
                case -3:
                        notice( t('Message could not be sent.') . EOL );
+                       break;
+               case -4:
+                       notice( t('Message collection failure.') . EOL );
+                       break;
                default:
                        info( t('Message sent.') . EOL );
        }
@@ -45,21 +49,32 @@ function message_content(&$a) {
 
        $myprofile = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
 
-       if (($a->argc > 1) && ($a->argv[1] === 'new')) {
-               $tab = 'new';
-       } else if ($a->argc == 2 && $a->argv[1] === 'sent') {
-               $tab = 'sent';
-       } else {
-               $tab = 'inbox';
-       }
-       
+
+       $tabs = array(
+               array(
+                       'label' => t('Inbox'),
+                       'url'=> $a->get_baseurl() . '/message',
+                       'sel'=> (($a->argc == 1) ? 'active' : ''),
+               ),
+               array(
+                       'label' => t('Outbox'),
+                       'url' => $a->get_baseurl() . '/message/sent',
+                       'sel'=> (($a->argv[1] == 'sent') ? 'active' : ''),
+               ),
+               array(
+                       'label' => t('New Message'),
+                       'url' => $a->get_baseurl() . '/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'),
-               '$inbox' => t('Inbox'),
-               '$outbox' => t('Outbox'),
-               '$new' => t('New Message'),
-               '$activetab' => $tab
+               '$tab_content' => $tab_content
        ));
 
 
@@ -78,16 +93,30 @@ function message_content(&$a) {
                        goaway($a->get_baseurl() . '/message' );
                }
                else {
-                       $r = q("SELECT `parent-uri` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       $r = q("SELECT `parent-uri`,`convid` FROM `mail` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                                intval($a->argv[2]),
                                intval(local_user())
                        );
                        if(count($r)) {
                                $parent = $r[0]['parent-uri'];
+                               $convid = $r[0]['convid'];
+
                                $r = q("DELETE FROM `mail` WHERE `parent-uri` = '%s' AND `uid` = %d ",
                                        dbesc($parent),
                                        intval(local_user())
                                );
+
+                               // remove diaspora conversation pointer
+                               // Actually if we do this, we can never receive another reply to that conversation,
+                               // as we will never again have the info we need to re-create it. 
+                               // We'll just have to orphan it. 
+
+                               //if($convid) {
+                               //      q("delete from conv where id = %d limit 1",
+                               //              intval($convid)
+                               //      );
+                               //}
+
                                if($r)
                                        info( t('Conversation removed.') . EOL );
                        } 
@@ -165,7 +194,7 @@ function message_content(&$a) {
                        $o .= replace_macros($tpl, array(
                                '$id' => $rr['id'],
                                '$from_name' =>$rr['from-name'],
-                               '$from_url' => $a->get_baseurl() . '/redir/' . $rr['contact-id'],
+                               '$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl() . '/redir/' . $rr['contact-id'] : $rr['url']),
                                '$sparkle' => ' sparkle',
                                '$from_photo' => $rr['thumb'],
                                '$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')),
@@ -191,11 +220,19 @@ function message_content(&$a) {
                );
                if(count($r)) { 
                        $contact_id = $r[0]['contact-id'];
+                       $convid = $r[0]['convid'];
+
+                       $sql_extra = sprintf(" and `mail`.`parent-uri` = '%s' ", dbesc($r[0]['parent-uri']));
+                       if($convid)
+                               $sql_extra = sprintf(" and ( `mail`.`parent-uri` = '%s' OR `mail`.`convid` = '%d' ) ",
+                                       dbesc($r[0]['parent-uri']),
+                                       intval($convid)
+                               );  
+
                        $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(local_user()),
-                               dbesc($r[0]['parent-uri'])
+                               WHERE `mail`.`uid` = %d $sql_extra ORDER BY `mail`.`created` ASC",
+                               intval(local_user())
                        );
                }
                if(! count($messages)) {