From b1668ffddaeff2aeb256cb23ab094d78b10a5108 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 1 Sep 2017 19:32:12 +0000
Subject: [PATCH] Address instead of url
---
mod/message.php | 4 ++--
view/templates/mail_conv.tpl | 2 +-
view/templates/mail_list.tpl | 2 +-
view/theme/frio/templates/mail_conv.tpl | 6 +++---
view/theme/frio/templates/mail_list.tpl | 4 ++--
view/theme/frost-mobile/templates/mail_conv.tpl | 2 +-
view/theme/frost-mobile/templates/mail_list.tpl | 2 +-
view/theme/frost/templates/mail_conv.tpl | 2 +-
view/theme/frost/templates/mail_list.tpl | 2 +-
view/theme/quattro/templates/mail_conv.tpl | 4 ++--
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/mod/message.php b/mod/message.php
index 96ba599348..f358ba975a 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -470,7 +470,7 @@ function message_content(App $a) {
'id' => $message['id'],
'from_name' => $from_name_e,
'from_url' => $from_url,
- 'from_url2' => $message['from-url'],
+ 'from_addr' => $contact['addr'],
'sparkle' => $sparkle,
'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
'subject' => $subject_e,
@@ -584,7 +584,7 @@ function render_messages(array $msg, $t) {
'$id' => $rr['id'],
'$from_name' => $participants,
'$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
- '$from_url2' => $rr['url'],
+ '$from_addr' => $contact['addr'],
'$sparkle' => ' sparkle',
'$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
'$subject' => $subject_e,
diff --git a/view/templates/mail_conv.tpl b/view/templates/mail_conv.tpl
index 990af5ca01..9ad7fec345 100644
--- a/view/templates/mail_conv.tpl
+++ b/view/templates/mail_conv.tpl
@@ -1,7 +1,7 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
- <a href="{{$mail.from_url}}" title="{{$mail.from_url2}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
+ <a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
diff --git a/view/templates/mail_list.tpl b/view/templates/mail_list.tpl
index 88a482af4a..04f23a3714 100644
--- a/view/templates/mail_list.tpl
+++ b/view/templates/mail_list.tpl
@@ -1,7 +1,7 @@
<div class="mail-list-outside-wrapper">
<div class="mail-list-sender" >
- <a href="{{$from_url}}" title="{{$from_url2}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_url2}}" /></a>
+ <a href="{{$from_url}}" title="{{$from_addr}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_addr}}" /></a>
</div>
<div class="mail-list-detail">
<div class="mail-list-sender-name" >{{$from_name}}</div>
diff --git a/view/theme/frio/templates/mail_conv.tpl b/view/theme/frio/templates/mail_conv.tpl
index a130466cd1..2ad9898495 100644
--- a/view/theme/frio/templates/mail_conv.tpl
+++ b/view/theme/frio/templates/mail_conv.tpl
@@ -1,14 +1,14 @@
<div id="mail_conv-{{$mail.id}}" class="mail-conv-wrapper message-{{$mail.id}}">
<div class="media">
<div class="pull-left contact-photo-wrapper">
- <a href="{{$mail.from_url}}" title="{{$mail.from_url2}}">
- <img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" title="{{$mail.from_url2}}" />
+ <a href="{{$mail.from_url}}" title="{{$mail.from_addr}}">
+ <img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" title="{{$mail.from_addr}}" />
</a>
</div>
<div class="media-body">
<div class="text-muted time mail-ago pull-right" title="{{$mail.date}}" data-toggle="tooltip">{{$mail.date}}</div>
<div class="mail-conv-delete-end"></div>
- <h4 class="media-heading"><a href="{{$mail.from_url}}" title="{{$mail.from_url2}}">{{$mail.from_name}}</a></h4>
+ <h4 class="media-heading"><a href="{{$mail.from_url}}" title="{{$mail.from_addr}}">{{$mail.from_name}}</a></h4>
<div class="mail-body">
{{$mail.body}}
diff --git a/view/theme/frio/templates/mail_list.tpl b/view/theme/frio/templates/mail_list.tpl
index d74306a807..d5062a2322 100644
--- a/view/theme/frio/templates/mail_list.tpl
+++ b/view/theme/frio/templates/mail_list.tpl
@@ -4,8 +4,8 @@
<div class="media">
<div class="pull-left contact-photo-wrapper">
- <a href="{{$from_url}}" title="{{$from_url2}}">
- <img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" title="{{$from_url2}}" />
+ <a href="{{$from_url}}" title="{{$from_addr}}">
+ <img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" title="{{$from_addr}}" />
</a>
</div>
<div class="media-body">
diff --git a/view/theme/frost-mobile/templates/mail_conv.tpl b/view/theme/frost-mobile/templates/mail_conv.tpl
index 78afeb51f6..3d9eebec2b 100644
--- a/view/theme/frost-mobile/templates/mail_conv.tpl
+++ b/view/theme/frost-mobile/templates/mail_conv.tpl
@@ -1,7 +1,7 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
- <a href="{{$mail.from_url}}" title="{{$mail.from_url2}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_url2}}" /></a>
+ <a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_addr}}" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
diff --git a/view/theme/frost-mobile/templates/mail_list.tpl b/view/theme/frost-mobile/templates/mail_list.tpl
index c0d5d1da19..ffde5d68f8 100644
--- a/view/theme/frost-mobile/templates/mail_list.tpl
+++ b/view/theme/frost-mobile/templates/mail_list.tpl
@@ -1,7 +1,7 @@
<div class="mail-list-outside-wrapper">
<div class="mail-list-sender" >
- <a href="{{$from_url}}" title="{{$from_url2}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_url2}}" /></a>
+ <a href="{{$from_url}}" title="{{$from_addr}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_addr}}" /></a>
</div>
<div class="mail-list-detail">
<div class="mail-list-sender-name" >{{$from_name}}</div>
diff --git a/view/theme/frost/templates/mail_conv.tpl b/view/theme/frost/templates/mail_conv.tpl
index bdf97bd27a..7a43952c4c 100644
--- a/view/theme/frost/templates/mail_conv.tpl
+++ b/view/theme/frost/templates/mail_conv.tpl
@@ -1,7 +1,7 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
- <a href="{{$mail.from_url}}" title="{{$mail.from_url2}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_url2}}" /></a>
+ <a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_addr}}" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
diff --git a/view/theme/frost/templates/mail_list.tpl b/view/theme/frost/templates/mail_list.tpl
index c0d5d1da19..ffde5d68f8 100644
--- a/view/theme/frost/templates/mail_list.tpl
+++ b/view/theme/frost/templates/mail_list.tpl
@@ -1,7 +1,7 @@
<div class="mail-list-outside-wrapper">
<div class="mail-list-sender" >
- <a href="{{$from_url}}" title="{{$from_url2}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_url2}}" /></a>
+ <a href="{{$from_url}}" title="{{$from_addr}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo{{$sparkle}}" src="{{$from_photo}}" height="80" width="80" alt="{{$from_name}}" title="{{$from_addr}}" /></a>
</div>
<div class="mail-list-detail">
<div class="mail-list-sender-name" >{{$from_name}}</div>
diff --git a/view/theme/quattro/templates/mail_conv.tpl b/view/theme/quattro/templates/mail_conv.tpl
index d51c3e34a3..89827cd314 100644
--- a/view/theme/quattro/templates/mail_conv.tpl
+++ b/view/theme/quattro/templates/mail_conv.tpl
@@ -23,7 +23,7 @@
<div class="wall-item-actions">
<div class="wall-item-actions-author">
<a href="{{$mail.from_url}}" target="redir"
- class="wall-item-name-link" title="{{$mail.from_url2}}"><span
+ class="wall-item-name-link" title="{{$mail.from_addr}}"><span
class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a>
<span class="wall-item-ago" title="{{$mail.date}}">{{$mail.ago}}</span>
</div>
@@ -47,7 +47,7 @@
<div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" >
- <a href="{{$mail.from_url}}" title="{{$mail.from_url2}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_url2}}" /></a>
+ <a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_addr}}" /></a>
</div>
<div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
--
2.39.5