keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Address instead of url

Browse source
This commit is contained in:
Michael 2017-09-01 19:32:12 +00:00
parent 88fb02db8d
commit b1668ffdda
10 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/message.php
View file

@ -470,7 +470,7 @@ function message_content(App $a) {
'id' => $message['id'], 'id' => $message['id'],
'from_name' => $from_name_e, 'from_name' => $from_name_e,
'from_url' => $from_url, 'from_url' => $from_url,
'from_url2' => $message['from-url'], 'from_addr' => $contact['addr'],
'sparkle' => $sparkle, 'sparkle' => $sparkle,
'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), 'from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
'subject' => $subject_e, 'subject' => $subject_e,
@ -584,7 +584,7 @@ function render_messages(array $msg, $t) {
'$id' => $rr['id'], '$id' => $rr['id'],
'$from_name' => $participants, '$from_name' => $participants,
'$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']), '$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
'$from_url2' => $rr['url'], '$from_addr' => $contact['addr'],
'$sparkle' => ' sparkle', '$sparkle' => ' sparkle',
'$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB), '$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),
'$subject' => $subject_e, '$subject' => $subject_e,

2
view/templates/mail_conv.tpl
View file

@ -1,7 +1,7 @@
<div class="mail-conv-outside-wrapper"> <div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" > <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>
<div class="mail-conv-detail" > <div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div> <div class="mail-conv-sender-name" >{{$mail.from_name}}</div>

2
view/templates/mail_list.tpl
View file

@ -1,7 +1,7 @@
<div class="mail-list-outside-wrapper"> <div class="mail-list-outside-wrapper">
<div class="mail-list-sender" > <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>
<div class="mail-list-detail"> <div class="mail-list-detail">
<div class="mail-list-sender-name" >{{$from_name}}</div> <div class="mail-list-sender-name" >{{$from_name}}</div>

6
view/theme/frio/templates/mail_conv.tpl
View file

@ -1,14 +1,14 @@
<div id="mail_conv-{{$mail.id}}" class="mail-conv-wrapper message-{{$mail.id}}"> <div id="mail_conv-{{$mail.id}}" class="mail-conv-wrapper message-{{$mail.id}}">
<div class="media"> <div class="media">
<div class="pull-left contact-photo-wrapper"> <div class="pull-left contact-photo-wrapper">
<a href="{{$mail.from_url}}" 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_url2}}" /> <img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" title="{{$mail.from_addr}}" />
</a> </a>
</div> </div>
<div class="media-body"> <div class="media-body">
<div class="text-muted time mail-ago pull-right" title="{{$mail.date}}" data-toggle="tooltip">{{$mail.date}}</div> <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> <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"> <div class="mail-body">
{{$mail.body}} {{$mail.body}}

4
view/theme/frio/templates/mail_list.tpl
View file

@ -4,8 +4,8 @@
<div class="media"> <div class="media">
<div class="pull-left contact-photo-wrapper"> <div class="pull-left contact-photo-wrapper">
<a href="{{$from_url}}" title="{{$from_url2}}"> <a href="{{$from_url}}" title="{{$from_addr}}">
<img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" title="{{$from_url2}}" /> <img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" title="{{$from_addr}}" />
</a> </a>
</div> </div>
<div class="media-body"> <div class="media-body">

2
view/theme/frost-mobile/templates/mail_conv.tpl
View file

@ -1,7 +1,7 @@
<div class="mail-conv-outside-wrapper"> <div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" > <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>
<div class="mail-conv-detail" > <div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div> <div class="mail-conv-sender-name" >{{$mail.from_name}}</div>

2
view/theme/frost-mobile/templates/mail_list.tpl
View file

@ -1,7 +1,7 @@
<div class="mail-list-outside-wrapper"> <div class="mail-list-outside-wrapper">
<div class="mail-list-sender" > <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>
<div class="mail-list-detail"> <div class="mail-list-detail">
<div class="mail-list-sender-name" >{{$from_name}}</div> <div class="mail-list-sender-name" >{{$from_name}}</div>

2
view/theme/frost/templates/mail_conv.tpl
View file

@ -1,7 +1,7 @@
<div class="mail-conv-outside-wrapper"> <div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" > <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>
<div class="mail-conv-detail" > <div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div> <div class="mail-conv-sender-name" >{{$mail.from_name}}</div>

2
view/theme/frost/templates/mail_list.tpl
View file

@ -1,7 +1,7 @@
<div class="mail-list-outside-wrapper"> <div class="mail-list-outside-wrapper">
<div class="mail-list-sender" > <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>
<div class="mail-list-detail"> <div class="mail-list-detail">
<div class="mail-list-sender-name" >{{$from_name}}</div> <div class="mail-list-sender-name" >{{$from_name}}</div>

4
view/theme/quattro/templates/mail_conv.tpl
View file

@ -23,7 +23,7 @@
<div class="wall-item-actions"> <div class="wall-item-actions">
<div class="wall-item-actions-author"> <div class="wall-item-actions-author">
<a href="{{$mail.from_url}}" target="redir" <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> class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a>
<span class="wall-item-ago" title="{{$mail.date}}">{{$mail.ago}}</span> <span class="wall-item-ago" title="{{$mail.date}}">{{$mail.ago}}</span>
</div> </div>
@ -47,7 +47,7 @@
<div class="mail-conv-outside-wrapper"> <div class="mail-conv-outside-wrapper">
<div class="mail-conv-sender" > <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>
<div class="mail-conv-detail" > <div class="mail-conv-detail" >
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div> <div class="mail-conv-sender-name" >{{$mail.from_name}}</div>