Address instead of url

diff --git a/mod/message.php b/mod/message.php
index 96ba599348b89c13097e342e56c84ab2cee48bb7..f358ba975a5c2d0807b28e202255b3c0cd31e9dd 100644 (file)
--- 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 990af5ca019ade9ed1f8e1292f925f08d1298421..9ad7fec345e221b989aa1da8427a01d9c2dbf2fa 100644 (file)
--- 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 88a482af4a03ee42428d265e538266a4d5eec7fc..04f23a37140fd22321d75a6e14ab7a7f4088751e 100644 (file)
--- 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 a130466cd14ecc7e47ed3ebc5f33d848f3775d89..2ad9898495b355b67f2619db574fae4538d2cfd8 100644 (file)
--- 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 d74306a807d22755b524f882a04246faf25c6758..d5062a2322be13e2058f8a86efdf430d215a6134 100644 (file)
--- 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 78afeb51f6476ce5f5eb7b60f5849449f8a3e24d..3d9eebec2bcce4c84a5ff3d24f7b7372211bf9c1 100644 (file)
--- 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 c0d5d1da192e897549d189e693a4aaf8324899f7..ffde5d68f81e7bbd5e78268c5645083c28903869 100644 (file)
--- 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 bdf97bd27ad66fefc53ec7d3752f9778566eb8eb..7a43952c4cc4e3988249035f74b7a331d82622a0 100644 (file)
--- 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 c0d5d1da192e897549d189e693a4aaf8324899f7..ffde5d68f81e7bbd5e78268c5645083c28903869 100644 (file)
--- 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 d51c3e34a325e19482488083b7b0e06a1e5b4b31..89827cd314ab485515cbc6281b8dc369e870f9c0 100644 (file)
--- 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>